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 001/238] [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 002/238] [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 003/238] [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 004/238] [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 005/238] [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 006/238] [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 007/238] [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 008/238] [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 009/238] [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 010/238] 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 011/238] [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 012/238] [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 013/238] [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 014/238] [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 015/238] [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 016/238] [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 017/238] [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 018/238] [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 019/238] [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 020/238] [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 021/238] [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 022/238] [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 023/238] [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 024/238] [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 025/238] [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 026/238] [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 027/238] [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 028/238] [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 029/238] [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 030/238] [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 031/238] [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 032/238] [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 12381be01045d64498616f3f2697f0162edbe0c1 Mon Sep 17 00:00:00 2001
From: "Turkesh Patel (Open ERP)" <tpa@tinyerp.com>
Date: Fri, 23 Mar 2012 15:00:13 +0530
Subject: [PATCH 033/238] [FIX] account_voucher: remove pay button if state is
 posted.

bzr revid: tpa@tinyerp.com-20120323093013-3x546uunrbe5t0nc
---
 addons/account_voucher/voucher_sales_purchase_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/account_voucher/voucher_sales_purchase_view.xml b/addons/account_voucher/voucher_sales_purchase_view.xml
index 0cb3104f92e..5b3965ad59b 100644
--- a/addons/account_voucher/voucher_sales_purchase_view.xml
+++ b/addons/account_voucher/voucher_sales_purchase_view.xml
@@ -153,7 +153,7 @@
                         <button name="cancel_voucher" string="Cancel" states="draft,proforma"  icon="gtk-cancel"/>
                         <button name="cancel_voucher" string="Cancel" type="object" states="posted" icon="terp-stock_effects-object-colorize" confirm="Are you sure to confirm this record ?"/>
                         <button name="proforma_voucher" string="Validate" states="draft" icon="gtk-go-forward"/>
-                        <group attrs="{'invisible':['|', ('state','!=','posted'), ('paid','=',True)]}">
+                        <group attrs="{'invisible':['|', ('state','=','posted'), ('paid','=',True)]}">
                            <button icon="terp-dolar_ok!" name="%(act_pay_voucher)d" context="{'narration':narration, 'title':'Customer Payment', 'type':'receipt', 'partner_id':partner_id, 'reference':reference, 'amount':amount}" type="action" string="Pay" attrs="{'invisible':[('pay_now','=','pay_now')]}"/>
                         </group>
                         <button name="action_cancel_draft" type="object" states="cancel" string="Set to Draft" icon="terp-stock_effects-object-colorize"/>

From 4e0cdb582954158481b5ec379e959c22a981ee5b Mon Sep 17 00:00:00 2001
From: "Turkesh Patel (Open ERP)" <tpa@tinyerp.com>
Date: Fri, 23 Mar 2012 17:09:25 +0530
Subject: [PATCH 034/238] [FIX] account_voucher: remove pay button if payment
 is done

bzr revid: tpa@tinyerp.com-20120323113925-hftkypiln1rn7mlk
---
 addons/account_voucher/account_voucher.py              | 6 +++---
 addons/account_voucher/voucher_sales_purchase_view.xml | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/addons/account_voucher/account_voucher.py b/addons/account_voucher/account_voucher.py
index 54226166508..8d7fa798c4a 100644
--- a/addons/account_voucher/account_voucher.py
+++ b/addons/account_voucher/account_voucher.py
@@ -46,10 +46,10 @@ class account_voucher(osv.osv):
     def _check_paid(self, cr, uid, ids, name, args, context=None):
         res = {}
         for voucher in self.browse(cr, uid, ids, context=context):
-            ok = True
+            ok = False
             for line in voucher.move_ids:
-                if (line.account_id.type, 'in', ('receivable', 'payable')) and not line.reconcile_id:
-                    ok = False
+                if (line.account_id.type, 'in', ('receivable', 'payable')) and line.reconcile_id:
+                    ok = True
             res[voucher.id] = ok
         return res
 
diff --git a/addons/account_voucher/voucher_sales_purchase_view.xml b/addons/account_voucher/voucher_sales_purchase_view.xml
index 5b3965ad59b..0cb3104f92e 100644
--- a/addons/account_voucher/voucher_sales_purchase_view.xml
+++ b/addons/account_voucher/voucher_sales_purchase_view.xml
@@ -153,7 +153,7 @@
                         <button name="cancel_voucher" string="Cancel" states="draft,proforma"  icon="gtk-cancel"/>
                         <button name="cancel_voucher" string="Cancel" type="object" states="posted" icon="terp-stock_effects-object-colorize" confirm="Are you sure to confirm this record ?"/>
                         <button name="proforma_voucher" string="Validate" states="draft" icon="gtk-go-forward"/>
-                        <group attrs="{'invisible':['|', ('state','=','posted'), ('paid','=',True)]}">
+                        <group attrs="{'invisible':['|', ('state','!=','posted'), ('paid','=',True)]}">
                            <button icon="terp-dolar_ok!" name="%(act_pay_voucher)d" context="{'narration':narration, 'title':'Customer Payment', 'type':'receipt', 'partner_id':partner_id, 'reference':reference, 'amount':amount}" type="action" string="Pay" attrs="{'invisible':[('pay_now','=','pay_now')]}"/>
                         </group>
                         <button name="action_cancel_draft" type="object" states="cancel" string="Set to Draft" icon="terp-stock_effects-object-colorize"/>

From f5cad0242de49dd4b9010674b147d3d330180442 Mon Sep 17 00:00:00 2001
From: niv-openerp <nicolas.vanhoren@openerp.com>
Date: Tue, 27 Mar 2012 11:23:45 +0200
Subject: [PATCH 035/238] [imp] desactivated rng check for views

bzr revid: nicolas.vanhoren@openerp.com-20120327092345-06bhhik1suy3td6p
---
 openerp/addons/base/ir/ir_ui_view.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/openerp/addons/base/ir/ir_ui_view.py b/openerp/addons/base/ir/ir_ui_view.py
index 8fcb794b08e..00a485e8ec1 100644
--- a/openerp/addons/base/ir/ir_ui_view.py
+++ b/openerp/addons/base/ir/ir_ui_view.py
@@ -89,7 +89,8 @@ class view(osv.osv):
         return True
 
     _constraints = [
-        (_check_xml, 'Invalid XML for View Architecture!', ['arch'])
+        # desactivate to test the new form views
+        #(_check_xml, 'Invalid XML for View Architecture!', ['arch'])
     ]
 
     def _auto_init(self, cr, context=None):

From 09b834e2ff36a65035580136da54dfbae999182f Mon Sep 17 00:00:00 2001
From: "Turkesh Patel (Open ERP)" <tpa@tinyerp.com>
Date: Tue, 27 Mar 2012 17:44:54 +0530
Subject: [PATCH 036/238] [FIX] l10n_ch: add default credit and debit account
 in demo data.

bzr revid: tpa@tinyerp.com-20120327121454-gw0rspj8jk0abe47
---
 addons/l10n_ch/journal_data.xml | 28 ++++++++++++++++++++--------
 1 file changed, 20 insertions(+), 8 deletions(-)

diff --git a/addons/l10n_ch/journal_data.xml b/addons/l10n_ch/journal_data.xml
index 04870ca936b..7f118c7d9e0 100644
--- a/addons/l10n_ch/journal_data.xml
+++ b/addons/l10n_ch/journal_data.xml
@@ -1,6 +1,6 @@
 <openerp>
     <data noupdate="1">
-        
+
         <record id="expenses_journal" model="account.journal">
             <field name="name">Journal de frais</field>
             <field name="code">EXPF</field>
@@ -8,9 +8,11 @@
             <field name="view_id" ref="account.account_journal_view"/>
             <field name="user_id" ref="base.user_root"/>
             <field name="update_posted" eval="True" />
+            <field model="account.account" name="default_credit_account_id" ref="account.a_expense"/>
+            <field model="account.account" name="default_debit_account_id" ref="account.a_expense"/>
             <field name="entry_posted" eval="True" />
         </record>
-        
+
         <record id="bank_journal" model="account.journal">
             <field name="name">Banque CHF</field>
             <field name="code">BCHF</field>
@@ -18,9 +20,11 @@
             <field name="view_id" ref="account.account_journal_bank_view"/>
             <field name="user_id" ref="base.user_root"/>
             <field name="update_posted" eval="True" />
+            <field model="account.account" name="default_credit_account_id" ref="account.cash"/>
+            <field model="account.account" name="default_debit_account_id" ref="account.cash"/>
             <field name="entry_posted" eval="True" />
         </record>
-        
+
         <record id="bank_euro_journal" model="account.journal">
             <field name="name">Banque EUR</field>
             <field name="code">BEUR</field>
@@ -29,9 +33,11 @@
             <field name="user_id" ref="base.user_root"/>
             <field name="update_posted" eval="True" />
             <field name="entry_posted" eval="True" />
-            <field name="currency" model="res.currency" search="[('name','=','EUR')]" />
+            <field model="account.account" name="default_credit_account_id" ref="account.cash"/>
+            <field model="account.account" name="default_debit_account_id" ref="account.cash"/>
+            <!-- field name="currency" model="res.currency" search="[('name','=','EUR')]" /-->
         </record>
-        
+
         <record id="petty_cash_journal" model="account.journal">
             <field name="name">Caisse</field>
             <field name="code">CAI</field>
@@ -39,9 +45,11 @@
             <field name="view_id" ref="account.account_journal_bank_view"/>
             <field name="user_id" ref="base.user_root"/>
             <field name="update_posted" eval="True" />
+            <field model="account.account" name="default_credit_account_id" ref="account.cash"/>
+            <field model="account.account" name="default_debit_account_id" ref="account.cash"/>
             <field name="entry_posted" eval="True" />
         </record>
-        
+
         <record id="misc_transaction_journal" model="account.journal">
             <field name="name">Opérations Diverses</field>
             <field name="code">OD</field>
@@ -49,17 +57,21 @@
             <field name="view_id" ref="account.account_journal_bank_view"/>
             <field name="user_id" ref="base.user_root"/>
             <field name="update_posted" eval="True" />
+            <field model="account.account" name="default_credit_account_id" ref="account.cash"/>
+            <field model="account.account" name="default_debit_account_id" ref="account.cash"/>
             <field name="entry_posted" eval="True" />
         </record>
-        
+
         <record model="account.journal" id="bilan_journal">
             <field name="name">Journal d'ouverture</field>
             <field name="code">JO</field>
             <field name="type">situation</field>
             <field name="centralisation">True</field>
             <field name="view_id" ref="account.account_journal_view"/>
+            <field model="account.account" name="default_credit_account_id" ref="account.cash"/>
+            <field model="account.account" name="default_debit_account_id" ref="account.cash"/>
             <field name="update_posted" eval="True" />
         </record>
-        
+
     </data>
 </openerp>

From f0a92dfc5a9572d2d73967a8b7b6e9ee7ae98c01 Mon Sep 17 00:00:00 2001
From: Fabien Meghazi <fme@openerp.com>
Date: Tue, 27 Mar 2012 16:28:58 +0200
Subject: [PATCH 037/238] [WIP] New Sale Order view

bzr revid: fme@openerp.com-20120327142858-gro32on5kjqr7iwr
---
 addons/sale/sale_view.xml | 111 +++++++++++++++++++++++---------------
 1 file changed, 67 insertions(+), 44 deletions(-)

diff --git a/addons/sale/sale_view.xml b/addons/sale/sale_view.xml
index 5cf3781478b..653cc38d6e3 100644
--- a/addons/sale/sale_view.xml
+++ b/addons/sale/sale_view.xml
@@ -96,28 +96,44 @@
             <field name="model">sale.order</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
+                <html>
+                <div class="oe_form_status">
+                    <div class="oe_form_status_left oe_left">
+                        <button name="invoice_recreate" states="invoice_except" string="Recreate Invoice" icon="gtk-go-forward"/>
+                        <button name="invoice_corrected" states="invoice_except" string="Ignore Exception" icon="gtk-apply"/>
+                        <button name="ship_recreate" states="shipping_except" string="Recreate Packing" icon="gtk-ok"/>
+                        <button name="ship_corrected" states="shipping_except" string="Ignore Exception" icon="gtk-apply"/>
+                        <button name="action_cancel" states="manual,progress" string="Cancel Order" type="object" icon="gtk-cancel"/>
+                        <button name="%(report_sale_order)d" string="Print Order" type="action" icon="gtk-print" states="waiting_date,manual,progress,done,shipping_except,invoice_except"/>
+                        <button name="manual_invoice" states="manual" string="Create Final Invoice" icon="gtk-go-forward" type="object"/>
+                        <button name="ship_cancel" states="shipping_except" string="Cancel Order" icon="gtk-cancel"/>
+                        <button name="action_cancel_draft" states="cancel" string="Set to Draft" type="object" icon="gtk-convert"/>
+                        <button name="cancel" states="draft" string="Cancel Order" icon="gtk-cancel"/>
+                        <button name="invoice_cancel" states="invoice_except" string="Cancel Order" icon="gtk-cancel"/>
+                        <button name="%(report_sale_order)d" string="Print Quotation" type="action" icon="gtk-print" states="draft"/>
+                        <button name="order_confirm" states="draft" string="Confirm Order" icon="gtk-apply"/>
+                    </div>
+                    <div class="oe_form_status_right oe_right">
+                        <field name="state" nolabel="1" widget="statusbar" statusbar_visible="draft,progress,done" statusbar_colors='{"shipping_except":"red","invoice_except":"red","waiting_date":"blue"}'/>
+                    </div>
+                    <div class="oe_clear"/>
+                </div>
                 <form string="Sales Order">
-                    <group col="6" colspan="4">
-                        <group col="4" colspan="4">
+                    <group col="2">
+                        <group col="2">
+                            <field name="partner_id" options='{"quick_create": false}' on_change="onchange_partner_id(partner_id)" domain="[('customer','=',True)]" context="{'search_default_customer':1}" required="1"/>
+                            <field name="partner_shipping_id" domain="[('partner_id','=',partner_id)]" groups="base.group_extended" options='{"quick_create": false}'/>
+                        </group>
+                        <group col="2">
                             <field name="name"/>
                             <field name="date_order"/>
-                            <field name="shop_id" on_change="onchange_shop_id(shop_id)" widget="selection" groups="base.group_extended"/>
-                            <field name="client_order_ref"/>
-                        </group>
-                        <group col="2" colspan="2">
-                            <field name="invoiced"/>
-                            <field name="shipped"/>
+                            <field name="payment_term" widget="selection"/>
+                            <field name="pricelist_id" domain="[('type','=','sale')]" groups="base.group_extended" on_change="onchange_pricelist_id(pricelist_id,order_line)"/>
                         </group>
                     </group>
-                    <notebook colspan="5">
-                        <page string="Sales Order">
-                            <field name="partner_id" options='{"quick_create": false}' on_change="onchange_partner_id(partner_id)" domain="[('customer','=',True)]" context="{'search_default_customer':1}" required="1"/>
-                            <field domain="[('partner_id','=',partner_id)]" name="partner_order_id" on_change="onchange_partner_order_id(partner_order_id, partner_invoice_id, partner_shipping_id)" options='{"quick_create": false}'/>
-                            <field domain="[('partner_id','=',partner_id)]" name="partner_invoice_id" groups="base.group_extended" options='{"quick_create": false}'/>
-                            <field domain="[('partner_id','=',partner_id)]" name="partner_shipping_id" groups="base.group_extended" options='{"quick_create": false}'/>
-                            <field domain="[('type','=','sale')]" name="pricelist_id" groups="base.group_extended" on_change="onchange_pricelist_id(pricelist_id,order_line)"/>
-                            <field name="project_id" context="{'partner_id':partner_id, 'contact_id':partner_order_id, 'pricelist_id':pricelist_id, 'default_name':name}" groups="analytic.group_analytic_accounting" domain="[('parent_id','!=',False)]"/>
-                            <newline/>
+
+                    <notebook>
+                        <page string="Summary">
                             <field colspan="4" name="order_line" nolabel="1" widget="one2many_list">
                                 <form string="Sales Order Lines">
                                     <notebook>
@@ -187,32 +203,41 @@
                                     <field name="price_subtotal"/>
                                 </tree>
                             </field>
-                            <newline/>
-                            <group col="13" colspan="10">
-                                <field name="amount_untaxed" sum="Untaxed amount"/>
-                                <field name="amount_tax"/>
-                                <field name="amount_total"/>
-                                <button name="button_dummy" states="draft" string="Compute" type="object" icon="gtk-execute"/>
-                                <button name="%(action_view_sale_advance_payment_inv)d" string="Advance Invoice" type="action" icon="gtk-execute" states="draft,manual" groups="base.group_extended"/>
-                            </group>
-                            <group col="17" colspan="4">
-                                <field name="state" widget="statusbar" statusbar_visible="draft,progress,done" statusbar_colors='{"shipping_except":"red","invoice_except":"red","waiting_date":"blue"}'/>
-                                <button name="invoice_recreate" states="invoice_except" string="Recreate Invoice" icon="gtk-go-forward"/>
-                                <button name="invoice_corrected" states="invoice_except" string="Ignore Exception" icon="gtk-apply"/>
-                                <button name="ship_recreate" states="shipping_except" string="Recreate Packing" icon="gtk-ok"/>
-                                <button name="ship_corrected" states="shipping_except" string="Ignore Exception" icon="gtk-apply"/>
-                                <button name="action_cancel" states="manual,progress" string="Cancel Order" type="object" icon="gtk-cancel"/>
-                                <button name="%(report_sale_order)d" string="Print Order" type="action" icon="gtk-print" states="waiting_date,manual,progress,done,shipping_except,invoice_except"/>
-                                <button name="manual_invoice" states="manual" string="Create Final Invoice" icon="gtk-go-forward" type="object"/>
-                                <button name="ship_cancel" states="shipping_except" string="Cancel Order" icon="gtk-cancel"/>
-                                <button name="action_cancel_draft" states="cancel" string="Set to Draft" type="object" icon="gtk-convert"/>
-                                <button name="cancel" states="draft" string="Cancel Order" icon="gtk-cancel"/>
-                                <button name="invoice_cancel" states="invoice_except" string="Cancel Order" icon="gtk-cancel"/>
-                                <button name="%(report_sale_order)d" string="Print Quotation" type="action" icon="gtk-print" states="draft"/>
-                                <button name="order_confirm" states="draft" string="Confirm Order" icon="gtk-apply"/>
-                            </group>
+
+                            <div class="oe_right">
+                                <group col="2">
+                                    <field name="amount_untaxed" sum="Untaxed amount"/>
+                                    <field name="amount_tax"/>
+                                    <field name="amount_total"/>
+                                </group>
+                            </div>
+                            <div class="oe_clear"/>
+
+                            <separator colspan="4" string="Notes"/>
+                            <field colspan="4" name="note" nolabel="1"/>
                         </page>
                         <page string="Other Information">
+                            <group col="4">
+                                <field domain="[('partner_id','=',partner_id)]" name="partner_order_id" on_change="onchange_partner_order_id(partner_order_id, partner_invoice_id, partner_shipping_id)" options='{"quick_create": false}'/>
+                                <field domain="[('partner_id','=',partner_id)]" name="partner_invoice_id" groups="base.group_extended" options='{"quick_create": false}'/>
+                                <field name="project_id" context="{'partner_id':partner_id, 'contact_id':partner_order_id, 'pricelist_id':pricelist_id, 'default_name':name}" groups="analytic.group_analytic_accounting" domain="[('parent_id','!=',False)]"/>
+                                <newline/>
+                                <newline/>
+                                <group col="13" colspan="10">
+                                    <button name="button_dummy" states="draft" string="Compute" type="object" icon="gtk-execute"/>
+                                    <button name="%(action_view_sale_advance_payment_inv)d" string="Advance Invoice" type="action" icon="gtk-execute" states="draft,manual" groups="base.group_extended"/>
+                                </group>
+                            </group>
+                            <group col="6" colspan="4">
+                                <group col="4" colspan="4">
+                                    <field name="shop_id" on_change="onchange_shop_id(shop_id)" widget="selection" groups="base.group_extended"/>
+                                    <field name="client_order_ref"/>
+                                </group>
+                                <group col="2" colspan="2">
+                                    <field name="invoiced"/>
+                                    <field name="shipped"/>
+                                </group>
+                            </group>
                             <group colspan="2" col="2" groups="base.group_extended" name="logistics">
                                 <separator string="Logistic" colspan="2"/>
                                 <field name="incoterm" widget="selection"/>
@@ -227,7 +252,6 @@
                             </group>
                             <group colspan="2" col="2" groups="base.group_extended">
                                 <separator string="Conditions" colspan="2"/>
-                                <field name="payment_term" widget="selection"/>
                                 <field name="fiscal_position" widget="selection"/>
                                 <field name="company_id" widget="selection" groups="base.group_multi_company"/>
                             </group>
@@ -236,8 +260,6 @@
                                 <field name="create_date"/>
                                 <field name="date_confirm"/>
                             </group>
-                            <separator colspan="4" string="Notes"/>
-                            <field colspan="4" name="note" nolabel="1"/>
                         </page>
                         <page string="History" groups="base.group_extended">
                             <separator colspan="4" string="Invoices"/>
@@ -247,6 +269,7 @@
                         </page>
                     </notebook>
                 </form>
+                </html>
             </field>
         </record>
 

From e99b876f640591f44b2e68080af623239c3f18dc Mon Sep 17 00:00:00 2001
From: "Turkesh Patel (Open ERP)" <tpa@tinyerp.com>
Date: Wed, 28 Mar 2012 11:13:30 +0530
Subject: [PATCH 038/238] [IMP] l10n_ch: remove changes of demo data

bzr revid: tpa@tinyerp.com-20120328054330-xyldnm258od1yo3c
---
 addons/l10n_ch/journal_data.xml | 14 +-------------
 1 file changed, 1 insertion(+), 13 deletions(-)

diff --git a/addons/l10n_ch/journal_data.xml b/addons/l10n_ch/journal_data.xml
index 7f118c7d9e0..fcefe9e3aff 100644
--- a/addons/l10n_ch/journal_data.xml
+++ b/addons/l10n_ch/journal_data.xml
@@ -8,8 +8,6 @@
             <field name="view_id" ref="account.account_journal_view"/>
             <field name="user_id" ref="base.user_root"/>
             <field name="update_posted" eval="True" />
-            <field model="account.account" name="default_credit_account_id" ref="account.a_expense"/>
-            <field model="account.account" name="default_debit_account_id" ref="account.a_expense"/>
             <field name="entry_posted" eval="True" />
         </record>
 
@@ -20,8 +18,6 @@
             <field name="view_id" ref="account.account_journal_bank_view"/>
             <field name="user_id" ref="base.user_root"/>
             <field name="update_posted" eval="True" />
-            <field model="account.account" name="default_credit_account_id" ref="account.cash"/>
-            <field model="account.account" name="default_debit_account_id" ref="account.cash"/>
             <field name="entry_posted" eval="True" />
         </record>
 
@@ -33,9 +29,7 @@
             <field name="user_id" ref="base.user_root"/>
             <field name="update_posted" eval="True" />
             <field name="entry_posted" eval="True" />
-            <field model="account.account" name="default_credit_account_id" ref="account.cash"/>
-            <field model="account.account" name="default_debit_account_id" ref="account.cash"/>
-            <!-- field name="currency" model="res.currency" search="[('name','=','EUR')]" /-->
+            <field name="currency" model="res.currency" search="[('name','=','EUR')]" />
         </record>
 
         <record id="petty_cash_journal" model="account.journal">
@@ -45,8 +39,6 @@
             <field name="view_id" ref="account.account_journal_bank_view"/>
             <field name="user_id" ref="base.user_root"/>
             <field name="update_posted" eval="True" />
-            <field model="account.account" name="default_credit_account_id" ref="account.cash"/>
-            <field model="account.account" name="default_debit_account_id" ref="account.cash"/>
             <field name="entry_posted" eval="True" />
         </record>
 
@@ -57,8 +49,6 @@
             <field name="view_id" ref="account.account_journal_bank_view"/>
             <field name="user_id" ref="base.user_root"/>
             <field name="update_posted" eval="True" />
-            <field model="account.account" name="default_credit_account_id" ref="account.cash"/>
-            <field model="account.account" name="default_debit_account_id" ref="account.cash"/>
             <field name="entry_posted" eval="True" />
         </record>
 
@@ -68,8 +58,6 @@
             <field name="type">situation</field>
             <field name="centralisation">True</field>
             <field name="view_id" ref="account.account_journal_view"/>
-            <field model="account.account" name="default_credit_account_id" ref="account.cash"/>
-            <field model="account.account" name="default_debit_account_id" ref="account.cash"/>
             <field name="update_posted" eval="True" />
         </record>
 

From fc9097988152c0af181f39ca8dfaa3f9b6f27330 Mon Sep 17 00:00:00 2001
From: Antony Lesuisse <al@openerp.com>
Date: Thu, 29 Mar 2012 16:43:07 +0200
Subject: [PATCH 039/238] css part1

bzr revid: al@openerp.com-20120329144307-0chkq7fki61s55qv
---
 addons/delivery/delivery_view.xml |  2 +-
 addons/sale/sale_view.xml         | 35 ++++++++++++++-----------------
 2 files changed, 17 insertions(+), 20 deletions(-)

diff --git a/addons/delivery/delivery_view.xml b/addons/delivery/delivery_view.xml
index 2d97d89dfca..4202ff3c7d4 100644
--- a/addons/delivery/delivery_view.xml
+++ b/addons/delivery/delivery_view.xml
@@ -313,7 +313,7 @@
             <field name="model">sale.order</field>
             <field name="inherit_id" ref="sale.view_order_form"/>
             <field name="arch" type="xml">
-                    <xpath expr="/form/notebook/page[@string='Sales Order']/group[1]/button[@name='button_dummy']" position="after">
+                    <xpath expr="//form/notebook/page[@string='Sales Order']/group[1]/button[@name='button_dummy']" position="after">
                          <button name="%(action_delivery_cost)d" states="draft" string="Delivery Costs" type="action" icon="gtk-add" context="{'order_id':active_id}"/>
                     </xpath>
             </field>
diff --git a/addons/sale/sale_view.xml b/addons/sale/sale_view.xml
index 653cc38d6e3..d3d798976b5 100644
--- a/addons/sale/sale_view.xml
+++ b/addons/sale/sale_view.xml
@@ -97,29 +97,26 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <html>
-                <div class="oe_form_status">
-                    <div class="oe_form_status_left oe_left">
-                        <button name="invoice_recreate" states="invoice_except" string="Recreate Invoice" icon="gtk-go-forward"/>
-                        <button name="invoice_corrected" states="invoice_except" string="Ignore Exception" icon="gtk-apply"/>
-                        <button name="ship_recreate" states="shipping_except" string="Recreate Packing" icon="gtk-ok"/>
-                        <button name="ship_corrected" states="shipping_except" string="Ignore Exception" icon="gtk-apply"/>
-                        <button name="action_cancel" states="manual,progress" string="Cancel Order" type="object" icon="gtk-cancel"/>
-                        <button name="%(report_sale_order)d" string="Print Order" type="action" icon="gtk-print" states="waiting_date,manual,progress,done,shipping_except,invoice_except"/>
-                        <button name="manual_invoice" states="manual" string="Create Final Invoice" icon="gtk-go-forward" type="object"/>
-                        <button name="ship_cancel" states="shipping_except" string="Cancel Order" icon="gtk-cancel"/>
-                        <button name="action_cancel_draft" states="cancel" string="Set to Draft" type="object" icon="gtk-convert"/>
-                        <button name="cancel" states="draft" string="Cancel Order" icon="gtk-cancel"/>
-                        <button name="invoice_cancel" states="invoice_except" string="Cancel Order" icon="gtk-cancel"/>
-                        <button name="%(report_sale_order)d" string="Print Quotation" type="action" icon="gtk-print" states="draft"/>
-                        <button name="order_confirm" states="draft" string="Confirm Order" icon="gtk-apply"/>
-                    </div>
-                    <div class="oe_form_status_right oe_right">
+                <div class="oe_form_topbar">
+                    <button name="invoice_recreate" states="invoice_except" string="Recreate Invoice" icon="gtk-go-forward"/>
+                    <button name="invoice_corrected" states="invoice_except" string="Ignore Exception" icon="gtk-apply"/>
+                    <button name="ship_recreate" states="shipping_except" string="Recreate Packing" icon="gtk-ok"/>
+                    <button name="ship_corrected" states="shipping_except" string="Ignore Exception" icon="gtk-apply"/>
+                    <button name="action_cancel" states="manual,progress" string="Cancel Order" type="object" icon="gtk-cancel"/>
+                    <button name="%(report_sale_order)d" string="Print Order" type="action" icon="gtk-print" states="waiting_date,manual,progress,done,shipping_except,invoice_except"/>
+                    <button name="manual_invoice" states="manual" string="Create Final Invoice" icon="gtk-go-forward" type="object"/>
+                    <button name="ship_cancel" states="shipping_except" string="Cancel Order" icon="gtk-cancel"/>
+                    <button name="action_cancel_draft" states="cancel" string="Set to Draft" type="object" icon="gtk-convert"/>
+                    <button name="cancel" states="draft" string="Cancel Order" icon="gtk-cancel"/>
+                    <button name="invoice_cancel" states="invoice_except" string="Cancel Order" icon="gtk-cancel"/>
+                    <button name="%(report_sale_order)d" string="Print Quotation" type="action" icon="gtk-print" states="draft"/>
+                    <button name="order_confirm" states="draft" string="Confirm Order" icon="gtk-apply"/>
+                    <div class="oe_right">
                         <field name="state" nolabel="1" widget="statusbar" statusbar_visible="draft,progress,done" statusbar_colors='{"shipping_except":"red","invoice_except":"red","waiting_date":"blue"}'/>
                     </div>
-                    <div class="oe_clear"/>
                 </div>
                 <form string="Sales Order">
-                    <group col="2">
+                    <group col="2" class="oe_form_header">
                         <group col="2">
                             <field name="partner_id" options='{"quick_create": false}' on_change="onchange_partner_id(partner_id)" domain="[('customer','=',True)]" context="{'search_default_customer':1}" required="1"/>
                             <field name="partner_shipping_id" domain="[('partner_id','=',partner_id)]" groups="base.group_extended" options='{"quick_create": false}'/>

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 040/238] [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
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

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 041/238] [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 a07d6e7364ede500577b1302c3db16d49aa53a00 Mon Sep 17 00:00:00 2001
From: "Turkesh Patel (Open ERP)" <tpa@tinyerp.com>
Date: Wed, 4 Apr 2012 12:56:22 +0530
Subject: [PATCH 042/238] [IMP] added new attribute for tree view

bzr revid: tpa@tinyerp.com-20120404072622-08evqadcnksplkwb
---
 openerp/addons/base/rng/view.rng | 1 +
 1 file changed, 1 insertion(+)

diff --git a/openerp/addons/base/rng/view.rng b/openerp/addons/base/rng/view.rng
index 5dce238db5d..c058795e0f0 100644
--- a/openerp/addons/base/rng/view.rng
+++ b/openerp/addons/base/rng/view.rng
@@ -222,6 +222,7 @@
             <rng:ref name="overload"/>
             <rng:optional><rng:attribute name="string"/></rng:optional>
             <rng:optional><rng:attribute name="colors"/></rng:optional>
+            <rng:optional><rng:attribute name="fontbold"/></rng:optional>
             <rng:optional>
               <rng:attribute name="editable">
                 <rng:choice>

From a5f5358cf2f0240852d2fd90d5b9beaafe0e6304 Mon Sep 17 00:00:00 2001
From: "Turkesh Patel (Open ERP)" <tpa@tinyerp.com>
Date: Wed, 4 Apr 2012 13:00:16 +0530
Subject: [PATCH 043/238] [IMP] improved code for make the list record bold
 depends on state

bzr revid: tpa@tinyerp.com-20120404073016-ro6wuybho7npp9k4
---
 addons/web/static/src/js/view_editor.js |  5 +++--
 addons/web/static/src/js/view_list.js   | 11 +++++++++--
 2 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/addons/web/static/src/js/view_editor.js b/addons/web/static/src/js/view_editor.js
index 2c0dc3d70b4..e0953ae5ef6 100644
--- a/addons/web/static/src/js/view_editor.js
+++ b/addons/web/static/src/js/view_editor.js
@@ -873,7 +873,8 @@ openerp.web.ViewEditor =   openerp.web.OldWidget.extend({
             'widget' : {'name':'widget', 'string': 'widget', 'type': 'selection'},
             'colors' : {'name':'colors', 'string': 'Colors', 'type': 'char'},
             'editable' : {'name':'editable', 'string': 'Editable', 'type': 'selection', 'selection': [["",""],["top","Top"],["bottom", "Bottom"]]},
-            'groups' : {'name':'groups', 'string': 'Groups', 'type': 'selection_multi'}
+            'groups' : {'name':'groups', 'string': 'Groups', 'type': 'selection_multi'},
+            'fontbold' : {'name':'fontbold', 'string': 'fontbold', 'type': 'char'},
         };
         var arch_val = self.get_object_by_id(this.one_object.clicked_tr_id,this.one_object['main_object'], []);
         this.edit_node_dialog.$element.append('<table id="rec_table"  style="width:400px" class="oe_forms"></table>');
@@ -1149,7 +1150,7 @@ var _PROPERTIES = {
     'board': ['style'],
     'column' : [],
     'action' : ['name', 'string', 'colspan', 'groups'],
-    'tree' : ['string', 'colors', 'editable', 'link', 'limit', 'min_rows'],
+    'tree' : ['string', 'colors', 'editable', 'link', 'limit', 'min_rows', 'fontbold'],
     'graph' : ['string', 'type'],
     'calendar' : ['string', 'date_start', 'date_stop', 'date_delay', 'day_length', 'color', 'mode']
 };
diff --git a/addons/web/static/src/js/view_list.js b/addons/web/static/src/js/view_list.js
index e8fff450c6e..cab916bbc32 100644
--- a/addons/web/static/src/js/view_list.js
+++ b/addons/web/static/src/js/view_list.js
@@ -56,6 +56,7 @@ openerp.web.ListView = openerp.web.View.extend( /** @lends openerp.web.ListView#
         this.view_id = view_id;
         this.previous_colspan = null;
         this.colors = null;
+        this.fontbold = null;
 
         this.columns = [];
 
@@ -154,16 +155,21 @@ openerp.web.ListView = openerp.web.View.extend( /** @lends openerp.web.ListView#
             current_date: new Date().toString('yyyy-MM-dd')
             // TODO: time, datetime, relativedelta
         });
+        var style= '';
+        if(record.attributes.state == this.fontbold) {
+            style = 'font-weight: bold;';
+        }
         for(var i=0, len=this.colors.length; i<len; ++i) {
             var pair = this.colors[i],
                 color = pair[0],
                 expression = pair[1];
             if (py.evaluate(expression, context).toJSON()) {
-                return 'color: ' + color + ';';
+                style += 'color: ' + color + ';'
+                return style;
             }
             // TODO: handle evaluation errors
         }
-        return '';
+        return style;
     },
     /**
      * Called after loading the list view's description, sets up such things
@@ -192,6 +198,7 @@ openerp.web.ListView = openerp.web.View.extend( /** @lends openerp.web.ListView#
         var self = this;
         this.fields_view = data;
         this.name = "" + this.fields_view.arch.attrs.string;
+        this.fontbold = this.fields_view.arch.attrs.fontbold
 
         if (this.fields_view.arch.attrs.colors) {
             this.colors = _(this.fields_view.arch.attrs.colors.split(';')).chain()

From dc9db0c01c360fb144a6bc3bd07b14827bb4125e Mon Sep 17 00:00:00 2001
From: "Turkesh Patel (Open ERP)" <tpa@tinyerp.com>
Date: Wed, 4 Apr 2012 14:46:13 +0530
Subject: [PATCH 044/238] [IMP] improved code for more than one states

bzr revid: tpa@tinyerp.com-20120404091613-fp7el2lal3qb190r
---
 addons/web/static/src/js/view_list.js | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

diff --git a/addons/web/static/src/js/view_list.js b/addons/web/static/src/js/view_list.js
index cab916bbc32..122d4ee76d5 100644
--- a/addons/web/static/src/js/view_list.js
+++ b/addons/web/static/src/js/view_list.js
@@ -156,9 +156,12 @@ openerp.web.ListView = openerp.web.View.extend( /** @lends openerp.web.ListView#
             // TODO: time, datetime, relativedelta
         });
         var style= '';
-        if(record.attributes.state == this.fontbold) {
-            style = 'font-weight: bold;';
+        for(var i=0, len=this.fontbold.length; i<len; ++i) {
+            if(record.attributes.state == this.fontbold[i]) {
+                style = 'font-weight: bold;';
+            }
         }
+
         for(var i=0, len=this.colors.length; i<len; ++i) {
             var pair = this.colors[i],
                 color = pair[0],
@@ -198,7 +201,6 @@ openerp.web.ListView = openerp.web.View.extend( /** @lends openerp.web.ListView#
         var self = this;
         this.fields_view = data;
         this.name = "" + this.fields_view.arch.attrs.string;
-        this.fontbold = this.fields_view.arch.attrs.fontbold
 
         if (this.fields_view.arch.attrs.colors) {
             this.colors = _(this.fields_view.arch.attrs.colors.split(';')).chain()
@@ -211,6 +213,13 @@ openerp.web.ListView = openerp.web.View.extend( /** @lends openerp.web.ListView#
                 }).value();
         }
 
+        if (this.fields_view.arch.attrs.fontbold) {
+            this.fontbold = _(this.fields_view.arch.attrs.fontbold.split(',')).chain().compact()
+                .map(function(fontbold_pair) {
+                    return fontbold_pair;
+                }).value();
+        }
+
         this.setup_columns(this.fields_view.fields, grouped);
 
         this.$element.html(QWeb.render(this._template, this));

From e685e4b3b66048e07f8c2e98f8e41a10db60eaaf Mon Sep 17 00:00:00 2001
From: "Turkesh Patel (Open ERP)" <tpa@tinyerp.com>
Date: Wed, 4 Apr 2012 17:32:11 +0530
Subject: [PATCH 045/238] [IMP] improved code for font-bold feature

bzr revid: tpa@tinyerp.com-20120404120211-0b1l1zvjx5550hqa
---
 addons/web/static/src/js/view_editor.js |  4 +--
 addons/web/static/src/js/view_list.js   | 36 ++++++++++++++++---------
 2 files changed, 25 insertions(+), 15 deletions(-)

diff --git a/addons/web/static/src/js/view_editor.js b/addons/web/static/src/js/view_editor.js
index e0953ae5ef6..ae531c8c925 100644
--- a/addons/web/static/src/js/view_editor.js
+++ b/addons/web/static/src/js/view_editor.js
@@ -874,7 +874,7 @@ openerp.web.ViewEditor =   openerp.web.OldWidget.extend({
             'colors' : {'name':'colors', 'string': 'Colors', 'type': 'char'},
             'editable' : {'name':'editable', 'string': 'Editable', 'type': 'selection', 'selection': [["",""],["top","Top"],["bottom", "Bottom"]]},
             'groups' : {'name':'groups', 'string': 'Groups', 'type': 'selection_multi'},
-            'fontbold' : {'name':'fontbold', 'string': 'fontbold', 'type': 'char'},
+            'fonts' : {'name':'fonts', 'string': 'fonts', 'type': 'char'},
         };
         var arch_val = self.get_object_by_id(this.one_object.clicked_tr_id,this.one_object['main_object'], []);
         this.edit_node_dialog.$element.append('<table id="rec_table"  style="width:400px" class="oe_forms"></table>');
@@ -1150,7 +1150,7 @@ var _PROPERTIES = {
     'board': ['style'],
     'column' : [],
     'action' : ['name', 'string', 'colspan', 'groups'],
-    'tree' : ['string', 'colors', 'editable', 'link', 'limit', 'min_rows', 'fontbold'],
+    'tree' : ['string', 'colors', 'editable', 'link', 'limit', 'min_rows', 'fonts'],
     'graph' : ['string', 'type'],
     'calendar' : ['string', 'date_start', 'date_stop', 'date_delay', 'day_length', 'color', 'mode']
 };
diff --git a/addons/web/static/src/js/view_list.js b/addons/web/static/src/js/view_list.js
index 122d4ee76d5..b2a23ac5451 100644
--- a/addons/web/static/src/js/view_list.js
+++ b/addons/web/static/src/js/view_list.js
@@ -56,7 +56,7 @@ openerp.web.ListView = openerp.web.View.extend( /** @lends openerp.web.ListView#
         this.view_id = view_id;
         this.previous_colspan = null;
         this.colors = null;
-        this.fontbold = null;
+        this.fonts = null;
 
         this.columns = [];
 
@@ -149,19 +149,26 @@ openerp.web.ListView = openerp.web.View.extend( /** @lends openerp.web.ListView#
      * @returns {String} CSS color declaration
      */
     color_for: function (record) {
-        if (!this.colors) { return ''; }
-        var context = _.extend({}, record.attributes, {
+       var style= '';
+
+       var context = _.extend({}, record.attributes, {
             uid: this.session.uid,
             current_date: new Date().toString('yyyy-MM-dd')
             // TODO: time, datetime, relativedelta
         });
-        var style= '';
-        for(var i=0, len=this.fontbold.length; i<len; ++i) {
-            if(record.attributes.state == this.fontbold[i]) {
-                style = 'font-weight: bold;';
-            }
-        }
 
+        if (this.fonts) {
+	        for(var i=0, len=this.fonts.length; i<len; ++i) {
+	            var pair = this.fonts[i],
+                    font = pair[0],
+                    expression = pair[1];
+                if (py.evaluate(expression, context).toJSON()) {
+                    style = 'font-weight: bold;';
+                }
+	        }
+	    }
+
+        if (!this.colors) { return style; }
         for(var i=0, len=this.colors.length; i<len; ++i) {
             var pair = this.colors[i],
                 color = pair[0],
@@ -213,10 +220,13 @@ openerp.web.ListView = openerp.web.View.extend( /** @lends openerp.web.ListView#
                 }).value();
         }
 
-        if (this.fields_view.arch.attrs.fontbold) {
-            this.fontbold = _(this.fields_view.arch.attrs.fontbold.split(',')).chain().compact()
-                .map(function(fontbold_pair) {
-                    return fontbold_pair;
+        if (this.fields_view.arch.attrs.fonts) {
+            this.fonts = _(this.fields_view.arch.attrs.fonts.split(',')).chain().compact()
+                .map(function(font_pair) {
+                    var pair = font_pair.split(':'),
+                        font = pair[0],
+                        expr = pair[1];
+                    return [font, py.parse(py.tokenize(expr)), expr];
                 }).value();
         }
 

From 09a40e6cb8aa31f9902aaeea83bc3396e3fd0617 Mon Sep 17 00:00:00 2001
From: "Turkesh Patel (Open ERP)" <tpa@tinyerp.com>
Date: Wed, 4 Apr 2012 18:59:30 +0530
Subject: [PATCH 046/238] [IMP] improved code.

bzr revid: tpa@tinyerp.com-20120404132930-gqlw6a4f5y9ng0pd
---
 addons/web/static/src/js/view_list.js | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/addons/web/static/src/js/view_list.js b/addons/web/static/src/js/view_list.js
index b2a23ac5451..29569a43a62 100644
--- a/addons/web/static/src/js/view_list.js
+++ b/addons/web/static/src/js/view_list.js
@@ -163,7 +163,9 @@ openerp.web.ListView = openerp.web.View.extend( /** @lends openerp.web.ListView#
                     font = pair[0],
                     expression = pair[1];
                 if (py.evaluate(expression, context).toJSON()) {
-                    style = 'font-weight: bold;';
+                    if (font == 'bold'){style = 'font-weight: bold;';}
+                    if (font == 'italic'){style = 'font-style: italic;';}
+                    if (font == 'underline'){style = 'text-decoration: underline;';}
                 }
 	        }
 	    }

From ecd703dfc9b270398b0991b1538e9d504b9a17c3 Mon Sep 17 00:00:00 2001
From: Antony Lesuisse <al@openerp.com>
Date: Fri, 6 Apr 2012 16:03:39 +0200
Subject: [PATCH 047/238] [FIX] mail new form api

bzr revid: al@openerp.com-20120406140339-43drxzaql75isk1p
---
 addons/mail/static/src/js/mail.js | 16 ++++++----------
 1 file changed, 6 insertions(+), 10 deletions(-)

diff --git a/addons/mail/static/src/js/mail.js b/addons/mail/static/src/js/mail.js
index fbe817c2c81..fc6cb833d4b 100644
--- a/addons/mail/static/src/js/mail.js
+++ b/addons/mail/static/src/js/mail.js
@@ -58,10 +58,8 @@ openerp.mail = function(session) {
     }
 
     /* Add ThreadDisplay widget to registry */
-    session.web.form.widgets.add(
-        'Thread', 'openerp.mail.Thread');
-    session.web.page.readonly.add(
-        'Thread', 'openerp.mail.Thread');
+    session.web.form.widgets.add( 'Thread', 'openerp.mail.Thread');
+//    session.web.page.readonly.add( 'Thread', 'openerp.mail.Thread');
 
     /** 
      * ThreadDisplay widget: this widget handles the display of a thread of
@@ -464,15 +462,13 @@ openerp.mail = function(session) {
 
 
     /* Add ThreadView widget to registry */
-    session.web.form.widgets.add(
-        'ThreadView', 'openerp.mail.RecordThread');
-    session.web.page.readonly.add(
-        'ThreadView', 'openerp.mail.RecordThread');
+    session.web.form.widgets.add( 'ThreadView', 'openerp.mail.RecordThread');
+//    session.web.page.readonly.add( 'ThreadView', 'openerp.mail.RecordThread');
 
     /* ThreadView widget: thread of comments */
-    mail.RecordThread = session.web.form.Field.extend({
+    mail.RecordThread = session.web.form.AbstractField.extend({
         // QWeb template to use when rendering the object
-        form_template: 'RecordThread',
+        template: 'RecordThread',
 
         init: function() {
             this._super.apply(this, arguments);

From 53cf28bee7a30c2b81346e0cb9d8756e1564d05c Mon Sep 17 00:00:00 2001
From: Antony Lesuisse <al@openerp.com>
Date: Mon, 9 Apr 2012 03:46:33 +0200
Subject: [PATCH 048/238] fix wiki

bzr revid: al@openerp.com-20120409014633-8ery0ndv4ix71nv7
---
 addons/wiki/static/src/js/wiki.js | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/addons/wiki/static/src/js/wiki.js b/addons/wiki/static/src/js/wiki.js
index 8d68fed22e6..31442afc3c3 100644
--- a/addons/wiki/static/src/js/wiki.js
+++ b/addons/wiki/static/src/js/wiki.js
@@ -1,8 +1,5 @@
 openerp.wiki = function (openerp) {
-    openerp.web.form.widgets.add(
-        'text_wiki', 'openerp.web.form.FieldText');
-    openerp.web.page.readonly.add(
-        'text_wiki', 'openerp.wiki.FieldWikiReadonly');
+    openerp.web.form.widgets.add( 'text_wiki', 'openerp.web.form.FieldText');
     openerp.wiki = {};
     openerp.wiki.FieldWikiReadonly = openerp.web.page.FieldCharReadonly.extend({
         set_value: function (value) {

From eb550cf9a146d17ad17069fdaaac874220513d59 Mon Sep 17 00:00:00 2001
From: Antony Lesuisse <al@openerp.com>
Date: Mon, 9 Apr 2012 04:04:45 +0200
Subject: [PATCH 049/238] fix2 wiki

bzr revid: al@openerp.com-20120409020445-om7ytt0239s1cwja
---
 addons/wiki/static/src/js/wiki.js | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/addons/wiki/static/src/js/wiki.js b/addons/wiki/static/src/js/wiki.js
index 31442afc3c3..88bfec6602e 100644
--- a/addons/wiki/static/src/js/wiki.js
+++ b/addons/wiki/static/src/js/wiki.js
@@ -1,5 +1,6 @@
 openerp.wiki = function (openerp) {
     openerp.web.form.widgets.add( 'text_wiki', 'openerp.web.form.FieldText');
+/*
     openerp.wiki = {};
     openerp.wiki.FieldWikiReadonly = openerp.web.page.FieldCharReadonly.extend({
         set_value: function (value) {
@@ -8,4 +9,5 @@ openerp.wiki = function (openerp) {
             return show_value;
         }
     });
+*/
 };

From f7fecf3f367574c1d187fa46f9d5bede93b67007 Mon Sep 17 00:00:00 2001
From: Antony Lesuisse <al@openerp.com>
Date: Mon, 9 Apr 2012 17:22:51 +0200
Subject: [PATCH 050/238] sale hide partner_order_id field

bzr revid: al@openerp.com-20120409152251-didpbt5tklnjahef
---
 addons/sale/sale_view.xml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/addons/sale/sale_view.xml b/addons/sale/sale_view.xml
index fd4ee1a02e2..4eae3c5717b 100644
--- a/addons/sale/sale_view.xml
+++ b/addons/sale/sale_view.xml
@@ -222,7 +222,9 @@
                         </page>
                         <page string="Other Information">
                             <group col="4">
+                                <!--
                                 <field domain="[('partner_id','=',partner_id)]" name="partner_order_id" on_change="onchange_partner_order_id(partner_order_id, partner_invoice_id, partner_shipping_id)" options='{"quick_create": false}'/>
+                                -->
                                 <field domain="[('partner_id','=',partner_id)]" name="partner_invoice_id" groups="base.group_extended" options='{"quick_create": false}'/>
                                 <field name="project_id" context="{'partner_id':partner_id, 'contact_id':partner_order_id, 'pricelist_id':pricelist_id, 'default_name':name}" groups="analytic.group_analytic_accounting" domain="[('parent_id','!=',False)]"/>
                                 <newline/>

From 1f4617207dee734fa46513d6ab5f5d792d401dfd Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Mon, 9 Apr 2012 20:42:48 +0200
Subject: [PATCH 051/238] [FIX] bug on sale order inheritancy/delivery

bzr revid: fp@tinyerp.com-20120409184248-v4o347u67yjg23kt
---
 addons/delivery/delivery_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/delivery/delivery_view.xml b/addons/delivery/delivery_view.xml
index 6cf2d19e076..b03d9cd4d79 100644
--- a/addons/delivery/delivery_view.xml
+++ b/addons/delivery/delivery_view.xml
@@ -304,7 +304,7 @@
             <field name="model">sale.order</field>
             <field name="inherit_id" ref="sale.view_order_form"/>
             <field name="arch" type="xml">
-                    <xpath expr="//form/notebook/page[@string='Sales Order']/group[1]/button[@name='button_dummy']" position="after">
+                    <xpath expr="//button[@name='button_dummy']" position="after">
                          <button name="%(action_delivery_cost)d" states="draft" string="Delivery Costs" type="action" icon="gtk-add" context="{'order_id':active_id}"/>
                     </xpath>
             </field>

From c7a822532806438a7417922f60308856685de444 Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Mon, 9 Apr 2012 20:58:19 +0200
Subject: [PATCH 052/238] [FIX] inheritancies sale order

bzr revid: fp@tinyerp.com-20120409185819-nlx7x1pt1e8evvjk
---
 addons/sale_layout/sale_layout_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/sale_layout/sale_layout_view.xml b/addons/sale_layout/sale_layout_view.xml
index 146ca8aa006..d43ecdaf4d6 100644
--- a/addons/sale_layout/sale_layout_view.xml
+++ b/addons/sale_layout/sale_layout_view.xml
@@ -12,7 +12,7 @@
             <field name="priority">1000</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <xpath expr="/form/notebook/page/field[@name='order_line']" position="replace">
+                <xpath expr="//field[@name='order_line']" position="replace">
                     <field name="abstract_line_ids" colspan="4" nolabel="1" widget="one2many_list">
                             <form string="Order Line">
                                 <notebook>

From edd07014cc73458e3d12329e04ce5833994ad65a Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Mon, 9 Apr 2012 21:40:43 +0200
Subject: [PATCH 053/238] [IMP] mail groups created by default

bzr revid: fp@tinyerp.com-20120409194043-g281n3s231vy86jm
---
 addons/mail/__openerp__.py                  |   1 +
 addons/mail/mail_data.xml                   |   2 +-
 addons/mail/mail_group_view.xml             |   2 +-
 addons/mail/mail_message_view.xml           |   2 +-
 addons/mail/mail_thread_view.xml            |   2 +-
 addons/mail/static/src/img/groupdefault.png | Bin 19910 -> 3092 bytes
 6 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/addons/mail/__openerp__.py b/addons/mail/__openerp__.py
index 88e932299e1..81719794f69 100644
--- a/addons/mail/__openerp__.py
+++ b/addons/mail/__openerp__.py
@@ -66,6 +66,7 @@ The main features are:
         'security/mail_security.xml',
         'security/ir.model.access.csv',
         'mail_data.xml',
+        'mail_group_data.xml',
         'res_users_view.xml',
     ],
     'installable': True,
diff --git a/addons/mail/mail_data.xml b/addons/mail/mail_data.xml
index 964552b951a..c8e8b1a488e 100644
--- a/addons/mail/mail_data.xml
+++ b/addons/mail/mail_data.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data noupdate="1">
-            <record forcecreate="True" id="ir_cron_mail_scheduler_action" model="ir.cron">
+        <record forcecreate="True" id="ir_cron_mail_scheduler_action" model="ir.cron">
             <field name="name">Email Queue Manager</field>
             <field name="user_id" ref="base.user_root"/>
             <field name="interval_number">1</field>
diff --git a/addons/mail/mail_group_view.xml b/addons/mail/mail_group_view.xml
index 949dd1cc9b8..ea0dede377d 100644
--- a/addons/mail/mail_group_view.xml
+++ b/addons/mail/mail_group_view.xml
@@ -112,6 +112,6 @@
         </record>
 
         <!-- left-side menu: Groups !-->
-        <menuitem id="mail_allgroups" name="All groups" parent="mail_feeds" sequence="12" action="action_view_groups"/>
+        <menuitem id="mail_allgroups" name="All Groups" parent="mail_feeds" sequence="12" action="action_view_groups"/>
     </data>
 </openerp>
diff --git a/addons/mail/mail_message_view.xml b/addons/mail/mail_message_view.xml
index 7389f8e5488..ecd106e05e5 100644
--- a/addons/mail/mail_message_view.xml
+++ b/addons/mail/mail_message_view.xml
@@ -234,7 +234,7 @@
         <menuitem name="Feeds" id="menu_email_message_all" parent="base.menu_email" action="action_view_all_messages_short" groups="base.group_no_one"/>
 
         <record id="action_mail_all_feeds" model="ir.actions.client">
-            <field name="name">All Feeds</field>
+            <field name="name">Wall</field>
             <field name="tag">mail.all_feeds</field>
             <field name="params" eval="{'search_view_id': ref('view_message_search_wall')}"/>
         </record>
diff --git a/addons/mail/mail_thread_view.xml b/addons/mail/mail_thread_view.xml
index faa6d24ae2c..af0c6cedda1 100644
--- a/addons/mail/mail_thread_view.xml
+++ b/addons/mail/mail_thread_view.xml
@@ -14,7 +14,7 @@
         <!-- left-side menu: Feeds !-->
         <menuitem id="mail_feeds" name="Feeds" parent="mail_feeds_main"/>
         <record id="mail_wallfeeds" model="ir.ui.menu">
-          <field name="name">All Feeds</field>
+          <field name="name">Wall</field>
           <field name="sequence" eval="10"/>
           <field name="action" ref="action_mail_all_feeds"/>
           <field name="parent_id" ref="mail_feeds"/>
diff --git a/addons/mail/static/src/img/groupdefault.png b/addons/mail/static/src/img/groupdefault.png
index fd8268372668a04b43448d520ae7cf670d4cd0c7..cf160022470e0f0d1c8928b9364bf99349bbee45 100644
GIT binary patch
literal 3092
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

literal 19910
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
I7s$*12lZE7KmY&$


From 614923ac5d604642c08bfeed61c6cc229ac2dc9c Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Mon, 9 Apr 2012 21:55:08 +0200
Subject: [PATCH 054/238] [IMP] adding missing file

bzr revid: fp@tinyerp.com-20120409195508-vn4g22yw93ygzj9g
---
 addons/mail/mail_group_data.xml | 13 +++++++++++++
 1 file changed, 13 insertions(+)
 create mode 100644 addons/mail/mail_group_data.xml

diff --git a/addons/mail/mail_group_data.xml b/addons/mail/mail_group_data.xml
new file mode 100644
index 00000000000..bbaa7748f16
--- /dev/null
+++ b/addons/mail/mail_group_data.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+
+        <record model="mail.group" id="group_all_company">
+            <field name="name">All Company</field>
+        </record>
+        <record model="mail.group" id="group_sales">
+            <field name="name">Sales</field>
+        </record>
+
+    </data>
+</openerp>

From 542a2bb0da65092f45ba8267ff6a417c772fbd1a Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Mon, 9 Apr 2012 22:00:15 +0200
Subject: [PATCH 055/238] [FIX] Sequence in menu

bzr revid: fp@tinyerp.com-20120409200015-bzjbaxotb32smsp3
---
 addons/sale/sale_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/sale/sale_view.xml b/addons/sale/sale_view.xml
index 4eae3c5717b..571db347e7e 100644
--- a/addons/sale/sale_view.xml
+++ b/addons/sale/sale_view.xml
@@ -2,7 +2,7 @@
     <data>
         <menuitem icon="terp-partner"
             id="base.menu_base_partner" name="Sales"
-            sequence="0" groups="base.group_sale_salesman,base.group_sale_manager"/>
+            sequence="1" groups="base.group_sale_salesman,base.group_sale_manager"/>
 
         <menuitem id="base.menu_product" name="Products" parent="base.menu_base_partner" sequence="9"/>
 

From 214ec28024f2ca558f87dc61e44a7a840ee5b9d2 Mon Sep 17 00:00:00 2001
From: Fabien Meghazi <fme@openerp.com>
Date: Mon, 9 Apr 2012 23:30:37 +0200
Subject: [PATCH 056/238] [IMP] Use manual layout for sale order form view

bzr revid: fme@openerp.com-20120409213037-0fehbp1572e0qrkk
---
 addons/sale/sale_view.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/sale/sale_view.xml b/addons/sale/sale_view.xml
index 571db347e7e..4eb2cdd9960 100644
--- a/addons/sale/sale_view.xml
+++ b/addons/sale/sale_view.xml
@@ -96,7 +96,7 @@
             <field name="model">sale.order</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <html>
+                <html layout="manual">
                 <div class="oe_form_topbar">
                     <button name="invoice_recreate" states="invoice_except" string="Recreate Invoice" icon="gtk-go-forward"/>
                     <button name="invoice_corrected" states="invoice_except" string="Ignore Exception" icon="gtk-apply"/>
@@ -115,7 +115,7 @@
                         <field name="state" nolabel="1" widget="statusbar" statusbar_visible="draft,progress,done" statusbar_colors='{"shipping_except":"red","invoice_except":"red","waiting_date":"blue"}'/>
                     </div>
                 </div>
-                <form string="Sales Order">
+                <form string="Sales Order" class="oe_form_autolayout">
                     <group col="2" class="oe_form_header">
                         <group col="2">
                             <field name="partner_id" options='{"quick_create": false}' on_change="onchange_partner_id(partner_id)" domain="[('customer','=',True)]" context="{'search_default_customer':1}" required="1"/>

From 459f9824b274f4a43884b98a5bae0ba6c0d4150c Mon Sep 17 00:00:00 2001
From: Fabien Meghazi <fme@openerp.com>
Date: Mon, 9 Apr 2012 23:58:49 +0200
Subject: [PATCH 057/238] [IMP] Sale Order form view: move social widget
 outside of the form

bzr revid: fme@openerp.com-20120409215849-wknbjoazecclhy9b
---
 addons/sale/sale_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/sale/sale_view.xml b/addons/sale/sale_view.xml
index 4eb2cdd9960..631d5416dc6 100644
--- a/addons/sale/sale_view.xml
+++ b/addons/sale/sale_view.xml
@@ -279,8 +279,8 @@
                             <field colspan="4" name="picking_ids" nolabel="1"/>
                         </page>
                     </notebook>
-                <field name="message_ids_social" colspan="4" widget="ThreadView" nolabel="1"/>
                 </form>
+                <field name="message_ids_social" colspan="4" widget="ThreadView" nolabel="1"/>
                 </html>
             </field>
         </record>

From 4a9d892e43ecff107bd03cab45f6b29c025db8f2 Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Tue, 10 Apr 2012 09:42:18 +0200
Subject: [PATCH 058/238] [FIX] limit on name_search on partners

bzr revid: fp@tinyerp.com-20120410074218-pj4iyn0zjxgo0gbr
---
 openerp/addons/base/res/res_partner.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/openerp/addons/base/res/res_partner.py b/openerp/addons/base/res/res_partner.py
index 6f04c3483cd..699fb778fcb 100644
--- a/openerp/addons/base/res/res_partner.py
+++ b/openerp/addons/base/res/res_partner.py
@@ -310,12 +310,14 @@ class res_partner(osv.osv):
             cr.execute('''SELECT partner.id FROM res_partner partner
                           LEFT JOIN res_partner company ON partner.parent_id = company.id
                           WHERE partner.name || ' (' || COALESCE(company.name,'') || ')'
-                          ''' + operator + ''' %s ''', (name2,))
+                          ''' + operator + ''' %s limit '''+str(limit), (name2,))
             ids = map(lambda x: x[0], cr.fetchall())
             if args:
                 ids = self.search(cr, uid, [('id', 'in', ids)] + args, limit=limit, context=context)
             if ids:
+                print 'ICI', ids
                 return self.name_get(cr, uid, ids, context)
+        print 'LA'
         return super(res_partner,self).name_search(cr, uid, name, args, operator=operator, context=context, limit=limit)
 
     def _email_send(self, cr, uid, ids, email_from, subject, body, on_error=None):

From cecdf06c341e30daf286ada5b01a9c804cf3ac93 Mon Sep 17 00:00:00 2001
From: Antony Lesuisse <al@openerp.com>
Date: Tue, 10 Apr 2012 10:03:23 +0200
Subject: [PATCH 059/238] sale wizard

bzr revid: al@openerp.com-20120410080323-r6toc2banwbwl3na
---
 addons/base_setup/base_setup_views.xml | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/addons/base_setup/base_setup_views.xml b/addons/base_setup/base_setup_views.xml
index 453d4b167c0..52591d9b853 100644
--- a/addons/base_setup/base_setup_views.xml
+++ b/addons/base_setup/base_setup_views.xml
@@ -132,7 +132,12 @@
         <field name="model">sale.config.settings</field>
         <field name="type">form</field>
         <field name="arch" type="xml">
-            <form string="Configure Sales">
+            <html>
+            <div class="oe_form_topbar">
+                <button string="Cancel" icon="gtk-cancel" special="cancel"/>
+                <button string="Apply" icon="gtk-apply" type="object" name="execute"/>
+            </div>
+            <form string="Configure Sales"> 
                 <group name="config_sale" colspan="4"/>
 
                 <!-- this part is necessary to allow the plugins to extend the view -->
@@ -145,15 +150,11 @@
                 <field name="module_plugin_outlook" attrs="{'invisible': [('module_crm','=',False)]}"/>
 
                 <group name="config_crm" colspan="4"/>
-
-                <newline/>
-                <label colspan="2"/>
-                <button string="Cancel" icon="gtk-cancel" special="cancel"/>
-                <button string="Apply" icon="gtk-apply" type="object" name="execute"/>
             </form>
+            </html>
         </field>
     </record>
-    
+
     <record id="base.action_sale_config" model="ir.actions.act_window">
         <field name="name">Configure Sales</field>
         <field name="type">ir.actions.act_window</field>

From 3d6ae8f74140c7f4a9618d725879c804bc9a9cca Mon Sep 17 00:00:00 2001
From: Antony Lesuisse <al@openerp.com>
Date: Tue, 10 Apr 2012 12:50:30 +0200
Subject: [PATCH 060/238] sale_order and sale wizard

bzr revid: al@openerp.com-20120410105030-4et6s3xhcz87xmpm
---
 addons/base_setup/base_setup_views.xml | 36 ++++++++++++++------------
 addons/sale/sale_view.xml              |  4 ++-
 2 files changed, 22 insertions(+), 18 deletions(-)

diff --git a/addons/base_setup/base_setup_views.xml b/addons/base_setup/base_setup_views.xml
index 52591d9b853..681ffcdc25f 100644
--- a/addons/base_setup/base_setup_views.xml
+++ b/addons/base_setup/base_setup_views.xml
@@ -132,26 +132,28 @@
         <field name="model">sale.config.settings</field>
         <field name="type">form</field>
         <field name="arch" type="xml">
-            <html>
-            <div class="oe_form_topbar">
-                <button string="Cancel" icon="gtk-cancel" special="cancel"/>
-                <button string="Apply" icon="gtk-apply" type="object" name="execute"/>
-            </div>
-            <form string="Configure Sales"> 
-                <group name="config_sale" colspan="4"/>
+            <form layout="manual">
+                <div class="oe_form_topbar">
+                    <button string="Cancel" icon="gtk-cancel" special="cancel"/>
+                    <button string="Apply" icon="gtk-apply" type="object" name="execute"/>
+                </div>
+                <shit string="Configure Sales" layout="auto">
+                    <group>
+                        <group name="config_sale" colspan="4"/>
 
-                <!-- this part is necessary to allow the plugins to extend the view -->
-                <field name="module_crm" invisible="1"/>
-                <group name="config_fetchmail" colspan="4" attrs="{'invisible': [('module_crm','=',False)]}">
-                    <separator string="Emails"/>
-                </group>
-                <field name="module_plugin_thunderbird" attrs="{'invisible': [('module_crm','=',False)]}"/>
-                <newline/>
-                <field name="module_plugin_outlook" attrs="{'invisible': [('module_crm','=',False)]}"/>
+                        <!-- this part is necessary to allow the plugins to extend the view -->
+                        <field name="module_crm" invisible="1"/>
+                        <group name="config_fetchmail" colspan="4" attrs="{'invisible': [('module_crm','=',False)]}">
+                            <separator string="Emails"/>
+                        </group>
+                        <field name="module_plugin_thunderbird" attrs="{'invisible': [('module_crm','=',False)]}"/>
+                        <newline/>
+                        <field name="module_plugin_outlook" attrs="{'invisible': [('module_crm','=',False)]}"/>
 
-                <group name="config_crm" colspan="4"/>
+                        <group name="config_crm" colspan="4"/>
+                    </shit>
+                </form>
             </form>
-            </html>
         </field>
     </record>
 
diff --git a/addons/sale/sale_view.xml b/addons/sale/sale_view.xml
index 631d5416dc6..792d960b7f2 100644
--- a/addons/sale/sale_view.xml
+++ b/addons/sale/sale_view.xml
@@ -280,7 +280,9 @@
                         </page>
                     </notebook>
                 </form>
-                <field name="message_ids_social" colspan="4" widget="ThreadView" nolabel="1"/>
+                <div class="oe_form_sheet_width">
+                    <field name="message_ids_social" colspan="4" widget="ThreadView" nolabel="1"/>
+                </div>
                 </html>
             </field>
         </record>

From dd2327e4cf72f5862410ebc21b9071c9c39f6995 Mon Sep 17 00:00:00 2001
From: Antony Lesuisse <al@openerp.com>
Date: Tue, 10 Apr 2012 13:11:37 +0200
Subject: [PATCH 061/238] sale html to form

bzr revid: al@openerp.com-20120410111137-p39v47ls47u7ocvg
---
 addons/sale/sale_view.xml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/addons/sale/sale_view.xml b/addons/sale/sale_view.xml
index 792d960b7f2..24a88eb6b41 100644
--- a/addons/sale/sale_view.xml
+++ b/addons/sale/sale_view.xml
@@ -96,7 +96,7 @@
             <field name="model">sale.order</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <html layout="manual">
+                <form layout="manual">
                 <div class="oe_form_topbar">
                     <button name="invoice_recreate" states="invoice_except" string="Recreate Invoice" icon="gtk-go-forward"/>
                     <button name="invoice_corrected" states="invoice_except" string="Ignore Exception" icon="gtk-apply"/>
@@ -115,7 +115,7 @@
                         <field name="state" nolabel="1" widget="statusbar" statusbar_visible="draft,progress,done" statusbar_colors='{"shipping_except":"red","invoice_except":"red","waiting_date":"blue"}'/>
                     </div>
                 </div>
-                <form string="Sales Order" class="oe_form_autolayout">
+                <sheet string="Sales Order" layout="auto">
                     <group col="2" class="oe_form_header">
                         <group col="2">
                             <field name="partner_id" options='{"quick_create": false}' on_change="onchange_partner_id(partner_id)" domain="[('customer','=',True)]" context="{'search_default_customer':1}" required="1"/>
@@ -279,11 +279,11 @@
                             <field colspan="4" name="picking_ids" nolabel="1"/>
                         </page>
                     </notebook>
-                </form>
+                </sheet>
                 <div class="oe_form_sheet_width">
                     <field name="message_ids_social" colspan="4" widget="ThreadView" nolabel="1"/>
                 </div>
-                </html>
+                </form>
             </field>
         </record>
 

From 529293bf6647b605fd2f5ac5306ac68e481b8cb6 Mon Sep 17 00:00:00 2001
From: Antony Lesuisse <al@openerp.com>
Date: Tue, 10 Apr 2012 13:22:44 +0200
Subject: [PATCH 062/238] crm.lead

bzr revid: al@openerp.com-20120410112244-2813dhnk1p1zf92t
---
 addons/crm/crm_lead_view.xml | 39 ++++++++++++++++--------------------
 1 file changed, 17 insertions(+), 22 deletions(-)

diff --git a/addons/crm/crm_lead_view.xml b/addons/crm/crm_lead_view.xml
index 52b7c88c2d4..70fabfc05b5 100644
--- a/addons/crm/crm_lead_view.xml
+++ b/addons/crm/crm_lead_view.xml
@@ -51,7 +51,19 @@
         <field name="model">crm.lead</field>
         <field name="type">form</field>
         <field name="arch" type="xml">
-            <form string="Leads Form">
+            <form string="Leads Form" layout="manual">
+                <div class="oe_form_topbar">
+                    <button name="case_cancel" string="Cancel" states="draft,open,pending" type="object" icon="gtk-cancel" />
+                    <button name="case_open" string="Open" states="draft,pending" type="object" icon="gtk-go-forward" />
+                    <button name="case_mark_lost" string="Close" states="open,pending" type="object" icon="gtk-close" />
+                    <button name="case_pending" string="Pending" states="open" type="object" icon="gtk-media-pause" />
+                    <button name="case_escalate" string="Escalate" states="open,pending" type="object" groups="base.group_extended" icon="gtk-go-up" />
+                    <button name="case_reset" string="Reset to Draft" states="done,cancel" type="object" icon="gtk-convert" />
+                    <div class="oe_right">
+                        <field name="state" nolabel="1" widget="statusbar" statusbar_visible="draft,open,done" statusbar_colors='{"pending":"blue"}'/>
+                    </div>
+                </div>
+                <sheet layout="auto">
                 <group colspan="4" col="7">
                     <field name="name" required="1" string="Subject"/>
                     <field name="priority"/>
@@ -121,26 +133,6 @@
                     <field name="description" nolabel="1" colspan="4"/>
                     <separator colspan="4"/>
                     <group col="8" colspan="4">
-                        <field name="state" widget="statusbar" statusbar_visible="draft,open,done" statusbar_colors='{"pending":"blue"}'/>
-                        <button name="case_cancel" string="Cancel"
-                            states="draft,open,pending" type="object"
-                            icon="gtk-cancel" />
-                        <button name="case_open" string="Open"
-                            states="draft,pending" type="object"
-                            icon="gtk-go-forward" />
-                        <button name="case_mark_lost" string="Close"
-                            states="open,pending" type="object"
-                            icon="gtk-close" />
-                        <button name="case_pending" string="Pending"
-                            states="open" type="object"
-                            icon="gtk-media-pause" />
-                        <button name="case_escalate" string="Escalate"
-                            states="open,pending" type="object"
-                            groups="base.group_extended"
-                            icon="gtk-go-up" />
-                        <button name="case_reset"
-                            string="Reset to Draft" states="done,cancel"
-                            type="object" icon="gtk-convert" />
                     </group>
                  </page>
                  <page string="Extra Info" groups="base.group_extended">
@@ -165,7 +157,10 @@
                     </group>
                  </page>
                 </notebook>
-                <field name="message_ids_social" colspan="4" widget="ThreadView" nolabel="1"/>
+                </sheet>
+                <div class="oe_form_sheet_width">
+                    <field name="message_ids_social" colspan="4" widget="ThreadView" nolabel="1"/>
+                </div>
             </form>
         </field>
     </record>

From 8c1b7d67ce0cb7936cebda80b9a79473656f0a59 Mon Sep 17 00:00:00 2001
From: "Quentin (OpenERP)" <qdp-launchpad@openerp.com>
Date: Tue, 10 Apr 2012 13:25:34 +0200
Subject: [PATCH 063/238] [FIX] base_setup: resolved tag mismatch

bzr revid: qdp-launchpad@openerp.com-20120410112534-rba9o2x8qm1jmuwz
---
 addons/base_setup/base_setup_views.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/base_setup/base_setup_views.xml b/addons/base_setup/base_setup_views.xml
index 681ffcdc25f..03ce542ae3e 100644
--- a/addons/base_setup/base_setup_views.xml
+++ b/addons/base_setup/base_setup_views.xml
@@ -151,8 +151,8 @@
                         <field name="module_plugin_outlook" attrs="{'invisible': [('module_crm','=',False)]}"/>
 
                         <group name="config_crm" colspan="4"/>
-                    </shit>
-                </form>
+                    </group>
+                </shit>
             </form>
         </field>
     </record>

From 0b6785921a7d8f058068e9216320e0ab931b9693 Mon Sep 17 00:00:00 2001
From: "Quentin (OpenERP)" <qdp-launchpad@openerp.com>
Date: Tue, 10 Apr 2012 13:26:07 +0200
Subject: [PATCH 064/238] [IMP] sale: applied changes in sale order form view
 as per last trunk

bzr revid: qdp-launchpad@openerp.com-20120410112607-9wiyiocc8sy3pcbt
---
 addons/sale/sale_view.xml | 49 +++++++--------------------------------
 1 file changed, 9 insertions(+), 40 deletions(-)

diff --git a/addons/sale/sale_view.xml b/addons/sale/sale_view.xml
index 24a88eb6b41..8d1fedd8574 100644
--- a/addons/sale/sale_view.xml
+++ b/addons/sale/sale_view.xml
@@ -116,19 +116,18 @@
                     </div>
                 </div>
                 <sheet string="Sales Order" layout="auto">
-                    <group col="2" class="oe_form_header">
-                        <group col="2">
-                            <field name="partner_id" options='{"quick_create": false}' on_change="onchange_partner_id(partner_id)" domain="[('customer','=',True)]" context="{'search_default_customer':1}" required="1"/>
-                            <field name="partner_shipping_id" domain="[('partner_id','=',partner_id)]" groups="base.group_extended" options='{"quick_create": false}'/>
-                        </group>
-                        <group col="2">
+                    <group col="6" colspan="4" class="oe_form_header">
+                        <group col="4" colspan="4">
                             <field name="name"/>
                             <field name="date_order"/>
-                            <field name="payment_term" widget="selection"/>
-                            <field name="pricelist_id" domain="[('type','=','sale')]" groups="base.group_extended" on_change="onchange_pricelist_id(pricelist_id,order_line)"/>
+                            <field name="shop_id" on_change="onchange_shop_id(shop_id)" widget="selection" groups="base.group_extended"/>
+                            <field name="client_order_ref"/>
+                        </group>
+                        <group col="2" colspan="2">
+                            <field name="invoiced"/>
+                            <field name="shipped"/>
                         </group>
                     </group>
-
                     <notebook colspan="5">
                         <page string="Sales Order">
                             <field name="partner_id" on_change="onchange_partner_id(partner_id)" domain="[('customer','=',True)]" context="{'search_default_customer':1}" required="1"/>
@@ -221,29 +220,6 @@
                             <field colspan="4" name="note" nolabel="1"/>
                         </page>
                         <page string="Other Information">
-                            <group col="4">
-                                <!--
-                                <field domain="[('partner_id','=',partner_id)]" name="partner_order_id" on_change="onchange_partner_order_id(partner_order_id, partner_invoice_id, partner_shipping_id)" options='{"quick_create": false}'/>
-                                -->
-                                <field domain="[('partner_id','=',partner_id)]" name="partner_invoice_id" groups="base.group_extended" options='{"quick_create": false}'/>
-                                <field name="project_id" context="{'partner_id':partner_id, 'contact_id':partner_order_id, 'pricelist_id':pricelist_id, 'default_name':name}" groups="analytic.group_analytic_accounting" domain="[('parent_id','!=',False)]"/>
-                                <newline/>
-                                <newline/>
-                                <group col="13" colspan="10">
-                                    <button name="button_dummy" states="draft" string="Compute" type="object" icon="gtk-execute"/>
-                                    <button name="%(action_view_sale_advance_payment_inv)d" string="Advance Invoice" type="action" icon="gtk-execute" states="draft,manual" groups="base.group_extended"/>
-                                </group>
-                            </group>
-                            <group col="6" colspan="4">
-                                <group col="4" colspan="4">
-                                    <field name="shop_id" on_change="onchange_shop_id(shop_id)" widget="selection" groups="base.group_extended"/>
-                                    <field name="client_order_ref"/>
-                                </group>
-                                <group col="2" colspan="2">
-                                    <field name="invoiced"/>
-                                    <field name="shipped"/>
-                                </group>
-                            </group>
                             <group colspan="2" col="2" groups="base.group_extended" name="logistics">
                                 <separator string="Logistic" colspan="2"/>
                                 <field name="incoterm" widget="selection"/>
@@ -258,19 +234,12 @@
                             </group>
                             <group name="sale_pay" colspan="2" col="2" groups="base.group_extended" >
                                 <separator string="Conditions" colspan="2"/>
+                                <field name="payment_term" widget="selection"/>
                                 <field name="fiscal_position" widget="selection"/>
                                 <field name="company_id" widget="selection" groups="base.group_multi_company"/>
                             </group>
-
-                            <group colspan="2" col="2" groups="base.group_no_one">
-                                <separator string="Dates" colspan="2"/>
-                                <field name="create_date"/>
-                                <field name="date_confirm"/>
-                            </group>
-
                             <separator colspan="4" string="Notes" groups="base.group_sale_notes_subtotal"/>
                             <field colspan="4" name="note" nolabel="1" groups="base.group_sale_notes_subtotal"/>
-
                         </page>
                         <page string="History" groups="base.group_extended">
                             <separator colspan="4" string="Invoices"/>

From b3d540a4cc5692819df576a3963aef6cf749c429 Mon Sep 17 00:00:00 2001
From: Christophe Simonis <chs@openerp.com>
Date: Tue, 10 Apr 2012 13:32:32 +0200
Subject: [PATCH 065/238] [FIX] remove Antony's shit

bzr revid: chs@openerp.com-20120410113232-0lcjmr37takli8u1
---
 addons/base_setup/base_setup_views.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/base_setup/base_setup_views.xml b/addons/base_setup/base_setup_views.xml
index 03ce542ae3e..07258111db1 100644
--- a/addons/base_setup/base_setup_views.xml
+++ b/addons/base_setup/base_setup_views.xml
@@ -137,7 +137,7 @@
                     <button string="Cancel" icon="gtk-cancel" special="cancel"/>
                     <button string="Apply" icon="gtk-apply" type="object" name="execute"/>
                 </div>
-                <shit string="Configure Sales" layout="auto">
+                <sheet string="Configure Sales" layout="auto">
                     <group>
                         <group name="config_sale" colspan="4"/>
 
@@ -152,7 +152,7 @@
 
                         <group name="config_crm" colspan="4"/>
                     </group>
-                </shit>
+                </sheet>
             </form>
         </field>
     </record>

From e71eaebd7492b547156b941356c2c654d13001fe Mon Sep 17 00:00:00 2001
From: Christophe Simonis <chs@openerp.com>
Date: Tue, 10 Apr 2012 13:45:13 +0200
Subject: [PATCH 066/238] [FIX] project: correct dependencies

bzr revid: chs@openerp.com-20120410114513-zfz0jdu7d3sg5fqb
---
 addons/project/__openerp__.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/project/__openerp__.py b/addons/project/__openerp__.py
index 35b920828b2..9a1c0803b2e 100644
--- a/addons/project/__openerp__.py
+++ b/addons/project/__openerp__.py
@@ -29,7 +29,7 @@
     "sequence": 8,
     'complexity': "easy",
     "images": ["images/gantt.png", "images/project_dashboard.jpeg","images/project_task_tree.jpeg","images/project_task.jpeg","images/project.jpeg","images/task_analysis.jpeg"],
-    "depends": ["base_setup", "product", "analytic", "board",  "mail", "resource"],
+    "depends": ["base_setup", "product", "analytic", "board",  "mail", "resource", 'wiki'],
     "description": """
 Project management module tracks multi-level projects, tasks, work done on tasks, eso.
 ======================================================================================

From ad9ab9765e049b51151bd9317a5c261e2aefc728 Mon Sep 17 00:00:00 2001
From: Christophe Simonis <chs@openerp.com>
Date: Tue, 10 Apr 2012 14:09:38 +0200
Subject: [PATCH 067/238] [FIX] project: remove dependence to wiki module

bzr revid: chs@openerp.com-20120410120938-hw1vykzs9iq02k20
---
 addons/project/__openerp__.py   | 2 +-
 addons/project/project_view.xml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/project/__openerp__.py b/addons/project/__openerp__.py
index 9a1c0803b2e..35b920828b2 100644
--- a/addons/project/__openerp__.py
+++ b/addons/project/__openerp__.py
@@ -29,7 +29,7 @@
     "sequence": 8,
     'complexity': "easy",
     "images": ["images/gantt.png", "images/project_dashboard.jpeg","images/project_task_tree.jpeg","images/project_task.jpeg","images/project.jpeg","images/task_analysis.jpeg"],
-    "depends": ["base_setup", "product", "analytic", "board",  "mail", "resource", 'wiki'],
+    "depends": ["base_setup", "product", "analytic", "board",  "mail", "resource"],
     "description": """
 Project management module tracks multi-level projects, tasks, work done on tasks, eso.
 ======================================================================================
diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml
index 7010031001c..c321c3919a7 100644
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -247,7 +247,7 @@
                                 <button name="%(action_project_task_reevaluate)d" string="Reevaluate" type="action" colspan="1" target="new" states="open,pending" icon="gtk-edit"/>
                             </group>
 
-                            <field colspan="4" name="description" nolabel="1"  attrs="{'readonly':[('state','=','done')]}" widget="text_wiki"/>
+                            <field colspan="4" name="description" nolabel="1"  attrs="{'readonly':[('state','=','done')]}"/>
                             <field colspan="4" name="work_ids" nolabel="1" attrs="{'readonly':[('state','in',['done','draft'])]}">
                                 <tree string="Task Work" editable="top">
                                     <field name="name" />

From 19531ef7078554bc546f7629141e8da4a7a5b3d3 Mon Sep 17 00:00:00 2001
From: Raphael Collet <rco@openerp.com>
Date: Tue, 10 Apr 2012 15:02:00 +0200
Subject: [PATCH 068/238] [IMP] app config wizards: improve form views

bzr revid: rco@openerp.com-20120410130200-hzrugwth8ty37nsr
---
 addons/account/res_config_view.xml     | 162 +++++++++++++------------
 addons/base_setup/base_setup_views.xml |   8 +-
 addons/hr/res_config_view.xml          |  84 ++++++-------
 addons/mrp/res_config_view.xml         |  33 ++---
 addons/project/res_config_view.xml     |  33 ++---
 addons/purchase/res_config_view.xml    |  35 +++---
 addons/stock/res_config_view.xml       |  49 ++++----
 7 files changed, 206 insertions(+), 198 deletions(-)

diff --git a/addons/account/res_config_view.xml b/addons/account/res_config_view.xml
index 742b842684a..86343512295 100644
--- a/addons/account/res_config_view.xml
+++ b/addons/account/res_config_view.xml
@@ -15,92 +15,94 @@
             <field name="model">account.config.settings</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Configure Accounting">
-                    <field name="has_default_company" invisible="1" />
-                    <field name="company_id" widget="selection" on_change="onchange_company_id(company_id)"
-                        attrs="{'invisible': [('has_default_company', '=', True)]}"/>
-                    <field name="expects_chart_of_accounts"/>
+                <form string="Configure Accounting" layout="manual">
+                    <div class="oe_form_topbar">
+                        <button string="Apply" type="object" name="execute"/>
+                        <button string="Cancel" special="cancel"/>
+                    </div>
+                    <sheet layout="auto">
+                        <field name="has_default_company" invisible="1" />
+                        <field name="company_id" widget="selection" on_change="onchange_company_id(company_id)"
+                            attrs="{'invisible': [('has_default_company', '=', True)]}"/>
+                        <field name="expects_chart_of_accounts"/>
 
-                    <field name="has_chart_of_accounts" invisible="1"/>
-                    <group string="No Chart of Accounts exists for this Company" colspan="4" attrs="{'invisible': ['|', ('expects_chart_of_accounts','=',False), ('has_chart_of_accounts','=',True)]}">
-                        <label string="Please select a chart template to install a chart of accounts." colspan="4"/>
-                        <field name="chart_template_id" widget="selection" on_change="onchange_chart_template_id(chart_template_id)" domain="[('visible','=', True)]"/>
-                        <button string="Install More Chart Templates" icon="gtk-go-forward"
-                            name="%(open_account_charts_modules)d" type="action"/>
-                        <field name ="code_digits" groups="account.group_account_user"/>
-                        <field name ="seq_journal" groups="base.group_extended"/>
-                        <newline/>
-                        <field name ="complete_tax_set" invisible="1"/>
-                        <field name="sale_tax" attrs="{'invisible': ['|', ('chart_template_id','=',False), ('complete_tax_set','=',False)]}"
-                            domain="[('chart_template_id', '=', chart_template_id),('parent_id','=',False),('type_tax_use','in',('sale','all'))]"/>
-                        <field name="purchase_tax" attrs="{'invisible': ['|', ('chart_template_id','=',False), ('complete_tax_set','=',False)]}"
-                            domain="[('chart_template_id', '=', chart_template_id),('parent_id','=',False),('type_tax_use','in',('purchase', 'all'))]"/>
-                        <field name ="sale_tax_rate" attrs="{'invisible': ['|', ('chart_template_id','=',False), ('complete_tax_set','=',True)]}" on_change="onchange_tax_rate(sale_tax_rate)"/>
-                        <field name ="purchase_tax_rate" attrs="{'invisible': ['|', ('chart_template_id','=',False), ('complete_tax_set','=',True)]}"/>
-                    </group>
+                        <field name="has_chart_of_accounts" invisible="1"/>
+                        <group string="No Chart of Accounts exists for this Company" colspan="4" attrs="{'invisible': ['|', ('expects_chart_of_accounts','=',False), ('has_chart_of_accounts','=',True)]}">
+                            <label string="Please select a chart template to install a chart of accounts." colspan="4"/>
+                            <field name="chart_template_id" widget="selection" on_change="onchange_chart_template_id(chart_template_id)" domain="[('visible','=', True)]"/>
+                            <button string="Install More Chart Templates" icon="gtk-go-forward"
+                                name="%(open_account_charts_modules)d" type="action"/>
+                            <field name ="code_digits" groups="account.group_account_user"/>
+                            <field name ="seq_journal" groups="base.group_extended"/>
+                            <newline/>
+                            <field name ="complete_tax_set" invisible="1"/>
+                            <field name="sale_tax" attrs="{'invisible': ['|', ('chart_template_id','=',False), ('complete_tax_set','=',False)]}"
+                                domain="[('chart_template_id', '=', chart_template_id),('parent_id','=',False),('type_tax_use','in',('sale','all'))]"/>
+                            <field name="purchase_tax" attrs="{'invisible': ['|', ('chart_template_id','=',False), ('complete_tax_set','=',False)]}"
+                                domain="[('chart_template_id', '=', chart_template_id),('parent_id','=',False),('type_tax_use','in',('purchase', 'all'))]"/>
+                            <field name ="sale_tax_rate" attrs="{'invisible': ['|', ('chart_template_id','=',False), ('complete_tax_set','=',True)]}" on_change="onchange_tax_rate(sale_tax_rate)"/>
+                            <field name ="purchase_tax_rate" attrs="{'invisible': ['|', ('chart_template_id','=',False), ('complete_tax_set','=',True)]}"/>
+                        </group>
 
-                    <field name="has_fiscal_year" invisible="1"/>
-                    <group string="No Fiscal Year exists for this Company" colspan="4" attrs="{'invisible': ['|', ('expects_chart_of_accounts','=',False), ('has_fiscal_year','=',True)]}">
-                        <field name="date_start" on_change="onchange_start_date(date_start)"/>
-                        <field name="date_stop"/>
-                        <field name="period" colspan="4"/>
-                    </group>
+                        <field name="has_fiscal_year" invisible="1"/>
+                        <group string="No Fiscal Year exists for this Company" colspan="4" attrs="{'invisible': ['|', ('expects_chart_of_accounts','=',False), ('has_fiscal_year','=',True)]}">
+                            <field name="date_start" on_change="onchange_start_date(date_start)"/>
+                            <field name="date_stop"/>
+                            <field name="period" colspan="4"/>
+                        </group>
 
-                    <group colspan="4">
-                        <separator string="Accounting Configuration" colspan="4"/>
-                        <field name ="complete_tax_set" invisible="1"/>
-                        <newline/>
-                        <group colspan="2" col="2">
-                            <field name="default_sale_tax" domain="[('type_tax_use','=','sale'), ('company_id','=',company_id)]"/>
-                            <field name="module_account_accountant"/>
-                            <field name="module_account_asset"/>
+                        <group colspan="4">
+                            <separator string="Accounting Configuration" colspan="4"/>
+                            <field name ="complete_tax_set" invisible="1"/>
+                            <newline/>
+                            <group colspan="2" col="2">
+                                <field name="default_sale_tax" domain="[('type_tax_use','=','sale'), ('company_id','=',company_id)]"/>
+                                <field name="module_account_accountant"/>
+                                <field name="module_account_asset"/>
+                            </group>
+                            <group colspan="2" col="2">
+                                <field name="default_purchase_tax" domain="[('type_tax_use','=','purchase'), ('company_id','=',company_id)]"/>
+                                <field name="currency_id" widget="selection"/>
+                                <field name="module_account_budget"/>
+                            </group>
                         </group>
                         <group colspan="2" col="2">
-                            <field name="default_purchase_tax" domain="[('type_tax_use','=','purchase'), ('company_id','=',company_id)]"/>
-                            <field name="currency_id" widget="selection"/>
-                            <field name="module_account_budget"/>
+                            <separator string="Customer Invoices" colspan="2"/>
+                            <field name="sale_journal_id" invisible="1"/>
+                            <field name="sale_sequence_next" attrs="{'readonly': [('sale_journal_id','=',False)]}"/>
+                            <field name="sale_refund_journal_id" invisible="1"/>
+                            <field name="sale_refund_sequence_next" attrs="{'readonly': [('sale_refund_journal_id','=',False)]}"/>
+                            <field name="module_account_invoice_layout"/>
+                            <field name="module_account_voucher"/>
+                            <field name="module_account_followup"/>
+                            <field name="group_proforma_invoices"/>
                         </group>
-                    </group>
-                    <group colspan="2" col="2">
-                        <separator string="Customer Invoices" colspan="2"/>
-                        <field name="sale_journal_id" invisible="1"/>
-                        <field name="sale_sequence_next" attrs="{'readonly': [('sale_journal_id','=',False)]}"/>
-                        <field name="sale_refund_journal_id" invisible="1"/>
-                        <field name="sale_refund_sequence_next" attrs="{'readonly': [('sale_refund_journal_id','=',False)]}"/>
-                        <field name="module_account_invoice_layout"/>
-                        <field name="module_account_voucher"/>
-                        <field name="module_account_followup"/>
-                        <field name="group_proforma_invoices"/>
-                    </group>
-                    <group colspan="2" col="2">
-                        <separator string="Supplier Invoices" colspan="2"/>
-                        <field name="purchase_journal_id" invisible="1"/>
-                        <field name="purchase_sequence_next" attrs="{'readonly': [('purchase_journal_id','=',False)]}"/>
-                        <field name="purchase_refund_journal_id" invisible="1"/>
-                        <field name="purchase_refund_sequence_next" attrs="{'readonly': [('purchase_refund_journal_id','=',False)]}"/>
-                        <field name="module_account_payment"/>
-                    </group>
-                    <group colspan="2" col="2">
-                        <separator string="Electronic Payments" colspan="2"/>
-                        <field name="paypal_account"/>
-                    </group>
-                    <group colspan="2" col="2">
-                        <separator string="Bank &amp; Cash" colspan="2"/>
-                        <label string="Configure Bank Accounts :"/>
-                        <button name="%(action_bank_tree)d" string="Configure Bank Accounts" icon="gtk-go-forward" type="action"/>
-                        <field name="company_footer"/>
-                        <field name="module_account_check_writing"/>
-                    </group>
-                    <group colspan="2" col="2">
-                        <separator string="Analytic Accounting" colspan="2"/>
-                        <group name="analytic_accounting" colspan="2"/>
-                        <field name="module_account_analytic_plans"/>
-                        <field name="module_account_analytic_default"/>
-                    </group>
-                    <newline/>
-                    <label colspan="2"/>
-                    <button string="Cancel" icon="gtk-cancel" special="cancel"/>
-                    <button string="Apply" icon="gtk-apply" type="object" name="execute"/>
+                        <group colspan="2" col="2">
+                            <separator string="Supplier Invoices" colspan="2"/>
+                            <field name="purchase_journal_id" invisible="1"/>
+                            <field name="purchase_sequence_next" attrs="{'readonly': [('purchase_journal_id','=',False)]}"/>
+                            <field name="purchase_refund_journal_id" invisible="1"/>
+                            <field name="purchase_refund_sequence_next" attrs="{'readonly': [('purchase_refund_journal_id','=',False)]}"/>
+                            <field name="module_account_payment"/>
+                        </group>
+                        <group colspan="2" col="2">
+                            <separator string="Electronic Payments" colspan="2"/>
+                            <field name="paypal_account"/>
+                        </group>
+                        <group colspan="2" col="2">
+                            <separator string="Bank &amp; Cash" colspan="2"/>
+                            <label string="Configure Bank Accounts :"/>
+                            <button name="%(action_bank_tree)d" string="Configure Bank Accounts" icon="gtk-go-forward" type="action"/>
+                            <field name="company_footer"/>
+                            <field name="module_account_check_writing"/>
+                        </group>
+                        <group colspan="2" col="2">
+                            <separator string="Analytic Accounting" colspan="2"/>
+                            <group name="analytic_accounting" colspan="2"/>
+                            <field name="module_account_analytic_plans"/>
+                            <field name="module_account_analytic_default"/>
+                        </group>
+                    </sheet>
                 </form>
             </field>
         </record>
diff --git a/addons/base_setup/base_setup_views.xml b/addons/base_setup/base_setup_views.xml
index 07258111db1..40e88c604ef 100644
--- a/addons/base_setup/base_setup_views.xml
+++ b/addons/base_setup/base_setup_views.xml
@@ -132,12 +132,12 @@
         <field name="model">sale.config.settings</field>
         <field name="type">form</field>
         <field name="arch" type="xml">
-            <form layout="manual">
+            <form string="Configure Sales" layout="manual">
                 <div class="oe_form_topbar">
-                    <button string="Cancel" icon="gtk-cancel" special="cancel"/>
-                    <button string="Apply" icon="gtk-apply" type="object" name="execute"/>
+                    <button string="Apply" type="object" name="execute"/>
+                    <button string="Cancel" special="cancel"/>
                 </div>
-                <sheet string="Configure Sales" layout="auto">
+                <sheet layout="auto">
                     <group>
                         <group name="config_sale" colspan="4"/>
 
diff --git a/addons/hr/res_config_view.xml b/addons/hr/res_config_view.xml
index f195cb1894a..ad8d5572466 100644
--- a/addons/hr/res_config_view.xml
+++ b/addons/hr/res_config_view.xml
@@ -13,49 +13,51 @@
             <field name="model">hr.config.settings</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string ="HR Application">
-                    <separator string="Human Resources" colspan="4"/>
-                    <label string="Departments :"/>
-                    <label colspan="1"/>
-                    <group colspan="2">
-                        <button name="%(view_department_form_installer)d" string="Create Your Departments"
-                            type="action" icon="terp-personal+"/>
-                    </group>
-                    <newline/>
-                    <label string="Employees :" />
-                    <label colspan="1"/>
-                    <group colspan="2">
-                        <button name="%(open_view_employee_list_my)d" string="Create Your Employees"
-                            type="action" icon="terp-personal"/>
-                    </group>
-                    <newline/>
-                    <field name="module_hr_timesheet_sheet"/>
-                    <newline/>
-                    <field name="module_hr_holidays"/>
-                    <newline/>
-                    <label string="Salary Rules :"/>
-                    <label colspan="1"/>
-                    <group colspan="2">
-                        <button string="Configure Your Salary Rules" icon="gtk-go-forward"
-                            name="%(open_payroll1_modules)d" type="action" />
-                    </group>
+                <form string ="Configure Human Resources" layout="manual">
+                    <div class="oe_form_topbar">
+                        <button string="Apply" type="object" name="execute"/>
+                        <button string="Cancel" special="cancel"/>
+                    </div>
+                    <sheet layout="auto">
+                        <separator string="Human Resources" colspan="4"/>
+                        <label string="Departments :"/>
+                        <label colspan="1"/>
+                        <group colspan="2">
+                            <button name="%(view_department_form_installer)d" string="Create Your Departments"
+                                type="action" icon="terp-personal+"/>
+                        </group>
+                        <newline/>
+                        <label string="Employees :" />
+                        <label colspan="1"/>
+                        <group colspan="2">
+                            <button name="%(open_view_employee_list_my)d" string="Create Your Employees"
+                                type="action" icon="terp-personal"/>
+                        </group>
+                        <newline/>
+                        <field name="module_hr_timesheet_sheet"/>
+                        <newline/>
+                        <field name="module_hr_holidays"/>
+                        <newline/>
+                        <label string="Salary Rules :"/>
+                        <label colspan="1"/>
+                        <group colspan="2">
+                            <button string="Configure Your Salary Rules" icon="gtk-go-forward"
+                                name="%(open_payroll1_modules)d" type="action" />
+                        </group>
 
-                    <separator string="Additional Features" colspan="4"/>
-                    <field name="module_hr_expense"/>
-                    <newline/>
-                    <field name="module_hr_recruitment"/>
-                    <newline/>
-                    <field name="module_hr_evaluation"/>
-                    <newline/>
-                    <field name="module_hr_contract"/>
+                        <separator string="Additional Features" colspan="4"/>
+                        <field name="module_hr_expense"/>
+                        <newline/>
+                        <field name="module_hr_recruitment"/>
+                        <newline/>
+                        <field name="module_hr_evaluation"/>
+                        <newline/>
+                        <field name="module_hr_contract"/>
 
-                    <group name="config_timesheets" colspan="4"/>
-                    <group name="config_payroll" colspan="4"/>
-                    <group name="config_recruitment" colspan="4"/>
-
-                    <label colspan="2"/>
-                    <button string="Cancel" icon="gtk-cancel" special="cancel"/>
-                    <button string="Apply" icon="gtk-apply" type="object" name="execute"/>
+                        <group name="config_timesheets" colspan="4"/>
+                        <group name="config_payroll" colspan="4"/>
+                        <group name="config_recruitment" colspan="4"/>
+                    </sheet>
                 </form>
             </field>
         </record>
diff --git a/addons/mrp/res_config_view.xml b/addons/mrp/res_config_view.xml
index 2586f4763e2..66b8e735ed6 100644
--- a/addons/mrp/res_config_view.xml
+++ b/addons/mrp/res_config_view.xml
@@ -6,24 +6,25 @@
             <field name="model">mrp.config.settings</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Configure Manufacturing">
-                    <separator string="Manufacturing Order" colspan="4"/>
-                    <field name="module_mrp_operations"/>
-                    <field name="module_stock_planning"/>
-                    <field name="module_mrp_subproduct"/>
-                    <field name="module_mrp_repair"/>
+                <form string="Configure Manufacturing" layout="manual">
+                    <div class="oe_form_topbar">
+                        <button string="Apply" type="object" name="execute"/>
+                        <button string="Cancel" special="cancel"/>
+                    </div>
+                    <sheet layout="auto">
+                        <separator string="Manufacturing Order" colspan="4"/>
+                        <field name="module_mrp_operations"/>
+                        <field name="module_stock_planning"/>
+                        <field name="module_mrp_subproduct"/>
+                        <field name="module_mrp_repair"/>
 
-		            <separator string="Logistics" colspan="4"/>
-                    <field name="module_mrp_jit"/>
+                        <separator string="Logistics" colspan="4"/>
+                        <field name="module_mrp_jit"/>
 
-		            <separator string="Bill Of Material" colspan="4"/>
-                    <field name="group_mrp_routings"/>
-                    <field name="group_mrp_properties"/>
-
-                    <newline/>
-                    <label colspan="2"/>
-                    <button string="Cancel" icon="gtk-cancel" special="cancel"/>
-                    <button string="Apply" icon="gtk-apply" type="object" name="execute"/>
+                        <separator string="Bill Of Material" colspan="4"/>
+                        <field name="group_mrp_routings"/>
+                        <field name="group_mrp_properties"/>
+                    </sheet>
                 </form>
             </field>
         </record>
diff --git a/addons/project/res_config_view.xml b/addons/project/res_config_view.xml
index daa5bc10d8e..021bab3962c 100644
--- a/addons/project/res_config_view.xml
+++ b/addons/project/res_config_view.xml
@@ -7,24 +7,25 @@
             <field name="type">form</field>
             <field name="priority" eval="20"/>
             <field name="arch" type="xml">
-                <form string="Configure Project">
-                    <separator string="Project" colspan="4"/>
-                    <field name="module_project_mrp"/>
-                    <field name="module_project_timesheet"/>
-                    <field name="module_pad"/>
+                <form string="Configure Project" layout="manual">
+                    <div class="oe_form_topbar">
+                        <button string="Apply" type="object" name="execute"/>
+                        <button string="Cancel" special="cancel"/>
+                    </div>
+                    <sheet layout="auto">
+                        <separator string="Project" colspan="4"/>
+                        <field name="module_project_mrp"/>
+                        <field name="module_project_timesheet"/>
+                        <field name="module_pad"/>
 
-                    <separator string="Planning" colspan="4"/>
-                    <field name="module_project_long_term"/>
+                        <separator string="Planning" colspan="4"/>
+                        <field name="module_project_long_term"/>
 
-                    <separator string="Helpdesk and support" colspan="4"/>
-                    <field name="module_project_issue"/>
-                    <field name="module_project_issue_sheet"/>
-                    <group name="support" colspan="4"/>
-
-                    <newline/>
-                    <label colspan="2"/>
-                    <button string="Cancel" icon="gtk-cancel" special="cancel"/>
-                    <button string="Apply" icon="gtk-apply" type="object" name="execute"/>
+                        <separator string="Helpdesk and support" colspan="4"/>
+                        <field name="module_project_issue"/>
+                        <field name="module_project_issue_sheet"/>
+                        <group name="support" colspan="4"/>
+                    </sheet>
                 </form>
             </field>
         </record>
diff --git a/addons/purchase/res_config_view.xml b/addons/purchase/res_config_view.xml
index dcf9f921dbb..26d40ac0be0 100644
--- a/addons/purchase/res_config_view.xml
+++ b/addons/purchase/res_config_view.xml
@@ -6,25 +6,26 @@
             <field name="model">purchase.config.settings</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Configure Purchases">
-                    <separator string="Invoicing" colspan="4"/>
-                    <field name="default_invoice_method" />
+                <form string="Configure Purchases" layout="manual">
+                    <div class="oe_form_topbar">
+                        <button string="Apply" type="object" name="execute"/>
+                        <button string="Cancel" special="cancel"/>
+                    </div>
+                    <sheet layout="auto">
+                        <separator string="Invoicing" colspan="4"/>
+                        <field name="default_invoice_method" />
 
-                    <separator string="Purchase Order" colspan="4"/>
-                    <field name="group_purchase_pricelist"/>
-                    <field name="group_uom"/>
-                    <field name="module_purchase_double_validation"/>
-                    <field name="module_purchase_requisition"/>
-                    <field name="module_warning"/>
-                    <field name="module_purchase_analytic_plans"/>
+                        <separator string="Purchase Order" colspan="4"/>
+                        <field name="group_purchase_pricelist"/>
+                        <field name="group_uom"/>
+                        <field name="module_purchase_double_validation"/>
+                        <field name="module_purchase_requisition"/>
+                        <field name="module_warning"/>
+                        <field name="module_purchase_analytic_plans"/>
 
-                    <separator string="Products" colspan="4"/>
-                    <field name="module_product_manufacturer"/>
-
-                    <newline/>
-                    <label colspan="2"/>
-                    <button string="Cancel" icon="gtk-cancel" special="cancel"/>
-                    <button string="Apply" icon="gtk-apply" type="object" name="execute"/>
+                        <separator string="Products" colspan="4"/>
+                        <field name="module_product_manufacturer"/>
+                    </sheet>
                 </form>
             </field>
         </record>
diff --git a/addons/stock/res_config_view.xml b/addons/stock/res_config_view.xml
index aa31c4adf9d..0e43f2ad8bf 100644
--- a/addons/stock/res_config_view.xml
+++ b/addons/stock/res_config_view.xml
@@ -7,33 +7,34 @@
             <field name="model">stock.config.settings</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string ="Configure Warehouse">
-                    <separator string="Traceability" colspan="4"/>
-                    <field name="group_stock_production_lot"/>
-                    <field name="module_product_expiry"
-                        attrs="{'invisible': [('group_stock_production_lot','=',False), ('group_stock_tracking_lot','=',False)]}"/>
-                    <newline/>
-                    <field name="group_stock_tracking_lot"/>
+                <form string ="Configure Warehouse" layout="manual">
+                    <div class="oe_form_topbar">
+                        <button string="Apply" type="object" name="execute"/>
+                        <button string="Cancel" special="cancel"/>
+                    </div>
+                    <sheet layout="auto">
+                        <separator string="Traceability" colspan="4"/>
+                        <field name="group_stock_production_lot"/>
+                        <field name="module_product_expiry"
+                            attrs="{'invisible': [('group_stock_production_lot','=',False), ('group_stock_tracking_lot','=',False)]}"/>
+                        <newline/>
+                        <field name="group_stock_tracking_lot"/>
 
-                    <separator string="Logistics" colspan="4"/>
-                    <field name="group_stock_multiple_locations"/>
-                    <field name="module_stock_no_autopicking"/>
-                    <field name="module_stock_location"/>
-                    <field name="module_stock_invoice_directly"/>
+                        <separator string="Logistics" colspan="4"/>
+                        <field name="group_stock_multiple_locations"/>
+                        <field name="module_stock_no_autopicking"/>
+                        <field name="module_stock_location"/>
+                        <field name="module_stock_invoice_directly"/>
 
-                    <separator string="Products" colspan="4"/>
-                    <field name="group_stock_packaging"/>
-                    <field name="group_stock_inventory_valuation"/>
-                    <field name="group_uom"/>
-                    <field name="group_uos"/>
+                        <separator string="Products" colspan="4"/>
+                        <field name="group_stock_packaging"/>
+                        <field name="group_stock_inventory_valuation"/>
+                        <field name="group_uom"/>
+                        <field name="group_uos"/>
 
-                    <separator string="Partners" colspan="4"/>
-                    <field name="module_claim_from_delivery"/>
-
-                    <newline/>
-                    <label colspan="2"/>
-                    <button string="Cancel" icon="gtk-cancel" special="cancel"/>
-                    <button string="Apply" icon="gtk-apply" type="object" name="execute"/>
+                        <separator string="Partners" colspan="4"/>
+                        <field name="module_claim_from_delivery"/>
+                    </sheet>
                 </form>
             </field>
         </record>

From d0781ecc2696964736304ec1575242603e417580 Mon Sep 17 00:00:00 2001
From: Antony Lesuisse <al@openerp.com>
Date: Tue, 10 Apr 2012 13:50:18 +0200
Subject: [PATCH 069/238] crm.lead opportunities

bzr revid: al@openerp.com-20120410115018-6gjzyvod3tqn6z05
---
 addons/crm/crm_lead_view.xml | 35 ++++++++++++++++++-----------------
 1 file changed, 18 insertions(+), 17 deletions(-)

diff --git a/addons/crm/crm_lead_view.xml b/addons/crm/crm_lead_view.xml
index 70fabfc05b5..7a985c94b71 100644
--- a/addons/crm/crm_lead_view.xml
+++ b/addons/crm/crm_lead_view.xml
@@ -131,9 +131,6 @@
                     </group>
                     <separator colspan="4" string="Notes"/>
                     <field name="description" nolabel="1" colspan="4"/>
-                    <separator colspan="4"/>
-                    <group col="8" colspan="4">
-                    </group>
                  </page>
                  <page string="Extra Info" groups="base.group_extended">
                     <group colspan="2" col="2">
@@ -401,7 +398,20 @@
         <field name="type">form</field>
         <field name="priority">20</field>
         <field name="arch" type="xml">
-            <form string="Opportunities">
+            <form string="Opportunities" layout="manual">
+                <div class="oe_form_topbar">
+                    <button name="case_cancel" string="Cancel" states="draft" type="object" icon="gtk-cancel" />
+                    <button name="case_mark_lost" string="Mark Lost" states="open,pending" type="object" icon="gtk-cancel" />
+                    <button name="case_reset" string="Reset to Draft" states="done,cancel" type="object" icon="gtk-convert" />
+                    <button name="case_open" string="Open" states="draft,pending" type="object" icon="gtk-go-forward" />
+                    <button name="case_pending" string="Pending" states="draft,open" type="object" icon="gtk-media-pause" />
+                    <button name="case_escalate" string="Escalate" states="open,pending" type="object" groups="base.group_extended" icon="gtk-go-up" />
+                    <button name="case_mark_won" string="Mark Won" states="open,pending" type="object" icon="gtk-apply" />
+                    <div class="oe_right">
+                        <field name="state" nolabel="1" widget="statusbar" statusbar_visible="draft,open,done" statusbar_colors='{"pending":"blue"}'/>
+                    </div>
+                </div>
+                <sheet layout="auto">
                 <group colspan="4" col="7">
                     <field name="name"  required="1" string="Opportunity"/>
                     <label string="Stage:" align="1.0"/>
@@ -468,18 +478,6 @@
 
                     <separator colspan="4" string="Details"/>
                     <field name="description" nolabel="1" colspan="4"/>
-
-                    <separator colspan="4"/>
-                    <group col="10" colspan="4">
-                        <field name="state" widget="statusbar" statusbar_visible="draft,open,done" statusbar_colors='{"pending":"blue"}'/>
-                        <button name="case_cancel" string="Cancel" states="draft" type="object" icon="gtk-cancel" />
-                        <button name="case_mark_lost" string="Mark Lost" states="open,pending" type="object" icon="gtk-cancel" />
-                        <button name="case_reset" string="Reset to Draft" states="done,cancel" type="object" icon="gtk-convert" />
-                        <button name="case_open" string="Open" states="draft,pending" type="object" icon="gtk-go-forward" />
-                        <button name="case_pending" string="Pending" states="draft,open" type="object" icon="gtk-media-pause" />
-                        <button name="case_escalate" string="Escalate" states="open,pending" type="object" groups="base.group_extended" icon="gtk-go-up" />
-                        <button name="case_mark_won" string="Mark Won" states="open,pending" type="object" icon="gtk-apply" />
-                    </group>
                 </page>
                 <page string="Lead">
                     <group colspan="2" col="4">
@@ -524,7 +522,10 @@
                     <field name="ref2"/>
                 </page>
                 </notebook>
-                <field name="message_ids_social" colspan="4" widget="ThreadView" nolabel="1"/>
+                </sheet>
+                <div class="oe_form_sheet_width">
+                    <field name="message_ids_social" colspan="4" widget="ThreadView" nolabel="1"/>
+                </div>
             </form>
         </field>
     </record>

From e485c73d152dd6e2ce4964214d83cf1cca0cbf24 Mon Sep 17 00:00:00 2001
From: "Quentin (OpenERP)" <qdp-launchpad@openerp.com>
Date: Tue, 10 Apr 2012 15:10:52 +0200
Subject: [PATCH 070/238] [IMP] base: new form view of res.partner

bzr revid: qdp-launchpad@openerp.com-20120410131052-8zj77cfa2ulkhiup
---
 openerp/addons/base/res/res_partner_view.xml | 91 ++++++++++++++++----
 1 file changed, 75 insertions(+), 16 deletions(-)

diff --git a/openerp/addons/base/res/res_partner_view.xml b/openerp/addons/base/res/res_partner_view.xml
index ffbbca3eb74..156abbabe85 100644
--- a/openerp/addons/base/res/res_partner_view.xml
+++ b/openerp/addons/base/res/res_partner_view.xml
@@ -333,25 +333,22 @@
             <field name="arch" type="xml">
                 <form string="Partners">
                     <group col="8" colspan="4">
-                        <group col="4" colspan="4">
-                            <field name="name" required="1"/>
-                            <field name="title" size="0" groups="base.group_extended" domain="[('domain', '=', 'contact')]"/>
-                            <newline/>
-                            <field name="function" attrs="{'invisible': [('is_company', '=', True)]}" colspan="4"/>
-                            <field name="parent_id" string="Company" colspan="4" attrs="{'invisible': [('is_company','=', True)]}"
-                                domain="[('is_company', '=', True)]" context="{'default_is_company': True}"
-                                on_change="onchange_address(use_parent_address, parent_id)"/>
+                        <group col="2">
+                            <field name="photo" widget='image' nolabel="1"/>
+                        </group>
+                        <group colspan="4">
+                            <h2><field name="name" required="1" nolabel="1" colspan="4"/></h2><newline/>
+                                <field name="function" attrs="{'invisible': [('is_company', '=', True)]}"/>
+                                <field name="title" size="0" groups="base.group_extended" domain="[('domain', '=', 'contact')]"/>
+                                <field name="parent_id" string="Company" attrs="{'invisible': [('is_company','=', True)]}"
+                                    domain="[('is_company', '=', True)]" context="{'default_is_company': True}"
+                                    on_change="onchange_address(use_parent_address, parent_id)"/>
                         </group>
                         <group col="2">
                             <field name="is_company" on_change="onchange_type(is_company)"/>
-                        </group>
-                        <group col="2">
                             <field name="customer"/>
                             <field name="supplier"/>
                         </group>
-                        <group col="2">
-                            <field name="photo" widget='image' nolabel="1"/>
-                        </group>
                     </group>
                     <notebook colspan="4">
                         <page string="General">
@@ -372,7 +369,6 @@
                             </group>
                             <group colspan="2">
                                 <separator string="Communication" colspan="4"/>
-                                <field name="lang" colspan="4"/>
                                 <field name="phone" colspan="4"/>
                                 <field name="mobile" colspan="4"/>
                                 <field name="fax" colspan="4"/>
@@ -381,7 +377,69 @@
                                 <field name="ref" groups="base.group_extended" colspan="4"/>
                             </group>
                             <group colspan="4" attrs="{'invisible': [('is_company','=', False)]}">
-                                <field name="child_ids" context="{'default_parent_id': active_id}" nolabel="1">
+                                <field name="child_ids" context="{'default_parent_id': active_id}" nolabel="1" mode="kanban">
+                <kanban>
+                    <field name="color"/>
+                    <field name="name"/>
+                    <field name="title"/>
+                    <field name="email"/>
+                    <field name="parent_id"/>
+                    <field name="is_company"/>
+                    <field name="function"/>
+                    <field name="phone"/>
+                    <field name="street"/>
+                    <field name="street2"/>
+                    <field name="photo"/>
+                    <field name="zip"/>
+                    <field name="city"/>
+                    <field name="country_id"/>
+                    <field name="mobile"/>
+                    <field name="state_id"/>
+                    <templates>
+                        <t t-name="kanban-box">
+                            <t t-set="color" t-value="kanban_color(record.color.raw_value)"/>
+                            <div t-att-class="color + (record.title.raw_value == 1 ? ' oe_kanban_color_alert' : '')">
+                                <div class="oe_module_vignette">
+                                <a type="edit">
+                                    <img t-att-src="kanban_image('res.partner', 'photo', record.id.value)" width="64" height="64" class="oe_module_icon"/>
+                                </a>
+                                    <div class="oe_module_desc">
+                                        <div class="oe_kanban_box_content oe_kanban_color_bglight oe_kanban_box_show_onclick_trigger oe_kanban_color_border">
+                                            <table class="oe_kanban_table">
+                                                <tr>
+                                                    <td class="oe_kanban_title1" align="left" valign="middle">
+                                                        <h4><a type="edit"><field name="name"/></a>
+                                                            <div t-if="record.parent_id.raw_value"><field name="parent_id"/></div>
+                                                        </h4>
+                                                            <i>
+															<div t-if="record.function.raw_value">
+                                                            <field name="function"/><br/></div>
+															<div t-if="record.email.raw_value">
+                                                            <field name="email"/><br/></div>
+</i>
+                                                    </td>
+                                                    <td t-if="record.is_company.raw_value" valign="top" align="right">
+                                                        <!--img t-att-src="kanban_image('res.partner', 'photo', record.id.value)" class="oe_kanban_gravatar"/-->
+                                                    </td>
+                                                </tr>
+                                            </table>
+                                        </div>
+                                        <div class="oe_kanban_buttons_set oe_kanban_color_border oe_kanban_color_bglight oe_kanban_box_show_onclick">
+                                            <div class="oe_kanban_left">
+                                                <a string="Edit" icon="gtk-edit" type="edit"/>
+                                                <a string="Change Color" icon="color-picker" type="color" name="color"/>
+                                                <a t-if="record.email.raw_value" title="Mail" t-att-href="'mailto:'+record.email.value" style="text-decoration: none;" >
+                                                    <img src="/web/static/src/img/icons/terp-mail-message-new.png" border="0" width="16" height="16"/>
+                                                </a>
+                                            </div>
+                                            <br class="oe_kanban_clear"/>
+                                    </div>
+                                    </div>
+                                </div>
+                            </div>
+                        </t>
+                    </templates>
+                </kanban>
                                 <form string="Partners">
                                     <group col="8" colspan="4">
                                         <group col="4" colspan="4">
@@ -404,7 +462,7 @@
                                             <field name="photo" widget='image' nolabel="1"/>
                                         </group>
                                     </group>
-                            <notebook colspan="4">
+                                <notebook colspan="4">
                                 <page string="General">
                                     <group colspan="2">
                                         <separator string="Address" colspan="4"/>
@@ -452,6 +510,7 @@
                         </page>
                         <page string="Sales &amp; Purchases" attrs="{'invisible': [('customer', '=', False), ('supplier', '=', False)]}">
                             <separator string="General Information" colspan="4"/>
+                            <field name="lang" colspan="4"/>
                             <field name="user_id"/>
                             <field name="active" groups="base.group_extended"/>
                             <field name="date"/>

From 4528c74a5025b1961d0e51af00202d55175042c0 Mon Sep 17 00:00:00 2001
From: Antony Lesuisse <al@openerp.com>
Date: Tue, 10 Apr 2012 15:20:43 +0200
Subject: [PATCH 071/238] hr_recruitment form

bzr revid: al@openerp.com-20120410132043-te2ntv8nvcf9lwt7
---
 addons/hr_recruitment/hr_recruitment_view.xml | 25 +++++++++++--------
 1 file changed, 15 insertions(+), 10 deletions(-)

diff --git a/addons/hr_recruitment/hr_recruitment_view.xml b/addons/hr_recruitment/hr_recruitment_view.xml
index 4a438a1f385..9b48c3057cc 100644
--- a/addons/hr_recruitment/hr_recruitment_view.xml
+++ b/addons/hr_recruitment/hr_recruitment_view.xml
@@ -73,7 +73,18 @@
         <field name="model">hr.applicant</field>
         <field name="type">form</field>
         <field name="arch" type="xml">
-            <form string="Jobs - Recruitment Form">
+            <form layout="manual">
+            <div class="oe_form_topbar">
+                <button name="case_cancel" string="Refuse" states="draft,open,pending" type="object" icon="gtk-cancel"/>
+                <button name="case_open" string="In Progress" states="draft,pending" type="object" icon="gtk-go-forward"/>
+                <button name="case_pending" string="Pending" states="open" type="object" icon="gtk-media-pause"/>
+                <button name="%(action_hr_recruitment_hired_employee)d" string="Hire" states="open,pending" type="action" icon="terp-partner"/>
+                <button name="case_reset" string="Reset to New" states="done,cancel" type="object" icon="gtk-convert"/>
+                <div class="oe_right">
+                    <field name="state" nolabel="1" widget="statusbar" statusbar_visible="draft,open,done" statusbar_colors='{"pending":"blue"}'/>
+                </div>
+            </div>
+            <sheet string="Jobs - Recruitment Form" layout="auto">
                 <group colspan="4" col="8">
                         <field name="name" string="Subject"/>
                         <field name="partner_name"/>
@@ -126,21 +137,15 @@
                             <field name="source_id"/>
                             <field name="reference"/>
                         </group>
-                        <separator colspan="4" string="Status"/>
-                        <group col="8" colspan="4">
-                            <field name="state" widget="statusbar" statusbar_visible="draft,open,done" statusbar_colors='{"pending":"blue"}'/>
-                            <button name="case_cancel" string="Refuse" states="draft,open,pending" type="object" icon="gtk-cancel"/>
-                            <button name="case_open" string="In Progress" states="draft,pending" type="object" icon="gtk-go-forward"/>
-                            <button name="case_pending" string="Pending" states="open" type="object" icon="gtk-media-pause"/>
-                            <button name="%(action_hr_recruitment_hired_employee)d" string="Hire" states="open,pending" type="action" icon="terp-partner"/>
-                            <button name="case_reset" string="Reset to New" states="done,cancel" type="object" icon="gtk-convert"/>
-                        </group>
                    </page>
                  <page string="Notes">
                      <field name="description" nolabel="1" colspan="4"/>
                  </page>
                 </notebook>
+            </sheet>
+            <div class="oe_form_sheet_width">
                 <field name="message_ids_social" colspan="4" widget="ThreadView" nolabel="1"/>
+            </div>
             </form>
         </field>
     </record>

From ee747dc954bf369673f5590b995ea0a8f5cf18f7 Mon Sep 17 00:00:00 2001
From: Antony Lesuisse <al@openerp.com>
Date: Tue, 10 Apr 2012 15:48:13 +0200
Subject: [PATCH 072/238] embbded kanban view

bzr revid: al@openerp.com-20120410134813-c0potdev7a1i63tf
---
 openerp/osv/orm.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/openerp/osv/orm.py b/openerp/osv/orm.py
index c94a8a51e26..313c96a9fb4 100644
--- a/openerp/osv/orm.py
+++ b/openerp/osv/orm.py
@@ -1651,7 +1651,7 @@ class BaseModel(object):
                     children = False
                     views = {}
                     for f in node:
-                        if f.tag in ('form', 'tree', 'graph'):
+                        if f.tag in ('form', 'tree', 'graph', 'kanban'):
                             node.remove(f)
                             ctx = context.copy()
                             ctx['base_model_name'] = self._name

From 11fe6c8af91c144d53be3a225bebdd7c63d7607e Mon Sep 17 00:00:00 2001
From: Antony Lesuisse <al@openerp.com>
Date: Tue, 10 Apr 2012 16:05:57 +0200
Subject: [PATCH 073/238] dashboard use manual layout

bzr revid: al@openerp.com-20120410140557-ewqp43oncnd215im
---
 addons/account/board_account_view.xml             | 2 +-
 addons/board/board_data_admin.xml                 | 2 +-
 addons/board/board_data_home.xml                  | 2 +-
 addons/crm/board_crm_view.xml                     | 2 +-
 addons/document/board_document_view.xml           | 4 ++--
 addons/event/board_association_view.xml           | 2 +-
 addons/hr/hr_board.xml                            | 4 ++--
 addons/mrp/board_manufacturing_view.xml           | 2 +-
 addons/project/board_project_view.xml             | 2 +-
 addons/project_issue/board_project_issue_view.xml | 2 +-
 addons/project_scrum/board_project_scrum_view.xml | 2 +-
 addons/purchase/board_purchase_view.xml           | 2 +-
 addons/sale/board_sale_view.xml                   | 4 ++--
 addons/stock/board_warehouse_view.xml             | 2 +-
 14 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/addons/account/board_account_view.xml b/addons/account/board_account_view.xml
index 6417bb99d88..fa6dac769a3 100644
--- a/addons/account/board_account_view.xml
+++ b/addons/account/board_account_view.xml
@@ -38,7 +38,7 @@
             <field name="model">board.board</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Account Board">
+                <form string="Account Board" layout="manual">
                     <board style="2-1">
                         <column>
                             <action name="%(account.action_invoice_tree1)d" creatable="true" string="Draft Customer Invoices" domain="[('state','in',('draft','proforma2')), ('type','=','out_invoice')]"/>
diff --git a/addons/board/board_data_admin.xml b/addons/board/board_data_admin.xml
index 5f8c2f1b05c..58e04a22c09 100644
--- a/addons/board/board_data_admin.xml
+++ b/addons/board/board_data_admin.xml
@@ -32,7 +32,7 @@
             <field name="model">board.board</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Administration Dashboard">
+                <form string="Administration Dashboard" layout="manual">
                     <board style="2-1">
                         <column>
                             <action name="%(board_config_overview)d" string="Configuration Overview"/>
diff --git a/addons/board/board_data_home.xml b/addons/board/board_data_home.xml
index 8a75a3ad496..8794173810a 100644
--- a/addons/board/board_data_home.xml
+++ b/addons/board/board_data_home.xml
@@ -43,7 +43,7 @@
       <field name="model">board.board</field>
       <field name="type">form</field>
       <field name="arch" type="xml">
-        <form string="">
+        <form string="" layout="manual">
           <board style="1">
             <column>
               <action name="%(action_application_tiles)d"/>
diff --git a/addons/crm/board_crm_view.xml b/addons/crm/board_crm_view.xml
index 5d64bf20093..bc0b41b24b9 100644
--- a/addons/crm/board_crm_view.xml
+++ b/addons/crm/board_crm_view.xml
@@ -98,7 +98,7 @@
                <field name="model">board.board</field>
                <field name="type">form</field>
                <field name="arch" type="xml">
-                    <form string="Sales Dashboard">
+                    <form string="Sales Dashboard" layout="manual">
                          <board style="2-1">
                             <column>
                                 <action string="My Opportunities"
diff --git a/addons/document/board_document_view.xml b/addons/document/board_document_view.xml
index 4412423c97b..27325662815 100644
--- a/addons/document/board_document_view.xml
+++ b/addons/document/board_document_view.xml
@@ -6,7 +6,7 @@
              <field name="model">board.board</field>
              <field name="type">form</field>
              <field name="arch" type="xml">
-                <form string="Document board">
+                <form string="Document board" layout="manual">
                      <board style="2-1" >
                         <column>
                             <action string="New Files"
@@ -57,7 +57,7 @@
              <field name="model">board.board</field>
              <field name="type">form</field>
              <field name="arch" type="xml">
-                <form string="Document board">
+                <form string="Document board" layout="manual">
                      <board style="2-1">
                         <column>
                             <action string="Wall of Shame"
diff --git a/addons/event/board_association_view.xml b/addons/event/board_association_view.xml
index 96db3db6781..72b46a74116 100644
--- a/addons/event/board_association_view.xml
+++ b/addons/event/board_association_view.xml
@@ -39,7 +39,7 @@
             <field name="model">board.board</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Association Dashboard">
+                <form string="Association Dashboard" layout="manual">
                     <board style="2-1">
                         <column>
                             <action string="Next Events"
diff --git a/addons/hr/hr_board.xml b/addons/hr/hr_board.xml
index 6b541f5a557..b026b40bd80 100644
--- a/addons/hr/hr_board.xml
+++ b/addons/hr/hr_board.xml
@@ -7,7 +7,7 @@
         <field name="model">board.board</field>
         <field name="type">form</field>
         <field name="arch" type="xml">
-            <form string="My Board">
+            <form string="My Board" layout="manual">
                 <board style="2-1">
                     <column/>
                     <column/>
@@ -35,7 +35,7 @@
         <field name="model">board.board</field>
         <field name="type">form</field>
         <field name="arch" type="xml">
-            <form string="HR Manager Board">
+            <form string="HR Manager Board" layout="manual">
                 <board style="2-1">
                     <column/>
                     <column/>
diff --git a/addons/mrp/board_manufacturing_view.xml b/addons/mrp/board_manufacturing_view.xml
index cb81d51d439..514b018032a 100644
--- a/addons/mrp/board_manufacturing_view.xml
+++ b/addons/mrp/board_manufacturing_view.xml
@@ -6,7 +6,7 @@
             <field name="model">board.board</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Manufacturing board">
+                <form string="Manufacturing board" layout="manual">
                     <board style="2-1">
                         <column>
                             <action name="%(procurement.procurement_exceptions)d" string="Procurements in Exception" domain="[('state','=','exception')]"/>
diff --git a/addons/project/board_project_view.xml b/addons/project/board_project_view.xml
index f4a855283ba..8fef3c1470e 100644
--- a/addons/project/board_project_view.xml
+++ b/addons/project/board_project_view.xml
@@ -80,7 +80,7 @@
             <field name="model">board.board</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="My Board">
+                <form string="My Board" layout="manual">
                     <board style="2-1">
                         <column>
                             <action name="%(my_open_tasks_action)d" string="My Open Tasks" creatable="true"/>
diff --git a/addons/project_issue/board_project_issue_view.xml b/addons/project_issue/board_project_issue_view.xml
index ff33793d8e8..c6a9da9cb41 100644
--- a/addons/project_issue/board_project_issue_view.xml
+++ b/addons/project_issue/board_project_issue_view.xml
@@ -56,7 +56,7 @@
             <field name="model">board.board</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Issues Dashboard">
+                <form string="Issues Dashboard" layout="manual">
                     <board style="2-1">
                         <column>
                             <action name="%(action_view_current_project_issue_tree)d" string="Current Issues"/>
diff --git a/addons/project_scrum/board_project_scrum_view.xml b/addons/project_scrum/board_project_scrum_view.xml
index 924a1cbf5cc..284208ee21f 100644
--- a/addons/project_scrum/board_project_scrum_view.xml
+++ b/addons/project_scrum/board_project_scrum_view.xml
@@ -75,7 +75,7 @@
             <field name="model">board.board</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="My Board">
+                <form string="My Board" layout="manual">
                     <board style="2-1">
                         <column>
                				 <action name="%(action_sprint_all_dashboard_tree)d" string="Sprints"/>
diff --git a/addons/purchase/board_purchase_view.xml b/addons/purchase/board_purchase_view.xml
index 4c9e776b96b..ad4c97aad4a 100644
--- a/addons/purchase/board_purchase_view.xml
+++ b/addons/purchase/board_purchase_view.xml
@@ -88,7 +88,7 @@
             <field name="model">board.board</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Purchase Dashboard">
+                <form string="Purchase Dashboard" layout="manual">
                     <board style="2-1">
                         <column>
                             <action name="%(purchase_draft)d" string="Request for Quotations" creatable="true"/>
diff --git a/addons/sale/board_sale_view.xml b/addons/sale/board_sale_view.xml
index 8a6caf1a849..3780c68b2b3 100644
--- a/addons/sale/board_sale_view.xml
+++ b/addons/sale/board_sale_view.xml
@@ -6,7 +6,7 @@
             <field name="model">board.board</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Sales Manager Dashboard">
+                <form string="Sales Manager Dashboard" layout="manual">
                     <board style="2-1">
                         <column>
                             <action name="%(sale.action_quotation_for_sale)d" string="Quotations" creatable="true"/>
@@ -99,7 +99,7 @@
             <field name="model">board.board</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Sales Dashboard">
+                <form string="Sales Dashboard" layout="manual">
                     <board style="2-1">
                         <column>
                             <action name="%(action_quotation_for_sale)d"
diff --git a/addons/stock/board_warehouse_view.xml b/addons/stock/board_warehouse_view.xml
index b8de9cf445e..b99b7e98609 100644
--- a/addons/stock/board_warehouse_view.xml
+++ b/addons/stock/board_warehouse_view.xml
@@ -44,7 +44,7 @@
             <field name="model">board.board</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Warehouse board">
+                <form string="Warehouse board" layout="manual">
                     <board style="2-1">
                         <column>
                             <action name="%(action_incoming_product_board)d" string="Incoming Shipments" creatable="true"/>

From 0d2ba40cf8cbe3adc2d37bf6e1e341068c148539 Mon Sep 17 00:00:00 2001
From: Raphael Collet <rco@openerp.com>
Date: Tue, 10 Apr 2012 16:09:55 +0200
Subject: [PATCH 074/238] [IMP] hr.config.settings: simplify form, remove all
 buttons

bzr revid: rco@openerp.com-20120410140955-a8m0oxigpy7rb1bu
---
 addons/hr/res_config_view.xml                 | 21 -------------------
 .../hr_evaluation/hr_evaluation_installer.xml | 16 --------------
 .../hr_expense/hr_expense_installer_view.xml  | 16 --------------
 addons/hr_holidays/hr_holidays_view.xml       | 16 --------------
 addons/hr_recruitment/res_config_view.xml     |  6 ------
 addons/hr_timesheet_sheet/res_config_view.xml |  6 ------
 6 files changed, 81 deletions(-)

diff --git a/addons/hr/res_config_view.xml b/addons/hr/res_config_view.xml
index ad8d5572466..3377ad20c37 100644
--- a/addons/hr/res_config_view.xml
+++ b/addons/hr/res_config_view.xml
@@ -20,30 +20,9 @@
                     </div>
                     <sheet layout="auto">
                         <separator string="Human Resources" colspan="4"/>
-                        <label string="Departments :"/>
-                        <label colspan="1"/>
-                        <group colspan="2">
-                            <button name="%(view_department_form_installer)d" string="Create Your Departments"
-                                type="action" icon="terp-personal+"/>
-                        </group>
-                        <newline/>
-                        <label string="Employees :" />
-                        <label colspan="1"/>
-                        <group colspan="2">
-                            <button name="%(open_view_employee_list_my)d" string="Create Your Employees"
-                                type="action" icon="terp-personal"/>
-                        </group>
-                        <newline/>
                         <field name="module_hr_timesheet_sheet"/>
                         <newline/>
                         <field name="module_hr_holidays"/>
-                        <newline/>
-                        <label string="Salary Rules :"/>
-                        <label colspan="1"/>
-                        <group colspan="2">
-                            <button string="Configure Your Salary Rules" icon="gtk-go-forward"
-                                name="%(open_payroll1_modules)d" type="action" />
-                        </group>
 
                         <separator string="Additional Features" colspan="4"/>
                         <field name="module_hr_expense"/>
diff --git a/addons/hr_evaluation/hr_evaluation_installer.xml b/addons/hr_evaluation/hr_evaluation_installer.xml
index c8ac9050368..5c0ca4841ed 100644
--- a/addons/hr_evaluation/hr_evaluation_installer.xml
+++ b/addons/hr_evaluation/hr_evaluation_installer.xml
@@ -10,21 +10,5 @@
             <field name="help">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.</field>
         </record>
 
-        <!-- Hr Configuration wizard -->
-        <record id="view_evaluation_config_wizard_inherit" model="ir.ui.view">
-            <field name="name">hr settings for evaluations</field>
-            <field name="model">hr.config.settings</field>
-            <field name="type">form</field>
-            <field name="inherit_id" ref="hr.view_human_resources_configuration"/>
-            <field name="arch" type="xml">
-                <field name="module_hr_evaluation" position="after">
-                    <group colspan="2">
-                        <button name="%(action_evaluation_plans_installer)d" string="Review Appraisal Plans"
-                            type="action" icon="terp-stock_align_left_24"/>
-                    </group>
-                </field>
-            </field>
-        </record>
-
     </data>
 </openerp>
diff --git a/addons/hr_expense/hr_expense_installer_view.xml b/addons/hr_expense/hr_expense_installer_view.xml
index aa9b551df6c..baabddea059 100644
--- a/addons/hr_expense/hr_expense_installer_view.xml
+++ b/addons/hr_expense/hr_expense_installer_view.xml
@@ -27,21 +27,5 @@
            <field name="help">Define one product for each expense type allowed for an employee (travel by car, hostel, restaurant, etc). If you reimburse the employees at a fixed rate, set a cost and a unit of measure on the product. If you reimburse based on real costs, set the cost at 0.00. The user will set the real price when recording his expense sheet.</field>
        </record>
 
-        <!-- Hr Configuration wizard -->
-        <record id="view_expenseconfig_wizard_inherit" model="ir.ui.view">
-            <field name="name">hr settings for expenses</field>
-            <field name="model">hr.config.settings</field>
-            <field name="type">form</field>
-            <field name="inherit_id" ref="hr.view_human_resources_configuration"/>
-            <field name="arch" type="xml">
-                <field name="module_hr_expense" position="after">
-                    <group colspan="2">
-                        <button name="%(product_normal_form_view_installer)d" string="Review Expenses Products"
-                            type="action" icon="terp-accessories-archiver"/>
-                    </group>
-                </field>
-            </field>
-        </record>
-
     </data>
 </openerp>
diff --git a/addons/hr_holidays/hr_holidays_view.xml b/addons/hr_holidays/hr_holidays_view.xml
index 9cb7c4d6a32..d6ee7ed869c 100644
--- a/addons/hr_holidays/hr_holidays_view.xml
+++ b/addons/hr_holidays/hr_holidays_view.xml
@@ -485,22 +485,6 @@
            <field name="help">You can assign remaining Legal Leaves for each employee, OpenERP will automatically create and validate allocation requests.</field>
        </record>
 
-        <!-- Hr Configuration wizard -->
-        <record id="view_config_wizard_inherit" model="ir.ui.view">
-            <field name="name">hr settings for holidays</field>
-            <field name="model">hr.config.settings</field>
-            <field name="type">form</field>
-            <field name="inherit_id" ref="hr.view_human_resources_configuration"/>
-            <field name="arch" type="xml">
-                <field name="module_hr_holidays" position="after">
-                    <group colspan="2">
-                        <button name="%(hr_holidays.hr_holidays_leaves_assign_legal)d" string="Allocate Leaves"
-                            type="action" icon="gtk-apply"/>
-                    </group>
-                </field>
-            </field>
-        </record>
-
         <!-- Hr employee inherit Legal Leaves -->
 
         <record id="view_employee_form_leave_inherit" model="ir.ui.view">
diff --git a/addons/hr_recruitment/res_config_view.xml b/addons/hr_recruitment/res_config_view.xml
index d056d493e2b..32575a4726d 100644
--- a/addons/hr_recruitment/res_config_view.xml
+++ b/addons/hr_recruitment/res_config_view.xml
@@ -7,12 +7,6 @@
             <field name="type">form</field>
             <field name="inherit_id" ref="hr.view_human_resources_configuration"/>
             <field name="arch" type="xml">
-                <field name="module_hr_recruitment" position="after">
-                    <group colspan="2">
-                        <button name="%(hr_recruitment_stage_form_installer)d" string="Review Recruitment Stages"
-                            type="action" icon="terp-stage"/>
-                    </group>
-                </field>
                 <group name="config_recruitment" position="after">
                     <separator  string="Recruitment" colspan="4"/>
                     <field name="module_document_ftp"/>
diff --git a/addons/hr_timesheet_sheet/res_config_view.xml b/addons/hr_timesheet_sheet/res_config_view.xml
index bd4142d7916..c789bd5106e 100644
--- a/addons/hr_timesheet_sheet/res_config_view.xml
+++ b/addons/hr_timesheet_sheet/res_config_view.xml
@@ -7,12 +7,6 @@
             <field name="type">form</field>
             <field name="inherit_id" ref="hr.view_human_resources_configuration"/>
             <field name="arch" type="xml">
-                <field name="module_hr_timesheet_sheet" position="after">
-                    <group colspan="2">
-                        <button name="%(hr_timesheet.action_define_analytic_structure)d" string="Create Your Timesheet Accounts"
-                            type="action" icon="terp-folder-green"/>
-                    </group>
-                </field>
                 <group name="config_timesheets" position="after">
                     <separator string="Timesheets" colspan="4"/>
                     <field name="timesheet_range"/>

From e6a10c0825d077b2af5318d6e4c40ef176f9a8d5 Mon Sep 17 00:00:00 2001
From: "Quentin (OpenERP)" <qdp-launchpad@openerp.com>
Date: Tue, 10 Apr 2012 16:29:33 +0200
Subject: [PATCH 075/238] [IMP] base: form view of res.partner

bzr revid: qdp-launchpad@openerp.com-20120410142933-uwcbibbaz5qyo6g7
---
 openerp/addons/base/res/res_partner_view.xml | 31 ++++++--------------
 1 file changed, 9 insertions(+), 22 deletions(-)

diff --git a/openerp/addons/base/res/res_partner_view.xml b/openerp/addons/base/res/res_partner_view.xml
index 156abbabe85..ee8789f534e 100644
--- a/openerp/addons/base/res/res_partner_view.xml
+++ b/openerp/addons/base/res/res_partner_view.xml
@@ -377,7 +377,7 @@
                                 <field name="ref" groups="base.group_extended" colspan="4"/>
                             </group>
                             <group colspan="4" attrs="{'invisible': [('is_company','=', False)]}">
-                                <field name="child_ids" context="{'default_parent_id': active_id}" nolabel="1" mode="kanban">
+                            <field name="child_ids" context="{'default_parent_id': active_id}" nolabel="1" mode="kanban,list">
                 <kanban>
                     <field name="color"/>
                     <field name="name"/>
@@ -401,39 +401,26 @@
                             <div t-att-class="color + (record.title.raw_value == 1 ? ' oe_kanban_color_alert' : '')">
                                 <div class="oe_module_vignette">
                                 <a type="edit">
-                                    <img t-att-src="kanban_image('res.partner', 'photo', record.id.value)" width="64" height="64" class="oe_module_icon"/>
+                                    <img t-att-src="kanban_image('res.partner', 'photo', record.id.value)" class="oe_form_avatar"/>
                                 </a>
                                     <div class="oe_module_desc">
                                         <div class="oe_kanban_box_content oe_kanban_color_bglight oe_kanban_box_show_onclick_trigger oe_kanban_color_border">
                                             <table class="oe_kanban_table">
                                                 <tr>
                                                     <td class="oe_kanban_title1" align="left" valign="middle">
-                                                        <h4><a type="edit"><field name="name"/></a>
-                                                            <div t-if="record.parent_id.raw_value"><field name="parent_id"/></div>
-                                                        </h4>
-                                                            <i>
-															<div t-if="record.function.raw_value">
-                                                            <field name="function"/><br/></div>
-															<div t-if="record.email.raw_value">
-                                                            <field name="email"/><br/></div>
-</i>
+                                                        <h4><a type="edit"><field name="name"/></a></h4>
+                                                        <i><div t-if="record.function.raw_value">
+                                                            <field name="function"/><br/></div></i>
                                                     </td>
-                                                    <td t-if="record.is_company.raw_value" valign="top" align="right">
+                                                    <td valign="top" align="right">
+                                                        <a t-if="record.email.raw_value" title="Mail" t-att-href="'mailto:'+record.email.value" style="text-decoration: none;" >
+                                                            <img src="/web/static/src/img/icons/terp-mail-message-new.png" border="0" width="16" height="16"/>
+                                                        </a>
                                                         <!--img t-att-src="kanban_image('res.partner', 'photo', record.id.value)" class="oe_kanban_gravatar"/-->
                                                     </td>
                                                 </tr>
                                             </table>
                                         </div>
-                                        <div class="oe_kanban_buttons_set oe_kanban_color_border oe_kanban_color_bglight oe_kanban_box_show_onclick">
-                                            <div class="oe_kanban_left">
-                                                <a string="Edit" icon="gtk-edit" type="edit"/>
-                                                <a string="Change Color" icon="color-picker" type="color" name="color"/>
-                                                <a t-if="record.email.raw_value" title="Mail" t-att-href="'mailto:'+record.email.value" style="text-decoration: none;" >
-                                                    <img src="/web/static/src/img/icons/terp-mail-message-new.png" border="0" width="16" height="16"/>
-                                                </a>
-                                            </div>
-                                            <br class="oe_kanban_clear"/>
-                                    </div>
                                     </div>
                                 </div>
                             </div>

From ea5ece169b7ae506121766698bd7785da9b49cfe Mon Sep 17 00:00:00 2001
From: "Rucha (Open ERP)" <rpa@tinyerp.com>
Date: Tue, 10 Apr 2012 16:32:37 +0200
Subject: [PATCH 076/238] [FIX]: delivery: fixed problem of wrong reference in
 inherited view

bzr revid: rpa@tinyerp.com-20120410143237-mojjdxujwttbp4ay
---
 addons/delivery/delivery_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/delivery/delivery_view.xml b/addons/delivery/delivery_view.xml
index b03d9cd4d79..83e591b6f01 100644
--- a/addons/delivery/delivery_view.xml
+++ b/addons/delivery/delivery_view.xml
@@ -304,7 +304,7 @@
             <field name="model">sale.order</field>
             <field name="inherit_id" ref="sale.view_order_form"/>
             <field name="arch" type="xml">
-                    <xpath expr="//button[@name='button_dummy']" position="after">
+                    <xpath expr="//button[@name='order_confirm']" position="after">
                          <button name="%(action_delivery_cost)d" states="draft" string="Delivery Costs" type="action" icon="gtk-add" context="{'order_id':active_id}"/>
                     </xpath>
             </field>

From 9d4d95013bf883e704db8e55f0d5c5b2ab5e052a Mon Sep 17 00:00:00 2001
From: "Quentin (OpenERP)" <qdp-launchpad@openerp.com>
Date: Tue, 10 Apr 2012 16:47:21 +0200
Subject: [PATCH 077/238] [IMP] base: form view of res.partner

bzr revid: qdp-launchpad@openerp.com-20120410144721-fq7jo6fgci8krlms
---
 openerp/addons/base/res/res_partner_view.xml | 164 ++++++-------------
 1 file changed, 49 insertions(+), 115 deletions(-)

diff --git a/openerp/addons/base/res/res_partner_view.xml b/openerp/addons/base/res/res_partner_view.xml
index ee8789f534e..05ab1c0a945 100644
--- a/openerp/addons/base/res/res_partner_view.xml
+++ b/openerp/addons/base/res/res_partner_view.xml
@@ -378,121 +378,55 @@
                             </group>
                             <group colspan="4" attrs="{'invisible': [('is_company','=', False)]}">
                             <field name="child_ids" context="{'default_parent_id': active_id}" nolabel="1" mode="kanban,list">
-                <kanban>
-                    <field name="color"/>
-                    <field name="name"/>
-                    <field name="title"/>
-                    <field name="email"/>
-                    <field name="parent_id"/>
-                    <field name="is_company"/>
-                    <field name="function"/>
-                    <field name="phone"/>
-                    <field name="street"/>
-                    <field name="street2"/>
-                    <field name="photo"/>
-                    <field name="zip"/>
-                    <field name="city"/>
-                    <field name="country_id"/>
-                    <field name="mobile"/>
-                    <field name="state_id"/>
-                    <templates>
-                        <t t-name="kanban-box">
-                            <t t-set="color" t-value="kanban_color(record.color.raw_value)"/>
-                            <div t-att-class="color + (record.title.raw_value == 1 ? ' oe_kanban_color_alert' : '')">
-                                <div class="oe_module_vignette">
-                                <a type="edit">
-                                    <img t-att-src="kanban_image('res.partner', 'photo', record.id.value)" class="oe_form_avatar"/>
-                                </a>
-                                    <div class="oe_module_desc">
-                                        <div class="oe_kanban_box_content oe_kanban_color_bglight oe_kanban_box_show_onclick_trigger oe_kanban_color_border">
-                                            <table class="oe_kanban_table">
-                                                <tr>
-                                                    <td class="oe_kanban_title1" align="left" valign="middle">
-                                                        <h4><a type="edit"><field name="name"/></a></h4>
-                                                        <i><div t-if="record.function.raw_value">
-                                                            <field name="function"/><br/></div></i>
-                                                    </td>
-                                                    <td valign="top" align="right">
-                                                        <a t-if="record.email.raw_value" title="Mail" t-att-href="'mailto:'+record.email.value" style="text-decoration: none;" >
-                                                            <img src="/web/static/src/img/icons/terp-mail-message-new.png" border="0" width="16" height="16"/>
-                                                        </a>
-                                                        <!--img t-att-src="kanban_image('res.partner', 'photo', record.id.value)" class="oe_kanban_gravatar"/-->
-                                                    </td>
-                                                </tr>
-                                            </table>
-                                        </div>
-                                    </div>
-                                </div>
-                            </div>
-                        </t>
-                    </templates>
-                </kanban>
-                                <form string="Partners">
-                                    <group col="8" colspan="4">
-                                        <group col="4" colspan="4">
-                                            <field name="name" required="1"/>
-                                            <field name="title" size="0" groups="base.group_extended" domain="[('domain', '=', 'contact')]"/>
-                                            <newline/>
-                                            <field name="function" attrs="{'invisible': [('is_company', '=', True)]}" colspan="4"/>
-                                            <field name="parent_id" string="Company" colspan="4" attrs="{'invisible': [('is_company','=', True)]}"
-                                                domain="[('is_company', '=', True)]" context="{'default_is_company': True}"
-                                                on_change="onchange_address(use_parent_address, parent_id)" invisible="1"/>
-                                        </group>
-                                        <group col="2">
-                                            <field name="is_company" on_change="onchange_type(is_company)" invisible="1"/>
-                                        </group>
-                                        <group col="2">
-                                            <field name="customer"/>
-                                            <field name="supplier"/>
-                                        </group>
-                                        <group col="2">
-                                            <field name="photo" widget='image' nolabel="1"/>
-                                        </group>
-                                    </group>
-                                <notebook colspan="4">
-                                <page string="General">
-                                    <group colspan="2">
-                                        <separator string="Address" colspan="4"/>
-                                        <field name="type" string="Type" attrs="{'invisible': [('is_company','=', True)]}"/>
-                                        <group colspan="2">
-                                            <field name="use_parent_address" attrs="{'invisible': [('is_company','=', True)]}" on_change="onchange_address(use_parent_address, parent_id)"/>
-                                        </group>
-                                        <newline/>
-                                            <field name="street" colspan="4"/>
-                                            <field name="street2" colspan="4"/>
-                                            <field name="zip"/>
-                                            <field name="city"/>
-                                            <field name="country_id"/>
-                                            <field name="state_id"/>
-                                        </group>
-                                        <group colspan="2">
-                                            <separator string="Communication" colspan="4"/>
-                                            <field name="lang" colspan="4"/>
-                                            <field name="phone" colspan="4"/>
-                                            <field name="mobile" colspan="4"/>
-                                            <field name="fax" colspan="4"/>
-                                            <field name="email" widget="email" colspan="4"/>
-                                            <field name="website" widget="url" colspan="4"/>
-                                            <field name="ref" groups="base.group_extended" colspan="4"/>
-                                        </group>
-                                    </page>
-                                    <page string="Sales &amp; Purchases" attrs="{'invisible': [('customer', '=', False), ('supplier', '=', False)]}">
-                                        <separator string="General Information" colspan="4"/>
-                                            <field name="user_id"/>
-                                            <field name="active" groups="base.group_extended"/>
-                                            <field name="date"/>
-                                            <field name="company_id" groups="base.group_multi_company" widget="selection"/>
-                                        <newline/>
-                                    </page>
-                                    <page string="Categories" groups="base.group_extended">
-                                        <field name="category_id" colspan="4" nolabel="1"/>
-                                    </page>
-                                    <page string="Notes">
-                                        <field name="comment" colspan="4" nolabel="1"/>
-                                    </page>
-                                </notebook>
-                            </form>
-                                </field>
+                                <kanban>
+                                    <field name="color"/>
+                                    <field name="name"/>
+                                    <field name="title"/>
+                                    <field name="email"/>
+                                    <field name="parent_id"/>
+                                    <field name="is_company"/>
+                                    <field name="function"/>
+                                    <field name="phone"/>
+                                    <field name="street"/>
+                                    <field name="street2"/>
+                                    <field name="photo"/>
+                                    <field name="zip"/>
+                                    <field name="city"/>
+                                    <field name="country_id"/>
+                                    <field name="mobile"/>
+                                    <field name="state_id"/>
+                                    <templates>
+                                        <t t-name="kanban-box">
+                                            <t t-set="color" t-value="kanban_color(record.color.raw_value)"/>
+                                            <div t-att-class="color + (record.title.raw_value == 1 ? ' oe_kanban_color_alert' : '')">
+                                                <div class="oe_module_vignette">
+                                                <a type="edit">
+                                                    <img t-att-src="kanban_image('res.partner', 'photo', record.id.value)" class="oe_form_avatar"/>
+                                                </a>
+                                                    <div class="oe_module_desc">
+                                                        <div class="oe_kanban_box_content oe_kanban_color_bglight oe_kanban_box_show_onclick_trigger oe_kanban_color_border">
+                                                            <table class="oe_kanban_table">
+                                                                <tr>
+                                                                    <td class="oe_kanban_title1" align="left" valign="middle">
+                                                                        <h4><a type="edit"><field name="name"/></a></h4>
+                                                                        <i><div t-if="record.function.raw_value">
+                                                                            <field name="function"/><br/></div></i>
+                                                                    </td>
+                                                                    <td valign="top" align="right">
+                                                                        <a t-if="record.email.raw_value" title="Mail" t-att-href="'mailto:'+record.email.value" style="text-decoration: none;" >
+                                                                            <img src="/web/static/src/img/icons/terp-mail-message-new.png" border="0" width="16" height="16"/>
+                                                                        </a>
+                                                                    </td>
+                                                                </tr>
+                                                            </table>
+                                                        </div>
+                                                    </div>
+                                                </div>
+                                            </div>
+                                        </t>
+                                    </templates>
+                                </kanban>
+                            </field>
                             </group>
                         </page>
                         <page string="Sales &amp; Purchases" attrs="{'invisible': [('customer', '=', False), ('supplier', '=', False)]}">

From 8b83ecaaee5fafb3788c9e444c62fbc90b128fd4 Mon Sep 17 00:00:00 2001
From: "Quentin (OpenERP)" <qdp-launchpad@openerp.com>
Date: Tue, 10 Apr 2012 17:10:54 +0200
Subject: [PATCH 078/238] [IMP] temporary improvement of form view of partner

bzr revid: qdp-launchpad@openerp.com-20120410151054-4g6ex2v7o9llt2e2
---
 openerp/addons/base/res/res_partner_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/openerp/addons/base/res/res_partner_view.xml b/openerp/addons/base/res/res_partner_view.xml
index 05ab1c0a945..f2861b7786f 100644
--- a/openerp/addons/base/res/res_partner_view.xml
+++ b/openerp/addons/base/res/res_partner_view.xml
@@ -401,7 +401,7 @@
                                             <div t-att-class="color + (record.title.raw_value == 1 ? ' oe_kanban_color_alert' : '')">
                                                 <div class="oe_module_vignette">
                                                 <a type="edit">
-                                                    <img t-att-src="kanban_image('res.partner', 'photo', record.id.value)" class="oe_form_avatar"/>
+                                                    <img t-att-src="kanban_image('res.partner', 'photo', record.id.value)" class="oe_form_avatar oe_kanban_avatar_toto"/>
                                                 </a>
                                                     <div class="oe_module_desc">
                                                         <div class="oe_kanban_box_content oe_kanban_color_bglight oe_kanban_box_show_onclick_trigger oe_kanban_color_border">

From a936f27674f7ae929ab7c3190c871c65a9b48082 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Tue, 10 Apr 2012 18:01:00 +0200
Subject: [PATCH 079/238] [FIX] share and mail.thread: tweaked access rights.
 (TODO: second part of patch: checking access rights to email should check
 those from its master record, like attachments. Will be done shortly after
 the CD.)

bzr revid: tde@openerp.com-20120410160100-lh4jr3ubkvemggvk
---
 addons/base_calendar/security/ir.model.access.csv | 2 +-
 addons/mail/security/ir.model.access.csv          | 9 +++++----
 addons/share/wizard/share_wizard.py               | 6 +++++-
 3 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/addons/base_calendar/security/ir.model.access.csv b/addons/base_calendar/security/ir.model.access.csv
index 3dac47653f2..34543f0e912 100644
--- a/addons/base_calendar/security/ir.model.access.csv
+++ b/addons/base_calendar/security/ir.model.access.csv
@@ -1,5 +1,5 @@
 id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
-access_calendar_attendee,calendar.attendee,model_calendar_attendee,base.group_user,1,1,1,1
+access_calendar_attendee,calendar.attendee,model_calendar_attendee,,1,1,1,1
 access_calendar_alarm,calendar.alarm,model_calendar_alarm,base.group_user,1,1,1,1
 access_res_alarm,res.alarm,model_res_alarm,base.group_user,1,1,1,1
 access_calendar_todo,calendar.todo,model_calendar_todo,base.group_user,1,1,1,1
diff --git a/addons/mail/security/ir.model.access.csv b/addons/mail/security/ir.model.access.csv
index c305de830c0..3cfd4e88f3d 100644
--- a/addons/mail/security/ir.model.access.csv
+++ b/addons/mail/security/ir.model.access.csv
@@ -1,7 +1,8 @@
 id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
-access_mail_message,mail.message,model_mail_message,base.group_user,1,1,1,1
+access_mail_message,mail.message,model_mail_message,,1,0,1,0
+access_mail_message_all,mail.message.all,model_mail_message,base.group_user,1,1,1,1
 access_mail_thread,mail.thread,model_mail_thread,base.group_user,1,1,1,0
-access_mail_subscription,mail.subscription,model_mail_subscription,base.group_user,1,1,1,1
-access_mail_notification,mail.notification,model_mail_notification,base.group_user,1,1,1,1
+access_mail_subscription,mail.subscription,model_mail_subscription,,1,1,1,1
+access_mail_notification,mail.notification,model_mail_notification,,1,1,1,1
 access_mail_group,mail.group,model_mail_group,base.group_user,1,1,1,1
-access_mail_message_report,mail.message.report,model_mail_message_report,base.group_user,1,0,0,0
+access_mail_message_report,mail.message.report,model_mail_message_report,,1,0,0,0
diff --git a/addons/share/wizard/share_wizard.py b/addons/share/wizard/share_wizard.py
index 854f021bf67..07004f333a8 100644
--- a/addons/share/wizard/share_wizard.py
+++ b/addons/share/wizard/share_wizard.py
@@ -189,7 +189,7 @@ class share_wizard(osv.osv_memory):
         'invite': False,
         'domain': lambda self, cr, uid, context, *a: context.get('domain', '[]'),
         'action_id': lambda self, cr, uid, context, *a: context.get('action_id'),
-        'access_mode': 'readonly',
+        'access_mode': 'readwrite',
         'embed_option_title': True,
         'embed_option_search': True,
     }
@@ -502,6 +502,8 @@ class share_wizard(osv.osv_memory):
         # Create required rights if allowed by current user rights and not
         # already granted
         for dummy, model in fields_relations:
+            # mail.message is transversal: it should not received directly the access rights
+            if model.model in ['mail.message']: continue
             values = {
                 'name': _('Copied access for sharing'),
                 'group_id': group_id,
@@ -632,6 +634,8 @@ class share_wizard(osv.osv_memory):
             domain = safe_eval(wizard_data.domain)
             if domain:
                 for rel_field, model in fields_relations:
+                    # mail.message is transversal: it should not received directly the access rights
+                    if model.model in ['mail.message']: continue
                     related_domain = []
                     if not rel_field: continue
                     for element in domain:

From 6d84bb78996667f26aa0617ba429b9d1b96b538e Mon Sep 17 00:00:00 2001
From: Minh Tran <mit@openerp.com>
Date: Tue, 10 Apr 2012 18:14:24 +0200
Subject: [PATCH 080/238] restyling of wall and chatter

bzr revid: mit@openerp.com-20120410161424-pdgx77dn0o7t31am
---
 addons/mail/static/src/css/mail.css | 65 +++++++++++++++++++----------
 addons/mail/static/src/js/mail.js   |  2 +-
 addons/mail/static/src/xml/mail.xml | 13 +++---
 3 files changed, 53 insertions(+), 27 deletions(-)

diff --git a/addons/mail/static/src/css/mail.css b/addons/mail/static/src/css/mail.css
index d920455537f..694de02a5cb 100644
--- a/addons/mail/static/src/css/mail.css
+++ b/addons/mail/static/src/css/mail.css
@@ -4,17 +4,23 @@
 
 div.oe_mail_wall {
     overflow: auto;
-    padding: 5px;
+    padding: 0;
+    background: white;
 }
 
-div.oe_mail_wall_search {
-    width: 55%;
+/*div.oe_mail_wall_search {*/
+    /*width: 550px;*/
+/*}*/
+
+.oe_mail_wall_button_comment {
+    float: right;
 }
 
 /* 2 columns view */
 div.oe_mail_wall_left {
     float: left;
-    width: 65%;
+    width: 560px;
+    margin: 8px;
 }
 
 div.oe_mail_wall_right {
@@ -22,6 +28,10 @@ div.oe_mail_wall_right {
     width: 34%;
 }
 
+.oe_mail_wall_threads {
+    margin-top: 8px;
+}
+
 .oe_mail_wall_thread div.oe_mail_thread_act .oe_mail_action_textarea, div.oe_mail_thread_subthread .oe_mail_action_textarea {
     height: 20px;
     padding: 2px;
@@ -47,16 +57,15 @@ div.oe_mail_wall_more {
 
 .oe_mail_recthread {
     overflow: auto;
-    padding: 5px 5px 5px 5px;
 }
 
 /* Left-side CSS */
 .oe_mail_recthread_actions {
-    margin-bottom: 10px;
+    margin-bottom: 8px;
 }
 
 .oe_mail_recthread_followers {
-    margin-bottom: 10px;
+    margin-bottom: 8px;
 }
 
 .oe_mail_followers_action, .oe_mail_followers_display {
@@ -70,21 +79,16 @@ div.oe_mail_wall_more {
 
 .oe_mail_recthread_right {
     float: right;
-    width: 25%;
-    margin-right: 5%;
+    width: 240px;
 }
 
 .oe_mail_button_follow, .oe_mail_button_unfollow {
-    width: 120px;
+    /*width: 120px;*/
 }
 
 .oe_mail_button_followers {
-    display: inline;
-    width: 120px;
-}
-
-.oe_mail_followers h4 {
-    margin: 0 0 8px;
+    display: inline-block;
+    width: 240px;
 }
 
 /* ------------------------------ */
@@ -99,7 +103,7 @@ div.oe_mail_thread_act {
 
 div.oe_mail_thread_display {
     white-space: normal;
-    margin-bottom: 5px;
+    /*margin-bottom: 5px;*/
 }
 
 div.oe_mail_thread_subthread {
@@ -116,8 +120,7 @@ li.oe_mail_thread_msg {
     padding: 1px;
 }
 
-.notification, .email {
-    background: #E0E0E0;
+.notification, .comment {
     padding: 4px;
     -moz-border-radius: 4px;
     -webkit-border-radius: 4px;
@@ -126,8 +129,16 @@ li.oe_mail_thread_msg {
     border-radius: 4px;
 }
 
-.comment {
-    padding: 4px;
+.oe_mail_thread_msg > .comment {
+    background: #eee;
+}
+
+.oe_mail_thread_subthread .comment {
+    background: white;
+}
+
+.notification {
+    background: #eee;
 }
 
 .notification:after, .email:after, .comment:after {
@@ -215,6 +226,14 @@ input.oe_mail, textarea.oe_mail {
     border-radius: 3px;
 }
 
+.oe_mail_wall .oe_mail_wall_act textarea {
+    width: 550px;
+}
+
+textarea.oe_mail {
+    height: 60px;
+}
+
 input.oe_mail:focus, textarea.oe_mail:focus {
     outline: 0;
     border-color: rgba(82, 168, 236, 0.8);
@@ -246,6 +265,10 @@ p.oe_mail_msg {
     font-weight: bold;
 }
 
+.oe_mail_msg_reply, .oe_mail_msg_delete {
+    margin-right: 4px;
+}
+
 a.oe_mail_oe_intlink {
     color: #8786b7;
 }
diff --git a/addons/mail/static/src/js/mail.js b/addons/mail/static/src/js/mail.js
index fc6cb833d4b..fcf02aafddd 100644
--- a/addons/mail/static/src/js/mail.js
+++ b/addons/mail/static/src/js/mail.js
@@ -638,7 +638,7 @@ openerp.mail = function(session) {
         load_search_view: function (view_id, defaults, hidden) {
             var self = this;
             this.searchview = new session.web.SearchView(this, this.ds_msg, view_id || false, defaults || {}, hidden || false);
-            var search_view_loaded = this.searchview.appendTo(this.$element.find('div.oe_mail_wall_search'));
+            var search_view_loaded = this.searchview.appendTo(this.$element.find('.oe_view_manager_row'));
             return $.when(search_view_loaded).then(function () {
                 self.searchview.on_search.add(self.do_searchview_search);
             });
diff --git a/addons/mail/static/src/xml/mail.xml b/addons/mail/static/src/xml/mail.xml
index 0f49902b6b3..271064db358 100644
--- a/addons/mail/static/src/xml/mail.xml
+++ b/addons/mail/static/src/xml/mail.xml
@@ -2,13 +2,17 @@
 <template>
 
     <div t-name="Wall" class="oe_mail_wall">
-        <div class="oe_mail_wall_search">
+        <div class="oe_view_manager_header">
+            <div class="oe_view_manager_row">
+                <h2 class="oe_view_title">All Feeds</h2>
+            </div>
         </div>
         <div class="oe_mail_wall_left">
             <div class="oe_mail_wall_act">
-                <textarea class="oe_mail oe_mail_wall_action_textarea" placeholder="Add a personnal message here..."/><br />
+                <textarea class="oe_mail oe_mail_wall_action_textarea" placeholder="Add a personnal message here..."/>
                 <button class="oe_mail_wall_button_comment" type="button">Post comment</button>
             </div>
+            <div class="oe_clear"></div>
             <div class="oe_mail_wall_threads">
             </div>
             <div class="oe_mail_wall_more">
@@ -65,7 +69,6 @@
     
     <t t-name="NoteDisplay">
         <p class="oe_mail_msg">
-            <a href="#" class="intlink oe_mail_oe_intlink" t-attf-data-res-model='{params.res_model}' t-attf-data-res-id='{params.res_id}'><t t-raw="record.record_name"/></a>
             <span class="oe_mail_msg_body"><t t-raw="record.body"/></span>
             <t t-if="record.tr_body"><span class="oe_mail_msg_body_short"><t t-raw="record.tr_body"/></span></t>
             <br />
@@ -73,9 +76,9 @@
                 <a href="#" class="intlink oe_mail_oe_intlink" data-res-model='res.users' t-attf-data-res-id='{record.user_id[0]}'><t t-raw="record.user_id[1]"/></a>
                 on <t t-raw="record.date"/>
             </span>
-            <t t-if="display['show_reply']"><span class="oe_mail_oe_space"><a href="#" class="oe_mail_msg_reply oe_mail_oe_intlink">Reply</a></span></t>
+            <t t-if="display['show_reply']"><a href="#" class="oe_mail_msg_reply oe_mail_oe_intlink"> Reply</a> </t>
             <t t-if="display['show_delete']">
-                <t t-if="thread._is_author(record.user_id[0])"><span class="oe_mail_oe_space"><a href="#" t-attf-data-id='{record.id}' class="oe_mail_msg_delete oe_mail_oe_intlink">Delete</a></span></t>
+                <t t-if="thread._is_author(record.user_id[0])"><a href="#" t-attf-data-id='{record.id}' class="oe_mail_msg_delete oe_mail_oe_intlink"> Delete </a></t>
             </t>
             <t t-if="display['show_hide']">
                 <t t-if="!(thread._is_author(record.user_id[0]))"><span class="oe_mail_oe_space"><a href="#" t-attf-data-id='{record.id}' class="oe_mail_msg_hide oe_mail_oe_intlink">Hide</a></span></t>

From cf4668b83145ac5c894feca5515e9cba48c86575 Mon Sep 17 00:00:00 2001
From: Minh Tran <mit@openerp.com>
Date: Tue, 10 Apr 2012 18:40:16 +0200
Subject: [PATCH 081/238] styling of hover of follow button

bzr revid: mit@openerp.com-20120410164016-sr3wq13lo6d02l9e
---
 addons/mail/static/src/css/mail.css | 8 ++++++++
 addons/mail/static/src/js/mail.js   | 6 ++++--
 addons/mail/static/src/xml/mail.xml | 2 +-
 3 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/addons/mail/static/src/css/mail.css b/addons/mail/static/src/css/mail.css
index 694de02a5cb..260b4a230cd 100644
--- a/addons/mail/static/src/css/mail.css
+++ b/addons/mail/static/src/css/mail.css
@@ -280,3 +280,11 @@ a.oe_mail_oe_intlink {
 .oe_mail_oe_space {
     margin-left: 15px;
 }
+
+
+
+
+.oe_mail_recthread_actions button {
+    width: 120px;
+}
+
diff --git a/addons/mail/static/src/js/mail.js b/addons/mail/static/src/js/mail.js
index fcf02aafddd..20ff72645a2 100644
--- a/addons/mail/static/src/js/mail.js
+++ b/addons/mail/static/src/js/mail.js
@@ -485,9 +485,11 @@ openerp.mail = function(session) {
             // bind buttons
             this.$element.find('button.oe_mail_button_followers').click(function () { self.do_toggle_followers(); }).hide();
             this.$element.find('button.oe_mail_button_follow').click(function () { self.do_follow(); })
-                .mouseover(function () { $(this).html('Follow'); }).mouseleave(function () { $(this).html('Not following'); });
+                .mouseover(function () { $(this).html('Follow').addClass('following'); })
+                .mouseleave(function () { $(this).html('Not following').removeClass('following'); });
             this.$element.find('button.oe_mail_button_unfollow').click(function () { self.do_unfollow(); })
-                .mouseover(function () { $(this).html('Unfollow'); }).mouseleave(function () { $(this).html('Following'); });
+                .mouseover(function () { $(this).html('Unfollow').removeClass('following').addClass('unfollow'); })
+                .mouseleave(function () { $(this).html('Following').removeClass('unfollow').addClass('following'); });
             this.reinit();
         },
 
diff --git a/addons/mail/static/src/xml/mail.xml b/addons/mail/static/src/xml/mail.xml
index 271064db358..a0133695659 100644
--- a/addons/mail/static/src/xml/mail.xml
+++ b/addons/mail/static/src/xml/mail.xml
@@ -32,7 +32,7 @@
         <div class="oe_mail_recthread_right">
             <div class="oe_mail_recthread_actions">
                 <button type="button" class="oe_mail_button_follow">Not following</button>
-                <button type="button" class="oe_mail_button_unfollow">Following</button>
+                <button type="button" class="oe_mail_button_unfollow following">Following</button>
                 <button type="button" class="oe_mail_button_followers">Display followers</button>
             </div>
             <div class="oe_mail_recthread_followers">

From aaaf9372ffe11019d41253aebd8f9c8d8836a771 Mon Sep 17 00:00:00 2001
From: Antony Lesuisse <al@openerp.com>
Date: Tue, 10 Apr 2012 18:25:55 +0200
Subject: [PATCH 082/238] project task and project

bzr revid: al@openerp.com-20120410162555-qg81a29b3wsw5cbh
---
 addons/project/project_view.xml | 64 ++++++++++++++++++---------------
 1 file changed, 35 insertions(+), 29 deletions(-)

diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml
index c321c3919a7..c48b075721a 100644
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -18,7 +18,20 @@
             <field name="model">project.project</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Project">
+                <form string="Project" layout="manual">
+                <div class="oe_form_topbar">
+                    <button name="set_cancel" string="Cancel" type="object" states="open,pending" icon="gtk-cancel"/>
+                    <button name="set_template" string="Set as Template" type="object" states="open" icon="gtk-convert" groups="base.group_extended"/>
+                    <button name="set_open" string="Re-open project" type="object" states="pending,cancelled,close" icon="gtk-ok"/>
+                    <button name="set_pending" string="Pending" type="object" states="open" icon="gtk-media-pause"/>
+                    <button name="set_done" string="Done" type="object" states="open,pending" icon="terp-dialog-close"/>
+                    <button name="reset_project" string="Reset as Project" type="object" states="template" icon="gtk-convert"/>
+                    <button string="New Project Based on Template" name="duplicate_template"  type="object" states="template" icon="gtk-new" context="{'parent_id':parent_id}"/>
+                    <div class="oe_right">
+                        <field name="state" nolabel="1" widget="statusbar" statusbar_visible="open,close" statusbar_colors='{"pending":"blue"}' select="1" readonly="1"/>
+                    </div>
+                </div>
+                <sheet string="Project" layout="auto">
                     <group colspan="6" col="6">
                         <field name="name" string="Project Name" select="1"/>
                         <field name="analytic_account_id" invisible="1" required="0"/>
@@ -43,21 +56,6 @@
                                 <field name="priority"/>
                                 <field name="active" attrs="{'invisible':[('state','in',['open', 'pending', 'template'])]}"/>
                             </group>
-                            <newline/>
-                            <separator colspan="4"/>
-                            <group col="9" colspan="8">
-                                <field name="state" widget="statusbar" statusbar_visible="open,close" statusbar_colors='{"pending":"blue"}' select="1" readonly="1"/>
-                                <button name="set_cancel" string="Cancel" type="object" states="open,pending" icon="gtk-cancel"/>
-                                <button name="set_template" string="Set as Template" type="object" states="open" icon="gtk-convert" groups="base.group_extended"/>
-                                <button name="set_open" string="Re-open project" type="object" states="pending,cancelled,close" icon="gtk-ok"/>
-                                <button name="set_pending" string="Pending" type="object" states="open" icon="gtk-media-pause"/>
-                                <button name="set_done" string="Done" type="object" states="open,pending" icon="terp-dialog-close"/>
-                                <button name="reset_project" string="Reset as Project" type="object" states="template" icon="gtk-convert"/>
-                                <button
-                                    string="New Project Based on Template"
-                                    name="duplicate_template"  type="object"
-                                    states="template" icon="gtk-new" context="{'parent_id':parent_id}"/>
-                            </group>
                         </page>
                         <page string="Members">
                             <field colspan="4" name="members" nolabel="1">
@@ -96,7 +94,10 @@
                         </page>
                     </notebook>
                     <newline/>
+                </sheet>
+                <div class="oe_form_sheet_width">
                     <field name="message_ids_social" colspan="4" widget="ThreadView" nolabel="1"/>
+                </div>
                 </form>
             </field>
         </record>
@@ -221,7 +222,20 @@
             <field name="type">form</field>
             <field eval="2" name="priority"/>
             <field name="arch" type="xml">
-                <form string="Task edition">
+                <form string="Project" layout="manual">
+                    <div class="oe_form_topbar">
+                        <button name="do_cancel" states="draft,open,pending" string="Cancel" type="object" icon="gtk-cancel"/>
+                        <button name="do_draft" states="open" string="Draft" type="object" icon="gtk-indent"/>
+                        <button name="do_open" states="pending,draft" string="Start Task" type="object" icon="gtk-media-play"/>
+                        <button name="%(action_project_task_reevaluate)d" states="done,cancelled" string="Reactivate" type="action" icon="gtk-convert" context="{'button_reactivate':True}" />
+                        <button name="do_pending" states="open" string="Pending" type="object" icon="gtk-media-pause"/>
+                        <button groups="base.group_extended" name="%(action_project_task_delegate)d" states="pending,open,draft" string="Delegate" type="action" icon="terp-personal"/>
+                        <button name="action_close" states="pending,open" string="Done" type="object" icon="terp-dialog-close"/>
+                        <div class="oe_right">
+                            <field name="state" nolabel="1" widget="statusbar" statusbar_visible="draft,open,done" statusbar_colors='{"pending":"blue"}' select="1"/>
+                        </div>
+                    </div>
+                    <sheet string="Task edition" layout="auto">
                     <group colspan="6" col="6">
                         <field name="name" select="1"/>
                         <field name="project_id" select="1"  on_change="onchange_project(project_id)"/>
@@ -256,17 +270,6 @@
                                     <field name="date" />
                                 </tree>
                             </field>
-                            <newline/>
-                            <group col="11" colspan="4">
-                                <field name="state" widget="statusbar" statusbar_visible="draft,open,done" statusbar_colors='{"pending":"blue"}' select="1"/>
-                                <button name="do_cancel" states="draft,open,pending" string="Cancel" type="object" icon="gtk-cancel"/>
-                                <button name="do_draft" states="open" string="Draft" type="object" icon="gtk-indent"/>
-                                <button name="do_open" states="pending,draft" string="Start Task" type="object" icon="gtk-media-play"/>
-                                <button name="%(action_project_task_reevaluate)d" states="done,cancelled" string="Reactivate" type="action" icon="gtk-convert" context="{'button_reactivate':True}" />
-                                <button name="do_pending" states="open" string="Pending" type="object" icon="gtk-media-pause"/>
-                                <button groups="base.group_extended" name="%(action_project_task_delegate)d" states="pending,open,draft" string="Delegate" type="action" icon="terp-personal"/>
-                                <button name="action_close" states="pending,open" string="Done" type="object" icon="terp-dialog-close"/>
-                            </group>
                         </page>
                         <page groups="base.group_extended" string="Delegations History">
                             <separator string="Parent Tasks" colspan="4"/>
@@ -304,7 +307,10 @@
                             <field colspan="4" name="notes" nolabel="1"/>
                         </page>
                     </notebook>
-                    <field name="message_ids_social" colspan="4" widget="ThreadView" nolabel="1"/>
+                    </sheet>
+                    <div class="oe_form_sheet_width">
+                        <field name="message_ids_social" colspan="4" widget="ThreadView" nolabel="1"/>
+                    </div>
                 </form>
             </field>
         </record>

From 0dd966ed7cc8e5b008e8fe205b71959330a64b33 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Tue, 10 Apr 2012 21:32:01 +0200
Subject: [PATCH 083/238] [IMP] Thread widget: record name appears for first
 message of thread.

bzr revid: tde@openerp.com-20120410193201-q04ycx52fkfzycn9
---
 addons/mail/static/src/xml/mail.xml | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/addons/mail/static/src/xml/mail.xml b/addons/mail/static/src/xml/mail.xml
index a0133695659..d97f0738629 100644
--- a/addons/mail/static/src/xml/mail.xml
+++ b/addons/mail/static/src/xml/mail.xml
@@ -69,6 +69,9 @@
     
     <t t-name="NoteDisplay">
         <p class="oe_mail_msg">
+            <t t-if="params.thread_level > 0">
+                <a href="#" class="intlink oe_mail_oe_intlink" t-attf-data-res-model='{params.res_model}' t-attf-data-res-id='{params.res_id}'><t t-raw="record.record_name"/></a>
+            </t>
             <span class="oe_mail_msg_body"><t t-raw="record.body"/></span>
             <t t-if="record.tr_body"><span class="oe_mail_msg_body_short"><t t-raw="record.tr_body"/></span></t>
             <br />
@@ -88,6 +91,10 @@
     
     <t t-name="EmailDisplay">
         <p class="oe_mail_msg oe_mail_msg_p_email_header">
+            <t t-if="params.thread_level > 0">
+                <a href="#" class="intlink oe_mail_oe_intlink" t-attf-data-res-model='{params.res_model}' t-attf-data-res-id='{params.res_id}'><t t-raw="record.record_name"/></a>
+            </t>
+            <br />
             <span class="oe_mail_oe_bold">From:</span> <t t-esc="record.email_from"/> on <span class="oe_mail_oe_fade"><t t-raw="record.date"/></span><br />
             <span class="oe_mail_oe_bold">To:</span> <t t-esc="record.email_to"/><br />
             <span class="oe_mail_oe_bold">Subject:</span> <t t-esc="record.subject"/><br />
@@ -95,6 +102,13 @@
         <p class="oe_mail_msg">
             <span class="oe_mail_msg_body"><t t-raw="record.body"/></span>
             <t t-if="record.tr_body"><span class="oe_mail_msg_body_short"><t t-raw="record.tr_body"/></span></t>
+            <br />
+            <t t-if="display['show_delete']">
+                <t t-if="thread._is_author(record.user_id[0])"><a href="#" t-attf-data-id='{record.id}' class="oe_mail_msg_delete oe_mail_oe_intlink"> Delete </a></t>
+            </t>
+            <t t-if="display['show_hide']">
+                <t t-if="!(thread._is_author(record.user_id[0]))"><span class="oe_mail_oe_space"><a href="#" t-attf-data-id='{record.id}' class="oe_mail_msg_hide oe_mail_oe_intlink">Hide</a></span></t>
+            </t>
         </p>
     </t>
 

From 6e198938c71f9f1f325991317f81da1530a9fea0 Mon Sep 17 00:00:00 2001
From: Antony Lesuisse <al@openerp.com>
Date: Tue, 10 Apr 2012 21:59:44 +0200
Subject: [PATCH 084/238] hr_recruitment nice applicant view

bzr revid: al@openerp.com-20120410195944-76vdzrrgvf3ihzxu
---
 addons/hr_recruitment/hr_recruitment_view.xml | 29 ++++++++++---------
 1 file changed, 15 insertions(+), 14 deletions(-)

diff --git a/addons/hr_recruitment/hr_recruitment_view.xml b/addons/hr_recruitment/hr_recruitment_view.xml
index 9b48c3057cc..1f7d916c6f3 100644
--- a/addons/hr_recruitment/hr_recruitment_view.xml
+++ b/addons/hr_recruitment/hr_recruitment_view.xml
@@ -85,29 +85,30 @@
                 </div>
             </div>
             <sheet string="Jobs - Recruitment Form" layout="auto">
-                <group colspan="4" col="8">
-                        <field name="name" string="Subject"/>
+                <group colspan="4" col="4">
+                    <field name="name" string="Subject"/>
+                    <group colspan="2" col="4">
                         <field name="partner_name"/>
-                        <field name="job_id" on_change="onchange_job(job_id)"/>
                         <button name="action_makeMeeting" type="object" string="Meeting" icon="gtk-index"/>
-                        <button string="Send New Email"
-                            name="%(mail.action_email_compose_message_wizard)d"
-                            icon="terp-mail-message-new" type="action"/>
-                    <newline/>
+                        <button string="Send New Email" name="%(mail.action_email_compose_message_wizard)d" icon="terp-mail-message-new" type="action"/>
+                    </group>
+                    <field name="user_id"/>
+                    <field name="job_id" on_change="onchange_job(job_id)"/>
                     <field name="department_id" widget="selection" on_change="onchange_department_id(department_id)"/>
                     <group colspan="2" col="4">
                         <field name="stage_id" domain="['|',('department_id','=',department_id),('department_id','=',False)]"/>
                         <button name="stage_previous" string="" type="object" icon="gtk-go-back"/>
                         <button icon="gtk-go-forward" string="" name="stage_next" type="object"/>
                     </group>
-                    <field name="user_id"/>
-                    <field name="survey" invisible="1"/>
-                    <button name="action_print_survey" string="Interview" type="object" icon="gtk-print" attrs="{'readonly':[('survey','=',False)]}"/>
-                    <button name="%(survey.action_view_survey_question_message)d" string="Answer" type="action" icon="gtk-execute" context="{'survey_id': survey, 'response_id': [response], 'response_no':0 ,'active' : response, 'object' : 'hr.applicant'}" attrs="{'readonly':[('survey','=',False)]}" groups="base.group_extended"/>
-                    <field name="response" invisible="1"/>
-                    <newline/>
                     <field name="date_action"/>
-                    <field name="title_action"/>
+                    <group colspan="2" col="8">
+                        <field name="title_action"/>
+                        <field name="survey" invisible="1"/>
+                        <button name="action_print_survey" string="Interview" type="object" icon="gtk-print" attrs="{'readonly':[('survey','=',False)]}"/>
+                        <button name="%(survey.action_view_survey_question_message)d" string="Answer" type="action" icon="gtk-execute" context="{'survey_id': survey, 'response_id': [response], 'response_no':0 ,'active' : response, 'object' : 'hr.applicant'}" attrs="{'readonly':[('survey','=',False)]}" groups="base.group_extended"/>
+                        <field name="response" invisible="1"/>
+                    </group>
+                    <newline/>
                 </group>
                 <notebook colspan="4">
                     <page string="Job Info">

From eca7e495d6bdbb5acd99751d9f50bce2d4d90095 Mon Sep 17 00:00:00 2001
From: Antony Lesuisse <al@openerp.com>
Date: Tue, 10 Apr 2012 22:30:29 +0200
Subject: [PATCH 085/238] mail restore object link

bzr revid: al@openerp.com-20120410203029-hc32debigx6paxc9
---
 addons/mail/static/src/xml/mail.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/addons/mail/static/src/xml/mail.xml b/addons/mail/static/src/xml/mail.xml
index d97f0738629..c3cd218c8b3 100644
--- a/addons/mail/static/src/xml/mail.xml
+++ b/addons/mail/static/src/xml/mail.xml
@@ -69,6 +69,7 @@
     
     <t t-name="NoteDisplay">
         <p class="oe_mail_msg">
+            <a href="#" class="intlink oe_mail_oe_intlink" t-attf-data-res-model='{params.res_model}' t-attf-data-res-id='{params.res_id}'><t t-raw="record.record_name"/></a>
             <t t-if="params.thread_level > 0">
                 <a href="#" class="intlink oe_mail_oe_intlink" t-attf-data-res-model='{params.res_model}' t-attf-data-res-id='{params.res_id}'><t t-raw="record.record_name"/></a>
             </t>

From c8c4e6252ad50a42ebb41aeb6ff9a5310eb91be8 Mon Sep 17 00:00:00 2001
From: Antony Lesuisse <al@openerp.com>
Date: Wed, 11 Apr 2012 00:10:13 +0200
Subject: [PATCH 086/238] res_partner fix kanabn

bzr revid: al@openerp.com-20120410221013-k98x87b58pzd8tc0
---
 openerp/addons/base/res/res_partner_view.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/openerp/addons/base/res/res_partner_view.xml b/openerp/addons/base/res/res_partner_view.xml
index f2861b7786f..b0ab232aeba 100644
--- a/openerp/addons/base/res/res_partner_view.xml
+++ b/openerp/addons/base/res/res_partner_view.xml
@@ -513,7 +513,7 @@
                                     <img t-att-src="kanban_image('res.partner', 'photo', record.id.value)" width="64" height="64" class="oe_module_icon"/>
                                 </a>
                                     <div class="oe_module_desc">
-                                        <div class="oe_kanban_box_content oe_kanban_color_bglight oe_kanban_box_show_onclick_trigger oe_kanban_color_border">
+                                        <div class="oe_kanban_box_content oe_kanban_box_show_onclick_trigger oe_kanban_color_border">
                                             <table class="oe_kanban_table">
                                                 <tr>
                                                     <td class="oe_kanban_title1" align="left" valign="middle">
@@ -521,7 +521,7 @@
                                                             <div t-if="record.parent_id.raw_value"><field name="parent_id"/></div>
                                                         </h4>
                                                             <i><div t-if="record.contact_address.raw_value"><field name="contact_address"/><br/></div>
-															<div t-if="record.email.raw_value">
+                                                            <div t-if="record.email.raw_value">
                                                             <field name="email"/><br/></div>
                                                             <div t-if="record.mobile.raw_value">
                                                             <field name="mobile"/><br/>

From b01cbdfd56a3c846393e437b5c98b044e679c53b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Wed, 11 Apr 2012 00:18:29 +0200
Subject: [PATCH 087/238] [FIX] Fixed last commit; mail widget already shows
 the link to document in first message of threads on the wall.

bzr revid: tde@openerp.com-20120410221829-gv9zqztps05xt8pg
---
 addons/mail/static/src/xml/mail.xml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/addons/mail/static/src/xml/mail.xml b/addons/mail/static/src/xml/mail.xml
index c3cd218c8b3..d97f0738629 100644
--- a/addons/mail/static/src/xml/mail.xml
+++ b/addons/mail/static/src/xml/mail.xml
@@ -69,7 +69,6 @@
     
     <t t-name="NoteDisplay">
         <p class="oe_mail_msg">
-            <a href="#" class="intlink oe_mail_oe_intlink" t-attf-data-res-model='{params.res_model}' t-attf-data-res-id='{params.res_id}'><t t-raw="record.record_name"/></a>
             <t t-if="params.thread_level > 0">
                 <a href="#" class="intlink oe_mail_oe_intlink" t-attf-data-res-model='{params.res_model}' t-attf-data-res-id='{params.res_id}'><t t-raw="record.record_name"/></a>
             </t>

From 8d985d9cf0050586cee26567d5d88fa4368f44fb Mon Sep 17 00:00:00 2001
From: "Dharti Ratani (OpenERP)" <dhr@tinyerp.com>
Date: Wed, 11 Apr 2012 17:53:15 +0530
Subject: [PATCH 088/238] [im]Corrected url issue

bzr revid: dhr@tinyerp.com-20120411122315-idrxfs4wkd0ejuli
---
 addons/web/static/src/js/view_form.js | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js
index 9abf8fdfbf9..55653151fad 100644
--- a/addons/web/static/src/js/view_form.js
+++ b/addons/web/static/src/js/view_form.js
@@ -1577,7 +1577,11 @@ openerp.web.form.FieldUrl = openerp.web.form.FieldChar.extend({
         if (!this.value) {
             this.do_warn("Resource error", "This resource is empty");
         } else {
-            window.open(this.value);
+            var url = $.trim(this.value);
+            if(url.toLowerCase().search("http://") != -1)
+                window.open(url);
+            else
+                window.open('http://'+url);
         }
     }
 });

From 86fe9e48b82642ce0abc9e1c5b609032d4908255 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Fri, 13 Apr 2012 12:03:27 +0200
Subject: [PATCH 089/238] [IMP] mail.thread: improvement taken from
 trunk-form-v2-fme. mail.group: added demo data. thread widget: updated css
 and html structure. mail security: now for every users, not only employees.
 This will need to be reviewed in details.

bzr revid: tde@openerp.com-20120413100327-2uimy9c1crnfzm6u
---
 addons/mail/__openerp__.py                  |   1 +
 addons/mail/mail_data.xml                   |   2 +-
 addons/mail/mail_group_data.xml             |  13 ++++
 addons/mail/mail_group_view.xml             |   2 +-
 addons/mail/mail_message_view.xml           |   2 +-
 addons/mail/mail_thread_view.xml            |   2 +-
 addons/mail/security/ir.model.access.csv    |   9 +--
 addons/mail/static/src/css/mail.css         |  73 ++++++++++++++------
 addons/mail/static/src/img/groupdefault.png | Bin 19910 -> 3092 bytes
 addons/mail/static/src/js/mail.js           |  20 +++---
 addons/mail/static/src/xml/mail.xml         |  29 ++++++--
 11 files changed, 107 insertions(+), 46 deletions(-)
 create mode 100644 addons/mail/mail_group_data.xml

diff --git a/addons/mail/__openerp__.py b/addons/mail/__openerp__.py
index 88e932299e1..81719794f69 100644
--- a/addons/mail/__openerp__.py
+++ b/addons/mail/__openerp__.py
@@ -66,6 +66,7 @@ The main features are:
         'security/mail_security.xml',
         'security/ir.model.access.csv',
         'mail_data.xml',
+        'mail_group_data.xml',
         'res_users_view.xml',
     ],
     'installable': True,
diff --git a/addons/mail/mail_data.xml b/addons/mail/mail_data.xml
index 964552b951a..c8e8b1a488e 100644
--- a/addons/mail/mail_data.xml
+++ b/addons/mail/mail_data.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data noupdate="1">
-            <record forcecreate="True" id="ir_cron_mail_scheduler_action" model="ir.cron">
+        <record forcecreate="True" id="ir_cron_mail_scheduler_action" model="ir.cron">
             <field name="name">Email Queue Manager</field>
             <field name="user_id" ref="base.user_root"/>
             <field name="interval_number">1</field>
diff --git a/addons/mail/mail_group_data.xml b/addons/mail/mail_group_data.xml
new file mode 100644
index 00000000000..bbaa7748f16
--- /dev/null
+++ b/addons/mail/mail_group_data.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+
+        <record model="mail.group" id="group_all_company">
+            <field name="name">All Company</field>
+        </record>
+        <record model="mail.group" id="group_sales">
+            <field name="name">Sales</field>
+        </record>
+
+    </data>
+</openerp>
diff --git a/addons/mail/mail_group_view.xml b/addons/mail/mail_group_view.xml
index 949dd1cc9b8..ea0dede377d 100644
--- a/addons/mail/mail_group_view.xml
+++ b/addons/mail/mail_group_view.xml
@@ -112,6 +112,6 @@
         </record>
 
         <!-- left-side menu: Groups !-->
-        <menuitem id="mail_allgroups" name="All groups" parent="mail_feeds" sequence="12" action="action_view_groups"/>
+        <menuitem id="mail_allgroups" name="All Groups" parent="mail_feeds" sequence="12" action="action_view_groups"/>
     </data>
 </openerp>
diff --git a/addons/mail/mail_message_view.xml b/addons/mail/mail_message_view.xml
index 7389f8e5488..ecd106e05e5 100644
--- a/addons/mail/mail_message_view.xml
+++ b/addons/mail/mail_message_view.xml
@@ -234,7 +234,7 @@
         <menuitem name="Feeds" id="menu_email_message_all" parent="base.menu_email" action="action_view_all_messages_short" groups="base.group_no_one"/>
 
         <record id="action_mail_all_feeds" model="ir.actions.client">
-            <field name="name">All Feeds</field>
+            <field name="name">Wall</field>
             <field name="tag">mail.all_feeds</field>
             <field name="params" eval="{'search_view_id': ref('view_message_search_wall')}"/>
         </record>
diff --git a/addons/mail/mail_thread_view.xml b/addons/mail/mail_thread_view.xml
index faa6d24ae2c..af0c6cedda1 100644
--- a/addons/mail/mail_thread_view.xml
+++ b/addons/mail/mail_thread_view.xml
@@ -14,7 +14,7 @@
         <!-- left-side menu: Feeds !-->
         <menuitem id="mail_feeds" name="Feeds" parent="mail_feeds_main"/>
         <record id="mail_wallfeeds" model="ir.ui.menu">
-          <field name="name">All Feeds</field>
+          <field name="name">Wall</field>
           <field name="sequence" eval="10"/>
           <field name="action" ref="action_mail_all_feeds"/>
           <field name="parent_id" ref="mail_feeds"/>
diff --git a/addons/mail/security/ir.model.access.csv b/addons/mail/security/ir.model.access.csv
index c305de830c0..3cfd4e88f3d 100644
--- a/addons/mail/security/ir.model.access.csv
+++ b/addons/mail/security/ir.model.access.csv
@@ -1,7 +1,8 @@
 id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
-access_mail_message,mail.message,model_mail_message,base.group_user,1,1,1,1
+access_mail_message,mail.message,model_mail_message,,1,0,1,0
+access_mail_message_all,mail.message.all,model_mail_message,base.group_user,1,1,1,1
 access_mail_thread,mail.thread,model_mail_thread,base.group_user,1,1,1,0
-access_mail_subscription,mail.subscription,model_mail_subscription,base.group_user,1,1,1,1
-access_mail_notification,mail.notification,model_mail_notification,base.group_user,1,1,1,1
+access_mail_subscription,mail.subscription,model_mail_subscription,,1,1,1,1
+access_mail_notification,mail.notification,model_mail_notification,,1,1,1,1
 access_mail_group,mail.group,model_mail_group,base.group_user,1,1,1,1
-access_mail_message_report,mail.message.report,model_mail_message_report,base.group_user,1,0,0,0
+access_mail_message_report,mail.message.report,model_mail_message_report,,1,0,0,0
diff --git a/addons/mail/static/src/css/mail.css b/addons/mail/static/src/css/mail.css
index d920455537f..260b4a230cd 100644
--- a/addons/mail/static/src/css/mail.css
+++ b/addons/mail/static/src/css/mail.css
@@ -4,17 +4,23 @@
 
 div.oe_mail_wall {
     overflow: auto;
-    padding: 5px;
+    padding: 0;
+    background: white;
 }
 
-div.oe_mail_wall_search {
-    width: 55%;
+/*div.oe_mail_wall_search {*/
+    /*width: 550px;*/
+/*}*/
+
+.oe_mail_wall_button_comment {
+    float: right;
 }
 
 /* 2 columns view */
 div.oe_mail_wall_left {
     float: left;
-    width: 65%;
+    width: 560px;
+    margin: 8px;
 }
 
 div.oe_mail_wall_right {
@@ -22,6 +28,10 @@ div.oe_mail_wall_right {
     width: 34%;
 }
 
+.oe_mail_wall_threads {
+    margin-top: 8px;
+}
+
 .oe_mail_wall_thread div.oe_mail_thread_act .oe_mail_action_textarea, div.oe_mail_thread_subthread .oe_mail_action_textarea {
     height: 20px;
     padding: 2px;
@@ -47,16 +57,15 @@ div.oe_mail_wall_more {
 
 .oe_mail_recthread {
     overflow: auto;
-    padding: 5px 5px 5px 5px;
 }
 
 /* Left-side CSS */
 .oe_mail_recthread_actions {
-    margin-bottom: 10px;
+    margin-bottom: 8px;
 }
 
 .oe_mail_recthread_followers {
-    margin-bottom: 10px;
+    margin-bottom: 8px;
 }
 
 .oe_mail_followers_action, .oe_mail_followers_display {
@@ -70,21 +79,16 @@ div.oe_mail_wall_more {
 
 .oe_mail_recthread_right {
     float: right;
-    width: 25%;
-    margin-right: 5%;
+    width: 240px;
 }
 
 .oe_mail_button_follow, .oe_mail_button_unfollow {
-    width: 120px;
+    /*width: 120px;*/
 }
 
 .oe_mail_button_followers {
-    display: inline;
-    width: 120px;
-}
-
-.oe_mail_followers h4 {
-    margin: 0 0 8px;
+    display: inline-block;
+    width: 240px;
 }
 
 /* ------------------------------ */
@@ -99,7 +103,7 @@ div.oe_mail_thread_act {
 
 div.oe_mail_thread_display {
     white-space: normal;
-    margin-bottom: 5px;
+    /*margin-bottom: 5px;*/
 }
 
 div.oe_mail_thread_subthread {
@@ -116,8 +120,7 @@ li.oe_mail_thread_msg {
     padding: 1px;
 }
 
-.notification, .email {
-    background: #E0E0E0;
+.notification, .comment {
     padding: 4px;
     -moz-border-radius: 4px;
     -webkit-border-radius: 4px;
@@ -126,8 +129,16 @@ li.oe_mail_thread_msg {
     border-radius: 4px;
 }
 
-.comment {
-    padding: 4px;
+.oe_mail_thread_msg > .comment {
+    background: #eee;
+}
+
+.oe_mail_thread_subthread .comment {
+    background: white;
+}
+
+.notification {
+    background: #eee;
 }
 
 .notification:after, .email:after, .comment:after {
@@ -215,6 +226,14 @@ input.oe_mail, textarea.oe_mail {
     border-radius: 3px;
 }
 
+.oe_mail_wall .oe_mail_wall_act textarea {
+    width: 550px;
+}
+
+textarea.oe_mail {
+    height: 60px;
+}
+
 input.oe_mail:focus, textarea.oe_mail:focus {
     outline: 0;
     border-color: rgba(82, 168, 236, 0.8);
@@ -246,6 +265,10 @@ p.oe_mail_msg {
     font-weight: bold;
 }
 
+.oe_mail_msg_reply, .oe_mail_msg_delete {
+    margin-right: 4px;
+}
+
 a.oe_mail_oe_intlink {
     color: #8786b7;
 }
@@ -257,3 +280,11 @@ a.oe_mail_oe_intlink {
 .oe_mail_oe_space {
     margin-left: 15px;
 }
+
+
+
+
+.oe_mail_recthread_actions button {
+    width: 120px;
+}
+
diff --git a/addons/mail/static/src/img/groupdefault.png b/addons/mail/static/src/img/groupdefault.png
index fd8268372668a04b43448d520ae7cf670d4cd0c7..cf160022470e0f0d1c8928b9364bf99349bbee45 100644
GIT binary patch
literal 3092
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

literal 19910
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
I7s$*12lZE7KmY&$

diff --git a/addons/mail/static/src/js/mail.js b/addons/mail/static/src/js/mail.js
index fbe817c2c81..dc6bd74c345 100644
--- a/addons/mail/static/src/js/mail.js
+++ b/addons/mail/static/src/js/mail.js
@@ -58,10 +58,8 @@ openerp.mail = function(session) {
     }
 
     /* Add ThreadDisplay widget to registry */
-    session.web.form.widgets.add(
-        'Thread', 'openerp.mail.Thread');
-    session.web.page.readonly.add(
-        'Thread', 'openerp.mail.Thread');
+    session.web.form.widgets.add( 'Thread', 'openerp.mail.Thread');
+    session.web.page.readonly.add( 'Thread', 'openerp.mail.Thread');
 
     /** 
      * ThreadDisplay widget: this widget handles the display of a thread of
@@ -464,10 +462,8 @@ openerp.mail = function(session) {
 
 
     /* Add ThreadView widget to registry */
-    session.web.form.widgets.add(
-        'ThreadView', 'openerp.mail.RecordThread');
-    session.web.page.readonly.add(
-        'ThreadView', 'openerp.mail.RecordThread');
+    session.web.form.widgets.add( 'ThreadView', 'openerp.mail.RecordThread');
+    session.web.page.readonly.add( 'ThreadView', 'openerp.mail.RecordThread');
 
     /* ThreadView widget: thread of comments */
     mail.RecordThread = session.web.form.Field.extend({
@@ -489,9 +485,11 @@ openerp.mail = function(session) {
             // bind buttons
             this.$element.find('button.oe_mail_button_followers').click(function () { self.do_toggle_followers(); }).hide();
             this.$element.find('button.oe_mail_button_follow').click(function () { self.do_follow(); })
-                .mouseover(function () { $(this).html('Follow'); }).mouseleave(function () { $(this).html('Not following'); });
+                .mouseover(function () { $(this).html('Follow').addClass('following'); })
+                .mouseleave(function () { $(this).html('Not following').removeClass('following'); });
             this.$element.find('button.oe_mail_button_unfollow').click(function () { self.do_unfollow(); })
-                .mouseover(function () { $(this).html('Unfollow'); }).mouseleave(function () { $(this).html('Following'); });
+                .mouseover(function () { $(this).html('Unfollow').removeClass('following').addClass('unfollow'); })
+                .mouseleave(function () { $(this).html('Following').removeClass('unfollow').addClass('following'); });
             this.reinit();
         },
 
@@ -642,7 +640,7 @@ openerp.mail = function(session) {
         load_search_view: function (view_id, defaults, hidden) {
             var self = this;
             this.searchview = new session.web.SearchView(this, this.ds_msg, view_id || false, defaults || {}, hidden || false);
-            var search_view_loaded = this.searchview.appendTo(this.$element.find('div.oe_mail_wall_search'));
+            var search_view_loaded = this.searchview.appendTo(this.$element.find('.oe_view_manager_row'));
             return $.when(search_view_loaded).then(function () {
                 self.searchview.on_search.add(self.do_searchview_search);
             });
diff --git a/addons/mail/static/src/xml/mail.xml b/addons/mail/static/src/xml/mail.xml
index 0f49902b6b3..d97f0738629 100644
--- a/addons/mail/static/src/xml/mail.xml
+++ b/addons/mail/static/src/xml/mail.xml
@@ -2,13 +2,17 @@
 <template>
 
     <div t-name="Wall" class="oe_mail_wall">
-        <div class="oe_mail_wall_search">
+        <div class="oe_view_manager_header">
+            <div class="oe_view_manager_row">
+                <h2 class="oe_view_title">All Feeds</h2>
+            </div>
         </div>
         <div class="oe_mail_wall_left">
             <div class="oe_mail_wall_act">
-                <textarea class="oe_mail oe_mail_wall_action_textarea" placeholder="Add a personnal message here..."/><br />
+                <textarea class="oe_mail oe_mail_wall_action_textarea" placeholder="Add a personnal message here..."/>
                 <button class="oe_mail_wall_button_comment" type="button">Post comment</button>
             </div>
+            <div class="oe_clear"></div>
             <div class="oe_mail_wall_threads">
             </div>
             <div class="oe_mail_wall_more">
@@ -28,7 +32,7 @@
         <div class="oe_mail_recthread_right">
             <div class="oe_mail_recthread_actions">
                 <button type="button" class="oe_mail_button_follow">Not following</button>
-                <button type="button" class="oe_mail_button_unfollow">Following</button>
+                <button type="button" class="oe_mail_button_unfollow following">Following</button>
                 <button type="button" class="oe_mail_button_followers">Display followers</button>
             </div>
             <div class="oe_mail_recthread_followers">
@@ -65,7 +69,9 @@
     
     <t t-name="NoteDisplay">
         <p class="oe_mail_msg">
-            <a href="#" class="intlink oe_mail_oe_intlink" t-attf-data-res-model='{params.res_model}' t-attf-data-res-id='{params.res_id}'><t t-raw="record.record_name"/></a>
+            <t t-if="params.thread_level > 0">
+                <a href="#" class="intlink oe_mail_oe_intlink" t-attf-data-res-model='{params.res_model}' t-attf-data-res-id='{params.res_id}'><t t-raw="record.record_name"/></a>
+            </t>
             <span class="oe_mail_msg_body"><t t-raw="record.body"/></span>
             <t t-if="record.tr_body"><span class="oe_mail_msg_body_short"><t t-raw="record.tr_body"/></span></t>
             <br />
@@ -73,9 +79,9 @@
                 <a href="#" class="intlink oe_mail_oe_intlink" data-res-model='res.users' t-attf-data-res-id='{record.user_id[0]}'><t t-raw="record.user_id[1]"/></a>
                 on <t t-raw="record.date"/>
             </span>
-            <t t-if="display['show_reply']"><span class="oe_mail_oe_space"><a href="#" class="oe_mail_msg_reply oe_mail_oe_intlink">Reply</a></span></t>
+            <t t-if="display['show_reply']"><a href="#" class="oe_mail_msg_reply oe_mail_oe_intlink"> Reply</a> </t>
             <t t-if="display['show_delete']">
-                <t t-if="thread._is_author(record.user_id[0])"><span class="oe_mail_oe_space"><a href="#" t-attf-data-id='{record.id}' class="oe_mail_msg_delete oe_mail_oe_intlink">Delete</a></span></t>
+                <t t-if="thread._is_author(record.user_id[0])"><a href="#" t-attf-data-id='{record.id}' class="oe_mail_msg_delete oe_mail_oe_intlink"> Delete </a></t>
             </t>
             <t t-if="display['show_hide']">
                 <t t-if="!(thread._is_author(record.user_id[0]))"><span class="oe_mail_oe_space"><a href="#" t-attf-data-id='{record.id}' class="oe_mail_msg_hide oe_mail_oe_intlink">Hide</a></span></t>
@@ -85,6 +91,10 @@
     
     <t t-name="EmailDisplay">
         <p class="oe_mail_msg oe_mail_msg_p_email_header">
+            <t t-if="params.thread_level > 0">
+                <a href="#" class="intlink oe_mail_oe_intlink" t-attf-data-res-model='{params.res_model}' t-attf-data-res-id='{params.res_id}'><t t-raw="record.record_name"/></a>
+            </t>
+            <br />
             <span class="oe_mail_oe_bold">From:</span> <t t-esc="record.email_from"/> on <span class="oe_mail_oe_fade"><t t-raw="record.date"/></span><br />
             <span class="oe_mail_oe_bold">To:</span> <t t-esc="record.email_to"/><br />
             <span class="oe_mail_oe_bold">Subject:</span> <t t-esc="record.subject"/><br />
@@ -92,6 +102,13 @@
         <p class="oe_mail_msg">
             <span class="oe_mail_msg_body"><t t-raw="record.body"/></span>
             <t t-if="record.tr_body"><span class="oe_mail_msg_body_short"><t t-raw="record.tr_body"/></span></t>
+            <br />
+            <t t-if="display['show_delete']">
+                <t t-if="thread._is_author(record.user_id[0])"><a href="#" t-attf-data-id='{record.id}' class="oe_mail_msg_delete oe_mail_oe_intlink"> Delete </a></t>
+            </t>
+            <t t-if="display['show_hide']">
+                <t t-if="!(thread._is_author(record.user_id[0]))"><span class="oe_mail_oe_space"><a href="#" t-attf-data-id='{record.id}' class="oe_mail_msg_hide oe_mail_oe_intlink">Hide</a></span></t>
+            </t>
         </p>
     </t>
 

From 77ded11094688a8624e0a21b61d376d33534625c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Fri, 13 Apr 2012 13:41:26 +0200
Subject: [PATCH 090/238] [CLEAN] Thrad widget: cleaned CSS file.

bzr revid: tde@openerp.com-20120413114126-4rls0wlbpe71m8ao
---
 addons/mail/static/src/css/mail.css | 190 ++++++++++++++--------------
 addons/mail/static/src/js/mail.js   |   8 +-
 addons/mail/static/src/xml/mail.xml |  14 +-
 3 files changed, 104 insertions(+), 108 deletions(-)

diff --git a/addons/mail/static/src/css/mail.css b/addons/mail/static/src/css/mail.css
index 260b4a230cd..e496c0b3990 100644
--- a/addons/mail/static/src/css/mail.css
+++ b/addons/mail/static/src/css/mail.css
@@ -2,125 +2,159 @@
 /* Wall                           */
 /* ------------------------------ */
 
-div.oe_mail_wall {
+.openerp div.oe_mail_wall {
     overflow: auto;
     padding: 0;
     background: white;
 }
 
-/*div.oe_mail_wall_search {*/
-    /*width: 550px;*/
-/*}*/
-
-.oe_mail_wall_button_comment {
-    float: right;
-}
-
 /* 2 columns view */
-div.oe_mail_wall_left {
+.openerp div.oe_mail_wall_left {
     float: left;
     width: 560px;
     margin: 8px;
 }
 
-div.oe_mail_wall_right {
-    float: right;
-    width: 34%;
+.openerp div.oe_mail_wall_right {
+    margin-left: 565px;
+    margin: 8px;
 }
 
-.oe_mail_wall_threads {
+.openerp div.oe_mail_wall_threads {
     margin-top: 8px;
 }
 
-.oe_mail_wall_thread div.oe_mail_thread_act .oe_mail_action_textarea, div.oe_mail_thread_subthread .oe_mail_action_textarea {
+.openerp textarea.oe_mail_wall_action_textarea {
+    width: 550px;
+    height: 60px;
+    padding: 5px;
+}
+
+.openerp div.oe_mail_wall_threads textarea {
     height: 20px;
     padding: 2px;
 }
 
-.oe_mail_thread_subthread div.oe_mail_thread_act .oe_mail_msg_image, .oe_mail_thread_subthread div.oe_mail_thread_display .oe_mail_msg_image {
+.openerp div.oe_mail_thread_subthread img {
     width: 30px;
     height: 30px;
 }
 
-.oe_mail_thread_subthread .oe_mail_msg_content, .oe_mail_thread_subthread .oe_mail_msg_content {
+.openerp div.oe_mail_thread_subthread div.oe_mail_msg_content {
     margin-left: 40px;
 }
 
-div.oe_mail_wall_more {
+.openerp div.oe_mail_wall_more {
     text-align: center;
     display: none;
 }
 
+
 /* ------------------------------ */
 /* RecordThread                   */
 /* ------------------------------ */
 
-.oe_mail_recthread {
+.openerp div.oe_mail_recthread {
     overflow: auto;
 }
 
 /* Left-side CSS */
-.oe_mail_recthread_actions {
+.openerp div.oe_mail_recthread_actions {
     margin-bottom: 8px;
 }
 
-.oe_mail_recthread_followers {
+.openerp div.oe_mail_recthread_followers {
     margin-bottom: 8px;
 }
 
-.oe_mail_followers_action, .oe_mail_followers_display {
-}
-
 /* RecordThread: 2 columns view */
-.oe_mail_recthread_left {
+.openerp div.oe_mail_recthread_left {
     float: left;
     width: 55%;
 }
 
-.oe_mail_recthread_right {
+.openerp div.oe_mail_recthread_right {
     float: right;
     width: 240px;
 }
 
-.oe_mail_button_follow, .oe_mail_button_unfollow {
-    /*width: 120px;*/
+.openerp div.oe_mail_recthread_actions button {
+    width: 120px;
 }
 
-.oe_mail_button_followers {
+.openerp button.oe_mail_button_followers {
     display: inline-block;
-    width: 240px;
+}
+
+.openerp button.oe_mail_button_mouseout {
+  color: white;
+  background-color: #8a89ba;
+  background-image: -webkit-gradient(linear, left top, left bottom, from(#8a89ba), to(#807fb4));
+  background-image: -webkit-linear-gradient(top, #8a89ba, #807fb4);
+  background-image: -moz-linear-gradient(top, #8a89ba, #807fb4);
+  background-image: -ms-linear-gradient(top, #8a89ba, #807fb4);
+  background-image: -o-linear-gradient(top, #8a89ba, #807fb4);
+  background-image: linear-gradient(to bottom, #8a89ba, #807fb4);
+}
+
+.openerp button.oe_mail_button_mouseover {
+  display: none;
+  color: white;
+  background-color: #dc5f59;
+  background-image: -webkit-gradient(linear, left top, left bottom, from(#dc5f59), to(#b33630));
+  background-image: -webkit-linear-gradient(top, #dc5f59, #b33630);
+  background-image: -moz-linear-gradient(top, #dc5f59, #b33630);
+  background-image: -ms-linear-gradient(top, #dc5f59, #b33630);
+  background-image: -o-linear-gradient(top, #dc5f59, #b33630);
+  background-image: linear-gradient(to bottom, #dc5f59, #b33630);
+}
+
+.openerp textarea.oe_mail_action_textarea {
+    height: 60px;
+    padding: 5px;
 }
 
 /* ------------------------------ */
 /* ThreadDisplay                  */
 /* ------------------------------ */
 
-div.oe_mail_thread_act {
+.openerp div.oe_mail_thread_act {
     white-space: normal;
     margin-bottom: 5px;
     padding: 4px;
 }
 
-div.oe_mail_thread_display {
-    white-space: normal;
-    /*margin-bottom: 5px;*/
+.openerp div.oe_mail_thread_act:after {
+    content: "";
+    display: block;
+    clear: both; 
 }
 
-div.oe_mail_thread_subthread {
+.openerp div.oe_mail_thread_display {
+    white-space: normal;
+}
+
+.openerp div.oe_mail_thread_subthread {
     margin-top: 8px;
     padding-left: 5%;
 }
 
-div.oe_mail_thread_more {
+.openerp div.oe_mail_thread_more {
     display: none;
     border-bottom: 1px solid #D2D9E7;
 }
 
-li.oe_mail_thread_msg {
+.openerp li.oe_mail_thread_msg {
     padding: 1px;
 }
 
-.notification, .comment {
+.openerp li.oe_mail_thread_msg:after {
+    content: "";
+    display: block;
+    clear: both; 
+}
+
+.openerp .notification, .openerp .comment.openerp .notification, .openerp .email {
     padding: 4px;
     -moz-border-radius: 4px;
     -webkit-border-radius: 4px;
@@ -129,46 +163,35 @@ li.oe_mail_thread_msg {
     border-radius: 4px;
 }
 
-.oe_mail_thread_msg > .comment {
+.openerp li.oe_mail_thread_msg > .comment {
     background: #eee;
 }
 
-.oe_mail_thread_subthread .comment {
+.openerp div.oe_mail_thread_subthread .comment {
     background: white;
 }
 
-.notification {
+.openerp .notification {
     background: #eee;
 }
 
-.notification:after, .email:after, .comment:after {
+.openerp .notification:after, .openerp .comment:after, .openerp .email:after {
     content: "";
     display: block;
     clear: both; 
 }
 
-li.oe_mail_thread_msg:after, div.oe_mail_thread_act:after {
-    content: "";
-    display: block;
-    clear: both; 
-}
-
-.oe_mail_msg_content {
+.openerp .oe_mail_msg_content {
     margin-left: 60px;
 }
 
-.oe_mail_msg_content:after {
+.openerp .oe_mail_msg_content:after {
     content: "";
     display: block;
     clear: both; 
 }
 
-.oe_mail_action_textarea {
-    height: 50px;
-    padding: 5px;
-}
-
-.oe_mail_msg_image {
+.openerp img.oe_mail_msg_image {
     margin-right: 8px;
     width: 45px;
     height: 45px;
@@ -186,11 +209,11 @@ li.oe_mail_thread_msg:after, div.oe_mail_thread_act:after {
     clip: rect(5px, 40px, 45px, 0px);
 }
 
-p.oe_mail_msg_p_email_header {
+.openerp p.oe_mail_msg_p_email_header {
     border-bottom: 1px solid #D2D9E7;
 }
 
-.oe_mail_msg_body a.reduce, .oe_mail_msg_body_short a.expand {
+.openerp span.oe_mail_msg_body a.reduce, .openerp span.oe_mail_msg_body_short a.expand {
     color: #4E43E7;
 }
 
@@ -198,17 +221,17 @@ p.oe_mail_msg_p_email_header {
 /* Styling (should be openerp)    */
 /* ------------------------------ */
 
-ul.oe_mail {
+.openerp ul.oe_mail {
     padding: 0;
     margin: 0;
 }
 
-li.oe_mail {
+.openerp li.oe_mail {
     list-style-type: none;
     margin-bottom: 2px;
 }
 
-input.oe_mail, textarea.oe_mail {
+.openerp input.oe_mail, textarea.oe_mail {
     width: 100%;
     padding: 4px;
     font-size: 12px;
@@ -226,15 +249,7 @@ input.oe_mail, textarea.oe_mail {
     border-radius: 3px;
 }
 
-.oe_mail_wall .oe_mail_wall_act textarea {
-    width: 550px;
-}
-
-textarea.oe_mail {
-    height: 60px;
-}
-
-input.oe_mail:focus, textarea.oe_mail:focus {
+.openerp input.oe_mail:focus, textarea.oe_mail:focus {
     outline: 0;
     border-color: rgba(82, 168, 236, 0.8);
     -moz-box-shadow: inset 0 1px 3px rgba(0, 0, 0, 0.1), 0 0 8px rgba(82, 168, 236, 0.6);
@@ -242,49 +257,30 @@ input.oe_mail:focus, textarea.oe_mail:focus {
     -box-shadow: inset 0 1px 3px rgba(0, 0, 0, 0.1), 0 0 8px rgba(82, 168, 236, 0.6);
 }
 
-p.oe_mail_msg {
+.openerp p.oe_mail_msg {
     padding: 0;
     margin: 0;
 }
 
-.oe_mail_oe_right {
+.openerp .oe_mail_oe_right {
     float: right;
     margin-right: 8px;
 }
 
-.oe_mail_oe_left {
+.openerp .oe_mail_oe_left {
     float: left;
     margin-right: 8px;
 }
 
-.oe_mail_oe_fade {
-    color: #888888;
-}
-
-.oe_mail_oe_bold {
-    font-weight: bold;
-}
-
-.oe_mail_msg_reply, .oe_mail_msg_delete {
-    margin-right: 4px;
-}
-
-a.oe_mail_oe_intlink {
+.openerp a.oe_mail_oe_intlink {
     color: #8786b7;
 }
 
-.oe_mail_oe_warning, .oe_mail_oe_warning a {
-    color: #C03000;
+.openerp .oe_mail_oe_bold {
+    font-weight: bold;
 }
 
-.oe_mail_oe_space {
+.openerp .oe_mail_oe_space {
     margin-left: 15px;
+    margin-right: 4px;
 }
-
-
-
-
-.oe_mail_recthread_actions button {
-    width: 120px;
-}
-
diff --git a/addons/mail/static/src/js/mail.js b/addons/mail/static/src/js/mail.js
index dc6bd74c345..c29b81fc097 100644
--- a/addons/mail/static/src/js/mail.js
+++ b/addons/mail/static/src/js/mail.js
@@ -485,11 +485,11 @@ openerp.mail = function(session) {
             // bind buttons
             this.$element.find('button.oe_mail_button_followers').click(function () { self.do_toggle_followers(); }).hide();
             this.$element.find('button.oe_mail_button_follow').click(function () { self.do_follow(); })
-                .mouseover(function () { $(this).html('Follow').addClass('following'); })
-                .mouseleave(function () { $(this).html('Not following').removeClass('following'); });
+                .mouseover(function () { $(this).html('Follow').removeClass('oe_mail_button_mouseout').addClass('oe_mail_button_mouseover'); })
+                .mouseleave(function () { $(this).html('Not following').removeClass('oe_mail_button_mouseover').addClass('oe_mail_button_mouseout'); });
             this.$element.find('button.oe_mail_button_unfollow').click(function () { self.do_unfollow(); })
-                .mouseover(function () { $(this).html('Unfollow').removeClass('following').addClass('unfollow'); })
-                .mouseleave(function () { $(this).html('Following').removeClass('unfollow').addClass('following'); });
+                .mouseover(function () { $(this).html('Unfollow').removeClass('oe_mail_button_mouseout').addClass('oe_mail_button_mouseover'); })
+                .mouseleave(function () { $(this).html('Following').removeClass('oe_mail_button_mouseover').addClass('oe_mail_button_mouseout'); });
             this.reinit();
         },
 
diff --git a/addons/mail/static/src/xml/mail.xml b/addons/mail/static/src/xml/mail.xml
index d97f0738629..6505b2cd88b 100644
--- a/addons/mail/static/src/xml/mail.xml
+++ b/addons/mail/static/src/xml/mail.xml
@@ -10,7 +10,7 @@
         <div class="oe_mail_wall_left">
             <div class="oe_mail_wall_act">
                 <textarea class="oe_mail oe_mail_wall_action_textarea" placeholder="Add a personnal message here..."/>
-                <button class="oe_mail_wall_button_comment" type="button">Post comment</button>
+                <button class="oe_mail_oe_right oe_mail_wall_button_comment" type="button">Post comment</button>
             </div>
             <div class="oe_clear"></div>
             <div class="oe_mail_wall_threads">
@@ -31,8 +31,8 @@
         </div>
         <div class="oe_mail_recthread_right">
             <div class="oe_mail_recthread_actions">
-                <button type="button" class="oe_mail_button_follow">Not following</button>
-                <button type="button" class="oe_mail_button_unfollow following">Following</button>
+                <button type="button" class="oe_mail_button_follow oe_mail_button_mouseout">Not following</button>
+                <button type="button" class="oe_mail_button_unfollow oe_mail_button_mouseout">Following</button>
                 <button type="button" class="oe_mail_button_followers">Display followers</button>
             </div>
             <div class="oe_mail_recthread_followers">
@@ -47,7 +47,7 @@
         <div class="oe_mail_thread_act">
             <img class="oe_mail_msg_image oe_mail_oe_left" alt="User img"/>
             <div class="oe_mail_msg_content">
-                <textarea class="oe_mail_action_textarea oe_mail" placeholder="Add your comment here..." onfocus="this.value = '';"/><br />
+                <textarea class="oe_mail oe_mail_action_textarea" placeholder="Add your comment here..." onfocus="this.value = '';"/><br />
             </div>
         </div>
         <div class="oe_mail_thread_display"></div>
@@ -79,12 +79,12 @@
                 <a href="#" class="intlink oe_mail_oe_intlink" data-res-model='res.users' t-attf-data-res-id='{record.user_id[0]}'><t t-raw="record.user_id[1]"/></a>
                 on <t t-raw="record.date"/>
             </span>
-            <t t-if="display['show_reply']"><a href="#" class="oe_mail_msg_reply oe_mail_oe_intlink"> Reply</a> </t>
+            <t t-if="display['show_reply']"><a href="#" class="oe_mail_oe_space oe_mail_msg_reply oe_mail_oe_intlink"> Reply</a> </t>
             <t t-if="display['show_delete']">
-                <t t-if="thread._is_author(record.user_id[0])"><a href="#" t-attf-data-id='{record.id}' class="oe_mail_msg_delete oe_mail_oe_intlink"> Delete </a></t>
+                <t t-if="thread._is_author(record.user_id[0])"><a href="#" t-attf-data-id='{record.id}' class="oe_mail_oe_space oe_mail_msg_delete oe_mail_oe_intlink"> Delete </a></t>
             </t>
             <t t-if="display['show_hide']">
-                <t t-if="!(thread._is_author(record.user_id[0]))"><span class="oe_mail_oe_space"><a href="#" t-attf-data-id='{record.id}' class="oe_mail_msg_hide oe_mail_oe_intlink">Hide</a></span></t>
+                <t t-if="!(thread._is_author(record.user_id[0]))"><a href="#" t-attf-data-id='{record.id}' class="oe_mail_oe_space oe_mail_msg_hide oe_mail_oe_intlink">Hide</a></t>
             </t>
         </p>
     </t>

From 8184c0da0bc82376fc8d00f2cfd5379a96a588d1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Fri, 13 Apr 2012 14:00:10 +0200
Subject: [PATCH 091/238] [FIX] Wall: fixed post button exceeding its parent
 container due to unknown oe_clear class in trunk. Added :after to clear the
 view.

bzr revid: tde@openerp.com-20120413120010-3s6mvkql0wy8kn9n
---
 addons/mail/static/src/css/mail.css | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/addons/mail/static/src/css/mail.css b/addons/mail/static/src/css/mail.css
index e496c0b3990..ca6f1f3e70a 100644
--- a/addons/mail/static/src/css/mail.css
+++ b/addons/mail/static/src/css/mail.css
@@ -8,6 +8,12 @@
     background: white;
 }
 
+.openerp div.oe_mail_wall_act:after {
+    content: "";
+    display: block;
+    clear: both; 
+}
+
 /* 2 columns view */
 .openerp div.oe_mail_wall_left {
     float: left;

From 514793c2fb540ddceb12a0cbcf190d039cbe4cb2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Fri, 13 Apr 2012 14:16:50 +0200
Subject: [PATCH 092/238] [IMP] mail.thread: users now receive no emails for
 notifications by default. Todo: find a good policy.

bzr revid: tde@openerp.com-20120413121650-hu6tdmqca84sj98x
---
 addons/mail/res_users.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/mail/res_users.py b/addons/mail/res_users.py
index 6efb218a658..5b84fad24e7 100644
--- a/addons/mail/res_users.py
+++ b/addons/mail/res_users.py
@@ -41,7 +41,7 @@ class res_users(osv.osv):
     }
     
     _defaults = {
-        'notification_email_pref': 'all',
+        'notification_email_pref': 'none',
     }
     
     def __init__(self, pool, cr):

From 9dc1810e644fa72dcef4bf7228342608172c1cbc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Fri, 13 Apr 2012 14:25:30 +0200
Subject: [PATCH 093/238] [IMP] mail.thread: cleaned css class name; cleaned a
 small bug in message display.

bzr revid: tde@openerp.com-20120413122530-kst3ho792hymr4p6
---
 addons/mail/static/src/css/mail.css | 16 +++++++++++-----
 addons/mail/static/src/xml/mail.xml |  6 +++---
 2 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/addons/mail/static/src/css/mail.css b/addons/mail/static/src/css/mail.css
index ca6f1f3e70a..4ba5deba040 100644
--- a/addons/mail/static/src/css/mail.css
+++ b/addons/mail/static/src/css/mail.css
@@ -160,7 +160,13 @@
     clear: both; 
 }
 
-.openerp .notification, .openerp .comment.openerp .notification, .openerp .email {
+.openerp li.oe_mail_thread_msg > div:after {
+    content: "";
+    display: block;
+    clear: both; 
+}
+
+.openerp .oe_mail_msg_notification, .openerp .oe_mail_msg_comment, .openerp .oe_mail_msg_email {
     padding: 4px;
     -moz-border-radius: 4px;
     -webkit-border-radius: 4px;
@@ -169,19 +175,19 @@
     border-radius: 4px;
 }
 
-.openerp li.oe_mail_thread_msg > .comment {
+.openerp li.oe_mail_thread_msg > .oe_mail_msg_comment {
     background: #eee;
 }
 
-.openerp div.oe_mail_thread_subthread .comment {
+.openerp div.oe_mail_thread_subthread .oe_mail_msg_comment {
     background: white;
 }
 
-.openerp .notification {
+.openerp .oe_mail_msg_notification {
     background: #eee;
 }
 
-.openerp .notification:after, .openerp .comment:after, .openerp .email:after {
+.openerp .oe_mail_msg_notification:after, .openerp .oe_mail_msg_comment:after, .openerp .oe_mail_msg_email:after {
     content: "";
     display: block;
     clear: both; 
diff --git a/addons/mail/static/src/xml/mail.xml b/addons/mail/static/src/xml/mail.xml
index 6505b2cd88b..f034b04311d 100644
--- a/addons/mail/static/src/xml/mail.xml
+++ b/addons/mail/static/src/xml/mail.xml
@@ -43,7 +43,7 @@
         </div>
     </div>
 
-    <ul t-name="Thread" class="oe_mail_thread oe_mail">
+    <ul t-name="Thread" class="oe_mail oe_mail_thread">
         <div class="oe_mail_thread_act">
             <img class="oe_mail_msg_image oe_mail_oe_left" alt="User img"/>
             <div class="oe_mail_msg_content">
@@ -56,8 +56,8 @@
         </div>
     </ul>
 
-    <li t-name="ThreadMsg" t-attf-class="oe_mail_thread_msg oe_mail">
-        <div t-attf-class="{record.type}">
+    <li t-name="ThreadMsg" t-attf-class="oe_mail oe_mail_thread_msg">
+        <div t-attf-class="oe_mail_msg_#{record.type}">
             <img class="oe_mail_msg_image oe_mail_oe_left" t-att-src="record.mini_url"/>
             <div class="oe_mail_msg_content">
                 <t t-if="record.type == 'email'"><t t-call="EmailDisplay" /></t>

From c1d9ea578d6b1e1f2d85b391e059db7c77988813 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Fri, 13 Apr 2012 14:53:18 +0200
Subject: [PATCH 094/238] [REM] Temporarily removed broadcasting when creating
 an user.

bzr revid: tde@openerp.com-20120413125318-ntbema0ngp5gwdep
---
 addons/mail/res_users.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/addons/mail/res_users.py b/addons/mail/res_users.py
index 5b84fad24e7..05bc4213e85 100644
--- a/addons/mail/res_users.py
+++ b/addons/mail/res_users.py
@@ -63,7 +63,8 @@ class res_users(osv.osv):
         # create a welcome message to broadcast
         company_name = user.company_id.name if user.company_id else 'the company'
         message = _('%s has joined %s! You may leave him/her a message to celebrate a new arrival in the company ! You can help him/her doing its first steps on OpenERP.') % (user.name, company_name)
-        self.message_broadcast(cr, uid, [user.id], 'Welcome notification', message, context=context)
+        # TODO: clean the broadcast feature. As this is not cleany specified, temporarily remove the message broadcasting that is not buggy but not very nice.
+        #self.message_broadcast(cr, uid, [user.id], 'Welcome notification', message, context=context)
         return user_id
 
     def message_load_ids(self, cr, uid, ids, limit=100, offset=0, domain=[], ascent=False, root_ids=[False], context=None):

From c83f54289d23978927bde3e5fc04a3c7bfb602ac Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Fri, 13 Apr 2012 17:01:22 +0200
Subject: [PATCH 095/238] [FIX] share: invite button added to mail.thread has
 the same style as '(un)follow' button.

bzr revid: tde@openerp.com-20120413150122-zdkzu9cmzpq8xors
---
 addons/mail/static/src/css/mail.css   | 4 ++--
 addons/share/static/src/css/share.css | 1 -
 addons/share/static/src/xml/share.xml | 4 ++--
 3 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/addons/mail/static/src/css/mail.css b/addons/mail/static/src/css/mail.css
index 4ba5deba040..7f0cc6f222c 100644
--- a/addons/mail/static/src/css/mail.css
+++ b/addons/mail/static/src/css/mail.css
@@ -81,7 +81,7 @@
 
 .openerp div.oe_mail_recthread_right {
     float: right;
-    width: 240px;
+    width: 250px;
 }
 
 .openerp div.oe_mail_recthread_actions button {
@@ -89,7 +89,7 @@
 }
 
 .openerp button.oe_mail_button_followers {
-    display: inline-block;
+    display: inline;
 }
 
 .openerp button.oe_mail_button_mouseout {
diff --git a/addons/share/static/src/css/share.css b/addons/share/static/src/css/share.css
index 379b3fbb86b..2cab9c6d2f2 100644
--- a/addons/share/static/src/css/share.css
+++ b/addons/share/static/src/css/share.css
@@ -1,5 +1,4 @@
 button.oe-share-mail {
-    width: 120px;
     display: none;
 }
 
diff --git a/addons/share/static/src/xml/share.xml b/addons/share/static/src/xml/share.xml
index d79c2d8501e..df9cb165c36 100644
--- a/addons/share/static/src/xml/share.xml
+++ b/addons/share/static/src/xml/share.xml
@@ -11,8 +11,8 @@
     </t>
 
     <t t-extend="RecordThread">
-        <t t-jquery=".oe_mail_button_follow" t-operation="before">
-            <button type="button" class="oe-share-mail">Invite</button>
+        <t t-jquery="button.oe_mail_button_unfollow" t-operation="after">
+            <button type="button" class="oe-share-mail oe_mail_button_mouseout">Invite</button>
         </t>
     </t>
 

From 77847d4b21d444f9e95b4048ba5822c97f4dce5a Mon Sep 17 00:00:00 2001
From: "Quentin (OpenERP)" <qdp-launchpad@openerp.com>
Date: Mon, 16 Apr 2012 10:12:56 +0200
Subject: [PATCH 096/238] [FIX] account: fixed bad default values for chart of
 accounts/taxes in reporting wizards

bzr revid: qdp-launchpad@openerp.com-20120416081256-kzznkz5rtibwa0fy
---
 addons/account/wizard/account_report_common.py | 3 ++-
 addons/account/wizard/account_vat.py           | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/addons/account/wizard/account_report_common.py b/addons/account/wizard/account_report_common.py
index 79cfa7236b6..b7d143eb740 100644
--- a/addons/account/wizard/account_report_common.py
+++ b/addons/account/wizard/account_report_common.py
@@ -110,7 +110,8 @@ class account_common_report(osv.osv_memory):
         return res
 
     def _get_account(self, cr, uid, context=None):
-        accounts = self.pool.get('account.account').search(cr, uid, [('parent_id', '=', False)], limit=1)
+        user = self.pool.get('res.users').browse(cr, uid, uid, context=context)
+        accounts = self.pool.get('account.account').search(cr, uid, [('parent_id', '=', False), ('company_id', '=', user.company_id.id)], limit=1)
         return accounts and accounts[0] or False
 
     def _get_fiscalyear(self, cr, uid, context=None):
diff --git a/addons/account/wizard/account_vat.py b/addons/account/wizard/account_vat.py
index 0770cbe246c..85fce5de000 100644
--- a/addons/account/wizard/account_vat.py
+++ b/addons/account/wizard/account_vat.py
@@ -34,7 +34,8 @@ class account_vat_declaration(osv.osv_memory):
     }
 
     def _get_tax(self, cr, uid, context=None):
-        taxes = self.pool.get('account.tax.code').search(cr, uid, [('parent_id', '=', False)], limit=1)
+        user = self.pool.get('res.users').browse(cr, uid, uid, context=context)
+        taxes = self.pool.get('account.tax.code').search(cr, uid, [('parent_id', '=', False), ('company_id', '=', user.company_id.id)], limit=1)
         return taxes and taxes[0] or False
 
     _defaults = {

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

bzr revid: tde@openerp.com-20120416081805-wz85d6sxd90n472b
---
 addons/mail/doc/index.rst         | 10 ++++++++--
 addons/mail/doc/index.rst.inc     |  3 ++-
 addons/mail/doc/mail_thread.rst   |  1 +
 addons/mail/static/src/js/mail.js |  6 +++++-
 4 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/addons/mail/doc/index.rst b/addons/mail/doc/index.rst
index b9217c42443..033b1241af6 100644
--- a/addons/mail/doc/index.rst
+++ b/addons/mail/doc/index.rst
@@ -1,6 +1,12 @@
-:orphan:
-
 Mail module documentation
 =========================
 
+The Mail module holds all models and logic related to messages management. At low-level, it handles messages and offers an API to message queues for email sending. At an higher level, it provides the OpenChatter feature that is a thread management system inside OpenERP. A model that inherits from the mail module adds OpenChatter to its document. Its gives them the following capabilities :
+
+ - messages management with a threaded design
+ - subscription mechanism tha allow users to follow/unfollow documents
+ - notifications mechanism; notifications are pushed to users to form a Wall page holding the latest pushed messages
+
+The mail module also comes with an email composition wizard, along with discussion groups.
+
 .. include:: index.rst.inc
diff --git a/addons/mail/doc/index.rst.inc b/addons/mail/doc/index.rst.inc
index 700c91c7d4f..6816b756759 100644
--- a/addons/mail/doc/index.rst.inc
+++ b/addons/mail/doc/index.rst.inc
@@ -4,5 +4,6 @@ Mail Module
 
 .. toctree::
    :maxdepth: 1
-
+   
+   mail_message
    mail_thread
diff --git a/addons/mail/doc/mail_thread.rst b/addons/mail/doc/mail_thread.rst
index f21d66da295..fd596c06689 100644
--- a/addons/mail/doc/mail_thread.rst
+++ b/addons/mail/doc/mail_thread.rst
@@ -10,6 +10,7 @@ mail.group
 
 A mail_group is a collection of users sharing messages in a discussion group. Group users are users that follow the mail group, using the subscription/follow mechanism of OpenSocial. A mail group has nothing in common wih res.users.group.
 Additional information on fields:
+
  - ``member_ids``: user member of the groups are calculated with ``message_get_subscribers`` method from mail.thread
  - ``member_count``: calculated with member_ids
  - ``is_subscriber``: calculated with member_ids
diff --git a/addons/mail/static/src/js/mail.js b/addons/mail/static/src/js/mail.js
index c29b81fc097..326225b6b24 100644
--- a/addons/mail/static/src/js/mail.js
+++ b/addons/mail/static/src/js/mail.js
@@ -388,6 +388,11 @@ openerp.mail = function(session) {
             return this.fetch_comments(this.params.limit, this.params.offset, domain);
         },
         
+        /**
+         *
+         * var regex_login = new RegExp(/(^|\s)@((\w|@|\.)*)/g);
+         * var regex_intlink = new RegExp(/(^|\s)#(\w*[a-zA-Z_]+\w*)\.(\w+[a-zA-Z_]+\w*),(\w+)/g);
+         */
         do_replace_internal_links: function (string) {
             var self = this;
             var icon_list = ['al', 'pinky']
@@ -427,7 +432,6 @@ openerp.mail = function(session) {
         
         /**
          *
-         * var regex_login = new RegExp(/(^|\s)@(\w*[a-zA-Z_.]+\w*\s)/g);
          * var regex_login = new RegExp(/(^|\s)@((\w|@|\.)*)/g);
          * var regex_intlink = new RegExp(/(^|\s)#(\w*[a-zA-Z_]+\w*)\.(\w+[a-zA-Z_]+\w*),(\w+)/g);
          */

From b7fa2c39b4f16c1d47762d993fbc5fcf122da436 Mon Sep 17 00:00:00 2001
From: Olivier Dony <odo@openerp.com>
Date: Mon, 16 Apr 2012 11:19:35 +0200
Subject: [PATCH 098/238] [REM] Remove PO files from deleted modules after
 disabling their LP translations templates

bzr revid: odo@openerp.com-20120416091935-oj1ittk5606uzc30
---
 addons/fetchmail_crm/i18n/pt.po       | 36 ---------------------------
 addons/fetchmail_crm_claim/i18n/ja.po | 34 -------------------------
 2 files changed, 70 deletions(-)
 delete mode 100644 addons/fetchmail_crm/i18n/pt.po
 delete mode 100644 addons/fetchmail_crm_claim/i18n/ja.po

diff --git a/addons/fetchmail_crm/i18n/pt.po b/addons/fetchmail_crm/i18n/pt.po
deleted file mode 100644
index cca065c3ac3..00000000000
--- a/addons/fetchmail_crm/i18n/pt.po
+++ /dev/null
@@ -1,36 +0,0 @@
-# Portuguese 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-12 21:01+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Portuguese <pt@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-13 05:26+0000\n"
-"X-Generator: Launchpad (build 15070)\n"
-
-#. module: fetchmail_crm
-#: model:ir.actions.act_window,name:fetchmail_crm.action_create_crm_leads_from_email_account
-msgid "Create Leads from Email Account"
-msgstr "Criar dicas a partir de Conta de Email"
-
-#. module: fetchmail_crm
-#: model:ir.actions.act_window,help:fetchmail_crm.action_create_crm_leads_from_email_account
-msgid ""
-"You can connect your email account with leads in OpenERP. A new email sent "
-"to this account (example: info@mycompany.com) will automatically create a "
-"lead in OpenERP. The whole communication with the salesman will be attached "
-"to the lead automatically."
-msgstr ""
-"Pode interligar a sua conta de email com dicas com o OpenERP. Um novo email "
-"enviado para esta conta (exemplo: info@minhaempresa.com) irá gerar "
-"automáticamente uma dica no OpenERP. Todas as comunicações com o vendedor "
-"serão anexadas à dica de forma automática."
diff --git a/addons/fetchmail_crm_claim/i18n/ja.po b/addons/fetchmail_crm_claim/i18n/ja.po
deleted file mode 100644
index a1f6db4a764..00000000000
--- a/addons/fetchmail_crm_claim/i18n/ja.po
+++ /dev/null
@@ -1,34 +0,0 @@
-# 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-08 05:43+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-09 04:56+0000\n"
-"X-Generator: Launchpad (build 15060)\n"
-
-#. module: fetchmail_crm_claim
-#: model:ir.actions.act_window,help:fetchmail_crm_claim.action_create_crm_claims_from_email_account
-msgid ""
-"You can connect your email account with claims in OpenERP. A new email sent "
-"to this account (example: support@mycompany.com) will automatically create a "
-"claim for the followup in OpenERP. The whole communication by email will be "
-"attached to the claim automatically to keep track of the history."
-msgstr ""
-"あなたのＥメールアカウントをOpenERPのクレームに関連づけることはできません。このアカウントに送られた新しいＥメールはOpenERPのフォローアップの"
-"ためのクレームを自動的に作成します。Ｅメールによる全てのコミュニケーションは、履歴を記録するために、自動的にクレームに関連づけられます。"
-
-#. module: fetchmail_crm_claim
-#: model:ir.actions.act_window,name:fetchmail_crm_claim.action_create_crm_claims_from_email_account
-msgid "Create Claims from Email Account"
-msgstr "Ｅメールアカウントからクレームを作成"

From d390418cf40baa6f589cfa1bf7934f815c6b6560 Mon Sep 17 00:00:00 2001
From: niv-openerp <nicolas.vanhoren@openerp.com>
Date: Mon, 16 Apr 2012 12:29:54 +0200
Subject: [PATCH 099/238] [fix] small changes in mail.js to ensure
 compatibility

bzr revid: nicolas.vanhoren@openerp.com-20120416102954-8tk02mc7vi7zvc89
---
 addons/mail/static/src/js/mail.js | 24 +++++++++++-------------
 1 file changed, 11 insertions(+), 13 deletions(-)

diff --git a/addons/mail/static/src/js/mail.js b/addons/mail/static/src/js/mail.js
index fbe817c2c81..20ff72645a2 100644
--- a/addons/mail/static/src/js/mail.js
+++ b/addons/mail/static/src/js/mail.js
@@ -58,10 +58,8 @@ openerp.mail = function(session) {
     }
 
     /* Add ThreadDisplay widget to registry */
-    session.web.form.widgets.add(
-        'Thread', 'openerp.mail.Thread');
-    session.web.page.readonly.add(
-        'Thread', 'openerp.mail.Thread');
+    session.web.form.widgets.add( 'Thread', 'openerp.mail.Thread');
+//    session.web.page.readonly.add( 'Thread', 'openerp.mail.Thread');
 
     /** 
      * ThreadDisplay widget: this widget handles the display of a thread of
@@ -464,15 +462,13 @@ openerp.mail = function(session) {
 
 
     /* Add ThreadView widget to registry */
-    session.web.form.widgets.add(
-        'ThreadView', 'openerp.mail.RecordThread');
-    session.web.page.readonly.add(
-        'ThreadView', 'openerp.mail.RecordThread');
+    session.web.form.widgets.add( 'ThreadView', 'openerp.mail.RecordThread');
+//    session.web.page.readonly.add( 'ThreadView', 'openerp.mail.RecordThread');
 
     /* ThreadView widget: thread of comments */
-    mail.RecordThread = session.web.form.Field.extend({
+    mail.RecordThread = session.web.form.AbstractField.extend({
         // QWeb template to use when rendering the object
-        form_template: 'RecordThread',
+        template: 'RecordThread',
 
         init: function() {
             this._super.apply(this, arguments);
@@ -489,9 +485,11 @@ openerp.mail = function(session) {
             // bind buttons
             this.$element.find('button.oe_mail_button_followers').click(function () { self.do_toggle_followers(); }).hide();
             this.$element.find('button.oe_mail_button_follow').click(function () { self.do_follow(); })
-                .mouseover(function () { $(this).html('Follow'); }).mouseleave(function () { $(this).html('Not following'); });
+                .mouseover(function () { $(this).html('Follow').addClass('following'); })
+                .mouseleave(function () { $(this).html('Not following').removeClass('following'); });
             this.$element.find('button.oe_mail_button_unfollow').click(function () { self.do_unfollow(); })
-                .mouseover(function () { $(this).html('Unfollow'); }).mouseleave(function () { $(this).html('Following'); });
+                .mouseover(function () { $(this).html('Unfollow').removeClass('following').addClass('unfollow'); })
+                .mouseleave(function () { $(this).html('Following').removeClass('unfollow').addClass('following'); });
             this.reinit();
         },
 
@@ -642,7 +640,7 @@ openerp.mail = function(session) {
         load_search_view: function (view_id, defaults, hidden) {
             var self = this;
             this.searchview = new session.web.SearchView(this, this.ds_msg, view_id || false, defaults || {}, hidden || false);
-            var search_view_loaded = this.searchview.appendTo(this.$element.find('div.oe_mail_wall_search'));
+            var search_view_loaded = this.searchview.appendTo(this.$element.find('.oe_view_manager_row'));
             return $.when(search_view_loaded).then(function () {
                 self.searchview.on_search.add(self.do_searchview_search);
             });

From 8e316cbdabd3e7e9decce57f02bcc94c1da7ba1c Mon Sep 17 00:00:00 2001
From: Fabien Meghazi <fme@openerp.com>
Date: Mon, 16 Apr 2012 13:49:53 +0200
Subject: [PATCH 100/238] [IMP] Improved styling for view manager header

bzr revid: fme@openerp.com-20120416114953-belugivw6fzfhrcz
---
 addons/web/static/src/css/base.css  | 6 ++++++
 addons/web/static/src/css/base.sass | 5 ++++-
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css
index 5288ce13a17..fc384fd9fbf 100644
--- a/addons/web/static/src/css/base.css
+++ b/addons/web/static/src/css/base.css
@@ -904,6 +904,9 @@
   color: white;
   text-shadow: 0 1px 2px rgba(0, 0, 0, 0.4);
 }
+.openerp .oe_view_manager_header2 .oe_view_manager_buttons {
+  white-space: nowrap;
+}
 .openerp .oe_view_manager_body h4 {
   margin: 8px 0;
 }
@@ -1042,6 +1045,9 @@
   -webkit-box-shadow: none;
   -box-shadow: none;
 }
+.openerp .oe_sidebar {
+  white-space: nowrap;
+}
 .openerp .oe_searchview {
   position: relative;
   float: right;
diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass
index 6afddbee2fa..b2373c7782b 100644
--- a/addons/web/static/src/css/base.sass
+++ b/addons/web/static/src/css/base.sass
@@ -705,6 +705,8 @@ $colour4: #8a89ba
                 a
                     color: #fff
                     text-shadow: 0 1px 2px rgba(0,0,0,0.4)
+        .oe_view_manager_buttons
+            white-space: nowrap
     // }}}
     // ViewManager.body {{{
     .oe_view_manager_body
@@ -814,7 +816,8 @@ $colour4: #8a89ba
                     text-decoration: none
                     @include vertical-gradient(#f0f0fa, #eeeef6)
                     @include box-shadow(none)
-
+    .oe_sidebar
+        white-space: nowrap
     // }}}
     // SearchView xmo {{{
     .oe_searchview

From 56db3a2060e3a0eef3e0f2cce71fd2bfb2ca44f5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Mon, 16 Apr 2012 14:37:03 +0200
Subject: [PATCH 101/238] [DOC] mail.thread documentation: added 'how to use
 OpenChatter in your addon'.

bzr revid: tde@openerp.com-20120416123703-6ip733mk119vsczr
---
 addons/mail/doc/index.rst.inc              |   6 +-
 addons/mail/doc/mail_message.rst           |  24 ++++
 addons/mail/doc/mail_needaction_howto.rst  |  15 ++
 addons/mail/doc/mail_openchatter_howto.rst | 155 +++++++++++++++++++++
 addons/mail/doc/mail_thread.rst            |   4 +-
 5 files changed, 200 insertions(+), 4 deletions(-)
 create mode 100644 addons/mail/doc/mail_message.rst
 create mode 100644 addons/mail/doc/mail_needaction_howto.rst
 create mode 100644 addons/mail/doc/mail_openchatter_howto.rst

diff --git a/addons/mail/doc/index.rst.inc b/addons/mail/doc/index.rst.inc
index 6816b756759..4679cd56fdf 100644
--- a/addons/mail/doc/index.rst.inc
+++ b/addons/mail/doc/index.rst.inc
@@ -1,9 +1,11 @@
 
-Mail Module
-'''''''''''
+Mail Module documentation topics
+'''''''''''''''''''''''''''''''''
 
 .. toctree::
    :maxdepth: 1
    
    mail_message
    mail_thread
+   mail_openchatter_howto
+   mail_needaction_howto
diff --git a/addons/mail/doc/mail_message.rst b/addons/mail/doc/mail_message.rst
new file mode 100644
index 00000000000..e41a772cac8
--- /dev/null
+++ b/addons/mail/doc/mail_message.rst
@@ -0,0 +1,24 @@
+.. _mail_message:
+
+mail.message
+============
+
+TODO
+
+mail.group
+++++++++++
+
+A mail_group is a collection of users sharing messages in a discussion group. Group users are users that follow the mail group, using the subscription/follow mechanism of OpenSocial. A mail group has nothing in common wih res.users.group.
+Additional information on fields:
+
+ - ``member_ids``: user member of the groups are calculated with ``message_get_subscribers`` method from mail.thread
+ - ``member_count``: calculated with member_ids
+ - ``is_subscriber``: calculated with member_ids
+
+res.users
++++++++++
+
+OpenChatter updates the res.users class:
+ - it adds a preference about sending emails when receiving a notification
+ - make a new user follow itself automatically
+ - create a welcome message when creating a new user, to make his arrival in OpenERP more friendly
diff --git a/addons/mail/doc/mail_needaction_howto.rst b/addons/mail/doc/mail_needaction_howto.rst
new file mode 100644
index 00000000000..8cb41cee374
--- /dev/null
+++ b/addons/mail/doc/mail_needaction_howto.rst
@@ -0,0 +1,15 @@
+
+How to use the need action mechanism in my addon
+=================================================
+
+Make your module inheriting from ir.needaction_mixin class
+
+Feature integration
+++++++++++++++++++++
+
+::
+
+  class my_module(osv.osv):
+    _name = "my.module"
+    _description = "My Module"
+    _inherit = ['ir.needaction_mixin']
diff --git a/addons/mail/doc/mail_openchatter_howto.rst b/addons/mail/doc/mail_openchatter_howto.rst
new file mode 100644
index 00000000000..fe28017be83
--- /dev/null
+++ b/addons/mail/doc/mail_openchatter_howto.rst
@@ -0,0 +1,155 @@
+
+How to use OpenChatter in my addon
+===================================
+
+Running example
+++++++++++++++++
+
+A small my_task model will be used as example to explain how to use the OpenChatter feature. Being simple, it has only the following fields :
+
+ - a name
+ - a task responsible
+ - a related project
+
+::
+
+  class my_task(osv.osv):
+    _name = "my.task"
+    _description = "My Task"
+    _columns = {
+      'name': fields.char('Name', required=True, size=64),
+      'user_id':fields.many2one('res.users', string='Responsible',
+        ondelete='cascade', required=True, select=1),
+      'project_id':fields.many2one('project.project', string='Related project',
+        ondelete='cascade', required=True, select=1),
+    }
+
+
+Two-lines feature integration
+++++++++++++++++++++++++++++++
+
+Make your module inheriting from the ``mail.thread`` class.
+
+::
+
+  class my_task(osv.osv):
+    _name = "my.task"
+    _description = "My Task"
+    # inherit from mail.thread allows the use of OpenChatter
+    _inherit = ['mail.thread']
+
+Use the thread viewer widget inside your form view by using the ThreadView widget on the message_ids_social field inherited from mail.thread.
+
+::
+
+  <record model="ir.ui.view" id="my_task_form_view">
+    <field name="name">My Task</field>
+    <field name="model">my.task</field>
+    <field name="type">form</field>
+    <field name="priority">1</field>
+    <field name="arch" type="xml">
+      <form>
+      [...]
+      <field name="message_ids_social" colspan="4" widget="ThreadView" nolabel="1"/>
+      </form>
+    </field>
+  </record>
+
+Send notifications
++++++++++++++++++++
+
+When sending a notification is required in your workflow or business logic, use the ``message_append_note`` method. This method is a shortcut to the ``message_append`` method that takes all ``mail.message`` fields as arguments. This latter method calls ``message_create`` that
+
+ - creates the message
+ - parses the body to find users you want to push the message to (finding and parsing ``@login`` in the message body)
+ - pushes a notification to users following the document and requested users of the latetr step
+
+You should therefore not worry about subscriptions or anything else than sending the notification. Here is a small example of sending a notification when the ``do_something`` method is called : 
+
+::
+
+  def do_something(self, cr, uid, ids, context=None):
+    [...]
+    self.do_something_send_note(cr, uid, ids, context=context)
+    [...]
+    return res
+
+  def do_something_send_note(self, cr, uid, ids, context=None):
+    self.message_append_note(cr, uid, ids, _('My subject'),
+    _("has received a <b>notification</b> and is happy for it."), context=context)
+
+Notifications guidelines
++++++++++++++++++++++++++
+
+Here are a few guidelines that you should keep in mind during the addition of system notifications :
+
+ - avoid unnecessary content; if a message has no interest, do not implement it
+ - use short sentences
+ - do not include the document name, as it is managed by the thread widget
+ - use a simple and clean style
+
+   - html tags are supported: use <b> or <em> mainly
+   - put main word(s) in bold
+   - avoid fancy styles that will break the OpenERP look and feel
+ - create a separate method for sending your notification
+
+   - use a method name like ``original_method_name_send_note``, that allow to easily spot notification methods in the code
+
+Subscription management
+++++++++++++++++++++++++
+
+There are a few default subscription tricks that you should know before playing with subscription:
+
+ - users that click on 'follow' follow the document. An entry in ``mail.subscription`` is created.
+ - users that click on 'unfollow' are no longer followers to the document. The related entry in ``mail.subscription`` is created.
+ - users that create or update a document automatically follow it. An entry in ``mail.subscription`` is created.
+
+If you want to override this default behavior, you should avoid doing it manualle. You should instead override the ``message_get_subscribers`` method from mail.thread. The default implementation looks in the ``mail.suscription`` table for entries matching ``user_id=uid, res_model=self._name, res_id=current_record_id``. You can add subscribers by overriding the ``message_get_subscribers`` and adding user ids to the returned list. This means that they will be considered as followers even if they do not have an entry in the mail.subscription table.
+
+As an exemple, let us say that you want to automatically add the my_task responsible along with the project manager to the list of followers. The method could look like:
+
+::
+
+  def message_get_subscribers(self, cr, uid, ids, context=None):
+    # get the followers from the mail.subscription table
+    sub_ids = self.message_get_subscribers_ids(cr, uid, ids, context=context);
+    # add the employee and its manager if specified to the subscribed users
+    for obj in self.browse(cr, uid, ids, context=context):
+      if obj.user_id:
+        sub_ids.append(obj.user_id)
+      if obj.project_id and obj.project_id.user_id:
+        sub_ids.append(obj.project_id.user_id)
+    return self.pool.get('res.users').read(cr, uid, sub_ids, context=context)
+
+This method has the advantage of being able to implement a particular behavior with as few code addition as possible. Moreover, when changing the task responsible of the project manager, the subscribers are always correct. This allows to avoid to implement complex corner cases that could obfuscate the code.
+
+The drawback of this method is that it is no longer possible to those subscribers to unfollow a document. Indeed, as user ids are added directly in a list in ``message_get_subscribers``, it is not possible to unsubscribe to a document. However, this drawback is mitigated by
+
+ - only important users shoudl be added using this method. Important users should not unsubscribe from their documents.
+ - users can hide the notifications on their Wall
+
+Messages display management
+++++++++++++++++++++++++++++
+
+By default, the ThreadView widget shows all messages related to the current document beside the document, in the History and comments section. However, you may want to display other messages in the widget. For example, the OpenChatter on res.users model shows
+
+ - messages related to the user, as usual (messages with ``model = res.users, res_id = current_document_id``)
+ - messages directly pushed to this user (containing @login)
+
+The best way to direct the messages that will be displayed in the OpenChatter widget is to override the ``message_load`` method. For example, the following method fetches messages as usual, but also fetches messages linked to the task project that contain the task name. Please refer to the API for more details about the arguments.
+
+::
+
+  def message_load(self, cr, uid, ids, limit=100, offset=0, domain=[], ascent=False, root_ids=[False], context=None):
+    msg_obj = self.pool.get('mail.message')
+    for my_task in self.browse(cr, uid, ids, context=context):
+      # search as usual messages related to the current document
+      msg_ids += msg_obj.search(cr, uid, ['|', '&', ('res_id', '=', my_task.id), ('model', '=', self._name),
+        # add: search in the current task project messages
+        '&', '&', ('res_id', '=', my_task.project_id.id), ('model', '=', 'project.project'),
+        # ... containing the task name
+        '|', ('body_text', 'like', '%s' % (my_task.name)), ('body_html', 'like', '%s' % (my_task.name))
+        ] + domain, limit=limit, offset=offset, context=context)
+    # if asked: add ancestor ids to have complete threads
+    if (ascent): msg_ids = self._message_add_ancestor_ids(cr, uid, ids, msg_ids, root_ids, context=context)
+    return msg_obj.read(cr, uid, msg_ids, context=context)
diff --git a/addons/mail/doc/mail_thread.rst b/addons/mail/doc/mail_thread.rst
index fd596c06689..f15f78156d3 100644
--- a/addons/mail/doc/mail_thread.rst
+++ b/addons/mail/doc/mail_thread.rst
@@ -1,7 +1,7 @@
 .. _mail_thread:
 
-OpenChatter
-===========
+mail.thread and OpenChatter
+===========================
 
 TODO
 

From 3e701407b728b80516412f1a3e11f1d473fa64d7 Mon Sep 17 00:00:00 2001
From: "Dharti Ratani (OpenERP)" <dhr@tinyerp.com>
Date: Mon, 16 Apr 2012 18:07:56 +0530
Subject: [PATCH 102/238] [IMP]code improved to support all protocols

bzr revid: dhr@tinyerp.com-20120416123756-ybx974od7ssdjrpq
---
 addons/web/static/src/js/view_form.js | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js
index 55653151fad..92441cdcb69 100644
--- a/addons/web/static/src/js/view_form.js
+++ b/addons/web/static/src/js/view_form.js
@@ -1577,11 +1577,11 @@ openerp.web.form.FieldUrl = openerp.web.form.FieldChar.extend({
         if (!this.value) {
             this.do_warn("Resource error", "This resource is empty");
         } else {
-            var url = $.trim(this.value);
-            if(url.toLowerCase().search("http://") != -1)
-                window.open(url);
-            else
+        	var url = $.trim(this.value);
+            if(/^[www]./i.test(url))
                 window.open('http://'+url);
+            else
+            	window.open(this.value);
         }
     }
 });

From 11c0136907b0b5bd96fd4e53e481c5542f0be7f4 Mon Sep 17 00:00:00 2001
From: Fabien Meghazi <fme@openerp.com>
Date: Mon, 16 Apr 2012 16:45:42 +0200
Subject: [PATCH 103/238] [ADD] Add support for QWeb templates in form view

bzr revid: fme@openerp.com-20120416144542-modz8goodot8yr7b
---
 addons/web/static/src/js/view_form.js | 67 +++++++++++++++++++++++++--
 addons/web/static/src/js/views.js     | 20 ++++++++
 2 files changed, 84 insertions(+), 3 deletions(-)

diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js
index e5824d64f59..27905ee4e73 100644
--- a/addons/web/static/src/js/view_form.js
+++ b/addons/web/static/src/js/view_form.js
@@ -55,6 +55,7 @@ openerp.web.FormView = openerp.web.View.extend({
         this.reload_mutex = new $.Mutex();
         this.mode = null;
         this.rendering_engine = new openerp.web.form.FormRenderingEngineReadonly(this);
+        this.qweb = null; // A QWeb instance will be created if the view is a QWeb template
     },
     destroy: function() {
         _.each(this.get_widgets(), function(w) {
@@ -73,11 +74,13 @@ openerp.web.FormView = openerp.web.View.extend({
         this.fields_order = [];
         this.fields_view = data;
 
-        this.rendering_engine.set_fields_view(data);
         this.rendering_engine.set_fields_registry(this.fields_registry);
         this.rendering_engine.set_tags_registry(this.tags_registry);
-        var $dest = this.$element.hasClass("oe_form_container") ? this.$element : this.$element.find('.oe_form_container');
-        this.rendering_engine.render_to($dest);
+        if (!this.extract_qweb_template(data)) {
+            this.rendering_engine.set_fields_view(data);
+            var $dest = this.$element.hasClass("oe_form_container") ? this.$element : this.$element.find('.oe_form_container');
+            this.rendering_engine.render_to($dest);
+        }
 
         this.$sidebar = this.options.$sidebar || this.$element.find('.oe_form_sidebar');
 
@@ -124,6 +127,56 @@ openerp.web.FormView = openerp.web.View.extend({
         this.has_been_loaded.resolve();
         return $.when();
     },
+    extract_qweb_template: function(fvg) {
+        for (var i=0, ii=fvg.arch.children.length; i < ii; i++) {
+            var child = fvg.arch.children[i];
+            if (child.tag === "templates") {
+                this.qweb = new QWeb2.Engine();
+                this.qweb.add_template(openerp.web.json_node_to_xml(child));
+                if (!this.qweb.has_template('form')) {
+                    throw new Error("No QWeb template found for form view");
+                }
+                return true;
+            }
+        }
+        this.qweb = null;
+        return false;
+    },
+    get_fvg_from_qweb: function(record) {
+        var view = this.qweb.render('form', this.get_qweb_context(record));
+        var fvg = _.clone(this.fields_view);
+        fvg.arch = openerp.web.xml_to_json(openerp.web.str_to_xml(view).firstChild);
+        return fvg;
+    },
+    get_qweb_context: function(record) {
+        var self = this,
+            new_record = {};
+        _.each(record, function(value, name) {
+            var r = _.clone(self.fields_view.fields[name] || {});
+            if ((r.type === 'date' || r.type === 'datetime') && value) {
+                r.raw_value = openerp.web.auto_str_to_date(value);
+            } else {
+                r.raw_value = value;
+            }
+            r.value = openerp.web.format_value(value, r);
+            new_record[name] = r;
+        });
+        return {
+            record : new_record,
+            new_record : !record.id
+        };
+    },
+    kill_current_form: function() {
+        _.each(this.getChildren(), function(el) {
+            el.destroy();
+        });
+        this.fields = {};
+        this.fields_order = [];
+        this.default_focus_field = null;
+        this.default_focus_button = null;
+        this.translatable_fields = [];
+        this.$element.find('.oe_form_container').empty();
+    },
     do_load_state: function(state, warm) {
         if (state.id && this.datarecord.id != state.id) {
             if (!this.dataset.get_id_index(state.id)) {
@@ -185,6 +238,13 @@ openerp.web.FormView = openerp.web.View.extend({
         }
         this.datarecord = record;
 
+        if (this.qweb) {
+            this.kill_current_form();
+            this.rendering_engine.set_fields_view(this.get_fvg_from_qweb(record));
+            var $dest = this.$element.hasClass("oe_form_container") ? this.$element : this.$element.find('.oe_form_container');
+            this.rendering_engine.render_to($dest);
+        }
+
         _(this.fields).each(function (field, f) {
             field.reset();
             var result = field.set_value(self.datarecord[f] || false);
@@ -863,6 +923,7 @@ openerp.web.form.FormRenderingEngine = openerp.web.Class.extend({
             var w = new (obj)(self.view, openerp.web.xml_to_json($elem[0]));
             w.replace($elem);
         })
+        // TODO: return a deferred
     },
     render_element: function(template, layout/* dictionaries */) {
         var dicts = [].slice.call(arguments).slice(2);
diff --git a/addons/web/static/src/js/views.js b/addons/web/static/src/js/views.js
index de9ff55758c..78f365c1a16 100644
--- a/addons/web/static/src/js/views.js
+++ b/addons/web/static/src/js/views.js
@@ -1247,6 +1247,26 @@ session.web.xml_to_str = function(node) {
         return (new XMLSerializer()).serializeToString(node);
     }
 }
+session.web.str_to_xml = function(s) {
+    if (window.DOMParser) {
+        var dp = new DOMParser();
+        var r = dp.parseFromString(s, "text/xml");
+        if (r.body && r.body.firstChild && r.body.firstChild.nodeName == 'parsererror') {
+            throw new Error("Could not parse string to xml");
+        }
+        return r;
+    }
+    var xDoc;
+    try {
+        xDoc = new ActiveXObject("MSXML2.DOMDocument");
+    } catch (e) {
+        throw new Error("Could not find a DOM Parser: " + e.message);
+    }
+    xDoc.async = false;
+    xDoc.preserveWhiteSpace = true;
+    xDoc.loadXML(s);
+    return xDoc;
+}
 
 /**
  * Registry for all the client actions key: tag value: widget

From de101478138785f0ac9ac9740dc07aaa0eaed194 Mon Sep 17 00:00:00 2001
From: niv-openerp <nicolas.vanhoren@openerp.com>
Date: Mon, 16 Apr 2012 17:08:39 +0200
Subject: [PATCH 104/238] [imp] small refactoring in form view

bzr revid: nicolas.vanhoren@openerp.com-20120416150839-vr45ozrqffc72qmk
---
 addons/web/static/src/js/view_form.js          | 9 ++++++---
 addons/web/static/src/js/view_list_editable.js | 1 +
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js
index e5824d64f59..6863d49f1d1 100644
--- a/addons/web/static/src/js/view_form.js
+++ b/addons/web/static/src/js/view_form.js
@@ -791,7 +791,11 @@ openerp.web.FormView = openerp.web.View.extend({
         });
         d.template = 'FormView.set_default';
         d.open();
-    }
+    },
+    register_field: function(field, name) {
+        this.fields[name] = field;
+        this.fields_order.push(name);
+    },
 });
 
 /**
@@ -855,6 +859,7 @@ openerp.web.form.FormRenderingEngine = openerp.web.Class.extend({
                 w.set_input_id($label.attr("for"));
             }
             self.alter_field(w);
+            self.view.register_field(w, $elem.attr("name"));
             w.replace($elem);
         });
         _.each(this.tags_to_init, function($elem) {
@@ -1621,8 +1626,6 @@ openerp.web.form.AbstractField = openerp.web.form.Widget.extend(/** @lends opene
         this._super(field_manager, node);
         this.name = this.node.attrs.name;
         this.value = false;
-        this.view.fields[this.name] = this;
-        this.view.fields_order.push(this.name);
         this.field = this.view.fields_view.fields[this.name] || {};
         this.set({required: this.modifiers['required'] === true});
         this.invalid = this.dirty = false;
diff --git a/addons/web/static/src/js/view_list_editable.js b/addons/web/static/src/js/view_list_editable.js
index aea7f6837c1..4047fcd6500 100644
--- a/addons/web/static/src/js/view_list_editable.js
+++ b/addons/web/static/src/js/view_list_editable.js
@@ -413,6 +413,7 @@ openerp.web.list_editable = function (openerp) {
                 }
                 var obj = self.view.fields_registry.get_object(key);
                 var w = new (obj)(self.view, openerp.web.xml_to_json(el));
+                self.view.register_field(w, $elem.attr("name"));
                 w.appendTo($td);
                 $td.appendTo($element);
             });

From f03e76c40972bd29ce0b5cc969b683328382bd79 Mon Sep 17 00:00:00 2001
From: niv-openerp <nicolas.vanhoren@openerp.com>
Date: Mon, 16 Apr 2012 18:09:21 +0200
Subject: [PATCH 105/238] [fix] small problem in editable lists

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

diff --git a/addons/web/static/src/js/view_list_editable.js b/addons/web/static/src/js/view_list_editable.js
index 4047fcd6500..41f8c012731 100644
--- a/addons/web/static/src/js/view_list_editable.js
+++ b/addons/web/static/src/js/view_list_editable.js
@@ -413,7 +413,7 @@ openerp.web.list_editable = function (openerp) {
                 }
                 var obj = self.view.fields_registry.get_object(key);
                 var w = new (obj)(self.view, openerp.web.xml_to_json(el));
-                self.view.register_field(w, $elem.attr("name"));
+                self.view.register_field(w, $(el).attr("name"));
                 w.appendTo($td);
                 $td.appendTo($element);
             });

From 81148c0b09b9e35a4dffbf83a63b70427cccff0c Mon Sep 17 00:00:00 2001
From: niv-openerp <nicolas.vanhoren@openerp.com>
Date: Mon, 16 Apr 2012 18:20:49 +0200
Subject: [PATCH 106/238] [imp] extracted fetch to make it less generic

bzr revid: nicolas.vanhoren@openerp.com-20120416162049-9mjgz6ul0zq1lzag
---
 addons/point_of_sale/static/src/js/pos.js | 39 +++++++++++++++--------
 1 file changed, 25 insertions(+), 14 deletions(-)

diff --git a/addons/point_of_sale/static/src/js/pos.js b/addons/point_of_sale/static/src/js/pos.js
index 148fe1ae74d..d99ffbafcee 100644
--- a/addons/point_of_sale/static/src/js/pos.js
+++ b/addons/point_of_sale/static/src/js/pos.js
@@ -58,6 +58,13 @@ openerp.point_of_sale = function(db) {
             localStorage['oe_pos_' + key] = JSON.stringify(value);
         },
     });
+    
+    var fetch = function(osvModel, fields, domain) {
+        var dataSetSearch;
+        dataSetSearch = new db.web.DataSetSearch(null, osvModel, {}, domain);
+        return dataSetSearch.read_slice(fields, 0);
+    };
+    
     /*
      Gets all the necessary data from the OpenERP web client (session, shop data etc.)
      */
@@ -84,22 +91,26 @@ openerp.point_of_sale = function(db) {
                     this.store.set(attr, val);
                 }, this));
             }, this));
-            $.when(this.fetch('pos.category', ['name', 'parent_id', 'child_id']),
-                this.fetch('product.product', ['name', 'list_price', 'pos_categ_id', 'taxes_id', 'product_image_small'], [['pos_categ_id', '!=', 'false']]),
-                this.fetch('account.bank.statement', ['account_id', 'currency', 'journal_id', 'state', 'name'],
-                    [['state', '=', 'open'], ['user_id', '=', this.session.uid]]),
-                this.fetch('account.journal', ['auto_cash', 'check_dtls', 'currency', 'name', 'type']),
-                this.fetch('account.tax', ['amount', 'price_include', 'type']),
-                this.get_app_data())
-                .pipe(_.bind(this.build_tree, this));
-        },
-        fetch: function(osvModel, fields, domain) {
-            var dataSetSearch;
             var self = this;
-            dataSetSearch = new db.web.DataSetSearch(this, osvModel, {}, domain);
-            return dataSetSearch.read_slice(fields, 0).then(function(result) {
-                return self.store.set(osvModel, result);
+            var cat_def = fetch('pos.category', ['name', 'parent_id', 'child_id']).pipe(function(result) {
+                return self.store.set('pos.category', result);
             });
+            var prod_def = fetch('product.product', ['name', 'list_price', 'pos_categ_id', 'taxes_id',
+                                                          'product_image_small'], [['pos_categ_id', '!=', 'false']]).then(function(result) {
+                return self.store.set('product.product', result);
+            });
+            var bank_def = fetch('account.bank.statement', ['account_id', 'currency', 'journal_id', 'state', 'name'],
+                    [['state', '=', 'open'], ['user_id', '=', this.session.uid]]).then(function(result) {
+                return self.store.set('account.bank.statement', result);
+            });
+            var journal_def = fetch('account.journal', ['auto_cash', 'check_dtls', 'currency', 'name', 'type']).then(function(result) {
+                return self.store.set('account.journal', result);
+            });
+            var tax_def = fetch('account.tax', ['amount', 'price_include', 'type']).then(function(result) {
+                return self.store.set('account.tax', result);
+            });
+            $.when(cat_def, prod_def, bank_def, journal_def, tax_def, this.get_app_data())
+                .pipe(_.bind(this.build_tree, this));
         },
         get_app_data: function() {
             var self = this;

From 5f69244e7542329c4bce0fc99ea1e46612a150d9 Mon Sep 17 00:00:00 2001
From: niv-openerp <nicolas.vanhoren@openerp.com>
Date: Mon, 16 Apr 2012 18:56:30 +0200
Subject: [PATCH 107/238] wip

bzr revid: nicolas.vanhoren@openerp.com-20120416165630-sk808rmb31ztjqsf
---
 addons/point_of_sale/static/src/js/pos.js | 22 ++++++++++------------
 1 file changed, 10 insertions(+), 12 deletions(-)

diff --git a/addons/point_of_sale/static/src/js/pos.js b/addons/point_of_sale/static/src/js/pos.js
index d99ffbafcee..953ef32ca44 100644
--- a/addons/point_of_sale/static/src/js/pos.js
+++ b/addons/point_of_sale/static/src/js/pos.js
@@ -59,6 +59,13 @@ openerp.point_of_sale = function(db) {
         },
     });
     
+    var DAOInterface = {
+        
+    };
+    var LocalStorageDAO = db.web.Class.extend({
+        
+    });
+    
     var fetch = function(osvModel, fields, domain) {
         var dataSetSearch;
         dataSetSearch = new db.web.DataSetSearch(null, osvModel, {}, domain);
@@ -76,21 +83,12 @@ openerp.point_of_sale = function(db) {
             this.flush_mutex = new $.Mutex();
             this.build_tree = _.bind(this.build_tree, this);
             this.session = session;
-            var attributes = {
-                'pending_operations': [],
+            this.set({'pending_operations': [],
                 'currency': {symbol: '$', position: 'after'},
                 'shop': {},
                 'company': {},
-                'user': {},
-            };
-            _.each(attributes, _.bind(function(def, attr) {
-                var to_set = {};
-                to_set[attr] = this.store.get(attr, def);
-                this.set(to_set);
-                this.bind('change:' + attr, _.bind(function(unused, val) {
-                    this.store.set(attr, val);
-                }, this));
-            }, this));
+                'user': {}});
+            
             var self = this;
             var cat_def = fetch('pos.category', ['name', 'parent_id', 'child_id']).pipe(function(result) {
                 return self.store.set('pos.category', result);

From 88eeba08645306dba40d14b1444d470d4a21ba3a Mon Sep 17 00:00:00 2001
From: niv-openerp <nicolas.vanhoren@openerp.com>
Date: Mon, 16 Apr 2012 19:04:07 +0200
Subject: [PATCH 108/238] [imp] removed all references to model names

bzr revid: nicolas.vanhoren@openerp.com-20120416170407-l1jv5i6j06rh6dus
---
 addons/point_of_sale/static/src/js/pos.js | 29 ++++++++++-------------
 1 file changed, 13 insertions(+), 16 deletions(-)

diff --git a/addons/point_of_sale/static/src/js/pos.js b/addons/point_of_sale/static/src/js/pos.js
index 953ef32ca44..1c60b69b59c 100644
--- a/addons/point_of_sale/static/src/js/pos.js
+++ b/addons/point_of_sale/static/src/js/pos.js
@@ -91,23 +91,20 @@ openerp.point_of_sale = function(db) {
             
             var self = this;
             var cat_def = fetch('pos.category', ['name', 'parent_id', 'child_id']).pipe(function(result) {
-                return self.store.set('pos.category', result);
+                return self.set({'categories': result});
             });
             var prod_def = fetch('product.product', ['name', 'list_price', 'pos_categ_id', 'taxes_id',
                                                           'product_image_small'], [['pos_categ_id', '!=', 'false']]).then(function(result) {
-                return self.store.set('product.product', result);
+                return self.set({'products': result});
             });
             var bank_def = fetch('account.bank.statement', ['account_id', 'currency', 'journal_id', 'state', 'name'],
                     [['state', '=', 'open'], ['user_id', '=', this.session.uid]]).then(function(result) {
-                return self.store.set('account.bank.statement', result);
-            });
-            var journal_def = fetch('account.journal', ['auto_cash', 'check_dtls', 'currency', 'name', 'type']).then(function(result) {
-                return self.store.set('account.journal', result);
+                return self.set({'bank_statements': result});
             });
             var tax_def = fetch('account.tax', ['amount', 'price_include', 'type']).then(function(result) {
-                return self.store.set('account.tax', result);
+                return self.set({'taxes': result});
             });
-            $.when(cat_def, prod_def, bank_def, journal_def, tax_def, this.get_app_data())
+            $.when(cat_def, prod_def, bank_def, tax_def, this.get_app_data())
                 .pipe(_.bind(this.build_tree, this));
         },
         get_app_data: function() {
@@ -159,7 +156,7 @@ openerp.point_of_sale = function(db) {
         categories: {},
         build_tree: function() {
             var c, id, _i, _len, _ref, _ref2;
-            _ref = this.store.get('pos.category');
+            _ref = this.get('categories');
             for (_i = 0, _len = _ref.length; _i < _len; _i++) {
                 c = _ref[_i];
                 this.categories[c.id] = {
@@ -182,7 +179,7 @@ openerp.point_of_sale = function(db) {
                 ancestors: [],
                 children: (function() {
                     var _j, _len2, _ref3, _results;
-                    _ref3 = this.store.get('pos.category');
+                    _ref3 = this.get('categories');
                     _results = [];
                     for (_j = 0, _len2 = _ref3.length; _j < _len2; _j++) {
                         c = _ref3[_j];
@@ -194,7 +191,7 @@ openerp.point_of_sale = function(db) {
                 }).call(this),
                 subtree: (function() {
                     var _j, _len2, _ref3, _results;
-                    _ref3 = this.store.get('pos.category');
+                    _ref3 = this.get('categories');
                     _results = [];
                     for (_j = 0, _len2 = _ref3.length; _j < _len2; _j++) {
                         c = _ref3[_j];
@@ -322,10 +319,10 @@ openerp.point_of_sale = function(db) {
             var totalTax = base;
             var totalNoTax = base;
             
-            var products = pos.store.get('product.product');
+            var products = pos.get('products');
             var product = _.detect(products, function(el) {return el.id === self.get('id');});
             var taxes_ids = product.taxes_id;
-            var taxes =  pos.store.get('account.tax');
+            var taxes =  pos.get('taxes');
             var taxtotal = 0;
             _.each(taxes_ids, function(el) {
                 var tax = _.detect(taxes, function(t) {return t.id === el;});
@@ -539,7 +536,7 @@ openerp.point_of_sale = function(db) {
                 products: new ProductCollection()
             });
             this.set({
-                cashRegisters: new CashRegisterCollection(pos.store.get('account.bank.statement')),
+                cashRegisters: new CashRegisterCollection(pos.get('bank_statements')),
             });
             return (this.get('orders')).bind('remove', _.bind( function(removedOrder) {
                 if ((this.get('orders')).isEmpty()) {
@@ -1262,7 +1259,7 @@ openerp.point_of_sale = function(db) {
             this.categoryView.children = c.children;
             this.categoryView.renderElement();
             this.categoryView.start();
-            products = pos.store.get('product.product').filter( function(p) {
+            products = pos.get('products').filter( function(p) {
                 var _ref;
                 return _ref = p.pos_categ_id[0], _.indexOf(c.subtree, _ref) >= 0;
             });
@@ -1336,7 +1333,7 @@ openerp.point_of_sale = function(db) {
                 pos.app = new App(self.$element);
                 db.webclient.set_content_full_screen(true);
                 
-                if (pos.store.get('account.bank.statement').length === 0)
+                if (pos.get('bank_statements').length === 0)
                     return new db.web.Model("ir.model.data").get_func("search_read")([['name', '=', 'action_pos_open_statement']], ['res_id']).pipe(
                             _.bind(function(res) {
                         return this.rpc('/web/action/load', {'action_id': res[0]['res_id']}).pipe(_.bind(function(result) {

From 2b2a203a04092dcce53c677b734c712c421af1d6 Mon Sep 17 00:00:00 2001
From: niv-openerp <nicolas.vanhoren@openerp.com>
Date: Mon, 16 Apr 2012 19:07:21 +0200
Subject: [PATCH 109/238] [imp] completely removed store class

bzr revid: nicolas.vanhoren@openerp.com-20120416170721-swgsf8pyeg7y8uf8
---
 addons/point_of_sale/static/src/js/pos.js | 26 +----------------------
 1 file changed, 1 insertion(+), 25 deletions(-)

diff --git a/addons/point_of_sale/static/src/js/pos.js b/addons/point_of_sale/static/src/js/pos.js
index 1c60b69b59c..4e1747878d6 100644
--- a/addons/point_of_sale/static/src/js/pos.js
+++ b/addons/point_of_sale/static/src/js/pos.js
@@ -34,30 +34,6 @@ openerp.point_of_sale = function(db) {
         };
     };
     var _t = db.web._t;
-
-    /*
-     Local store access. Read once from localStorage upon construction and persist on every change.
-     There should only be one store active at any given time to ensure data consistency.
-     */
-    var Store = db.web.Class.extend({
-        init: function() {
-            this.data = {};
-        },
-        get: function(key, _default) {
-            if (this.data[key] === undefined) {
-                var stored = localStorage['oe_pos_' + key];
-                if (stored)
-                    this.data[key] = JSON.parse(stored);
-                else
-                    return _default;
-            }
-            return this.data[key];
-        },
-        set: function(key, value) {
-            this.data[key] = value;
-            localStorage['oe_pos_' + key] = JSON.stringify(value);
-        },
-    });
     
     var DAOInterface = {
         
@@ -78,7 +54,7 @@ openerp.point_of_sale = function(db) {
     var Pos = Backbone.Model.extend({
         initialize: function(session, attributes) {
             Backbone.Model.prototype.initialize.call(this, attributes);
-            this.store = new Store();
+            this.dao = new LocalStorageDAO();
             this.ready = $.Deferred();
             this.flush_mutex = new $.Mutex();
             this.build_tree = _.bind(this.build_tree, this);

From 43358fe2499ae5dba9dbd61a483ed51963da8b82 Mon Sep 17 00:00:00 2001
From: niv-openerp <nicolas.vanhoren@openerp.com>
Date: Mon, 16 Apr 2012 19:10:42 +0200
Subject: [PATCH 110/238] [imp] renammed products to product_list for
 lisibility

bzr revid: nicolas.vanhoren@openerp.com-20120416171042-304swvgac38mrmkm
---
 addons/point_of_sale/static/src/js/pos.js | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/addons/point_of_sale/static/src/js/pos.js b/addons/point_of_sale/static/src/js/pos.js
index 4e1747878d6..d1873b1bdde 100644
--- a/addons/point_of_sale/static/src/js/pos.js
+++ b/addons/point_of_sale/static/src/js/pos.js
@@ -71,7 +71,7 @@ openerp.point_of_sale = function(db) {
             });
             var prod_def = fetch('product.product', ['name', 'list_price', 'pos_categ_id', 'taxes_id',
                                                           'product_image_small'], [['pos_categ_id', '!=', 'false']]).then(function(result) {
-                return self.set({'products': result});
+                return self.set({'product_list': result});
             });
             var bank_def = fetch('account.bank.statement', ['account_id', 'currency', 'journal_id', 'state', 'name'],
                     [['state', '=', 'open'], ['user_id', '=', this.session.uid]]).then(function(result) {
@@ -295,8 +295,8 @@ openerp.point_of_sale = function(db) {
             var totalTax = base;
             var totalNoTax = base;
             
-            var products = pos.get('products');
-            var product = _.detect(products, function(el) {return el.id === self.get('id');});
+            var product_list = pos.get('product_list');
+            var product = _.detect(product_list, function(el) {return el.id === self.get('id');});
             var taxes_ids = product.taxes_id;
             var taxes =  pos.get('taxes');
             var taxtotal = 0;
@@ -1226,7 +1226,7 @@ openerp.point_of_sale = function(db) {
             this.category();
         };
         App.prototype.category = function(id) {
-            var c, products;
+            var c, product_list;
             if (id == null) {
                 id = 0;
             }
@@ -1235,28 +1235,28 @@ openerp.point_of_sale = function(db) {
             this.categoryView.children = c.children;
             this.categoryView.renderElement();
             this.categoryView.start();
-            products = pos.get('products').filter( function(p) {
+            product_list = pos.get('product_list').filter( function(p) {
                 var _ref;
                 return _ref = p.pos_categ_id[0], _.indexOf(c.subtree, _ref) >= 0;
             });
-            (this.shop.get('products')).reset(products);
+            (this.shop.get('products')).reset(product_list);
             var self = this;
             $('.searchbox input').keyup(function() {
                 var m, s;
                 s = $(this).val().toLowerCase();
                 if (s) {
-                    m = products.filter( function(p) {
+                    m = product_list.filter( function(p) {
                         return p.name.toLowerCase().indexOf(s) != -1;
                     });
                     $('.search-clear').fadeIn();
                 } else {
-                    m = products;
+                    m = product_list;
                     $('.search-clear').fadeOut();
                 }
                 return (self.shop.get('products')).reset(m);
             });
             return $('.search-clear').click( function() {
-                (self.shop.get('products')).reset(products);
+                (self.shop.get('products')).reset(product_list);
                 $('.searchbox input').val('').focus();
                 return $('.search-clear').fadeOut();
             });

From c9cd4657afdf77c5c2ced45dee8491a301702f2a Mon Sep 17 00:00:00 2001
From: Antony Lesuisse <al@openerp.com>
Date: Tue, 17 Apr 2012 03:19:33 +0200
Subject: [PATCH 111/238] [FIX] restore attachement, part1 read-only

bzr revid: al@openerp.com-20120417011933-wwkynkzpxex0lbbh
---
 addons/web/static/src/js/view_form.js | 63 ++----------------------
 addons/web/static/src/js/views.js     | 62 ++++++++++++++++++++----
 addons/web/static/src/xml/base.xml    | 70 +++++++++++++--------------
 3 files changed, 90 insertions(+), 105 deletions(-)

diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js
index 5b63ec3506d..a3f0d82bb63 100644
--- a/addons/web/static/src/js/view_form.js
+++ b/addons/web/static/src/js/view_form.js
@@ -112,7 +112,6 @@ openerp.web.FormView = openerp.web.View.extend({
         if (!this.sidebar && this.options.sidebar) {
             this.sidebar = new openerp.web.Sidebar(this);
             this.sidebar.appendTo(this.$sidebar);
-            //this.sidebar.attachments = new openerp.web.form.SidebarAttachments(this.sidebar, this);
             this.sidebar.add_toolbar(this.fields_view.toolbar);
             this.sidebar.add_items('other', [{
                 label: _t('Set Default'),
@@ -269,7 +268,7 @@ openerp.web.FormView = openerp.web.View.extend({
             self.is_initialized.resolve();
             self.do_update_pager(record.id == null);
             if (self.sidebar) {
-               // self.sidebar.attachments.do_update();
+               self.sidebar.do_attachement_update(self.dataset, self.datarecord.id);
             }
             if (self.default_focus_field) {
                 self.default_focus_field.focus();
@@ -697,12 +696,12 @@ openerp.web.FormView = openerp.web.View.extend({
                 this.dataset.alter_ids(this.dataset.ids.concat([this.datarecord.id]));
                 this.dataset.index = this.dataset.ids.length - 1;
             } else {
-            	this.dataset.alter_ids([this.datarecord.id].concat(this.dataset.ids));
+                this.dataset.alter_ids([this.datarecord.id].concat(this.dataset.ids));
                 this.dataset.index = 0;
             }
             this.do_update_pager();
             if (this.sidebar) {
-                // this.sidebar.attachments.do_update();
+                this.sidebar.do_attachement_update(this.dataset, this.datarecord.id);
             }
             //openerp.log("The record has been created with id #" + this.datarecord.id);
             this.reload();
@@ -1221,62 +1220,6 @@ openerp.web.form.FormDialog = openerp.web.Dialog.extend({
     }
 });
 
-
-openerp.web.form.SidebarAttachments = openerp.web.Widget.extend({
-    init: function(parent, form_view) {
-        //var $section = parent.add_section(_t('Attachments'), 'attachments');
-        //this.$div = $('<div class="oe-sidebar-attachments"></div>');
-        //$section.append(this.$div);
-        this._super(parent);
-        this.view = form_view;
-    },
-    do_update: function() {
-        return;
-        if (!this.view.datarecord.id) {
-            this.on_attachments_loaded([]);
-        } else {
-            (new openerp.web.DataSetSearch(
-                this, 'ir.attachment', this.view.dataset.get_context(),
-                [
-                    ['res_model', '=', this.view.dataset.model],
-                    ['res_id', '=', this.view.datarecord.id],
-                    ['type', 'in', ['binary', 'url']]
-                ])).read_slice(['name', 'url', 'type'], {}).then(this.on_attachments_loaded);
-        }
-    },
-    on_attachments_loaded: function(attachments) {
-        return;
-        this.attachments = attachments;
-        this.$div.html(QWeb.render('FormView.sidebar.attachments', this));
-        this.$element.find('.oe-binary-file').change(this.on_attachment_changed);
-        this.$element.find('.oe-sidebar-attachment-delete').click(this.on_attachment_delete);
-    },
-    on_attachment_changed: function(e) {
-        return;
-        window[this.element_id + '_iframe'] = this.do_update;
-        var $e = $(e.target);
-        if ($e.val() != '') {
-            this.$element.find('form.oe-binary-form').submit();
-            $e.parent().find('input[type=file]').prop('disabled', true);
-            $e.parent().find('button').prop('disabled', true).find('img, span').toggle();
-        }
-    },
-    on_attachment_delete: function(e) {
-        return;
-        var self = this, $e = $(e.currentTarget);
-        var name = _.str.trim($e.parent().find('a.oe-sidebar-attachments-link').text());
-        if (confirm(_.str.sprintf(_t("Do you really want to delete the attachment %s?"), name))) {
-            this.rpc('/web/dataset/unlink', {
-                model: 'ir.attachment',
-                ids: [parseInt($e.attr('data-id'))]
-            }, function(r) {
-                $e.parent().remove();
-                self.do_notify("Delete an attachment", "The attachment '" + name + "' has been deleted");
-            });
-        }
-    }
-});
-
 openerp.web.form.compute_domain = function(expr, fields) {
     var stack = [];
     for (var i = expr.length - 1; i >= 0; i--) {
diff --git a/addons/web/static/src/js/views.js b/addons/web/static/src/js/views.js
index 78f365c1a16..55e87c06904 100644
--- a/addons/web/static/src/js/views.js
+++ b/addons/web/static/src/js/views.js
@@ -727,8 +727,6 @@ session.web.Sidebar = session.web.Widget.extend({
     init: function(parent) {
         this._super(parent);
         var view = this.getParent();
-        var view_manager = view.getParent();
-        var action = view_manager.action;
         this.sections = [
             { 'name' : 'print', 'label' : _t('Print'), },
             { 'name' : 'files', 'label' : _t('Attachement'), },
@@ -763,21 +761,22 @@ session.web.Sidebar = session.web.Widget.extend({
             var item = self.items[section][index];
             if (item.callback) {
                 item.callback.apply(self, [item]);
-            }
-            if (item.action) {
+            } else if (item.action) {
                 self.on_item_action_clicked(item);
+            } else if (item.url) {
+                return true;
             }
             return false;
         });
+        //this.$div.html(QWeb.render('FormView.sidebar.attachments', this));
+        //this.$element.find('.oe-binary-file').change(this.on_attachment_changed);
+        //this.$element.find('.oe-sidebar-attachment-delete').click(this.on_attachment_delete);
     },
     redraw: function() {
         var self = this;
         self.$element.html(QWeb.render('Sidebar', {widget: self}));
         this.$element.find('ul').hide();
     },
-    add_default_sections: function() {
-        var self = this;
-    },
     add_section: function() {
         var self = this;
     },
@@ -857,6 +856,52 @@ session.web.Sidebar = session.web.Widget.extend({
             });
         });
     },
+    do_attachement_update: function(dataset, model_id) {
+        if (!model_id) {
+            this.on_attachments_loaded([]);
+        } else {
+            var dom = [ ['res_model', '=', dataset.model], ['res_id', '=', model_id], ['type', 'in', ['binary', 'url']] ];
+            var ds = new session.web.DataSetSearch(this, 'ir.attachment', dataset.get_context(), dom);
+            ds.read_slice(['name', 'url', 'type'], {}).then(this.on_attachments_loaded);
+        }
+    },
+    on_attachments_loaded: function(attachments) {
+        var self = this;
+        var items = [];
+        // TODO: preprend: _s +
+        var prefix = '/web/binary/saveas?session_id=' + self.session.session_id + '&model=ir.attachment&field=datas&filename_field=name&id=';
+        _.each(attachments,function(a) {
+            a.label = a.name;
+            if(a.type === "binary") {
+                a.url = prefix  + a.id + '&t=' + (new Date().getTime());
+            }
+        });
+        this.add_items('files', attachments);
+    },
+    on_attachment_changed: function(e) {
+        return;
+        window[this.element_id + '_iframe'] = this.do_update;
+        var $e = $(e.target);
+        if ($e.val() != '') {
+            this.$element.find('form.oe-binary-form').submit();
+            $e.parent().find('input[type=file]').prop('disabled', true);
+            $e.parent().find('button').prop('disabled', true).find('img, span').toggle();
+        }
+    },
+    on_attachment_delete: function(e) {
+        return;
+        var self = this, $e = $(e.currentTarget);
+        var name = _.str.trim($e.parent().find('a.oe-sidebar-attachments-link').text());
+        if (confirm(_.str.sprintf(_t("Do you really want to delete the attachment %s?"), name))) {
+            this.rpc('/web/dataset/unlink', {
+                model: 'ir.attachment',
+                ids: [parseInt($e.attr('data-id'))]
+            }, function(r) {
+                $e.parent().remove();
+                self.do_notify("Delete an attachment", "The attachment '" + name + "' has been deleted");
+            });
+        }
+    }
 });
 
 session.web.TranslateDialog = session.web.Dialog.extend({
@@ -1147,9 +1192,6 @@ session.web.View = session.web.Widget.extend({
     },
     do_search: function(view) {
     },
-    set_common_sidebar_sections: function(sidebar) {
-        sidebar.add_default_sections();
-    },
     on_sidebar_import: function() {
         var import_view = new session.web.DataImport(this, this.dataset);
         import_view.start();
diff --git a/addons/web/static/src/xml/base.xml b/addons/web/static/src/xml/base.xml
index fdf5a5a7b5f..0df4ca71777 100644
--- a/addons/web/static/src/xml/base.xml
+++ b/addons/web/static/src/xml/base.xml
@@ -515,7 +515,7 @@
                 <button class="oe_dropdown_toggle"><t t-esc="section.label"/></button>
                 <ul class="oe_dropdown_menu">
                     <li t-foreach="widget.items[section.name]" t-as="item" t-att-class="item.classname">
-                        <a class="oe_sidebar_action_a" t-att-title="item.title" href="#" t-att-data-section="section.name" t-att-data-index="item_index">
+                        <a class="oe_sidebar_action_a" t-att-title="item.title" t-att-data-section="section.name" t-att-data-index="item_index" t-att-href="item.url" target="_blank">
                             <t t-raw="item.label"/>
                         </a>
                     </li>
@@ -524,6 +524,40 @@
         </t>
     </div>
 </t>
+<t t-name="Sidebar.attachments">
+    <div class="oe-sidebar-attachments-toolbar">
+        <div class="oe-binary-file-set" style="float: right">
+            <form class="oe-binary-form" t-attf-target="#{element_id}_iframe"
+                method="post" enctype="multipart/form-data" action="/web/binary/upload_attachment">
+                <input type="hidden" name="session_id" t-att-value="session.session_id"/>
+                <input type="hidden" name="callback" t-attf-value="#{element_id}_iframe"/>
+                <input type="hidden" name="model" t-att-value="view.dataset.model"/>
+                <input type="hidden" name="id" t-att-value="view.datarecord.id"/>
+                <button class="oe_button" type="button">
+                    <img t-att-src='_s + "/web/static/src/img/throbber.gif"' width="16" height="16" style="display: none"/>
+                    <span>Add</span>
+                </button>
+                <input type="file" class="oe-binary-file" name="ufile" title="Add attachment"
+                    t-att-onclick="view.datarecord.id ? null : 'alert(\'No record selected ! You can only attach to existing record.\'); return false;'"/>
+            </form>
+            <iframe t-attf-id="#{element_id}_iframe" t-attf-name="#{element_id}_iframe" style="display: none"/>
+        </div>
+    </div>
+    <br style="clear: both"/>
+    <ul class="oe-sidebar-attachments-items">
+        <li t-foreach="attachments" t-as="attachment">
+            <t t-if="attachment.type == 'binary'" t-set="attachment.url" t-value="_s + '/web/binary/saveas?session_id='
+                + session.session_id + '&amp;model=ir.attachment&amp;id=' + attachment.id
+                + '&amp;field=datas&amp;filename_field=name&amp;t=' + (new Date().getTime())"/>
+            <a class="oe-sidebar-attachments-link" t-att-href="attachment.url" target="_blank">
+                <t t-esc="attachment.name"/>
+            </a>
+            <a href="#" class="oe-sidebar-attachment-delete" t-att-data-id="attachment.id" t-attf-title="Delete the attachment #{attachment.name}">
+                <img t-att-src='_s + "/web/static/src/img/attachments-close.png"' width="15" height="15" border="0"/>
+            </a>
+        </li>
+    </ul>
+</t>
 
 <t t-name="TreeView">
     <select t-if="toolbar" style="width: 30%">
@@ -690,40 +724,6 @@
         </t>
     </div>
 </t>
-<t t-name="FormView.sidebar.attachments">
-    <div class="oe-sidebar-attachments-toolbar">
-        <div class="oe-binary-file-set" style="float: right">
-            <form class="oe-binary-form" t-attf-target="#{element_id}_iframe"
-                method="post" enctype="multipart/form-data" action="/web/binary/upload_attachment">
-                <input type="hidden" name="session_id" t-att-value="session.session_id"/>
-                <input type="hidden" name="callback" t-attf-value="#{element_id}_iframe"/>
-                <input type="hidden" name="model" t-att-value="view.dataset.model"/>
-                <input type="hidden" name="id" t-att-value="view.datarecord.id"/>
-                <button class="oe_button" type="button">
-                    <img t-att-src='_s + "/web/static/src/img/throbber.gif"' width="16" height="16" style="display: none"/>
-                    <span>Add</span>
-                </button>
-                <input type="file" class="oe-binary-file" name="ufile" title="Add attachment"
-                    t-att-onclick="view.datarecord.id ? null : 'alert(\'No record selected ! You can only attach to existing record.\'); return false;'"/>
-            </form>
-            <iframe t-attf-id="#{element_id}_iframe" t-attf-name="#{element_id}_iframe" style="display: none"/>
-        </div>
-    </div>
-    <br style="clear: both"/>
-    <ul class="oe-sidebar-attachments-items">
-        <li t-foreach="attachments" t-as="attachment">
-            <t t-if="attachment.type == 'binary'" t-set="attachment.url" t-value="_s + '/web/binary/saveas?session_id='
-                + session.session_id + '&amp;model=ir.attachment&amp;id=' + attachment.id
-                + '&amp;field=datas&amp;filename_field=name&amp;t=' + (new Date().getTime())"/>
-            <a class="oe-sidebar-attachments-link" t-att-href="attachment.url" target="_blank">
-                <t t-esc="attachment.name"/>
-            </a>
-            <a href="#" class="oe-sidebar-attachment-delete" t-att-data-id="attachment.id" t-attf-title="Delete the attachment #{attachment.name}">
-                <img t-att-src='_s + "/web/static/src/img/attachments-close.png"' width="15" height="15" border="0"/>
-            </a>
-        </li>
-    </ul>
-</t>
 <form t-name="FormView.set_default" class="oe_forms oe_frame">
     <t t-set="args" t-value="widget.dialog_options.args"/>
     <table style="width: 100%">

From 2a54e468a9d8d6a763f062cd7ad813f1a942a056 Mon Sep 17 00:00:00 2001
From: Antony Lesuisse <al@openerp.com>
Date: Tue, 17 Apr 2012 03:29:20 +0200
Subject: [PATCH 112/238] [FIX] restore attachement, part2 still read-only

bzr revid: al@openerp.com-20120417012920-303yobg7y9c9fy1p
---
 addons/web/static/src/js/views.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/addons/web/static/src/js/views.js b/addons/web/static/src/js/views.js
index 55e87c06904..50982373214 100644
--- a/addons/web/static/src/js/views.js
+++ b/addons/web/static/src/js/views.js
@@ -876,7 +876,8 @@ session.web.Sidebar = session.web.Widget.extend({
                 a.url = prefix  + a.id + '&t=' + (new Date().getTime());
             }
         });
-        this.add_items('files', attachments);
+        this.items['files'] = attachments;
+        this.redraw();
     },
     on_attachment_changed: function(e) {
         return;

From 4ecd07837f5f28d295efd5fe13b6643f863851fc Mon Sep 17 00:00:00 2001
From: Antony Lesuisse <al@openerp.com>
Date: Tue, 17 Apr 2012 03:43:23 +0200
Subject: [PATCH 113/238] [FIX] restore attachement, part2 very beginning of
 add

bzr revid: al@openerp.com-20120417014323-vp1cn1k5en5ogmdq
---
 addons/web/static/src/js/views.js  | 9 ++++++---
 addons/web/static/src/xml/base.xml | 3 +++
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/addons/web/static/src/js/views.js b/addons/web/static/src/js/views.js
index 50982373214..79d3d4cd167 100644
--- a/addons/web/static/src/js/views.js
+++ b/addons/web/static/src/js/views.js
@@ -757,7 +757,6 @@ session.web.Sidebar = session.web.Widget.extend({
             var section = $(this).data('section');
             var index = $(this).data('index');
             $(this).closest('ul').hide();
-            console.log('click item',section,index);
             var item = self.items[section][index];
             if (item.callback) {
                 item.callback.apply(self, [item]);
@@ -876,8 +875,12 @@ session.web.Sidebar = session.web.Widget.extend({
                 a.url = prefix  + a.id + '&t=' + (new Date().getTime());
             }
         });
-        this.items['files'] = attachments;
-        this.redraw();
+        attachments.push( { label: _t("Add..."), callback: self.on_attachment_add } );
+        self.items['files'] = attachments;
+        self.redraw();
+    },
+    on_attachment_add: function(e) {
+        this.$element.find('.oe_sidebar_add').show();
     },
     on_attachment_changed: function(e) {
         return;
diff --git a/addons/web/static/src/xml/base.xml b/addons/web/static/src/xml/base.xml
index 0df4ca71777..7cbffe865e5 100644
--- a/addons/web/static/src/xml/base.xml
+++ b/addons/web/static/src/xml/base.xml
@@ -519,6 +519,9 @@
                             <t t-raw="item.label"/>
                         </a>
                     </li>
+                    <li t-if="section.name == 'files'" class="oe_sidebar_add" style="display:none;">
+                        Input type file stuff
+                    </li>
                 </ul>
             </div>
         </t>

From a87f82e393a6acccbbdaf867223f327329ea83e8 Mon Sep 17 00:00:00 2001
From: Launchpad Translations on behalf of openerp <>
Date: Tue, 17 Apr 2012 04:51:24 +0000
Subject: [PATCH 114/238] Launchpad automatic translations update.

bzr revid: launchpad_translations_on_behalf_of_openerp-20120407045522-76gwya51lihl0t2r
bzr revid: launchpad_translations_on_behalf_of_openerp-20120408043834-jrvm7d3sae8aki98
bzr revid: launchpad_translations_on_behalf_of_openerp-20120409045634-45612rg0m6hk96wl
bzr revid: launchpad_translations_on_behalf_of_openerp-20120417045124-4ci2fzmegcudnsfi
---
 openerp/addons/base/i18n/ja.po | 675 ++++++++++++++++++++++-----------
 1 file changed, 452 insertions(+), 223 deletions(-)

diff --git a/openerp/addons/base/i18n/ja.po b/openerp/addons/base/i18n/ja.po
index a22b7512575..8f6da375214 100644
--- a/openerp/addons/base/i18n/ja.po
+++ b/openerp/addons/base/i18n/ja.po
@@ -8,14 +8,14 @@ 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-06 04:31+0000\n"
+"PO-Revision-Date: 2012-04-16 18:23+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-06 04:37+0000\n"
-"X-Generator: Launchpad (build 15060)\n"
+"X-Launchpad-Export-Date: 2012-04-17 04:51+0000\n"
+"X-Generator: Launchpad (build 15099)\n"
 
 #. module: base
 #: model:res.country,name:base.sh
@@ -204,7 +204,7 @@ msgstr "契約上の請求レート"
 #: code:addons/base/res/res_users.py:558
 #, python-format
 msgid "Warning!"
-msgstr "警告！"
+msgstr "警告"
 
 #. module: base
 #: code:addons/base/ir/ir_model.py:344
@@ -413,7 +413,7 @@ msgstr "子アプリケーション"
 #. module: base
 #: field:res.partner,credit_limit:0
 msgid "Credit Limit"
-msgstr "信用限度"
+msgstr "与信限度"
 
 #. module: base
 #: model:ir.module.module,description:base.module_web_graph
@@ -647,7 +647,7 @@ msgstr "コロンビア"
 #: code:addons/orm.py:1390
 #, python-format
 msgid "Key/value '%s' not found in selection field '%s'"
-msgstr "選択した項目 '%s' の中にキー / バリュー '%s' がありません。"
+msgstr "キー / バリュー %s が選択した項目 %s の中にありません。"
 
 #. module: base
 #: help:res.country,code:0
@@ -1103,7 +1103,7 @@ msgid ""
 "Language with code \"%s\" is not defined in your system !\n"
 "Define it through the Administration menu."
 msgstr ""
-"コード \"%s\" に対する言語がシステムに定義されていません。\n"
+"コード %s に対する言語がシステムに定義されていません。\n"
 "アドミニストレーションメニューを使ってそれを定義してください。"
 
 #. module: base
@@ -1155,7 +1155,7 @@ msgstr "遷移"
 #: code:addons/orm.py:4615
 #, python-format
 msgid "Record #%d of %s not found, cannot copy!"
-msgstr ""
+msgstr "レコード#%d が見つかりません（%s ）。コピーはできません。"
 
 #. module: base
 #: field:ir.module.module,contributors:0
@@ -1191,9 +1191,9 @@ msgstr ""
 "　・ 休日管理\n"
 "　・ プロジェクト管理\n"
 "\n"
-"各部門の管理者は、チームの誰かが計画上妥当性を考慮中の未割り当ての時間があるか、タスクの割り当てを必要としている誰かがいるのかを知ることができます。\n"
+"各部門のマネジャは、チームの誰かが計画上妥当性を考慮中の未割り当ての時間があるか、タスクの割り当てを必要としている誰かがいるのかを知ることができます。\n"
 "\n"
-"月末に計画管理者は、割り当てられたタイムシートがそれぞれの分析会計を尊重した計画であるかをチェックすることもできます。\n"
+"月末に計画マネジャは、割り当てられたタイムシートがそれぞれの分析会計を尊重した計画であるかをチェックすることもできます。\n"
 
 #. module: base
 #: selection:ir.property,type:0
@@ -1426,7 +1426,7 @@ msgstr ""
 #: code:addons/base/module/wizard/base_update_translations.py:38
 #, python-format
 msgid "No language with code \"%s\" exists"
-msgstr "コード \"%s\" を持つ言語が存在しません。"
+msgstr "コード %s を持つ言語が存在しません。"
 
 #. module: base
 #: model:ir.module.module,description:base.module_document
@@ -1590,7 +1590,7 @@ msgid ""
 "'%s' contains too many dots. XML ids should not contain dots ! These are "
 "used to refer to other modules data, as in module.reference_id"
 msgstr ""
-"'%s' は余分なドットが含まれています。XMLのIDはドットを含んではいけません。 これらは module.reference_id "
+"%s には余分なドットが含まれています。XMLのIDはドットを含んではいけません。 これらは module.reference_id "
 "のように、他のモジュールデータに指し示すために使われます。"
 
 #. module: base
@@ -1893,16 +1893,15 @@ msgid ""
 "Once installed, check the menu 'Ideas' in the 'Tools' main menu."
 msgstr ""
 "\n"
-"This module allows your user to easily and efficiently participate in "
-"enterprise innovation.\n"
+"このモジュールはユーザが簡単に、そして効果的に企業改革に関与させます。\n"
 "============================================================================="
 "===============\n"
 "\n"
-"It allows everybody to express ideas about different subjects.\n"
-"Then, other users can comment on these ideas and vote for particular ideas.\n"
-"Each idea has a score based on the different votes.\n"
-"The managers can obtain an easy view of best ideas from all the users.\n"
-"Once installed, check the menu 'Ideas' in the 'Tools' main menu."
+"それは全ての人が異なった題材についてアイディアを表現させます。\n"
+"それから、他のユーザはそれらのアイディアにコメントしたり、特定のアイディアに投票することができます。\n"
+"各アイディアは異なった投票に基づくスコアを持ちます。\n"
+"マネジャは全てのユーザから最良のアイディアの容易な視野を獲得できます。\n"
+"インストールした後、ツールのメインメニューの中にアイディアメニューがあることをチェックして下さい。"
 
 #. module: base
 #: model:ir.model,name:base.model_ir_rule
@@ -2068,7 +2067,7 @@ msgstr ""
 #: code:addons/base/res/res_users.py:420
 #, python-format
 msgid "%s (copy)"
-msgstr ""
+msgstr "%s（コピー）"
 
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_account_chart
@@ -2288,24 +2287,24 @@ msgid ""
 "    "
 msgstr ""
 "\n"
-"この受注ジャーナルモジュールは受注と配達（選択リスト）を異なったジャーナルに分類することができます。\n"
+"この受注仕訳帳モジュールは受注と配達（選択リスト）を異なった仕訳帳に分類することができます。\n"
 "======================================================================\n"
 "このモジュールは部門を持つ大きな会社にとても役立ちます。\n"
 "\n"
-"以下のような異なる目的のためにジャーナルを使うことができます：\n"
+"以下のような異なる目的のために仕訳帳を使うことができます：\n"
 "    ・ 別部門の受注の分離\n"
 "    ・ 配達がトラックなのかUPSなのかの仕訳\n"
 "\n"
-"ジャーナルは責任を持ち、異なる状態に展開する：\n"
+"仕訳帳にはそうした責任があり、そして異なる状態に進展します：\n"
 "    ・ ドラフト、オープン、キャンセル、完了\n"
 "\n"
-"バッチ操作は一度に全ての受注の確認、検証、請求書集荷といった異なるジャーナルを処理できます。\n"
+"バッチ操作は一度に全ての受注の確認、検証、請求書集荷といった異なる仕訳帳を処理できます。\n"
 "\n"
 "バッチ請求方法はパートナごとや受注オーダーごとに構成することもできます。例：\n"
 "    ・ 日々の送付\n"
 "    ・ 月次の送付など\n"
 "\n"
-"いくらかのジャーナルによる統計値が提供されます。\n"
+"いくらかの仕訳帳による統計値が提供されます。\n"
 "    "
 
 #. module: base
@@ -2349,7 +2348,7 @@ msgstr ""
 "以下の全てのワークフローが実装されています：\n"
 "    ・ ドラフト経費\n"
 "    ・ 従業員によるシートの確認\n"
-"    ・ 管理者による認可\n"
+"    ・ マネジャによる認可\n"
 "    ・ 会計人による認可と請求書の作成\n"
 "    ・ 従業員へ請求書に基づく支払い\n"
 "\n"
@@ -2483,8 +2482,8 @@ msgstr ""
 "\n"
 "異なったジョブに向けての面接を認めるための調査モジュールと統合されています。\n"
 "\n"
-"このモジュールはメールケーとウェイと統合されていて、自動的にjobs@YOURCOMPANY.comに\n"
-"送られた電子メールを追跡します。あなたの履歴ベースに保存、検索できるドキュメント管理システム\n"
+"このモジュールはメールゲートウェイと統合されていて、自動的にjobs@YOURCOMPANY.comに\n"
+"送られたEメールを追跡します。あなたの履歴ベースに保存、検索できるドキュメント管理システム\n"
 "とも統合されています。\n"
 "    "
 
@@ -2508,13 +2507,13 @@ msgstr "ポーランド"
 msgid ""
 "Comma-separated list of allowed view modes, such as 'form', 'tree', "
 "'calendar', etc. (Default: tree,form)"
-msgstr "'form'、'tree'、'calendar'など（デフォルト：tree、form）のようなビューモードの許されたカンマ区切りのリスト"
+msgstr "'form'、'tree'、'calendar'など（デフォルト：tree、form）のような表示モードの許されたカンマ区切りのリスト"
 
 #. module: base
 #: code:addons/orm.py:3615
 #, python-format
 msgid "A document was modified since you last viewed it (%s:%d)"
-msgstr "このドキュメントはあなたの前回参照時から更新されています（%s:%d）"
+msgstr "このドキュメントはあなたの前回参照時から更新されています（%s：%d）"
 
 #. module: base
 #: view:workflow:0
@@ -2778,7 +2777,7 @@ msgstr "サーバアクション"
 #. module: base
 #: help:ir.actions.client,params:0
 msgid "Arguments sent to the client along withthe view tag"
-msgstr "引数はクライアントにビュータグとともに送信されます。"
+msgstr "引数はクライアントにビューのタグとともに送信されます。"
 
 #. module: base
 #: model:ir.module.module,description:base.module_project_gtd
@@ -2859,7 +2858,7 @@ msgstr "発行人保証サーバとの通信途中のエラー"
 #: model:res.groups,name:base.group_sale_manager
 #: model:res.groups,name:base.group_tool_manager
 msgid "Manager"
-msgstr "管理者"
+msgstr "マネジャ"
 
 #. module: base
 #: model:ir.ui.menu,name:base.menu_custom
@@ -3119,7 +3118,7 @@ msgstr "ストレージのパラメータ"
 #: code:addons/base/module/module.py:409
 #, python-format
 msgid "Can not upgrade module '%s'. It is not installed."
-msgstr "モジュール '%s' はインストールされていないためアップグレードできません。"
+msgstr "モジュール %s はインストールされていないためアップグレードできません。"
 
 #. module: base
 #: model:res.country,name:base.cu
@@ -4037,7 +4036,7 @@ msgstr "会社名"
 msgid ""
 "Invalid value for reference field \"%s.%s\" (last part must be a non-zero "
 "integer): \"%s\""
-msgstr "参照項目として無効な値です \"%s.%s\" （最後の部分は整数の０以外にすべきです）：\"%s\""
+msgstr "参照項目として無効な値です %s.%s（最後の部分は整数の０以外にすべきです）：%s"
 
 #. module: base
 #: model:ir.module.category,name:base.module_category_human_resources
@@ -4083,7 +4082,7 @@ msgid ""
 "    "
 msgstr ""
 "\n"
-"    ・ 多言語サポート：勘定科目表、税金、税金コード、ジャーナル、会計テンプレート、分析勘定科目表、ジャーナル分析\n"
+"    ・ 多言語サポート：勘定科目表、税金、税金コード、仕訳帳、会計テンプレート、分析勘定科目表、仕訳帳分析\n"
 "    ・ セットアップウィザード変更\n"
 "        ・ テンプレートから目的のオブジェクトへCOA、税金、税金コード、会計ポジションの翻訳をコピー\n"
 "    "
@@ -4162,7 +4161,7 @@ msgid ""
 "Can not create the module file:\n"
 " %s"
 msgstr ""
-"そのモジュールファイルの作成ができません：\n"
+"モジュールファイルの作成ができません：\n"
 " %s"
 
 #. module: base
@@ -4253,7 +4252,7 @@ msgid ""
 "Mail delivery failed via SMTP server '%s'.\n"
 "%s: %s"
 msgstr ""
-"SMTPサーバによるメール送信は失敗しました '%s'。\n"
+"SMTPサーバによるメール送信は失敗しました %s。\n"
 "%s: %s"
 
 #. module: base
@@ -4299,9 +4298,9 @@ msgstr ""
 "会計アクセス権限\n"
 "=========================\n"
 "\n"
-"このモジュールはアドミンユーザにジャーナル項目や勘定科目表といった全ての会計機能へのアクセスを与えます。\n"
+"このモジュールはアドミンユーザに仕訳項目や勘定科目表といった全ての会計機能へのアクセスを与えます。\n"
 "\n"
-"アドミニストレータには管理者とユーザアクセス権を、デモユーザにはユーザアクセス権のみを割り当てます。\n"
+"アドミニストレータにはマネジャとユーザアクセス権を、デモユーザにはユーザアクセス権のみを割り当てます。\n"
 "    "
 
 #. module: base
@@ -4439,7 +4438,7 @@ msgstr ""
 "\n"
 "  ・ 分析ライン（分析ラインと関連付けされた一般アカウントを持つ会社）の所有者に適合させる\n"
 "  ・ 分析ライン（金融の会計に類似している）に多通貨を追加する\n"
-"  ・ コストに分類される全てをオーナー会社の正しい通貨に基づいて分析アカウントの中に修正する\n"
+"  ・ コストに分類される全てを所有会社の正しい通貨に基づいて分析アカウントの中に修正する\n"
 "  ・ デフォルトでは、単独会社においては何ら変更なし\n"
 "\n"
 "結果として、同じ通貨ではない会社間において同じ分析アカウントを共有することができます。このセットアップは有効にします。どうぞお使い下さい。\n"
@@ -5388,7 +5387,7 @@ msgstr "セキュリティ"
 #: code:addons/base/ir/ir_model.py:311
 #, python-format
 msgid "Changing the storing system for field \"%s\" is not allowed."
-msgstr "システムに保存されている項目\"%s\"は変更が許されていません。"
+msgstr "システムに保存されている項目%s は変更が許されていません。"
 
 #. module: base
 #: help:res.partner.bank,company_id:0
@@ -5748,7 +5747,7 @@ msgstr ""
 "このモジュールをインストール後、会計の設定ウィザードが自動起動します。\n"
 "    ・ 勘定科目表作成を補助する会計テンプレートがあります。\n"
 "    ・ "
-"特定のウィザードでは会社の名前、従うべき表のテンプレート、生成するための桁数、あなたのアカウントと銀行口座、ジャーナル作成のための通貨が尋ねられます。\n"
+"特定のウィザードでは会社の名前、従うべき表のテンプレート、生成するための桁数、あなたのアカウントと銀行口座、仕訳帳作成のための通貨が尋ねられます。\n"
 "\n"
 "すると、未記入の表テンプレートのコピーが作成されます。\n"
 "\n"
@@ -6153,8 +6152,8 @@ msgstr ""
 "    ・ 外貨サポート\n"
 "    ・ 全てのデータレコードタイプ（0、1、2、3、4,、8、9）のサポート\n"
 "    ・ 全てのトランザクションコード、構造化された形式の通信の解析とロギング\n"
-"    ・ CODA構成パラメータを通した自動金融ジャーナル割り当て\n"
-"    ・ 銀行口座番号ごとの複数ジャーナルのサポート\n"
+"    ・ CODA構成パラメータを通した自動金融仕訳帳割り当て\n"
+"    ・ 銀行口座番号ごとの複数仕訳帳のサポート\n"
 "    ・ １つのCODAファイル中の異なった銀行口座の複数の口座明細をサポート\n"
 "    ・ CODA銀行口座の構文解析のみをサポート（CODA銀行口座設定でtype='info'と定義された）\n"
 "    ・ 多言語CODA解析、イギリス、オランダ、フランスのために与えられた解析設定データ\n"
@@ -6239,7 +6238,7 @@ msgid ""
 "        "
 msgstr ""
 "\n"
-"このモジュールによって一般的なジャーナルを使って、幾つかの分析計画を使うことができます。\n"
+"このモジュールによって一般的な仕訳帳を使って、幾つかの分析計画を使うことができます。\n"
 "============================================================================="
 "======\n"
 "\n"
@@ -6324,11 +6323,11 @@ msgid ""
 "user-wise as well as month wise.\n"
 msgstr ""
 "\n"
-"これはサービス会社のプロジェクト管理者に会計分析ビュー更新のために重要なデータを見せるためのモジュールです。\n"
+"これはサービス会社のプロジェクトマネジャに会計分析ビュー更新のために重要なデータを見せるためのモジュールです。\n"
 "============================================================================="
 "======================================\n"
 "\n"
-"各管理者に関連情報を見せるためにメニューに追加します。\n"
+"各マネジャに関連情報を見せるためにメニューに追加します。\n"
 "月単位と同じようにユーザ単位の会計分析要約のレポートを表示できます。\n"
 
 #. module: base
@@ -6495,7 +6494,7 @@ msgstr "グジャラート語 / ગુજરાતી"
 #, python-format
 msgid ""
 "Unable to process module \"%s\" because an external dependency is not met: %s"
-msgstr "外部依存が解決されないため、モジュール\"%s\"の処理ができません： %s"
+msgstr "外部依存が解決されないため、モジュール%s の処理ができません： %s"
 
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_l10n_be_hr_payroll
@@ -6673,7 +6672,7 @@ msgstr "公式な翻訳のロード"
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_account_cancel
 msgid "Cancel Journal Entries"
-msgstr "ジャーナル入力のキャンセル"
+msgstr "仕訳帳入力のキャンセル"
 
 #. module: base
 #: view:ir.actions.server:0
@@ -7102,7 +7101,7 @@ msgstr "時刻の書式"
 #: code:addons/orm.py:2134
 #, python-format
 msgid "There is no view of type '%s' defined for the structure!"
-msgstr "構造のために定義されたビューのタイプ’%s’がありません。"
+msgstr "構造のために定義されたビューのタイプ %s がありません。"
 
 #. module: base
 #: view:ir.module.module:0
@@ -7176,7 +7175,7 @@ msgstr "不在の繰り返し"
 #: code:addons/base/module/wizard/base_module_import.py:69
 #, python-format
 msgid "Can not create the module file: %s !"
-msgstr "このモジュールファイルの作成ができません: %s !"
+msgstr "このモジュールファイルの作成ができません: %s"
 
 #. module: base
 #: field:ir.server.object.lines,server_id:0
@@ -7390,7 +7389,7 @@ msgstr "シリアルキー"
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_hr_timesheet
 msgid "Timesheets"
-msgstr "タイムシート"
+msgstr "勤務表"
 
 #. module: base
 #: field:res.partner,function:0
@@ -7936,7 +7935,7 @@ msgstr "スペイン語（メキシコ）/ Español (MX)"
 #: code:addons/base/publisher_warranty/publisher_warranty.py:145
 #, python-format
 msgid "Please verify your publisher warranty serial number and validity."
-msgstr "発行者の保証シリアル番号とその有効性を確認して下さい。"
+msgstr "発行人保証シリアル番号とその有効性を確認して下さい。"
 
 #. module: base
 #: view:res.log:0
@@ -7966,7 +7965,7 @@ msgstr "このウィンドウ"
 #. module: base
 #: view:publisher_warranty.contract:0
 msgid "Publisher Warranty Contracts"
-msgstr "発行者保証契約"
+msgstr "発行人保証契約"
 
 #. module: base
 #: help:res.log,name:0
@@ -8471,7 +8470,7 @@ msgstr ""
 "\n"
 "プッシュプローの仕様は、どの場所がどの場所と何のパラメータでつながれているかを示します。\n"
 "製品の所定の量が供給元の場所で動きがあるや否や、結び付けられた動作が、フロー定義\n"
-"（目的地の場所、遅延、移動の種類、ジャーナル他）でセットされたパラメータにしたがって\n"
+"（目的地の場所、遅延、移動の種類、仕訳帳他）でセットされたパラメータにしたがって\n"
 "自動的に予測されます。\n"
 "この新しい動きは、パラメータにしたがって自動的に実行されるか、手動確認を要求します。\n"
 "\n"
@@ -8838,7 +8837,7 @@ msgid ""
 "You try to upgrade a module that depends on the module: %s.\n"
 "But this module is not available in your system."
 msgstr ""
-"あなたは次のモジュールに依存するモジュールをアップグレードしようとしています： %s.\n"
+"あなたは次のモジュールに依存するモジュールをアップグレードしようとしています： %s\n"
 "しかし、そのモジュールはあなたのシステムでは使用できません。"
 
 #. module: base
@@ -9036,8 +9035,8 @@ msgid ""
 "installed the CRM, with the history tab, you can track all the interactions "
 "with a partner such as opportunities, emails, or sales orders issued."
 msgstr ""
-"顧客（システムの他のエリアではパートナと呼ばれる）は、あなたが彼らが将来顧客であるのか、仕入先であるのかどうか会社の住所録の管理するのを手助けします。パー"
-"トナのフォームは、会社のアドレスから、価格リストなどの多くの情報、パートナの連絡先まで相互に必要なすべての情報を追跡し、記録することができます。\r\n"
+"顧客（システムの他のエリアではパートナと呼ばれる）は、彼らが見込み客、顧客であるのか、仕入先であるのかどうか会社の住所録の管理するのを手助けします。パート"
+"ナのフォームは、会社のアドレスから、価格リストなどの多くの情報、パートナの連絡先まで相互に必要なすべての情報を追跡し、記録することができます。\r\n"
 "CRMをインストールした場合は、履歴タブでパートナと共にオポチュニティ、電子メール、発行された受注など全ての対話を追跡することができます。"
 
 #. module: base
@@ -9065,7 +9064,7 @@ msgstr ""
 #. module: base
 #: view:res.request.history:0
 msgid "Request History"
-msgstr "要望履歴"
+msgstr "リクエストの履歴"
 
 #. module: base
 #: help:ir.rule,global:0
@@ -10928,7 +10927,7 @@ msgstr "アイスランド"
 #: model:ir.actions.act_window,name:base.ir_action_window
 #: model:ir.ui.menu,name:base.menu_ir_action_window
 msgid "Window Actions"
-msgstr "ウィンドウの操作"
+msgstr "ウィンドウアクション"
 
 #. module: base
 #: view:res.lang:0
@@ -11159,7 +11158,7 @@ msgstr "購読申し込み"
 #: help:ir.actions.server,model_id:0
 msgid ""
 "Select the object on which the action will work (read, write, create)."
-msgstr "アクションが動作する（読込、書込、作成）オブジェクトを選択して下さい。"
+msgstr "アクションが動作する（読み込み、書き込み、作成）オブジェクトを選択して下さい。"
 
 #. module: base
 #: field:base.language.import,name:0
@@ -11239,7 +11238,7 @@ msgstr "休暇管理"
 #: view:res.partner.address:0
 #: view:workflow.activity:0
 msgid "Group By..."
-msgstr "グループ化"
+msgstr "グループ化…"
 
 #. module: base
 #: view:ir.model.fields:0
@@ -11446,7 +11445,7 @@ msgid ""
 "    "
 msgstr ""
 "\n"
-"このモジュールは所定のアカウントで特定のジャーナルのデフォルト請求レートを定義することができます。\n"
+"このモジュールは所定のアカウントで特定の仕訳帳のデフォルト請求レートを定義することができます。\n"
 "============================================================================="
 "=================================\n"
 "\n"
@@ -11794,8 +11793,8 @@ msgstr ""
 "会計入力のキャンセルができます。\n"
 "=====================================\n"
 "\n"
-"このモジュールはアカウントジャーナルのフォームビューに\"入力のキャンセルを許可\"項目を追加します。Trueが設定されている場合は、ユーザは入力と請求書"
-"をキャンセルすることができます。\n"
+"このモジュールは会計仕訳帳のフォームビューに\"入力のキャンセルを許可\"項目を追加します。Trueが設定されている場合は、ユーザは入力と請求書をキャンセ"
+"ルすることができます。\n"
 "    "
 
 #. module: base
@@ -12085,7 +12084,7 @@ msgid ""
 "You try to install module '%s' that depends on module '%s'.\n"
 "But the latter module is not available in your system."
 msgstr ""
-"あなたはモジュール'%s'をインストールしようとしています。これはモジュール'%s'に依存しています。\n"
+"あなたはモジュール %s をインストールしようとしています。これはモジュール %s に依存しています。\n"
 "しかし、後者のモジュールはあなたのシステムでは利用可能ではありません。"
 
 #. module: base
@@ -12693,8 +12692,8 @@ msgid ""
 "Project, Project Tasks Data into OpenERP Module."
 msgstr ""
 "このモジュールはSugarCRMの以下のデータをOpenERPモジュールにインポートします：\n"
-"　　Leads、Opportunities、Users、Accounts、Contacts、Employees、Meetings、\n"
-"　　Phonecalls、Emails、Project、Project Tasks"
+"　　リード、オポチュニティ、ユーザ、会計、コンタクト、従業員、ミーティング、\n"
+"　　電話、Eメール、プロジェクト、プロジェクトタスク"
 
 #. module: base
 #: model:ir.actions.act_window,name:base.action_publisher_warranty_contract_add_wizard
@@ -12768,7 +12767,7 @@ msgstr "コメント"
 #. module: base
 #: model:res.groups,name:base.group_hr_manager
 msgid "HR Manager"
-msgstr "HR管理者"
+msgstr "HRマネジャ"
 
 #. module: base
 #: view:ir.filters:0
@@ -12879,7 +12878,7 @@ msgstr "OpenERPパートナ"
 #, python-format
 msgid ""
 "Unable to install module \"%s\" because an external dependency is not met: %s"
-msgstr "モジュール\"%s\" をインストールすることができません。なぜなら、外部依存関係が満たされていないからです：%s"
+msgstr "モジュール %s をインストールすることができません。なぜなら、外部依存関係が満たされていないからです：%s"
 
 #. module: base
 #: view:ir.module.module:0
@@ -13638,7 +13637,7 @@ msgstr ""
 "============================================================================="
 "============================\n"
 "\n"
-"　・ スプリントプロジェクト、プロダクトオーナー、スクラムマスター\n"
+"　・ スプリントプロジェクト、プロダクト所有者、スクラムマスター\n"
 "　・スプリントの レビュー、デイリーミーティング、フィードバック\n"
 "　・ 製品バックログ\n"
 "　・ スプリントバックログ\n"
@@ -13794,9 +13793,9 @@ msgstr ""
 "従業員の評価を作成する機能\n"
 "=======================================\n"
 "\n"
-"評価は彼の管理者と同様に部下や後輩のために従業員によって作成することができます。\n"
+"評価は彼のマネジャと同様に部下や後輩のために従業員によって作成することができます。\n"
 "その評価は様々な調査を作成され、そして従業員階層のどのレベルが何を満たすかを定義\n"
-"された計画の下で実行されます。そして最終レビューと評価は管理者によって実行されます。\n"
+"された計画の下で実行されます。そして最終レビューと評価はマネジャによって実行されます。\n"
 "全ての評価は従業員によってファイルされ、それはPDFファイルの形式で見ることができます。\n"
 "自身の現在の評価のためにダッシュボードを実装しています。\n"
 "         "
@@ -14042,7 +14041,7 @@ msgstr ""
 "を使っていないなら、パスワードはネットワーク上を暗号化されないで転送されますので、\n"
 "他のセキュリティ対策を無視して良いということではありません。\n"
 "また、データベースに格納された他を保護しません。それは重要なデータを含むかもしれません。\n"
-"全てのエリアに対して、システム管理者によって以下のような適切なセキュリティ対策の実装が要求されます。\n"
+"全てのエリアに対して、システムアドミニストレータによって以下のような適切なセキュリティ対策の実装が要求されます。\n"
 "データベースバックアップ、システムファイル、リモートシェルアクセス、物理サーバアクセスなどに対する保護\n"
 "\n"
 "LDAP認証との統合\n"
@@ -14704,7 +14703,7 @@ msgstr ""
 "OpenERPはLDAPのパスワード変更の管理をしません。そのため、パスワードの変更は\n"
 "LDAPディレクトリに直接的に（LDAPユーザ用）他の方法によって処理されるべきです。\n"
 "\n"
-"LDAP認証ユーザ（管理者アカウントは1つの明示的な例）とともに、データベースにローカルの\n"
+"LDAP認証ユーザ（アドミニストレータアカウントは1つの明示的な例）とともに、データベースにローカルの\n"
 "OpenERPユーザを持つことも可能です。\n"
 "\n"
 "それはどのように機能するか：\n"
@@ -15189,7 +15188,7 @@ msgstr "ブルガリア"
 #. module: base
 #: view:publisher_warranty.contract.wizard:0
 msgid "Publisher warranty contract successfully registered!"
-msgstr "出版社保証契約は正常に登録されました。"
+msgstr "発行人保証契約は正常に登録されました。"
 
 #. module: base
 #: model:res.country,name:base.ao
@@ -15967,7 +15966,7 @@ msgstr "顧客パートナ"
 #. module: base
 #: sql_constraint:res.users:0
 msgid "You can not have two users with the same login !"
-msgstr "同一のログインに２つのユーザを持つことはできません！"
+msgstr "同じログインでは２つのユーザを持てません。"
 
 #. module: base
 #: model:ir.model,name:base.model_res_request_history
@@ -16213,7 +16212,7 @@ msgstr "ルクセンブルク"
 #. module: base
 #: selection:res.request,priority:0
 msgid "Low"
-msgstr ""
+msgstr "低い"
 
 #. module: base
 #: code:addons/base/ir/ir_ui_menu.py:284
@@ -16226,12 +16225,12 @@ msgstr "エラーです。再帰的な関係となるメニューを作ること
 msgid ""
 "3. If user belongs to several groups, the results from step 2 are combined "
 "with logical OR operator"
-msgstr ""
+msgstr "3. ユーザが複数のグループに属している場合は、論理OR演算子により２つが組み合わされた結果となります。"
 
 #. module: base
 #: model:ir.module.module,description:base.module_auth_openid
 msgid "Allow users to login through OpenID."
-msgstr ""
+msgstr "ユーザはOpenIDを介してログインすることができます。"
 
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_account_payment
@@ -16241,7 +16240,7 @@ msgstr "仕入先支払管理"
 #. module: base
 #: model:res.country,name:base.sv
 msgid "El Salvador"
-msgstr ""
+msgstr "エルサルバドル"
 
 #. module: base
 #: field:res.bank,phone:0
@@ -16249,17 +16248,17 @@ msgstr ""
 #: field:res.partner,phone:0
 #: field:res.partner.address,phone:0
 msgid "Phone"
-msgstr ""
+msgstr "電話"
 
 #. module: base
 #: field:res.groups,menu_access:0
 msgid "Access Menu"
-msgstr ""
+msgstr "アドレスメニュー"
 
 #. module: base
 #: model:res.country,name:base.th
 msgid "Thailand"
-msgstr ""
+msgstr "タイ王国"
 
 #. module: base
 #: model:ir.module.module,description:base.module_base_report_creator
@@ -16274,18 +16273,26 @@ msgid ""
 "After installing the module, it adds a menu to define a custom report in\n"
 "the Administration / Customization / Reporting menu.\n"
 msgstr ""
+"\n"
+"このモジュールは幾つかのオブジェクトによりどんな統計レポートも作ることができます。\n"
+"=========================================================================\n"
+"\n"
+"これは、エンドユーザのためのSQLクエリビルダーとブラウザです。\n"
+"\n"
+"モジュールをインストールした後、アドミニストレーション / カスタム化 / レポーティング\n"
+"メニューの中にカスタムレポートを定義するためのメニューが追加されます。\n"
 
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_report_designer
 msgid "Report Designer"
-msgstr ""
+msgstr "レポートデザイナ"
 
 #. module: base
 #: model:ir.ui.menu,name:base.menu_address_book
 #: model:ir.ui.menu,name:base.menu_config_address_book
 #: model:ir.ui.menu,name:base.menu_procurement_management_supplier
 msgid "Address Book"
-msgstr ""
+msgstr "アドレス帳"
 
 #. module: base
 #: model:ir.module.module,description:base.module_l10n_ma
@@ -16300,6 +16307,15 @@ msgid ""
 "cumulatif...). L'intégration comptable a été validé avec l'aide du Cabinet "
 "d'expertise comptable Seddik au cours du troisième trimestre 2010"
 msgstr ""
+"\n"
+"これはモロッコの会計表を管理するための基本モジュールです。\n"
+"=================================================================\n"
+"\n"
+"Ce Module charge le modèle du plan de comptes standard Marocain et permet de "
+"générer les états comptables aux normes marocaines (Bilan, CPC (comptes de "
+"produits et charges), balance générale à 6 colonnes, Grand livre "
+"cumulatif...). L'intégration comptable a été validé avec l'aide du Cabinet "
+"d'expertise comptable Seddik au cours du troisième trimestre 2010"
 
 #. module: base
 #: model:ir.module.module,description:base.module_web_calendar
@@ -16308,11 +16324,14 @@ msgid ""
 "        OpenERP Web calendar view.\n"
 "        "
 msgstr ""
+"\n"
+"        OpenERP Webカレンダービュー\n"
+"        "
 
 #. module: base
 #: model:ir.ui.menu,name:base.menu_crm_config_lead
 msgid "Leads & Opportunities"
-msgstr ""
+msgstr "リードとオポチュニティ"
 
 #. module: base
 #: selection:base.language.install,lang:0
@@ -16322,40 +16341,40 @@ msgstr "ルーマニア語 / română"
 #. module: base
 #: view:res.log:0
 msgid "System Logs"
-msgstr ""
+msgstr "システムログ"
 
 #. module: base
 #: selection:workflow.activity,join_mode:0
 #: selection:workflow.activity,split_mode:0
 msgid "And"
-msgstr ""
+msgstr "かつ"
 
 #. module: base
 #: help:ir.values,res_id:0
 msgid ""
 "Database identifier of the record to which this applies. 0 = for all records"
-msgstr ""
+msgstr "これを適用するためのレコードのデータベース識別子。0 = 全てのレコードのため"
 
 #. module: base
 #: field:ir.model.fields,relation:0
 msgid "Object Relation"
-msgstr ""
+msgstr "オブジェクトの関係"
 
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_account_voucher
 msgid "eInvoicing & Payments"
-msgstr ""
+msgstr "電子請求と支払"
 
 #. module: base
 #: view:ir.rule:0
 #: view:res.partner:0
 msgid "General"
-msgstr ""
+msgstr "一般"
 
 #. module: base
 #: model:res.country,name:base.uz
 msgid "Uzbekistan"
-msgstr ""
+msgstr "ウズベキスタン"
 
 #. module: base
 #: model:ir.model,name:base.model_ir_actions_act_window
@@ -16366,33 +16385,33 @@ msgstr ""
 #. module: base
 #: field:ir.rule,perm_create:0
 msgid "Apply For Create"
-msgstr ""
+msgstr "作成の適用"
 
 #. module: base
 #: model:res.country,name:base.vi
 msgid "Virgin Islands (USA)"
-msgstr ""
+msgstr "アメリカ領ヴァージン諸島"
 
 #. module: base
 #: model:res.country,name:base.tw
 msgid "Taiwan"
-msgstr ""
+msgstr "台湾"
 
 #. module: base
 #: model:ir.model,name:base.model_res_currency_rate
 msgid "Currency Rate"
-msgstr ""
+msgstr "為替レート"
 
 #. module: base
 #: field:workflow,osv:0
 #: field:workflow.instance,res_type:0
 msgid "Resource Object"
-msgstr ""
+msgstr "リソースオブジェクト"
 
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_crm_helpdesk
 msgid "Helpdesk"
-msgstr ""
+msgstr "ヘルプデスク"
 
 #. module: base
 #: model:ir.actions.act_window,help:base.grant_menu_access
@@ -16403,16 +16422,19 @@ msgid ""
 "be assigned to specific groups in order to make them accessible to some "
 "users within the system."
 msgstr ""
+"OpenERPシステムメニューの中の利用可能で表示される項目の管理とカスタマイズができます。各行の先頭にあるボックスをクリックして現れたボタンを介して削除"
+"することで、その項目を削除することができます。項目は、システム内の一部のユーザーからアクセスできるようにするために、特定のグループに割り当てることができま"
+"す。"
 
 #. module: base
 #: field:ir.ui.view,field_parent:0
 msgid "Child Field"
-msgstr ""
+msgstr "子項目"
 
 #. module: base
 #: view:ir.rule:0
 msgid "Detailed algorithm:"
-msgstr ""
+msgstr "アルゴリズムの詳細："
 
 #. module: base
 #: field:ir.actions.act_window,usage:0
@@ -16423,7 +16445,7 @@ msgstr ""
 #: field:ir.actions.server,usage:0
 #: field:ir.actions.wizard,usage:0
 msgid "Action Usage"
-msgstr ""
+msgstr "アクションの用途"
 
 #. module: base
 #: model:ir.model,name:base.model_workflow_workitem
@@ -16433,19 +16455,19 @@ msgstr ""
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_profile_tools
 msgid "Miscellaneous Tools"
-msgstr ""
+msgstr "その他のツール"
 
 #. module: base
 #: model:ir.module.category,description:base.module_category_tools
 msgid ""
 "Lets you install various interesting but non-essential tools like Survey, "
 "Lunch and Ideas box."
-msgstr ""
+msgstr "調査、昼食、アイディアボックスといった様々な興味深い、しかし、本質的ではないツールのインストールができます。"
 
 #. module: base
 #: selection:ir.module.module,state:0
 msgid "Not Installable"
-msgstr ""
+msgstr "インストール可能でない"
 
 #. module: base
 #: model:ir.module.module,description:base.module_product
@@ -16471,27 +16493,46 @@ msgid ""
 "Print product labels with barcode.\n"
 "    "
 msgstr ""
+"\n"
+"これはOpenERPの製品と価格リストを管理するための基本モジュールです。\n"
+"========================================================================\n"
+"\n"
+"製品は異形、異なる価格設定方法、仕入先情報、在庫 / オーダーの作成、\n"
+"異なった計量単位、梱包、資産をサポートします。\n"
+"\n"
+"価格表サポート：\n"
+"　・ 複数レベルの割引（製品、分類、数量ごと）\n"
+"　・ 異なった基準に基づく価格を計算：\n"
+"　　　・ 他の料金表\n"
+"　　　・ 原価\n"
+"　　　・ リストの価格\n"
+"　　　・ 仕入価格など\n"
+"\n"
+"製品および / またはパートナによる価格リストの好み\n"
+"\n"
+"バーコード付きの製品ラベルの印刷\n"
+"    "
 
 #. module: base
 #: report:ir.module.reference.graph:0
 msgid "View :"
-msgstr ""
+msgstr "ビュー："
 
 #. module: base
 #: field:ir.model.fields,view_load:0
 msgid "View Auto-Load"
-msgstr ""
+msgstr "自動ロードの表示"
 
 #. module: base
 #: code:addons/base/ir/ir_model.py:264
 #, python-format
 msgid "You cannot remove the field '%s' !"
-msgstr ""
+msgstr "この項目を取り去ることはできません %s。"
 
 #. module: base
 #: view:res.users:0
 msgid "Allowed Companies"
-msgstr ""
+msgstr "許可された会社"
 
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_l10n_de
@@ -16501,23 +16542,23 @@ msgstr "ドイツ - 会計"
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_auction
 msgid "Auction Houses"
-msgstr ""
+msgstr "オークションハウス"
 
 #. module: base
 #: field:ir.ui.menu,web_icon:0
 msgid "Web Icon File"
-msgstr ""
+msgstr "Webアイコンファイル"
 
 #. module: base
 #: view:base.module.upgrade:0
 #: model:ir.ui.menu,name:base.menu_view_base_module_upgrade
 msgid "Apply Scheduled Upgrades"
-msgstr ""
+msgstr "スケジュールされた更新を適用"
 
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_sale_journal
 msgid "Invoicing Journals"
-msgstr ""
+msgstr "請求仕訳帳"
 
 #. module: base
 #: selection:base.language.install,lang:0
@@ -16527,20 +16568,20 @@ msgstr "ペルシア語 / فارس"
 #. module: base
 #: view:ir.actions.act_window:0
 msgid "View Ordering"
-msgstr ""
+msgstr "オーダーの表示"
 
 #. module: base
 #: code:addons/base/module/wizard/base_module_upgrade.py:95
 #, python-format
 msgid "Unmet dependency !"
-msgstr ""
+msgstr "依存関係が満たされていません。"
 
 #. module: base
 #: view:base.language.import:0
 msgid ""
 "Supported file formats: *.csv (Comma-separated values) or *.po (GetText "
 "Portable Objects)"
-msgstr ""
+msgstr "サポートされるファイル形式：*.csv（コンマ区切りの値）、*.po（移植可能オブジェクト）"
 
 #. module: base
 #: code:addons/base/ir/ir_model.py:534
@@ -16548,7 +16589,7 @@ msgstr ""
 msgid ""
 "You can not delete this document (%s) ! Be sure your user belongs to one of "
 "these groups: %s."
-msgstr ""
+msgstr "このドキュメントは削除できません（%s）。ユーザがこれらのグループの何れかに属していることを確認して下さい：%s"
 
 #. module: base
 #: model:ir.module.module,description:base.module_web_livechat
@@ -16560,6 +16601,12 @@ msgid ""
 "Add \"Support\" button in header from where you can access OpenERP Support.\n"
 "    "
 msgstr ""
+"\n"
+"保守契約を持つ人とのライブチャットによるサポートを有効にします。============================================="
+"======================\n"
+"\n"
+"OpenERPサポートにアクセスできる場所からヘッダにサポートボタンを追加します。\n"
+"    "
 
 #. module: base
 #: model:ir.model,name:base.model_base_module_configuration
@@ -16574,49 +16621,53 @@ msgid ""
 "        This module provides the core of the OpenERP web client.\n"
 "        "
 msgstr ""
+"\n"
+"        OpenERP Webコアモジュール\n"
+"        このもモジュールはOpenERP Webクライアントのコアを提供します。\n"
+"        "
 
 #. module: base
 #: sql_constraint:res.country:0
 msgid "The name of the country must be unique !"
-msgstr ""
+msgstr "国の名前は固有であるべきです。"
 
 #. module: base
 #: field:base.language.export,name:0
 #: field:ir.attachment,datas_fname:0
 msgid "Filename"
-msgstr ""
+msgstr "ファイル名"
 
 #. module: base
 #: field:ir.model,access_ids:0
 #: view:ir.model.access:0
 msgid "Access"
-msgstr ""
+msgstr "アクセス"
 
 #. module: base
 #: model:res.country,name:base.sk
 msgid "Slovak Republic"
-msgstr ""
+msgstr "スロバキア共和国"
 
 #. module: base
 #: model:ir.ui.menu,name:base.publisher_warranty
 msgid "Publisher Warranty"
-msgstr ""
+msgstr "発行人保証"
 
 #. module: base
 #: model:res.country,name:base.aw
 msgid "Aruba"
-msgstr ""
+msgstr "アルバ"
 
 #. module: base
 #: code:addons/base/module/wizard/base_module_import.py:60
 #, python-format
 msgid "File is not a zip file!"
-msgstr ""
+msgstr "ファイルがzipファイルでありません。"
 
 #. module: base
 #: model:res.country,name:base.ar
 msgid "Argentina"
-msgstr ""
+msgstr "アルゼンチン"
 
 #. module: base
 #: model:ir.module.module,description:base.module_project_issue
@@ -16631,28 +16682,36 @@ msgid ""
 "and decide on their status as they evolve.\n"
 "    "
 msgstr ""
+"\n"
+"このモジュールはプロジェクトの問題 / バグ管理を提供します。\n"
+"=======================================================\n"
+"\n"
+"OpenERPはシステムのバグ、顧客からの苦情、 物理的な故障などプロジェクトが\n"
+"直面する問題を管理します。リストビューはマネジャが問題をすばやくチェックし、\n"
+"それを割り当てそして進展するステータスの上での決定をすることができます。\n"
+"    "
 
 #. module: base
 #: field:res.groups,full_name:0
 msgid "Group Name"
-msgstr ""
+msgstr "グループ名"
 
 #. module: base
 #: model:res.country,name:base.bh
 msgid "Bahrain"
-msgstr ""
+msgstr "バーレーン"
 
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_web
 msgid "web"
-msgstr ""
+msgstr "Web"
 
 #. module: base
 #: field:res.bank,fax:0
 #: field:res.company,fax:0
 #: field:res.partner.address,fax:0
 msgid "Fax"
-msgstr ""
+msgstr "FAX"
 
 #. module: base
 #: model:ir.module.module,description:base.module_l10n_nl
@@ -16693,11 +16752,45 @@ msgid ""
 "\n"
 "    "
 msgstr ""
+"\n"
+"これはOpenERPのオランダの会計表を管理するためのモジュールです。\n"
+"============================================================================="
+"\n"
+"\n"
+"バージョン情報のために、__openerp__.pyファイルの中の変更履歴をお読み下さい。\n"
+"Dit is een basismodule om een uitgebreid grootboek- en BTW schema voor "
+"Nederlandse bedrijven te installeren in OpenERP versie 5.\n"
+"\n"
+"De BTW rekeningen zijn waar nodig gekoppeld om de juiste rapportage te "
+"genereren, denk b.v. aan intracommunautaire verwervingen\n"
+"waarbij u 19% BTW moet opvoeren, maar tegelijkertijd ook 19% als voorheffing "
+"weer mag aftrekken.\n"
+"\n"
+"Na installatie van deze module word de configuratie wizard voor "
+"\"Accounting\" aangeroepen.\n"
+"    * U krijgt een lijst met grootboektemplates aangeboden waarin zich ook "
+"het Nederlandse grootboekschema bevind.\n"
+"\n"
+"    * Als de configuratie wizard start, wordt u gevraagd om de naam van uw "
+"bedrijf in te voeren, welke grootboekschema te installeren, uit hoeveel "
+"cijfers een grootboekrekening mag bestaan, het rekeningnummer van uw bank en "
+"de currency om Journalen te creeren.\n"
+"\n"
+"Let op!! -> De template van het Nederlandse rekeningschema is opgebouwd uit "
+"4 cijfers. Dit is het minimale aantal welk u moet invullen, u mag het aantal "
+"verhogen. De extra cijfers worden dan achter het rekeningnummer aangevult "
+"met \"nullen\"\n"
+"\n"
+"    * Dit is dezelfe configuratie wizard welke aangeroepen kan worden via "
+"Financial Management/Configuration/Financial Accounting/Financial "
+"Accounts/Generate Chart of Accounts from a Chart Template.\n"
+"\n"
+"    "
 
 #. module: base
 #: view:res.partner.address:0
 msgid "Search Contact"
-msgstr ""
+msgstr "コンタクトの検索"
 
 #. module: base
 #: view:ir.attachment:0
@@ -16714,18 +16807,18 @@ msgstr ""
 #: view:res.users:0
 #: field:res.users,company_id:0
 msgid "Company"
-msgstr ""
+msgstr "会社"
 
 #. module: base
 #: model:ir.module.category,name:base.module_category_report_designer
 msgid "Advanced Reporting"
-msgstr ""
+msgstr "高度なレポート"
 
 #. module: base
 #: selection:ir.actions.act_window,target:0
 #: selection:ir.actions.url,target:0
 msgid "New Window"
-msgstr ""
+msgstr "新規ウィンドウ"
 
 #. module: base
 #: model:ir.model,name:base.model_ir_model_data
@@ -16735,7 +16828,7 @@ msgstr ""
 #. module: base
 #: view:publisher_warranty.contract:0
 msgid "Publisher Warranty Contract"
-msgstr ""
+msgstr "発行人保証契約"
 
 #. module: base
 #: selection:base.language.install,lang:0
@@ -16745,7 +16838,7 @@ msgstr "ブルガリア語 / български език"
 #. module: base
 #: model:ir.ui.menu,name:base.menu_aftersale
 msgid "After-Sale Services"
-msgstr ""
+msgstr "アフターサービス"
 
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_l10n_fr
@@ -16755,17 +16848,17 @@ msgstr "フランス - 会計"
 #. module: base
 #: view:ir.actions.todo:0
 msgid "Launch"
-msgstr ""
+msgstr "起動"
 
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_caldav
 msgid "Share Calendar using CalDAV"
-msgstr ""
+msgstr "CalDAVを利用してカレンダーを共有"
 
 #. module: base
 #: field:ir.actions.act_window,limit:0
 msgid "Limit"
-msgstr ""
+msgstr "制限"
 
 #. module: base
 #: help:workflow.transition,group_id:0
@@ -16777,18 +16870,18 @@ msgstr "ユーザがこのトランジションを有効にするために許可
 #: code:addons/orm.py:791
 #, python-format
 msgid "Serialization field `%s` not found for sparse field `%s`!"
-msgstr ""
+msgstr "シリアライズ項目%s が（スパース項目 %s のための）見つかりません。"
 
 #. module: base
 #: model:res.country,name:base.jm
 msgid "Jamaica"
-msgstr ""
+msgstr "ジャマイカ"
 
 #. module: base
 #: field:res.partner,color:0
 #: field:res.partner.address,color:0
 msgid "Color Index"
-msgstr ""
+msgstr "カラーインデックス"
 
 #. module: base
 #: model:ir.actions.act_window,help:base.action_partner_category_form
@@ -16798,11 +16891,13 @@ msgid ""
 "categories have a hierarchy structure: a partner belonging to a category "
 "also belong to his parent category."
 msgstr ""
+"追跡のためのより良い分類を行うためや分析目的のためにパートナの分類を管理して下さい。パートナは幾つかの分類に属している可能性もあり、分類は階層的な構造を持"
+"つかも知れません：パートナの属する分類はその親の分類にも属しています。"
 
 #. module: base
 #: model:res.country,name:base.az
 msgid "Azerbaijan"
-msgstr ""
+msgstr "アゼルバイジャン"
 
 #. module: base
 #: code:addons/base/ir/ir_mail_server.py:450
@@ -16814,28 +16909,28 @@ msgstr "警告"
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_edi
 msgid "Electronic Data Interchange (EDI)"
-msgstr ""
+msgstr "電子データ交換（EDI）"
 
 #. module: base
 #: model:ir.module.category,name:base.module_category_tools
 msgid "Extra Tools"
-msgstr ""
+msgstr "その他ツール"
 
 #. module: base
 #: model:res.country,name:base.vg
 msgid "Virgin Islands (British)"
-msgstr ""
+msgstr "イギリス領ヴァージン諸島"
 
 #. module: base
 #: view:ir.property:0
 #: model:ir.ui.menu,name:base.next_id_15
 msgid "Parameters"
-msgstr ""
+msgstr "パラメータ"
 
 #. module: base
 #: model:res.country,name:base.pm
 msgid "Saint Pierre and Miquelon"
-msgstr ""
+msgstr "サンピエール島・ミクロン島"
 
 #. module: base
 #: model:ir.module.module,description:base.module_email_template
@@ -16883,6 +16978,37 @@ msgid ""
 "\n"
 "    "
 msgstr ""
+"\n"
+"Eメールのテンプレート化（OpenlabsのオリジナルのPower Emailの簡易バージョン）\n"
+"============================================================================="
+"\n"
+"\n"
+"送信者、受信者、件名、ボディ（HTMLとテキスト）を含む、任意のOpenERPドキュメント\n"
+"（受注オーダー、請求書など）に関連する完全なEメールテンプレートをデザインできます。\n"
+"また、テンプレートにファイルや、レポートを印刷して自動的に添付することができます。\n"
+"\n"
+"高度な使用では、テンプレートにはそれらが関連するドキュメントの動的な属性を含むこと\n"
+"ができます。例えば、それを書く時や、その属性が定義されていない時に安全な\n"
+"デフォルト提供するためにもパートナの国の名前を使うことができます。、\n"
+"それぞれのテンプレートはそれらの動的な値を含むことを助けるための組み込みアシスタント\n"
+"が含まれています。\n"
+"\n"
+"このオプションを有効にしているなら、組み立てアシスタントはテンプレートが適用される\n"
+"OpenERPドキュメント（例えば請求書）のサイドバーに表示されます。\n"
+"これは必要に応じて、レビューや内容の改変をした後で、テンプレートを基本とした\n"
+"新しいEメールを送るための簡単な方法として役立ちます。\n"
+"\n"
+"この組み立てアシスタントは一度に複数のドキュメントのために呼ばれるときには\n"
+"大量メーリングシステムにもなります。\n"
+"\n"
+"任意のOpenERPドキュメント上で大きなキャンペーンを自動化することが必要なら、\n"
+"これらのEメールテンプレートは、マーケティングキャンペーンシステムの心臓部にも\n"
+"なります（マーケティングキャンペーンアプリケーションを参照）。\n"
+"\n"
+"技術的な注記：これは、Openlabsにより維持されるオリジナルのPower Emailに対する\n"
+"単にテンプレート化のシステムです。\n"
+"\n"
+"    "
 
 #. module: base
 #: selection:base.language.install,lang:0
@@ -16892,7 +17018,7 @@ msgstr "チェコ語 / Čeština"
 #. module: base
 #: model:ir.module.category,name:base.module_category_generic_modules
 msgid "Generic Modules"
-msgstr ""
+msgstr "一般的なモジュール"
 
 #. module: base
 #: model:ir.actions.act_window,help:base.action_partner_supplier_form
@@ -16902,11 +17028,13 @@ msgid ""
 "uncheck the 'Suppliers' filter button in order to search in all your "
 "partners, including customers and prospects."
 msgstr ""
+"仕入先フォームから仕入先に関する全ての情報にアクセスできます：会計データ、Eメールの履歴、ミーティング、発注など。顧客や見込み客を含む全てのパートナを検索"
+"するためには仕入先のフィルタボタンのチェックを外して下さい。"
 
 #. module: base
 #: model:res.country,name:base.rw
 msgid "Rwanda"
-msgstr ""
+msgstr "ルワンダ"
 
 #. module: base
 #: model:ir.module.module,description:base.module_hr_timesheet
@@ -16927,21 +17055,32 @@ msgid ""
 "to set up a management by affair.\n"
 "    "
 msgstr ""
+"\n"
+"このモジュールはタイムシートシステムを実装します。\n"
+"==========================================\n"
+"\n"
+"それぞれの従業員は異なったプロジェクトに費やした時間のエンコードと追跡ができます。\n"
+"プロジェクトは分析アカウントであり、プロジェクトに費やした時間は分析アカウント上にコストを生成します。\n"
+"\n"
+"時間に関する多数のレポートと従業員追跡が提供されます。\n"
+"\n"
+"これは完全に原価計算モジュールと統合されます。これにより仕事による管理が実現されます。\n"
+"    "
 
 #. module: base
 #: help:ir.mail_server,smtp_port:0
 msgid "SMTP Port. Usually 465 for SSL, and 25 or 587 for other cases."
-msgstr ""
+msgstr "SMTPポートは通常はSSLのために465が、他のケースのために25と587が使われます。"
 
 #. module: base
 #: view:ir.sequence:0
 msgid "Day of the week (0:Monday): %(weekday)s"
-msgstr ""
+msgstr "曜日（0：月曜日）：%(weekday)s"
 
 #. module: base
 #: model:res.country,name:base.ck
 msgid "Cook Islands"
-msgstr ""
+msgstr "クック諸島"
 
 #. module: base
 #: field:ir.model.data,noupdate:0
@@ -16951,17 +17090,17 @@ msgstr ""
 #. module: base
 #: selection:base.language.install,lang:0
 msgid "Klingon"
-msgstr ""
+msgstr "クリンゴン語"
 
 #. module: base
 #: model:res.country,name:base.sg
 msgid "Singapore"
-msgstr ""
+msgstr "シンガポール"
 
 #. module: base
 #: selection:ir.actions.act_window,target:0
 msgid "Current Window"
-msgstr ""
+msgstr "現在のウィンドウ"
 
 #. module: base
 #: model:ir.module.module,description:base.module_crm
@@ -16999,18 +17138,42 @@ msgid ""
 "    * Opportunities by Stage (graph)\n"
 "    * Planned Revenue by Stage and User (graph)\n"
 msgstr ""
+"\n"
+"一般的なOpenERPのCRM（Customer Relationship Management）\n"
+"=====================================================\n"
+"\n"
+"このシステムは人々のグループがリード、オポチュニティ、ミーティング、電話他を知的に効果的に\n"
+"管理することを可能にします。これはコミュニケーション、身分証明、優先度付け、割り当て、\n"
+"問題解決、通知といった主要なタスクを管理します。\n"
+"\n"
+"OpenERPはユーザ、顧客、仕入先による全てのケースが正常に追跡されることを保証します。\n"
+"自動的にリマインダーを送信し、リクエストを徐々に拡大し、特定のメソッドと自身の会社のルール\n"
+"に基づく多くの他のアクションをトリガすることができます。\n"
+"\n"
+"このシステムで最大のものはユーザは特別な何かをする必要がないことです。\n"
+"単にリクエストの追跡のためにEメールを送信するだけです。OpenERPは彼らの\n"
+"メッセージに敬意を持って取り扱い、自動的に適切なスタッフにルーティングし、\n"
+"そしてこの先の対応が正しい場所に到達することを確実にします。\n"
+"\n"
+"CRMモジュールはメールとOpenERPの間を同期インタフェースするために\n"
+"Eメールゲートウェイを持ちます。\n"
+"\n"
+"CRMのために作成されるダッシュボードは次のものを含みます：\n"
+"　・ 分類別のオポチュニティ（グラフ）\n"
+"　・ ステージ別のオポチュニティ（グラフ）\n"
+"　・ ステージとユーザ別の計画収益（グラフ）\n"
 
 #. module: base
 #: model:ir.module.category,description:base.module_category_accounting_and_finance
 msgid ""
 "Helps you handle your accounting needs, if you are not an accountant, we "
 "suggest you to install only the Invoicing."
-msgstr ""
+msgstr "会計処理に必要な手助けをします。あなたが会計士でないなら請求書処理のみをインストールすることをお勧めします。"
 
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_plugin_thunderbird
 msgid "Thunderbird Plug-In"
-msgstr ""
+msgstr "Thunderbirdプラグイン"
 
 #. module: base
 #: model:ir.model,name:base.model_res_country
@@ -17023,7 +17186,7 @@ msgstr ""
 #: field:res.partner.address,country_id:0
 #: field:res.partner.bank,country_id:0
 msgid "Country"
-msgstr ""
+msgstr "国"
 
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_project_messages
@@ -17033,7 +17196,7 @@ msgstr ""
 #. module: base
 #: model:res.country,name:base.pn
 msgid "Pitcairn Island"
-msgstr ""
+msgstr "ピトケアン島"
 
 #. module: base
 #: model:ir.module.module,description:base.module_web_tests
@@ -17042,39 +17205,42 @@ msgid ""
 "        OpenERP Web test suite.\n"
 "        "
 msgstr ""
+"\n"
+"        OpenERP Webテストスイート\n"
+"        "
 
 #. module: base
 #: view:ir.values:0
 msgid "Action Bindings/Defaults"
-msgstr ""
+msgstr "アクションバインディング / デフォルト"
 
 #. module: base
 #: view:ir.rule:0
 msgid ""
 "1. Global rules are combined together with a logical AND operator, and with "
 "the result of the following steps"
-msgstr ""
+msgstr "1. グローバルなルールは論理AND演算子により、ともに結合されます。その結果は、以下のステップとなります。"
 
 #. module: base
 #: view:res.partner:0
 #: view:res.partner.address:0
 msgid "Change Color"
-msgstr ""
+msgstr "色の変更"
 
 #. module: base
 #: model:res.partner.category,name:base.res_partner_category_15
 msgid "IT sector"
-msgstr ""
+msgstr "ITセクター"
 
 #. module: base
 #: view:ir.actions.act_window:0
 msgid "Select Groups"
-msgstr ""
+msgstr "グループを選択"
 
 #. module: base
 #: view:res.lang:0
 msgid "%X - Appropriate time representation."
-msgstr ""
+msgstr "%X - 適切な時刻の表現"
 
 #. module: base
 #: selection:base.language.install,lang:0
@@ -17089,32 +17255,35 @@ msgid ""
 "1,06,500;[1,2,-1] will represent it to be 106,50,0;[3] will represent it as "
 "106,500. Provided ',' as the thousand separator in each case."
 msgstr ""
+"0 < n の時に、セパレータのフォーマットは [,n] のようにすべきです：ユニットディジットが -1 "
+"から始まるとセパレーションの終了です。例えば、[3,2,-1] は 106500 を 1,06,500 に；[1,2,-1] は 106,50,0 "
+"に；[3] は 106,500 となります。それぞれのケースでは千のセパレータとして\",\"を与えて下さい。"
 
 #. module: base
 #: field:ir.module.module,auto_install:0
 msgid "Automatic Installation"
-msgstr ""
+msgstr "自動インストール"
 
 #. module: base
 #: model:res.country,name:base.jp
 msgid "Japan"
-msgstr ""
+msgstr "日本"
 
 #. module: base
 #: code:addons/base/ir/ir_model.py:357
 #, python-format
 msgid "Can only rename one column at a time!"
-msgstr ""
+msgstr "リネームは一度に１カラムしかできません。"
 
 #. module: base
 #: selection:ir.translation,type:0
 msgid "Wizard Button"
-msgstr ""
+msgstr "ウィザードボタン"
 
 #. module: base
 #: selection:ir.translation,type:0
 msgid "Report/Template"
-msgstr ""
+msgstr "レポート / テンプレート"
 
 #. module: base
 #: model:ir.module.module,description:base.module_marketing_campaign
@@ -17145,13 +17314,33 @@ msgid ""
 "Leads.\n"
 "    "
 msgstr ""
+"\n"
+"このモジュールはマーケティングキャンペーン（キャンペーンは実際、単なるCRMリードではなく、何れかのリソースにより定義されます）を通してリードの自動化を提"
+"供します。\n"
+"============================================================================="
+"============================================================\n"
+"\n"
+"キャンペーンは動的でマルチチャンネルです。そのプロセスは次のとおりです：\n"
+"　・ "
+"マーケティングキャンペーンはワークフローのようにデザインして下さい。これには送信用のEメールテンプレート、プリントしてEメールで送信するレポート、カスタム"
+"アクションなどが含まれます。\n"
+"　・ キャンペーンで入力すべき項目（例えば、確かな国からのリードなど）を選択した入力セグメントの定義をして下さい。\n"
+"　・ キャンペーンをテストのためにリアルタイムあるいは加速状態でシミュレーションモードで実行して下さい。その後、微調整します。\n"
+"　・ 各アクションが手動の検証を必要とする場合は、手動で実際のキャンペーンを開始することもできます。\n"
+"　・ 最後にキャンペーンを実際に起動し、キャンペーンの全てが完全に自動的に行われるよう統計値を監視します。\n"
+"\n"
+"キャンペーンの実行中にも、ちろんパラメータ、入力背具面tp、ワークフローなどの微調整を続ける事ができます。\n"
+"\n"
+"注記：デモデータが必要なら、marketing_campaign_crm_demoモジュールをインストールできます。それはCRMリードに依存するため、CR"
+"Mアプリケーションもインストールすることになります。\n"
+"    "
 
 #. module: base
 #: selection:ir.actions.act_window.view,view_mode:0
 #: selection:ir.ui.view,type:0
 #: selection:wizard.ir.model.menu.create.line,view_type:0
 msgid "Graph"
-msgstr ""
+msgstr "グラフ"
 
 #. module: base
 #: model:ir.model,name:base.model_ir_actions_server
@@ -17171,32 +17360,32 @@ msgstr "カナダ - 会計"
 #: model:ir.ui.menu,name:base.menu_ir_actions_todo_form
 #: model:ir.ui.menu,name:base.next_id_11
 msgid "Configuration Wizards"
-msgstr ""
+msgstr "設定ウィザード"
 
 #. module: base
 #: field:res.lang,code:0
 msgid "Locale Code"
-msgstr ""
+msgstr "ロケールコード"
 
 #. module: base
 #: field:workflow.activity,split_mode:0
 msgid "Split Mode"
-msgstr ""
+msgstr "分割モード"
 
 #. module: base
 #: view:base.module.upgrade:0
 msgid "Note that this operation might take a few minutes."
-msgstr ""
+msgstr "この操作は数分を要しますのでご注意下さい。"
 
 #. module: base
 #: model:ir.ui.menu,name:base.menu_localisation
 msgid "Localisation"
-msgstr ""
+msgstr "ローカル化"
 
 #. module: base
 #: field:ir.sequence,implementation:0
 msgid "Implementation"
-msgstr ""
+msgstr "実装"
 
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_l10n_ve
@@ -17206,39 +17395,39 @@ msgstr "ベネズエラ - 会計"
 #. module: base
 #: model:res.country,name:base.cl
 msgid "Chile"
-msgstr ""
+msgstr "チリ"
 
 #. module: base
 #: view:ir.cron:0
 msgid "Execution"
-msgstr ""
+msgstr "実行"
 
 #. module: base
 #: field:ir.actions.server,condition:0
 #: view:ir.values:0
 #: field:workflow.transition,condition:0
 msgid "Condition"
-msgstr ""
+msgstr "条件"
 
 #. module: base
 #: help:res.currency,rate:0
 msgid "The rate of the currency to the currency of rate 1."
-msgstr ""
+msgstr "レートが1である通貨に対しての通貨のレート"
 
 #. module: base
 #: field:ir.ui.view,name:0
 msgid "View Name"
-msgstr ""
+msgstr "ビュー名"
 
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_document_ftp
 msgid "Shared Repositories (FTP)"
-msgstr ""
+msgstr "共有リポジトリ（FTP）"
 
 #. module: base
 #: model:ir.model,name:base.model_res_groups
 msgid "Access Groups"
-msgstr ""
+msgstr "アクセスグループ"
 
 #. module: base
 #: selection:base.language.install,lang:0
@@ -17248,7 +17437,7 @@ msgstr "イタリア語 / Italiano"
 #. module: base
 #: field:ir.actions.report.xml,attachment:0
 msgid "Save As Attachment Prefix"
-msgstr ""
+msgstr "プレフィックスを付けて保存"
 
 #. module: base
 #: view:ir.actions.server:0
@@ -17256,16 +17445,17 @@ msgid ""
 "Only one client action will be executed, last client action will be "
 "considered in case of multiple client actions."
 msgstr ""
+"１つのクライアントアクションのみが実行されます。複数のクライアントアクションがあるケースには、最後のクライアントアクションが認識されます。"
 
 #. module: base
 #: model:res.country,name:base.hr
 msgid "Croatia"
-msgstr ""
+msgstr "クロアチア"
 
 #. module: base
 #: field:ir.actions.server,mobile:0
 msgid "Mobile No"
-msgstr ""
+msgstr "携帯電話番号"
 
 #. module: base
 #: model:ir.actions.act_window,name:base.action_partner_by_category
@@ -17274,27 +17464,27 @@ msgstr ""
 #: model:ir.ui.menu,name:base.menu_partner_category_form
 #: view:res.partner.category:0
 msgid "Partner Categories"
-msgstr ""
+msgstr "パートナ分類"
 
 #. module: base
 #: view:base.module.upgrade:0
 msgid "System Update"
-msgstr ""
+msgstr "システム アップデート"
 
 #. module: base
 #: selection:ir.translation,type:0
 msgid "Wizard Field"
-msgstr ""
+msgstr "ウィザード項目"
 
 #. module: base
 #: help:ir.sequence,prefix:0
 msgid "Prefix value of the record for the sequence"
-msgstr ""
+msgstr "順序のためのレコードのプレフィックス値"
 
 #. module: base
 #: model:res.country,name:base.sc
 msgid "Seychelles"
-msgstr ""
+msgstr "セーシェル"
 
 #. module: base
 #: model:ir.actions.act_window,name:base.action_res_partner_bank_account_form
@@ -17304,39 +17494,39 @@ msgstr ""
 #: field:res.company,bank_ids:0
 #: view:res.partner.bank:0
 msgid "Bank Accounts"
-msgstr ""
+msgstr "銀行口座"
 
 #. module: base
 #: field:ir.model,modules:0
 #: field:ir.model.fields,modules:0
 msgid "In modules"
-msgstr ""
+msgstr "モジュール内"
 
 #. module: base
 #: model:res.country,name:base.sl
 msgid "Sierra Leone"
-msgstr ""
+msgstr "シエラレオネ"
 
 #. module: base
 #: view:res.company:0
 #: view:res.partner:0
 msgid "General Information"
-msgstr ""
+msgstr "一般的な情報"
 
 #. module: base
 #: model:res.country,name:base.tc
 msgid "Turks and Caicos Islands"
-msgstr ""
+msgstr "タークス・カイコス諸島"
 
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_fetchmail_project_issue
 msgid "eMail Gateway for Project Issues"
-msgstr ""
+msgstr "プロジェクトの問題のためのEメールゲートウェイ"
 
 #. module: base
 #: field:res.partner.bank,partner_id:0
 msgid "Account Owner"
-msgstr ""
+msgstr "アカウント所有者"
 
 #. module: base
 #: code:addons/base/res/res_users.py:270
@@ -17347,7 +17537,7 @@ msgstr "会社切替の警告"
 #. module: base
 #: model:res.country,name:base.ge
 msgid "Georgia"
-msgstr ""
+msgstr "グルジア"
 
 #. module: base
 #: model:ir.module.category,description:base.module_category_manufacturing
@@ -17359,99 +17549,99 @@ msgstr "製造プロセスを管理し、それらのプロセスのレポート
 #. module: base
 #: help:ir.sequence,number_increment:0
 msgid "The next number of the sequence will be incremented by this number"
-msgstr ""
+msgstr "シーケンスの次の番号はこの数値の分だけ増加させられます。"
 
 #. module: base
 #: code:addons/orm.py:341
 #, python-format
 msgid "Wrong ID for the browse record, got %r, expected an integer."
-msgstr ""
+msgstr "ブラウズレコードのためには間違ったIDです。取得したのは %r ですが、 整数が期待されます。"
 
 #. module: base
 #: field:res.partner.address,function:0
 #: selection:workflow.activity,kind:0
 msgid "Function"
-msgstr ""
+msgstr "機能"
 
 #. module: base
 #: view:res.widget:0
 msgid "Search Widget"
-msgstr ""
+msgstr "ウィジットの検索"
 
 #. module: base
 #: model:ir.module.category,description:base.module_category_customer_relationship_management
 msgid ""
 "Manage relations with prospects and customers using leads, opportunities, "
 "requests or issues."
-msgstr ""
+msgstr "リード、オポチュニティ、リクエスト、問題を使って、見込み客や顧客との関係を管理することができます。"
 
 #. module: base
 #: selection:res.partner.address,type:0
 msgid "Delivery"
-msgstr ""
+msgstr "配達"
 
 #. module: base
 #: model:res.partner.title,name:base.res_partner_title_pvt_ltd
 #: model:res.partner.title,shortcut:base.res_partner_title_pvt_ltd
 msgid "Corp."
-msgstr ""
+msgstr "会社"
 
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_purchase_requisition
 msgid "Purchase Requisitions"
-msgstr ""
+msgstr "発注依頼"
 
 #. module: base
 #: selection:ir.cron,interval_type:0
 msgid "Months"
-msgstr ""
+msgstr "月"
 
 #. module: base
 #: view:workflow.instance:0
 msgid "Workflow Instances"
-msgstr ""
+msgstr "ワークフローインスタンス"
 
 #. module: base
 #: code:addons/base/res/res_partner.py:284
 #, python-format
 msgid "Partners: "
-msgstr ""
+msgstr "パートナ： "
 
 #. module: base
 #: field:res.partner.bank,name:0
 msgid "Bank Account"
-msgstr ""
+msgstr "銀行口座"
 
 #. module: base
 #: model:res.country,name:base.kp
 msgid "North Korea"
-msgstr ""
+msgstr "北朝鮮"
 
 #. module: base
 #: selection:ir.actions.server,state:0
 msgid "Create Object"
-msgstr ""
+msgstr "オブジェクトの作成"
 
 #. module: base
 #: view:ir.filters:0
 #: field:res.log,context:0
 msgid "Context"
-msgstr ""
+msgstr "コンテキスト"
 
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_sale_mrp
 msgid "Sales and MRP Management"
-msgstr ""
+msgstr "受注とMRP管理"
 
 #. module: base
 #: model:ir.actions.act_window,name:base.action_partner_sms_send
 msgid "Send an SMS"
-msgstr ""
+msgstr "SMSを送信"
 
 #. module: base
 #: model:res.partner.category,name:base.res_partner_category_1
 msgid "Prospect"
-msgstr ""
+msgstr "見込み客"
 
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_stock_invoice_directly
@@ -17474,31 +17664,37 @@ msgid ""
 "are accessible if installed.\n"
 "    "
 msgstr ""
+"\n"
+"ツールモジュールのための共通基盤\n"
+"==============================\n"
+"\n"
+"もしインストールされている場合、調査、昼食、アイデアなどのツールがアクセス可能な場所から、ツールのためのメニューリンクを作成します。\n"
+"    "
 
 #. module: base
 #: field:ir.exports,name:0
 msgid "Export Name"
-msgstr ""
+msgstr "エクスポート名"
 
 #. module: base
 #: help:res.partner.address,type:0
 msgid ""
 "Used to select automatically the right address according to the context in "
 "sales and purchases documents."
-msgstr ""
+msgstr "受発注のドキュメントの内容に応じて、自動的に正しいアドレスを選択するために使用されます。"
 
 #. module: base
 #: model:ir.actions.act_window,name:base.res_widget_act_window
 #: model:ir.ui.menu,name:base.menu_res_widget_act_window
 msgid "Homepage Widgets"
-msgstr ""
+msgstr "ホームページウィジット"
 
 #. module: base
 #: help:res.company,rml_footer2:0
 msgid ""
 "This field is computed automatically based on bank accounts defined, having "
 "the display on footer checkbox set."
-msgstr ""
+msgstr "この項目はフッターのチェックボックスセット上に表示された定義された銀行口座に基づいて自動的に計算されます。"
 
 #. module: base
 #: model:ir.module.module,description:base.module_mrp_subproduct
@@ -17518,6 +17714,19 @@ msgid ""
 "    A + B + C -> D + E\n"
 "    "
 msgstr ""
+"\n"
+"このモジュールは１つの製造オーダーから幾つかの製品を製造することができます。\n"
+"============================================================================="
+"\n"
+"\n"
+"部品表でサブプロダクトを構成できます。\n"
+"\n"
+"このモジュールを使用しない場合：\n"
+"    A + B + C -> D\n"
+"\n"
+"このモジュールを使用した場合：\n"
+"    A + B + C -> D + E\n"
+"    "
 
 #. module: base
 #: model:res.country,name:base.lk
@@ -17550,6 +17759,26 @@ msgid ""
 "module.\n"
 "    "
 msgstr ""
+"\n"
+"このモジュールは何の開発もなしで新しいモジュールの作成ができます。\n"
+"======================================================================\n"
+"\n"
+"これは記録セッションの中でオブジェクトの全ての操作を記録します。そして、\n"
+".ZIPモジュールを生成します。それによって、OpenERPクライアントから直接\n"
+"独自モジュールを作成することができます。\n"
+"\n"
+"このバージョンは作成と既存のレコードの更新にために動作します。それは依存関係と、\n"
+"全てのウィジットのタイプのためリンク（多対１、多対多など）を再計算します。\n"
+"また、ワークフローとデモ / 更新データもサポートします。\n"
+"\n"
+"カスタム設定とデモ / テストデータのために、簡単に再利用と公表可能なモジュールを\n"
+"作成するために役立つはずです。\n"
+"\n"
+"利用方法：\n"
+"モジュールウィザードの アドミニストレーション/カスタマイゼーション/モジュール \n"
+"作成/エクスポート カスタマイゼーション を実行します。\n"
+"記録の日時の基準、記録されるオブジェクト、記録モジュールを選択して下さい。\n"
+"    "
 
 #. module: base
 #: selection:base.language.install,lang:0

From dfda972285d25802a696ed4671fad515a23c2446 Mon Sep 17 00:00:00 2001
From: Launchpad Translations on behalf of openerp <>
Date: Tue, 17 Apr 2012 05:24:01 +0000
Subject: [PATCH 115/238] Launchpad automatic translations update.

bzr revid: launchpad_translations_on_behalf_of_openerp-20120417045202-9zgk4szsg252hiln
bzr revid: launchpad_translations_on_behalf_of_openerp-20120417052401-zew26x0fyljrziw5
---
 addons/account/i18n/ja.po                     | 10428 ++++++++++++++++
 addons/account_analytic_analysis/i18n/ja.po   |     8 +-
 addons/account_analytic_default/i18n/gu.po    |   183 +
 addons/account_analytic_default/i18n/ja.po    |     8 +-
 addons/account_analytic_plans/i18n/gu.po      |   542 +
 addons/account_anglo_saxon/i18n/gu.po         |    98 +
 addons/account_anglo_saxon/i18n/ja.po         |    65 +-
 addons/account_asset/i18n/ja.po               |     6 +-
 .../i18n/ja.po                                |   100 +-
 .../i18n/pt.po                                |   386 +
 addons/account_check_writing/i18n/pt.po       |   210 +
 addons/account_invoice_layout/i18n/gu.po      |   355 +
 addons/auction/i18n/gu.po                     |  2357 ++++
 addons/crm/i18n/ja.po                         |   150 +-
 addons/hr/i18n/ja.po                          |   695 +
 addons/hr_payroll/i18n/ja.po                  |     4 +-
 addons/mrp_repair/i18n/sr@latin.po            |    12 +-
 addons/web/i18n/gu.po                         |  1544 +++
 addons/web/i18n/nl.po                         |     8 +-
 addons/web_diagram/i18n/bs.po                 |    57 +
 addons/web_gantt/i18n/bs.po                   |    28 +
 addons/web_graph/i18n/bs.po                   |    23 +
 addons/web_kanban/i18n/bs.po                  |    55 +
 23 files changed, 17160 insertions(+), 162 deletions(-)
 create mode 100644 addons/account/i18n/ja.po
 create mode 100644 addons/account_analytic_default/i18n/gu.po
 create mode 100644 addons/account_analytic_plans/i18n/gu.po
 create mode 100644 addons/account_anglo_saxon/i18n/gu.po
 create mode 100644 addons/account_bank_statement_extensions/i18n/pt.po
 create mode 100644 addons/account_check_writing/i18n/pt.po
 create mode 100644 addons/account_invoice_layout/i18n/gu.po
 create mode 100644 addons/auction/i18n/gu.po
 create mode 100644 addons/hr/i18n/ja.po
 create mode 100644 addons/web/i18n/gu.po
 create mode 100644 addons/web_diagram/i18n/bs.po
 create mode 100644 addons/web_gantt/i18n/bs.po
 create mode 100644 addons/web_graph/i18n/bs.po
 create mode 100644 addons/web_kanban/i18n/bs.po

diff --git a/addons/account/i18n/ja.po b/addons/account/i18n/ja.po
new file mode 100644
index 00000000000..781f574222c
--- /dev/null
+++ b/addons/account/i18n/ja.po
@@ -0,0 +1,10428 @@
+# 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:35+0000\n"
+"PO-Revision-Date: 2012-04-17 04:15+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"
+
+#. module: account
+#: view:account.invoice.report:0
+#: view:analytic.entries.report:0
+msgid "last month"
+msgstr "先月"
+
+#. module: account
+#: model:process.transition,name:account.process_transition_supplierreconcilepaid0
+msgid "System payment"
+msgstr "システム支払い"
+
+#. module: account
+#: view:account.journal:0
+msgid "Other Configuration"
+msgstr "その他の設定"
+
+#. module: account
+#: help:account.tax.code,sequence:0
+msgid ""
+"Determine the display order in the report 'Accounting \\ Reporting \\ "
+"Generic Reporting \\ Taxes \\ Taxes Report'"
+msgstr "会計 \\ レポート \\ 一般的なレポート \\ 税金 \\ 税金レポート にあるレポートの表示順を決定して下さい。"
+
+#. module: account
+#: view:account.move.reconcile:0
+msgid "Journal Entry Reconcile"
+msgstr "仕訳帳入力の調整"
+
+#. module: account
+#: view:account.account:0
+#: view:account.bank.statement:0
+#: view:account.move:0
+#: view:account.move.line:0
+msgid "Account Statistics"
+msgstr "アカウントの統計情報"
+
+#. module: account
+#: view:account.invoice:0
+msgid "Proforma/Open/Paid Invoices"
+msgstr "請求書のプロフォーマ / オープン / 支払い済"
+
+#. module: account
+#: field:report.invoice.created,residual:0
+msgid "Residual"
+msgstr "残余"
+
+#. module: account
+#: constraint:account.period:0
+msgid "Error ! The duration of the Period(s) is/are invalid. "
+msgstr "エラー。期間の長さが無効です。 "
+
+#. module: account
+#: field:account.analytic.line,currency_id:0
+msgid "Account currency"
+msgstr "アカウントの通貨"
+
+#. module: account
+#: view:account.tax:0
+msgid "Children Definition"
+msgstr "子の定義"
+
+#. module: account
+#: code:addons/account/account_bank_statement.py:302
+#, python-format
+msgid "Journal item \"%s\" is not valid."
+msgstr "仕訳項目 %s は有効ではありません。"
+
+#. module: account
+#: model:ir.model,name:account.model_report_aged_receivable
+msgid "Aged Receivable Till Today"
+msgstr "今日までの売掛金の年齢"
+
+#. module: account
+#: model:process.transition,name:account.process_transition_invoiceimport0
+msgid "Import from invoice or payment"
+msgstr "請求書や支払いからインポート"
+
+#. module: account
+#: model:ir.model,name:account.model_wizard_multi_charts_accounts
+msgid "wizard.multi.charts.accounts"
+msgstr ""
+
+#. module: account
+#: view:account.move:0
+msgid "Total Debit"
+msgstr "借方合計"
+
+#. module: account
+#: view:account.unreconcile:0
+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 "取引を調整しない場合、それらが無効にされないためには、それら取引にリンクされた全てのアクションを検証しなければなりません。"
+
+#. module: account
+#: constraint:account.journal:0
+msgid ""
+"Configuration error! The currency chosen should be shared by the default "
+"accounts too."
+msgstr "設定エラー。選択された通貨はデフォルトアカウントによっても共有されなければなりません。"
+
+#. module: account
+#: report:account.invoice:0
+#: field:account.invoice.line,origin:0
+msgid "Origin"
+msgstr "起点"
+
+#. module: account
+#: view:account.account:0
+#: view:account.automatic.reconcile:0
+#: field:account.move.line,reconcile_id:0
+#: view:account.move.line.reconcile:0
+#: view:account.move.line.reconcile.writeoff:0
+msgid "Reconcile"
+msgstr "調整"
+
+#. module: account
+#: field:account.bank.statement.line,ref:0
+#: field:account.entries.report,ref:0
+#: view:account.invoice:0
+#: field:account.move,ref:0
+#: field:account.move.line,ref:0
+#: field:account.subscription,ref:0
+msgid "Reference"
+msgstr "参照"
+
+#. module: account
+#: view:account.open.closed.fiscalyear:0
+msgid "Choose Fiscal Year "
+msgstr "年度の選択 "
+
+#. module: account
+#: help:account.payment.term,active:0
+msgid ""
+"If the active field is set to False, it will allow you to hide the payment "
+"term without removing it."
+msgstr "アクティブ項目がFalseに設定されている場合、支払条件を削除することなく非表示にできます。"
+
+#. module: account
+#: code:addons/account/account_invoice.py:1428
+#, python-format
+msgid "Warning!"
+msgstr "警告"
+
+#. module: account
+#: code:addons/account/account.py:3112
+#, python-format
+msgid "Miscellaneous Journal"
+msgstr "その他の仕訳帳"
+
+#. module: account
+#: field:account.fiscal.position.account,account_src_id:0
+#: field:account.fiscal.position.account.template,account_src_id:0
+msgid "Account Source"
+msgstr "元アカウント"
+
+#. module: account
+#: model:ir.actions.act_window,name:account.act_acc_analytic_acc_5_report_hr_timesheet_invoice_journal
+msgid "All Analytic Entries"
+msgstr "全ての分析エントリー"
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_view_created_invoice_dashboard
+msgid "Invoices Created Within Past 15 Days"
+msgstr "過去15日以内に作成済み請求書"
+
+#. module: account
+#: field:accounting.report,label_filter:0
+msgid "Column Label"
+msgstr "列ラベル"
+
+#. module: account
+#: code:addons/account/wizard/account_move_journal.py:95
+#, python-format
+msgid "Journal: %s"
+msgstr "仕訳帳：%s"
+
+#. module: account
+#: help:account.analytic.journal,type:0
+msgid ""
+"Gives the type of the analytic journal. When it needs for a document (eg: an "
+"invoice) to create analytic entries, OpenERP will look for a matching "
+"journal of the same type."
+msgstr ""
+"分析仕訳帳のタイプを与えて下さい。分析エントリーを作成するためのドキュメント（例えば請求書）のために必要な場合、OpenERPは同じタイプの一致する仕訳帳"
+"を探します。"
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_account_tax_template_form
+#: model:ir.ui.menu,name:account.menu_action_account_tax_template_form
+msgid "Tax Templates"
+msgstr "税金テンプレート"
+
+#. module: account
+#: model:ir.model,name:account.model_account_tax
+msgid "account.tax"
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_account_move_line_reconcile_select
+msgid "Move line reconcile select"
+msgstr "調整のため選択する行の移動"
+
+#. module: account
+#: help:account.tax.code,notprintable:0
+#: help:account.tax.code.template,notprintable:0
+msgid ""
+"Check this box if you don't want any VAT related to this Tax Code to appear "
+"on invoices"
+msgstr "この税金コードに関連するどんなVATも請求書上に現れるのを望まない場合は、このボックスをチェックして下さい。"
+
+#. module: account
+#: code:addons/account/account_invoice.py:1241
+#, python-format
+msgid "Invoice '%s' is paid partially: %s%s of %s%s (%s%s remaining)"
+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 "会計エントリーは調整の入力です。"
+
+#. module: account
+#: model:ir.ui.menu,name:account.menu_finance_management_belgian_reports
+msgid "Belgian Reports"
+msgstr "ベルギーのレポート"
+
+#. module: account
+#: code:addons/account/account_move_line.py:1200
+#, python-format
+msgid "You can not add/modify entries in a closed journal."
+msgstr "閉じられた仕訳帳のエントリーを追加 / 削除することはできません。"
+
+#. module: account
+#: help:account.account,user_type:0
+msgid ""
+"Account Type is used for information purpose, to generate country-specific "
+"legal reports, and set the rules to close a fiscal year and generate opening "
+"entries."
+msgstr ""
+"アカウントタイプは、各国固有の法律上のレポートを作成し、そして会計年度を終了させて開始エントリーを生成するためのルールを設定するための情報目的で使用されま"
+"す。"
+
+#. module: account
+#: report:account.overdue:0
+msgid "Sub-Total :"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_account_use_model_create_entry
+#: model:ir.actions.act_window,name:account.action_view_account_use_model
+#: model:ir.ui.menu,name:account.menu_action_manual_recurring
+msgid "Manual Recurring"
+msgstr ""
+
+#. module: account
+#: view:account.fiscalyear.close.state:0
+msgid "Close Fiscalyear"
+msgstr ""
+
+#. module: account
+#: field:account.automatic.reconcile,allow_write_off:0
+msgid "Allow write off"
+msgstr ""
+
+#. module: account
+#: view:account.analytic.chart:0
+msgid "Select the Period for Analysis"
+msgstr ""
+
+#. module: account
+#: view:account.move.line:0
+msgid "St."
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_invoice.py:551
+#, python-format
+msgid "Invoice line account company does not match with invoice company."
+msgstr ""
+
+#. module: account
+#: field:account.journal.column,field:0
+msgid "Field Name"
+msgstr ""
+
+#. module: account
+#: help:account.installer,charts:0
+msgid ""
+"Installs localized accounting charts to match as closely as possible the "
+"accounting needs of your company based on your country."
+msgstr ""
+
+#. module: account
+#: code:addons/account/wizard/account_move_journal.py:63
+#, python-format
+msgid ""
+"Can't find any account journal of %s type for this company.\n"
+"\n"
+"You can create one in the menu: \n"
+"Configuration/Financial Accounting/Accounts/Journals."
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_account_unreconcile
+msgid "Account Unreconcile"
+msgstr ""
+
+#. module: account
+#: view:product.product:0
+#: view:product.template:0
+msgid "Purchase Properties"
+msgstr ""
+
+#. module: account
+#: help:account.financial.report,style_overwrite:0
+msgid ""
+"You can set up here the format you want this record to be displayed. If you "
+"leave the automatic formatting, it will be computed based on the financial "
+"reports hierarchy (auto-computed field 'level')."
+msgstr ""
+
+#. module: account
+#: view:account.installer:0
+msgid "Configure"
+msgstr ""
+
+#. module: account
+#: selection:account.entries.report,month:0
+#: selection:account.invoice.report,month:0
+#: selection:analytic.entries.report,month:0
+#: selection:report.account.sales,month:0
+#: selection:report.account_type.sales,month:0
+msgid "June"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,help:account.action_account_moves_bank
+msgid ""
+"This view is used by accountants in order to record entries massively in "
+"OpenERP. Journal items are created by OpenERP if you use Bank Statements, "
+"Cash Registers, or Customer/Supplier payments."
+msgstr ""
+
+#. module: account
+#: constraint:account.move.line:0
+msgid "You can not create journal items on an account of type view."
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_account_tax_template
+msgid "account.tax.template"
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_account_bank_accounts_wizard
+msgid "account.bank.accounts.wizard"
+msgstr ""
+
+#. module: account
+#: field:account.move.line,date_created:0
+#: field:account.move.reconcile,create_date:0
+msgid "Creation date"
+msgstr ""
+
+#. module: account
+#: selection:account.journal,type:0
+msgid "Purchase Refund"
+msgstr ""
+
+#. module: account
+#: selection:account.journal,type:0
+msgid "Opening/Closing Situation"
+msgstr ""
+
+#. module: account
+#: help:account.journal,currency:0
+msgid "The currency used to enter statement"
+msgstr ""
+
+#. module: account
+#: field:account.open.closed.fiscalyear,fyear_id:0
+msgid "Fiscal Year to Open"
+msgstr ""
+
+#. module: account
+#: help:account.journal,sequence_id:0
+msgid ""
+"This field contains the informatin related to the numbering of the journal "
+"entries of this journal."
+msgstr ""
+
+#. module: account
+#: field:account.journal,default_debit_account_id:0
+msgid "Default Debit Account"
+msgstr ""
+
+#. module: account
+#: view:account.move:0
+msgid "Total Credit"
+msgstr ""
+
+#. module: account
+#: view:account.move.line.unreconcile.select:0
+msgid "Open For Unreconciliation"
+msgstr ""
+
+#. module: account
+#: field:account.account.template,chart_template_id:0
+#: field:account.fiscal.position.template,chart_template_id:0
+#: field:account.tax.template,chart_template_id:0
+#: field:wizard.multi.charts.accounts,chart_template_id:0
+msgid "Chart Template"
+msgstr ""
+
+#. module: account
+#: help:account.model.line,amount_currency:0
+msgid "The amount expressed in an optional other currency."
+msgstr ""
+
+#. module: account
+#: field:accounting.report,enable_filter:0
+msgid "Enable Comparison"
+msgstr ""
+
+#. module: account
+#: help:account.journal.period,state:0
+msgid ""
+"When journal period is created. The state is 'Draft'. If a report is printed "
+"it comes to 'Printed' state. When all transactions are done, it comes in "
+"'Done' state."
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,help:account.action_account_tax_chart
+msgid ""
+"Chart of Taxes is a tree view reflecting the structure of the Tax Cases (or "
+"tax codes) and shows the current tax situation. The tax chart represents the "
+"amount of each area of the tax declaration for your country. It’s presented "
+"in a hierarchical structure, which can be modified to fit your needs."
+msgstr ""
+
+#. module: account
+#: view:account.analytic.line:0
+#: field:account.automatic.reconcile,journal_id:0
+#: view:account.bank.statement:0
+#: field:account.bank.statement,journal_id:0
+#: report:account.central.journal:0
+#: view:account.entries.report:0
+#: field:account.entries.report,journal_id:0
+#: view:account.invoice:0
+#: field:account.invoice,journal_id:0
+#: view:account.invoice.report:0
+#: field:account.invoice.report,journal_id:0
+#: field:account.journal.period,journal_id:0
+#: report:account.journal.period.print:0
+#: report:account.journal.period.print.sale.purchase:0
+#: view:account.model:0
+#: field:account.model,journal_id:0
+#: view:account.move:0
+#: field:account.move,journal_id:0
+#: field:account.move.bank.reconcile,journal_id:0
+#: view:account.move.line:0
+#: field:account.move.line,journal_id:0
+#: view:analytic.entries.report:0
+#: field:analytic.entries.report,journal_id:0
+#: model:ir.actions.report.xml,name:account.account_journal
+#: model:ir.model,name:account.model_account_journal
+#: field:validate.account.move,journal_id:0
+msgid "Journal"
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_account_invoice_confirm
+msgid "Confirm the selected invoices"
+msgstr ""
+
+#. module: account
+#: field:account.addtmpl.wizard,cparent_id:0
+msgid "Parent target"
+msgstr ""
+
+#. module: account
+#: field:account.bank.statement,account_id:0
+msgid "Account used in this journal"
+msgstr ""
+
+#. module: account
+#: help:account.aged.trial.balance,chart_account_id:0
+#: help:account.balance.report,chart_account_id:0
+#: help:account.central.journal,chart_account_id:0
+#: help:account.common.account.report,chart_account_id:0
+#: help:account.common.journal.report,chart_account_id:0
+#: help:account.common.partner.report,chart_account_id:0
+#: help:account.common.report,chart_account_id:0
+#: help:account.general.journal,chart_account_id:0
+#: help:account.partner.balance,chart_account_id:0
+#: help:account.partner.ledger,chart_account_id:0
+#: help:account.print.journal,chart_account_id:0
+#: help:account.report.general.ledger,chart_account_id:0
+#: help:account.vat.declaration,chart_account_id:0
+#: help:accounting.report,chart_account_id:0
+msgid "Select Charts of Accounts"
+msgstr ""
+
+#. module: account
+#: sql_constraint:res.company:0
+msgid "The company name must be unique !"
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_account_invoice_refund
+msgid "Invoice Refund"
+msgstr ""
+
+#. module: account
+#: report:account.overdue:0
+msgid "Li."
+msgstr ""
+
+#. module: account
+#: field:account.automatic.reconcile,unreconciled:0
+msgid "Not reconciled transactions"
+msgstr ""
+
+#. module: account
+#: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
+msgid "Counterpart"
+msgstr ""
+
+#. module: account
+#: view:account.fiscal.position:0
+#: field:account.fiscal.position,tax_ids:0
+#: field:account.fiscal.position.template,tax_ids:0
+msgid "Tax Mapping"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_account_fiscalyear_close_state
+#: model:ir.ui.menu,name:account.menu_wizard_fy_close_state
+msgid "Close a Fiscal Year"
+msgstr ""
+
+#. module: account
+#: model:process.transition,note:account.process_transition_confirmstatementfromdraft0
+msgid "The accountant confirms the statement."
+msgstr ""
+
+#. module: account
+#: selection:account.balance.report,display_account:0
+#: selection:account.common.account.report,display_account:0
+#: selection:account.report.general.ledger,display_account:0
+#: selection:account.tax,type_tax_use:0
+#: selection:account.tax.template,type_tax_use:0
+msgid "All"
+msgstr ""
+
+#. module: account
+#: field:account.invoice.report,address_invoice_id:0
+msgid "Invoice Address Name"
+msgstr ""
+
+#. module: account
+#: selection:account.installer,period:0
+msgid "3 Monthly"
+msgstr ""
+
+#. module: account
+#: view:account.unreconcile.reconcile:0
+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 ""
+
+#. module: account
+#: view:analytic.entries.report:0
+msgid "   30 Days   "
+msgstr ""
+
+#. module: account
+#: field:ir.sequence,fiscal_ids:0
+msgid "Sequences"
+msgstr ""
+
+#. module: account
+#: field:account.financial.report,account_report_id:0
+#: selection:account.financial.report,type:0
+msgid "Report Value"
+msgstr ""
+
+#. module: account
+#: view:account.fiscal.position.template:0
+msgid "Taxes Mapping"
+msgstr ""
+
+#. module: account
+#: report:account.central.journal:0
+msgid "Centralized Journal"
+msgstr ""
+
+#. module: account
+#: sql_constraint:account.sequence.fiscalyear:0
+msgid "Main Sequence must be different from current !"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_move_line.py:1251
+#, python-format
+msgid "No period found or more than one period found for the given date."
+msgstr ""
+
+#. module: account
+#: field:account.invoice.tax,tax_amount:0
+msgid "Tax Code Amount"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account.py:3116
+#, python-format
+msgid "SAJ"
+msgstr ""
+
+#. module: account
+#: view:account.period:0
+#: view:account.period.close:0
+msgid "Close Period"
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_account_common_partner_report
+msgid "Account Common Partner Report"
+msgstr ""
+
+#. module: account
+#: field:account.fiscalyear.close,period_id:0
+msgid "Opening Entries Period"
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_account_journal_period
+msgid "Journal Period"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_move_line.py:750
+#: code:addons/account/account_move_line.py:803
+#, python-format
+msgid "To reconcile the entries company should be the same for all entries"
+msgstr ""
+
+#. module: account
+#: view:account.account:0
+#: selection:account.aged.trial.balance,result_selection:0
+#: selection:account.common.partner.report,result_selection:0
+#: selection:account.partner.balance,result_selection:0
+#: selection:account.partner.ledger,result_selection:0
+#: code:addons/account/report/account_partner_balance.py:297
+#: model:ir.actions.act_window,name:account.action_aged_receivable
+#, python-format
+msgid "Receivable Accounts"
+msgstr ""
+
+#. module: account
+#: 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
+#: model:ir.model,name:account.model_account_report_general_ledger
+msgid "General Ledger Report"
+msgstr ""
+
+#. module: account
+#: view:account.invoice:0
+msgid "Re-Open"
+msgstr ""
+
+#. module: account
+#: view:account.use.model:0
+msgid "Are you sure you want to create entries?"
+msgstr ""
+
+#. module: account
+#: view:account.invoice:0
+msgid "Print Invoice"
+msgstr ""
+
+#. module: account
+#: field:account.partner.reconcile.process,today_reconciled:0
+msgid "Partners Reconciled Today"
+msgstr ""
+
+#. module: account
+#: view:report.hr.timesheet.invoice.journal:0
+msgid "Sale journal in this year"
+msgstr ""
+
+#. module: account
+#: selection:account.financial.report,display_detail:0
+msgid "Display children with hierarchy"
+msgstr ""
+
+#. module: account
+#: selection:account.payment.term.line,value:0
+#: selection:account.tax.template,type:0
+msgid "Percent"
+msgstr ""
+
+#. module: account
+#: model:ir.ui.menu,name:account.menu_finance_charts
+msgid "Charts"
+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 ""
+
+#. module: account
+#: field:account.invoice.refund,filter_refund:0
+msgid "Refund Method"
+msgstr ""
+
+#. module: account
+#: code:addons/account/wizard/account_change_currency.py:38
+#, python-format
+msgid "You can only change currency for Draft Invoice !"
+msgstr ""
+
+#. module: account
+#: model:ir.ui.menu,name:account.menu_account_report
+msgid "Financial Report"
+msgstr ""
+
+#. module: account
+#: view:account.analytic.journal:0
+#: field:account.analytic.journal,type:0
+#: field:account.bank.statement.line,type:0
+#: field:account.financial.report,type:0
+#: field:account.invoice,type:0
+#: view:account.invoice.report:0
+#: field:account.invoice.report,type:0
+#: view:account.journal:0
+#: field:account.journal,type:0
+#: field:account.move.reconcile,type:0
+#: field:report.invoice.created,type:0
+msgid "Type"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_invoice.py:738
+#, python-format
+msgid ""
+"Taxes are missing!\n"
+"Click on compute button."
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_account_subscription_line
+msgid "Account Subscription Line"
+msgstr ""
+
+#. module: account
+#: help:account.invoice,reference:0
+msgid "The partner reference of this invoice."
+msgstr ""
+
+#. module: account
+#: view:account.invoice.report:0
+msgid "Supplier Invoices And Refunds"
+msgstr ""
+
+#. module: account
+#: view:account.move.line.unreconcile.select:0
+#: view:account.unreconcile:0
+#: view:account.unreconcile.reconcile:0
+#: model:ir.model,name:account.model_account_move_line_unreconcile_select
+msgid "Unreconciliation"
+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 ""
+
+#. module: account
+#: model:ir.model,name:account.model_account_analytic_journal_report
+msgid "Account Analytic Journal"
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_account_automatic_reconcile
+msgid "Automatic Reconcile"
+msgstr ""
+
+#. module: account
+#: report:account.analytic.account.quantity_cost_ledger:0
+msgid "J.C./Move name"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,help:account.action_account_gain_loss
+msgid ""
+"When doing multi-currency transactions, you may loose or gain some amount "
+"due to changes of exchange rate. This menu gives you a forecast of the Gain "
+"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
+#: selection:account.invoice.report,month:0
+#: selection:analytic.entries.report,month:0
+#: selection:report.account.sales,month:0
+#: selection:report.account_type.sales,month:0
+msgid "September"
+msgstr ""
+
+#. module: account
+#: selection:account.subscription,period_type:0
+msgid "days"
+msgstr ""
+
+#. module: account
+#: help:account.account.template,nocreate:0
+msgid ""
+"If checked, the new chart of accounts will not contain this by default."
+msgstr ""
+
+#. module: account
+#: code:addons/account/wizard/account_invoice_refund.py:110
+#, python-format
+msgid ""
+"Can not %s invoice which is already reconciled, invoice should be "
+"unreconciled first. You can only Refund this invoice"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_subscription_form_new
+msgid "New Subscription"
+msgstr ""
+
+#. module: account
+#: view:account.payment.term:0
+msgid "Computation"
+msgstr ""
+
+#. module: account
+#: selection:account.invoice.refund,filter_refund:0
+msgid "Cancel: refund invoice and reconcile"
+msgstr ""
+
+#. module: account
+#: field:account.cashbox.line,pieces:0
+msgid "Values"
+msgstr ""
+
+#. module: account
+#: view:account.invoice.report:0
+#: field:account.invoice.report,delay_to_pay:0
+msgid "Avg. Delay To Pay"
+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 ""
+
+#. module: account
+#: view:account.fiscalyear:0
+msgid "Create 3 Months Periods"
+msgstr ""
+
+#. module: account
+#: report:account.overdue:0
+msgid "Due"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account.py:1345
+#, python-format
+msgid ""
+"You cannot validate this journal entry because account \"%s\" does not "
+"belong to chart of accounts \"%s\"!"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_move_line.py:835
+#, python-format
+msgid ""
+"This account does not allow reconciliation! You should update the account "
+"definition to change this."
+msgstr ""
+
+#. module: account
+#: view:account.invoice:0
+#: view:account.move:0
+#: view:validate.account.move:0
+#: view:validate.account.move.lines:0
+msgid "Approve"
+msgstr ""
+
+#. module: account
+#: view:account.invoice:0
+#: view:account.move:0
+#: view:report.invoice.created:0
+msgid "Total Amount"
+msgstr ""
+
+#. module: account
+#: selection:account.account,type:0
+#: selection:account.account.template,type:0
+#: selection:account.entries.report,type:0
+msgid "Consolidation"
+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 ""
+
+#. module: account
+#: view:account.entries.report:0
+msgid "Extended Filters..."
+msgstr ""
+
+#. module: account
+#: model:ir.ui.menu,name:account.menu_account_central_journal
+msgid "Centralizing Journal"
+msgstr ""
+
+#. module: account
+#: selection:account.journal,type:0
+msgid "Sale Refund"
+msgstr ""
+
+#. module: account
+#: model:process.node,note:account.process_node_accountingstatemententries0
+msgid "Bank statement"
+msgstr ""
+
+#. module: account
+#: field:account.analytic.line,move_id:0
+msgid "Move Line"
+msgstr ""
+
+#. module: account
+#: help:account.move.line,tax_amount:0
+msgid ""
+"If the Tax account is a tax code account, this field will contain the taxed "
+"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 ""
+
+#. module: account
+#: view:account.analytic.line:0
+msgid "Purchases"
+msgstr ""
+
+#. module: account
+#: field:account.model,lines_id:0
+msgid "Model Entries"
+msgstr ""
+
+#. module: account
+#: field:account.account,code:0
+#: report:account.account.balance:0
+#: field:account.account.template,code:0
+#: field:account.account.type,code:0
+#: report:account.analytic.account.balance:0
+#: report:account.analytic.account.inverted.balance:0
+#: report:account.analytic.account.journal:0
+#: field:account.analytic.line,code:0
+#: field:account.fiscalyear,code:0
+#: report:account.general.journal:0
+#: field:account.journal,code:0
+#: report:account.partner.balance:0
+#: field:account.period,code:0
+msgid "Code"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account.py:2268
+#: code:addons/account/account_bank_statement.py:357
+#: code:addons/account/account_invoice.py:73
+#: code:addons/account/account_invoice.py:688
+#: code:addons/account/account_move_line.py:173
+#, python-format
+msgid "No Analytic Journal !"
+msgstr ""
+
+#. module: account
+#: report:account.partner.balance:0
+#: view:account.partner.balance:0
+#: model:ir.actions.act_window,name:account.action_account_partner_balance
+#: 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 ""
+
+#. module: account
+#: field:account.bank.accounts.wizard,acc_name:0
+msgid "Account Name."
+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 ""
+
+#. module: account
+#: field:report.account.receivable,name:0
+msgid "Week of Year"
+msgstr ""
+
+#. module: account
+#: field:account.report.general.ledger,landscape:0
+msgid "Landscape Mode"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account.py:645
+#, python-format
+msgid ""
+"You cannot change the type of account from '%s' to '%s' type as it contains "
+"journal items!"
+msgstr ""
+
+#. module: account
+#: field:account.report.general.ledger,sortby:0
+msgid "Sort by"
+msgstr ""
+
+#. module: account
+#: help:account.fiscalyear.close,fy_id:0
+msgid "Select a Fiscal year to close"
+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 ""
+
+#. 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 ""
+
+#. module: account
+#: view:account.tax:0
+msgid "Applicability Options"
+msgstr ""
+
+#. module: account
+#: report:account.partner.balance:0
+msgid "In dispute"
+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 ""
+
+#. module: account
+#: report:account.analytic.account.journal:0
+#: report:account.third_party_ledger:0
+#: report:account.third_party_ledger_other:0
+msgid "-"
+msgstr ""
+
+#. module: account
+#: view:account.analytic.account:0
+#: model:res.groups,name:account.group_account_manager
+msgid "Manager"
+msgstr ""
+
+#. module: account
+#: view:account.subscription.generate:0
+msgid "Generate Entries before:"
+msgstr ""
+
+#. module: account
+#: view:account.move.line:0
+msgid "Unbalanced Journal Items"
+msgstr ""
+
+#. module: account
+#: model:account.account.type,name:account.data_account_type_bank
+#: selection:account.bank.accounts.wizard,account_type:0
+#: code:addons/account/account.py:3003
+#, python-format
+msgid "Bank"
+msgstr ""
+
+#. module: account
+#: field:account.period,date_start:0
+msgid "Start of Period"
+msgstr ""
+
+#. module: account
+#: model:process.transition,name:account.process_transition_confirmstatementfromdraft0
+msgid "Confirm statement"
+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 ""
+
+#. 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 ""
+
+#. module: account
+#: selection:account.move.line,centralisation:0
+msgid "Credit Centralisation"
+msgstr ""
+
+#. module: account
+#: view:report.account_type.sales:0
+msgid "All Months Sales by type"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,help:account.action_invoice_tree2
+msgid ""
+"With Supplier Invoices you can enter and manage invoices issued by your "
+"suppliers. OpenERP can also generate draft invoices automatically from "
+"purchase orders or receipts. This way, you can control the invoice from your "
+"supplier according to what you purchased or received."
+msgstr ""
+
+#. 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 ""
+
+#. module: account
+#: view:account.invoice.cancel:0
+msgid "Cancel Invoices"
+msgstr ""
+
+#. module: account
+#: help:account.journal,code:0
+msgid "The code will be displayed on reports."
+msgstr ""
+
+#. module: account
+#: view:account.tax.template:0
+msgid "Taxes used in Purchases"
+msgstr ""
+
+#. module: account
+#: field:account.invoice.tax,tax_code_id:0
+#: field:account.tax,description:0
+#: field:account.tax.template,tax_code_id:0
+#: model:ir.model,name:account.model_account_tax_code
+msgid "Tax Code"
+msgstr ""
+
+#. module: account
+#: field:account.account,currency_mode:0
+msgid "Outgoing Currencies Rate"
+msgstr ""
+
+#. module: account
+#: selection:account.analytic.journal,type:0
+msgid "Situation"
+msgstr ""
+
+#. module: account
+#: help:account.move.line,move_id:0
+msgid "The move of this entry line."
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_move_line.py:1302
+#, python-format
+msgid ""
+"You can not use this general account in this journal, check the tab 'Entry "
+"Controls' on the related journal !"
+msgstr ""
+
+#. module: account
+#: field:account.move.line.reconcile,trans_nbr:0
+msgid "# of Transaction"
+msgstr ""
+
+#. module: account
+#: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
+#: report:account.third_party_ledger:0
+#: report:account.third_party_ledger_other:0
+msgid "Entry Label"
+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 ""
+
+#. module: account
+#: help:account.invoice,origin:0
+#: help:account.invoice.line,origin:0
+msgid "Reference of the document that produced this invoice."
+msgstr ""
+
+#. module: account
+#: view:account.analytic.line:0
+#: view:account.journal:0
+msgid "Others"
+msgstr ""
+
+#. module: account
+#: view:account.subscription:0
+msgid "Draft Subscription"
+msgstr ""
+
+#. module: account
+#: view:account.account:0
+#: report:account.account.balance:0
+#: view:account.analytic.line:0
+#: field:account.automatic.reconcile,writeoff_acc_id:0
+#: field:account.bank.statement.line,account_id:0
+#: view:account.entries.report:0
+#: field:account.entries.report,account_id:0
+#: field:account.invoice,account_id:0
+#: field:account.invoice.line,account_id:0
+#: view:account.invoice.report:0
+#: field:account.invoice.report,account_id:0
+#: field:account.journal,account_control_ids:0
+#: report:account.journal.period.print:0
+#: report:account.journal.period.print.sale.purchase:0
+#: field:account.model.line,account_id:0
+#: view:account.move.line:0
+#: field:account.move.line,account_id:0
+#: field:account.move.line.reconcile.select,account_id:0
+#: field:account.move.line.unreconcile.select,account_id:0
+#: report:account.third_party_ledger:0
+#: report:account.third_party_ledger_other:0
+#: view:analytic.entries.report:0
+#: field:analytic.entries.report,account_id:0
+#: model:ir.model,name:account.model_account_account
+#: field:report.account.sales,account_id:0
+msgid "Account"
+msgstr ""
+
+#. module: account
+#: field:account.tax,include_base_amount:0
+msgid "Included in base amount"
+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 ""
+
+#. module: account
+#: field:account.account,level:0
+#: field:account.financial.report,level:0
+msgid "Level"
+msgstr ""
+
+#. module: account
+#: report:account.invoice:0
+#: view:account.invoice:0
+#: view:account.invoice.line:0
+#: field:account.invoice.line,invoice_line_tax_id:0
+#: view:account.move:0
+#: view:account.move.line:0
+#: model:ir.actions.act_window,name:account.action_tax_form
+#: model:ir.ui.menu,name:account.account_template_taxes
+#: model:ir.ui.menu,name:account.menu_action_tax_form
+#: model:ir.ui.menu,name:account.menu_tax_report
+#: model:ir.ui.menu,name:account.next_id_27
+msgid "Taxes"
+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 ""
+
+#. module: account
+#: model:account.financial.report,name:account.account_financial_report_profitandloss0
+msgid "Profit and Loss"
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_account_account_template
+msgid "Templates for Accounts"
+msgstr ""
+
+#. module: account
+#: view:account.tax.code.template:0
+msgid "Search tax template"
+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 ""
+
+#. module: account
+#: model:ir.actions.report.xml,name:account.account_overdue
+#: view:res.company:0
+msgid "Overdue Payments"
+msgstr ""
+
+#. module: account
+#: report:account.third_party_ledger:0
+#: report:account.third_party_ledger_other:0
+msgid "Initial Balance"
+msgstr ""
+
+#. module: account
+#: view:account.invoice:0
+msgid "Reset to Draft"
+msgstr ""
+
+#. module: account
+#: view:wizard.multi.charts.accounts:0
+msgid "Bank Information"
+msgstr ""
+
+#. module: account
+#: view:account.aged.trial.balance:0
+#: view:account.common.report:0
+msgid "Report Options"
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_account_entries_report
+msgid "Journal Items Analysis"
+msgstr ""
+
+#. module: account
+#: model:ir.ui.menu,name:account.next_id_22
+msgid "Partners"
+msgstr ""
+
+#. module: account
+#: view:account.bank.statement:0
+#: model:ir.model,name:account.model_account_bank_statement
+#: model:process.node,name:account.process_node_accountingstatemententries0
+#: model:process.node,name:account.process_node_bankstatement0
+#: model:process.node,name:account.process_node_supplierbankstatement0
+msgid "Bank Statement"
+msgstr ""
+
+#. module: account
+#: field:res.partner,property_account_receivable:0
+msgid "Account Receivable"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.report.xml,name:account.account_central_journal
+msgid "Central Journal"
+msgstr ""
+
+#. module: account
+#: selection:account.balance.report,display_account:0
+#: selection:account.common.account.report,display_account:0
+#: selection:account.partner.balance,display_partner:0
+#: selection:account.report.general.ledger,display_account:0
+msgid "With balance is not equal to 0"
+msgstr ""
+
+#. module: account
+#: view:account.tax:0
+msgid "Search Taxes"
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_account_analytic_cost_ledger
+msgid "Account Analytic Cost Ledger"
+msgstr ""
+
+#. module: account
+#: view:account.model:0
+msgid "Create entries"
+msgstr ""
+
+#. module: account
+#: field:account.entries.report,nbr:0
+msgid "# of Items"
+msgstr ""
+
+#. module: account
+#: field:account.automatic.reconcile,max_amount:0
+msgid "Maximum write-off amount"
+msgstr ""
+
+#. module: account
+#: view:account.invoice:0
+msgid "Compute Taxes"
+msgstr ""
+
+#. module: account
+#: field:account.chart.template,code_digits:0
+#: field:wizard.multi.charts.accounts,code_digits:0
+msgid "# of Digits"
+msgstr ""
+
+#. module: account
+#: field:account.journal,entry_posted:0
+msgid "Skip 'Draft' State for Manual Entries"
+msgstr ""
+
+#. module: account
+#: view:account.invoice.report:0
+#: field:account.invoice.report,price_total:0
+msgid "Total Without Tax"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,help:account.action_move_journal_line
+msgid ""
+"A journal entry consists of several journal items, each of which is either a "
+"debit or a credit transaction. OpenERP automatically creates one journal "
+"entry per accounting document: invoice, refund, supplier payment, bank "
+"statements, etc."
+msgstr ""
+
+#. module: account
+#: view:account.entries.report:0
+msgid "# of Entries "
+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 ""
+
+#. module: account
+#: model:ir.model,name:account.model_temp_range
+msgid "A Temporary table used for Dashboard view"
+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 ""
+
+#. module: account
+#: selection:account.account,type:0
+#: selection:account.account.template,type:0
+#: selection:account.bank.statement,state:0
+#: selection:account.entries.report,type:0
+#: view:account.fiscalyear:0
+#: selection:account.fiscalyear,state:0
+#: selection:account.period,state:0
+msgid "Closed"
+msgstr ""
+
+#. module: account
+#: model:ir.ui.menu,name:account.menu_finance_recurrent_entries
+msgid "Recurring Entries"
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_account_fiscal_position_template
+msgid "Template for Fiscal Position"
+msgstr ""
+
+#. module: account
+#: field:account.automatic.reconcile,reconciled:0
+msgid "Reconciled transactions"
+msgstr ""
+
+#. module: account
+#: field:account.journal.view,columns_id:0
+msgid "Columns"
+msgstr ""
+
+#. module: account
+#: report:account.overdue:0
+msgid "."
+msgstr ""
+
+#. module: account
+#: view:account.analytic.cost.ledger.journal.report:0
+msgid "and Journals"
+msgstr ""
+
+#. module: account
+#: field:account.journal,groups_id:0
+msgid "Groups"
+msgstr ""
+
+#. module: account
+#: field:account.invoice,amount_untaxed:0
+#: field:report.invoice.created,amount_untaxed:0
+msgid "Untaxed"
+msgstr ""
+
+#. module: account
+#: view:account.partner.reconcile.process:0
+msgid "Go to next partner"
+msgstr ""
+
+#. module: account
+#: view:account.bank.statement:0
+msgid "Search Bank Statements"
+msgstr ""
+
+#. module: account
+#: view:account.move.line:0
+msgid "Unposted Journal Items"
+msgstr ""
+
+#. module: account
+#: view:account.chart.template:0
+#: field:account.chart.template,property_account_payable:0
+msgid "Payable Account"
+msgstr ""
+
+#. module: account
+#: field:account.tax,account_paid_id:0
+#: field:account.tax.template,account_paid_id:0
+msgid "Refund Tax Account"
+msgstr ""
+
+#. module: account
+#: view:account.bank.statement:0
+#: field:account.bank.statement,line_ids:0
+msgid "Statement lines"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,help:account.action_bank_statement_tree
+msgid ""
+"A bank statement is a summary of all financial transactions occurring over a "
+"given period of time on a deposit account, a credit card or any other type "
+"of financial account. The starting balance will be proposed automatically "
+"and the closing balance is to be found on your statement. When you are in "
+"the Payment column of a line, you can press F1 to open the reconciliation "
+"form."
+msgstr ""
+
+#. module: account
+#: report:account.analytic.account.cost_ledger:0
+msgid "Date/Code"
+msgstr ""
+
+#. module: account
+#: field:account.analytic.line,general_account_id:0
+#: view:analytic.entries.report:0
+#: field:analytic.entries.report,general_account_id:0
+msgid "General Account"
+msgstr ""
+
+#. module: account
+#: field:res.partner,debit_limit:0
+msgid "Payable Limit"
+msgstr ""
+
+#. module: account
+#: report:account.invoice:0
+#: view:account.invoice:0
+#: view:account.invoice.report:0
+#: field:account.move.line,invoice:0
+#: model:ir.model,name:account.model_account_invoice
+#: model:res.request.link,name:account.req_link_invoice
+msgid "Invoice"
+msgstr ""
+
+#. module: account
+#: model:process.node,note:account.process_node_analytic0
+#: model:process.node,note:account.process_node_analyticcost0
+msgid "Analytic costs to invoice"
+msgstr ""
+
+#. module: account
+#: view:ir.sequence:0
+msgid "Fiscal Year Sequence"
+msgstr ""
+
+#. module: account
+#: field:wizard.multi.charts.accounts,seq_journal:0
+msgid "Separated Journal Sequences"
+msgstr ""
+
+#. module: account
+#: view:account.invoice:0
+msgid "Responsible"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_report_account_type_sales_tree_all
+msgid "Sales by Account Type"
+msgstr ""
+
+#. module: account
+#: view:account.invoice.refund:0
+msgid ""
+"Cancel Invoice: Creates the refund invoice, validate and reconcile it to "
+"cancel the current invoice."
+msgstr ""
+
+#. module: account
+#: model:ir.ui.menu,name:account.periodical_processing_invoicing
+msgid "Invoicing"
+msgstr ""
+
+#. module: account
+#: code:addons/account/report/account_partner_balance.py:115
+#, python-format
+msgid "Unknown Partner"
+msgstr ""
+
+#. module: account
+#: field:account.tax.code,sum:0
+msgid "Year Sum"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_invoice.py:1429
+#, python-format
+msgid ""
+"You selected an Unit of Measure which is not compatible with the product."
+msgstr ""
+
+#. module: account
+#: view:account.change.currency:0
+msgid "This wizard will change the currency of the invoice"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,help:account.action_account_chart
+msgid ""
+"Display your company chart of accounts per fiscal year and filter by period. "
+"Have a complete tree view of all journal items per account code by clicking "
+"on an account."
+msgstr ""
+
+#. module: account
+#: view:account.analytic.account:0
+msgid "Pending Accounts"
+msgstr ""
+
+#. module: account
+#: view:account.tax.template:0
+msgid "Tax Declaration"
+msgstr ""
+
+#. module: account
+#: help:account.journal.period,active:0
+msgid ""
+"If the active field is set to False, it will allow you to hide the journal "
+"period without removing it."
+msgstr ""
+
+#. module: account
+#: view:res.partner:0
+msgid "Supplier Debit"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.act_account_partner_account_move_all
+msgid "Receivables & Payables"
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_account_common_journal_report
+msgid "Account Common Journal Report"
+msgstr ""
+
+#. module: account
+#: selection:account.partner.balance,display_partner:0
+msgid "All Partners"
+msgstr ""
+
+#. module: account
+#: view:account.analytic.chart:0
+msgid "Analytic Account Charts"
+msgstr ""
+
+#. module: account
+#: view:account.analytic.line:0
+#: view:analytic.entries.report:0
+msgid "My Entries"
+msgstr ""
+
+#. module: account
+#: report:account.overdue:0
+msgid "Customer Ref:"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_cash_statement.py:292
+#, python-format
+msgid "User %s does not have rights to access %s journal !"
+msgstr ""
+
+#. module: account
+#: help:account.period,special:0
+msgid "These periods can overlap."
+msgstr ""
+
+#. module: account
+#: model:process.node,name:account.process_node_draftstatement0
+msgid "Draft statement"
+msgstr ""
+
+#. module: account
+#: view:account.tax:0
+msgid "Tax Declaration: Credit Notes"
+msgstr ""
+
+#. module: account
+#: field:account.move.line.reconcile,credit:0
+msgid "Credit amount"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account.py:407
+#: code:addons/account/account.py:412
+#: code:addons/account/account.py:429
+#, python-format
+msgid "Error!"
+msgstr ""
+
+#. module: account
+#: sql_constraint:account.move.line:0
+msgid "Wrong credit or debit value in accounting entry !"
+msgstr ""
+
+#. module: account
+#: view:account.invoice.report:0
+#: model:ir.actions.act_window,name:account.action_account_invoice_report_all
+#: model:ir.ui.menu,name:account.menu_action_account_invoice_report_all
+msgid "Invoices Analysis"
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_account_period_close
+msgid "period close"
+msgstr ""
+
+#. module: account
+#: view:account.installer:0
+msgid "Configure Fiscal Year"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_project_account_analytic_line_form
+msgid "Entries By Line"
+msgstr ""
+
+#. module: account
+#: field:account.vat.declaration,based_on:0
+msgid "Based on"
+msgstr ""
+
+#. module: account
+#: field:account.invoice,move_id:0
+#: field:account.invoice,move_name:0
+msgid "Journal Entry"
+msgstr ""
+
+#. module: account
+#: view:account.tax:0
+msgid "Tax Declaration: Invoices"
+msgstr ""
+
+#. module: account
+#: field:account.cashbox.line,subtotal:0
+msgid "Sub Total"
+msgstr ""
+
+#. module: account
+#: view:account.account:0
+#: view:account.treasury.report:0
+#: model:ir.actions.act_window,name:account.action_account_treasury_report_all
+#: model:ir.model,name:account.model_account_treasury_report
+#: model:ir.ui.menu,name:account.menu_action_account_treasury_report_all
+msgid "Treasury Analysis"
+msgstr ""
+
+#. module: account
+#: constraint:res.company:0
+msgid "Error! You can not create recursive companies."
+msgstr ""
+
+#. module: account
+#: model:ir.actions.report.xml,name:account.account_journal_sale_purchase
+msgid "Sale/Purchase Journal"
+msgstr ""
+
+#. module: account
+#: view:account.analytic.account:0
+msgid "Analytic account"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_bank_statement.py:339
+#, python-format
+msgid "Please verify that an account is defined in the journal."
+msgstr ""
+
+#. module: account
+#: selection:account.entries.report,move_line_state:0
+#: selection:account.move.line,state:0
+msgid "Valid"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_account_print_journal
+#: model:ir.model,name:account.model_account_print_journal
+msgid "Account Print Journal"
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_product_category
+msgid "Product Category"
+msgstr ""
+
+#. module: account
+#: selection:account.account.type,report_type:0
+msgid "/"
+msgstr ""
+
+#. module: account
+#: help:res.company,property_reserve_and_surplus_account:0
+msgid ""
+"This account is used for transferring Profit/Loss (If It is Profit: Amount "
+"will be added, Loss : Amount will be deducted.), as calculated in Profit & "
+"Loss Report"
+msgstr ""
+
+#. module: account
+#: model:process.node,note:account.process_node_reconciliation0
+#: model:process.node,note:account.process_node_supplierreconciliation0
+msgid "Comparison between accounting and payment entries"
+msgstr ""
+
+#. module: account
+#: view:account.tax:0
+#: view:account.tax.template:0
+msgid "Tax Definition"
+msgstr ""
+
+#. module: account
+#: help:wizard.multi.charts.accounts,seq_journal:0
+msgid ""
+"Check this box if you want to use a different sequence for each created "
+"journal. Otherwise, all will use the same sequence."
+msgstr ""
+
+#. module: account
+#: help:account.partner.ledger,amount_currency:0
+#: help:account.report.general.ledger,amount_currency:0
+msgid ""
+"It adds the currency column if the currency is different then the company "
+"currency"
+msgstr ""
+
+#. module: account
+#: help:account.journal,allow_date:0
+msgid ""
+"If set to True then do not accept the entry if the entry date is not into "
+"the period dates"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_invoice.py:73
+#, python-format
+msgid "You must define an analytic journal of type '%s'!"
+msgstr ""
+
+#. module: account
+#: field:account.installer,config_logo:0
+#: field:wizard.multi.charts.accounts,config_logo:0
+msgid "Image"
+msgstr ""
+
+#. module: account
+#: 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
+#: model:ir.actions.act_window,help:account.action_account_financial_report_tree
+msgid "Makes a generic system to draw financial reports easily."
+msgstr ""
+
+#. module: account
+#: view:account.invoice:0
+#: view:report.invoice.created:0
+msgid "Untaxed Amount"
+msgstr ""
+
+#. module: account
+#: help:account.tax,active:0
+msgid ""
+"If the active field is set to False, it will allow you to hide the tax "
+"without removing it."
+msgstr ""
+
+#. module: account
+#: view:account.analytic.line:0
+msgid "Analytic Journal Items related to a sale journal."
+msgstr ""
+
+#. module: account
+#: selection:account.financial.report,style_overwrite:0
+msgid "Italic Text (smaller)"
+msgstr ""
+
+#. module: account
+#: view:account.bank.statement:0
+#: view:account.invoice:0
+#: selection:account.invoice,state:0
+#: view:account.invoice.report:0
+#: selection:account.invoice.report,state:0
+#: selection:account.journal.period,state:0
+#: view:account.subscription:0
+#: selection:account.subscription,state:0
+#: selection:report.invoice.created,state:0
+msgid "Draft"
+msgstr ""
+
+#. module: account
+#: report:account.journal.period.print.sale.purchase:0
+msgid "VAT Declaration"
+msgstr ""
+
+#. module: account
+#: field:account.move.reconcile,line_partial_ids:0
+msgid "Partial Entry lines"
+msgstr ""
+
+#. module: account
+#: view:account.fiscalyear:0
+#: field:account.treasury.report,fiscalyear_id:0
+msgid "Fiscalyear"
+msgstr ""
+
+#. module: account
+#: view:account.journal.select:0
+#: view:project.account.analytic.line:0
+msgid "Open Entries"
+msgstr ""
+
+#. module: account
+#: field:account.automatic.reconcile,account_ids:0
+msgid "Accounts to Reconcile"
+msgstr ""
+
+#. module: account
+#: model:process.transition,note:account.process_transition_filestatement0
+msgid "Import of the statement in the system from an electronic file"
+msgstr ""
+
+#. module: account
+#: model:process.node,name:account.process_node_importinvoice0
+msgid "Import from invoice"
+msgstr ""
+
+#. module: account
+#: selection:account.entries.report,month:0
+#: selection:account.invoice.report,month:0
+#: selection:analytic.entries.report,month:0
+#: selection:report.account.sales,month:0
+#: selection:report.account_type.sales,month:0
+msgid "January"
+msgstr ""
+
+#. module: account
+#: view:account.journal:0
+msgid "Validations"
+msgstr ""
+
+#. module: account
+#: view:account.entries.report:0
+msgid "This F.Year"
+msgstr ""
+
+#. module: account
+#: view:account.tax.chart:0
+msgid "Account tax charts"
+msgstr ""
+
+#. module: account
+#: constraint:account.period:0
+msgid ""
+"Invalid period ! Some periods overlap or the date period is not in the scope "
+"of the fiscal year. "
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_bank_statement.py:357
+#, python-format
+msgid "You have to assign an analytic journal on the '%s' journal!"
+msgstr ""
+
+#. module: account
+#: selection:account.invoice,state:0
+#: view:account.invoice.report:0
+#: selection:account.invoice.report,state:0
+#: selection:report.invoice.created,state:0
+msgid "Pro-forma"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account.py:1461
+#, python-format
+msgid ""
+"There is no default default debit account defined \n"
+"on journal \"%s\""
+msgstr ""
+
+#. module: account
+#: help:account.account.template,type:0
+#: help:account.entries.report,type:0
+msgid ""
+"This type is used to differentiate types with special effects in OpenERP: "
+"view can not have entries, consolidation are accounts that can have children "
+"accounts for multi-company consolidations, payable/receivable are for "
+"partners accounts (for debit/credit computations), closed for depreciated "
+"accounts."
+msgstr ""
+
+#. module: account
+#: view:account.chart.template:0
+msgid "Search Chart of Account Templates"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_move_line.py:1277
+#, python-format
+msgid ""
+"Can not create an automatic sequence for this piece!\n"
+"Put a sequence in the journal definition for automatic numbering or create a "
+"sequence manually for this piece."
+msgstr ""
+
+#. module: account
+#: code:addons/account/account.py:787
+#, python-format
+msgid ""
+"You can not modify the company of this journal as its related record exist "
+"in journal items"
+msgstr ""
+
+#. module: account
+#: report:account.invoice:0
+msgid "Customer Code"
+msgstr ""
+
+#. module: account
+#: view:account.installer:0
+msgid ""
+"The default Chart of Accounts is matching your country selection. If no "
+"certified Chart of Accounts exists for your specified country, a generic one "
+"can be installed and will be selected by default."
+msgstr ""
+
+#. module: account
+#: view:account.account.type:0
+#: field:account.account.type,note:0
+#: view:account.analytic.account:0
+#: report:account.invoice:0
+#: field:account.invoice,name:0
+#: field:account.invoice.line,name:0
+#: field:account.invoice.refund,description:0
+#: report:account.overdue:0
+#: field:account.payment.term,note:0
+#: view:account.tax.code:0
+#: field:account.tax.code,info:0
+#: view:account.tax.code.template:0
+#: field:account.tax.code.template,info:0
+#: field:analytic.entries.report,name:0
+#: field:report.invoice.created,name:0
+msgid "Description"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account.py:3119
+#, python-format
+msgid "ECNJ"
+msgstr ""
+
+#. module: account
+#: view:account.subscription:0
+#: selection:account.subscription,state:0
+msgid "Running"
+msgstr ""
+
+#. module: account
+#: view:account.chart.template:0
+#: field:product.category,property_account_income_categ:0
+#: field:product.template,property_account_income:0
+msgid "Income Account"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_invoice.py:370
+#, python-format
+msgid "There is no Accounting Journal of type Sale/Purchase defined!"
+msgstr ""
+
+#. module: account
+#: constraint:res.partner.bank:0
+msgid "The RIB and/or IBAN is not valid"
+msgstr ""
+
+#. module: account
+#: view:product.category:0
+msgid "Accounting Properties"
+msgstr ""
+
+#. module: account
+#: report:account.general.ledger_landscape:0
+#: report:account.journal.period.print:0
+#: report:account.journal.period.print.sale.purchase:0
+msgid "Entries Sorted By"
+msgstr ""
+
+#. module: account
+#: field:account.change.currency,currency_id:0
+msgid "Change to"
+msgstr ""
+
+#. module: account
+#: view:account.entries.report:0
+msgid "# of Products Qty "
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_product_template
+msgid "Product Template"
+msgstr ""
+
+#. module: account
+#: report:account.account.balance:0
+#: field:account.aged.trial.balance,fiscalyear_id:0
+#: field:account.balance.report,fiscalyear_id:0
+#: report:account.central.journal:0
+#: field:account.central.journal,fiscalyear_id:0
+#: field:account.common.account.report,fiscalyear_id:0
+#: field:account.common.journal.report,fiscalyear_id:0
+#: field:account.common.partner.report,fiscalyear_id:0
+#: field:account.common.report,fiscalyear_id:0
+#: view:account.entries.report:0
+#: field:account.entries.report,fiscalyear_id:0
+#: field:account.fiscalyear,name:0
+#: report:account.general.journal:0
+#: field:account.general.journal,fiscalyear_id:0
+#: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
+#: field:account.journal.period,fiscalyear_id:0
+#: report:account.journal.period.print:0
+#: report:account.journal.period.print.sale.purchase:0
+#: report:account.partner.balance:0
+#: field:account.partner.balance,fiscalyear_id:0
+#: field:account.partner.ledger,fiscalyear_id:0
+#: field:account.period,fiscalyear_id:0
+#: field:account.print.journal,fiscalyear_id:0
+#: field:account.report.general.ledger,fiscalyear_id:0
+#: field:account.sequence.fiscalyear,fiscalyear_id:0
+#: report:account.third_party_ledger:0
+#: report:account.third_party_ledger_other:0
+#: report:account.vat.declaration:0
+#: field:account.vat.declaration,fiscalyear_id:0
+#: field:accounting.report,fiscalyear_id:0
+#: field:accounting.report,fiscalyear_id_cmp:0
+#: model:ir.model,name:account.model_account_fiscalyear
+msgid "Fiscal Year"
+msgstr ""
+
+#. module: account
+#: help:account.aged.trial.balance,fiscalyear_id:0
+#: help:account.balance.report,fiscalyear_id:0
+#: help:account.central.journal,fiscalyear_id:0
+#: help:account.common.account.report,fiscalyear_id:0
+#: help:account.common.journal.report,fiscalyear_id:0
+#: help:account.common.partner.report,fiscalyear_id:0
+#: help:account.common.report,fiscalyear_id:0
+#: help:account.general.journal,fiscalyear_id:0
+#: help:account.partner.balance,fiscalyear_id:0
+#: help:account.partner.ledger,fiscalyear_id:0
+#: help:account.print.journal,fiscalyear_id:0
+#: help:account.report.general.ledger,fiscalyear_id:0
+#: help:account.vat.declaration,fiscalyear_id:0
+#: help:accounting.report,fiscalyear_id:0
+#: help:accounting.report,fiscalyear_id_cmp:0
+msgid "Keep empty for all open fiscal year"
+msgstr ""
+
+#. module: account
+#: field:account.invoice.report,account_line_id:0
+msgid "Account Line"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account.py:1468
+#, python-format
+msgid ""
+"There is no default default credit account defined \n"
+"on journal \"%s\""
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,help:account.action_review_financial_journals_installer
+msgid ""
+"Setup your accounting journals. For bank accounts, it's better to use the "
+"'Setup Your Bank Accounts' tool that will automatically create the accounts "
+"and journals for you."
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_account_move
+msgid "Account Entry"
+msgstr ""
+
+#. module: account
+#: constraint:res.partner:0
+msgid "Error ! You cannot create recursive associated members."
+msgstr ""
+
+#. module: account
+#: field:account.sequence.fiscalyear,sequence_main_id:0
+msgid "Main Sequence"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_bank_statement.py:402
+#, python-format
+msgid ""
+"In order to delete a bank statement, you must first cancel it to delete "
+"related journal items."
+msgstr ""
+
+#. module: account
+#: field:account.invoice,payment_term:0
+#: field:account.invoice.report,payment_term:0
+#: view:account.payment.term:0
+#: field:account.payment.term,name:0
+#: view:account.payment.term.line:0
+#: field:account.payment.term.line,payment_id:0
+#: model:ir.model,name:account.model_account_payment_term
+#: field:res.partner,property_payment_term:0
+msgid "Payment Term"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_account_fiscal_position_form
+#: model:ir.ui.menu,name:account.menu_action_account_fiscal_position_form
+msgid "Fiscal Positions"
+msgstr ""
+
+#. module: account
+#: constraint:account.account:0
+#: constraint:account.tax.code:0
+msgid "Error ! You can not create recursive accounts."
+msgstr ""
+
+#. module: account
+#: field:account.period.close,sure:0
+msgid "Check this box"
+msgstr ""
+
+#. module: account
+#: view:account.common.report:0
+msgid "Filters"
+msgstr ""
+
+#. module: account
+#: view:account.bank.statement:0
+#: selection:account.bank.statement,state:0
+#: view:account.fiscalyear:0
+#: selection:account.fiscalyear,state:0
+#: selection:account.invoice,state:0
+#: selection:account.invoice.report,state:0
+#: view:account.open.closed.fiscalyear:0
+#: selection:account.period,state:0
+#: code:addons/account/wizard/account_move_journal.py:106
+#: selection:report.invoice.created,state:0
+#, python-format
+msgid "Open"
+msgstr ""
+
+#. module: account
+#: model:process.node,note:account.process_node_draftinvoices0
+#: model:process.node,note:account.process_node_supplierdraftinvoices0
+msgid "Draft state of an invoice"
+msgstr ""
+
+#. module: account
+#: view:account.partner.reconcile.process:0
+msgid "Partner Reconciliation"
+msgstr ""
+
+#. module: account
+#: field:account.tax,tax_code_id:0
+#: view:account.tax.code:0
+msgid "Account Tax Code"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_invoice.py:572
+#, python-format
+msgid ""
+"Can't find any account journal of %s type for this company.\n"
+"\n"
+"You can create one in the menu: \n"
+"Configuration\\Financial Accounting\\Accounts\\Journals."
+msgstr ""
+
+#. module: account
+#: model:account.payment.term,name:account.account_payment_term_advance
+#: model:account.payment.term,note:account.account_payment_term_advance
+msgid "30% Advance End 30 Days"
+msgstr ""
+
+#. module: account
+#: view:account.entries.report:0
+msgid "Unreconciled entries"
+msgstr ""
+
+#. module: account
+#: field:account.invoice.tax,base_code_id:0
+#: field:account.tax.template,base_code_id:0
+msgid "Base Code"
+msgstr ""
+
+#. module: account
+#: help:account.invoice.tax,sequence:0
+msgid "Gives the sequence order when displaying a list of invoice tax."
+msgstr ""
+
+#. module: account
+#: field:account.tax,base_sign:0
+#: field:account.tax,ref_base_sign:0
+#: field:account.tax.template,base_sign:0
+#: field:account.tax.template,ref_base_sign:0
+msgid "Base Code Sign"
+msgstr ""
+
+#. module: account
+#: view:account.vat.declaration:0
+msgid ""
+"This menu prints a VAT declaration based on invoices or payments. Select one "
+"or several periods of the fiscal year. The information required for a tax "
+"declaration is automatically generated by OpenERP from invoices (or "
+"payments, in some countries). This data is updated in real time. That’s very "
+"useful because it enables you to preview at any time the tax that you owe at "
+"the start and end of the month or quarter."
+msgstr ""
+
+#. module: account
+#: selection:account.move.line,centralisation:0
+msgid "Debit Centralisation"
+msgstr ""
+
+#. module: account
+#: view:account.invoice.confirm:0
+#: model:ir.actions.act_window,name:account.action_account_invoice_confirm
+msgid "Confirm Draft Invoices"
+msgstr ""
+
+#. module: account
+#: field:account.entries.report,day:0
+#: view:account.invoice.report:0
+#: field:account.invoice.report,day:0
+#: view:analytic.entries.report:0
+#: field:analytic.entries.report,day:0
+msgid "Day"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.act_account_renew_view
+msgid "Accounts to Renew"
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_account_model_line
+msgid "Account Model Entries"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account.py:3117
+#, python-format
+msgid "EXJ"
+msgstr ""
+
+#. module: account
+#: field:product.template,supplier_taxes_id:0
+msgid "Supplier Taxes"
+msgstr ""
+
+#. module: account
+#: view:account.entries.report:0
+msgid "entries"
+msgstr ""
+
+#. module: account
+#: help:account.invoice,date_due:0
+#: help:account.invoice,payment_term:0
+msgid ""
+"If you use payment terms, the due date will be computed automatically at the "
+"generation of accounting entries. If you keep the payment term and the due "
+"date empty, it means direct payment. The payment term may compute several "
+"due dates, for example 50% now, 50% in one month."
+msgstr ""
+
+#. module: account
+#: view:account.analytic.cost.ledger.journal.report:0
+msgid "Select period"
+msgstr ""
+
+#. module: account
+#: model:ir.ui.menu,name:account.menu_account_pp_statements
+msgid "Statements"
+msgstr ""
+
+#. module: account
+#: report:account.analytic.account.journal:0
+msgid "Move Name"
+msgstr ""
+
+#. module: account
+#: help:res.partner,property_account_position:0
+msgid ""
+"The fiscal position will determine taxes and the accounts used for the "
+"partner."
+msgstr ""
+
+#. module: account
+#: view:account.print.journal:0
+msgid ""
+"This report gives you an overview of the situation of a specific journal"
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_account_move_line_reconcile_writeoff
+msgid "Account move line reconcile (writeoff)"
+msgstr ""
+
+#. module: account
+#: model:account.account.type,name:account.account_type_tax
+#: report:account.invoice:0
+#: field:account.invoice,amount_tax:0
+#: field:account.move.line,account_tax_id:0
+msgid "Tax"
+msgstr ""
+
+#. module: account
+#: view:account.analytic.account:0
+#: field:account.bank.statement.line,analytic_account_id:0
+#: field:account.entries.report,analytic_account_id:0
+#: field:account.invoice.line,account_analytic_id:0
+#: field:account.model.line,analytic_account_id:0
+#: field:account.move.line,analytic_account_id:0
+#: field:account.move.line.reconcile.writeoff,analytic_id:0
+msgid "Analytic Account"
+msgstr ""
+
+#. module: account
+#: view:account.account:0
+#: field:account.financial.report,account_ids:0
+#: selection:account.financial.report,type:0
+#: view:account.journal:0
+#: model:ir.actions.act_window,name:account.action_account_form
+#: model:ir.ui.menu,name:account.account_account_menu
+#: model:ir.ui.menu,name:account.account_template_accounts
+#: model:ir.ui.menu,name:account.menu_action_account_form
+#: model:ir.ui.menu,name:account.menu_analytic
+msgid "Accounts"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_invoice.py:369
+#, python-format
+msgid "Configuration Error!"
+msgstr ""
+
+#. module: account
+#: field:account.invoice.report,price_average:0
+msgid "Average Price"
+msgstr ""
+
+#. module: account
+#: report:account.overdue:0
+msgid "Date:"
+msgstr ""
+
+#. module: account
+#: report:account.journal.period.print:0
+#: report:account.journal.period.print.sale.purchase:0
+msgid "Label"
+msgstr ""
+
+#. module: account
+#: view:account.tax:0
+#: view:res.partner.bank:0
+msgid "Accounting Information"
+msgstr ""
+
+#. module: account
+#: view:account.tax:0
+#: view:account.tax.template:0
+msgid "Special Computation"
+msgstr ""
+
+#. module: account
+#: view:account.move.bank.reconcile:0
+#: model:ir.actions.act_window,name:account.action_account_bank_reconcile_tree
+msgid "Bank reconciliation"
+msgstr ""
+
+#. module: account
+#: report:account.invoice:0
+msgid "Disc.(%)"
+msgstr ""
+
+#. module: account
+#: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
+#: report:account.overdue:0
+#: report:account.third_party_ledger:0
+#: report:account.third_party_ledger_other:0
+msgid "Ref"
+msgstr ""
+
+#. module: account
+#: help:account.move.line,tax_code_id:0
+msgid "The Account can either be a base tax code or a tax code account."
+msgstr ""
+
+#. module: account
+#: sql_constraint:account.model.line:0
+msgid "Wrong credit or debit value in model, they must be positive!"
+msgstr ""
+
+#. module: account
+#: model:ir.ui.menu,name:account.menu_automatic_reconcile
+msgid "Automatic Reconciliation"
+msgstr ""
+
+#. module: account
+#: field:account.invoice,reconciled:0
+msgid "Paid/Reconciled"
+msgstr ""
+
+#. module: account
+#: field:account.tax,ref_base_code_id:0
+#: field:account.tax.template,ref_base_code_id:0
+msgid "Refund Base Code"
+msgstr ""
+
+#. module: account
+#: selection:account.tax.template,applicable_type:0
+msgid "True"
+msgstr ""
+
+#. module: account
+#: view:account.bank.statement:0
+#: view:account.common.report:0
+#: view:account.move:0
+#: view:account.move.line:0
+#: view:accounting.report:0
+msgid "Dates"
+msgstr ""
+
+#. module: account
+#: field:account.chart.template,parent_id:0
+msgid "Parent Chart Template"
+msgstr ""
+
+#. module: account
+#: field:account.tax,parent_id:0
+#: field:account.tax.template,parent_id:0
+msgid "Parent Tax Account"
+msgstr ""
+
+#. module: account
+#: code:addons/account/wizard/account_change_currency.py:59
+#, python-format
+msgid "New currency is not configured properly !"
+msgstr ""
+
+#. module: account
+#: view:account.subscription.generate:0
+msgid ""
+"Automatically generate entries based on what has been entered in the  system "
+"before a specific date."
+msgstr ""
+
+#. module: account
+#: view:account.aged.trial.balance:0
+#: model:ir.actions.act_window,name:account.action_account_aged_balance_view
+#: model:ir.ui.menu,name:account.menu_aged_trial_balance
+msgid "Aged Partner Balance"
+msgstr ""
+
+#. module: account
+#: model:process.transition,name:account.process_transition_entriesreconcile0
+#: model:process.transition,name:account.process_transition_supplierentriesreconcile0
+msgid "Accounting entries"
+msgstr ""
+
+#. module: account
+#: field:account.invoice,reference_type:0
+msgid "Communication Type"
+msgstr ""
+
+#. module: account
+#: field:account.invoice.line,discount:0
+msgid "Discount (%)"
+msgstr ""
+
+#. module: account
+#: help:account.journal,entry_posted:0
+msgid ""
+"Check this box if you don't want new journal entries to pass through the "
+"'draft' state and instead goes directly to the 'posted state' without any "
+"manual validation. \n"
+"Note that journal entries that are automatically created by the system are "
+"always skipping that state."
+msgstr ""
+
+#. module: account
+#: model:ir.actions.server,name:account.ir_actions_server_action_wizard_multi_chart
+#: model:ir.ui.menu,name:account.menu_act_ir_actions_bleble
+msgid "New Company Financial Setting"
+msgstr ""
+
+#. module: account
+#: view:account.installer:0
+msgid "Configure Your Chart of Accounts"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_report_account_sales_tree_all
+#: view:report.account.sales:0
+#: view:report.account_type.sales:0
+msgid "Sales by Account"
+msgstr ""
+
+#. module: account
+#: view:account.use.model:0
+msgid "This wizard will create recurring accounting entries"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account.py:1321
+#, python-format
+msgid "No sequence defined on the journal !"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account.py:2268
+#: code:addons/account/account_invoice.py:688
+#: code:addons/account/account_move_line.py:173
+#, python-format
+msgid "You have to define an analytic journal on the '%s' journal!"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account.py:407
+#, python-format
+msgid ""
+"You need an Opening journal with centralisation checked to set the initial "
+"balance!"
+msgstr ""
+
+#. module: account
+#: view:account.invoice.tax:0
+#: model:ir.actions.act_window,name:account.action_tax_code_list
+#: model:ir.ui.menu,name:account.menu_action_tax_code_list
+msgid "Tax codes"
+msgstr ""
+
+#. module: account
+#: view:account.account:0
+msgid "Unrealized Gains and losses"
+msgstr ""
+
+#. module: account
+#: model:ir.ui.menu,name:account.menu_account_customer
+#: model:ir.ui.menu,name:account.menu_finance_receivables
+msgid "Customers"
+msgstr ""
+
+#. module: account
+#: report:account.analytic.account.cost_ledger:0
+#: report:account.analytic.account.journal:0
+#: report:account.analytic.account.quantity_cost_ledger:0
+msgid "Period to"
+msgstr ""
+
+#. module: account
+#: selection:account.entries.report,month:0
+#: selection:account.invoice.report,month:0
+#: selection:analytic.entries.report,month:0
+#: selection:report.account.sales,month:0
+#: selection:report.account_type.sales,month:0
+msgid "August"
+msgstr ""
+
+#. module: account
+#: model:process.transition,note:account.process_transition_paymentreconcile0
+msgid "Payment entries are the second input of the reconciliation."
+msgstr ""
+
+#. module: account
+#: selection:account.entries.report,month:0
+#: selection:account.invoice.report,month:0
+#: selection:analytic.entries.report,month:0
+#: selection:report.account.sales,month:0
+#: selection:report.account_type.sales,month:0
+msgid "October"
+msgstr ""
+
+#. module: account
+#: help:account.move.line,quantity:0
+msgid ""
+"The optional quantity expressed by this line, eg: number of product sold. "
+"The quantity is not a legal requirement but is very useful for some reports."
+msgstr ""
+
+#. module: account
+#: view:account.payment.term.line:0
+msgid "Line 2:"
+msgstr ""
+
+#. module: account
+#: field:account.journal.column,required:0
+msgid "Required"
+msgstr ""
+
+#. module: account
+#: view:account.chart.template:0
+#: field:product.category,property_account_expense_categ:0
+#: field:product.template,property_account_expense:0
+msgid "Expense Account"
+msgstr ""
+
+#. module: account
+#: help:account.invoice,period_id:0
+msgid "Keep empty to use the period of the validation(invoice) date."
+msgstr ""
+
+#. module: account
+#: help:account.bank.statement,account_id:0
+msgid ""
+"used in statement reconciliation domain, but shouldn't be used elswhere."
+msgstr ""
+
+#. module: account
+#: field:account.invoice.tax,base_amount:0
+msgid "Base Code Amount"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_invoice.py:392
+#, python-format
+msgid ""
+"You can not delete an invoice which is open or paid. We suggest you to "
+"refund it instead."
+msgstr ""
+
+#. module: account
+#: field:wizard.multi.charts.accounts,sale_tax:0
+msgid "Default Sale Tax"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_invoice.py:1013
+#, python-format
+msgid "Invoice  '%s' is validated."
+msgstr ""
+
+#. module: account
+#: help:account.model.line,date_maturity:0
+msgid ""
+"The maturity date of the generated entries for this model. You can choose "
+"between the creation date or the creation date of the entries plus the "
+"partner payment terms."
+msgstr ""
+
+#. module: account
+#: model:ir.ui.menu,name:account.menu_finance_accounting
+msgid "Financial Accounting"
+msgstr ""
+
+#. module: account
+#: model:ir.ui.menu,name:account.menu_account_report_pl
+msgid "Profit And Loss"
+msgstr ""
+
+#. module: account
+#: view:account.fiscal.position:0
+#: field:account.fiscal.position,name:0
+#: field:account.fiscal.position.account,position_id:0
+#: field:account.fiscal.position.tax,position_id:0
+#: field:account.fiscal.position.tax.template,position_id:0
+#: view:account.fiscal.position.template:0
+#: field:account.invoice,fiscal_position:0
+#: field:account.invoice.report,fiscal_position:0
+#: model:ir.model,name:account.model_account_fiscal_position
+#: field:res.partner,property_account_position:0
+msgid "Fiscal Position"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_invoice.py:735
+#, python-format
+msgid ""
+"Tax base different!\n"
+"Click on compute to update the tax base."
+msgstr ""
+
+#. module: account
+#: field:account.partner.ledger,page_split:0
+msgid "One Partner Per Page"
+msgstr ""
+
+#. module: account
+#: field:account.account,child_parent_ids:0
+#: field:account.account.template,child_parent_ids:0
+msgid "Children"
+msgstr ""
+
+#. module: account
+#: selection:account.invoice,type:0
+#: selection:account.invoice.report,type:0
+#: model:process.process,name:account.process_process_invoiceprocess0
+#: selection:report.invoice.created,type:0
+msgid "Customer Invoice"
+msgstr ""
+
+#. module: account
+#: help:account.tax.template,include_base_amount:0
+msgid ""
+"Set if the amount of tax must be included in the base amount before "
+"computing the next taxes."
+msgstr ""
+
+#. module: account
+#: help:account.journal,user_id:0
+msgid "The user responsible for this journal"
+msgstr ""
+
+#. module: account
+#: view:account.period:0
+msgid "Search Period"
+msgstr ""
+
+#. module: account
+#: view:account.change.currency:0
+msgid "Invoice Currency"
+msgstr ""
+
+#. module: account
+#: field:accounting.report,account_report_id:0
+#: model:ir.ui.menu,name:account.menu_account_financial_reports_tree
+msgid "Account Reports"
+msgstr ""
+
+#. module: account
+#: field:account.payment.term,line_ids:0
+msgid "Terms"
+msgstr ""
+
+#. module: account
+#: field:account.bank.statement,total_entry_encoding:0
+msgid "Cash Transaction"
+msgstr ""
+
+#. module: account
+#: view:res.partner:0
+msgid "Bank account"
+msgstr ""
+
+#. module: account
+#: field:account.chart.template,tax_template_ids:0
+msgid "Tax Template List"
+msgstr ""
+
+#. module: account
+#: model:ir.ui.menu,name:account.menu_account_print_sale_purchase_journal
+msgid "Sale/Purchase Journals"
+msgstr ""
+
+#. module: account
+#: help:account.account,currency_mode:0
+msgid ""
+"This will select how the current currency rate for outgoing transactions is "
+"computed. In most countries the legal method is \"average\" but only a few "
+"software systems are able to manage this. So if you import from another "
+"software system you may have to use the rate at date. Incoming transactions "
+"always use the rate at date."
+msgstr ""
+
+#. module: account
+#: help:account.chart.template,code_digits:0
+#: help:wizard.multi.charts.accounts,code_digits:0
+msgid "No. of Digits to use for account code"
+msgstr ""
+
+#. module: account
+#: field:account.payment.term.line,name:0
+msgid "Line Name"
+msgstr ""
+
+#. module: account
+#: view:account.fiscalyear:0
+msgid "Search Fiscalyear"
+msgstr ""
+
+#. module: account
+#: selection:account.tax,applicable_type:0
+msgid "Always"
+msgstr ""
+
+#. module: account
+#: view:account.invoice.report:0
+#: view:analytic.entries.report:0
+msgid "Month-1"
+msgstr ""
+
+#. module: account
+#: view:account.analytic.line:0
+msgid "Total Quantity"
+msgstr ""
+
+#. module: account
+#: field:account.move.line.reconcile.writeoff,writeoff_acc_id:0
+msgid "Write-Off account"
+msgstr ""
+
+#. module: account
+#: field:account.model.line,model_id:0
+#: view:account.subscription:0
+#: field:account.subscription,model_id:0
+msgid "Model"
+msgstr ""
+
+#. module: account
+#: help:account.invoice.tax,base_code_id:0
+msgid "The account basis of the tax declaration."
+msgstr ""
+
+#. module: account
+#: selection:account.account,type:0
+#: selection:account.account.template,type:0
+#: selection:account.entries.report,type:0
+#: selection:account.financial.report,type:0
+msgid "View"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account.py:3363
+#: code:addons/account/account_bank.py:90
+#, python-format
+msgid "BNK"
+msgstr ""
+
+#. module: account
+#: field:account.move.line,analytic_lines:0
+msgid "Analytic lines"
+msgstr ""
+
+#. module: account
+#: view:account.invoice:0
+msgid "Proforma Invoices"
+msgstr ""
+
+#. module: account
+#: model:process.node,name:account.process_node_electronicfile0
+msgid "Electronic File"
+msgstr ""
+
+#. module: account
+#: view:res.partner:0
+msgid "Customer Credit"
+msgstr ""
+
+#. module: account
+#: view:account.payment.term.line:0
+msgid "  Day of the Month: 0"
+msgstr ""
+
+#. module: account
+#: view:account.subscription:0
+msgid "Starts on"
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_account_partner_ledger
+msgid "Account Partner Ledger"
+msgstr ""
+
+#. module: account
+#: help:account.journal.column,sequence:0
+msgid "Gives the sequence order to journal column."
+msgstr ""
+
+#. module: account
+#: help:account.account,currency_id:0
+#: help:account.account.template,currency_id:0
+#: help:account.bank.accounts.wizard,currency_id:0
+msgid "Forces all moves for this account to have this secondary currency."
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,help:account.action_validate_account_move_line
+msgid ""
+"This wizard will validate all journal entries of a particular journal and "
+"period. Once journal entries are validated, you can not update them anymore."
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_account_chart_template_form
+#: model:ir.ui.menu,name:account.menu_action_account_chart_template_form
+msgid "Chart of Accounts Templates"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_wizard_multi_chart
+msgid "Generate Chart of Accounts from a Chart Template"
+msgstr ""
+
+#. module: account
+#: view:report.account.sales:0
+msgid "This months' Sales by type"
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_account_unreconcile_reconcile
+msgid "Account Unreconcile Reconcile"
+msgstr ""
+
+#. module: account
+#: sql_constraint:account.tax:0
+msgid "The description must be unique per company!"
+msgstr ""
+
+#. module: account
+#: help:account.account.type,close_method:0
+msgid ""
+"Set here the method that will be used to generate the end of year journal "
+"entries for all the accounts of this type.\n"
+"\n"
+" 'None' means that nothing will be done.\n"
+" 'Balance' will generally be used for cash accounts.\n"
+" 'Detail' will copy each existing journal item of the previous year, even "
+"the reconciled ones.\n"
+" 'Unreconciled' will copy only the journal items that were unreconciled on "
+"the first day of the new fiscal year."
+msgstr ""
+
+#. module: account
+#: code:addons/account/wizard/account_open_closed_fiscalyear.py:39
+#, python-format
+msgid "No End of year journal defined for the fiscal year"
+msgstr ""
+
+#. module: account
+#: view:account.tax:0
+#: view:account.tax.template:0
+msgid "Keep empty to use the expense account"
+msgstr ""
+
+#. module: account
+#: field:account.aged.trial.balance,journal_ids:0
+#: field:account.analytic.cost.ledger.journal.report,journal:0
+#: field:account.balance.report,journal_ids:0
+#: field:account.central.journal,journal_ids:0
+#: field:account.common.account.report,journal_ids:0
+#: field:account.common.journal.report,journal_ids:0
+#: field:account.common.partner.report,journal_ids:0
+#: view:account.common.report:0
+#: field:account.common.report,journal_ids:0
+#: report:account.general.journal:0
+#: field:account.general.journal,journal_ids:0
+#: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
+#: view:account.journal.period:0
+#: report:account.partner.balance:0
+#: field:account.partner.balance,journal_ids:0
+#: field:account.partner.ledger,journal_ids:0
+#: view:account.print.journal:0
+#: field:account.print.journal,journal_ids:0
+#: field:account.report.general.ledger,journal_ids:0
+#: report:account.third_party_ledger:0
+#: report:account.third_party_ledger_other:0
+#: field:account.vat.declaration,journal_ids:0
+#: field:accounting.report,journal_ids:0
+#: model:ir.actions.act_window,name:account.action_account_journal_form
+#: model:ir.actions.act_window,name:account.action_account_journal_period_tree
+#: model:ir.ui.menu,name:account.menu_account_print_journal
+#: model:ir.ui.menu,name:account.menu_action_account_journal_form
+#: model:ir.ui.menu,name:account.menu_journals
+#: model:ir.ui.menu,name:account.menu_journals_report
+msgid "Journals"
+msgstr ""
+
+#. module: account
+#: field:account.partner.reconcile.process,to_reconcile:0
+msgid "Remaining Partners"
+msgstr ""
+
+#. module: account
+#: view:account.subscription:0
+#: field:account.subscription,lines_id:0
+msgid "Subscription Lines"
+msgstr ""
+
+#. module: account
+#: selection:account.analytic.journal,type:0
+#: view:account.journal:0
+#: selection:account.journal,type:0
+#: view:account.model:0
+#: selection:account.tax,type_tax_use:0
+#: view:account.tax.template:0
+#: selection:account.tax.template,type_tax_use:0
+msgid "Purchase"
+msgstr ""
+
+#. module: account
+#: view:account.installer:0
+#: view:wizard.multi.charts.accounts:0
+msgid "Accounting Application Configuration"
+msgstr ""
+
+#. module: account
+#: view:account.payment.term.line:0
+msgid "  Value amount: 0.02"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.open_board_account
+#: model:ir.ui.menu,name:account.menu_board_account
+msgid "Accounting Dashboard"
+msgstr ""
+
+#. module: account
+#: field:account.bank.statement,balance_start:0
+#: field:account.treasury.report,starting_balance:0
+msgid "Starting Balance"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_invoice.py:1332
+#, python-format
+msgid "No Partner Defined !"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_account_period_close
+#: model:ir.actions.act_window,name:account.action_account_period_tree
+#: model:ir.ui.menu,name:account.menu_action_account_period_close_tree
+msgid "Close a Period"
+msgstr ""
+
+#. module: account
+#: field:account.financial.report,display_detail:0
+msgid "Display details"
+msgstr ""
+
+#. module: account
+#: report:account.overdue:0
+msgid "VAT:"
+msgstr ""
+
+#. module: account
+#: constraint:account.invoice:0
+msgid "Invalid BBA Structured Communication !"
+msgstr ""
+
+#. module: account
+#: help:account.analytic.line,amount_currency:0
+msgid ""
+"The amount expressed in the related account currency if not equal to the "
+"company one."
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_account_unreconcile
+#: model:ir.actions.act_window,name:account.action_account_unreconcile_reconcile
+#: model:ir.actions.act_window,name:account.action_account_unreconcile_select
+msgid "Unreconcile Entries"
+msgstr ""
+
+#. module: account
+#: field:account.tax.code,notprintable:0
+#: field:account.tax.code.template,notprintable:0
+msgid "Not Printable in Invoice"
+msgstr ""
+
+#. module: account
+#: report:account.vat.declaration:0
+#: field:account.vat.declaration,chart_tax_id:0
+msgid "Chart of Tax"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_cash_statement.py:314
+#, python-format
+msgid "The closing balance should be the same than the computed balance!"
+msgstr ""
+
+#. module: account
+#: view:account.journal:0
+msgid "Search Account Journal"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_invoice_tree_pending_invoice
+msgid "Pending Invoice"
+msgstr ""
+
+#. module: account
+#: view:account.invoice.report:0
+#: selection:account.subscription,period_type:0
+#: view:analytic.entries.report:0
+msgid "year"
+msgstr ""
+
+#. module: account
+#: view:product.product:0
+msgid "Purchase Taxes"
+msgstr ""
+
+#. module: account
+#: view:validate.account.move.lines:0
+msgid ""
+"All selected journal entries will be validated and posted. It means you "
+"won't be able to modify their accounting fields anymore."
+msgstr ""
+
+#. module: account
+#: model:ir.actions.report.xml,name:account.account_transfers
+msgid "Transfers"
+msgstr ""
+
+#. module: account
+#: view:account.chart:0
+msgid "Account charts"
+msgstr ""
+
+#. module: account
+#: report:account.vat.declaration:0
+msgid "Tax Amount"
+msgstr ""
+
+#. module: account
+#: view:account.move:0
+msgid "Search Move"
+msgstr ""
+
+#. module: account
+#: field:account.tax.code,name:0
+#: field:account.tax.code.template,name:0
+msgid "Tax Case Name"
+msgstr ""
+
+#. module: account
+#: report:account.invoice:0
+#: model:process.node,name:account.process_node_draftinvoices0
+msgid "Draft Invoice"
+msgstr ""
+
+#. module: account
+#: code:addons/account/wizard/account_invoice_state.py:68
+#, python-format
+msgid ""
+"Selected Invoice(s) cannot be cancelled as they are already in 'Cancelled' "
+"or 'Done' state!"
+msgstr ""
+
+#. module: account
+#: view:account.invoice.line:0
+msgid "Quantity :"
+msgstr ""
+
+#. module: account
+#: field:account.aged.trial.balance,period_length:0
+msgid "Period Length (days)"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_account_print_sale_purchase_journal
+msgid "Print Sale/Purchase Journal"
+msgstr ""
+
+#. module: account
+#: field:account.invoice.report,state:0
+msgid "Invoice State"
+msgstr ""
+
+#. module: account
+#: view:account.invoice.report:0
+#: field:account.invoice.report,categ_id:0
+msgid "Category of Product"
+msgstr ""
+
+#. module: account
+#: view:account.addtmpl.wizard:0
+#: model:ir.actions.act_window,name:account.action_account_addtmpl_wizard_form
+msgid "Create Account"
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_report_account_type_sales
+msgid "Report of the Sales by Account Type"
+msgstr ""
+
+#. module: account
+#: view:account.move.line:0
+msgid "Unreconciled Journal Items"
+msgstr ""
+
+#. module: account
+#: sql_constraint:res.currency:0
+msgid "The currency code must be unique per company!"
+msgstr ""
+
+#. module: account
+#: selection:account.account.type,close_method:0
+msgid "Detail"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_invoice.py:839
+#, python-format
+msgid ""
+"Can not create the invoice !\n"
+"The related payment term is probably misconfigured as it gives a computed "
+"amount greater than the total invoiced amount. The latest line of your "
+"payment term must be of type 'balance' to avoid rounding issues."
+msgstr ""
+
+#. module: account
+#: report:account.invoice:0
+msgid "VAT :"
+msgstr ""
+
+#. module: account
+#: report:account.central.journal:0
+#: report:account.general.ledger:0
+#: field:account.installer,charts:0
+#: report:account.partner.balance:0
+#: report:account.third_party_ledger:0
+#: report:account.third_party_ledger_other:0
+#: model:ir.actions.act_window,name:account.action_account_chart
+#: model:ir.actions.act_window,name:account.action_account_tree
+#: model:ir.ui.menu,name:account.menu_action_account_tree2
+msgid "Chart of Accounts"
+msgstr ""
+
+#. module: account
+#: view:account.tax.chart:0
+msgid "(If you do not select period it will take all open periods)"
+msgstr ""
+
+#. module: account
+#: field:account.journal,centralisation:0
+msgid "Centralised counterpart"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_move_line.py:584
+#, python-format
+msgid "You can not create journal items on a \"view\" account %s %s"
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_account_partner_reconcile_process
+msgid "Reconcilation Process partner by partner"
+msgstr ""
+
+#. module: account
+#: selection:account.automatic.reconcile,power:0
+msgid "2"
+msgstr ""
+
+#. module: account
+#: view:account.chart:0
+msgid "(If you do not select Fiscal year it will take all open fiscal years)"
+msgstr ""
+
+#. module: account
+#: selection:account.aged.trial.balance,filter:0
+#: report:account.analytic.account.journal:0
+#: selection:account.balance.report,filter:0
+#: field:account.bank.statement,date:0
+#: selection:account.central.journal,filter:0
+#: selection:account.common.account.report,filter:0
+#: selection:account.common.journal.report,filter:0
+#: selection:account.common.partner.report,filter:0
+#: selection:account.common.report,filter:0
+#: view:account.entries.report:0
+#: field:account.entries.report,date:0
+#: selection:account.general.journal,filter:0
+#: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
+#: field:account.invoice.report,date:0
+#: report:account.journal.period.print:0
+#: report:account.journal.period.print.sale.purchase:0
+#: view:account.move:0
+#: field:account.move,date:0
+#: field:account.move.line.reconcile.writeoff,date_p:0
+#: report:account.overdue:0
+#: selection:account.partner.balance,filter:0
+#: selection:account.partner.ledger,filter:0
+#: selection:account.print.journal,filter:0
+#: selection:account.print.journal,sort_selection:0
+#: selection:account.report.general.ledger,filter:0
+#: selection:account.report.general.ledger,sortby:0
+#: field:account.subscription.generate,date:0
+#: field:account.subscription.line,date:0
+#: report:account.third_party_ledger:0
+#: report:account.third_party_ledger_other:0
+#: selection:account.vat.declaration,filter:0
+#: selection:accounting.report,filter:0
+#: selection:accounting.report,filter_cmp:0
+#: field:analytic.entries.report,date:0
+msgid "Date"
+msgstr ""
+
+#. module: account
+#: view:account.move:0
+msgid "Post"
+msgstr ""
+
+#. module: account
+#: view:account.unreconcile:0
+#: view:account.unreconcile.reconcile:0
+msgid "Unreconcile"
+msgstr ""
+
+#. module: account
+#: view:account.analytic.line:0
+#: field:account.bank.statement,user_id:0
+#: view:account.journal:0
+#: field:account.journal,user_id:0
+#: view:analytic.entries.report:0
+#: field:analytic.entries.report,user_id:0
+msgid "User"
+msgstr ""
+
+#. module: account
+#: view:account.chart.template:0
+msgid "Chart of Accounts Template"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account.py:2280
+#, python-format
+msgid ""
+"Maturity date of entry line generated by model line '%s' of model '%s' is "
+"based on partner payment term!\n"
+"Please define partner on it!"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_move_line.py:837
+#, python-format
+msgid "Some entries are already reconciled !"
+msgstr ""
+
+#. module: account
+#: view:account.tax:0
+msgid "Account Tax"
+msgstr ""
+
+#. module: account
+#: model:ir.ui.menu,name:account.menu_finance_reporting_budgets
+msgid "Budgets"
+msgstr ""
+
+#. module: account
+#: selection:account.aged.trial.balance,filter:0
+#: selection:account.balance.report,filter:0
+#: selection:account.central.journal,filter:0
+#: selection:account.common.account.report,filter:0
+#: selection:account.common.journal.report,filter:0
+#: selection:account.common.partner.report,filter:0
+#: selection:account.common.report,filter:0
+#: selection:account.general.journal,filter:0
+#: selection:account.partner.balance,filter:0
+#: selection:account.partner.ledger,filter:0
+#: selection:account.print.journal,filter:0
+#: selection:account.report.general.ledger,filter:0
+#: selection:account.vat.declaration,filter:0
+#: selection:accounting.report,filter:0
+#: selection:accounting.report,filter_cmp:0
+msgid "No Filters"
+msgstr ""
+
+#. module: account
+#: view:account.invoice.report:0
+msgid "Pro-forma Invoices"
+msgstr ""
+
+#. module: account
+#: view:res.partner:0
+msgid "History"
+msgstr ""
+
+#. module: account
+#: help:account.tax,applicable_type:0
+#: help:account.tax.template,applicable_type:0
+msgid ""
+"If not applicable (computed through a Python code), the tax won't appear on "
+"the invoice."
+msgstr ""
+
+#. module: account
+#: view:account.tax:0
+#: view:account.tax.template:0
+msgid "Applicable Code (if type=code)"
+msgstr ""
+
+#. module: account
+#: view:account.invoice.report:0
+#: field:account.invoice.report,product_qty:0
+msgid "Qty"
+msgstr ""
+
+#. module: account
+#: field:account.invoice.report,address_contact_id:0
+msgid "Contact Address Name"
+msgstr ""
+
+#. module: account
+#: field:account.move.line,blocked:0
+msgid "Litigation"
+msgstr ""
+
+#. module: account
+#: view:account.analytic.line:0
+msgid "Search Analytic Lines"
+msgstr ""
+
+#. module: account
+#: field:res.partner,property_account_payable:0
+msgid "Account Payable"
+msgstr ""
+
+#. module: account
+#: model:process.node,name:account.process_node_supplierpaymentorder0
+msgid "Payment Order"
+msgstr ""
+
+#. module: account
+#: help:account.account.template,reconcile:0
+msgid ""
+"Check this option if you want the user to reconcile entries in this account."
+msgstr ""
+
+#. module: account
+#: model:ir.actions.report.xml,name:account.account_account_balance_landscape
+msgid "Account balance"
+msgstr ""
+
+#. module: account
+#: report:account.invoice:0
+#: field:account.invoice.line,price_unit:0
+msgid "Unit Price"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_account_tree1
+msgid "Analytic Items"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_move_line.py:1153
+#, python-format
+msgid "Unable to change tax !"
+msgstr ""
+
+#. module: account
+#: field:analytic.entries.report,nbr:0
+msgid "#Entries"
+msgstr ""
+
+#. module: account
+#: selection:account.invoice.refund,filter_refund:0
+msgid "Create a draft Refund"
+msgstr ""
+
+#. module: account
+#: view:account.state.open:0
+msgid "Open Invoice"
+msgstr ""
+
+#. module: account
+#: field:account.invoice.tax,factor_tax:0
+msgid "Multipication factor Tax code"
+msgstr ""
+
+#. module: account
+#: view:account.fiscal.position:0
+msgid "Mapping"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_invoice.py:921
+#, python-format
+msgid ""
+"You cannot create an invoice on a centralised journal. Uncheck the "
+"centralised counterpart box in the related journal from the configuration "
+"menu."
+msgstr ""
+
+#. module: account
+#: field:account.account,name:0
+#: field:account.account.template,name:0
+#: report:account.analytic.account.inverted.balance:0
+#: field:account.bank.statement,name:0
+#: field:account.chart.template,name:0
+#: field:account.model.line,name:0
+#: field:account.move.line,name:0
+#: field:account.move.reconcile,name:0
+#: field:account.subscription,name:0
+msgid "Name"
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_account_aged_trial_balance
+msgid "Account Aged Trial balance Report"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_move_line.py:591
+#, python-format
+msgid "You can not create journal items on a closed account %s %s"
+msgstr ""
+
+#. module: account
+#: field:account.move.line,date:0
+msgid "Effective date"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_bank_tree
+#: model:ir.ui.menu,name:account.menu_action_bank_tree
+msgid "Setup your Bank Accounts"
+msgstr ""
+
+#. module: account
+#: code:addons/account/wizard/account_move_bank_reconcile.py:53
+#, python-format
+msgid "Standard Encoding"
+msgstr ""
+
+#. module: account
+#: help:account.journal,analytic_journal_id:0
+msgid "Journal for analytic entries"
+msgstr ""
+
+#. module: account
+#: constraint:account.aged.trial.balance:0
+#: constraint:account.balance.report:0
+#: constraint:account.central.journal:0
+#: constraint:account.common.account.report:0
+#: constraint:account.common.journal.report:0
+#: constraint:account.common.partner.report:0
+#: constraint:account.common.report:0
+#: constraint:account.general.journal:0
+#: constraint:account.partner.balance:0
+#: constraint:account.partner.ledger:0
+#: constraint:account.print.journal:0
+#: constraint:account.report.general.ledger:0
+#: constraint:account.vat.declaration:0
+#: constraint:accounting.report:0
+msgid ""
+"The fiscalyear, periods or chart of account chosen have to belong to the "
+"same company."
+msgstr ""
+
+#. module: account
+#: model:ir.actions.todo.category,name:account.category_accounting_configuration
+#: model:ir.ui.menu,name:account.menu_finance
+#: model:process.node,name:account.process_node_accountingentries0
+#: model:process.node,name:account.process_node_supplieraccountingentries0
+#: view:product.product:0
+#: view:product.template:0
+#: view:res.partner:0
+msgid "Accounting"
+msgstr ""
+
+#. module: account
+#: view:account.entries.report:0
+msgid "Journal Entries with period in current year"
+msgstr ""
+
+#. module: account
+#: help:account.central.journal,amount_currency:0
+#: help:account.common.journal.report,amount_currency:0
+#: help:account.general.journal,amount_currency:0
+#: help:account.print.journal,amount_currency:0
+msgid ""
+"Print Report with the currency column if the currency is different then the "
+"company currency"
+msgstr ""
+
+#. module: account
+#: help:account.account,unrealized_gain_loss:0
+msgid ""
+"Value of Loss or Gain due to changes in exchange rate when doing multi-"
+"currency transactions."
+msgstr ""
+
+#. module: account
+#: view:account.analytic.line:0
+msgid "General Accounting"
+msgstr ""
+
+#. module: account
+#: report:account.overdue:0
+msgid "Balance :"
+msgstr ""
+
+#. module: account
+#: help:account.fiscalyear.close,journal_id:0
+msgid ""
+"The best practice here is to use a journal dedicated to contain the opening "
+"entries of all fiscal years. Note that you should define it with default "
+"debit/credit accounts, of type 'situation' and with a centralized "
+"counterpart."
+msgstr ""
+
+#. module: account
+#: view:account.installer:0
+#: view:wizard.multi.charts.accounts:0
+msgid "title"
+msgstr ""
+
+#. module: account
+#: view:account.invoice:0
+#: view:account.period:0
+#: view:account.subscription:0
+msgid "Set to Draft"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_subscription_form
+msgid "Recurring Lines"
+msgstr ""
+
+#. module: account
+#: field:account.partner.balance,display_partner:0
+msgid "Display Partners"
+msgstr ""
+
+#. module: account
+#: view:account.invoice:0
+msgid "Validate"
+msgstr ""
+
+#. module: account
+#: report:account.analytic.account.cost_ledger:0
+#: report:account.analytic.account.quantity_cost_ledger:0
+#: model:ir.actions.act_window,name:account.action_account_analytic_cost
+#: model:ir.actions.report.xml,name:account.account_analytic_account_cost_ledger
+msgid "Cost Ledger"
+msgstr ""
+
+#. module: account
+#: model:account.financial.report,name:account.account_financial_report_assets0
+msgid "Assets"
+msgstr ""
+
+#. module: account
+#: view:account.invoice.confirm:0
+msgid "Confirm Invoices"
+msgstr ""
+
+#. module: account
+#: selection:account.account,currency_mode:0
+msgid "Average Rate"
+msgstr ""
+
+#. module: account
+#: field:account.balance.report,display_account:0
+#: field:account.common.account.report,display_account:0
+#: field:account.report.general.ledger,display_account:0
+msgid "Display Accounts"
+msgstr ""
+
+#. module: account
+#: view:account.state.open:0
+msgid "(Invoice should be unreconciled if you want to open it)"
+msgstr ""
+
+#. module: account
+#: field:account.chart,period_from:0
+msgid "Start period"
+msgstr ""
+
+#. module: account
+#: field:account.tax,name:0
+#: field:account.tax.template,name:0
+#: report:account.vat.declaration:0
+msgid "Tax Name"
+msgstr ""
+
+#. module: account
+#: model:account.payment.term,name:account.account_payment_term
+#: model:account.payment.term,note:account.account_payment_term
+msgid "30 Days End of Month"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_account_analytic_balance
+#: model:ir.actions.report.xml,name:account.account_analytic_account_balance
+msgid "Analytic Balance"
+msgstr ""
+
+#. module: account
+#: help:account.account,active:0
+msgid ""
+"If the active field is set to False, it will allow you to hide the account "
+"without removing it."
+msgstr ""
+
+#. module: account
+#: view:account.move.line:0
+msgid "Posted Journal Items"
+msgstr ""
+
+#. module: account
+#: view:account.tax.template:0
+msgid "Search Tax Templates"
+msgstr ""
+
+#. module: account
+#: model:ir.ui.menu,name:account.periodical_processing_journal_entries_validation
+msgid "Draft Entries"
+msgstr ""
+
+#. module: account
+#: view:account.payment.term.line:0
+msgid "  Day of the Month= -1"
+msgstr ""
+
+#. module: account
+#: view:account.payment.term.line:0
+msgid "  Number of Days: 30"
+msgstr ""
+
+#. module: account
+#: field:account.account,shortcut:0
+#: field:account.account.template,shortcut:0
+msgid "Shortcut"
+msgstr ""
+
+#. module: account
+#: constraint:account.fiscalyear:0
+msgid "Error! The start date of the fiscal year must be before his end date."
+msgstr ""
+
+#. module: account
+#: view:account.account:0
+#: field:account.account,user_type:0
+#: view:account.account.template:0
+#: field:account.account.template,user_type:0
+#: view:account.account.type:0
+#: field:account.account.type,name:0
+#: field:account.bank.accounts.wizard,account_type:0
+#: field:account.entries.report,user_type:0
+#: selection:account.financial.report,type:0
+#: model:ir.model,name:account.model_account_account_type
+#: field:report.account.receivable,type:0
+#: field:report.account_type.sales,user_type:0
+msgid "Account Type"
+msgstr ""
+
+#. module: account
+#: view:res.partner:0
+msgid "Bank Account Owner"
+msgstr ""
+
+#. module: account
+#: report:account.account.balance:0
+#: view:account.balance.report:0
+#: model:ir.actions.act_window,name:account.action_account_balance_menu
+#: model:ir.actions.report.xml,name:account.account_account_balance
+#: model:ir.ui.menu,name:account.menu_general_Balance_report
+msgid "Trial Balance"
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_account_invoice_cancel
+msgid "Cancel the Selected Invoices"
+msgstr ""
+
+#. module: account
+#: help:product.category,property_account_income_categ:0
+#: help:product.template,property_account_income:0
+msgid ""
+"This account will be used to value outgoing stock for the current product "
+"category using sale price"
+msgstr ""
+
+#. module: account
+#: selection:account.automatic.reconcile,power:0
+msgid "3"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_move_line.py:97
+#, python-format
+msgid ""
+"You haven't supplied enough argument to compute the initial balance, please "
+"select a period and journal in the context."
+msgstr ""
+
+#. module: account
+#: model:process.transition,note:account.process_transition_supplieranalyticcost0
+msgid ""
+"Analytic costs (timesheets, some purchased products, ...) come from analytic "
+"accounts. These generate draft supplier invoices."
+msgstr ""
+
+#. module: account
+#: view:account.bank.statement:0
+msgid "Close CashBox"
+msgstr ""
+
+#. module: account
+#: view:account.invoice.report:0
+#: field:account.invoice.report,due_delay:0
+msgid "Avg. Due Delay"
+msgstr ""
+
+#. module: account
+#: view:account.entries.report:0
+msgid "Acc.Type"
+msgstr ""
+
+#. module: account
+#: field:account.entries.report,month:0
+#: view:account.invoice.report:0
+#: field:account.invoice.report,month:0
+#: view:analytic.entries.report:0
+#: field:analytic.entries.report,month:0
+#: field:report.account.sales,month:0
+#: field:report.account_type.sales,month:0
+msgid "Month"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_move_line.py:1216
+#, python-format
+msgid ""
+"You can not do this modification on a confirmed entry! You can just change "
+"some non legal fields or you must unconfirm the journal entry first! \n"
+"%s"
+msgstr ""
+
+#. module: account
+#: field:res.company,paypal_account:0
+msgid "Paypal Account"
+msgstr ""
+
+#. module: account
+#: field:account.invoice.report,uom_name:0
+msgid "Reference UoM"
+msgstr ""
+
+#. module: account
+#: field:account.account,note:0
+#: field:account.account.template,note:0
+msgid "Note"
+msgstr ""
+
+#. module: account
+#: selection:account.financial.report,sign:0
+msgid "Reverse balance sign"
+msgstr ""
+
+#. module: account
+#: view:account.analytic.account:0
+msgid "Overdue Account"
+msgstr ""
+
+#. module: account
+#: selection:account.account.type,report_type:0
+#: code:addons/account/account.py:184
+#, python-format
+msgid "Balance Sheet (Liability account)"
+msgstr ""
+
+#. module: account
+#: help:account.invoice,date_invoice:0
+msgid "Keep empty to use the current date"
+msgstr ""
+
+#. module: account
+#: field:account.invoice,tax_line:0
+msgid "Tax Lines"
+msgstr ""
+
+#. module: account
+#: field:account.tax,base_code_id:0
+msgid "Account Base Code"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_analytic_line.py:93
+#, python-format
+msgid "There is no expense account defined for this product: \"%s\" (id:%d)"
+msgstr ""
+
+#. module: account
+#: view:res.partner:0
+msgid "Customer Accounting Properties"
+msgstr ""
+
+#. module: account
+#: help:res.company,paypal_account:0
+msgid "Paypal username (usually email) for receiving online payments."
+msgstr ""
+
+#. module: account
+#: selection:account.aged.trial.balance,target_move:0
+#: selection:account.balance.report,target_move:0
+#: selection:account.central.journal,target_move:0
+#: selection:account.chart,target_move:0
+#: selection:account.common.account.report,target_move:0
+#: selection:account.common.journal.report,target_move:0
+#: selection:account.common.partner.report,target_move:0
+#: selection:account.common.report,target_move:0
+#: selection:account.general.journal,target_move:0
+#: selection:account.move.journal,target_move:0
+#: selection:account.partner.balance,target_move:0
+#: selection:account.partner.ledger,target_move:0
+#: selection:account.print.journal,target_move:0
+#: selection:account.report.general.ledger,target_move:0
+#: selection:account.tax.chart,target_move:0
+#: selection:account.vat.declaration,target_move:0
+#: selection:accounting.report,target_move:0
+#: code:addons/account/report/common_report_header.py:68
+#, python-format
+msgid "All Posted Entries"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_bank_statement.py:367
+#, python-format
+msgid "Statement %s is confirmed, journal items are created."
+msgstr ""
+
+#. module: account
+#: field:report.aged.receivable,name:0
+msgid "Month Range"
+msgstr ""
+
+#. module: account
+#: help:account.analytic.balance,empty_acc:0
+msgid "Check if you want to display Accounts with 0 balance too."
+msgstr ""
+
+#. module: account
+#: view:account.tax:0
+msgid "Compute Code"
+msgstr ""
+
+#. module: account
+#: view:account.account.template:0
+msgid "Default taxes"
+msgstr ""
+
+#. module: account
+#: code:addons/account/wizard/account_fiscalyear_close.py:41
+#, python-format
+msgid "End of Fiscal Year Entry"
+msgstr ""
+
+#. module: account
+#: model:ir.ui.menu,name:account.menu_finance_periodical_processing
+msgid "Periodical Processing"
+msgstr ""
+
+#. module: account
+#: constraint:account.analytic.line:0
+msgid "You can not create analytic line on view account."
+msgstr ""
+
+#. module: account
+#: help:account.move.line,state:0
+msgid ""
+"When new move line is created the state will be 'Draft'.\n"
+"* When all the payments are done it will be in 'Valid' state."
+msgstr ""
+
+#. module: account
+#: field:account.journal,view_id:0
+msgid "Display Mode"
+msgstr ""
+
+#. module: account
+#: model:process.node,note:account.process_node_importinvoice0
+msgid "Statement from invoice or payment"
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_account_chart
+msgid "Account chart"
+msgstr ""
+
+#. module: account
+#: selection:account.financial.report,style_overwrite:0
+msgid "Main Title 1 (bold, underlined)"
+msgstr ""
+
+#. module: account
+#: report:account.analytic.account.balance:0
+#: report:account.central.journal:0
+msgid "Account Name"
+msgstr ""
+
+#. module: account
+#: help:account.fiscalyear.close,report_name:0
+msgid "Give name of the new entries"
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_account_invoice_report
+msgid "Invoices Statistics"
+msgstr ""
+
+#. module: account
+#: field:account.account,exchange_rate:0
+msgid "Exchange Rate"
+msgstr ""
+
+#. module: account
+#: model:process.transition,note:account.process_transition_paymentorderreconcilation0
+msgid "Bank statements are entered in the system."
+msgstr ""
+
+#. module: account
+#: code:addons/account/wizard/account_reconcile.py:133
+#, python-format
+msgid "Reconcile Writeoff"
+msgstr ""
+
+#. module: account
+#: view:report.account.receivable:0
+msgid "Accounts by type"
+msgstr ""
+
+#. module: account
+#: view:account.bank.statement:0
+#: field:account.bank.statement,balance_end_cash:0
+msgid "Closing Balance"
+msgstr ""
+
+#. module: account
+#: code:addons/account/report/common_report_header.py:92
+#, python-format
+msgid "Not implemented"
+msgstr ""
+
+#. module: account
+#: field:account.chart.template,visible:0
+msgid "Can be Visible?"
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_account_journal_select
+msgid "Account Journal Select"
+msgstr ""
+
+#. module: account
+#: view:account.tax.template:0
+msgid "Credit Notes"
+msgstr ""
+
+#. module: account
+#: sql_constraint:account.period:0
+msgid "The name of the period must be unique per company!"
+msgstr ""
+
+#. module: account
+#: view:wizard.multi.charts.accounts:0
+msgid "res_config_contents"
+msgstr ""
+
+#. module: account
+#: view:account.unreconcile:0
+msgid "Unreconciliate transactions"
+msgstr ""
+
+#. module: account
+#: help:account.chart.template,visible:0
+msgid ""
+"Set this to False if you don't want this template to be used actively in the "
+"wizard that generate Chart of Accounts from templates, this is useful when "
+"you want to generate accounts of this template only when loading its child "
+"template."
+msgstr ""
+
+#. module: account
+#: view:account.use.model:0
+msgid "Create Entries From Models"
+msgstr ""
+
+#. module: account
+#: field:account.account,reconcile:0
+#: field:account.account.template,reconcile:0
+msgid "Allow Reconciliation"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account.py:1077
+#, python-format
+msgid ""
+"You can not modify company of this period as some journal items exists."
+msgstr ""
+
+#. module: account
+#: view:account.analytic.account:0
+msgid "Analytic Account Statistics"
+msgstr ""
+
+#. module: account
+#: report:account.vat.declaration:0
+msgid "Based On"
+msgstr ""
+
+#. module: account
+#: field:account.tax,price_include:0
+#: field:account.tax.template,price_include:0
+msgid "Tax Included in Price"
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_account_analytic_cost_ledger_journal_report
+msgid "Account Analytic Cost Ledger For Journal Report"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_model_form
+#: model:ir.ui.menu,name:account.menu_action_model_form
+msgid "Recurring Models"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_move_line.py:1251
+#, python-format
+msgid "Encoding error"
+msgstr ""
+
+#. module: account
+#: selection:account.automatic.reconcile,power:0
+msgid "4"
+msgstr ""
+
+#. module: account
+#: view:account.invoice:0
+msgid "Change"
+msgstr ""
+
+#. module: account
+#: selection:account.journal,type:0
+msgid "Bank and Cheques"
+msgstr ""
+
+#. module: account
+#: field:account.journal,type_control_ids:0
+msgid "Type Controls"
+msgstr ""
+
+#. module: account
+#: help:account.journal,default_credit_account_id:0
+msgid "It acts as a default account for credit amount"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_validate_account_move_line
+#: model:ir.ui.menu,name:account.menu_validate_account_moves
+#: view:validate.account.move:0
+#: view:validate.account.move.lines:0
+msgid "Post Journal Entries"
+msgstr ""
+
+#. module: account
+#: selection:account.invoice,state:0
+#: selection:account.invoice.report,state:0
+#: selection:report.invoice.created,state:0
+msgid "Cancelled"
+msgstr ""
+
+#. module: account
+#: help:account.bank.statement,balance_end_cash:0
+msgid "Closing balance based on cashBox"
+msgstr ""
+
+#. module: account
+#: view:account.payment.term.line:0
+msgid "Example"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_invoice.py:828
+#, python-format
+msgid ""
+"Please verify the price of the invoice !\n"
+"The real total does not match the computed total."
+msgstr ""
+
+#. module: account
+#: view:account.tax:0
+#: view:account.tax.template:0
+msgid "Keep empty to use the income account"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account.py:3299
+#, python-format
+msgid "Purchase Tax %.2f%%"
+msgstr ""
+
+#. module: account
+#: view:account.subscription.generate:0
+#: model:ir.actions.act_window,name:account.action_account_subscription_generate
+#: model:ir.ui.menu,name:account.menu_generate_subscription
+msgid "Generate Entries"
+msgstr ""
+
+#. module: account
+#: help:account.vat.declaration,chart_tax_id:0
+msgid "Select Charts of Taxes"
+msgstr ""
+
+#. module: account
+#: view:account.fiscal.position:0
+#: field:account.fiscal.position,account_ids:0
+#: field:account.fiscal.position.template,account_ids:0
+msgid "Account Mapping"
+msgstr ""
+
+#. module: account
+#: selection:account.bank.statement.line,type:0
+#: view:account.invoice:0
+#: view:account.invoice.report:0
+#: code:addons/account/account_invoice.py:337
+#, python-format
+msgid "Customer"
+msgstr ""
+
+#. module: account
+#: view:account.bank.statement:0
+msgid "Confirmed"
+msgstr ""
+
+#. module: account
+#: report:account.invoice:0
+msgid "Cancelled Invoice"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account.py:1567
+#, python-format
+msgid ""
+"Couldn't create move with currency different from the secondary currency of "
+"the account \"%s - %s\". Clear the secondary currency field of the account "
+"definition if you want to accept all currencies."
+msgstr ""
+
+#. module: account
+#: selection:account.bank.statement,state:0
+msgid "New"
+msgstr ""
+
+#. module: account
+#: field:account.invoice.refund,date:0
+msgid "Operation date"
+msgstr ""
+
+#. module: account
+#: view:account.unreconcile.reconcile:0
+msgid "Unreconciliation transactions"
+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 ""
+
+#. module: account
+#: view:validate.account.move:0
+msgid ""
+"All draft account entries in this journal and period will be validated. It "
+"means you won't be able to modify their accounting fields anymore."
+msgstr ""
+
+#. module: account
+#: model:ir.ui.menu,name:account.menu_finance_configuration
+msgid "Configuration"
+msgstr ""
+
+#. module: account
+#: field:account.automatic.reconcile,date1:0
+msgid "Starting Date"
+msgstr ""
+
+#. module: account
+#: field:account.chart.template,property_account_income:0
+msgid "Income Account on Product Template"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account.py:3120
+#, python-format
+msgid "MISC"
+msgstr ""
+
+#. module: account
+#: model:email.template,subject:account.email_template_edi_invoice
+msgid "${object.company_id.name} Invoice (Ref ${object.number or 'n/a' })"
+msgstr ""
+
+#. module: account
+#: help:res.partner,last_reconciliation_date:0
+msgid ""
+"Date on which the partner accounting entries were reconciled last time"
+msgstr ""
+
+#. module: account
+#: field:account.fiscalyear.close,fy2_id:0
+msgid "New Fiscal Year"
+msgstr ""
+
+#. module: account
+#: view:account.invoice:0
+#: view:account.tax.template:0
+#: selection:account.vat.declaration,based_on:0
+#: model:ir.actions.act_window,name:account.act_res_partner_2_account_invoice_opened
+#: model:ir.actions.act_window,name:account.action_invoice_tree
+#: model:ir.actions.report.xml,name:account.account_invoices
+#: view:report.invoice.created:0
+#: field:res.partner,invoice_ids:0
+msgid "Invoices"
+msgstr ""
+
+#. module: account
+#: view:account.invoice:0
+msgid "My invoices"
+msgstr ""
+
+#. module: account
+#: selection:account.bank.accounts.wizard,account_type:0
+msgid "Check"
+msgstr ""
+
+#. module: account
+#: view:account.invoice:0
+#: field:account.invoice,user_id:0
+#: view:account.invoice.report:0
+#: field:account.invoice.report,user_id:0
+msgid "Salesman"
+msgstr ""
+
+#. module: account
+#: view:account.invoice.report:0
+msgid "Invoiced"
+msgstr ""
+
+#. module: account
+#: view:account.move:0
+msgid "Posted Journal Entries"
+msgstr ""
+
+#. module: account
+#: view:account.use.model:0
+msgid "Use Model"
+msgstr ""
+
+#. module: account
+#: help:account.invoice,partner_bank_id:0
+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 ""
+
+#. module: account
+#: view:account.state.open:0
+msgid "No"
+msgstr ""
+
+#. module: account
+#: help:account.invoice.tax,tax_code_id:0
+msgid "The tax basis of the tax declaration."
+msgstr ""
+
+#. module: account
+#: view:account.addtmpl.wizard:0
+msgid "Add"
+msgstr ""
+
+#. module: account
+#: selection:account.invoice,state:0
+#: report:account.overdue:0
+msgid "Paid"
+msgstr ""
+
+#. module: account
+#: view:account.period.close:0
+msgid "Are you sure ?"
+msgstr ""
+
+#. module: account
+#: help:account.move.line,statement_id:0
+msgid "The bank statement used for bank reconciliation"
+msgstr ""
+
+#. module: account
+#: model:process.transition,note:account.process_transition_suppliercustomerinvoice0
+msgid "Draft invoices are validated. "
+msgstr ""
+
+#. module: account
+#: constraint:account.account.template:0
+msgid ""
+"Configuration Error!\n"
+"You can not define children to an account with internal type different of "
+"\"View\"! "
+msgstr ""
+
+#. module: account
+#: code:addons/account/account.py:923
+#, python-format
+msgid "Opening Period"
+msgstr ""
+
+#. module: account
+#: view:account.move:0
+msgid "Journal Entries to Review"
+msgstr ""
+
+#. module: account
+#: view:account.bank.statement:0
+#: view:account.subscription:0
+msgid "Compute"
+msgstr ""
+
+#. module: account
+#: field:account.tax,type_tax_use:0
+msgid "Tax Application"
+msgstr ""
+
+#. module: account
+#: view:account.move:0
+#: view:account.move.line:0
+#: code:addons/account/wizard/account_move_journal.py:153
+#: model:ir.actions.act_window,name:account.act_account_journal_2_account_move_line
+#: model:ir.actions.act_window,name:account.act_account_move_to_account_move_line_open
+#: model:ir.actions.act_window,name:account.act_account_partner_account_move
+#: model:ir.actions.act_window,name:account.action_account_manual_reconcile
+#: model:ir.actions.act_window,name:account.action_account_moves_all_a
+#: model:ir.actions.act_window,name:account.action_account_moves_bank
+#: model:ir.actions.act_window,name:account.action_account_moves_purchase
+#: model:ir.actions.act_window,name:account.action_account_moves_sale
+#: model:ir.actions.act_window,name:account.action_move_line_search
+#: model:ir.actions.act_window,name:account.action_move_line_select
+#: model:ir.actions.act_window,name:account.action_move_line_tree1
+#: model:ir.actions.act_window,name:account.action_tax_code_line_open
+#: model:ir.model,name:account.model_account_move_line
+#: model:ir.ui.menu,name:account.menu_action_account_moves_all
+#: model:ir.ui.menu,name:account.menu_action_account_moves_bank
+#: model:ir.ui.menu,name:account.menu_eaction_account_moves_purchase
+#: model:ir.ui.menu,name:account.menu_eaction_account_moves_sale
+#, python-format
+msgid "Journal Items"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account.py:1088
+#: code:addons/account/account.py:1090
+#: code:addons/account/account.py:1321
+#: code:addons/account/account.py:1563
+#: code:addons/account/account.py:1567
+#: code:addons/account/account.py:3368
+#: code:addons/account/account_move_line.py:807
+#: code:addons/account/account_move_line.py:830
+#: code:addons/account/account_move_line.py:832
+#: code:addons/account/account_move_line.py:835
+#: code:addons/account/account_move_line.py:837
+#: code:addons/account/report/common_report_header.py:92
+#: code:addons/account/wizard/account_change_currency.py:38
+#: code:addons/account/wizard/account_change_currency.py:59
+#: code:addons/account/wizard/account_change_currency.py:64
+#: code:addons/account/wizard/account_change_currency.py:70
+#: code:addons/account/wizard/account_financial_report.py:69
+#: code:addons/account/wizard/account_move_bank_reconcile.py:49
+#: code:addons/account/wizard/account_report_common.py:144
+#: code:addons/account/wizard/account_report_common.py:150
+#, python-format
+msgid "Error"
+msgstr ""
+
+#. module: account
+#: field:account.analytic.balance,date2:0
+#: field:account.analytic.cost.ledger,date2:0
+#: field:account.analytic.cost.ledger.journal.report,date2:0
+#: field:account.analytic.inverted.balance,date2:0
+#: field:account.analytic.journal.report,date2:0
+msgid "End of period"
+msgstr ""
+
+#. module: account
+#: view:res.partner:0
+msgid "Bank Details"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,help:account.action_account_partner_balance
+msgid ""
+"This report is analysis by partner. It is a PDF report containing one line "
+"per partner representing the cumulative credit balance."
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,help:account.action_account_analytic_journal_tree
+msgid ""
+"To print an analytics (or costs) journal for a given period. The report give "
+"code, move name, account number, general amount and analytic amount."
+msgstr ""
+
+#. module: account
+#: sql_constraint:account.invoice:0
+msgid "Invoice Number must be unique per Company!"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_account_receivable_graph
+msgid "Balance by Type of Account"
+msgstr ""
+
+#. module: account
+#: view:account.fiscalyear.close:0
+msgid "Generate Fiscal Year Opening Entries"
+msgstr ""
+
+#. module: account
+#: model:res.groups,name:account.group_account_user
+msgid "Accountant"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,help:account.action_account_treasury_report_all
+msgid ""
+"From this view, have an analysis of your treasury. It sums the balance of "
+"every accounting entries made on liquidity accounts per period."
+msgstr ""
+
+#. module: account
+#: field:account.journal,group_invoice_lines:0
+msgid "Group Invoice Lines"
+msgstr ""
+
+#. module: account
+#: view:account.invoice.cancel:0
+#: view:account.invoice.confirm:0
+msgid "Close"
+msgstr ""
+
+#. module: account
+#: field:account.bank.statement.line,move_ids:0
+msgid "Moves"
+msgstr ""
+
+#. module: account
+#: view:report.hr.timesheet.invoice.journal:0
+msgid "Sale journal in this month"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_account_vat_declaration
+#: model:ir.model,name:account.model_account_vat_declaration
+msgid "Account Vat Declaration"
+msgstr ""
+
+#. module: account
+#: report:account.invoice:0
+msgid "Price"
+msgstr ""
+
+#. module: account
+#: view:account.period:0
+msgid "To Close"
+msgstr ""
+
+#. module: account
+#: field:account.treasury.report,date:0
+msgid "Beginning of Period Date"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account.py:1351
+#, python-format
+msgid ""
+"You can not modify a posted entry of this journal !\n"
+"You should set the journal to allow cancelling entries if you want to do "
+"that."
+msgstr ""
+
+#. module: account
+#: model:ir.ui.menu,name:account.account_template_folder
+msgid "Templates"
+msgstr ""
+
+#. module: account
+#: field:account.invoice.tax,name:0
+msgid "Tax Description"
+msgstr ""
+
+#. module: account
+#: field:account.tax,child_ids:0
+msgid "Child Tax Accounts"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account.py:1090
+#, python-format
+msgid "Start period should be smaller then End period"
+msgstr ""
+
+#. module: account
+#: help:account.tax,price_include:0
+#: help:account.tax.template,price_include:0
+msgid ""
+"Check this if the price you use on the product and invoices includes this "
+"tax."
+msgstr ""
+
+#. module: account
+#: report:account.analytic.account.balance:0
+msgid "Analytic Balance -"
+msgstr ""
+
+#. module: account
+#: report:account.account.balance:0
+#: field:account.aged.trial.balance,target_move:0
+#: field:account.balance.report,target_move:0
+#: report:account.central.journal:0
+#: field:account.central.journal,target_move:0
+#: field:account.chart,target_move:0
+#: field:account.common.account.report,target_move:0
+#: field:account.common.journal.report,target_move:0
+#: field:account.common.partner.report,target_move:0
+#: field:account.common.report,target_move:0
+#: report:account.general.journal:0
+#: field:account.general.journal,target_move:0
+#: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
+#: report:account.journal.period.print:0
+#: report:account.journal.period.print.sale.purchase:0
+#: field:account.move.journal,target_move:0
+#: report:account.partner.balance:0
+#: field:account.partner.balance,target_move:0
+#: field:account.partner.ledger,target_move:0
+#: field:account.print.journal,target_move:0
+#: field:account.report.general.ledger,target_move:0
+#: field:account.tax.chart,target_move:0
+#: report:account.third_party_ledger:0
+#: report:account.third_party_ledger_other:0
+#: field:account.vat.declaration,target_move:0
+#: field:accounting.report,target_move:0
+msgid "Target Moves"
+msgstr ""
+
+#. module: account
+#: model:account.payment.term,name:account.account_payment_term_net
+#: model:account.payment.term,note:account.account_payment_term_net
+msgid "30 Net Days"
+msgstr ""
+
+#. module: account
+#: field:account.subscription,period_type:0
+msgid "Period Type"
+msgstr ""
+
+#. module: account
+#: view:account.invoice:0
+#: field:account.invoice,payment_ids:0
+#: selection:account.vat.declaration,based_on:0
+msgid "Payments"
+msgstr ""
+
+#. module: account
+#: view:account.tax:0
+msgid "Reverse Compute Code"
+msgstr ""
+
+#. module: account
+#: field:account.subscription.line,move_id:0
+msgid "Entry"
+msgstr ""
+
+#. module: account
+#: field:account.tax,python_compute_inv:0
+#: field:account.tax.template,python_compute_inv:0
+msgid "Python Code (reverse)"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_payment_term_form
+#: model:ir.ui.menu,name:account.menu_action_payment_term_form
+msgid "Payment Terms"
+msgstr ""
+
+#. module: account
+#: help:account.chart.template,complete_tax_set:0
+msgid ""
+"This boolean helps you to choose if you want to propose to the user to "
+"encode the sale and purchase rates or choose from list of taxes. This last "
+"choice assumes that the set of tax defined on this template is complete"
+msgstr ""
+
+#. module: account
+#: view:account.financial.report:0
+#: field:account.financial.report,children_ids:0
+#: model:ir.model,name:account.model_account_financial_report
+msgid "Account Report"
+msgstr ""
+
+#. module: account
+#: field:account.journal.column,name:0
+msgid "Column Name"
+msgstr ""
+
+#. module: account
+#: view:account.general.journal:0
+msgid ""
+"This report gives you an overview of the situation of your general journals"
+msgstr ""
+
+#. module: account
+#: field:account.entries.report,year:0
+#: view:account.invoice.report:0
+#: field:account.invoice.report,year:0
+#: view:analytic.entries.report:0
+#: field:analytic.entries.report,year:0
+#: field:report.account.sales,name:0
+#: field:report.account_type.sales,name:0
+msgid "Year"
+msgstr ""
+
+#. module: account
+#: field:account.bank.statement,starting_details_ids:0
+msgid "Opening Cashbox"
+msgstr ""
+
+#. module: account
+#: view:account.payment.term.line:0
+msgid "Line 1:"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account.py:1307
+#, python-format
+msgid "Integrity Error !"
+msgstr ""
+
+#. module: account
+#: field:account.tax.template,description:0
+msgid "Internal Name"
+msgstr ""
+
+#. module: account
+#: selection:account.subscription,period_type:0
+msgid "month"
+msgstr ""
+
+#. module: account
+#: field:account.partner.reconcile.process,next_partner_id:0
+msgid "Next Partner to Reconcile"
+msgstr ""
+
+#. module: account
+#: field:account.invoice.tax,account_id:0
+#: field:account.move.line,tax_code_id:0
+msgid "Tax Account"
+msgstr ""
+
+#. module: account
+#: view:account.automatic.reconcile:0
+msgid "Reconciliation result"
+msgstr ""
+
+#. module: account
+#: model:account.financial.report,name:account.account_financial_report_balancesheet0
+#: model:ir.ui.menu,name:account.menu_account_report_bs
+msgid "Balance Sheet"
+msgstr ""
+
+#. module: account
+#: view:account.general.journal:0
+#: model:ir.ui.menu,name:account.menu_account_general_journal
+msgid "General Journals"
+msgstr ""
+
+#. module: account
+#: field:account.journal,allow_date:0
+msgid "Check Date in Period"
+msgstr ""
+
+#. module: account
+#: model:ir.ui.menu,name:account.final_accounting_reports
+msgid "Accounting Reports"
+msgstr ""
+
+#. module: account
+#: field:account.move,line_id:0
+#: view:analytic.entries.report:0
+#: model:ir.actions.act_window,name:account.act_account_acount_move_line_open
+#: model:ir.actions.act_window,name:account.action_move_line_form
+msgid "Entries"
+msgstr ""
+
+#. module: account
+#: view:account.entries.report:0
+msgid "This Period"
+msgstr ""
+
+#. module: account
+#: field:account.analytic.line,product_uom_id:0
+#: field:account.move.line,product_uom_id:0
+msgid "UoM"
+msgstr ""
+
+#. module: account
+#: code:addons/account/wizard/account_invoice_refund.py:146
+#, python-format
+msgid "No Period found on Invoice!"
+msgstr ""
+
+#. module: account
+#: view:account.tax.template:0
+msgid "Compute Code (if type=code)"
+msgstr ""
+
+#. module: account
+#: selection:account.analytic.journal,type:0
+#: view:account.journal:0
+#: selection:account.journal,type:0
+#: view:account.model:0
+#: selection:account.tax,type_tax_use:0
+#: view:account.tax.template:0
+#: selection:account.tax.template,type_tax_use:0
+msgid "Sale"
+msgstr ""
+
+#. module: account
+#: view:account.financial.report:0
+msgid "Report"
+msgstr ""
+
+#. module: account
+#: view:account.analytic.line:0
+#: field:account.bank.statement.line,amount:0
+#: report:account.invoice:0
+#: field:account.invoice.tax,amount:0
+#: view:account.move:0
+#: field:account.move,amount:0
+#: view:account.move.line:0
+#: field:account.tax,amount:0
+#: field:account.tax.template,amount:0
+#: view:analytic.entries.report:0
+#: field:analytic.entries.report,amount:0
+msgid "Amount"
+msgstr ""
+
+#. module: account
+#: model:process.transition,name:account.process_transition_customerinvoice0
+#: model:process.transition,name:account.process_transition_paymentorderreconcilation0
+#: model:process.transition,name:account.process_transition_statemententries0
+#: model:process.transition,name:account.process_transition_suppliercustomerinvoice0
+#: model:process.transition,name:account.process_transition_suppliervalidentries0
+#: model:process.transition,name:account.process_transition_validentries0
+msgid "Validation"
+msgstr ""
+
+#. module: account
+#: field:account.tax,child_depend:0
+#: field:account.tax.template,child_depend:0
+msgid "Tax on Children"
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_account_fiscal_position_tax_template
+msgid "Template Tax Fiscal Position"
+msgstr ""
+
+#. module: account
+#: field:account.journal,update_posted:0
+msgid "Allow Cancelling Entries"
+msgstr ""
+
+#. module: account
+#: field:account.tax.code,sign:0
+msgid "Coefficent for parent"
+msgstr ""
+
+#. module: account
+#: view:account.analytic.account:0
+msgid "Analytic Accounts with a past deadline."
+msgstr ""
+
+#. module: account
+#: report:account.partner.balance:0
+msgid "(Account/Partner) Name"
+msgstr ""
+
+#. module: account
+#: view:account.bank.statement:0
+msgid "Transaction"
+msgstr ""
+
+#. module: account
+#: help:account.tax,base_code_id:0
+#: help:account.tax,ref_base_code_id:0
+#: help:account.tax,ref_tax_code_id:0
+#: help:account.tax,tax_code_id:0
+#: help:account.tax.template,base_code_id:0
+#: help:account.tax.template,ref_base_code_id:0
+#: help:account.tax.template,ref_tax_code_id:0
+#: help:account.tax.template,tax_code_id:0
+msgid "Use this code for the VAT declaration."
+msgstr ""
+
+#. module: account
+#: field:account.partner.reconcile.process,progress:0
+msgid "Progress"
+msgstr ""
+
+#. module: account
+#: view:report.hr.timesheet.invoice.journal:0
+msgid "Analytic Entries Stats"
+msgstr ""
+
+#. module: account
+#: field:wizard.multi.charts.accounts,bank_accounts_id:0
+msgid "Cash and Banks"
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_account_installer
+msgid "account.installer"
+msgstr ""
+
+#. module: account
+#: field:account.tax.template,include_base_amount:0
+msgid "Include in Base Amount"
+msgstr ""
+
+#. module: account
+#: help:account.payment.term.line,days:0
+msgid ""
+"Number of days to add before computation of the day of month.If Date=15/01, "
+"Number of Days=22, Day of Month=-1, then the due date is 28/02."
+msgstr ""
+
+#. module: account
+#: view:account.payment.term.line:0
+msgid "Amount Computation"
+msgstr ""
+
+#. module: account
+#: view:account.journal:0
+msgid "Entry Controls"
+msgstr ""
+
+#. module: account
+#: view:account.analytic.chart:0
+#: view:project.account.analytic.line:0
+msgid "(Keep empty to open the current situation)"
+msgstr ""
+
+#. module: account
+#: field:account.analytic.balance,date1:0
+#: field:account.analytic.cost.ledger,date1:0
+#: field:account.analytic.cost.ledger.journal.report,date1:0
+#: field:account.analytic.inverted.balance,date1:0
+#: field:account.analytic.journal.report,date1:0
+msgid "Start of period"
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_account_common_account_report
+msgid "Account Common Account Report"
+msgstr ""
+
+#. module: account
+#: field:account.bank.statement.line,name:0
+#: field:account.invoice,reference:0
+msgid "Communication"
+msgstr ""
+
+#. module: account
+#: model:ir.ui.menu,name:account.menu_analytic_accounting
+msgid "Analytic Accounting"
+msgstr ""
+
+#. module: account
+#: field:account.partner.ledger,initial_balance:0
+#: field:account.report.general.ledger,initial_balance:0
+msgid "Include Initial Balances"
+msgstr ""
+
+#. module: account
+#: selection:account.invoice,type:0
+#: selection:account.invoice.report,type:0
+#: selection:report.invoice.created,type:0
+msgid "Customer Refund"
+msgstr ""
+
+#. module: account
+#: constraint:account.move:0
+msgid ""
+"You can not create more than one move per period on centralized journal"
+msgstr ""
+
+#. module: account
+#: field:account.tax,ref_tax_sign:0
+#: field:account.tax,tax_sign:0
+#: field:account.tax.template,ref_tax_sign:0
+#: field:account.tax.template,tax_sign:0
+msgid "Tax Code Sign"
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_report_invoice_created
+msgid "Report of Invoices Created within Last 15 days"
+msgstr ""
+
+#. module: account
+#: view:account.payment.term.line:0
+msgid "  Number of Days: 14"
+msgstr ""
+
+#. module: account
+#: field:account.fiscalyear,end_journal_period_id:0
+msgid "End of Year Entries Journal"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account.py:3446
+#: code:addons/account/account_bank_statement.py:338
+#: code:addons/account/account_invoice.py:427
+#: code:addons/account/account_invoice.py:527
+#: code:addons/account/account_invoice.py:542
+#: code:addons/account/account_invoice.py:550
+#: code:addons/account/account_invoice.py:572
+#: code:addons/account/wizard/account_move_journal.py:63
+#, python-format
+msgid "Configuration Error !"
+msgstr ""
+
+#. module: account
+#: field:account.payment.term.line,value_amount:0
+msgid "Amount To Pay"
+msgstr ""
+
+#. module: account
+#: help:account.partner.reconcile.process,to_reconcile:0
+msgid ""
+"This is the remaining partners for who you should check if there is "
+"something to reconcile or not. This figure already count the current partner "
+"as reconciled."
+msgstr ""
+
+#. module: account
+#: view:account.subscription.line:0
+msgid "Subscription lines"
+msgstr ""
+
+#. module: account
+#: field:account.entries.report,quantity:0
+msgid "Products Quantity"
+msgstr ""
+
+#. module: account
+#: view:account.entries.report:0
+#: selection:account.entries.report,move_state:0
+#: view:account.move:0
+#: selection:account.move,state:0
+#: view:account.move.line:0
+msgid "Unposted"
+msgstr ""
+
+#. module: account
+#: view:account.change.currency:0
+#: model:ir.actions.act_window,name:account.action_account_change_currency
+#: model:ir.model,name:account.model_account_change_currency
+msgid "Change Currency"
+msgstr ""
+
+#. module: account
+#: view:account.invoice:0
+msgid "This action will erase taxes"
+msgstr ""
+
+#. module: account
+#: model:process.node,note:account.process_node_accountingentries0
+#: model:process.node,note:account.process_node_supplieraccountingentries0
+msgid "Accounting entries."
+msgstr ""
+
+#. module: account
+#: view:account.invoice:0
+msgid "Payment Date"
+msgstr ""
+
+#. module: account
+#: view:account.analytic.account:0
+#: model:ir.actions.act_window,name:account.action_account_analytic_account_form
+#: model:ir.ui.menu,name:account.account_analytic_def_account
+msgid "Analytic Accounts"
+msgstr ""
+
+#. module: account
+#: view:account.invoice.report:0
+msgid "Customer Invoices And Refunds"
+msgstr ""
+
+#. module: account
+#: field:account.analytic.line,amount_currency:0
+#: field:account.entries.report,amount_currency:0
+#: field:account.model.line,amount_currency:0
+#: field:account.move.line,amount_currency:0
+msgid "Amount Currency"
+msgstr ""
+
+#. module: account
+#: code:addons/account/wizard/account_validate_account_move.py:39
+#, python-format
+msgid ""
+"Specified Journal does not have any account move entries in draft state for "
+"this period"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_view_move_line
+msgid "Lines to reconcile"
+msgstr ""
+
+#. module: account
+#: report:account.analytic.account.balance:0
+#: report:account.analytic.account.inverted.balance:0
+#: report:account.analytic.account.quantity_cost_ledger:0
+#: report:account.invoice:0
+#: field:account.invoice.line,quantity:0
+#: field:account.model.line,quantity:0
+#: field:account.move.line,quantity:0
+#: view:analytic.entries.report:0
+#: field:analytic.entries.report,unit_amount:0
+#: field:report.account.sales,quantity:0
+#: field:report.account_type.sales,quantity:0
+msgid "Quantity"
+msgstr ""
+
+#. module: account
+#: view:account.move.line:0
+msgid "Number (Move)"
+msgstr ""
+
+#. module: account
+#: view:analytic.entries.report:0
+msgid "Analytic Entries during last 7 days"
+msgstr ""
+
+#. module: account
+#: selection:account.financial.report,style_overwrite:0
+msgid "Normal Text"
+msgstr ""
+
+#. module: account
+#: view:account.invoice.refund:0
+msgid "Refund Invoice Options"
+msgstr ""
+
+#. module: account
+#: help:account.automatic.reconcile,power:0
+msgid ""
+"Number of partial amounts that can be combined to find a balance point can "
+"be chosen as the power of the automatic reconciliation"
+msgstr ""
+
+#. module: account
+#: help:account.payment.term.line,sequence:0
+msgid ""
+"The sequence field is used to order the payment term lines from the lowest "
+"sequences to the higher ones"
+msgstr ""
+
+#. module: account
+#: view:account.fiscal.position.template:0
+#: field:account.fiscal.position.template,name:0
+msgid "Fiscal Position Template"
+msgstr ""
+
+#. module: account
+#: view:account.analytic.chart:0
+#: view:account.chart:0
+#: view:account.tax.chart:0
+msgid "Open Charts"
+msgstr ""
+
+#. module: account
+#: view:account.fiscalyear.close.state:0
+msgid ""
+"If no additional entries should be recorded on a fiscal year, you can close "
+"it from here. It will close all opened periods in this year that will make "
+"impossible any new entry record. Close a fiscal year when you need to "
+"finalize your end of year results definitive "
+msgstr ""
+
+#. module: account
+#: field:account.central.journal,amount_currency:0
+#: field:account.common.journal.report,amount_currency:0
+#: field:account.general.journal,amount_currency:0
+#: field:account.partner.ledger,amount_currency:0
+#: field:account.print.journal,amount_currency:0
+#: field:account.report.general.ledger,amount_currency:0
+msgid "With Currency"
+msgstr ""
+
+#. module: account
+#: view:account.bank.statement:0
+msgid "Open CashBox"
+msgstr ""
+
+#. module: account
+#: selection:account.financial.report,style_overwrite:0
+msgid "Automatic formatting"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account.py:963
+#, python-format
+msgid ""
+"No fiscal year defined for this date !\n"
+"Please create one from the configuration of the accounting menu."
+msgstr ""
+
+#. module: account
+#: view:account.move.line.reconcile:0
+msgid "Reconcile With Write-Off"
+msgstr ""
+
+#. module: account
+#: selection:account.payment.term.line,value:0
+#: selection:account.tax,type:0
+msgid "Fixed Amount"
+msgstr ""
+
+#. module: account
+#: view:account.subscription:0
+msgid "Valid Up to"
+msgstr ""
+
+#. module: account
+#: view:account.journal:0
+msgid "Invoicing Data"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_account_automatic_reconcile
+msgid "Account Automatic Reconcile"
+msgstr ""
+
+#. module: account
+#: view:account.move:0
+#: view:account.move.line:0
+msgid "Journal Item"
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_account_move_journal
+msgid "Move journal"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_account_fiscalyear_close
+#: model:ir.ui.menu,name:account.menu_wizard_fy_close
+msgid "Generate Opening Entries"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_move_line.py:759
+#, python-format
+msgid "Already Reconciled!"
+msgstr ""
+
+#. module: account
+#: help:account.tax,type:0
+msgid "The computation method for the tax amount."
+msgstr ""
+
+#. module: account
+#: view:account.payment.term.line:0
+msgid "Due Date Computation"
+msgstr ""
+
+#. module: account
+#: field:report.invoice.created,create_date:0
+msgid "Create Date"
+msgstr ""
+
+#. module: account
+#: view:account.analytic.journal:0
+#: model:ir.actions.act_window,name:account.action_account_analytic_journal_form
+#: model:ir.ui.menu,name:account.account_def_analytic_journal
+msgid "Analytic Journals"
+msgstr ""
+
+#. module: account
+#: field:account.account,child_id:0
+msgid "Child Accounts"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_move_line.py:1214
+#, python-format
+msgid "Move name (id): %s (%s)"
+msgstr ""
+
+#. module: account
+#: view:account.move.line.reconcile:0
+#: code:addons/account/account_move_line.py:857
+#, python-format
+msgid "Write-Off"
+msgstr ""
+
+#. module: account
+#: field:res.partner,debit:0
+msgid "Total Payable"
+msgstr ""
+
+#. module: account
+#: model:account.account.type,name:account.data_account_type_income
+#: model:account.financial.report,name:account.account_financial_report_income0
+msgid "Income"
+msgstr ""
+
+#. module: account
+#: selection:account.bank.statement.line,type:0
+#: view:account.invoice:0
+#: view:account.invoice.report:0
+#: code:addons/account/account_invoice.py:339
+#, python-format
+msgid "Supplier"
+msgstr ""
+
+#. module: account
+#: selection:account.entries.report,month:0
+#: selection:account.invoice.report,month:0
+#: selection:analytic.entries.report,month:0
+#: selection:report.account.sales,month:0
+#: selection:report.account_type.sales,month:0
+msgid "March"
+msgstr ""
+
+#. module: account
+#: view:account.account.template:0
+msgid "Account Template"
+msgstr ""
+
+#. module: account
+#: report:account.journal.period.print.sale.purchase:0
+msgid "VAT"
+msgstr ""
+
+#. module: account
+#: report:account.analytic.account.journal:0
+msgid "Account n°"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_invoice.py:88
+#, python-format
+msgid "Free Reference"
+msgstr ""
+
+#. module: account
+#: field:account.payment.term.line,value:0
+msgid "Valuation"
+msgstr ""
+
+#. module: account
+#: selection:account.aged.trial.balance,result_selection:0
+#: selection:account.common.partner.report,result_selection:0
+#: selection:account.partner.balance,result_selection:0
+#: selection:account.partner.ledger,result_selection:0
+#: code:addons/account/report/account_partner_balance.py:301
+#, python-format
+msgid "Receivable and Payable Accounts"
+msgstr ""
+
+#. module: account
+#: field:account.fiscal.position.account.template,position_id:0
+msgid "Fiscal Mapping"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_account_state_open
+#: model:ir.model,name:account.model_account_state_open
+msgid "Account State Open"
+msgstr ""
+
+#. module: account
+#: report:account.analytic.account.quantity_cost_ledger:0
+msgid "Max Qty:"
+msgstr ""
+
+#. module: account
+#: view:account.invoice.refund:0
+msgid "Refund Invoice"
+msgstr ""
+
+#. module: account
+#: field:account.invoice,address_invoice_id:0
+msgid "Invoice Address"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,help:account.action_account_entries_report_all
+msgid ""
+"From this view, have an analysis of your different financial accounts. The "
+"document shows your debit and credit taking in consideration some criteria "
+"you can choose by using the search tool."
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,help:account.action_tax_code_list
+msgid ""
+"The tax code definition depends on the tax declaration of your country. "
+"OpenERP allows you to define the tax structure and manage it from this menu. "
+"You can define both numeric and alphanumeric tax codes."
+msgstr ""
+
+#. module: account
+#: help:account.partner.reconcile.process,progress:0
+msgid ""
+"Shows you the progress made today on the reconciliation process. Given by \n"
+"Partners Reconciled Today \\ (Remaining Partners + Partners Reconciled Today)"
+msgstr ""
+
+#. module: account
+#: help:account.payment.term.line,value:0
+msgid ""
+"Select here the kind of valuation related to this payment term line. Note "
+"that you should have your last line with the type 'Balance' to ensure that "
+"the whole amount will be threated."
+msgstr ""
+
+#. module: account
+#: field:account.invoice,period_id:0
+#: field:account.invoice.report,period_id:0
+#: field:report.account.sales,period_id:0
+#: field:report.account_type.sales,period_id:0
+msgid "Force Period"
+msgstr ""
+
+#. module: account
+#: view:account.invoice.report:0
+#: field:account.invoice.report,nbr:0
+msgid "# of Lines"
+msgstr ""
+
+#. module: account
+#: field:account.aged.trial.balance,filter:0
+#: field:account.balance.report,filter:0
+#: field:account.central.journal,filter:0
+#: field:account.common.account.report,filter:0
+#: field:account.common.journal.report,filter:0
+#: field:account.common.partner.report,filter:0
+#: field:account.common.report,filter:0
+#: field:account.general.journal,filter:0
+#: field:account.partner.balance,filter:0
+#: field:account.partner.ledger,filter:0
+#: field:account.print.journal,filter:0
+#: field:account.report.general.ledger,filter:0
+#: field:account.vat.declaration,filter:0
+#: field:accounting.report,filter:0
+#: field:accounting.report,filter_cmp:0
+msgid "Filter by"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account.py:2256
+#, python-format
+msgid "You have a wrong expression \"%(...)s\" in your model !"
+msgstr ""
+
+#. module: account
+#: field:account.bank.statement.line,date:0
+msgid "Entry Date"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_move_line.py:1155
+#: code:addons/account/account_move_line.py:1238
+#, python-format
+msgid "You can not use an inactive account!"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_move_line.py:830
+#, python-format
+msgid "Entries are not of the same account or already reconciled ! "
+msgstr ""
+
+#. module: account
+#: help:account.bank.statement,balance_end:0
+msgid "Balance as calculated based on Starting Balance and transaction lines"
+msgstr ""
+
+#. module: account
+#: code:addons/account/wizard/account_change_currency.py:64
+#: code:addons/account/wizard/account_change_currency.py:70
+#, python-format
+msgid "Current currency is not configured properly !"
+msgstr ""
+
+#. module: account
+#: field:account.tax,account_collected_id:0
+#: field:account.tax.template,account_collected_id:0
+msgid "Invoice Tax Account"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_account_general_journal
+#: model:ir.model,name:account.model_account_general_journal
+msgid "Account General Journal"
+msgstr ""
+
+#. module: account
+#: field:account.payment.term.line,days:0
+msgid "Number of Days"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_bank_statement.py:402
+#: code:addons/account/account_invoice.py:392
+#: code:addons/account/wizard/account_period_close.py:51
+#, python-format
+msgid "Invalid action !"
+msgstr ""
+
+#. module: account
+#: code:addons/account/wizard/account_move_journal.py:102
+#, python-format
+msgid "Period: %s"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_review_financial_journals_installer
+msgid "Review your Financial Journals"
+msgstr ""
+
+#. module: account
+#: help:account.tax,name:0
+msgid "This name will be displayed on reports"
+msgstr ""
+
+#. module: account
+#: report:account.analytic.account.cost_ledger:0
+#: report:account.analytic.account.quantity_cost_ledger:0
+msgid "Printing date"
+msgstr ""
+
+#. module: account
+#: selection:account.account.type,close_method:0
+#: selection:account.tax,type:0
+#: selection:account.tax.template,type:0
+msgid "None"
+msgstr ""
+
+#. module: account
+#: view:analytic.entries.report:0
+msgid "  365 Days  "
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_invoice_tree3
+#: model:ir.ui.menu,name:account.menu_action_invoice_tree3
+msgid "Customer Refunds"
+msgstr ""
+
+#. module: account
+#: field:account.account,foreign_balance:0
+msgid "Foreign Balance"
+msgstr ""
+
+#. module: account
+#: field:account.journal.period,name:0
+msgid "Journal-Period Name"
+msgstr ""
+
+#. module: account
+#: field:account.invoice.tax,factor_base:0
+msgid "Multipication factor for Base code"
+msgstr ""
+
+#. module: account
+#: code:addons/account/wizard/account_report_common.py:150
+#, python-format
+msgid "not implemented"
+msgstr ""
+
+#. module: account
+#: help:account.journal,company_id:0
+msgid "Company related to this journal"
+msgstr ""
+
+#. module: account
+#: code:addons/account/wizard/account_invoice_state.py:44
+#, python-format
+msgid ""
+"Selected Invoice(s) cannot be confirmed as they are not in 'Draft' or 'Pro-"
+"Forma' state!"
+msgstr ""
+
+#. module: account
+#: view:account.subscription:0
+msgid "Running Subscription"
+msgstr ""
+
+#. module: account
+#: report:account.invoice:0
+msgid "Fiscal Position Remark :"
+msgstr ""
+
+#. module: account
+#: view:analytic.entries.report:0
+#: model:ir.actions.act_window,name:account.action_analytic_entries_report
+#: model:ir.ui.menu,name:account.menu_action_analytic_entries_report
+msgid "Analytic Entries Analysis"
+msgstr ""
+
+#. module: account
+#: selection:account.aged.trial.balance,direction_selection:0
+msgid "Past"
+msgstr ""
+
+#. module: account
+#: constraint:account.account:0
+msgid ""
+"Configuration Error! \n"
+"You can not define children to an account with internal type different of "
+"\"View\"! "
+msgstr ""
+
+#. module: account
+#: help:res.partner.bank,journal_id:0
+msgid ""
+"This journal will be created automatically for this bank account when you "
+"save the record"
+msgstr ""
+
+#. module: account
+#: view:account.analytic.line:0
+msgid "Analytic Entry"
+msgstr ""
+
+#. module: account
+#: view:res.company:0
+#: field:res.company,overdue_msg:0
+msgid "Overdue Payments Message"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,help:account.action_account_moves_all_a
+msgid ""
+"This view can be used by accountants in order to quickly record entries in "
+"OpenERP. If you want to record a supplier invoice, start by recording the "
+"line of the expense account. OpenERP will propose to you automatically the "
+"Tax related to this account and the counterpart \"Account Payable\"."
+msgstr ""
+
+#. module: account
+#: field:account.entries.report,date_created:0
+msgid "Date Created"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_account_analytic_account_line_extended_form
+msgid "account.analytic.line.extended"
+msgstr ""
+
+#. module: account
+#: view:account.invoice:0
+msgid "(keep empty to use the current period)"
+msgstr ""
+
+#. module: account
+#: model:process.transition,note:account.process_transition_supplierreconcilepaid0
+msgid ""
+"As soon as the reconciliation is done, the invoice's state turns to “done” "
+"(i.e. paid) in the system."
+msgstr ""
+
+#. module: account
+#: view:account.chart.template:0
+#: field:account.chart.template,account_root_id:0
+msgid "Root Account"
+msgstr ""
+
+#. module: account
+#: field:res.partner,last_reconciliation_date:0
+msgid "Latest Reconciliation Date"
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_account_analytic_line
+msgid "Analytic Line"
+msgstr ""
+
+#. module: account
+#: field:product.template,taxes_id:0
+msgid "Customer Taxes"
+msgstr ""
+
+#. module: account
+#: help:account.model,name:0
+msgid "This is a model for recurring accounting entries"
+msgstr ""
+
+#. module: account
+#: field:wizard.multi.charts.accounts,sale_tax_rate:0
+msgid "Sales Tax(%)"
+msgstr ""
+
+#. module: account
+#: view:account.addtmpl.wizard:0
+msgid "Create an Account based on this template"
+msgstr ""
+
+#. module: account
+#: view:account.account.type:0
+#: view:account.tax.code:0
+msgid "Reporting Configuration"
+msgstr ""
+
+#. module: account
+#: field:account.tax,type:0
+#: field:account.tax.template,type:0
+msgid "Tax Type"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_account_template_form
+#: model:ir.ui.menu,name:account.menu_action_account_template_form
+msgid "Account Templates"
+msgstr ""
+
+#. module: account
+#: help:wizard.multi.charts.accounts,complete_tax_set:0
+msgid ""
+"This boolean helps you to choose if you want to propose to the user to "
+"encode the sales and purchase rates or use the usual m2o fields. This last "
+"choice assumes that the set of tax defined for the chosen template is "
+"complete"
+msgstr ""
+
+#. module: account
+#: report:account.vat.declaration:0
+msgid "Tax Statement"
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_res_company
+msgid "Companies"
+msgstr ""
+
+#. module: account
+#: view:account.invoice.report:0
+msgid "Open and Paid Invoices"
+msgstr ""
+
+#. module: account
+#: selection:account.financial.report,display_detail:0
+msgid "Display children flat"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account.py:629
+#, python-format
+msgid ""
+"You can not remove/desactivate an account which is set on a customer or "
+"supplier."
+msgstr ""
+
+#. module: account
+#: help:account.fiscalyear.close.state,fy_id:0
+msgid "Select a fiscal year to close"
+msgstr ""
+
+#. module: account
+#: help:account.chart.template,tax_template_ids:0
+msgid "List of all the taxes that have to be installed by the wizard"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.report.xml,name:account.account_intracom
+msgid "IntraCom"
+msgstr ""
+
+#. module: account
+#: view:account.move.line.reconcile.writeoff:0
+msgid "Information addendum"
+msgstr ""
+
+#. module: account
+#: field:account.chart,fiscalyear:0
+msgid "Fiscal year"
+msgstr ""
+
+#. module: account
+#: view:account.move.reconcile:0
+msgid "Partial Reconcile Entries"
+msgstr ""
+
+#. module: account
+#: view:account.addtmpl.wizard:0
+#: view:account.aged.trial.balance:0
+#: view:account.analytic.balance:0
+#: view:account.analytic.chart:0
+#: view:account.analytic.cost.ledger:0
+#: view:account.analytic.cost.ledger.journal.report:0
+#: view:account.analytic.inverted.balance:0
+#: view:account.analytic.journal.report:0
+#: view:account.automatic.reconcile:0
+#: view:account.bank.statement:0
+#: view:account.change.currency:0
+#: view:account.chart:0
+#: view:account.common.report:0
+#: view:account.fiscalyear.close:0
+#: view:account.fiscalyear.close.state:0
+#: view:account.invoice:0
+#: view:account.invoice.refund:0
+#: view:account.journal.select:0
+#: view:account.move:0
+#: view:account.move.bank.reconcile:0
+#: view:account.move.line.reconcile:0
+#: view:account.move.line.reconcile.select:0
+#: view:account.move.line.reconcile.writeoff:0
+#: view:account.move.line.unreconcile.select:0
+#: view:account.open.closed.fiscalyear:0
+#: view:account.partner.reconcile.process:0
+#: view:account.period.close:0
+#: view:account.subscription.generate:0
+#: view:account.tax.chart:0
+#: view:account.unreconcile:0
+#: view:account.unreconcile.reconcile:0
+#: view:account.use.model:0
+#: view:account.vat.declaration:0
+#: code:addons/account/wizard/account_move_journal.py:105
+#: view:project.account.analytic.line:0
+#: view:validate.account.move:0
+#: view:validate.account.move.lines:0
+#, python-format
+msgid "Cancel"
+msgstr ""
+
+#. module: account
+#: selection:account.account,type:0
+#: selection:account.account.template,type:0
+#: model:account.account.type,name:account.data_account_type_receivable
+#: selection:account.entries.report,type:0
+msgid "Receivable"
+msgstr ""
+
+#. module: account
+#: constraint:account.move.line:0
+msgid "Company must be the same for its related account and period."
+msgstr ""
+
+#. module: account
+#: view:account.invoice:0
+msgid "Other Info"
+msgstr ""
+
+#. module: account
+#: field:account.journal,default_credit_account_id:0
+msgid "Default Credit Account"
+msgstr ""
+
+#. module: account
+#: help:account.analytic.line,currency_id:0
+msgid "The related account currency if not equal to the company one."
+msgstr ""
+
+#. module: account
+#: view:account.analytic.account:0
+msgid "Current"
+msgstr ""
+
+#. module: account
+#: view:account.bank.statement:0
+msgid "CashBox"
+msgstr ""
+
+#. module: account
+#: model:account.account.type,name:account.account_type_cash_equity
+msgid "Equity"
+msgstr ""
+
+#. module: account
+#: selection:account.tax,type:0
+msgid "Percentage"
+msgstr ""
+
+#. module: account
+#: selection:account.report.general.ledger,sortby:0
+msgid "Journal & Partner"
+msgstr ""
+
+#. module: account
+#: field:account.automatic.reconcile,power:0
+msgid "Power"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account.py:3368
+#, python-format
+msgid "Cannot generate an unused journal code."
+msgstr ""
+
+#. module: account
+#: view:project.account.analytic.line:0
+msgid "View Account Analytic Lines"
+msgstr ""
+
+#. module: account
+#: field:account.invoice,internal_number:0
+#: field:report.invoice.created,number:0
+msgid "Invoice Number"
+msgstr ""
+
+#. module: account
+#: help:account.tax,include_base_amount:0
+msgid ""
+"Indicates if the amount of tax must be included in the base amount for the "
+"computation of the next taxes"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_account_partner_reconcile
+msgid "Reconciliation: Go to Next Partner"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_account_analytic_invert_balance
+#: model:ir.actions.report.xml,name:account.account_analytic_account_inverted_balance
+msgid "Inverted Analytic Balance"
+msgstr ""
+
+#. module: account
+#: field:account.tax.template,applicable_type:0
+msgid "Applicable Type"
+msgstr ""
+
+#. module: account
+#: field:account.invoice.line,invoice_id:0
+msgid "Invoice Reference"
+msgstr ""
+
+#. module: account
+#: help:account.tax.template,sequence:0
+msgid ""
+"The sequence field is used to order the taxes lines from lower sequences to "
+"higher ones. The order is important if you have a tax that has several tax "
+"children. In this case, the evaluation order is important."
+msgstr ""
+
+#. module: account
+#: selection:account.account,type:0
+#: selection:account.account.template,type:0
+#: view:account.journal:0
+msgid "Liquidity"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_account_analytic_journal_open_form
+#: model:ir.ui.menu,name:account.account_analytic_journal_entries
+msgid "Analytic Journal Items"
+msgstr ""
+
+#. module: account
+#: view:account.fiscalyear.close:0
+msgid ""
+"This wizard will generate the end of year journal entries of selected fiscal "
+"year. Note that you can run this wizard many times for the same fiscal year: "
+"it will simply replace the old opening entries with the new ones."
+msgstr ""
+
+#. module: account
+#: model:ir.ui.menu,name:account.menu_finance_bank_and_cash
+msgid "Bank and Cash"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,help:account.action_analytic_entries_report
+msgid ""
+"From this view, have an analysis of your different analytic entries "
+"following the analytic account you defined matching your business need. Use "
+"the tool search to analyse information about analytic entries generated in "
+"the system."
+msgstr ""
+
+#. module: account
+#: sql_constraint:account.journal:0
+msgid "The name of the journal must be unique per company !"
+msgstr ""
+
+#. module: account
+#: field:account.account.template,nocreate:0
+msgid "Optional create"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account.py:664
+#, python-format
+msgid ""
+"You cannot change the owner company of an account that already contains "
+"journal items."
+msgstr ""
+
+#. module: account
+#: code:addons/account/wizard/account_report_aged_partner_balance.py:58
+#, python-format
+msgid "Enter a Start date !"
+msgstr ""
+
+#. module: account
+#: report:account.invoice:0
+#: selection:account.invoice,type:0
+#: selection:account.invoice.report,type:0
+#: selection:report.invoice.created,type:0
+msgid "Supplier Refund"
+msgstr ""
+
+#. module: account
+#: model:ir.ui.menu,name:account.menu_dashboard_acc
+msgid "Dashboard"
+msgstr ""
+
+#. module: account
+#: field:account.bank.statement,move_line_ids:0
+msgid "Entry lines"
+msgstr ""
+
+#. module: account
+#: field:account.move.line,centralisation:0
+msgid "Centralisation"
+msgstr ""
+
+#. module: account
+#: view:account.account:0
+#: view:account.account.template:0
+#: view:account.analytic.account:0
+#: view:account.analytic.journal:0
+#: view:account.analytic.line:0
+#: view:account.bank.statement:0
+#: view:account.chart.template:0
+#: view:account.entries.report:0
+#: view:account.financial.report:0
+#: view:account.fiscalyear:0
+#: view:account.invoice:0
+#: view:account.invoice.report:0
+#: view:account.journal:0
+#: view:account.model:0
+#: view:account.move:0
+#: view:account.move.line:0
+#: view:account.subscription:0
+#: view:account.tax.code.template:0
+#: view:analytic.entries.report:0
+msgid "Group By..."
+msgstr ""
+
+#. module: account
+#: field:account.journal.column,readonly:0
+msgid "Readonly"
+msgstr ""
+
+#. module: account
+#: view:account.payment.term.line:0
+msgid "  Valuation: Balance"
+msgstr ""
+
+#. module: account
+#: field:account.invoice.line,uos_id:0
+msgid "Unit of Measure"
+msgstr ""
+
+#. module: account
+#: constraint:account.payment.term.line:0
+msgid ""
+"Percentages for Payment Term Line must be between 0 and 1, Example: 0.02 for "
+"2% "
+msgstr ""
+
+#. module: account
+#: field:account.installer,has_default_company:0
+msgid "Has Default Company"
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_account_sequence_fiscalyear
+msgid "account.sequence.fiscalyear"
+msgstr ""
+
+#. module: account
+#: report:account.analytic.account.journal:0
+#: view:account.analytic.journal:0
+#: field:account.analytic.line,journal_id:0
+#: field:account.journal,analytic_journal_id:0
+#: model:ir.actions.act_window,name:account.action_account_analytic_journal
+#: model:ir.actions.report.xml,name:account.analytic_journal_print
+#: model:ir.model,name:account.model_account_analytic_journal
+msgid "Analytic Journal"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account.py:622
+#, python-format
+msgid "You can not desactivate an account that contains some journal items."
+msgstr ""
+
+#. module: account
+#: view:account.entries.report:0
+msgid "Reconciled"
+msgstr ""
+
+#. module: account
+#: report:account.invoice:0
+#: field:account.invoice.tax,base:0
+msgid "Base"
+msgstr ""
+
+#. module: account
+#: field:account.model,name:0
+msgid "Model Name"
+msgstr ""
+
+#. module: account
+#: field:account.chart.template,property_account_expense_categ:0
+msgid "Expense Category Account"
+msgstr ""
+
+#. module: account
+#: view:account.bank.statement:0
+msgid "Cash Transactions"
+msgstr ""
+
+#. module: account
+#: code:addons/account/wizard/account_state_open.py:37
+#, python-format
+msgid "Invoice is already reconciled"
+msgstr ""
+
+#. module: account
+#: view:account.account:0
+#: view:account.account.template:0
+#: view:account.bank.statement:0
+#: field:account.bank.statement.line,note:0
+#: view:account.fiscal.position:0
+#: field:account.fiscal.position,note:0
+#: field:account.fiscal.position.template,note:0
+#: view:account.invoice.line:0
+#: field:account.invoice.line,note:0
+msgid "Notes"
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_analytic_entries_report
+msgid "Analytic Entries Statistics"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account.py:624
+#, python-format
+msgid "You can not remove an account containing journal items."
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_analytic_line.py:145
+#: code:addons/account/account_move_line.py:933
+#, python-format
+msgid "Entries: "
+msgstr ""
+
+#. module: account
+#: view:account.use.model:0
+msgid "Create manual recurring entries in a chosen journal."
+msgstr ""
+
+#. module: account
+#: help:res.partner.bank,currency_id:0
+msgid "Currency of the related account journal."
+msgstr ""
+
+#. module: account
+#: code:addons/account/account.py:1563
+#, python-format
+msgid "Couldn't create move between different companies"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,help:account.action_account_type_form
+msgid ""
+"An account type is used to determine how an account is used in each journal. "
+"The deferral method of an account type determines the process for the annual "
+"closing. Reports such as the Balance Sheet and the Profit and Loss report "
+"use the category (profit/loss or balance sheet). For example, the account "
+"type could be linked to an asset account, expense account or payable "
+"account. From this view, you can create and manage the account types you "
+"need for your company."
+msgstr ""
+
+#. module: account
+#: selection:account.account.type,report_type:0
+#: code:addons/account/account.py:183
+#, python-format
+msgid "Balance Sheet (Asset account)"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,help:account.action_account_bank_reconcile_tree
+msgid ""
+"Bank Reconciliation consists of verifying that your bank statement "
+"corresponds with the entries (or records) of that account in your accounting "
+"system."
+msgstr ""
+
+#. module: account
+#: model:process.node,note:account.process_node_draftstatement0
+msgid "State is draft"
+msgstr ""
+
+#. module: account
+#: view:account.move.line:0
+#: code:addons/account/account_move_line.py:1043
+#, python-format
+msgid "Total debit"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_move_line.py:808
+#, python-format
+msgid "Entry \"%s\" is not valid !"
+msgstr ""
+
+#. module: account
+#: report:account.invoice:0
+msgid "Fax :"
+msgstr ""
+
+#. module: account
+#: view:wizard.multi.charts.accounts:0
+msgid ""
+"This will automatically configure your chart of accounts, bank accounts, "
+"taxes and journals according to the selected template"
+msgstr ""
+
+#. module: account
+#: help:res.partner,property_account_receivable:0
+msgid ""
+"This account will be used instead of the default one as the receivable "
+"account for the current partner"
+msgstr ""
+
+#. module: account
+#: field:account.tax,python_applicable:0
+#: field:account.tax,python_compute:0
+#: selection:account.tax,type:0
+#: selection:account.tax.template,applicable_type:0
+#: field:account.tax.template,python_applicable:0
+#: field:account.tax.template,python_compute:0
+#: selection:account.tax.template,type:0
+msgid "Python Code"
+msgstr ""
+
+#. module: account
+#: view:account.entries.report:0
+msgid "Journal Entries with period in current period"
+msgstr ""
+
+#. module: account
+#: help:account.journal,update_posted:0
+msgid ""
+"Check this box if you want to allow the cancellation the entries related to "
+"this journal or of the invoice related to this journal"
+msgstr ""
+
+#. module: account
+#: view:account.fiscalyear.close:0
+msgid "Create"
+msgstr ""
+
+#. module: account
+#: model:process.transition.action,name:account.process_transition_action_createentries0
+msgid "Create entry"
+msgstr ""
+
+#. module: account
+#: selection:account.account.type,report_type:0
+#: code:addons/account/account.py:182
+#, python-format
+msgid "Profit & Loss (Expense account)"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account.py:622
+#: code:addons/account/account.py:624
+#: code:addons/account/account.py:963
+#: code:addons/account/account.py:1052
+#: code:addons/account/account.py:1129
+#: code:addons/account/account.py:1344
+#: code:addons/account/account.py:1351
+#: code:addons/account/account.py:2280
+#: code:addons/account/account.py:2596
+#: code:addons/account/account_analytic_line.py:92
+#: code:addons/account/account_analytic_line.py:101
+#: code:addons/account/account_bank_statement.py:301
+#: code:addons/account/account_bank_statement.py:314
+#: code:addons/account/account_bank_statement.py:352
+#: code:addons/account/account_cash_statement.py:292
+#: code:addons/account/account_cash_statement.py:314
+#: code:addons/account/account_invoice.py:808
+#: code:addons/account/account_invoice.py:839
+#: code:addons/account/account_invoice.py:1030
+#: code:addons/account/account_move_line.py:1200
+#: code:addons/account/account_move_line.py:1216
+#: code:addons/account/account_move_line.py:1218
+#: code:addons/account/wizard/account_invoice_refund.py:108
+#: code:addons/account/wizard/account_invoice_refund.py:110
+#: code:addons/account/wizard/account_open_closed_fiscalyear.py:39
+#: code:addons/account/wizard/account_use_model.py:44
+#, python-format
+msgid "Error !"
+msgstr ""
+
+#. module: account
+#: field:account.financial.report,style_overwrite:0
+msgid "Financial Report Style"
+msgstr ""
+
+#. module: account
+#: selection:account.financial.report,sign:0
+msgid "Preserve balance sign"
+msgstr ""
+
+#. module: account
+#: view:account.vat.declaration:0
+#: model:ir.actions.report.xml,name:account.account_vat_declaration
+#: model:ir.ui.menu,name:account.menu_account_vat_declaration
+msgid "Taxes Report"
+msgstr ""
+
+#. module: account
+#: selection:account.journal.period,state:0
+msgid "Printed"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_move_line.py:584
+#: code:addons/account/account_move_line.py:591
+#, python-format
+msgid "Error :"
+msgstr ""
+
+#. module: account
+#: view:account.analytic.line:0
+msgid "Project line"
+msgstr ""
+
+#. module: account
+#: field:account.invoice.tax,manual:0
+msgid "Manual"
+msgstr ""
+
+#. module: account
+#: view:account.automatic.reconcile:0
+msgid ""
+"For an invoice to be considered as paid, the invoice entries must be "
+"reconciled with counterparts, usually payments. With the automatic "
+"reconciliation functionality, OpenERP makes its own search for entries to "
+"reconcile in a series of accounts. It finds entries for each partner where "
+"the amounts correspond."
+msgstr ""
+
+#. module: account
+#: view:account.move:0
+#: field:account.move,to_check:0
+msgid "To Review"
+msgstr ""
+
+#. module: account
+#: help:account.partner.ledger,initial_balance:0
+#: help:account.report.general.ledger,initial_balance:0
+msgid ""
+"If you selected to filter by date or period, this field allow you to add a "
+"row to display the amount of debit/credit/balance that precedes the filter "
+"you've set."
+msgstr ""
+
+#. module: account
+#: view:account.bank.statement:0
+#: view:account.move:0
+#: model:ir.actions.act_window,name:account.action_move_journal_line
+#: model:ir.ui.menu,name:account.menu_action_move_journal_line_form
+#: model:ir.ui.menu,name:account.menu_finance_entries
+msgid "Journal Entries"
+msgstr ""
+
+#. module: account
+#: help:account.partner.ledger,page_split:0
+msgid "Display Ledger Report with One partner per page"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_move_line.py:1218
+#, python-format
+msgid ""
+"You can not do this modification on a reconciled entry! You can just change "
+"some non legal fields or you must unreconcile first!\n"
+"%s"
+msgstr ""
+
+#. module: account
+#: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
+#: report:account.third_party_ledger:0
+#: report:account.third_party_ledger_other:0
+msgid "JRNL"
+msgstr ""
+
+#. module: account
+#: view:account.partner.balance:0
+#: view:account.partner.ledger:0
+msgid ""
+"This report is an analysis done by a partner. It is a PDF report containing "
+"one line per partner representing the cumulative credit balance"
+msgstr ""
+
+#. module: account
+#: code:addons/account/wizard/account_validate_account_move.py:61
+#, python-format
+msgid ""
+"Selected Entry Lines does not have any account move enties in draft state"
+msgstr ""
+
+#. module: account
+#: selection:account.aged.trial.balance,target_move:0
+#: selection:account.balance.report,target_move:0
+#: selection:account.central.journal,target_move:0
+#: selection:account.chart,target_move:0
+#: selection:account.common.account.report,target_move:0
+#: selection:account.common.journal.report,target_move:0
+#: selection:account.common.partner.report,target_move:0
+#: selection:account.common.report,target_move:0
+#: selection:account.general.journal,target_move:0
+#: selection:account.move.journal,target_move:0
+#: selection:account.partner.balance,target_move:0
+#: selection:account.partner.ledger,target_move:0
+#: selection:account.print.journal,target_move:0
+#: selection:account.report.general.ledger,target_move:0
+#: selection:account.tax.chart,target_move:0
+#: selection:account.vat.declaration,target_move:0
+#: selection:accounting.report,target_move:0
+#: code:addons/account/report/common_report_header.py:67
+#, python-format
+msgid "All Entries"
+msgstr ""
+
+#. module: account
+#: constraint:product.template:0
+msgid ""
+"Error: The default UOM and the purchase UOM must be in the same category."
+msgstr ""
+
+#. module: account
+#: view:account.journal.select:0
+msgid "Journal Select"
+msgstr ""
+
+#. module: account
+#: view:account.bank.statement:0
+#: code:addons/account/account.py:420
+#: code:addons/account/account.py:432
+#, python-format
+msgid "Opening Balance"
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_account_move_reconcile
+msgid "Account Reconciliation"
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_account_fiscal_position_tax
+msgid "Taxes Fiscal Position"
+msgstr ""
+
+#. module: account
+#: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
+#: view:account.report.general.ledger:0
+#: model:ir.actions.act_window,name:account.action_account_general_ledger_menu
+#: model:ir.actions.report.xml,name:account.account_general_ledger
+#: model:ir.actions.report.xml,name:account.account_general_ledger_landscape
+#: model:ir.ui.menu,name:account.menu_general_ledger
+msgid "General Ledger"
+msgstr ""
+
+#. module: account
+#: model:process.transition,note:account.process_transition_paymentorderbank0
+msgid "The payment order is sent to the bank."
+msgstr ""
+
+#. module: account
+#: view:account.balance.report:0
+msgid ""
+"This report allows you to print or generate a pdf of your trial balance "
+"allowing you to quickly check the balance of each of your accounts in a "
+"single report"
+msgstr ""
+
+#. module: account
+#: help:account.move,to_check:0
+msgid ""
+"Check this box if you are unsure of that journal entry and if you want to "
+"note it as 'to be reviewed' by an accounting expert."
+msgstr ""
+
+#. module: account
+#: field:account.chart.template,complete_tax_set:0
+#: field:wizard.multi.charts.accounts,complete_tax_set:0
+msgid "Complete Set of Taxes"
+msgstr ""
+
+#. module: account
+#: view:account.chart.template:0
+msgid "Properties"
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_account_tax_chart
+msgid "Account tax chart"
+msgstr ""
+
+#. module: account
+#: constraint:res.partner.bank:0
+msgid ""
+"\n"
+"Please define BIC/Swift code on bank for bank type IBAN Account to make "
+"valid payments"
+msgstr ""
+
+#. module: account
+#: report:account.analytic.account.cost_ledger:0
+#: report:account.analytic.account.quantity_cost_ledger:0
+#: report:account.central.journal:0
+#: report:account.general.journal:0
+#: report:account.invoice:0
+#: report:account.journal.period.print:0
+#: report:account.journal.period.print.sale.purchase:0
+#: report:account.partner.balance:0
+msgid "Total:"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account.py:2229
+#, python-format
+msgid ""
+"You can specify year, month and date in the name of the model using the "
+"following labels:\n"
+"\n"
+"%(year)s: To Specify Year \n"
+"%(month)s: To Specify Month \n"
+"%(date)s: Current Date\n"
+"\n"
+"e.g. My model on %(date)s"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_aged_income
+msgid "Income Accounts"
+msgstr ""
+
+#. module: account
+#: help:report.invoice.created,origin:0
+msgid "Reference of the document that generated this invoice report."
+msgstr ""
+
+#. module: account
+#: field:account.tax.code,child_ids:0
+#: field:account.tax.code.template,child_ids:0
+msgid "Child Codes"
+msgstr ""
+
+#. module: account
+#: view:account.tax.template:0
+msgid "Taxes used in Sales"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_invoice.py:495
+#: code:addons/account/wizard/account_invoice_refund.py:145
+#, python-format
+msgid "Data Insufficient !"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_invoice_tree1
+#: model:ir.ui.menu,name:account.menu_action_invoice_tree1
+msgid "Customer Invoices"
+msgstr ""
+
+#. module: account
+#: field:account.move.line.reconcile,writeoff:0
+msgid "Write-Off amount"
+msgstr ""
+
+#. module: account
+#: view:account.analytic.line:0
+msgid "Sales"
+msgstr ""
+
+#. module: account
+#: view:account.journal.column:0
+#: model:ir.model,name:account.model_account_journal_column
+msgid "Journal Column"
+msgstr ""
+
+#. module: account
+#: selection:account.invoice.report,state:0
+#: selection:account.journal.period,state:0
+#: selection:account.subscription,state:0
+#: selection:report.invoice.created,state:0
+msgid "Done"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,help:account.action_bank_tree
+msgid ""
+"Configure your company's bank account and select those that must appear on "
+"the report footer. You can reorder banks in the list view. If you use the "
+"accounting application of OpenERP, journals and accounts will be created "
+"automatically based on these data."
+msgstr ""
+
+#. module: account
+#: model:process.transition,note:account.process_transition_invoicemanually0
+msgid "A statement with manual entries becomes a draft statement."
+msgstr ""
+
+#. module: account
+#: view:account.aged.trial.balance:0
+msgid ""
+"Aged Partner Balance is a more detailed report of your receivables by "
+"intervals. When opening that report, OpenERP asks for the name of the "
+"company, the fiscal period and the size of the interval to be analyzed (in "
+"days). OpenERP then calculates a table of credit balance by period. So if "
+"you request an interval of 30 days OpenERP generates an analysis of "
+"creditors for the past month, past two months, and so on. "
+msgstr ""
+
+#. module: account
+#: field:account.invoice,origin:0
+#: field:report.invoice.created,origin:0
+msgid "Source Document"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account.py:1432
+#, python-format
+msgid "You can not delete a posted journal entry \"%s\"!"
+msgstr ""
+
+#. module: account
+#: selection:account.partner.ledger,filter:0
+#: code:addons/account/report/account_partner_ledger.py:59
+#: model:ir.actions.act_window,name:account.act_account_acount_move_line_open_unreconciled
+#, python-format
+msgid "Unreconciled Entries"
+msgstr ""
+
+#. module: account
+#: model:ir.ui.menu,name:account.menu_menu_Bank_process
+msgid "Statements Reconciliation"
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_accounting_report
+msgid "Accounting Report"
+msgstr ""
+
+#. module: account
+#: report:account.invoice:0
+msgid "Taxes:"
+msgstr ""
+
+#. module: account
+#: help:account.tax,amount:0
+msgid "For taxes of type percentage, enter % ratio between 0-1."
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,help:account.action_subscription_form
+msgid ""
+"A recurring entry is a miscellaneous entry that occurs on a recurrent basis "
+"from a specific date, i.e. corresponding to the signature of a contract or "
+"an agreement with a customer or a supplier. With Define Recurring Entries, "
+"you can create such entries to automate the postings in the system."
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_account_report_tree_hierarchy
+msgid "Financial Reports Hierarchy"
+msgstr ""
+
+#. module: account
+#: field:account.entries.report,product_uom_id:0
+#: view:analytic.entries.report:0
+#: field:analytic.entries.report,product_uom_id:0
+msgid "Product UOM"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,help:account.action_view_bank_statement_tree
+msgid ""
+"A Cash Register allows you to manage cash entries in your cash journals. "
+"This feature provides an easy way to follow up cash payments on a daily "
+"basis. You can enter the coins that are in your cash box, and then post "
+"entries when money comes in or goes out of the cash box."
+msgstr ""
+
+#. module: account
+#: help:account.invoice.refund,date:0
+msgid ""
+"This date will be used as the invoice date for Refund Invoice and Period "
+"will be chosen accordingly!"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.act_account_invoice_partner_relation
+msgid "Monthly Turnover"
+msgstr ""
+
+#. module: account
+#: view:account.move:0
+#: view:account.move.line:0
+msgid "Analytic Lines"
+msgstr ""
+
+#. module: account
+#: field:account.analytic.journal,line_ids:0
+#: field:account.tax.code,line_ids:0
+msgid "Lines"
+msgstr ""
+
+#. module: account
+#: view:account.tax.template:0
+msgid "Account Tax Template"
+msgstr ""
+
+#. module: account
+#: view:account.journal.select:0
+msgid "Are you sure you want to open Journal Entries?"
+msgstr ""
+
+#. module: account
+#: view:account.state.open:0
+msgid "Are you sure you want to open this invoice ?"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_invoice.py:528
+#: code:addons/account/account_invoice.py:543
+#, python-format
+msgid ""
+"Can not find a chart of account, you should create one from the "
+"configuration of the accounting menu."
+msgstr ""
+
+#. module: account
+#: field:account.chart.template,property_account_expense_opening:0
+msgid "Opening Entries Expense Account"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_move_line.py:999
+#, python-format
+msgid "Accounting Entries"
+msgstr ""
+
+#. module: account
+#: field:account.account.template,parent_id:0
+msgid "Parent Account Template"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_account_configuration_installer
+msgid "Install your Chart of Accounts"
+msgstr ""
+
+#. module: account
+#: view:account.bank.statement:0
+#: field:account.bank.statement.line,statement_id:0
+#: field:account.move.line,statement_id:0
+#: model:process.process,name:account.process_process_statementprocess0
+msgid "Statement"
+msgstr ""
+
+#. module: account
+#: help:account.journal,default_debit_account_id:0
+msgid "It acts as a default account for debit amount"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,help:account.action_account_journal_period_tree
+msgid ""
+"You can search for individual account entries through useful information. To "
+"search for account entries, open a journal, then select a record line."
+msgstr ""
+
+#. module: account
+#: view:account.entries.report:0
+msgid "Posted entries"
+msgstr ""
+
+#. module: account
+#: help:account.payment.term.line,value_amount:0
+msgid "For percent enter a ratio between 0-1."
+msgstr ""
+
+#. module: account
+#: report:account.invoice:0
+#: view:account.invoice:0
+#: field:account.invoice,date_invoice:0
+#: field:report.invoice.created,date_invoice:0
+msgid "Invoice Date"
+msgstr ""
+
+#. module: account
+#: view:account.invoice.report:0
+msgid "Group by year of Invoice Date"
+msgstr ""
+
+#. module: account
+#: help:res.partner,credit:0
+msgid "Total amount this customer owes you."
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_ir_sequence
+msgid "ir.sequence"
+msgstr ""
+
+#. module: account
+#: field:account.journal.period,icon:0
+msgid "Icon"
+msgstr ""
+
+#. module: account
+#: view:account.automatic.reconcile:0
+#: view:account.use.model:0
+msgid "Ok"
+msgstr ""
+
+#. module: account
+#: field:account.chart.template,tax_code_root_id:0
+msgid "Root Tax Code"
+msgstr ""
+
+#. module: account
+#: help:account.journal,centralisation:0
+msgid ""
+"Check this box to determine that each entry of this journal won't create a "
+"new counterpart but will share the same counterpart. This is used in fiscal "
+"year closing."
+msgstr ""
+
+#. module: account
+#: field:account.bank.statement,closing_date:0
+msgid "Closed On"
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_account_bank_statement_line
+msgid "Bank Statement Line"
+msgstr ""
+
+#. module: account
+#: field:account.automatic.reconcile,date2:0
+msgid "Ending Date"
+msgstr ""
+
+#. module: account
+#: field:wizard.multi.charts.accounts,purchase_tax:0
+msgid "Default Purchase Tax"
+msgstr ""
+
+#. module: account
+#: field:account.chart.template,property_account_income_opening:0
+msgid "Opening Entries Income Account"
+msgstr ""
+
+#. module: account
+#: view:account.bank.statement:0
+msgid "Confirm"
+msgstr ""
+
+#. module: account
+#: help:account.tax,domain:0
+#: help:account.tax.template,domain:0
+msgid ""
+"This field is only used if you develop your own module allowing developers "
+"to create specific taxes in a custom domain."
+msgstr ""
+
+#. module: account
+#: code:addons/account/account.py:1088
+#, python-format
+msgid "You should have chosen periods that belongs to the same company"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_review_payment_terms_installer
+msgid "Review your Payment Terms"
+msgstr ""
+
+#. module: account
+#: field:account.fiscalyear.close,report_name:0
+msgid "Name of new entries"
+msgstr ""
+
+#. module: account
+#: view:account.use.model:0
+msgid "Create Entries"
+msgstr ""
+
+#. module: account
+#: view:res.partner:0
+msgid "Information About the Bank"
+msgstr ""
+
+#. module: account
+#: model:ir.ui.menu,name:account.menu_finance_reporting
+msgid "Reporting"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_move_line.py:759
+#: code:addons/account/account_move_line.py:842
+#: code:addons/account/wizard/account_invoice_state.py:44
+#: code:addons/account/wizard/account_invoice_state.py:68
+#: code:addons/account/wizard/account_state_open.py:37
+#: code:addons/account/wizard/account_validate_account_move.py:39
+#: code:addons/account/wizard/account_validate_account_move.py:61
+#, python-format
+msgid "Warning"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_analytic_open
+msgid "Contracts/Analytic Accounts"
+msgstr ""
+
+#. module: account
+#: field:account.bank.statement,ending_details_ids:0
+msgid "Closing Cashbox"
+msgstr ""
+
+#. module: account
+#: view:account.journal:0
+#: field:res.partner.bank,journal_id:0
+msgid "Account Journal"
+msgstr ""
+
+#. module: account
+#: model:process.node,name:account.process_node_paidinvoice0
+#: model:process.node,name:account.process_node_supplierpaidinvoice0
+msgid "Paid invoice"
+msgstr ""
+
+#. module: account
+#: help:account.partner.reconcile.process,next_partner_id:0
+msgid ""
+"This field shows you the next partner that will be automatically chosen by "
+"the system to go through the reconciliation process, based on the latest day "
+"it have been reconciled."
+msgstr ""
+
+#. module: account
+#: field:account.move.line.reconcile.writeoff,comment:0
+msgid "Comment"
+msgstr ""
+
+#. module: account
+#: field:account.tax,domain:0
+#: field:account.tax.template,domain:0
+msgid "Domain"
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_account_use_model
+msgid "Use model"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account.py:429
+#, python-format
+msgid "Unable to adapt the initial balance (negative value)!"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,help:account.action_account_moves_purchase
+msgid ""
+"This view is used by accountants in order to record entries massively in "
+"OpenERP. If you want to record a supplier invoice, start by recording the "
+"line of the expense account, OpenERP will propose to you automatically the "
+"Tax related to this account and the counter-part \"Account Payable\"."
+msgstr ""
+
+#. module: account
+#: view:account.invoice.line:0
+#: field:account.invoice.tax,invoice_id:0
+#: model:ir.model,name:account.model_account_invoice_line
+msgid "Invoice Line"
+msgstr ""
+
+#. module: account
+#: view:account.invoice.report:0
+msgid "Customer And Supplier Refunds"
+msgstr ""
+
+#. module: account
+#: field:account.financial.report,sign:0
+msgid "Sign on Reports"
+msgstr ""
+
+#. module: account
+#: code:addons/account/wizard/account_fiscalyear_close.py:73
+#, python-format
+msgid "The periods to generate opening entries were not found"
+msgstr ""
+
+#. module: account
+#: model:account.account.type,name:account.data_account_type_view
+msgid "Root/View"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account.py:3121
+#, python-format
+msgid "OPEJ"
+msgstr ""
+
+#. module: account
+#: report:account.invoice:0
+#: view:account.invoice:0
+msgid "PRO-FORMA"
+msgstr ""
+
+#. module: account
+#: selection:account.entries.report,move_line_state:0
+#: view:account.move.line:0
+#: selection:account.move.line,state:0
+msgid "Unbalanced"
+msgstr ""
+
+#. module: account
+#: selection:account.move.line,centralisation:0
+msgid "Normal"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_email_templates
+#: model:ir.ui.menu,name:account.menu_email_templates
+msgid "Email Templates"
+msgstr ""
+
+#. module: account
+#: view:account.move.line:0
+msgid "Optional Information"
+msgstr ""
+
+#. module: account
+#: code:addons/account/wizard/account_fiscalyear_close.py:84
+#, python-format
+msgid "The journal must have default credit and debit account"
+msgstr ""
+
+#. module: account
+#: report:account.general.journal:0
+msgid ":"
+msgstr ""
+
+#. module: account
+#: selection:account.account,currency_mode:0
+msgid "At Date"
+msgstr ""
+
+#. module: account
+#: help:account.move.line,date_maturity:0
+msgid ""
+"This field is used for payable and receivable journal entries. You can put "
+"the limit date for the payment of this line."
+msgstr ""
+
+#. module: account
+#: model:ir.ui.menu,name:account.menu_multi_currency
+msgid "Multi-Currencies"
+msgstr ""
+
+#. module: account
+#: field:account.model.line,date_maturity:0
+msgid "Maturity Date"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_move_line.py:1302
+#, python-format
+msgid "Bad account !"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account.py:3108
+#, python-format
+msgid "Sales Journal"
+msgstr ""
+
+#. module: account
+#: code:addons/account/wizard/account_move_journal.py:104
+#, python-format
+msgid "Open Journal Items !"
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_account_invoice_tax
+msgid "Invoice Tax"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_move_line.py:1277
+#, python-format
+msgid "No piece number !"
+msgstr ""
+
+#. module: account
+#: view:account.financial.report:0
+#: model:ir.ui.menu,name:account.menu_account_report_tree_hierarchy
+msgid "Account Reports Hierarchy"
+msgstr ""
+
+#. module: account
+#: help:account.account.template,chart_template_id:0
+msgid ""
+"This optional field allow you to link an account template to a specific "
+"chart template that may differ from the one its root parent belongs to. This "
+"allow you to define chart templates that extend another and complete it with "
+"few new accounts (You don't need to define the whole structure that is "
+"common to both several times)."
+msgstr ""
+
+#. module: account
+#: view:account.move:0
+msgid "Unposted Journal Entries"
+msgstr ""
+
+#. module: account
+#: view:product.product:0
+#: view:product.template:0
+msgid "Sales Properties"
+msgstr ""
+
+#. module: account
+#: model:ir.ui.menu,name:account.menu_manual_reconcile
+msgid "Manual Reconciliation"
+msgstr ""
+
+#. module: account
+#: report:account.overdue:0
+msgid "Total amount due:"
+msgstr ""
+
+#. module: account
+#: field:account.analytic.chart,to_date:0
+#: field:project.account.analytic.line,to_date:0
+msgid "To"
+msgstr ""
+
+#. module: account
+#: selection:account.move.line,centralisation:0
+#: code:addons/account/account.py:1518
+#, python-format
+msgid "Currency Adjustment"
+msgstr ""
+
+#. module: account
+#: field:account.fiscalyear.close,fy_id:0
+#: field:account.fiscalyear.close.state,fy_id:0
+msgid "Fiscal Year to close"
+msgstr ""
+
+#. module: account
+#: view:account.invoice.cancel:0
+#: model:ir.actions.act_window,name:account.action_account_invoice_cancel
+msgid "Cancel Selected Invoices"
+msgstr ""
+
+#. module: account
+#: help:account.account.type,report_type:0
+msgid ""
+"This field is used to generate legal reports: profit and loss, balance sheet."
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,help:account.action_review_payment_terms_installer
+msgid ""
+"Payment terms define the conditions to pay a customer or supplier invoice in "
+"one or several payments. Customers periodic reminders will use the payment "
+"terms for each letter. Each customer or supplier can be assigned to one of "
+"these payment terms."
+msgstr ""
+
+#. module: account
+#: selection:account.entries.report,month:0
+#: selection:account.invoice.report,month:0
+#: selection:analytic.entries.report,month:0
+#: selection:report.account.sales,month:0
+#: selection:report.account_type.sales,month:0
+msgid "May"
+msgstr ""
+
+#. module: account
+#: view:account.account:0
+#: view:account.account.template:0
+#: selection:account.aged.trial.balance,result_selection:0
+#: selection:account.common.partner.report,result_selection:0
+#: selection:account.partner.balance,result_selection:0
+#: selection:account.partner.ledger,result_selection:0
+#: code:addons/account/report/account_partner_balance.py:299
+#, python-format
+msgid "Payable Accounts"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_invoice.py:732
+#, python-format
+msgid "Global taxes defined, but they are not in invoice lines !"
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_account_chart_template
+msgid "Templates for Account Chart"
+msgstr ""
+
+#. module: account
+#: help:account.model.line,sequence:0
+msgid ""
+"The sequence field is used to order the resources from lower sequences to "
+"higher ones."
+msgstr ""
+
+#. module: account
+#: field:account.tax.code,code:0
+#: field:account.tax.code.template,code:0
+msgid "Case Code"
+msgstr ""
+
+#. module: account
+#: view:validate.account.move:0
+msgid "Post Journal Entries of a Journal"
+msgstr ""
+
+#. module: account
+#: view:product.product:0
+msgid "Sale Taxes"
+msgstr ""
+
+#. module: account
+#: field:account.financial.report,name:0
+msgid "Report Name"
+msgstr ""
+
+#. module: account
+#: model:account.account.type,name:account.data_account_type_cash
+#: selection:account.analytic.journal,type:0
+#: selection:account.bank.accounts.wizard,account_type:0
+#: selection:account.entries.report,type:0
+#: selection:account.journal,type:0
+#: code:addons/account/account.py:3003
+#, python-format
+msgid "Cash"
+msgstr ""
+
+#. module: account
+#: field:account.fiscal.position.account,account_dest_id:0
+#: field:account.fiscal.position.account.template,account_dest_id:0
+msgid "Account Destination"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account.py:1431
+#: code:addons/account/account.py:1460
+#: code:addons/account/account.py:1467
+#: code:addons/account/account_invoice.py:920
+#: code:addons/account/account_move_line.py:1104
+#: code:addons/account/wizard/account_automatic_reconcile.py:152
+#: code:addons/account/wizard/account_fiscalyear_close.py:73
+#: code:addons/account/wizard/account_fiscalyear_close.py:83
+#: code:addons/account/wizard/account_fiscalyear_close.py:86
+#: code:addons/account/wizard/account_move_journal.py:165
+#: code:addons/account/wizard/account_report_aged_partner_balance.py:56
+#: code:addons/account/wizard/account_report_aged_partner_balance.py:58
+#, python-format
+msgid "UserError"
+msgstr ""
+
+#. module: account
+#: model:process.node,note:account.process_node_supplierpaymentorder0
+msgid "Payment of invoices"
+msgstr ""
+
+#. module: account
+#: field:account.bank.statement.line,sequence:0
+#: field:account.financial.report,sequence:0
+#: field:account.invoice.tax,sequence:0
+#: view:account.journal:0
+#: field:account.journal.column,sequence:0
+#: field:account.model.line,sequence:0
+#: field:account.payment.term.line,sequence:0
+#: field:account.sequence.fiscalyear,sequence_id:0
+#: field:account.tax,sequence:0
+#: field:account.tax.code,sequence:0
+#: field:account.tax.template,sequence:0
+msgid "Sequence"
+msgstr ""
+
+#. module: account
+#: constraint:product.category:0
+msgid "Error ! You cannot create recursive categories."
+msgstr ""
+
+#. module: account
+#: help:account.model.line,quantity:0
+msgid "The optional quantity on entries."
+msgstr ""
+
+#. module: account
+#: view:account.financial.report:0
+msgid "Parent Report"
+msgstr ""
+
+#. module: account
+#: view:account.state.open:0
+msgid "Yes"
+msgstr ""
+
+#. module: account
+#: view:report.account_type.sales:0
+msgid "Sales by Account type"
+msgstr ""
+
+#. module: account
+#: help:account.invoice,move_id:0
+msgid "Link to the automatically generated Journal Items."
+msgstr ""
+
+#. module: account
+#: selection:account.installer,period:0
+msgid "Monthly"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,help:account.action_account_journal_view
+msgid ""
+"Here you can customize an existing journal view or create a new view. "
+"Journal views determine the way you can record entries in your journal. "
+"Select the fields you want to appear in a journal and determine the sequence "
+"in which they will appear. Then you can create a new journal and link your "
+"view to it."
+msgstr ""
+
+#. module: account
+#: model:account.account.type,name:account.data_account_type_asset
+msgid "Asset"
+msgstr ""
+
+#. module: account
+#: view:analytic.entries.report:0
+msgid "    7 Days    "
+msgstr ""
+
+#. module: account
+#: field:account.bank.statement,balance_end:0
+msgid "Computed Balance"
+msgstr ""
+
+#. module: account
+#: field:account.account,parent_id:0
+#: field:account.financial.report,parent_id:0
+msgid "Parent"
+msgstr ""
+
+#. module: account
+#: help:account.payment.term.line,days2:0
+msgid ""
+"Day of the month, set -1 for the last day of the current month. If it's "
+"positive, it gives the day of the next month. Set 0 for net days (otherwise "
+"it's based on the beginning of the month)."
+msgstr ""
+
+#. module: account
+#: model:ir.ui.menu,name:account.menu_finance_legal_statement
+msgid "Legal Reports"
+msgstr ""
+
+#. module: account
+#: field:account.tax.code,sum_period:0
+msgid "Period Sum"
+msgstr ""
+
+#. module: account
+#: help:account.tax,sequence:0
+msgid ""
+"The sequence field is used to order the tax lines from the lowest sequences "
+"to the higher ones. The order is important if you have a tax with several "
+"tax children. In this case, the evaluation order is important."
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_account_cashbox_line
+msgid "CashBox Line"
+msgstr ""
+
+#. module: account
+#: view:account.partner.ledger:0
+#: report:account.third_party_ledger:0
+#: report:account.third_party_ledger_other:0
+#: model:ir.actions.report.xml,name:account.account_3rdparty_ledger
+#: model:ir.actions.report.xml,name:account.account_3rdparty_ledger_other
+#: model:ir.ui.menu,name:account.menu_account_partner_ledger
+msgid "Partner Ledger"
+msgstr ""
+
+#. module: account
+#: selection:account.tax.template,type:0
+msgid "Fixed"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account.py:629
+#: code:addons/account/account.py:642
+#: code:addons/account/account.py:645
+#: code:addons/account/account.py:664
+#: code:addons/account/account.py:787
+#: code:addons/account/account.py:1077
+#: code:addons/account/account_invoice.py:732
+#: code:addons/account/account_invoice.py:735
+#: code:addons/account/account_invoice.py:738
+#: code:addons/account/account_move_line.py:97
+#: code:addons/account/account_move_line.py:750
+#: code:addons/account/account_move_line.py:803
+#, python-format
+msgid "Warning !"
+msgstr ""
+
+#. module: account
+#: field:account.entries.report,move_line_state:0
+msgid "State of Move Line"
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_account_move_line_reconcile
+msgid "Account move line reconcile"
+msgstr ""
+
+#. module: account
+#: view:account.subscription.generate:0
+#: model:ir.model,name:account.model_account_subscription_generate
+msgid "Subscription Compute"
+msgstr ""
+
+#. module: account
+#: field:account.bank.statement.line,partner_id:0
+#: view:account.entries.report:0
+#: field:account.entries.report,partner_id:0
+#: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
+#: view:account.invoice:0
+#: field:account.invoice,partner_id:0
+#: field:account.invoice.line,partner_id:0
+#: view:account.invoice.report:0
+#: field:account.invoice.report,partner_id:0
+#: report:account.journal.period.print:0
+#: report:account.journal.period.print.sale.purchase:0
+#: field:account.model.line,partner_id:0
+#: view:account.move:0
+#: field:account.move,partner_id:0
+#: view:account.move.line:0
+#: field:account.move.line,partner_id:0
+#: view:analytic.entries.report:0
+#: field:analytic.entries.report,partner_id:0
+#: model:ir.model,name:account.model_res_partner
+#: field:report.invoice.created,partner_id:0
+msgid "Partner"
+msgstr ""
+
+#. module: account
+#: help:account.change.currency,currency_id:0
+msgid "Select a currency to apply on the invoice"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account.py:3446
+#, python-format
+msgid ""
+"The bank account defined on the selected chart of accounts hasn't a code."
+msgstr ""
+
+#. module: account
+#: code:addons/account/wizard/account_invoice_refund.py:108
+#, python-format
+msgid "Can not %s draft/proforma/cancel invoice."
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_invoice.py:810
+#, python-format
+msgid "No Invoice Lines !"
+msgstr ""
+
+#. module: account
+#: view:account.financial.report:0
+msgid "Report Type"
+msgstr ""
+
+#. module: account
+#: view:account.analytic.account:0
+#: view:account.bank.statement:0
+#: field:account.bank.statement,state:0
+#: field:account.entries.report,move_state:0
+#: view:account.fiscalyear:0
+#: field:account.fiscalyear,state:0
+#: view:account.invoice:0
+#: field:account.invoice,state:0
+#: view:account.invoice.report:0
+#: field:account.journal.period,state:0
+#: field:account.move,state:0
+#: view:account.move.line:0
+#: field:account.move.line,state:0
+#: field:account.period,state:0
+#: view:account.subscription:0
+#: field:account.subscription,state:0
+#: field:report.invoice.created,state:0
+msgid "State"
+msgstr ""
+
+#. module: account
+#: help:account.open.closed.fiscalyear,fyear_id:0
+msgid ""
+"Select Fiscal Year which you want to remove entries for its End of year "
+"entries journal"
+msgstr ""
+
+#. module: account
+#: field:account.tax.template,type_tax_use:0
+msgid "Tax Use In"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_bank_statement.py:315
+#, python-format
+msgid ""
+"The statement balance is incorrect !\n"
+"The expected balance (%.2f) is different than the computed one. (%.2f)"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_bank_statement.py:353
+#, python-format
+msgid "The account entries lines are not in valid state."
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,help:account.action_account_analytic_account_tree2
+msgid ""
+"The normal chart of accounts has a structure defined by the legal "
+"requirement of the country. The analytic chart of accounts structure should "
+"reflect your own business needs in term of costs/revenues reporting. They "
+"are usually structured by contracts, projects, products or departements. "
+"Most of the OpenERP operations (invoices, timesheets, expenses, etc) "
+"generate analytic entries on the related account."
+msgstr ""
+
+#. module: account
+#: field:account.account.type,close_method:0
+msgid "Deferral Method"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_invoice.py:379
+#, python-format
+msgid "Invoice '%s' is paid."
+msgstr ""
+
+#. module: account
+#: model:process.node,note:account.process_node_electronicfile0
+msgid "Automatic entry"
+msgstr ""
+
+#. module: account
+#: constraint:account.tax.code.template:0
+msgid "Error ! You can not create recursive Tax Codes."
+msgstr ""
+
+#. module: account
+#: help:account.journal,group_invoice_lines:0
+msgid ""
+"If this box is checked, the system will try to group the accounting lines "
+"when generating them from invoices."
+msgstr ""
+
+#. module: account
+#: help:account.account,reconcile:0
+msgid ""
+"Check this box if this account allows reconciliation of journal items."
+msgstr ""
+
+#. module: account
+#: help:account.period,state:0
+msgid ""
+"When monthly periods are created. The state is 'Draft'. At the end of "
+"monthly period it is in 'Done' state."
+msgstr ""
+
+#. module: account
+#: report:account.analytic.account.inverted.balance:0
+msgid "Inverted Analytic Balance -"
+msgstr ""
+
+#. module: account
+#: view:account.move.bank.reconcile:0
+msgid "Open for bank reconciliation"
+msgstr ""
+
+#. module: account
+#: view:account.analytic.line:0
+#: model:ir.actions.act_window,name:account.action_account_analytic_line_form
+msgid "Analytic Entries"
+msgstr ""
+
+#. module: account
+#: view:report.account_type.sales:0
+msgid "This Months Sales by type"
+msgstr ""
+
+#. module: account
+#: view:account.analytic.account:0
+msgid "Associated Partner"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_invoice.py:1332
+#, python-format
+msgid "You must first select a partner !"
+msgstr ""
+
+#. module: account
+#: view:account.invoice:0
+#: field:account.invoice,comment:0
+msgid "Additional Information"
+msgstr ""
+
+#. module: account
+#: help:account.invoice,state:0
+msgid ""
+" * The 'Draft' state is used when a user is encoding a new and unconfirmed "
+"Invoice.             \n"
+"* The 'Pro-forma' when invoice is in Pro-forma state,invoice does not have "
+"an invoice number.             \n"
+"* The 'Open' state is used when user create invoice,a invoice number is "
+"generated.Its in open state till user does not pay invoice.             \n"
+"* The 'Paid' state is set automatically when the invoice is paid. Its "
+"related journal entries may or may not be reconciled.             \n"
+"* The 'Cancelled' state is used when user cancel invoice."
+msgstr ""
+
+#. module: account
+#: view:account.invoice.report:0
+#: field:account.invoice.report,residual:0
+msgid "Total Residual"
+msgstr ""
+
+#. module: account
+#: model:process.node,note:account.process_node_invoiceinvoice0
+#: model:process.node,note:account.process_node_supplierinvoiceinvoice0
+msgid "Invoice's state is Open"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,help:account.action_tax_code_tree
+msgid ""
+"The chart of taxes is used to generate your periodical tax statement. You "
+"will see the taxes with codes related to your legal statement according to "
+"your country."
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_invoice.py:428
+#, python-format
+msgid ""
+"Can not find a chart of accounts for this company, you should create one."
+msgstr ""
+
+#. module: account
+#: view:account.invoice:0
+msgid "Proforma"
+msgstr ""
+
+#. module: account
+#: report:account.analytic.account.cost_ledger:0
+msgid "J.C. /Move name"
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_account_open_closed_fiscalyear
+msgid "Choose Fiscal Year"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account.py:3111
+#, python-format
+msgid "Purchase Refund Journal"
+msgstr ""
+
+#. module: account
+#: help:account.tax.template,amount:0
+msgid "For Tax Type percent enter % ratio between 0-1."
+msgstr ""
+
+#. module: account
+#: view:account.analytic.account:0
+msgid "Current Accounts"
+msgstr ""
+
+#. module: account
+#: view:account.invoice.report:0
+msgid "Group by Invoice Date"
+msgstr ""
+
+#. module: account
+#: view:account.invoice.refund:0
+msgid ""
+"Modify Invoice: Cancels the current invoice and creates a new copy of it "
+"ready for editing."
+msgstr ""
+
+#. module: account
+#: field:account.automatic.reconcile,period_id:0
+#: view:account.bank.statement:0
+#: field:account.bank.statement,period_id:0
+#: view:account.entries.report:0
+#: field:account.entries.report,period_id:0
+#: view:account.fiscalyear:0
+#: report:account.general.ledger_landscape:0
+#: view:account.invoice:0
+#: view:account.invoice.report:0
+#: field:account.journal.period,period_id:0
+#: report:account.journal.period.print:0
+#: report:account.journal.period.print.sale.purchase:0
+#: view:account.move:0
+#: field:account.move,period_id:0
+#: view:account.move.line:0
+#: field:account.move.line,period_id:0
+#: view:account.period:0
+#: field:account.subscription,period_nbr:0
+#: field:account.tax.chart,period_id:0
+#: field:account.treasury.report,period_id:0
+#: field:validate.account.move,period_id:0
+msgid "Period"
+msgstr ""
+
+#. module: account
+#: help:account.account,adjusted_balance:0
+msgid ""
+"Total amount (in Company currency) for transactions held in secondary "
+"currency for this account."
+msgstr ""
+
+#. module: account
+#: report:account.invoice:0
+msgid "Net Total:"
+msgstr ""
+
+#. module: account
+#: model:ir.ui.menu,name:account.menu_finance_generic_reporting
+msgid "Generic Reporting"
+msgstr ""
+
+#. module: account
+#: field:account.move.line.reconcile.writeoff,journal_id:0
+msgid "Write-Off Journal"
+msgstr ""
+
+#. module: account
+#: help:res.partner,property_payment_term:0
+msgid ""
+"This payment term will be used instead of the default one for the current "
+"partner"
+msgstr ""
+
+#. module: account
+#: view:account.tax.template:0
+msgid "Compute Code for Taxes included prices"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_invoice.py:1030
+#, python-format
+msgid ""
+"You can not cancel an invoice which is partially paid! You need to "
+"unreconcile related payment entries first!"
+msgstr ""
+
+#. module: account
+#: field:account.chart.template,property_account_income_categ:0
+msgid "Income Category Account"
+msgstr ""
+
+#. module: account
+#: field:account.account,adjusted_balance:0
+msgid "Adjusted Balance"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_account_fiscal_position_template_form
+#: model:ir.ui.menu,name:account.menu_action_account_fiscal_position_form_template
+msgid "Fiscal Position Templates"
+msgstr ""
+
+#. module: account
+#: view:account.entries.report:0
+msgid "Int.Type"
+msgstr ""
+
+#. module: account
+#: field:account.move.line,tax_amount:0
+msgid "Tax/Base Amount"
+msgstr ""
+
+#. module: account
+#: view:account.payment.term.line:0
+msgid "  Valuation: Percent"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,help:account.action_invoice_tree3
+msgid ""
+"With Customer Refunds you can manage the credit notes for your customers. A "
+"refund is a document that credits an invoice completely or partially. You "
+"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
+msgid ""
+"This menu print a VAT declaration based on invoices or payments. You can "
+"select one or several periods of the fiscal year. Information required for a "
+"tax declaration is automatically generated by OpenERP from invoices (or "
+"payments, in some countries). This data is updated in real time. That’s very "
+"useful because it enables you to preview at any time the tax that you owe at "
+"the start and end of the month or quarter."
+msgstr ""
+
+#. module: account
+#: report:account.invoice:0
+msgid "Tel. :"
+msgstr ""
+
+#. module: account
+#: field:account.account,company_currency_id:0
+msgid "Company Currency"
+msgstr ""
+
+#. module: account
+#: field:account.aged.trial.balance,chart_account_id:0
+#: field:account.balance.report,chart_account_id:0
+#: field:account.central.journal,chart_account_id:0
+#: field:account.common.account.report,chart_account_id:0
+#: field:account.common.journal.report,chart_account_id:0
+#: field:account.common.partner.report,chart_account_id:0
+#: field:account.common.report,chart_account_id:0
+#: field:account.general.journal,chart_account_id:0
+#: field:account.partner.balance,chart_account_id:0
+#: field:account.partner.ledger,chart_account_id:0
+#: field:account.print.journal,chart_account_id:0
+#: field:account.report.general.ledger,chart_account_id:0
+#: field:account.vat.declaration,chart_account_id:0
+#: field:accounting.report,chart_account_id:0
+msgid "Chart of Account"
+msgstr ""
+
+#. module: account
+#: model:process.node,name:account.process_node_paymententries0
+#: model:process.transition,name:account.process_transition_reconcilepaid0
+msgid "Payment"
+msgstr ""
+
+#. module: account
+#: field:account.bank.statement,balance_end_real:0
+#: field:account.treasury.report,ending_balance:0
+msgid "Ending Balance"
+msgstr ""
+
+#. module: account
+#: help:account.move.line,blocked:0
+msgid ""
+"You can check this box to mark this journal item as a litigation with the "
+"associated partner"
+msgstr ""
+
+#. module: account
+#: field:account.move.line,reconcile_partial_id:0
+#: view:account.move.line.reconcile:0
+msgid "Partial Reconcile"
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_account_analytic_inverted_balance
+msgid "Account Analytic Inverted Balance"
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_account_common_report
+msgid "Account Common Report"
+msgstr ""
+
+#. module: account
+#: view:account.invoice.report:0
+#: view:analytic.entries.report:0
+msgid "current month"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account.py:1052
+#, python-format
+msgid ""
+"No period defined for this date: %s !\n"
+"Please create one."
+msgstr ""
+
+#. module: account
+#: model:process.transition,name:account.process_transition_filestatement0
+msgid "Automatic import of the bank sta"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_account_journal_view
+#: model:ir.ui.menu,name:account.menu_action_account_journal_view
+msgid "Journal Views"
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_account_move_bank_reconcile
+msgid "Move bank reconcile"
+msgstr ""
+
+#. module: account
+#: field:account.financial.report,account_type_ids:0
+#: model:ir.actions.act_window,name:account.action_account_type_form
+#: model:ir.ui.menu,name:account.menu_action_account_type_form
+msgid "Account Types"
+msgstr ""
+
+#. module: account
+#: view:account.payment.term.line:0
+msgid "  Value amount: n.a"
+msgstr ""
+
+#. module: account
+#: view:account.automatic.reconcile:0
+#: view:account.move:0
+#: view:account.move.line:0
+#: view:account.move.line.reconcile:0
+#: view:account.move.line.reconcile.select:0
+#: code:addons/account/wizard/account_move_line_reconcile_select.py:45
+#: model:ir.ui.menu,name:account.periodical_processing_reconciliation
+#: model:process.node,name:account.process_node_reconciliation0
+#: model:process.node,name:account.process_node_supplierreconciliation0
+#, python-format
+msgid "Reconciliation"
+msgstr ""
+
+#. module: account
+#: view:account.chart.template:0
+#: field:account.chart.template,property_account_receivable:0
+msgid "Receivable Account"
+msgstr ""
+
+#. module: account
+#: view:account.invoice:0
+msgid ""
+"This button only appears when the state of the invoice is 'paid' (showing "
+"that it has been fully reconciled) and auto-computed boolean 'reconciled' is "
+"False (depicting that it's not the case anymore). In other words, the "
+"invoice has been dereconciled and it does not fit anymore the 'paid' state. "
+"You should press this button to re-open it and let it continue its normal "
+"process after having resolved the eventual exceptions it may have created."
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_account_fiscalyear_close_state
+msgid "Fiscalyear Close state"
+msgstr ""
+
+#. module: account
+#: field:account.invoice.refund,journal_id:0
+msgid "Refund Journal"
+msgstr ""
+
+#. module: account
+#: report:account.account.balance:0
+#: report:account.central.journal:0
+#: report:account.general.journal:0
+#: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
+#: report:account.partner.balance:0
+msgid "Filter By"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,help:account.action_invoice_tree1
+msgid ""
+"With Customer Invoices you can create and manage sales invoices issued to "
+"your customers. OpenERP can also generate draft invoices automatically from "
+"sales orders or deliveries. You should only confirm them before sending them "
+"to your customers."
+msgstr ""
+
+#. module: account
+#: code:addons/account/wizard/account_period_close.py:51
+#, python-format
+msgid ""
+"In order to close a period, you must first post related journal entries."
+msgstr ""
+
+#. module: account
+#: view:account.entries.report:0
+#: view:board.board:0
+#: model:ir.actions.act_window,name:account.action_company_analysis_tree
+msgid "Company Analysis"
+msgstr ""
+
+#. module: account
+#: help:account.invoice,account_id:0
+msgid "The partner account used for this invoice."
+msgstr ""
+
+#. module: account
+#: code:addons/account/account.py:3296
+#, python-format
+msgid "Tax %.2f%%"
+msgstr ""
+
+#. module: account
+#: view:account.analytic.account:0
+msgid "Contacts"
+msgstr ""
+
+#. module: account
+#: field:account.tax.code,parent_id:0
+#: view:account.tax.code.template:0
+#: field:account.tax.code.template,parent_id:0
+msgid "Parent Code"
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_account_payment_term_line
+msgid "Payment Term Line"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account.py:3109
+#, python-format
+msgid "Purchase Journal"
+msgstr ""
+
+#. module: account
+#: view:account.invoice.refund:0
+msgid "Refund Invoice: Creates the refund invoice, ready for editing."
+msgstr ""
+
+#. module: account
+#: field:account.invoice.line,price_subtotal:0
+msgid "Subtotal"
+msgstr ""
+
+#. module: account
+#: view:account.vat.declaration:0
+msgid "Print Tax Statement"
+msgstr ""
+
+#. module: account
+#: view:account.model.line:0
+msgid "Journal Entry Model Line"
+msgstr ""
+
+#. module: account
+#: view:account.invoice:0
+#: field:account.invoice,date_due:0
+#: view:account.invoice.report:0
+#: field:account.invoice.report,date_due:0
+#: field:report.invoice.created,date_due:0
+msgid "Due Date"
+msgstr ""
+
+#. module: account
+#: model:ir.ui.menu,name:account.menu_account_supplier
+#: model:ir.ui.menu,name:account.menu_finance_payables
+msgid "Suppliers"
+msgstr ""
+
+#. module: account
+#: view:account.journal:0
+msgid "Accounts Type Allowed (empty for no control)"
+msgstr ""
+
+#. module: account
+#: view:res.partner:0
+msgid "Supplier Accounting Properties"
+msgstr ""
+
+#. module: account
+#: help:account.move.line,amount_residual:0
+msgid ""
+"The residual amount on a receivable or payable of a journal entry expressed "
+"in the company currency."
+msgstr ""
+
+#. module: account
+#: view:account.tax.code:0
+msgid "Statistics"
+msgstr ""
+
+#. module: account
+#: field:account.analytic.chart,from_date:0
+#: field:project.account.analytic.line,from_date:0
+msgid "From"
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_account_fiscalyear_close
+msgid "Fiscalyear Close"
+msgstr ""
+
+#. module: account
+#: sql_constraint:account.account:0
+msgid "The code of the account must be unique per company !"
+msgstr ""
+
+#. module: account
+#: view:account.invoice:0
+#: model:ir.actions.act_window,name:account.act_account_journal_2_account_invoice_opened
+msgid "Unpaid Invoices"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_invoice.py:495
+#, python-format
+msgid "The payment term of supplier does not have a payment term line!"
+msgstr ""
+
+#. module: account
+#: field:account.move.line.reconcile,debit:0
+msgid "Debit amount"
+msgstr ""
+
+#. module: account
+#: view:board.board:0
+#: model:ir.actions.act_window,name:account.action_treasory_graph
+msgid "Treasury"
+msgstr ""
+
+#. module: account
+#: view:account.aged.trial.balance:0
+#: view:account.analytic.balance:0
+#: view:account.analytic.cost.ledger:0
+#: view:account.analytic.cost.ledger.journal.report:0
+#: view:account.analytic.inverted.balance:0
+#: view:account.analytic.journal.report:0
+#: view:account.common.report:0
+msgid "Print"
+msgstr ""
+
+#. module: account
+#: view:account.journal:0
+msgid "Accounts Allowed (empty for no control)"
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_account_fiscal_position_account_template
+msgid "Template Account Fiscal Mapping"
+msgstr ""
+
+#. module: account
+#: view:board.board:0
+msgid "Draft Customer Invoices"
+msgstr ""
+
+#. module: account
+#: model:ir.ui.menu,name:account.menu_configuration_misc
+msgid "Miscellaneous"
+msgstr ""
+
+#. module: account
+#: help:res.partner,debit:0
+msgid "Total amount you have to pay to this supplier."
+msgstr ""
+
+#. module: account
+#: model:process.node,name:account.process_node_analytic0
+#: model:process.node,name:account.process_node_analyticcost0
+msgid "Analytic Costs"
+msgstr ""
+
+#. module: account
+#: field:account.analytic.journal,name:0
+#: report:account.general.journal:0
+#: field:account.journal,name:0
+msgid "Journal Name"
+msgstr ""
+
+#. module: account
+#: view:account.move.line:0
+msgid "Next Partner Entries to reconcile"
+msgstr ""
+
+#. module: account
+#: selection:account.financial.report,style_overwrite:0
+msgid "Smallest Text"
+msgstr ""
+
+#. module: account
+#: model:res.groups,name:account.group_account_invoice
+msgid "Invoicing & Payments"
+msgstr ""
+
+#. module: account
+#: help:account.invoice,internal_number:0
+msgid ""
+"Unique number of the invoice, computed automatically when the invoice is "
+"created."
+msgstr ""
+
+#. module: account
+#: constraint:account.bank.statement.line:0
+msgid ""
+"The amount of the voucher must be the same amount as the one on the "
+"statement line"
+msgstr ""
+
+#. module: account
+#: model:account.account.type,name:account.data_account_type_expense
+#: model:account.financial.report,name:account.account_financial_report_expense0
+msgid "Expense"
+msgstr ""
+
+#. module: account
+#: help:account.chart,fiscalyear:0
+msgid "Keep empty for all open fiscal years"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_move_line.py:1105
+#, python-format
+msgid "The account move (%s) for centralisation has been confirmed!"
+msgstr ""
+
+#. module: account
+#: help:account.move.line,amount_currency:0
+msgid ""
+"The amount expressed in an optional other currency if it is a multi-currency "
+"entry."
+msgstr ""
+
+#. module: account
+#: code:addons/account/account.py:1307
+#, python-format
+msgid ""
+"You can not validate a non-balanced entry !\n"
+"Make sure you have configured payment terms properly !\n"
+"The latest payment term line should be of the type \"Balance\" !"
+msgstr ""
+
+#. module: account
+#: view:account.account:0
+#: report:account.analytic.account.journal:0
+#: field:account.bank.statement,currency:0
+#: report:account.central.journal:0
+#: view:account.entries.report:0
+#: field:account.entries.report,currency_id:0
+#: report:account.general.journal:0
+#: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
+#: field:account.invoice,currency_id:0
+#: field:account.invoice.report,currency_id:0
+#: field:account.journal,currency:0
+#: report:account.journal.period.print:0
+#: report:account.journal.period.print.sale.purchase:0
+#: field:account.model.line,currency_id:0
+#: view:account.move:0
+#: view:account.move.line:0
+#: field:account.move.line,currency_id:0
+#: report:account.third_party_ledger:0
+#: report:account.third_party_ledger_other:0
+#: field:analytic.entries.report,currency_id:0
+#: model:ir.model,name:account.model_res_currency
+#: field:report.account.sales,currency_id:0
+#: field:report.account_type.sales,currency_id:0
+#: field:report.invoice.created,currency_id:0
+#: field:res.partner.bank,currency_id:0
+msgid "Currency"
+msgstr ""
+
+#. module: account
+#: help:account.bank.statement.line,sequence:0
+msgid ""
+"Gives the sequence order when displaying a list of bank statement lines."
+msgstr ""
+
+#. module: account
+#: model:process.transition,note:account.process_transition_validentries0
+msgid "Accountant validates the accounting entries coming from the invoice."
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,help:account.action_account_fiscalyear_form
+msgid ""
+"Define your company's financial year according to your needs. A financial "
+"year is a period at the end of which a company's accounts are made up "
+"(usually 12 months). The financial year is usually referred to by the date "
+"in which it ends. For example, if a company's financial year ends November "
+"30, 2011, then everything between December 1, 2010 and November 30, 2011  "
+"would be referred to as FY 2011. You are not obliged to follow the actual "
+"calendar year."
+msgstr ""
+
+#. module: account
+#: view:account.entries.report:0
+#: model:ir.actions.act_window,name:account.act_account_acount_move_line_reconcile_open
+msgid "Reconciled entries"
+msgstr ""
+
+#. module: account
+#: field:account.invoice,address_contact_id:0
+msgid "Contact Address"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account.py:2256
+#, python-format
+msgid "Wrong model !"
+msgstr ""
+
+#. module: account
+#: field:account.invoice.refund,period:0
+msgid "Force period"
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_account_partner_balance
+msgid "Print Account Partner Balance"
+msgstr ""
+
+#. module: account
+#: help:account.financial.report,sign:0
+msgid ""
+"For accounts that are typically more debited than credited and that you "
+"would like to print as negative amounts in your reports, you should reverse "
+"the sign of the balance; e.g.: Expense account. The same applies for "
+"accounts that are typically more credited than debited and that you would "
+"like to print as positive amounts in your reports; e.g.: Income account."
+msgstr ""
+
+#. module: account
+#: field:res.partner,contract_ids:0
+msgid "Contracts"
+msgstr ""
+
+#. module: account
+#: field:account.cashbox.line,ending_id:0
+#: field:account.cashbox.line,starting_id:0
+#: field:account.entries.report,reconcile_id:0
+#: field:account.financial.report,balance:0
+msgid "unknown"
+msgstr ""
+
+#. module: account
+#: field:account.fiscalyear.close,journal_id:0
+#: code:addons/account/account.py:3113
+#, python-format
+msgid "Opening Entries Journal"
+msgstr ""
+
+#. module: account
+#: model:process.transition,note:account.process_transition_customerinvoice0
+msgid "Draft invoices are checked, validated and printed."
+msgstr ""
+
+#. module: account
+#: help:account.chart.template,property_reserve_and_surplus_account:0
+msgid ""
+"This Account is used for transferring Profit/Loss(If It is Profit: Amount "
+"will be added, Loss: Amount will be deducted.), Which is calculated from "
+"Profilt & Loss Report"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_invoice.py:808
+#, python-format
+msgid "Please define sequence on the journal related to this invoice."
+msgstr ""
+
+#. module: account
+#: view:account.move:0
+#: field:account.move,narration:0
+#: view:account.move.line:0
+#: field:account.move.line,narration:0
+msgid "Internal Note"
+msgstr ""
+
+#. module: account
+#: view:report.account.sales:0
+msgid "This year's Sales by type"
+msgstr ""
+
+#. module: account
+#: view:account.analytic.cost.ledger.journal.report:0
+msgid "Cost Ledger for period"
+msgstr ""
+
+#. module: account
+#: help:account.tax,child_depend:0
+#: help:account.tax.template,child_depend:0
+msgid ""
+"Set if the tax computation is based on the computation of child taxes rather "
+"than on the total amount."
+msgstr ""
+
+#. module: account
+#: selection:account.tax,applicable_type:0
+msgid "Given by Python Code"
+msgstr ""
+
+#. module: account
+#: field:account.analytic.journal,code:0
+msgid "Journal Code"
+msgstr ""
+
+#. module: account
+#: help:account.tax.code,sign:0
+msgid ""
+"You can specify here the coefficient that will be used when consolidating "
+"the amount of this case into its parent. For example, set 1/-1 if you want "
+"to add/substract it."
+msgstr ""
+
+#. module: account
+#: view:account.invoice:0
+#: field:account.move.line,amount_residual:0
+#: field:account.move.line,amount_residual_currency:0
+msgid "Residual Amount"
+msgstr ""
+
+#. module: account
+#: field:account.invoice,move_lines:0
+#: field:account.move.reconcile,line_id:0
+msgid "Entry Lines"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_view_financial_accounts_installer
+msgid "Review your Financial Accounts"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_open_journal_button
+#: model:ir.actions.act_window,name:account.action_validate_account_move
+msgid "Open Journal"
+msgstr ""
+
+#. module: account
+#: report:account.analytic.account.journal:0
+msgid "KI"
+msgstr ""
+
+#. module: account
+#: report:account.analytic.account.cost_ledger:0
+#: report:account.analytic.account.journal:0
+#: report:account.analytic.account.quantity_cost_ledger:0
+msgid "Period from"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account.py:3110
+#, python-format
+msgid "Sales Refund Journal"
+msgstr ""
+
+#. module: account
+#: view:account.move:0
+#: view:account.move.line:0
+#: view:account.payment.term:0
+msgid "Information"
+msgstr ""
+
+#. module: account
+#: model:process.node,note:account.process_node_bankstatement0
+msgid "Registered payment"
+msgstr ""
+
+#. module: account
+#: view:account.fiscalyear.close.state:0
+msgid "Close states of Fiscal year and periods"
+msgstr ""
+
+#. module: account
+#: view:account.analytic.line:0
+msgid "Product Information"
+msgstr ""
+
+#. module: account
+#: report:account.analytic.account.journal:0
+#: view:account.move:0
+#: view:account.move.line:0
+#: model:ir.ui.menu,name:account.next_id_40
+msgid "Analytic"
+msgstr ""
+
+#. module: account
+#: model:process.node,name:account.process_node_invoiceinvoice0
+#: model:process.node,name:account.process_node_supplierinvoiceinvoice0
+msgid "Create Invoice"
+msgstr ""
+
+#. module: account
+#: field:wizard.multi.charts.accounts,purchase_tax_rate:0
+msgid "Purchase Tax(%)"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_invoice.py:810
+#, python-format
+msgid "Please create some invoice lines."
+msgstr ""
+
+#. module: account
+#: report:account.overdue:0
+msgid "Dear Sir/Madam,"
+msgstr ""
+
+#. module: account
+#: field:account.vat.declaration,display_detail:0
+msgid "Display Detail"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account.py:3118
+#, python-format
+msgid "SCNJ"
+msgstr ""
+
+#. module: account
+#: model:process.transition,note:account.process_transition_analyticinvoice0
+msgid ""
+"Analytic costs (timesheets, some purchased products, ...) come from analytic "
+"accounts. These generate draft invoices."
+msgstr ""
+
+#. module: account
+#: help:account.journal,view_id:0
+msgid ""
+"Gives the view used when writing or browsing entries in this journal. The "
+"view tells OpenERP which fields should be visible, required or readonly and "
+"in which order. You can create your own view for a faster encoding in each "
+"journal."
+msgstr ""
+
+#. module: account
+#: field:account.period,date_stop:0
+#: model:ir.ui.menu,name:account.menu_account_end_year_treatments
+msgid "End of Period"
+msgstr ""
+
+#. module: account
+#: field:account.account,financial_report_ids:0
+#: field:account.account.template,financial_report_ids:0
+#: model:ir.actions.act_window,name:account.action_account_financial_report_tree
+#: model:ir.actions.act_window,name:account.action_account_report
+#: model:ir.actions.act_window,name:account.action_account_report_bs
+#: model:ir.actions.act_window,name:account.action_account_report_pl
+#: model:ir.ui.menu,name:account.menu_account_reports
+msgid "Financial Reports"
+msgstr ""
+
+#. module: account
+#: report:account.account.balance:0
+#: field:account.aged.trial.balance,period_from:0
+#: field:account.balance.report,period_from:0
+#: report:account.central.journal:0
+#: field:account.central.journal,period_from:0
+#: field:account.common.account.report,period_from:0
+#: field:account.common.journal.report,period_from:0
+#: field:account.common.partner.report,period_from:0
+#: field:account.common.report,period_from:0
+#: report:account.general.journal:0
+#: field:account.general.journal,period_from:0
+#: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
+#: report:account.partner.balance:0
+#: field:account.partner.balance,period_from:0
+#: field:account.partner.ledger,period_from:0
+#: field:account.print.journal,period_from:0
+#: field:account.report.general.ledger,period_from:0
+#: report:account.third_party_ledger:0
+#: report:account.third_party_ledger_other:0
+#: report:account.vat.declaration:0
+#: field:account.vat.declaration,period_from:0
+#: field:accounting.report,period_from:0
+#: field:accounting.report,period_from_cmp:0
+msgid "Start Period"
+msgstr ""
+
+#. module: account
+#: field:account.aged.trial.balance,direction_selection:0
+msgid "Analysis Direction"
+msgstr ""
+
+#. module: account
+#: field:res.partner,ref_companies:0
+msgid "Companies that refers to partner"
+msgstr ""
+
+#. module: account
+#: view:account.journal:0
+#: field:account.journal.column,view_id:0
+#: view:account.journal.view:0
+#: field:account.journal.view,name:0
+#: model:ir.model,name:account.model_account_journal_view
+msgid "Journal View"
+msgstr ""
+
+#. module: account
+#: view:account.move.line:0
+#: code:addons/account/account_move_line.py:1046
+#, python-format
+msgid "Total credit"
+msgstr ""
+
+#. module: account
+#: model:process.transition,note:account.process_transition_suppliervalidentries0
+msgid "Accountant validates the accounting entries coming from the invoice. "
+msgstr ""
+
+#. module: account
+#: report:account.overdue:0
+msgid "Best regards."
+msgstr ""
+
+#. module: account
+#: view:account.invoice:0
+msgid "Unpaid"
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_account_tax_code_template
+msgid "Tax Code Template"
+msgstr ""
+
+#. module: account
+#: report:account.overdue:0
+msgid "Document: Customer account statement"
+msgstr ""
+
+#. module: account
+#: field:account.account.type,report_type:0
+msgid "P&L / BS Category"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,help:account.action_invoice_tree4
+msgid ""
+"With Supplier Refunds you can manage the credit notes you receive from your "
+"suppliers. A refund is a document that credits an invoice completely or "
+"partially. You can easily generate refunds and reconcile them directly from "
+"the invoice form."
+msgstr ""
+
+#. module: account
+#: view:account.account.template:0
+msgid "Receivale Accounts"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_bank_statement_periodic_tree
+#: model:ir.actions.act_window,name:account.action_bank_statement_tree
+#: model:ir.ui.menu,name:account.menu_bank_statement_tree
+msgid "Bank Statements"
+msgstr ""
+
+#. module: account
+#: field:account.account,balance:0
+#: report:account.account.balance:0
+#: selection:account.account.type,close_method:0
+#: report:account.analytic.account.balance:0
+#: report:account.analytic.account.cost_ledger:0
+#: report:account.analytic.account.inverted.balance:0
+#: report:account.central.journal:0
+#: field:account.entries.report,balance:0
+#: report:account.general.journal:0
+#: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
+#: field:account.invoice,residual:0
+#: field:account.move.line,balance:0
+#: report:account.partner.balance:0
+#: selection:account.payment.term.line,value:0
+#: selection:account.tax,type:0
+#: selection:account.tax.template,type:0
+#: report:account.third_party_ledger:0
+#: report:account.third_party_ledger_other:0
+#: field:account.treasury.report,balance:0
+#: field:report.account.receivable,balance:0
+#: field:report.aged.receivable,balance:0
+msgid "Balance"
+msgstr ""
+
+#. module: account
+#: model:process.node,note:account.process_node_supplierbankstatement0
+msgid "Manually or automatically entered in the system"
+msgstr ""
+
+#. module: account
+#: report:account.account.balance:0
+#: report:account.general.ledger_landscape:0
+msgid "Display Account"
+msgstr ""
+
+#. module: account
+#: view:account.account.type:0
+msgid "Closing Method"
+msgstr ""
+
+#. module: account
+#: selection:account.account,type:0
+#: selection:account.account.template,type:0
+#: model:account.account.type,name:account.data_account_type_payable
+#: selection:account.entries.report,type:0
+msgid "Payable"
+msgstr ""
+
+#. module: account
+#: view:report.account.sales:0
+#: view:report.account_type.sales:0
+#: view:report.hr.timesheet.invoice.journal:0
+msgid "This Year"
+msgstr ""
+
+#. module: account
+#: view:board.board:0
+msgid "Account Board"
+msgstr ""
+
+#. module: account
+#: view:account.model:0
+#: field:account.model,legend:0
+msgid "Legend"
+msgstr ""
+
+#. module: account
+#: view:account.analytic.account:0
+msgid "Contract Data"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,help:account.action_account_moves_sale
+msgid ""
+"This view is used by accountants in order to record entries massively in "
+"OpenERP. If you want to record a customer invoice, select the journal and "
+"the period in the search toolbar. Then, start by recording the entry line of "
+"the income account. OpenERP will propose to you automatically the Tax "
+"related to this account and the counter-part \"Account receivable\"."
+msgstr ""
+
+#. module: account
+#: code:addons/account/wizard/account_automatic_reconcile.py:152
+#, python-format
+msgid "You must select accounts to reconcile"
+msgstr ""
+
+#. module: account
+#: model:process.transition,note:account.process_transition_entriesreconcile0
+msgid "Accounting entries are the first input of the reconciliation."
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,help:account.action_account_period_form
+msgid ""
+"Here you can define a financial period, an interval of time in your "
+"company's financial year. An accounting period typically is a month or a "
+"quarter. It usually corresponds to the periods of the tax declaration. "
+"Create and manage periods from here and decide whether a period should be "
+"closed or left open depending on your company's activities over a specific "
+"period."
+msgstr ""
+
+#. module: account
+#: report:account.third_party_ledger:0
+#: report:account.third_party_ledger_other:0
+msgid "Filters By"
+msgstr ""
+
+#. module: account
+#: model:process.node,note:account.process_node_manually0
+#: model:process.transition,name:account.process_transition_invoicemanually0
+msgid "Manual entry"
+msgstr ""
+
+#. module: account
+#: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
+#: report:account.journal.period.print:0
+#: report:account.journal.period.print.sale.purchase:0
+#: field:account.move.line,move_id:0
+#: field:analytic.entries.report,move_id:0
+msgid "Move"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_move_line.py:1153
+#, python-format
+msgid "You can not change the tax, you should remove and recreate lines !"
+msgstr ""
+
+#. module: account
+#: view:analytic.entries.report:0
+msgid "Analytic Entries of last 365 days"
+msgstr ""
+
+#. module: account
+#: report:account.central.journal:0
+msgid "A/C No."
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.act_account_journal_2_account_bank_statement
+msgid "Bank statements"
+msgstr ""
+
+#. module: account
+#: help:account.addtmpl.wizard,cparent_id:0
+msgid ""
+"Creates an account with the selected template under this existing parent."
+msgstr ""
+
+#. module: account
+#: selection:account.model.line,date_maturity:0
+msgid "Date of the day"
+msgstr ""
+
+#. module: account
+#: code:addons/account/wizard/account_move_bank_reconcile.py:49
+#, python-format
+msgid ""
+"You have to define the bank account\n"
+"in the journal definition for reconciliation."
+msgstr ""
+
+#. module: account
+#: view:account.move.line.reconcile:0
+msgid "Reconciliation transactions"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_account_common_menu
+msgid "Common Report"
+msgstr ""
+
+#. module: account
+#: view:account.account:0
+#: field:account.account,child_consol_ids:0
+msgid "Consolidated Children"
+msgstr ""
+
+#. module: account
+#: code:addons/account/wizard/account_fiscalyear_close.py:87
+#, python-format
+msgid ""
+"The journal must have centralised counterpart without the Skipping draft "
+"state option checked!"
+msgstr ""
+
+#. module: account
+#: view:account.invoice.report:0
+msgid "Customer And Supplier Invoices"
+msgstr ""
+
+#. module: account
+#: model:process.node,note:account.process_node_paymententries0
+#: model:process.transition,name:account.process_transition_paymentorderbank0
+#: model:process.transition,name:account.process_transition_paymentreconcile0
+msgid "Payment entries"
+msgstr ""
+
+#. module: account
+#: selection:account.entries.report,month:0
+#: selection:account.invoice.report,month:0
+#: selection:analytic.entries.report,month:0
+#: selection:report.account.sales,month:0
+#: selection:report.account_type.sales,month:0
+msgid "July"
+msgstr ""
+
+#. module: account
+#: view:account.account:0
+msgid "Chart of accounts"
+msgstr ""
+
+#. module: account
+#: field:account.subscription.line,subscription_id:0
+msgid "Subscription"
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_account_analytic_balance
+msgid "Account Analytic Balance"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account.py:412
+#, python-format
+msgid ""
+"No opening/closing period defined, please create one to set the initial "
+"balance!"
+msgstr ""
+
+#. module: account
+#: report:account.account.balance:0
+#: field:account.aged.trial.balance,period_to:0
+#: field:account.balance.report,period_to:0
+#: report:account.central.journal:0
+#: field:account.central.journal,period_to:0
+#: field:account.common.account.report,period_to:0
+#: field:account.common.journal.report,period_to:0
+#: field:account.common.partner.report,period_to:0
+#: field:account.common.report,period_to:0
+#: report:account.general.journal:0
+#: field:account.general.journal,period_to:0
+#: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
+#: report:account.partner.balance:0
+#: field:account.partner.balance,period_to:0
+#: field:account.partner.ledger,period_to:0
+#: field:account.print.journal,period_to:0
+#: field:account.report.general.ledger,period_to:0
+#: report:account.third_party_ledger:0
+#: report:account.third_party_ledger_other:0
+#: report:account.vat.declaration:0
+#: field:account.vat.declaration,period_to:0
+#: field:accounting.report,period_to:0
+#: field:accounting.report,period_to_cmp:0
+msgid "End Period"
+msgstr ""
+
+#. module: account
+#: field:account.move.line,date_maturity:0
+msgid "Due date"
+msgstr ""
+
+#. module: account
+#: view:account.move.journal:0
+msgid "Standard entries"
+msgstr ""
+
+#. module: account
+#: help:account.journal,type:0
+msgid ""
+"Select 'Sale' for customer invoices journals. Select 'Purchase' for supplier "
+"invoices journals. Select 'Cash' or 'Bank' for journals that are used in "
+"customer or supplier payments. Select 'General' for miscellaneous operations "
+"journals. Select 'Opening/Closing Situation' for entries generated for new "
+"fiscal years."
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_account_subscription
+msgid "Account Subscription"
+msgstr ""
+
+#. module: account
+#: report:account.overdue:0
+msgid "Maturity date"
+msgstr ""
+
+#. module: account
+#: view:account.subscription:0
+msgid "Entry Subscription"
+msgstr ""
+
+#. module: account
+#: report:account.account.balance:0
+#: field:account.aged.trial.balance,date_from:0
+#: field:account.balance.report,date_from:0
+#: report:account.central.journal:0
+#: field:account.central.journal,date_from:0
+#: field:account.common.account.report,date_from:0
+#: field:account.common.journal.report,date_from:0
+#: field:account.common.partner.report,date_from:0
+#: field:account.common.report,date_from:0
+#: field:account.fiscalyear,date_start:0
+#: report:account.general.journal:0
+#: field:account.general.journal,date_from:0
+#: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
+#: field:account.installer,date_start:0
+#: report:account.partner.balance:0
+#: field:account.partner.balance,date_from:0
+#: field:account.partner.ledger,date_from:0
+#: field:account.print.journal,date_from:0
+#: field:account.report.general.ledger,date_from:0
+#: field:account.subscription,date_start:0
+#: report:account.third_party_ledger:0
+#: report:account.third_party_ledger_other:0
+#: field:account.vat.declaration,date_from:0
+#: field:accounting.report,date_from:0
+#: field:accounting.report,date_from_cmp:0
+msgid "Start Date"
+msgstr ""
+
+#. module: account
+#: help:account.invoice,reconciled:0
+msgid ""
+"It indicates that the invoice has been paid and the journal entry of the "
+"invoice has been reconciled with one or several journal entries of payment."
+msgstr ""
+
+#. module: account
+#: view:account.invoice:0
+#: view:account.invoice.report:0
+#: model:process.node,name:account.process_node_supplierdraftinvoices0
+msgid "Draft Invoices"
+msgstr ""
+
+#. module: account
+#: selection:account.account.type,close_method:0
+#: view:account.entries.report:0
+#: view:account.move.line:0
+msgid "Unreconciled"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_invoice.py:828
+#, python-format
+msgid "Bad total !"
+msgstr ""
+
+#. module: account
+#: field:account.journal,sequence_id:0
+msgid "Entry Sequence"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,help:account.action_account_period_tree
+msgid ""
+"A period is a fiscal period of time during which accounting entries should "
+"be recorded for accounting related activities. Monthly period is the norm "
+"but depending on your countries or company needs, you could also have "
+"quarterly periods. Closing a period will make it impossible to record new "
+"accounting entries, all new entries should then be made on the following "
+"open period. Close a period when you do not want to record new entries and "
+"want to lock this period for tax related calculation."
+msgstr ""
+
+#. module: account
+#: view:account.analytic.account:0
+msgid "Pending"
+msgstr ""
+
+#. module: account
+#: model:process.transition,name:account.process_transition_analyticinvoice0
+#: model:process.transition,name:account.process_transition_supplieranalyticcost0
+msgid "From analytic accounts"
+msgstr ""
+
+#. module: account
+#: field:account.period,name:0
+msgid "Period Name"
+msgstr ""
+
+#. module: account
+#: report:account.analytic.account.quantity_cost_ledger:0
+msgid "Code/Date"
+msgstr ""
+
+#. module: account
+#: field:account.account,active:0
+#: field:account.analytic.journal,active:0
+#: field:account.fiscal.position,active:0
+#: field:account.journal.period,active:0
+#: field:account.payment.term,active:0
+#: field:account.tax,active:0
+msgid "Active"
+msgstr ""
+
+#. module: account
+#: view:accounting.report:0
+msgid "Comparison"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_invoice.py:372
+#, python-format
+msgid "Unknown Error"
+msgstr ""
+
+#. module: account
+#: help:res.partner,property_account_payable:0
+msgid ""
+"This account will be used instead of the default one as the payable account "
+"for the current partner"
+msgstr ""
+
+#. module: account
+#: field:account.period,special:0
+msgid "Opening/Closing Period"
+msgstr ""
+
+#. module: account
+#: field:account.account,currency_id:0
+#: field:account.account.template,currency_id:0
+#: field:account.bank.accounts.wizard,currency_id:0
+msgid "Secondary Currency"
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_validate_account_move
+msgid "Validate Account Move"
+msgstr ""
+
+#. module: account
+#: field:account.account,credit:0
+#: report:account.account.balance:0
+#: report:account.analytic.account.balance:0
+#: report:account.analytic.account.cost_ledger:0
+#: report:account.analytic.account.inverted.balance:0
+#: report:account.central.journal:0
+#: field:account.entries.report,credit:0
+#: report:account.general.journal:0
+#: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
+#: report:account.journal.period.print:0
+#: report:account.journal.period.print.sale.purchase:0
+#: field:account.model.line,credit:0
+#: field:account.move.line,credit:0
+#: report:account.partner.balance:0
+#: report:account.third_party_ledger:0
+#: report:account.third_party_ledger_other:0
+#: field:account.treasury.report,credit:0
+#: report:account.vat.declaration:0
+#: field:report.account.receivable,credit:0
+msgid "Credit"
+msgstr ""
+
+#. module: account
+#: help:account.invoice.refund,journal_id:0
+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 ""
+
+#. module: account
+#: selection:account.account.type,report_type:0
+#: code:addons/account/account.py:181
+#, python-format
+msgid "Profit & Loss (Income account)"
+msgstr ""
+
+#. module: account
+#: constraint:account.account:0
+msgid ""
+"Configuration Error! \n"
+"You can not select an account type with a deferral method different of "
+"\"Unreconciled\" for accounts with internal type \"Payable/Receivable\"! "
+msgstr ""
+
+#. module: account
+#: view:account.model:0
+msgid "Journal Entry Model"
+msgstr ""
+
+#. module: account
+#: code:addons/account/wizard/account_use_model.py:44
+#, python-format
+msgid ""
+"Maturity date of entry line generated by model line '%s' is based on partner "
+"payment term!\n"
+"Please define partner on it!"
+msgstr ""
+
+#. module: account
+#: field:account.cashbox.line,number:0
+#: field:account.invoice,number:0
+#: field:account.move,name:0
+msgid "Number"
+msgstr ""
+
+#. module: account
+#: report:account.analytic.account.journal:0
+#: selection:account.analytic.journal,type:0
+#: selection:account.bank.statement.line,type:0
+#: selection:account.journal,type:0
+msgid "General"
+msgstr ""
+
+#. module: account
+#: view:analytic.entries.report:0
+msgid "Analytic Entries of last 30 days"
+msgstr ""
+
+#. module: account
+#: selection:account.aged.trial.balance,filter:0
+#: selection:account.balance.report,filter:0
+#: selection:account.central.journal,filter:0
+#: view:account.chart:0
+#: selection:account.common.account.report,filter:0
+#: selection:account.common.journal.report,filter:0
+#: selection:account.common.partner.report,filter:0
+#: view:account.common.report:0
+#: selection:account.common.report,filter:0
+#: view:account.fiscalyear:0
+#: field:account.fiscalyear,period_ids:0
+#: selection:account.general.journal,filter:0
+#: field:account.installer,period:0
+#: selection:account.partner.balance,filter:0
+#: selection:account.partner.ledger,filter:0
+#: view:account.print.journal:0
+#: selection:account.print.journal,filter:0
+#: selection:account.report.general.ledger,filter:0
+#: report:account.vat.declaration:0
+#: view:account.vat.declaration:0
+#: selection:account.vat.declaration,filter:0
+#: view:accounting.report:0
+#: selection:accounting.report,filter:0
+#: selection:accounting.report,filter_cmp:0
+#: model:ir.actions.act_window,name:account.action_account_period_form
+#: model:ir.ui.menu,name:account.menu_action_account_period_form
+#: model:ir.ui.menu,name:account.next_id_23
+msgid "Periods"
+msgstr ""
+
+#. module: account
+#: field:account.invoice.report,currency_rate:0
+msgid "Currency Rate"
+msgstr ""
+
+#. module: account
+#: view:account.account:0
+#: field:account.account,tax_ids:0
+#: field:account.account.template,tax_ids:0
+msgid "Default Taxes"
+msgstr ""
+
+#. module: account
+#: selection:account.entries.report,month:0
+#: selection:account.invoice.report,month:0
+#: selection:analytic.entries.report,month:0
+#: selection:report.account.sales,month:0
+#: selection:report.account_type.sales,month:0
+msgid "April"
+msgstr ""
+
+#. module: account
+#: model:account.financial.report,name:account.account_financial_report_profitloss_toreport0
+msgid "Profit (Loss) to report"
+msgstr ""
+
+#. module: account
+#: view:account.move.line.reconcile.select:0
+msgid "Open for Reconciliation"
+msgstr ""
+
+#. module: account
+#: field:account.account,parent_left:0
+msgid "Parent Left"
+msgstr ""
+
+#. module: account
+#: help:account.invoice.refund,filter_refund:0
+msgid ""
+"Refund invoice base on this type. You can not Modify and Cancel if the "
+"invoice is already reconciled"
+msgstr ""
+
+#. module: account
+#: selection:account.financial.report,style_overwrite:0
+msgid "Title 2 (bold)"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_invoice_tree2
+#: model:ir.ui.menu,name:account.menu_action_invoice_tree2
+msgid "Supplier Invoices"
+msgstr ""
+
+#. module: account
+#: view:account.analytic.line:0
+#: field:account.analytic.line,product_id:0
+#: view:account.entries.report:0
+#: field:account.entries.report,product_id:0
+#: field:account.invoice.line,product_id:0
+#: view:account.invoice.report:0
+#: field:account.invoice.report,product_id:0
+#: field:account.move.line,product_id:0
+#: view:analytic.entries.report:0
+#: field:analytic.entries.report,product_id:0
+#: field:report.account.sales,product_id:0
+#: field:report.account_type.sales,product_id:0
+msgid "Product"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,help:account.action_validate_account_move
+msgid ""
+"The validation of journal entries process is also called 'ledger posting' "
+"and is the process of transferring debit and credit amounts from a journal "
+"of original entry to a ledger book."
+msgstr ""
+
+#. module: account
+#: help:account.bank.statement,state:0
+msgid ""
+"When new statement is created the state will be 'Draft'.\n"
+"And after getting confirmation from the bank it will be in 'Confirmed' state."
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_account_period
+msgid "Account period"
+msgstr ""
+
+#. module: account
+#: view:account.subscription:0
+msgid "Remove Lines"
+msgstr ""
+
+#. module: account
+#: view:account.report.general.ledger:0
+msgid ""
+"This report allows you to print or generate a pdf of your general ledger "
+"with details of all your account journals"
+msgstr ""
+
+#. module: account
+#: selection:account.account,type:0
+#: selection:account.account.template,type:0
+#: selection:account.entries.report,type:0
+msgid "Regular"
+msgstr ""
+
+#. module: account
+#: view:account.account:0
+#: field:account.account,type:0
+#: view:account.account.template:0
+#: field:account.account.template,type:0
+#: field:account.entries.report,type:0
+msgid "Internal Type"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_subscription_form_running
+msgid "Running Subscriptions"
+msgstr ""
+
+#. module: account
+#: view:report.account.sales:0
+#: view:report.account_type.sales:0
+#: view:report.hr.timesheet.invoice.journal:0
+msgid "This Month"
+msgstr ""
+
+#. module: account
+#: view:account.analytic.balance:0
+#: view:account.analytic.cost.ledger:0
+#: view:account.analytic.inverted.balance:0
+#: view:account.analytic.journal.report:0
+#: model:ir.actions.act_window,name:account.action_account_partner_ledger
+msgid "Select Period"
+msgstr ""
+
+#. module: account
+#: view:account.entries.report:0
+#: selection:account.entries.report,move_state:0
+#: view:account.move:0
+#: selection:account.move,state:0
+#: view:account.move.line:0
+msgid "Posted"
+msgstr ""
+
+#. module: account
+#: report:account.account.balance:0
+#: field:account.aged.trial.balance,date_to:0
+#: field:account.balance.report,date_to:0
+#: report:account.central.journal:0
+#: field:account.central.journal,date_to:0
+#: field:account.common.account.report,date_to:0
+#: field:account.common.journal.report,date_to:0
+#: field:account.common.partner.report,date_to:0
+#: field:account.common.report,date_to:0
+#: field:account.fiscalyear,date_stop:0
+#: report:account.general.journal:0
+#: field:account.general.journal,date_to:0
+#: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
+#: field:account.installer,date_stop:0
+#: report:account.partner.balance:0
+#: field:account.partner.balance,date_to:0
+#: field:account.partner.ledger,date_to:0
+#: field:account.print.journal,date_to:0
+#: field:account.report.general.ledger,date_to:0
+#: report:account.third_party_ledger:0
+#: report:account.third_party_ledger_other:0
+#: field:account.vat.declaration,date_to:0
+#: field:accounting.report,date_to:0
+#: field:accounting.report,date_to_cmp:0
+msgid "End Date"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_account_open_closed_fiscalyear
+#: model:ir.ui.menu,name:account.menu_wizard_account_open_closed_fiscalyear
+msgid "Cancel Opening Entries"
+msgstr ""
+
+#. module: account
+#: field:account.payment.term.line,days2:0
+msgid "Day of the Month"
+msgstr ""
+
+#. module: account
+#: field:account.fiscal.position.tax,tax_src_id:0
+#: field:account.fiscal.position.tax.template,tax_src_id:0
+msgid "Tax Source"
+msgstr ""
+
+#. module: account
+#: view:ir.sequence:0
+msgid "Fiscal Year Sequences"
+msgstr ""
+
+#. module: account
+#: selection:account.financial.report,display_detail:0
+msgid "No detail"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_analytic_line.py:102
+#, python-format
+msgid "There is no income account defined for this product: \"%s\" (id:%d)"
+msgstr ""
+
+#. module: account
+#: constraint:account.move.line:0
+msgid "You can not create journal items on closed account."
+msgstr ""
+
+#. module: account
+#: field:account.account,unrealized_gain_loss:0
+#: model:ir.actions.act_window,name:account.action_account_gain_loss
+#: model:ir.ui.menu,name:account.menu_unrealized_gains_losses
+msgid "Unrealized Gain or Loss"
+msgstr ""
+
+#. module: account
+#: view:account.fiscalyear:0
+#: view:account.move:0
+#: view:account.move.line:0
+#: view:account.period:0
+msgid "States"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.server,name:account.ir_actions_server_edi_invoice
+msgid "Auto-email confirmed invoices"
+msgstr ""
+
+#. module: account
+#: field:account.invoice,check_total:0
+msgid "Verification Total"
+msgstr ""
+
+#. module: account
+#: report:account.analytic.account.balance:0
+#: report:account.analytic.account.inverted.balance:0
+#: report:account.analytic.account.quantity_cost_ledger:0
+#: view:account.analytic.line:0
+#: view:account.bank.statement:0
+#: field:account.invoice,amount_total:0
+#: field:report.account.sales,amount_total:0
+#: field:report.account_type.sales,amount_total:0
+#: field:report.invoice.created,amount_total:0
+msgid "Total"
+msgstr ""
+
+#. module: account
+#: code:addons/account/wizard/account_move_journal.py:97
+#, python-format
+msgid "Journal: All"
+msgstr ""
+
+#. module: account
+#: field:account.account,company_id:0
+#: field:account.aged.trial.balance,company_id:0
+#: field:account.analytic.journal,company_id:0
+#: field:account.balance.report,company_id:0
+#: field:account.bank.statement,company_id:0
+#: field:account.bank.statement.line,company_id:0
+#: field:account.central.journal,company_id:0
+#: field:account.common.account.report,company_id:0
+#: field:account.common.journal.report,company_id:0
+#: field:account.common.partner.report,company_id:0
+#: field:account.common.report,company_id:0
+#: view:account.entries.report:0
+#: field:account.entries.report,company_id:0
+#: field:account.fiscal.position,company_id:0
+#: field:account.fiscalyear,company_id:0
+#: field:account.general.journal,company_id:0
+#: field:account.installer,company_id:0
+#: field:account.invoice,company_id:0
+#: field:account.invoice.line,company_id:0
+#: view:account.invoice.report:0
+#: field:account.invoice.report,company_id:0
+#: field:account.invoice.tax,company_id:0
+#: view:account.journal:0
+#: field:account.journal,company_id:0
+#: field:account.journal.period,company_id:0
+#: field:account.model,company_id:0
+#: field:account.move,company_id:0
+#: field:account.move.line,company_id:0
+#: field:account.partner.balance,company_id:0
+#: field:account.partner.ledger,company_id:0
+#: field:account.period,company_id:0
+#: field:account.print.journal,company_id:0
+#: field:account.report.general.ledger,company_id:0
+#: field:account.tax,company_id:0
+#: field:account.tax.code,company_id:0
+#: field:account.treasury.report,company_id:0
+#: field:account.vat.declaration,company_id:0
+#: field:accounting.report,company_id:0
+#: view:analytic.entries.report:0
+#: field:analytic.entries.report,company_id:0
+#: field:wizard.multi.charts.accounts,company_id:0
+msgid "Company"
+msgstr ""
+
+#. module: account
+#: model:ir.ui.menu,name:account.menu_action_subscription_form
+msgid "Define Recurring Entries"
+msgstr ""
+
+#. module: account
+#: field:account.entries.report,date_maturity:0
+msgid "Date Maturity"
+msgstr ""
+
+#. module: account
+#: help:account.bank.statement,total_entry_encoding:0
+msgid "Total cash transactions"
+msgstr ""
+
+#. module: account
+#: help:account.partner.reconcile.process,today_reconciled:0
+msgid ""
+"This figure depicts the total number of partners that have gone throught the "
+"reconciliation process today. The current partner is counted as already "
+"processed."
+msgstr ""
+
+#. module: account
+#: view:account.fiscalyear:0
+msgid "Create Monthly Periods"
+msgstr ""
+
+#. module: account
+#: field:account.tax.code.template,sign:0
+msgid "Sign For Parent"
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_account_balance_report
+msgid "Trial Balance Report"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_bank_statement_draft_tree
+msgid "Draft statements"
+msgstr ""
+
+#. module: account
+#: model:process.transition,note:account.process_transition_statemententries0
+msgid ""
+"Manual or automatic creation of payment entries according to the statements"
+msgstr ""
+
+#. module: account
+#: field:account.analytic.balance,empty_acc:0
+msgid "Empty Accounts ? "
+msgstr ""
+
+#. module: account
+#: constraint:account.bank.statement:0
+msgid "The journal and period chosen have to belong to the same company."
+msgstr ""
+
+#. module: account
+#: view:account.invoice:0
+msgid "Invoice lines"
+msgstr ""
+
+#. module: account
+#: field:account.chart,period_to:0
+msgid "End period"
+msgstr ""
+
+#. module: account
+#: sql_constraint:account.journal:0
+msgid "The code of the journal must be unique per company !"
+msgstr ""
+
+#. module: account
+#: help:product.category,property_account_expense_categ:0
+#: help:product.template,property_account_expense:0
+msgid ""
+"This account will be used to value outgoing stock for the current product "
+"category using cost price"
+msgstr ""
+
+#. module: account
+#: view:wizard.multi.charts.accounts:0
+msgid "Generate Your Chart of Accounts from a Chart Template"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,help:account.action_account_invoice_report_all
+msgid ""
+"From this report, you can have an overview of the amount invoiced to your "
+"customer as well as payment delays. The tool search can also be used to "
+"personalise your Invoices reports and so, match this analysis to your needs."
+msgstr ""
+
+#. module: account
+#: view:account.automatic.reconcile:0
+#: view:account.move.line.reconcile.writeoff:0
+msgid "Write-Off Move"
+msgstr ""
+
+#. module: account
+#: model:process.node,note:account.process_node_paidinvoice0
+msgid "Invoice's state is Done"
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_report_account_sales
+msgid "Report of the Sales by Account"
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_account_fiscal_position_account
+msgid "Accounts Fiscal Position"
+msgstr ""
+
+#. module: account
+#: report:account.invoice:0
+#: view:account.invoice:0
+#: selection:account.invoice,type:0
+#: selection:account.invoice.report,type:0
+#: model:process.process,name:account.process_process_supplierinvoiceprocess0
+#: selection:report.invoice.created,type:0
+msgid "Supplier Invoice"
+msgstr ""
+
+#. module: account
+#: field:account.account,debit:0
+#: report:account.account.balance:0
+#: report:account.analytic.account.balance:0
+#: report:account.analytic.account.cost_ledger:0
+#: report:account.analytic.account.inverted.balance:0
+#: report:account.central.journal:0
+#: field:account.entries.report,debit:0
+#: report:account.general.journal:0
+#: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
+#: report:account.journal.period.print:0
+#: report:account.journal.period.print.sale.purchase:0
+#: field:account.model.line,debit:0
+#: field:account.move.line,debit:0
+#: report:account.partner.balance:0
+#: report:account.third_party_ledger:0
+#: report:account.third_party_ledger_other:0
+#: field:account.treasury.report,debit:0
+#: report:account.vat.declaration:0
+#: field:report.account.receivable,debit:0
+msgid "Debit"
+msgstr ""
+
+#. module: account
+#: selection:account.financial.report,style_overwrite:0
+msgid "Title 3 (bold, smaller)"
+msgstr ""
+
+#. module: account
+#: field:account.invoice,invoice_line:0
+msgid "Invoice Lines"
+msgstr ""
+
+#. module: account
+#: constraint:account.account.template:0
+msgid "Error ! You can not create recursive account templates."
+msgstr ""
+
+#. module: account
+#: selection:account.print.journal,sort_selection:0
+msgid "Journal Entry Number"
+msgstr ""
+
+#. module: account
+#: view:account.subscription:0
+msgid "Recurring"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account.py:642
+#, python-format
+msgid ""
+"You cannot change the type of account from 'Closed' to any other type which "
+"contains journal items!"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_move_line.py:832
+#, python-format
+msgid "Entry is already reconciled"
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_report_account_receivable
+msgid "Receivable accounts"
+msgstr ""
+
+#. module: account
+#: selection:account.model.line,date_maturity:0
+msgid "Partner Payment Term"
+msgstr ""
+
+#. module: account
+#: field:temp.range,name:0
+msgid "Range"
+msgstr ""
+
+#. module: account
+#: view:account.analytic.line:0
+msgid "Analytic Journal Items related to a purchase journal."
+msgstr ""
+
+#. module: account
+#: help:account.account,type:0
+msgid ""
+"The 'Internal Type' is used for features available on different types of "
+"accounts: view can not have journal items, consolidation are accounts that "
+"can have children accounts for multi-company consolidations, "
+"payable/receivable are for partners accounts (for debit/credit "
+"computations), closed for depreciated accounts."
+msgstr ""
+
+#. module: account
+#: selection:account.balance.report,display_account:0
+#: selection:account.common.account.report,display_account:0
+#: selection:account.report.general.ledger,display_account:0
+msgid "With movements"
+msgstr ""
+
+#. module: account
+#: view:account.analytic.account:0
+msgid "Account Data"
+msgstr ""
+
+#. module: account
+#: view:account.tax.code.template:0
+msgid "Account Tax Code Template"
+msgstr ""
+
+#. module: account
+#: model:process.node,name:account.process_node_manually0
+msgid "Manually"
+msgstr ""
+
+#. module: account
+#: selection:account.entries.report,month:0
+#: selection:account.invoice.report,month:0
+#: selection:analytic.entries.report,month:0
+#: selection:report.account.sales,month:0
+#: selection:report.account_type.sales,month:0
+msgid "December"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_account_analytic_journal_tree
+#: model:ir.ui.menu,name:account.account_analytic_journal_print
+msgid "Print Analytic Journals"
+msgstr ""
+
+#. module: account
+#: view:account.invoice.report:0
+msgid "Group by month of Invoice Date"
+msgstr ""
+
+#. module: account
+#: view:account.analytic.line:0
+msgid "Fin.Account"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_aged_receivable_graph
+#: view:report.aged.receivable:0
+msgid "Aged Receivable"
+msgstr ""
+
+#. module: account
+#: field:account.tax,applicable_type:0
+msgid "Applicability"
+msgstr ""
+
+#. module: account
+#: code:addons/account/wizard/account_move_journal.py:165
+#, python-format
+msgid "This period is already closed !"
+msgstr ""
+
+#. module: account
+#: help:account.move.line,currency_id:0
+msgid "The optional other currency if it is a multi-currency entry."
+msgstr ""
+
+#. module: account
+#: model:process.transition,note:account.process_transition_invoiceimport0
+msgid ""
+"Import of the statement in the system from a supplier or customer invoice"
+msgstr ""
+
+#. module: account
+#: model:ir.ui.menu,name:account.menu_finance_periodical_processing_billing
+msgid "Billing"
+msgstr ""
+
+#. module: account
+#: view:account.account:0
+#: view:account.analytic.account:0
+msgid "Parent Account"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,help:account.action_account_journal_form
+msgid ""
+"Create and manage your company's journals from this menu. A journal is used "
+"to record transactions of all accounting data related to the day-to-day "
+"business of your company using double-entry bookkeeping system. Depending on "
+"the nature of its activities and the number of daily transactions, a company "
+"may keep several types of specialized journals such as a cash journal, "
+"purchase journal, sales journal..."
+msgstr ""
+
+#. module: account
+#: view:account.payment.term:0
+msgid "Description On Invoices"
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_account_analytic_chart
+msgid "Account Analytic Chart"
+msgstr ""
+
+#. module: account
+#: help:account.invoice,residual:0
+msgid "Remaining amount due."
+msgstr ""
+
+#. module: account
+#: model:ir.ui.menu,name:account.menu_finance_statistic_report_statement
+msgid "Statistic Reports"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_move_line.py:1155
+#: code:addons/account/account_move_line.py:1238
+#, python-format
+msgid "Bad account!"
+msgstr ""
+
+#. module: account
+#: field:account.print.journal,sort_selection:0
+msgid "Entries Sorted by"
+msgstr ""
+
+#. module: account
+#: help:account.move,state:0
+msgid ""
+"All manually created new journal entries are usually in the state "
+"'Unposted', but you can set the option to skip that state on the related "
+"journal. In that case, they will be behave as journal entries automatically "
+"created by the system on document validation (invoices, bank statements...) "
+"and will be created in 'Posted' state."
+msgstr ""
+
+#. module: account
+#: view:account.fiscal.position.template:0
+msgid "Accounts Mapping"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_invoice.py:364
+#, python-format
+msgid "Invoice '%s' is waiting for validation."
+msgstr ""
+
+#. module: account
+#: selection:account.entries.report,month:0
+#: selection:account.invoice.report,month:0
+#: selection:analytic.entries.report,month:0
+#: selection:report.account.sales,month:0
+#: selection:report.account_type.sales,month:0
+msgid "November"
+msgstr ""
+
+#. module: account
+#: selection:account.invoice.refund,filter_refund:0
+msgid "Modify: refund invoice, reconcile and create a new draft invoice"
+msgstr ""
+
+#. module: account
+#: help:account.invoice.line,account_id:0
+msgid "The income or expense account related to the selected product."
+msgstr ""
+
+#. module: account
+#: field:account.subscription,period_total:0
+msgid "Number of Periods"
+msgstr ""
+
+#. module: account
+#: report:account.general.journal:0
+#: model:ir.actions.report.xml,name:account.account_general_journal
+msgid "General Journal"
+msgstr ""
+
+#. module: account
+#: view:account.invoice:0
+msgid "Search Invoice"
+msgstr ""
+
+#. module: account
+#: report:account.invoice:0
+#: view:account.invoice:0
+#: view:account.invoice.refund:0
+#: view:account.invoice.report:0
+#: model:ir.actions.act_window,name:account.action_account_invoice_refund
+msgid "Refund"
+msgstr ""
+
+#. module: account
+#: model:email.template,body_text:account.email_template_edi_invoice
+msgid ""
+"\n"
+"Hello${object.address_invoice_id.name and ' ' or "
+"''}${object.address_invoice_id.name or ''},\n"
+"\n"
+"A new invoice is available for ${object.partner_id.name}:\n"
+"       | Invoice number: *${object.number}*\n"
+"       | Invoice total: *${object.amount_total} ${object.currency_id.name}*\n"
+"       | Invoice date: ${object.date_invoice}\n"
+"       % if object.origin:\n"
+"       | Order reference: ${object.origin}\n"
+"       % endif\n"
+"       | Your contact: ${object.user_id.name} ${object.user_id.user_email "
+"and '<%s>'%(object.user_id.user_email) or ''}\n"
+"\n"
+"You can view the invoice document, download it and pay online using the "
+"following link:\n"
+"    ${ctx.get('edi_web_url_view') or 'n/a'}\n"
+"\n"
+"% if object.company_id.paypal_account and object.type in ('out_invoice', "
+"'in_refund'):\n"
+"<% \n"
+"comp_name = quote(object.company_id.name)\n"
+"inv_number = quote(object.number)\n"
+"paypal_account = quote(object.company_id.paypal_account)\n"
+"inv_amount = quote(str(object.amount_total))\n"
+"cur_name = quote(object.currency_id.name)\n"
+"paypal_url = \"https://www.paypal.com/cgi-"
+"bin/webscr?cmd=_xclick&business=%s&item_name=%s%%20Invoice%%20%s\"\\\n"
+"             "
+"\"&invoice=%s&amount=%s&currency_code=%s&button_subtype=services&no_note=1&bn"
+"=OpenERP_Invoice_PayNow_%s\" % \\\n"
+"             "
+"(paypal_account,comp_name,inv_number,inv_number,inv_amount,cur_name,cur_name)"
+"\n"
+"%>\n"
+"It is also possible to directly pay with Paypal:\n"
+"    ${paypal_url}\n"
+"% endif\n"
+"\n"
+"If you have any question, do not hesitate to contact us.\n"
+"\n"
+"\n"
+"Thank you for choosing ${object.company_id.name}!\n"
+"\n"
+"\n"
+"--\n"
+"${object.user_id.name} ${object.user_id.user_email and "
+"'<%s>'%(object.user_id.user_email) or ''}\n"
+"${object.company_id.name}\n"
+"% if object.company_id.street:\n"
+"${object.company_id.street or ''}\n"
+"% endif\n"
+"% if object.company_id.street2:\n"
+"${object.company_id.street2}\n"
+"% endif\n"
+"% if object.company_id.city or object.company_id.zip:\n"
+"${object.company_id.zip or ''} ${object.company_id.city or ''}\n"
+"% endif\n"
+"% if object.company_id.country_id:\n"
+"${object.company_id.state_id and ('%s, ' % object.company_id.state_id.name) "
+"or ''} ${object.company_id.country_id.name or ''}\n"
+"% endif\n"
+"% if object.company_id.phone:\n"
+"Phone: ${object.company_id.phone}\n"
+"% endif\n"
+"% if object.company_id.website:\n"
+"${object.company_id.website or ''}\n"
+"% endif\n"
+"            "
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_res_partner_bank
+msgid "Bank Accounts"
+msgstr ""
+
+#. module: account
+#: field:res.partner,credit:0
+msgid "Total Receivable"
+msgstr ""
+
+#. module: account
+#: view:account.account:0
+#: view:account.account.template:0
+#: view:account.journal:0
+#: view:account.move.line:0
+msgid "General Information"
+msgstr ""
+
+#. module: account
+#: view:account.move:0
+#: view:account.move.line:0
+msgid "Accounting Documents"
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_validate_account_move_lines
+msgid "Validate Account Move Lines"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_account_analytic_cost_ledger_journal
+#: model:ir.actions.report.xml,name:account.account_analytic_account_quantity_cost_ledger
+msgid "Cost Ledger (Only quantities)"
+msgstr ""
+
+#. module: account
+#: model:process.node,note:account.process_node_supplierpaidinvoice0
+msgid "Invoice's state is Done."
+msgstr ""
+
+#. module: account
+#: model:process.transition,note:account.process_transition_reconcilepaid0
+msgid "As soon as the reconciliation is done, the invoice can be paid."
+msgstr ""
+
+#. module: account
+#: view:account.account.template:0
+msgid "Search Account Templates"
+msgstr ""
+
+#. module: account
+#: view:account.invoice.tax:0
+msgid "Manual Invoice Taxes"
+msgstr ""
+
+#. module: account
+#: field:account.account,parent_right:0
+msgid "Parent Right"
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_account_addtmpl_wizard
+msgid "account.addtmpl.wizard"
+msgstr ""
+
+#. module: account
+#: field:account.aged.trial.balance,result_selection:0
+#: field:account.common.partner.report,result_selection:0
+#: report:account.partner.balance:0
+#: field:account.partner.balance,result_selection:0
+#: field:account.partner.ledger,result_selection:0
+#: report:account.third_party_ledger:0
+#: report:account.third_party_ledger_other:0
+msgid "Partner's"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_account_fiscalyear_form
+#: view:ir.sequence:0
+#: model:ir.ui.menu,name:account.menu_action_account_fiscalyear_form
+msgid "Fiscal Years"
+msgstr ""
+
+#. module: account
+#: help:account.analytic.journal,active:0
+msgid ""
+"If the active field is set to False, it will allow you to hide the analytic "
+"journal without removing it."
+msgstr ""
+
+#. module: account
+#: field:account.analytic.line,ref:0
+msgid "Ref."
+msgstr ""
+
+#. module: account
+#: field:account.use.model,model:0
+#: model:ir.model,name:account.model_account_model
+msgid "Account Model"
+msgstr ""
+
+#. module: account
+#: selection:account.entries.report,month:0
+#: selection:account.invoice.report,month:0
+#: selection:analytic.entries.report,month:0
+#: selection:report.account.sales,month:0
+#: selection:report.account_type.sales,month:0
+msgid "February"
+msgstr ""
+
+#. module: account
+#: help:account.bank.statement,name:0
+msgid ""
+"if you give the Name other then /, its created Accounting Entries Move will "
+"be with same name as statement name. This allows the statement entries to "
+"have the same references than the statement itself"
+msgstr ""
+
+#. module: account
+#: field:account.bank.accounts.wizard,bank_account_id:0
+#: view:account.chart.template:0
+#: field:account.chart.template,bank_account_view_id:0
+#: field:account.invoice,partner_bank_id:0
+#: field:account.invoice.report,partner_bank_id:0
+msgid "Bank Account"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_account_central_journal
+#: model:ir.model,name:account.model_account_central_journal
+msgid "Account Central Journal"
+msgstr ""
+
+#. module: account
+#: report:account.overdue:0
+msgid "Maturity"
+msgstr ""
+
+#. module: account
+#: selection:account.aged.trial.balance,direction_selection:0
+msgid "Future"
+msgstr ""
+
+#. module: account
+#: view:account.move.line:0
+msgid "Search Journal Items"
+msgstr ""
+
+#. module: account
+#: help:account.tax,base_sign:0
+#: help:account.tax,ref_base_sign:0
+#: help:account.tax,ref_tax_sign:0
+#: help:account.tax,tax_sign:0
+#: help:account.tax.template,base_sign:0
+#: help:account.tax.template,ref_base_sign:0
+#: help:account.tax.template,ref_tax_sign:0
+#: help:account.tax.template,tax_sign:0
+msgid "Usually 1 or -1."
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_account_analytic_account_tree2
+#: model:ir.actions.act_window,name:account.action_account_analytic_chart
+#: model:ir.ui.menu,name:account.menu_action_analytic_account_tree2
+msgid "Chart of Analytic Accounts"
+msgstr ""
+
+#. module: account
+#: field:account.chart.template,property_account_expense:0
+msgid "Expense Account on Product Template"
+msgstr ""
+
+#. module: account
+#: help:accounting.report,label_filter:0
+msgid ""
+"This label will be displayed on report to show the balance computed for the "
+"given comparison filter."
+msgstr ""
+
+#. module: account
+#: code:addons/account/wizard/account_report_aged_partner_balance.py:56
+#, python-format
+msgid "You must enter a period length that cannot be 0 or below !"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,help:account.action_account_form
+msgid ""
+"Create and manage the accounts you need to record journal entries. An "
+"account is part of a ledger allowing your company to register all kinds of "
+"debit and credit transactions. Companies present their annual accounts in "
+"two main parts: the balance sheet and the income statement (profit and loss "
+"account). The annual accounts of a company are required by law to disclose a "
+"certain amount of information. They have to be certified by an external "
+"auditor annually."
+msgstr ""
+
+#. module: account
+#: help:account.move.line,amount_residual_currency:0
+msgid ""
+"The residual amount on a receivable or payable of a journal entry expressed "
+"in its currency (maybe different of the company currency)."
+msgstr ""
diff --git a/addons/account_analytic_analysis/i18n/ja.po b/addons/account_analytic_analysis/i18n/ja.po
index 714b1eee4c4..9ed8acf0a61 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-13 23:04+0000\n"
+"PO-Revision-Date: 2012-04-16 17:38+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-15 04:42+0000\n"
-"X-Generator: Launchpad (build 15070)\n"
+"X-Launchpad-Export-Date: 2012-04-17 04:51+0000\n"
+"X-Generator: Launchpad (build 15099)\n"
 
 #. module: account_analytic_analysis
 #: field:account.analytic.account,revenue_per_hour:0
@@ -59,7 +59,7 @@ msgstr "１ヶ月以内に期限を迎える分析アカウント"
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
 msgid "Group By..."
-msgstr "グループ化"
+msgstr "グループ化…"
 
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
diff --git a/addons/account_analytic_default/i18n/gu.po b/addons/account_analytic_default/i18n/gu.po
new file mode 100644
index 00000000000..fd0d2450737
--- /dev/null
+++ b/addons/account_analytic_default/i18n/gu.po
@@ -0,0 +1,183 @@
+# 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-16 11:11+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-17 04:51+0000\n"
+"X-Generator: Launchpad (build 15099)\n"
+
+#. module: account_analytic_default
+#: help:account.analytic.default,partner_id:0
+msgid ""
+"select a partner which will use analytical account specified in analytic "
+"default (eg. create new cutomer invoice or Sale order if we select this "
+"partner, it will automatically take this as an analytical account)"
+msgstr ""
+
+#. module: account_analytic_default
+#: model:ir.actions.act_window,name:account_analytic_default.analytic_rule_action_partner
+#: model:ir.actions.act_window,name:account_analytic_default.analytic_rule_action_product
+#: model:ir.actions.act_window,name:account_analytic_default.analytic_rule_action_user
+msgid "Analytic Rules"
+msgstr ""
+
+#. module: account_analytic_default
+#: help:account.analytic.default,analytic_id:0
+msgid "Analytical Account"
+msgstr ""
+
+#. module: account_analytic_default
+#: view:account.analytic.default:0
+msgid "Current"
+msgstr "વર્તમાન"
+
+#. module: account_analytic_default
+#: view:account.analytic.default:0
+msgid "Group By..."
+msgstr "ગ્રુપ દ્વારા..."
+
+#. module: account_analytic_default
+#: help:account.analytic.default,date_stop:0
+msgid "Default end date for this Analytical Account"
+msgstr ""
+
+#. module: account_analytic_default
+#: model:ir.model,name:account_analytic_default.model_stock_picking
+msgid "Picking List"
+msgstr ""
+
+#. module: account_analytic_default
+#: view:account.analytic.default:0
+msgid "Conditions"
+msgstr "શરતો"
+
+#. module: account_analytic_default
+#: help:account.analytic.default,company_id:0
+msgid ""
+"select a company which will use analytical account specified in analytic "
+"default (eg. create new cutomer invoice or Sale order if we select this "
+"company, it will automatically take this as an analytical account)"
+msgstr ""
+
+#. module: account_analytic_default
+#: help:account.analytic.default,date_start:0
+msgid "Default start date for this Analytical Account"
+msgstr ""
+
+#. module: account_analytic_default
+#: view:account.analytic.default:0
+#: field:account.analytic.default,product_id:0
+msgid "Product"
+msgstr "ઉત્પાદન"
+
+#. module: account_analytic_default
+#: model:ir.model,name:account_analytic_default.model_account_analytic_default
+msgid "Analytic Distribution"
+msgstr ""
+
+#. module: account_analytic_default
+#: view:account.analytic.default:0
+#: field:account.analytic.default,company_id:0
+msgid "Company"
+msgstr "કંપની"
+
+#. module: account_analytic_default
+#: view:account.analytic.default:0
+#: field:account.analytic.default,user_id:0
+msgid "User"
+msgstr "વપરાશકર્તા"
+
+#. module: account_analytic_default
+#: model:ir.actions.act_window,name:account_analytic_default.act_account_acount_move_line_open
+msgid "Entries"
+msgstr ""
+
+#. module: account_analytic_default
+#: field:account.analytic.default,date_stop:0
+msgid "End Date"
+msgstr "અંતિમ તારીખ"
+
+#. module: account_analytic_default
+#: help:account.analytic.default,user_id:0
+msgid ""
+"select a user which will use analytical account specified in analytic default"
+msgstr ""
+
+#. module: account_analytic_default
+#: view:account.analytic.default:0
+#: model:ir.actions.act_window,name:account_analytic_default.action_analytic_default_list
+#: model:ir.ui.menu,name:account_analytic_default.menu_analytic_default_list
+msgid "Analytic Defaults"
+msgstr ""
+
+#. module: account_analytic_default
+#: sql_constraint:stock.picking:0
+msgid "Reference must be unique per Company!"
+msgstr ""
+
+#. module: account_analytic_default
+#: view:account.analytic.default:0
+msgid "Analytical defaults whose end date is greater than today or None"
+msgstr ""
+
+#. module: account_analytic_default
+#: help:account.analytic.default,product_id:0
+msgid ""
+"select a product which will use analytical account specified in analytic "
+"default (eg. create new cutomer invoice or Sale order if we select this "
+"product, it will automatically take this as an analytical account)"
+msgstr ""
+
+#. module: account_analytic_default
+#: field:account.analytic.default,sequence:0
+msgid "Sequence"
+msgstr "ક્રમ"
+
+#. module: account_analytic_default
+#: model:ir.model,name:account_analytic_default.model_account_invoice_line
+msgid "Invoice Line"
+msgstr ""
+
+#. module: account_analytic_default
+#: view:account.analytic.default:0
+#: field:account.analytic.default,analytic_id:0
+msgid "Analytic Account"
+msgstr "વિશ્લેષણાત્મક ખાતું"
+
+#. module: account_analytic_default
+#: view:account.analytic.default:0
+msgid "Accounts"
+msgstr "ખાતાઓ"
+
+#. module: account_analytic_default
+#: view:account.analytic.default:0
+#: field:account.analytic.default,partner_id:0
+msgid "Partner"
+msgstr "ભાગીદાર"
+
+#. module: account_analytic_default
+#: field:account.analytic.default,date_start:0
+msgid "Start Date"
+msgstr "શરુઆતની તારીખ"
+
+#. module: account_analytic_default
+#: help:account.analytic.default,sequence:0
+msgid ""
+"Gives the sequence order when displaying a list of analytic distribution"
+msgstr ""
+
+#. module: account_analytic_default
+#: model:ir.model,name:account_analytic_default.model_sale_order_line
+msgid "Sales Order Line"
+msgstr ""
diff --git a/addons/account_analytic_default/i18n/ja.po b/addons/account_analytic_default/i18n/ja.po
index af4c1f3ae55..7e109b403a7 100644
--- a/addons/account_analytic_default/i18n/ja.po
+++ b/addons/account_analytic_default/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-13 22:29+0000\n"
+"PO-Revision-Date: 2012-04-16 17:39+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-14 04:57+0000\n"
-"X-Generator: Launchpad (build 15070)\n"
+"X-Launchpad-Export-Date: 2012-04-17 04:51+0000\n"
+"X-Generator: Launchpad (build 15099)\n"
 
 #. module: account_analytic_default
 #: help:account.analytic.default,partner_id:0
@@ -47,7 +47,7 @@ msgstr "現在"
 #. module: account_analytic_default
 #: view:account.analytic.default:0
 msgid "Group By..."
-msgstr "グループ化"
+msgstr "グループ化…"
 
 #. module: account_analytic_default
 #: help:account.analytic.default,date_stop:0
diff --git a/addons/account_analytic_plans/i18n/gu.po b/addons/account_analytic_plans/i18n/gu.po
new file mode 100644
index 00000000000..54f3635ee07
--- /dev/null
+++ b/addons/account_analytic_plans/i18n/gu.po
@@ -0,0 +1,542 @@
+# 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-16 12:52+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-17 04:51+0000\n"
+"X-Generator: Launchpad (build 15099)\n"
+
+#. module: account_analytic_plans
+#: view:analytic.plan.create.model:0
+msgid ""
+"This distribution model has been saved.You will be able to reuse it later."
+msgstr ""
+
+#. module: account_analytic_plans
+#: field:account.analytic.plan.instance.line,plan_id:0
+msgid "Plan Id"
+msgstr ""
+
+#. module: account_analytic_plans
+#: report:account.analytic.account.crossovered.analytic:0
+msgid "From Date"
+msgstr ""
+
+#. module: account_analytic_plans
+#: report:account.analytic.account.crossovered.analytic:0
+#: view:account.crossovered.analytic:0
+#: model:ir.actions.act_window,name:account_analytic_plans.action_account_crossovered_analytic
+#: model:ir.actions.report.xml,name:account_analytic_plans.account_analytic_account_crossovered_analytic
+msgid "Crossovered Analytic"
+msgstr ""
+
+#. module: account_analytic_plans
+#: view:account.analytic.plan:0
+#: field:account.analytic.plan,name:0
+#: field:account.analytic.plan.line,plan_id:0
+#: model:ir.actions.act_window,name:account_analytic_plans.account_analytic_plan_form_action
+#: model:ir.model,name:account_analytic_plans.model_account_analytic_plan
+#: model:ir.ui.menu,name:account_analytic_plans.menu_account_analytic_plan_action
+msgid "Analytic Plan"
+msgstr ""
+
+#. module: account_analytic_plans
+#: field:account.analytic.plan.instance,journal_id:0
+#: view:account.crossovered.analytic:0
+#: field:account.crossovered.analytic,journal_ids:0
+msgid "Analytic Journal"
+msgstr ""
+
+#. module: account_analytic_plans
+#: view:account.analytic.plan.line:0
+#: model:ir.model,name:account_analytic_plans.model_account_analytic_plan_line
+msgid "Analytic Plan Line"
+msgstr ""
+
+#. module: account_analytic_plans
+#: code:addons/account_analytic_plans/wizard/account_crossovered_analytic.py:61
+#, python-format
+msgid "User Error"
+msgstr ""
+
+#. module: account_analytic_plans
+#: model:ir.model,name:account_analytic_plans.model_account_analytic_plan_instance
+msgid "Analytic Plan Instance"
+msgstr ""
+
+#. module: account_analytic_plans
+#: view:analytic.plan.create.model:0
+msgid "Ok"
+msgstr "બરાબર"
+
+#. module: account_analytic_plans
+#: field:account.analytic.plan.instance,plan_id:0
+msgid "Model's Plan"
+msgstr ""
+
+#. module: account_analytic_plans
+#: field:account.analytic.plan.instance,account2_ids:0
+msgid "Account2 Id"
+msgstr ""
+
+#. module: account_analytic_plans
+#: sql_constraint:account.invoice:0
+msgid "Invoice Number must be unique per Company!"
+msgstr ""
+
+#. module: account_analytic_plans
+#: report:account.analytic.account.crossovered.analytic:0
+msgid "Amount"
+msgstr "કિંમત"
+
+#. module: account_analytic_plans
+#: constraint:account.journal:0
+msgid ""
+"Configuration error! The currency chosen should be shared by the default "
+"accounts too."
+msgstr ""
+
+#. module: account_analytic_plans
+#: sql_constraint:account.move.line:0
+msgid "Wrong credit or debit value in accounting entry !"
+msgstr ""
+
+#. module: account_analytic_plans
+#: field:account.analytic.plan.instance,account6_ids:0
+msgid "Account6 Id"
+msgstr ""
+
+#. module: account_analytic_plans
+#: model:ir.ui.menu,name:account_analytic_plans.menu_account_analytic_multi_plan_action
+msgid "Multi Plans"
+msgstr ""
+
+#. module: account_analytic_plans
+#: model:ir.model,name:account_analytic_plans.model_account_bank_statement_line
+msgid "Bank Statement Line"
+msgstr ""
+
+#. module: account_analytic_plans
+#: model:ir.actions.act_window,name:account_analytic_plans.account_analytic_plan_form_action_installer
+msgid "Define your Analytic Plans"
+msgstr ""
+
+#. module: account_analytic_plans
+#: constraint:account.invoice:0
+msgid "Invalid BBA Structured Communication !"
+msgstr ""
+
+#. module: account_analytic_plans
+#: constraint:account.bank.statement:0
+msgid "The journal and period chosen have to belong to the same company."
+msgstr ""
+
+#. module: account_analytic_plans
+#: 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_analytic_plans
+#: sql_constraint:account.journal:0
+msgid "The code of the journal must be unique per company !"
+msgstr ""
+
+#. module: account_analytic_plans
+#: field:account.crossovered.analytic,ref:0
+msgid "Analytic Account Reference"
+msgstr ""
+
+#. module: account_analytic_plans
+#: model:ir.model,name:account_analytic_plans.model_sale_order_line
+msgid "Sales Order Line"
+msgstr ""
+
+#. module: account_analytic_plans
+#: code:addons/account_analytic_plans/wizard/analytic_plan_create_model.py:47
+#: view:analytic.plan.create.model:0
+#, python-format
+msgid "Distribution Model Saved"
+msgstr ""
+
+#. module: account_analytic_plans
+#: model:ir.actions.act_window,name:account_analytic_plans.account_analytic_plan_instance_action
+msgid "Analytic Distribution's Models"
+msgstr ""
+
+#. module: account_analytic_plans
+#: view:account.crossovered.analytic:0
+msgid "Print"
+msgstr "છાપો"
+
+#. module: account_analytic_plans
+#: report:account.analytic.account.crossovered.analytic:0
+#: field:account.analytic.line,percentage:0
+msgid "Percentage"
+msgstr "ટકાવારી"
+
+#. module: account_analytic_plans
+#: code:addons/account_analytic_plans/account_analytic_plans.py:221
+#, python-format
+msgid "A model having this name and code already exists !"
+msgstr ""
+
+#. module: account_analytic_plans
+#: code:addons/account_analytic_plans/wizard/analytic_plan_create_model.py:41
+#, python-format
+msgid "No analytic plan defined !"
+msgstr ""
+
+#. module: account_analytic_plans
+#: field:account.analytic.plan.instance.line,rate:0
+msgid "Rate (%)"
+msgstr ""
+
+#. module: account_analytic_plans
+#: view:account.analytic.plan:0
+#: field:account.analytic.plan,plan_ids:0
+#: field:account.journal,plan_id:0
+msgid "Analytic Plans"
+msgstr ""
+
+#. module: account_analytic_plans
+#: report:account.analytic.account.crossovered.analytic:0
+msgid "Perc(%)"
+msgstr ""
+
+#. module: account_analytic_plans
+#: field:account.analytic.plan.line,max_required:0
+msgid "Maximum Allowed (%)"
+msgstr ""
+
+#. module: account_analytic_plans
+#: report:account.analytic.account.crossovered.analytic:0
+msgid "Printing date"
+msgstr ""
+
+#. module: account_analytic_plans
+#: view:account.analytic.plan.line:0
+msgid "Analytic Plan Lines"
+msgstr ""
+
+#. module: account_analytic_plans
+#: constraint:account.bank.statement.line:0
+msgid ""
+"The amount of the voucher must be the same amount as the one on the "
+"statement line"
+msgstr ""
+
+#. module: account_analytic_plans
+#: model:ir.model,name:account_analytic_plans.model_account_invoice_line
+msgid "Invoice Line"
+msgstr ""
+
+#. module: account_analytic_plans
+#: 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_analytic_plans
+#: report:account.analytic.account.crossovered.analytic:0
+msgid "Currency"
+msgstr "ચલણ"
+
+#. module: account_analytic_plans
+#: field:account.crossovered.analytic,date1:0
+msgid "Start Date"
+msgstr "શરુઆતની તારીખ"
+
+#. module: account_analytic_plans
+#: field:account.analytic.plan.instance,account_ids:0
+msgid "Account Id"
+msgstr ""
+
+#. module: account_analytic_plans
+#: field:account.analytic.plan.instance,account5_ids:0
+msgid "Account5 Id"
+msgstr ""
+
+#. module: account_analytic_plans
+#: model:ir.model,name:account_analytic_plans.model_account_analytic_plan_instance_line
+msgid "Analytic Instance Line"
+msgstr ""
+
+#. module: account_analytic_plans
+#: field:account.analytic.plan.line,root_analytic_id:0
+msgid "Root Account"
+msgstr ""
+
+#. module: account_analytic_plans
+#: report:account.analytic.account.crossovered.analytic:0
+msgid "To Date"
+msgstr ""
+
+#. module: account_analytic_plans
+#: code:addons/account_analytic_plans/account_analytic_plans.py:341
+#: code:addons/account_analytic_plans/account_analytic_plans.py:485
+#, python-format
+msgid "You have to define an analytic journal on the '%s' journal!"
+msgstr ""
+
+#. module: account_analytic_plans
+#: field:account.crossovered.analytic,empty_line:0
+msgid "Dont show empty lines"
+msgstr ""
+
+#. module: account_analytic_plans
+#: model:ir.actions.act_window,name:account_analytic_plans.action_analytic_plan_create_model
+msgid "analytic.plan.create.model.action"
+msgstr ""
+
+#. module: account_analytic_plans
+#: model:ir.model,name:account_analytic_plans.model_account_analytic_line
+msgid "Analytic Line"
+msgstr ""
+
+#. module: account_analytic_plans
+#: report:account.analytic.account.crossovered.analytic:0
+msgid "Analytic Account :"
+msgstr ""
+
+#. module: account_analytic_plans
+#: report:account.analytic.account.crossovered.analytic:0
+msgid "Analytic Account Reference:"
+msgstr ""
+
+#. module: account_analytic_plans
+#: field:account.analytic.plan.line,name:0
+msgid "Plan Name"
+msgstr ""
+
+#. module: account_analytic_plans
+#: field:account.analytic.plan,default_instance_id:0
+msgid "Default Entries"
+msgstr ""
+
+#. module: account_analytic_plans
+#: model:ir.model,name:account_analytic_plans.model_account_move_line
+msgid "Journal Items"
+msgstr ""
+
+#. module: account_analytic_plans
+#: field:account.analytic.plan.instance,account1_ids:0
+msgid "Account1 Id"
+msgstr ""
+
+#. module: account_analytic_plans
+#: field:account.analytic.plan.line,min_required:0
+msgid "Minimum Allowed (%)"
+msgstr ""
+
+#. module: account_analytic_plans
+#: help:account.analytic.plan.line,root_analytic_id:0
+msgid "Root account of this plan."
+msgstr ""
+
+#. module: account_analytic_plans
+#: code:addons/account_analytic_plans/account_analytic_plans.py:221
+#: code:addons/account_analytic_plans/wizard/analytic_plan_create_model.py:38
+#: code:addons/account_analytic_plans/wizard/analytic_plan_create_model.py:41
+#, python-format
+msgid "Error"
+msgstr "ભૂલ"
+
+#. module: account_analytic_plans
+#: view:analytic.plan.create.model:0
+msgid "Save This Distribution as a Model"
+msgstr ""
+
+#. module: account_analytic_plans
+#: constraint:account.move.line:0
+msgid "You can not create journal items on an account of type view."
+msgstr ""
+
+#. module: account_analytic_plans
+#: report:account.analytic.account.crossovered.analytic:0
+msgid "Quantity"
+msgstr "જથ્થો"
+
+#. module: account_analytic_plans
+#: code:addons/account_analytic_plans/wizard/analytic_plan_create_model.py:38
+#, python-format
+msgid "Please put a name and a code before saving the model !"
+msgstr ""
+
+#. module: account_analytic_plans
+#: model:ir.model,name:account_analytic_plans.model_account_crossovered_analytic
+msgid "Print Crossovered Analytic"
+msgstr ""
+
+#. module: account_analytic_plans
+#: code:addons/account_analytic_plans/account_analytic_plans.py:341
+#: code:addons/account_analytic_plans/account_analytic_plans.py:485
+#, python-format
+msgid "No Analytic Journal !"
+msgstr ""
+
+#. module: account_analytic_plans
+#: field:account.analytic.plan.instance.line,analytic_account_id:0
+msgid "Analytic Account"
+msgstr "વિશ્લેષણાત્મક ખાતું"
+
+#. module: account_analytic_plans
+#: model:ir.model,name:account_analytic_plans.model_account_bank_statement
+msgid "Bank Statement"
+msgstr ""
+
+#. module: account_analytic_plans
+#: field:account.analytic.plan.instance,account3_ids:0
+msgid "Account3 Id"
+msgstr ""
+
+#. module: account_analytic_plans
+#: constraint:account.analytic.line:0
+msgid "You can not create analytic line on view account."
+msgstr ""
+
+#. module: account_analytic_plans
+#: model:ir.model,name:account_analytic_plans.model_account_invoice
+msgid "Invoice"
+msgstr "બિલ"
+
+#. module: account_analytic_plans
+#: view:account.crossovered.analytic:0
+#: view:analytic.plan.create.model:0
+msgid "Cancel"
+msgstr "રદ કરો"
+
+#. module: account_analytic_plans
+#: field:account.analytic.plan.instance,account4_ids:0
+msgid "Account4 Id"
+msgstr ""
+
+#. module: account_analytic_plans
+#: constraint:account.move.line:0
+msgid "Company must be the same for its related account and period."
+msgstr ""
+
+#. module: account_analytic_plans
+#: view:account.analytic.plan.instance.line:0
+msgid "Analytic Distribution Lines"
+msgstr ""
+
+#. module: account_analytic_plans
+#: code:addons/account_analytic_plans/account_analytic_plans.py:234
+#, python-format
+msgid "The Total Should be Between %s and %s"
+msgstr ""
+
+#. module: account_analytic_plans
+#: report:account.analytic.account.crossovered.analytic:0
+msgid "at"
+msgstr "એટ"
+
+#. module: account_analytic_plans
+#: report:account.analytic.account.crossovered.analytic:0
+msgid "Account Name"
+msgstr "ખાતા નામ"
+
+#. module: account_analytic_plans
+#: view:account.analytic.plan.instance.line:0
+msgid "Analytic Distribution Line"
+msgstr ""
+
+#. module: account_analytic_plans
+#: field:account.analytic.plan.instance,code:0
+msgid "Distribution Code"
+msgstr ""
+
+#. module: account_analytic_plans
+#: report:account.analytic.account.crossovered.analytic:0
+msgid "%"
+msgstr ""
+
+#. module: account_analytic_plans
+#: report:account.analytic.account.crossovered.analytic:0
+msgid "100.00%"
+msgstr ""
+
+#. module: account_analytic_plans
+#: field:account.analytic.default,analytics_id:0
+#: view:account.analytic.plan.instance:0
+#: field:account.analytic.plan.instance,name:0
+#: field:account.bank.statement.line,analytics_id:0
+#: field:account.invoice.line,analytics_id:0
+#: field:account.move.line,analytics_id:0
+#: model:ir.model,name:account_analytic_plans.model_account_analytic_default
+msgid "Analytic Distribution"
+msgstr ""
+
+#. module: account_analytic_plans
+#: model:ir.model,name:account_analytic_plans.model_account_journal
+msgid "Journal"
+msgstr ""
+
+#. module: account_analytic_plans
+#: report:account.analytic.account.crossovered.analytic:0
+msgid "Code"
+msgstr ""
+
+#. module: account_analytic_plans
+#: model:ir.model,name:account_analytic_plans.model_analytic_plan_create_model
+msgid "analytic.plan.create.model"
+msgstr ""
+
+#. module: account_analytic_plans
+#: field:account.crossovered.analytic,date2:0
+msgid "End Date"
+msgstr ""
+
+#. module: account_analytic_plans
+#: model:ir.actions.act_window,name:account_analytic_plans.account_analytic_instance_model_open
+msgid "Distribution Models"
+msgstr ""
+
+#. module: account_analytic_plans
+#: model:ir.actions.act_window,help:account_analytic_plans.account_analytic_plan_form_action_installer
+msgid ""
+"To setup a multiple analytic plans environment, you must define the root "
+"analytic accounts for each plan set. Then, you must attach a plan set to "
+"your account journals."
+msgstr ""
+
+#. module: account_analytic_plans
+#: constraint:account.move.line:0
+msgid "You can not create journal items on closed account."
+msgstr ""
+
+#. module: account_analytic_plans
+#: report:account.analytic.account.crossovered.analytic:0
+msgid "Company"
+msgstr ""
+
+#. module: account_analytic_plans
+#: field:account.analytic.plan.line,sequence:0
+msgid "Sequence"
+msgstr ""
+
+#. module: account_analytic_plans
+#: sql_constraint:account.journal:0
+msgid "The name of the journal must be unique per company !"
+msgstr ""
+
+#. module: account_analytic_plans
+#: code:addons/account_analytic_plans/account_analytic_plans.py:234
+#, python-format
+msgid "Value Error"
+msgstr ""
diff --git a/addons/account_anglo_saxon/i18n/gu.po b/addons/account_anglo_saxon/i18n/gu.po
new file mode 100644
index 00000000000..ae11c66152d
--- /dev/null
+++ b/addons/account_anglo_saxon/i18n/gu.po
@@ -0,0 +1,98 @@
+# 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-16 11:17+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-17 04:51+0000\n"
+"X-Generator: Launchpad (build 15099)\n"
+
+#. module: account_anglo_saxon
+#: sql_constraint:purchase.order:0
+msgid "Order Reference must be unique per Company!"
+msgstr ""
+
+#. module: account_anglo_saxon
+#: view:product.category:0
+msgid " Accounting Property"
+msgstr ""
+
+#. module: account_anglo_saxon
+#: model:ir.model,name:account_anglo_saxon.model_product_category
+msgid "Product Category"
+msgstr "ઉત્પાદન વર્ગ"
+
+#. module: account_anglo_saxon
+#: sql_constraint:stock.picking:0
+msgid "Reference must be unique per Company!"
+msgstr ""
+
+#. module: account_anglo_saxon
+#: constraint:product.category:0
+msgid "Error ! You cannot create recursive categories."
+msgstr ""
+
+#. module: account_anglo_saxon
+#: constraint:account.invoice:0
+msgid "Invalid BBA Structured Communication !"
+msgstr ""
+
+#. module: account_anglo_saxon
+#: constraint:product.template:0
+msgid ""
+"Error: The default UOM and the purchase UOM must be in the same category."
+msgstr ""
+
+#. module: account_anglo_saxon
+#: model:ir.model,name:account_anglo_saxon.model_account_invoice_line
+msgid "Invoice Line"
+msgstr ""
+
+#. module: account_anglo_saxon
+#: model:ir.model,name:account_anglo_saxon.model_purchase_order
+msgid "Purchase Order"
+msgstr "ખરીદી ઓર્ડર"
+
+#. module: account_anglo_saxon
+#: model:ir.model,name:account_anglo_saxon.model_product_template
+msgid "Product Template"
+msgstr ""
+
+#. module: account_anglo_saxon
+#: field:product.category,property_account_creditor_price_difference_categ:0
+#: field:product.template,property_account_creditor_price_difference:0
+msgid "Price Difference Account"
+msgstr ""
+
+#. module: account_anglo_saxon
+#: model:ir.model,name:account_anglo_saxon.model_account_invoice
+msgid "Invoice"
+msgstr "બિલ"
+
+#. module: account_anglo_saxon
+#: model:ir.model,name:account_anglo_saxon.model_stock_picking
+msgid "Picking List"
+msgstr ""
+
+#. module: account_anglo_saxon
+#: sql_constraint:account.invoice:0
+msgid "Invoice Number must be unique per Company!"
+msgstr ""
+
+#. module: account_anglo_saxon
+#: help:product.category,property_account_creditor_price_difference_categ:0
+#: help:product.template,property_account_creditor_price_difference:0
+msgid ""
+"This account will be used to value price difference between purchase price "
+"and cost price."
+msgstr ""
diff --git a/addons/account_anglo_saxon/i18n/ja.po b/addons/account_anglo_saxon/i18n/ja.po
index 63df6b6ff2f..d761b8823c2 100644
--- a/addons/account_anglo_saxon/i18n/ja.po
+++ b/addons/account_anglo_saxon/i18n/ja.po
@@ -8,39 +8,39 @@ 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-01 05:17+0000\n"
-"Last-Translator: Masaki Yamaya <Unknown>\n"
+"PO-Revision-Date: 2012-04-16 17:44+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-02 04:37+0000\n"
-"X-Generator: Launchpad (build 15032)\n"
+"X-Launchpad-Export-Date: 2012-04-17 04:51+0000\n"
+"X-Generator: Launchpad (build 15099)\n"
 
 #. module: account_anglo_saxon
 #: sql_constraint:purchase.order:0
 msgid "Order Reference must be unique per Company!"
-msgstr "発注参照は会社ごとにユニークなければいけません"
+msgstr "オーダー参照は会社ごとにユニークでなければいけません。"
 
 #. module: account_anglo_saxon
 #: view:product.category:0
 msgid " Accounting Property"
-msgstr " 経理属性"
+msgstr " 会計の属性"
 
 #. module: account_anglo_saxon
 #: model:ir.model,name:account_anglo_saxon.model_product_category
 msgid "Product Category"
-msgstr "製品カテゴリー"
+msgstr "製品分類"
 
 #. module: account_anglo_saxon
 #: sql_constraint:stock.picking:0
 msgid "Reference must be unique per Company!"
-msgstr "参照は会社ごとにユニークでなければいけません"
+msgstr "参照は会社ごとにユニークでなければいけません。"
 
 #. module: account_anglo_saxon
 #: constraint:product.category:0
 msgid "Error ! You cannot create recursive categories."
-msgstr "エラー：再帰カテゴリーを作成することはできません"
+msgstr "エラー：再帰カテゴリーを作成することはできません。"
 
 #. module: account_anglo_saxon
 #: constraint:account.invoice:0
@@ -51,17 +51,17 @@ msgstr "無効なBBA構造のコミュニケーション"
 #: constraint:product.template:0
 msgid ""
 "Error: The default UOM and the purchase UOM must be in the same category."
-msgstr "エラー：デフォールトのUOMと購入UOMは同じカテゴリーでなければいけません"
+msgstr "エラー：デフォルトのUOMと発注UOMは同じ分類でなければいけません。"
 
 #. module: account_anglo_saxon
 #: model:ir.model,name:account_anglo_saxon.model_account_invoice_line
 msgid "Invoice Line"
-msgstr "請求明細"
+msgstr "請求行"
 
 #. module: account_anglo_saxon
 #: model:ir.model,name:account_anglo_saxon.model_purchase_order
 msgid "Purchase Order"
-msgstr "購買発注"
+msgstr "発注オーダー"
 
 #. module: account_anglo_saxon
 #: model:ir.model,name:account_anglo_saxon.model_product_template
@@ -82,12 +82,12 @@ msgstr "請求書"
 #. module: account_anglo_saxon
 #: model:ir.model,name:account_anglo_saxon.model_stock_picking
 msgid "Picking List"
-msgstr "選択リスト"
+msgstr "集荷リスト"
 
 #. module: account_anglo_saxon
 #: sql_constraint:account.invoice:0
 msgid "Invoice Number must be unique per Company!"
-msgstr "請求書番号は会社ごとにユニークでなければいけません"
+msgstr "請求書番号は会社ごとにユニークでなければいけません。"
 
 #. module: account_anglo_saxon
 #: help:product.category,property_account_creditor_price_difference_categ:0
@@ -95,4 +95,39 @@ msgstr "請求書番号は会社ごとにユニークでなければいけませ
 msgid ""
 "This account will be used to value price difference between purchase price "
 "and cost price."
-msgstr "このアカウントを使って購買価格とコスト価格の違いを計算します"
+msgstr "このアカウントは仕入価格とコスト価格の価格差の値のために使われます。"
+
+#~ msgid "Order Reference must be unique !"
+#~ msgstr "オーダーリファレンスは固有である必要があります。"
+
+#~ msgid "Stock Accounting for Anglo Saxon countries"
+#~ msgstr "アングロサクソン諸国の株会計"
+
+#~ msgid ""
+#~ "This module will support the Anglo-Saxons accounting methodology by\n"
+#~ "    changing the accounting logic with stock transactions. The difference "
+#~ "between the Anglo-Saxon accounting countries\n"
+#~ "    and the Rhine or also called Continental accounting countries is the "
+#~ "moment of taking the Cost of Goods Sold versus Cost of Sales.\n"
+#~ "    Anglo-Saxons accounting does take the cost when sales invoice is "
+#~ "created, Continental accounting will take the cost at the moment the goods "
+#~ "are shipped.\n"
+#~ "    This module will add this functionality by using a interim account, to "
+#~ "store the value of shipped goods and will contra book this interim account\n"
+#~ "    when the invoice is created to transfer this amount to the debtor or "
+#~ "creditor account.\n"
+#~ "    Secondly, price differences between actual purchase price and fixed "
+#~ "product standard price are booked on a separate account"
+#~ msgstr ""
+#~ "このモジュールは次のようなアングロサクソン会計手法をサポートします：\n"
+#~ "　　株式取引の会計ロジックを変更します。アングロサクソン会計（英米型会計）国と、ラインまたは\n"
+#~ "　　コンチネンタル会計（大陸型会計）国と呼ばれる違いは売上原価の計上タイミングの違いです。\n"
+#~ "　　アングロサクソン会計は販売の請求書が作成された時に原価を計上します。コンチネンタル会計\n"
+#~ "　　では商品が出荷された時に原価を計上します。\n"
+#~ "　　このモジュールは中間勘定を使うことによってこの機能を加えます。借方または貸方アカウントに\n"
+#~ "　　その総額を転送するために請求書が作成された時に、出荷された商品の価値を保存し、そして\n"
+#~ "　　この中間勘定を反対記帳します。\n"
+#~ "　　第２に、実際の仕入価格と固定の製品標準価格の差は分離された勘定に記帳されます。"
+
+#~ msgid "Error ! You can not create recursive categories."
+#~ msgstr "エラーです。再帰的な関係となる分類を作ることはできません。"
diff --git a/addons/account_asset/i18n/ja.po b/addons/account_asset/i18n/ja.po
index 5f7c94a5cdb..37889bb1af1 100644
--- a/addons/account_asset/i18n/ja.po
+++ b/addons/account_asset/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-15 03:56+0000\n"
+"PO-Revision-Date: 2012-04-16 17:45+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-16 04:41+0000\n"
+"X-Launchpad-Export-Date: 2012-04-17 04:51+0000\n"
 "X-Generator: Launchpad (build 15099)\n"
 
 #. module: account_asset
@@ -46,7 +46,7 @@ msgstr "資産の計算"
 #. module: account_asset
 #: view:asset.asset.report:0
 msgid "Group By..."
-msgstr "グループ化"
+msgstr "グループ化…"
 
 #. module: account_asset
 #: field:asset.asset.report,gross_value:0
diff --git a/addons/account_bank_statement_extensions/i18n/ja.po b/addons/account_bank_statement_extensions/i18n/ja.po
index 3ee81372600..b852e95c682 100644
--- a/addons/account_bank_statement_extensions/i18n/ja.po
+++ b/addons/account_bank_statement_extensions/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-16 03:50+0000\n"
+"PO-Revision-Date: 2012-04-16 23:00+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-16 04:41+0000\n"
+"X-Launchpad-Export-Date: 2012-04-17 04:52+0000\n"
 "X-Generator: Launchpad (build 15099)\n"
 
 #. module: account_bank_statement_extensions
@@ -32,7 +32,7 @@ msgstr "確認済"
 #: view:account.bank.statement:0
 #: view:account.bank.statement.line:0
 msgid "Glob. Id"
-msgstr "グローバルID"
+msgstr "国際化ID"
 
 #. module: account_bank_statement_extensions
 #: selection:account.bank.statement.line.global,type:0
@@ -59,12 +59,12 @@ msgstr "選択した明細書行をキャンセル"
 #. module: account_bank_statement_extensions
 #: constraint:res.partner.bank:0
 msgid "The RIB and/or IBAN is not valid"
-msgstr ""
+msgstr "銀行情報のRIBまたはIBANが正しくありません。"
 
 #. module: account_bank_statement_extensions
 #: view:account.bank.statement.line:0
 msgid "Group By..."
-msgstr "グループ化"
+msgstr "グループ化…"
 
 #. module: account_bank_statement_extensions
 #: field:account.bank.statement.line,state:0
@@ -87,7 +87,7 @@ msgstr "明細書"
 #: model:ir.actions.act_window,name:account_bank_statement_extensions.action_confirm_statement_line
 #: model:ir.model,name:account_bank_statement_extensions.model_confirm_statement_line
 msgid "Confirm selected statement lines"
-msgstr ""
+msgstr "選択した明細行の確認"
 
 #. module: account_bank_statement_extensions
 #: report:bank.statement.balance.report:0
@@ -104,7 +104,7 @@ msgstr "行のキャンセル"
 #: view:account.bank.statement.line.global:0
 #: model:ir.model,name:account_bank_statement_extensions.model_account_bank_statement_line_global
 msgid "Batch Payment Info"
-msgstr "一括払い情報"
+msgstr "バッチ支払情報"
 
 #. module: account_bank_statement_extensions
 #: view:confirm.statement.line:0
@@ -134,64 +134,64 @@ msgstr "仕訳帳"
 #. module: account_bank_statement_extensions
 #: view:account.bank.statement.line:0
 msgid "Confirmed Statement Lines."
-msgstr ""
+msgstr "確認済みの明細書行"
 
 #. module: account_bank_statement_extensions
 #: view:account.bank.statement.line:0
 msgid "Credit Transactions."
-msgstr ""
+msgstr "貸方取引"
 
 #. module: account_bank_statement_extensions
 #: model:ir.actions.act_window,help:account_bank_statement_extensions.action_cancel_statement_line
 msgid "cancel selected statement lines."
-msgstr ""
+msgstr "選択明細行のキャンセル"
 
 #. module: account_bank_statement_extensions
 #: field:account.bank.statement.line,counterparty_number:0
 msgid "Counterparty Number"
-msgstr ""
+msgstr "相手方番号"
 
 #. module: account_bank_statement_extensions
 #: view:account.bank.statement.line.global:0
 msgid "Transactions"
-msgstr ""
+msgstr "取引"
 
 #. module: account_bank_statement_extensions
 #: code:addons/account_bank_statement_extensions/account_bank_statement.py:130
 #, python-format
 msgid "Warning"
-msgstr ""
+msgstr "警告"
 
 #. module: account_bank_statement_extensions
 #: report:bank.statement.balance.report:0
 msgid "Closing Balance"
-msgstr ""
+msgstr "締切残高"
 
 #. module: account_bank_statement_extensions
 #: report:bank.statement.balance.report:0
 msgid "Date"
-msgstr ""
+msgstr "日付"
 
 #. module: account_bank_statement_extensions
 #: view:account.bank.statement.line:0
 #: field:account.bank.statement.line,globalisation_amount:0
 msgid "Glob. Amount"
-msgstr ""
+msgstr "国際化金額"
 
 #. module: account_bank_statement_extensions
 #: view:account.bank.statement.line:0
 msgid "Debit Transactions."
-msgstr ""
+msgstr "借方取引"
 
 #. module: account_bank_statement_extensions
 #: view:account.bank.statement.line:0
 msgid "Extended Filters..."
-msgstr ""
+msgstr "拡張したフィルタ…"
 
 #. module: account_bank_statement_extensions
 #: view:confirm.statement.line:0
 msgid "Confirmed lines cannot be changed anymore."
-msgstr ""
+msgstr "確認された行はもはや変更できません。"
 
 #. module: account_bank_statement_extensions
 #: constraint:res.partner.bank:0
@@ -200,6 +200,8 @@ msgid ""
 "Please define BIC/Swift code on bank for bank type IBAN Account to make "
 "valid payments"
 msgstr ""
+"\n"
+"正当な支払いを行うために銀行タイプIBAN口座のための銀行にBIC/Swiftコードを定義して下さい。"
 
 #. module: account_bank_statement_extensions
 #: field:account.bank.statement.line,val_date:0
@@ -209,17 +211,17 @@ msgstr ""
 #. module: account_bank_statement_extensions
 #: model:ir.actions.act_window,help:account_bank_statement_extensions.action_confirm_statement_line
 msgid "Confirm selected statement lines."
-msgstr ""
+msgstr "選択した明細行の確認をします。"
 
 #. module: account_bank_statement_extensions
 #: view:cancel.statement.line:0
 msgid "Are you sure you want to cancel the selected Bank Statement lines ?"
-msgstr ""
+msgstr "選択した銀行明細行のキャンセルを本当に行いますか？"
 
 #. module: account_bank_statement_extensions
 #: report:bank.statement.balance.report:0
 msgid "Name"
-msgstr ""
+msgstr "名称"
 
 #. module: account_bank_statement_extensions
 #: selection:account.bank.statement.line.global,type:0
@@ -229,22 +231,22 @@ msgstr ""
 #. module: account_bank_statement_extensions
 #: view:account.bank.statement.line:0
 msgid "Notes"
-msgstr ""
+msgstr "注記"
 
 #. module: account_bank_statement_extensions
 #: selection:account.bank.statement.line.global,type:0
 msgid "Manual"
-msgstr ""
+msgstr "手動"
 
 #. module: account_bank_statement_extensions
 #: view:account.bank.statement.line:0
 msgid "Credit"
-msgstr ""
+msgstr "貸方"
 
 #. module: account_bank_statement_extensions
 #: field:account.bank.statement.line.global,amount:0
 msgid "Amount"
-msgstr ""
+msgstr "金額"
 
 #. module: account_bank_statement_extensions
 #: view:account.bank.statement.line:0
@@ -254,121 +256,121 @@ msgstr ""
 #. module: account_bank_statement_extensions
 #: field:account.bank.statement.line,counterparty_currency:0
 msgid "Counterparty Currency"
-msgstr ""
+msgstr "相手方通貨"
 
 #. module: account_bank_statement_extensions
 #: field:account.bank.statement.line,counterparty_bic:0
 msgid "Counterparty BIC"
-msgstr ""
+msgstr "相手方BIC"
 
 #. module: account_bank_statement_extensions
 #: field:account.bank.statement.line.global,child_ids:0
 msgid "Child Codes"
-msgstr ""
+msgstr "子コード"
 
 #. module: account_bank_statement_extensions
 #: view:confirm.statement.line:0
 msgid "Are you sure you want to confirm the selected Bank Statement lines ?"
-msgstr ""
+msgstr "選択した銀行明細行を本当に確認しますか？"
 
 #. module: account_bank_statement_extensions
 #: constraint:account.bank.statement.line:0
 msgid ""
 "The amount of the voucher must be the same amount as the one on the "
 "statement line"
-msgstr ""
+msgstr "バウチャーの金額は明細行のひとつの金額と同じでなければなりません。"
 
 #. module: account_bank_statement_extensions
 #: help:account.bank.statement.line,globalisation_id:0
 msgid ""
 "Code to identify transactions belonging to the same globalisation level "
 "within a batch payment"
-msgstr ""
+msgstr "バッチ支払いの中で、同じ国際化レベルに沿った取引を識別するためのコード"
 
 #. module: account_bank_statement_extensions
 #: view:account.bank.statement.line:0
 msgid "Draft Statement Lines."
-msgstr ""
+msgstr "ドラフト明細行"
 
 #. module: account_bank_statement_extensions
 #: view:account.bank.statement.line:0
 msgid "Glob. Am."
-msgstr ""
+msgstr "国際化総額"
 
 #. module: account_bank_statement_extensions
 #: model:ir.model,name:account_bank_statement_extensions.model_account_bank_statement_line
 msgid "Bank Statement Line"
-msgstr ""
+msgstr "銀行明細行"
 
 #. module: account_bank_statement_extensions
 #: field:account.bank.statement.line.global,code:0
 msgid "Code"
-msgstr ""
+msgstr "コード"
 
 #. module: account_bank_statement_extensions
 #: field:account.bank.statement.line,counterparty_name:0
 msgid "Counterparty Name"
-msgstr ""
+msgstr "相手方名"
 
 #. module: account_bank_statement_extensions
 #: field:account.bank.statement.line.global,name:0
 msgid "Communication"
-msgstr ""
+msgstr "通信"
 
 #. module: account_bank_statement_extensions
 #: model:ir.model,name:account_bank_statement_extensions.model_res_partner_bank
 msgid "Bank Accounts"
-msgstr ""
+msgstr "銀行口座"
 
 #. module: account_bank_statement_extensions
 #: constraint:account.bank.statement:0
 msgid "The journal and period chosen have to belong to the same company."
-msgstr ""
+msgstr "選択された仕訳帳と期間は同じ会社に属していなければなりません。"
 
 #. module: account_bank_statement_extensions
 #: model:ir.model,name:account_bank_statement_extensions.model_account_bank_statement
 msgid "Bank Statement"
-msgstr ""
+msgstr "銀行明細"
 
 #. module: account_bank_statement_extensions
 #: view:account.bank.statement.line:0
 msgid "Statement Line"
-msgstr ""
+msgstr "明細行"
 
 #. module: account_bank_statement_extensions
 #: sql_constraint:account.bank.statement.line.global:0
 msgid "The code must be unique !"
-msgstr ""
+msgstr "コードは固有でなければなりません。"
 
 #. module: account_bank_statement_extensions
 #: field:account.bank.statement.line.global,bank_statement_line_ids:0
 #: model:ir.actions.act_window,name:account_bank_statement_extensions.action_bank_statement_line
 #: model:ir.ui.menu,name:account_bank_statement_extensions.bank_statement_line
 msgid "Bank Statement Lines"
-msgstr ""
+msgstr "銀行明細行"
 
 #. module: account_bank_statement_extensions
 #: view:account.bank.statement.line.global:0
 msgid "Child Batch Payments"
-msgstr ""
+msgstr "子バッチ支払い"
 
 #. module: account_bank_statement_extensions
 #: view:cancel.statement.line:0
 #: view:confirm.statement.line:0
 msgid "Cancel"
-msgstr ""
+msgstr "キャンセル"
 
 #. module: account_bank_statement_extensions
 #: view:account.bank.statement.line:0
 msgid "Statement Lines"
-msgstr ""
+msgstr "明細行"
 
 #. module: account_bank_statement_extensions
 #: view:account.bank.statement.line:0
 msgid "Total Amount"
-msgstr ""
+msgstr "合計金額"
 
 #. module: account_bank_statement_extensions
 #: field:account.bank.statement.line,globalisation_id:0
 msgid "Globalisation ID"
-msgstr ""
+msgstr "国際化ID"
diff --git a/addons/account_bank_statement_extensions/i18n/pt.po b/addons/account_bank_statement_extensions/i18n/pt.po
new file mode 100644
index 00000000000..ac8c07acdc6
--- /dev/null
+++ b/addons/account_bank_statement_extensions/i18n/pt.po
@@ -0,0 +1,386 @@
+# Portuguese 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-16 14:08+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Portuguese <pt@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:52+0000\n"
+"X-Generator: Launchpad (build 15099)\n"
+
+#. module: account_bank_statement_extensions
+#: view:account.bank.statement.line:0
+msgid "Search Bank Transactions"
+msgstr "Pesquisar operações bancárias"
+
+#. module: account_bank_statement_extensions
+#: view:account.bank.statement.line:0
+#: selection:account.bank.statement.line,state:0
+msgid "Confirmed"
+msgstr "Confirmado"
+
+#. module: account_bank_statement_extensions
+#: view:account.bank.statement:0
+#: view:account.bank.statement.line:0
+msgid "Glob. Id"
+msgstr "Glob. Id"
+
+#. module: account_bank_statement_extensions
+#: selection:account.bank.statement.line.global,type:0
+msgid "CODA"
+msgstr "CODA"
+
+#. module: account_bank_statement_extensions
+#: field:account.bank.statement.line.global,parent_id:0
+msgid "Parent Code"
+msgstr "Código ascendente"
+
+#. module: account_bank_statement_extensions
+#: view:account.bank.statement.line:0
+msgid "Debit"
+msgstr "Débito"
+
+#. module: account_bank_statement_extensions
+#: view:cancel.statement.line:0
+#: model:ir.actions.act_window,name:account_bank_statement_extensions.action_cancel_statement_line
+#: model:ir.model,name:account_bank_statement_extensions.model_cancel_statement_line
+msgid "Cancel selected statement lines"
+msgstr "Cancelar linhas de instrução selecionadas"
+
+#. module: account_bank_statement_extensions
+#: constraint:res.partner.bank:0
+msgid "The RIB and/or IBAN is not valid"
+msgstr "O RIB e / ou o IBAN não é válido"
+
+#. module: account_bank_statement_extensions
+#: view:account.bank.statement.line:0
+msgid "Group By..."
+msgstr "Grupo por..."
+
+#. module: account_bank_statement_extensions
+#: field:account.bank.statement.line,state:0
+msgid "State"
+msgstr "Estado"
+
+#. module: account_bank_statement_extensions
+#: view:account.bank.statement.line:0
+#: selection:account.bank.statement.line,state:0
+msgid "Draft"
+msgstr "Rascunho"
+
+#. module: account_bank_statement_extensions
+#: view:account.bank.statement.line:0
+msgid "Statement"
+msgstr "Afirmação"
+
+#. module: account_bank_statement_extensions
+#: view:confirm.statement.line:0
+#: model:ir.actions.act_window,name:account_bank_statement_extensions.action_confirm_statement_line
+#: model:ir.model,name:account_bank_statement_extensions.model_confirm_statement_line
+msgid "Confirm selected statement lines"
+msgstr "Confirme linhas de instrução selecionados"
+
+#. module: account_bank_statement_extensions
+#: report:bank.statement.balance.report:0
+#: model:ir.actions.report.xml,name:account_bank_statement_extensions.bank_statement_balance_report
+msgid "Bank Statement Balances Report"
+msgstr "Declaração do Relatório dos Balanços do Banco"
+
+#. module: account_bank_statement_extensions
+#: view:cancel.statement.line:0
+msgid "Cancel Lines"
+msgstr "Cancelar linhas"
+
+#. module: account_bank_statement_extensions
+#: view:account.bank.statement.line.global:0
+#: model:ir.model,name:account_bank_statement_extensions.model_account_bank_statement_line_global
+msgid "Batch Payment Info"
+msgstr "Informação do pagamento do lote"
+
+#. module: account_bank_statement_extensions
+#: view:confirm.statement.line:0
+msgid "Confirm Lines"
+msgstr "Confirmar Linhas"
+
+#. module: account_bank_statement_extensions
+#: code:addons/account_bank_statement_extensions/account_bank_statement.py:130
+#, python-format
+msgid ""
+"Delete operation not allowed !             Please go to the associated bank "
+"statement in order to delete and/or modify this bank statement line"
+msgstr ""
+"Excluir operação não permitida! Por favor, vá para o extracto bancário "
+"associado, a fim de eliminar e / ou modificar esta linha do extrato bancário"
+
+#. module: account_bank_statement_extensions
+#: field:account.bank.statement.line.global,type:0
+msgid "Type"
+msgstr "Tipo"
+
+#. module: account_bank_statement_extensions
+#: view:account.bank.statement.line:0
+#: field:account.bank.statement.line,journal_id:0
+#: report:bank.statement.balance.report:0
+msgid "Journal"
+msgstr "Diário"
+
+#. module: account_bank_statement_extensions
+#: view:account.bank.statement.line:0
+msgid "Confirmed Statement Lines."
+msgstr "Linhas de Declaração Confirmadas."
+
+#. module: account_bank_statement_extensions
+#: view:account.bank.statement.line:0
+msgid "Credit Transactions."
+msgstr "Operações de crédito."
+
+#. module: account_bank_statement_extensions
+#: model:ir.actions.act_window,help:account_bank_statement_extensions.action_cancel_statement_line
+msgid "cancel selected statement lines."
+msgstr "Cancelar declaração de linhas selecionadas"
+
+#. module: account_bank_statement_extensions
+#: field:account.bank.statement.line,counterparty_number:0
+msgid "Counterparty Number"
+msgstr "Número da contraparte"
+
+#. module: account_bank_statement_extensions
+#: view:account.bank.statement.line.global:0
+msgid "Transactions"
+msgstr "Transacções"
+
+#. module: account_bank_statement_extensions
+#: code:addons/account_bank_statement_extensions/account_bank_statement.py:130
+#, python-format
+msgid "Warning"
+msgstr "Aviso !"
+
+#. module: account_bank_statement_extensions
+#: report:bank.statement.balance.report:0
+msgid "Closing Balance"
+msgstr "Saldo de Encerramento"
+
+#. module: account_bank_statement_extensions
+#: report:bank.statement.balance.report:0
+msgid "Date"
+msgstr "Data"
+
+#. module: account_bank_statement_extensions
+#: view:account.bank.statement.line:0
+#: field:account.bank.statement.line,globalisation_amount:0
+msgid "Glob. Amount"
+msgstr "Montante Global"
+
+#. module: account_bank_statement_extensions
+#: view:account.bank.statement.line:0
+msgid "Debit Transactions."
+msgstr "Operações de débito."
+
+#. module: account_bank_statement_extensions
+#: view:account.bank.statement.line:0
+msgid "Extended Filters..."
+msgstr "Filtros Avançados..."
+
+#. module: account_bank_statement_extensions
+#: view:confirm.statement.line:0
+msgid "Confirmed lines cannot be changed anymore."
+msgstr "Linhas Confirmadas não pode ser alteradas."
+
+#. module: account_bank_statement_extensions
+#: constraint:res.partner.bank:0
+msgid ""
+"\n"
+"Please define BIC/Swift code on bank for bank type IBAN Account to make "
+"valid payments"
+msgstr ""
+"\n"
+"Por favor defina BIC/ Código Swift no banco para conta bancária tipo IBAN "
+"para fazer pagamentos válidos"
+
+#. module: account_bank_statement_extensions
+#: field:account.bank.statement.line,val_date:0
+msgid "Valuta Date"
+msgstr "Data Valuta"
+
+#. module: account_bank_statement_extensions
+#: model:ir.actions.act_window,help:account_bank_statement_extensions.action_confirm_statement_line
+msgid "Confirm selected statement lines."
+msgstr "Confirme linhas de instrução selecionadas."
+
+#. module: account_bank_statement_extensions
+#: view:cancel.statement.line:0
+msgid "Are you sure you want to cancel the selected Bank Statement lines ?"
+msgstr ""
+"Tem certeza que deseja cancelar as linhas de Declaração Bancárias "
+"selecionadas?"
+
+#. module: account_bank_statement_extensions
+#: report:bank.statement.balance.report:0
+msgid "Name"
+msgstr "Nome"
+
+#. module: account_bank_statement_extensions
+#: selection:account.bank.statement.line.global,type:0
+msgid "ISO 20022"
+msgstr "ISO 20022"
+
+#. module: account_bank_statement_extensions
+#: view:account.bank.statement.line:0
+msgid "Notes"
+msgstr "Notas"
+
+#. module: account_bank_statement_extensions
+#: selection:account.bank.statement.line.global,type:0
+msgid "Manual"
+msgstr "Manual"
+
+#. module: account_bank_statement_extensions
+#: view:account.bank.statement.line:0
+msgid "Credit"
+msgstr "Crédito"
+
+#. module: account_bank_statement_extensions
+#: field:account.bank.statement.line.global,amount:0
+msgid "Amount"
+msgstr "Montante"
+
+#. module: account_bank_statement_extensions
+#: view:account.bank.statement.line:0
+msgid "Fin.Account"
+msgstr "Fin.Account"
+
+#. module: account_bank_statement_extensions
+#: field:account.bank.statement.line,counterparty_currency:0
+msgid "Counterparty Currency"
+msgstr "Moeda da contraparte"
+
+#. module: account_bank_statement_extensions
+#: field:account.bank.statement.line,counterparty_bic:0
+msgid "Counterparty BIC"
+msgstr "BIC da contraparte"
+
+#. module: account_bank_statement_extensions
+#: field:account.bank.statement.line.global,child_ids:0
+msgid "Child Codes"
+msgstr "Códigos descendentes"
+
+#. module: account_bank_statement_extensions
+#: view:confirm.statement.line:0
+msgid "Are you sure you want to confirm the selected Bank Statement lines ?"
+msgstr ""
+"Tem certeza de que pretende confirmar as linhas da Declaração Bancária "
+"selecionadas?"
+
+#. module: account_bank_statement_extensions
+#: constraint:account.bank.statement.line:0
+msgid ""
+"The amount of the voucher must be the same amount as the one on the "
+"statement line"
+msgstr ""
+"O montante do comprovativo deve ser o mesmo valor que o da linha de instrução"
+
+#. module: account_bank_statement_extensions
+#: help:account.bank.statement.line,globalisation_id:0
+msgid ""
+"Code to identify transactions belonging to the same globalisation level "
+"within a batch payment"
+msgstr ""
+"Código para identificar as operações que pertencem ao mesmo nível de "
+"globalização dentro de um pagamento do lote"
+
+#. module: account_bank_statement_extensions
+#: view:account.bank.statement.line:0
+msgid "Draft Statement Lines."
+msgstr "Declaração das Linhas do rascunho."
+
+#. module: account_bank_statement_extensions
+#: view:account.bank.statement.line:0
+msgid "Glob. Am."
+msgstr "Glob. Am."
+
+#. module: account_bank_statement_extensions
+#: model:ir.model,name:account_bank_statement_extensions.model_account_bank_statement_line
+msgid "Bank Statement Line"
+msgstr "Linha de extracto Bancário"
+
+#. module: account_bank_statement_extensions
+#: field:account.bank.statement.line.global,code:0
+msgid "Code"
+msgstr "Código"
+
+#. module: account_bank_statement_extensions
+#: field:account.bank.statement.line,counterparty_name:0
+msgid "Counterparty Name"
+msgstr "Nome da contraparte"
+
+#. module: account_bank_statement_extensions
+#: field:account.bank.statement.line.global,name:0
+msgid "Communication"
+msgstr "Communicação"
+
+#. module: account_bank_statement_extensions
+#: model:ir.model,name:account_bank_statement_extensions.model_res_partner_bank
+msgid "Bank Accounts"
+msgstr "Contas Bancárias"
+
+#. module: account_bank_statement_extensions
+#: constraint:account.bank.statement:0
+msgid "The journal and period chosen have to belong to the same company."
+msgstr "O diário e o período escolhidos devem pertencer à mesma empresa."
+
+#. module: account_bank_statement_extensions
+#: model:ir.model,name:account_bank_statement_extensions.model_account_bank_statement
+msgid "Bank Statement"
+msgstr "Extracto Bancário"
+
+#. module: account_bank_statement_extensions
+#: view:account.bank.statement.line:0
+msgid "Statement Line"
+msgstr "Linha de declaração"
+
+#. module: account_bank_statement_extensions
+#: sql_constraint:account.bank.statement.line.global:0
+msgid "The code must be unique !"
+msgstr "O código deve ser único !"
+
+#. module: account_bank_statement_extensions
+#: field:account.bank.statement.line.global,bank_statement_line_ids:0
+#: model:ir.actions.act_window,name:account_bank_statement_extensions.action_bank_statement_line
+#: model:ir.ui.menu,name:account_bank_statement_extensions.bank_statement_line
+msgid "Bank Statement Lines"
+msgstr "Linhas de Declarações Bancárias"
+
+#. module: account_bank_statement_extensions
+#: view:account.bank.statement.line.global:0
+msgid "Child Batch Payments"
+msgstr "Pagamentos em lote descendente"
+
+#. module: account_bank_statement_extensions
+#: view:cancel.statement.line:0
+#: view:confirm.statement.line:0
+msgid "Cancel"
+msgstr "Cancelar"
+
+#. module: account_bank_statement_extensions
+#: view:account.bank.statement.line:0
+msgid "Statement Lines"
+msgstr "Linhas da Declaração"
+
+#. module: account_bank_statement_extensions
+#: view:account.bank.statement.line:0
+msgid "Total Amount"
+msgstr "Montante total"
+
+#. module: account_bank_statement_extensions
+#: field:account.bank.statement.line,globalisation_id:0
+msgid "Globalisation ID"
+msgstr "ID Globalização"
diff --git a/addons/account_check_writing/i18n/pt.po b/addons/account_check_writing/i18n/pt.po
new file mode 100644
index 00000000000..3242b403328
--- /dev/null
+++ b/addons/account_check_writing/i18n/pt.po
@@ -0,0 +1,210 @@
+# Portuguese 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-16 14:40+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Portuguese <pt@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:52+0000\n"
+"X-Generator: Launchpad (build 15099)\n"
+
+#. module: account_check_writing
+#: selection:res.company,check_layout:0
+msgid "Check on Top"
+msgstr "Verifique no topo"
+
+#. module: account_check_writing
+#: model:ir.actions.act_window,help:account_check_writing.action_write_check
+msgid ""
+"The check payment form allows you to track the payment you do to your "
+"suppliers specially by check. When you select a supplier, the payment method "
+"and an amount for the payment, OpenERP will propose to reconcile your "
+"payment with the open supplier invoices or bills.You can print the check"
+msgstr ""
+"A seleção da forma de pagamento permite que acompanhe o pagamento que faz "
+"aos seus fornecedores, especialmente por meio de cheque. Quando selecionar "
+"um fornecedor, o método de pagamento e um montante para o pagamento, OpenERP "
+"irá propor a conciliar o pagamento com as faturas de fornecedores ou contas "
+"abertas. Pode imprimir o cheque"
+
+#. module: account_check_writing
+#: view:account.voucher:0
+#: model:ir.actions.report.xml,name:account_check_writing.account_print_check_bottom
+#: model:ir.actions.report.xml,name:account_check_writing.account_print_check_middle
+#: model:ir.actions.report.xml,name:account_check_writing.account_print_check_top
+msgid "Print Check"
+msgstr "Imprimir Cheque"
+
+#. module: account_check_writing
+#: selection:res.company,check_layout:0
+msgid "Check in middle"
+msgstr "Verifique no meio"
+
+#. module: account_check_writing
+#: help:res.company,check_layout:0
+msgid ""
+"Check on top is compatible with Quicken, QuickBooks and Microsoft Money. "
+"Check in middle is compatible with Peachtree, ACCPAC and DacEasy. Check on "
+"bottom is compatible with Peachtree, ACCPAC and DacEasy only"
+msgstr ""
+"Verifique no topo se é compatível com o Quicken, QuickBooks e Microsoft "
+"Money. Verifique no meio se é compatível com Peachtree, ACCPAC e DacEasy. "
+"Verifique na parte inferior se é compatível apenas com Peachtree, ACCPAC e "
+"DacEasy"
+
+#. module: account_check_writing
+#: selection:res.company,check_layout:0
+msgid "Check on bottom"
+msgstr "Verifique na parte inferior"
+
+#. module: account_check_writing
+#: constraint:res.company:0
+msgid "Error! You can not create recursive companies."
+msgstr "Erro! Não pode criar empresas recursivas."
+
+#. module: account_check_writing
+#: help:account.journal,allow_check_writing:0
+msgid "Check this if the journal is to be used for writing checks."
+msgstr "Marque esta opção se está a utilizar diáriamente cheques."
+
+#. module: account_check_writing
+#: field:account.journal,allow_check_writing:0
+msgid "Allow Check writing"
+msgstr "Permitir que verifique a escrita"
+
+#. module: account_check_writing
+#: report:account.print.check.bottom:0
+#: report:account.print.check.middle:0
+#: report:account.print.check.top:0
+msgid "Description"
+msgstr "Descrição"
+
+#. module: account_check_writing
+#: model:ir.model,name:account_check_writing.model_account_journal
+msgid "Journal"
+msgstr "Diário"
+
+#. module: account_check_writing
+#: model:ir.actions.act_window,name:account_check_writing.action_write_check
+#: model:ir.ui.menu,name:account_check_writing.menu_action_write_check
+msgid "Write Checks"
+msgstr "Preencher cheques"
+
+#. module: account_check_writing
+#: report:account.print.check.bottom:0
+#: report:account.print.check.middle:0
+#: report:account.print.check.top:0
+msgid "Discount"
+msgstr "Desconto"
+
+#. module: account_check_writing
+#: report:account.print.check.bottom:0
+#: report:account.print.check.middle:0
+#: report:account.print.check.top:0
+msgid "Original Amount"
+msgstr "Montante original"
+
+#. module: account_check_writing
+#: view:res.company:0
+msgid "Configuration"
+msgstr "Configuração"
+
+#. module: account_check_writing
+#: field:account.voucher,allow_check:0
+msgid "Allow Check Writing"
+msgstr "Permitir cheques"
+
+#. module: account_check_writing
+#: report:account.print.check.bottom:0
+#: report:account.print.check.middle:0
+#: report:account.print.check.top:0
+msgid "Payment"
+msgstr "Pagamento"
+
+#. module: account_check_writing
+#: field:account.journal,use_preprint_check:0
+msgid "Use Preprinted Check"
+msgstr "Usar cheques pré imprimidos"
+
+#. module: account_check_writing
+#: sql_constraint:res.company:0
+msgid "The company name must be unique !"
+msgstr "O nome da empresa deve ser único!"
+
+#. module: account_check_writing
+#: report:account.print.check.bottom:0
+#: report:account.print.check.middle:0
+#: report:account.print.check.top:0
+msgid "Due Date"
+msgstr "Data da Dívida"
+
+#. module: account_check_writing
+#: model:ir.model,name:account_check_writing.model_res_company
+msgid "Companies"
+msgstr "Empresas"
+
+#. module: account_check_writing
+#: view:res.company:0
+msgid "Default Check layout"
+msgstr "Verificar disposição predefinida"
+
+#. module: account_check_writing
+#: constraint:account.journal:0
+msgid ""
+"Configuration error! The currency chosen should be shared by the default "
+"accounts too."
+msgstr ""
+"Erro na configuração! A moeda escolhida deve ser partilhada também pelas "
+"contas padrão."
+
+#. module: account_check_writing
+#: report:account.print.check.bottom:0
+#: report:account.print.check.middle:0
+msgid "Balance Due"
+msgstr "Saldo devedor"
+
+#. module: account_check_writing
+#: report:account.print.check.bottom:0
+#: report:account.print.check.middle:0
+#: report:account.print.check.top:0
+msgid "Check Amount"
+msgstr "Verificar montante"
+
+#. module: account_check_writing
+#: model:ir.model,name:account_check_writing.model_account_voucher
+msgid "Accounting Voucher"
+msgstr "Voucher da Contabilidade"
+
+#. module: account_check_writing
+#: sql_constraint:account.journal:0
+msgid "The name of the journal must be unique per company !"
+msgstr "O nome do diário deve ser único por empresa!"
+
+#. module: account_check_writing
+#: sql_constraint:account.journal:0
+msgid "The code of the journal must be unique per company !"
+msgstr "O código do diário deve ser único por empresa!"
+
+#. module: account_check_writing
+#: field:account.voucher,amount_in_word:0
+msgid "Amount in Word"
+msgstr "Valor em Palavra"
+
+#. module: account_check_writing
+#: report:account.print.check.top:0
+msgid "Open Balance"
+msgstr "Abrir Balanço"
+
+#. module: account_check_writing
+#: field:res.company,check_layout:0
+msgid "Choose Check layout"
+msgstr "Escolha verificação da disposição"
diff --git a/addons/account_invoice_layout/i18n/gu.po b/addons/account_invoice_layout/i18n/gu.po
new file mode 100644
index 00000000000..b01663a7adf
--- /dev/null
+++ b/addons/account_invoice_layout/i18n/gu.po
@@ -0,0 +1,355 @@
+# 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-16 11:19+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-17 04:51+0000\n"
+"X-Generator: Launchpad (build 15099)\n"
+
+#. module: account_invoice_layout
+#: selection:account.invoice.line,state:0
+msgid "Sub Total"
+msgstr ""
+
+#. module: account_invoice_layout
+#: report:account.invoice.layout:0
+#: report:notify_account.invoice:0
+msgid "Note:"
+msgstr "નોંધ:"
+
+#. module: account_invoice_layout
+#: report:account.invoice.layout:0
+#: report:notify_account.invoice:0
+msgid "Cancelled Invoice"
+msgstr ""
+
+#. module: account_invoice_layout
+#: selection:account.invoice.line,state:0
+#: field:notify.message,name:0
+msgid "Title"
+msgstr "શીર્ષક"
+
+#. module: account_invoice_layout
+#: report:account.invoice.layout:0
+#: report:notify_account.invoice:0
+msgid "Disc. (%)"
+msgstr ""
+
+#. module: account_invoice_layout
+#: selection:account.invoice.line,state:0
+msgid "Note"
+msgstr "નોંધ"
+
+#. module: account_invoice_layout
+#: view:account.invoice.special.msg:0
+msgid "Print"
+msgstr ""
+
+#. module: account_invoice_layout
+#: help:notify.message,msg:0
+msgid ""
+"This notification will appear at the bottom of the Invoices when printed."
+msgstr ""
+
+#. module: account_invoice_layout
+#: report:account.invoice.layout:0
+#: report:notify_account.invoice:0
+msgid "Unit Price"
+msgstr ""
+
+#. module: account_invoice_layout
+#: model:ir.model,name:account_invoice_layout.model_notify_message
+msgid "Notify By Messages"
+msgstr ""
+
+#. module: account_invoice_layout
+#: report:account.invoice.layout:0
+#: report:notify_account.invoice:0
+msgid "VAT :"
+msgstr ""
+
+#. module: account_invoice_layout
+#: report:account.invoice.layout:0
+#: report:notify_account.invoice:0
+msgid "Tel. :"
+msgstr ""
+
+#. module: account_invoice_layout
+#: report:account.invoice.layout:0
+#: report:notify_account.invoice:0
+msgid "PRO-FORMA"
+msgstr ""
+
+#. module: account_invoice_layout
+#: field:account.invoice,abstract_line_ids:0
+msgid "Invoice Lines"
+msgstr ""
+
+#. module: account_invoice_layout
+#: view:account.invoice.line:0
+msgid "Seq."
+msgstr ""
+
+#. module: account_invoice_layout
+#: model:ir.ui.menu,name:account_invoice_layout.menu_finan_config_notify_message
+msgid "Notification Message"
+msgstr ""
+
+#. module: account_invoice_layout
+#: report:account.invoice.layout:0
+msgid "Customer Code"
+msgstr ""
+
+#. module: account_invoice_layout
+#: report:account.invoice.layout:0
+#: report:notify_account.invoice:0
+msgid "Description"
+msgstr "વર્ણન"
+
+#. module: account_invoice_layout
+#: help:account.invoice.line,sequence:0
+msgid "Gives the sequence order when displaying a list of invoice lines."
+msgstr ""
+
+#. module: account_invoice_layout
+#: report:account.invoice.layout:0
+#: report:notify_account.invoice:0
+msgid "Price"
+msgstr "કિંમત"
+
+#. module: account_invoice_layout
+#: report:account.invoice.layout:0
+#: report:notify_account.invoice:0
+msgid "Invoice Date"
+msgstr "બિલ તારીખ"
+
+#. module: account_invoice_layout
+#: report:account.invoice.layout:0
+msgid "Taxes:"
+msgstr "કર:"
+
+#. module: account_invoice_layout
+#: field:account.invoice.line,functional_field:0
+msgid "Source Account"
+msgstr "સ્રોત ખાતુ"
+
+#. module: account_invoice_layout
+#: model:ir.actions.act_window,name:account_invoice_layout.notify_mesage_tree_form
+msgid "Write Messages"
+msgstr ""
+
+#. module: account_invoice_layout
+#: report:account.invoice.layout:0
+#: report:notify_account.invoice:0
+msgid "Base"
+msgstr "આધાર"
+
+#. module: account_invoice_layout
+#: selection:account.invoice.line,state:0
+msgid "Page Break"
+msgstr ""
+
+#. module: account_invoice_layout
+#: view:notify.message:0
+#: field:notify.message,msg:0
+msgid "Special Message"
+msgstr ""
+
+#. module: account_invoice_layout
+#: help:account.invoice.special.msg,message:0
+msgid "Message to Print at the bottom of report"
+msgstr ""
+
+#. module: account_invoice_layout
+#: report:account.invoice.layout:0
+#: report:notify_account.invoice:0
+msgid "Quantity"
+msgstr "જથ્થો"
+
+#. module: account_invoice_layout
+#: report:account.invoice.layout:0
+#: report:notify_account.invoice:0
+msgid "Refund"
+msgstr "વળતર"
+
+#. module: account_invoice_layout
+#: report:account.invoice.layout:0
+#: report:notify_account.invoice:0
+msgid "Fax :"
+msgstr "ફેક્સ:"
+
+#. module: account_invoice_layout
+#: report:account.invoice.layout:0
+msgid "Total:"
+msgstr "કુલ:"
+
+#. module: account_invoice_layout
+#: view:account.invoice.special.msg:0
+msgid "Select Message"
+msgstr "સંદેશ પસંદ કરો"
+
+#. module: account_invoice_layout
+#: view:notify.message:0
+msgid "Messages"
+msgstr "સંદેશાઓ"
+
+#. module: account_invoice_layout
+#: selection:account.invoice.line,state:0
+msgid "Product"
+msgstr "વસ્તુ"
+
+#. module: account_invoice_layout
+#: report:account.invoice.layout:0
+#: report:notify_account.invoice:0
+msgid "Description / Taxes"
+msgstr ""
+
+#. module: account_invoice_layout
+#: report:account.invoice.layout:0
+#: report:notify_account.invoice:0
+msgid "Amount"
+msgstr "કિંમત"
+
+#. module: account_invoice_layout
+#: model:notify.message,msg:account_invoice_layout.demo_message1
+msgid "ERP & CRM Solutions..."
+msgstr ""
+
+#. module: account_invoice_layout
+#: report:notify_account.invoice:0
+msgid "Net Total :"
+msgstr ""
+
+#. module: account_invoice_layout
+#: report:notify_account.invoice:0
+msgid "Total :"
+msgstr ""
+
+#. module: account_invoice_layout
+#: report:account.invoice.layout:0
+#: report:notify_account.invoice:0
+msgid "Draft Invoice"
+msgstr ""
+
+#. module: account_invoice_layout
+#: field:account.invoice.line,sequence:0
+msgid "Sequence Number"
+msgstr "ક્રમ નંબર"
+
+#. module: account_invoice_layout
+#: model:ir.model,name:account_invoice_layout.model_account_invoice_special_msg
+msgid "Account Invoice Special Message"
+msgstr ""
+
+#. module: account_invoice_layout
+#: report:account.invoice.layout:0
+#: report:notify_account.invoice:0
+msgid "Origin"
+msgstr "ઉદ્ભવ"
+
+#. module: account_invoice_layout
+#: sql_constraint:account.invoice:0
+msgid "Invoice Number must be unique per Company!"
+msgstr ""
+
+#. module: account_invoice_layout
+#: selection:account.invoice.line,state:0
+msgid "Separator Line"
+msgstr ""
+
+#. module: account_invoice_layout
+#: report:notify_account.invoice:0
+msgid "Your Reference"
+msgstr ""
+
+#. module: account_invoice_layout
+#: report:account.invoice.layout:0
+#: report:notify_account.invoice:0
+msgid "Supplier Invoice"
+msgstr ""
+
+#. module: account_invoice_layout
+#: model:ir.actions.report.xml,name:account_invoice_layout.account_invoices_1
+msgid "Invoices"
+msgstr "ઈનવોઈસ"
+
+#. module: account_invoice_layout
+#: constraint:account.invoice:0
+msgid "Invalid BBA Structured Communication !"
+msgstr ""
+
+#. module: account_invoice_layout
+#: report:account.invoice.layout:0
+#: report:notify_account.invoice:0
+msgid "Tax"
+msgstr "કરવેરો"
+
+#. module: account_invoice_layout
+#: model:ir.model,name:account_invoice_layout.model_account_invoice_line
+msgid "Invoice Line"
+msgstr ""
+
+#. module: account_invoice_layout
+#: report:account.invoice.layout:0
+msgid "Net Total:"
+msgstr ""
+
+#. module: account_invoice_layout
+#: model:ir.actions.act_window,name:account_invoice_layout.action_account_invoice_special_msg
+#: model:ir.actions.report.xml,name:account_invoice_layout.account_invoices_layout_message
+msgid "Invoices and Message"
+msgstr ""
+
+#. module: account_invoice_layout
+#: field:account.invoice.line,state:0
+msgid "Type"
+msgstr "પ્રકાર"
+
+#. module: account_invoice_layout
+#: view:notify.message:0
+msgid "Write a notification or a wishful message."
+msgstr ""
+
+#. module: account_invoice_layout
+#: report:account.invoice.layout:0
+#: model:ir.model,name:account_invoice_layout.model_account_invoice
+#: report:notify_account.invoice:0
+msgid "Invoice"
+msgstr "બિલ"
+
+#. module: account_invoice_layout
+#: view:account.invoice.special.msg:0
+msgid "Cancel"
+msgstr "રદ કરો"
+
+#. module: account_invoice_layout
+#: report:account.invoice.layout:0
+#: report:notify_account.invoice:0
+msgid "Supplier Refund"
+msgstr ""
+
+#. module: account_invoice_layout
+#: field:account.invoice.special.msg,message:0
+msgid "Message"
+msgstr "સંદેશો"
+
+#. module: account_invoice_layout
+#: report:notify_account.invoice:0
+msgid "Taxes :"
+msgstr "કરવેરો"
+
+#. module: account_invoice_layout
+#: model:ir.ui.menu,name:account_invoice_layout.menu_notify_mesage_tree_form
+msgid "All Notification Messages"
+msgstr ""
diff --git a/addons/auction/i18n/gu.po b/addons/auction/i18n/gu.po
new file mode 100644
index 00000000000..17ca8f5633d
--- /dev/null
+++ b/addons/auction/i18n/gu.po
@@ -0,0 +1,2357 @@
+# 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-16 11:28+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-17 04:51+0000\n"
+"X-Generator: Launchpad (build 15099)\n"
+
+#. module: auction
+#: model:ir.ui.menu,name:auction.auction_report_menu
+msgid "Reporting"
+msgstr "અહેવાલીકરણ"
+
+#. module: auction
+#: model:ir.model,name:auction.model_auction_taken
+msgid "Auction taken"
+msgstr ""
+
+#. module: auction
+#: view:auction.lots:0
+msgid "Set to draft"
+msgstr ""
+
+#. module: auction
+#: view:auction.deposit:0
+#: field:auction.deposit,partner_id:0
+#: field:auction.lots,seller_id:0
+#: view:report.auction:0
+#: field:report.auction,seller:0
+msgid "Seller"
+msgstr ""
+
+#. module: auction
+#: field:auction.lots,name:0
+msgid "Title"
+msgstr "શીર્ષક"
+
+#. module: auction
+#: field:auction.lots.sms.send,text:0
+msgid "SMS Message"
+msgstr ""
+
+#. module: auction
+#: view:auction.catalog.flagey:0
+#: view:auction.lots.auction.move:0
+#: view:auction.lots.make.invoice.buyer:0
+msgid " "
+msgstr " "
+
+#. module: auction
+#: view:auction.lots.auction.move:0
+msgid "Warning, Erase The Object Adjudication Price and Its Buyer!"
+msgstr ""
+
+#. module: auction
+#: help:auction.pay.buy,statement_id1:0
+msgid "First Bank Statement For Buyer"
+msgstr ""
+
+#. module: auction
+#: field:auction.bid_line,lot_id:0
+#: field:auction.lot.history,lot_id:0
+msgid "Object"
+msgstr "ઓબ્જેક્ટ"
+
+#. module: auction
+#: field:report.auction.object.date,obj_num:0
+msgid "# of Objects"
+msgstr ""
+
+#. module: auction
+#: view:auction.lots:0
+msgid "Authors"
+msgstr "લેખકો"
+
+#. module: auction
+#: view:auction.bid:0
+#: report:auction.bids:0
+#: view:auction.lots:0
+#: field:auction.lots,ach_uid:0
+#: field:auction.lots.buyer_map,ach_uid:0
+#: field:auction.lots.make.invoice.buyer,buyer_id:0
+#: field:auction.pay.buy,buyer_id:0
+#: report:buyer.list:0
+#: view:report.auction:0
+#: field:report.auction,buyer:0
+#: report:report.auction.buyer.result:0
+msgid "Buyer"
+msgstr "ખરીદનાર"
+
+#. module: auction
+#: field:report.auction,object:0
+msgid "No of objects"
+msgstr ""
+
+#. module: auction
+#: help:auction.lots,paid_vnd:0
+msgid ""
+"When state of Seller Invoice is 'Paid', this field is selected as True."
+msgstr ""
+
+#. module: auction
+#: report:auction.total.rml:0
+msgid "# of paid items (based on invoices):"
+msgstr ""
+
+#. module: auction
+#: view:auction.deposit:0
+msgid "Deposit Border"
+msgstr ""
+
+#. module: auction
+#: field:auction.lots.make.invoice,amount:0
+#: field:auction.lots.make.invoice.buyer,amount:0
+msgid "Invoiced Amount"
+msgstr ""
+
+#. module: auction
+#: help:auction.lots,name:0
+msgid "Auction object name"
+msgstr ""
+
+#. module: auction
+#: model:ir.model,name:auction.model_aie_category
+msgid "aie.category"
+msgstr ""
+
+#. module: auction
+#: field:auction.deposit.cost,amount:0
+#: field:auction.pay.buy,amount:0
+#: field:auction.pay.buy,amount2:0
+#: field:auction.pay.buy,amount3:0
+msgid "Amount"
+msgstr "કિંમત"
+
+#. module: auction
+#: model:ir.actions.act_window,name:auction.action_deposit_border
+#: model:ir.ui.menu,name:auction.menu_auction_deposit_border
+msgid "Deposit border"
+msgstr ""
+
+#. module: auction
+#: view:auction.deposit:0
+msgid "Reference"
+msgstr "સંદર્ભ"
+
+#. module: auction
+#: help:auction.dates,state:0
+msgid ""
+"When auction starts the state is 'Draft'.\n"
+" At the end of auction, the state becomes 'Closed'."
+msgstr ""
+
+#. module: auction
+#: field:auction.dates,account_analytic_id:0
+msgid "Analytic Account"
+msgstr "વિશ્લેષણાત્મક ખાતું"
+
+#. module: auction
+#: help:auction.pay.buy,amount3:0
+msgid "Amount For Third Bank Statement"
+msgstr ""
+
+#. module: auction
+#: view:auction.lots:0
+msgid "Buy object"
+msgstr ""
+
+#. module: auction
+#: field:auction.lots,lot_num:0
+msgid "List Number"
+msgstr ""
+
+#. module: auction
+#: report:buyer.list:0
+msgid "Date:"
+msgstr "તારીખ:"
+
+#. module: auction
+#: field:auction.deposit.cost,name:0
+msgid "Cost Name"
+msgstr ""
+
+#. module: auction
+#: view:auction.dates:0
+#: field:auction.dates,state:0
+#: view:auction.lots:0
+#: field:auction.lots,state:0
+#: view:report.auction:0
+#: field:report.auction,state:0
+msgid "State"
+msgstr "સ્થિતિ"
+
+#. module: auction
+#: view:auction.dates:0
+msgid "First Auction Date"
+msgstr ""
+
+#. module: auction
+#: selection:report.auction,month:0
+msgid "January"
+msgstr "જાન્યુઆરી"
+
+#. module: auction
+#: help:auction.lot.category,active:0
+msgid ""
+"If the active field is set to False, it will allow you to hide the auction "
+"lot category without removing it."
+msgstr ""
+
+#. module: auction
+#: view:auction.lots:0
+msgid "Ref"
+msgstr "સંદર્ભ"
+
+#. module: auction
+#: field:report.auction,total_price:0
+msgid "Total Price"
+msgstr ""
+
+#. module: auction
+#: view:auction.lots:0
+msgid "Total Adj."
+msgstr ""
+
+#. module: auction
+#: view:auction.lots.sms.send:0
+msgid "SMS - Gateway: clickatell','Bulk SMS send"
+msgstr ""
+
+#. module: auction
+#: help:auction.lots,costs:0
+msgid "Deposit cost"
+msgstr ""
+
+#. module: auction
+#: selection:auction.lots,state:0
+#: selection:report.auction,state:0
+#: selection:report.object.encoded,state:0
+msgid "Unsold"
+msgstr ""
+
+#. module: auction
+#: view:auction.deposit:0
+msgid "Search Auction deposit"
+msgstr ""
+
+#. module: auction
+#: help:auction.lots,lot_num:0
+msgid "List number in depositer inventory"
+msgstr ""
+
+#. module: auction
+#: report:auction.total.rml:0
+msgid "Items"
+msgstr "વસ્તુઓ"
+
+#. module: auction
+#: model:account.tax,name:auction.auction_tax5
+#: field:auction.dates,seller_costs:0
+msgid "Seller Costs"
+msgstr ""
+
+#. module: auction
+#: view:auction.bid:0
+#: view:auction.bid_line:0
+#: view:auction.lots:0
+#: field:auction.lots,bid_lines:0
+#: model:ir.actions.report.xml,name:auction.bid_auction
+#: model:ir.ui.menu,name:auction.menu_action_bid_open
+msgid "Bids"
+msgstr ""
+
+#. module: auction
+#: field:report.auction,gross_revenue:0
+msgid "Gross Revenue"
+msgstr ""
+
+#. module: auction
+#: view:auction.lots.buyer_map:0
+msgid "Buyer Map"
+msgstr ""
+
+#. module: auction
+#: field:report.object.encoded,obj_ret:0
+msgid "# obj ret"
+msgstr ""
+
+#. module: auction
+#: model:ir.model,name:auction.model_auction_bid
+msgid "Bid Auctions"
+msgstr ""
+
+#. module: auction
+#: help:auction.lots,image:0
+msgid "Object Image"
+msgstr ""
+
+#. module: auction
+#: code:addons/auction/wizard/auction_lots_buyer_map.py:70
+#, python-format
+msgid "No buyer is set for this lot."
+msgstr ""
+
+#. module: auction
+#: code:addons/auction/auction.py:578
+#, python-format
+msgid "The Buyer \"%s\" has no Invoice Address."
+msgstr ""
+
+#. module: auction
+#: model:ir.actions.act_window,name:auction.action_auction_object_categories
+msgid "Auction object Categories"
+msgstr ""
+
+#. module: auction
+#: model:ir.model,name:auction.model_auction_deposit_cost
+msgid "Auction Deposit Cost"
+msgstr ""
+
+#. module: auction
+#: view:auction.deposit:0
+msgid "Deposit Border Form"
+msgstr ""
+
+#. module: auction
+#: help:auction.lots,statement_id:0
+msgid "Bank statement line for given buyer"
+msgstr ""
+
+#. module: auction
+#: field:auction.lot.category,aie_categ:0
+msgid "Category"
+msgstr "શ્રેણી"
+
+#. module: auction
+#: model:ir.actions.act_window,name:auction.action_view_auction_buyer_map
+msgid "Map buyer username to Partners"
+msgstr ""
+
+#. module: auction
+#: view:auction.lots:0
+msgid "Search Auction Lots"
+msgstr ""
+
+#. module: auction
+#: field:report.auction,net_revenue:0
+msgid "Net Revenue"
+msgstr ""
+
+#. module: auction
+#: field:report.auction.adjudication,state:0
+#: field:report.object.encoded,state:0
+msgid "Status"
+msgstr "સ્થિતિ"
+
+#. module: auction
+#: model:ir.actions.act_window,name:auction.action_auction_lots_sms_send
+msgid "SMS Send"
+msgstr ""
+
+#. module: auction
+#: selection:report.auction,month:0
+msgid "August"
+msgstr "ઑગસ્ટ"
+
+#. module: auction
+#: view:auction.lots:0
+#: selection:auction.lots,state:0
+#: view:report.auction:0
+#: selection:report.auction,state:0
+msgid "Sold"
+msgstr ""
+
+#. module: auction
+#: selection:report.auction,month:0
+msgid "June"
+msgstr "જૂન"
+
+#. module: auction
+#: code:addons/auction/wizard/auction_catalog_flagey_report.py:63
+#, python-format
+msgid "No Lots belong to this Auction Date"
+msgstr ""
+
+#. module: auction
+#: view:auction.lots:0
+msgid "New Object"
+msgstr ""
+
+#. module: auction
+#: selection:report.auction,month:0
+msgid "October"
+msgstr "ઑક્ટોબર"
+
+#. module: auction
+#: field:auction.bid_line,name:0
+msgid "Bid date"
+msgstr ""
+
+#. module: auction
+#: field:auction.dates,acc_expense:0
+msgid "Expense Account"
+msgstr ""
+
+#. module: auction
+#: model:ir.ui.menu,name:auction.menu_wizard_emporte
+msgid "Deliveries Management"
+msgstr ""
+
+#. module: auction
+#: field:auction.lots,obj_desc:0
+msgid "Object Description"
+msgstr ""
+
+#. module: auction
+#: field:auction.lots,artist2_id:0
+msgid "Artist/Author2"
+msgstr ""
+
+#. module: auction
+#: view:auction.pay.buy:0
+msgid "Line1"
+msgstr ""
+
+#. module: auction
+#: model:ir.model,name:auction.model_auction_lots_make_invoice_buyer
+msgid "Make Invoice for Buyer"
+msgstr ""
+
+#. module: auction
+#: field:auction.lots,gross_revenue:0
+#: field:report.object.encoded,gross_revenue:0
+msgid "Gross revenue"
+msgstr ""
+
+#. module: auction
+#: model:ir.actions.act_window,name:auction.action_auction_pay_buy
+msgid "Pay objects of the buyer"
+msgstr ""
+
+#. module: auction
+#: help:auction.dates,auction2:0
+msgid "End date of auction"
+msgstr ""
+
+#. module: auction
+#: view:auction.lots.sms.send:0
+msgid "Send SMS"
+msgstr ""
+
+#. module: auction
+#: field:auction.lots,name2:0
+msgid "Short Description (2)"
+msgstr ""
+
+#. module: auction
+#: report:auction.total.rml:0
+#: model:ir.ui.menu,name:auction.auction_buyers_menu
+msgid "Buyers"
+msgstr ""
+
+#. module: auction
+#: view:auction.lots:0
+#: view:report.auction:0
+msgid "Object Category"
+msgstr ""
+
+#. module: auction
+#: model:account.tax.code,name:auction.account_tax_code_id4
+msgid "VAT 12%"
+msgstr ""
+
+#. module: auction
+#: view:auction.dates:0
+msgid "Buyer Invoices"
+msgstr ""
+
+#. module: auction
+#: model:ir.actions.report.xml,name:auction.res_w_buyer
+msgid "Results with buyer"
+msgstr ""
+
+#. module: auction
+#: field:auction.bid_line,price:0
+msgid "Maximum Price"
+msgstr ""
+
+#. module: auction
+#: help:auction.dates,auction1:0
+msgid "Start date of auction"
+msgstr ""
+
+#. module: auction
+#: model:ir.model,name:auction.model_auction_lots_auction_move
+msgid "Auction Move"
+msgstr ""
+
+#. module: auction
+#: help:auction.dates,buyer_costs:0
+msgid "Account tax for buyer"
+msgstr ""
+
+#. module: auction
+#: view:auction.dates:0
+msgid "Next Auction"
+msgstr ""
+
+#. module: auction
+#: view:auction.taken:0
+msgid "Select lots which are Sold"
+msgstr ""
+
+#. module: auction
+#: field:auction.lots,statement_id:0
+msgid "Payment"
+msgstr ""
+
+#. module: auction
+#: code:addons/auction/auction.py:571
+#: code:addons/auction/auction.py:686
+#, python-format
+msgid "The object \"%s\" has no buyer assigned."
+msgstr ""
+
+#. module: auction
+#: selection:auction.deposit,method:0
+msgid "Keep until sold"
+msgstr ""
+
+#. module: auction
+#: view:auction.dates:0
+msgid "Last Auction Date"
+msgstr ""
+
+#. module: auction
+#: field:report.object.encoded,obj_num:0
+msgid "# of Encoded obj."
+msgstr ""
+
+#. module: auction
+#: field:auction.lots,paid_vnd:0
+msgid "Seller Paid"
+msgstr ""
+
+#. module: auction
+#: view:board.board:0
+#: view:report.object.encoded:0
+msgid "Objects statistics"
+msgstr ""
+
+#. module: auction
+#: report:auction.total.rml:0
+msgid "# of sellers:"
+msgstr ""
+
+#. module: auction
+#: field:report.auction,date:0
+#: field:report.object.encoded,date:0
+msgid "Create Date"
+msgstr ""
+
+#. module: auction
+#: view:auction.dates:0
+#: selection:report.object.encoded,state:0
+msgid "Invoiced"
+msgstr ""
+
+#. module: auction
+#: report:auction.total.rml:0
+msgid "# of items taken away:"
+msgstr ""
+
+#. module: auction
+#: model:ir.model,name:auction.model_report_auction
+#: view:report.auction:0
+msgid "Auction's Summary"
+msgstr ""
+
+#. module: auction
+#: report:buyer.list:0
+msgid "%)"
+msgstr "%)"
+
+#. module: auction
+#: view:auction.lots:0
+msgid "Buyer Information"
+msgstr ""
+
+#. module: auction
+#: help:auction.lots,gross_revenue:0
+msgid "Buyer Price - Seller Price"
+msgstr ""
+
+#. module: auction
+#: field:auction.lots.make.invoice,objects:0
+#: field:auction.lots.make.invoice.buyer,objects:0
+msgid "# of objects"
+msgstr ""
+
+#. module: auction
+#: field:auction.lots,lot_est2:0
+msgid "Maximum Estimation"
+msgstr ""
+
+#. module: auction
+#: field:auction.lots,buyer_price:0
+msgid "Buyer price"
+msgstr ""
+
+#. module: auction
+#: view:auction.lots:0
+msgid "Bids Details"
+msgstr ""
+
+#. module: auction
+#: field:auction.lots,is_ok:0
+msgid "Buyer's payment"
+msgstr ""
+
+#. module: auction
+#: view:auction.dates:0
+msgid "End of auction"
+msgstr ""
+
+#. module: auction
+#: model:ir.actions.act_window,name:auction.action_auction_catalog_flagey_wizard
+#: model:ir.model,name:auction.model_auction_catalog_flagey
+msgid "Auction Catalog Flagey"
+msgstr ""
+
+#. module: auction
+#: selection:report.auction,month:0
+msgid "March"
+msgstr "માર્ચ"
+
+#. module: auction
+#: model:account.tax,name:auction.auction_tax4
+msgid "Seller Costs1"
+msgstr ""
+
+#. module: auction
+#: field:auction.deposit,create_uid:0
+#: field:auction.lots,create_uid:0
+msgid "Created by"
+msgstr "દ્દારા બનાવેલ છે"
+
+#. module: auction
+#: report:auction.total.rml:0
+msgid "# of buyers:"
+msgstr ""
+
+#. module: auction
+#: field:auction.lots,costs:0
+msgid "Indirect costs"
+msgstr ""
+
+#. module: auction
+#: help:auction.dates,seller_costs:0
+msgid "Account tax for seller"
+msgstr ""
+
+#. module: auction
+#: code:addons/auction/wizard/auction_lots_invoice.py:67
+#: code:addons/auction/wizard/auction_lots_numerotate.py:103
+#: code:addons/auction/wizard/auction_lots_numerotate.py:129
+#, python-format
+msgid "UserError"
+msgstr ""
+
+#. module: auction
+#: field:auction.dates,journal_seller_id:0
+msgid "Seller Journal"
+msgstr ""
+
+#. module: auction
+#: view:auction.dates:0
+#: selection:auction.dates,state:0
+#: view:auction.lots:0
+#: selection:auction.lots,state:0
+#: view:report.auction:0
+#: selection:report.auction,state:0
+#: selection:report.auction.adjudication,state:0
+#: selection:report.object.encoded,state:0
+msgid "Draft"
+msgstr "ડ્રાફ્ટ"
+
+#. module: auction
+#: view:auction.dates:0
+msgid "Invoiced Auction"
+msgstr ""
+
+#. module: auction
+#: view:auction.catalog.flagey:0
+msgid "Print"
+msgstr "છાપો"
+
+#. module: auction
+#: view:auction.lots:0
+#: view:report.auction:0
+msgid "Type"
+msgstr "પ્રકાર"
+
+#. module: auction
+#: help:aie.category,child_ids:0
+msgid "children aie category"
+msgstr ""
+
+#. module: auction
+#: help:auction.lots,ach_emp:0
+msgid "When state is Taken Away, this field is marked as True"
+msgstr ""
+
+#. module: auction
+#: model:ir.actions.act_window,name:auction.action_auction_taken
+msgid "Gestion emporte"
+msgstr ""
+
+#. module: auction
+#: view:auction.bid:0
+#: report:auction.bids:0
+#: view:auction.dates:0
+#: view:auction.lots:0
+#: field:auction.lots,auction_id:0
+#: report:auction.total.rml:0
+#: model:ir.module.category,name:auction.module_category_auction
+#: model:ir.ui.menu,name:auction.auction_menu_root
+#: view:report.auction:0
+msgid "Auction"
+msgstr ""
+
+#. module: auction
+#: view:auction.lot.category:0
+#: model:ir.ui.menu,name:auction.menu_auction_object_cat
+msgid "Object Categories"
+msgstr ""
+
+#. module: auction
+#: field:auction.lots.sms.send,app_id:0
+msgid "API ID"
+msgstr ""
+
+#. module: auction
+#: field:auction.bid,name:0
+#: field:auction.bid_line,bid_id:0
+msgid "Bid ID"
+msgstr ""
+
+#. module: auction
+#: report:auction.total.rml:0
+msgid "Min Estimate:"
+msgstr ""
+
+#. module: auction
+#: selection:report.auction,month:0
+msgid "September"
+msgstr "સપ્ટેમ્બર"
+
+#. module: auction
+#: field:report.auction,net_margin:0
+msgid "Net Margin"
+msgstr ""
+
+#. module: auction
+#: field:auction.lots,vnd_lim_net:0
+msgid "Net limit ?"
+msgstr ""
+
+#. module: auction
+#: field:aie.category,child_ids:0
+msgid "unknown"
+msgstr "અજ્ઞાત"
+
+#. module: auction
+#: report:auction.total.rml:0
+msgid "# of commissions:"
+msgstr ""
+
+#. module: auction
+#: field:auction.bid_line,auction:0
+#: field:auction.dates,name:0
+msgid "Auction Name"
+msgstr ""
+
+#. module: auction
+#: model:account.tax,name:auction.tax_seller
+msgid "Seller Costs (12%)"
+msgstr ""
+
+#. module: auction
+#: field:aie.category,parent_id:0
+msgid "Parent aie Category"
+msgstr ""
+
+#. module: auction
+#: view:report.auction:0
+msgid "Auction Summary"
+msgstr ""
+
+#. module: auction
+#: view:auction.lots.make.invoice:0
+#: view:auction.lots.make.invoice.buyer:0
+msgid "(Keep empty for automatic number)"
+msgstr ""
+
+#. module: auction
+#: code:addons/auction/auction.py:578
+#, python-format
+msgid "No Invoice Address"
+msgstr ""
+
+#. module: auction
+#: model:ir.actions.report.xml,name:auction.v_huissier
+msgid "Bailiffs Listing"
+msgstr ""
+
+#. module: auction
+#: code:addons/auction/wizard/auction_lots_numerotate.py:103
+#: code:addons/auction/wizard/auction_lots_numerotate.py:129
+#, python-format
+msgid "This record does not exist !"
+msgstr ""
+
+#. module: auction
+#: field:auction.pay.buy,total:0
+msgid "Total Amount"
+msgstr "કુલ રકમ"
+
+#. module: auction
+#: help:auction.pay.buy,amount:0
+msgid "Amount For First Bank Statement"
+msgstr ""
+
+#. module: auction
+#: model:ir.model,name:auction.model_report_auction_object_date
+#: view:report.auction.object.date:0
+msgid "Objects per day"
+msgstr ""
+
+#. module: auction
+#: help:auction.lots,author_right:0
+msgid "Account tax for author commission"
+msgstr ""
+
+#. module: auction
+#: model:product.template,name:auction.monproduit_product_template
+msgid "Oeuvres a 21%"
+msgstr ""
+
+#. module: auction
+#: field:report.object.encoded,adj:0
+msgid "Adj."
+msgstr ""
+
+#. module: auction
+#: field:auction.lot.history,name:0
+#: field:report.auction.adjudication,date:0
+msgid "Date"
+msgstr "તારીખ"
+
+#. module: auction
+#: field:auction.lots,obj_ret:0
+msgid "Price retired"
+msgstr ""
+
+#. module: auction
+#: view:auction.deposit:0
+msgid "Extra Costs"
+msgstr ""
+
+#. module: auction
+#: view:auction.lots.buyer_map:0
+msgid "Map "
+msgstr ""
+
+#. module: auction
+#: field:auction.lots,paid_ach:0
+msgid "Buyer Invoice Reconciled"
+msgstr ""
+
+#. module: auction
+#: field:auction.deposit,date_dep:0
+msgid "Deposit date"
+msgstr ""
+
+#. module: auction
+#: model:ir.actions.report.xml,name:auction.id_deposit
+msgid "Deposits"
+msgstr ""
+
+#. module: auction
+#: field:auction.deposit,specific_cost_ids:0
+msgid "Specific Costs"
+msgstr ""
+
+#. module: auction
+#: report:buyer.list:0
+msgid "To pay ("
+msgstr ""
+
+#. module: auction
+#: model:account.tax,name:auction.tax_buyer
+msgid "Buyer Costs (20%)"
+msgstr ""
+
+#. module: auction
+#: model:ir.ui.menu,name:auction.menu_board_auction
+msgid "Dashboard"
+msgstr "ડેશબોર્ડ"
+
+#. module: auction
+#: view:auction.dates:0
+#: model:ir.actions.act_window,name:auction.action_auction_dates_next
+#: model:ir.ui.menu,name:auction.auction_date_menu
+#: model:ir.ui.menu,name:auction.menu_auction_dates_next1
+msgid "Auctions"
+msgstr ""
+
+#. module: auction
+#: view:board.board:0
+msgid "Total Adjudications"
+msgstr ""
+
+#. module: auction
+#: model:ir.model,name:auction.model_auction_lots_make_invoice
+msgid "Make invoice"
+msgstr ""
+
+#. module: auction
+#: selection:report.auction,month:0
+msgid "November"
+msgstr "નવેમ્બર"
+
+#. module: auction
+#: view:auction.dates:0
+#: view:auction.lots:0
+msgid "History"
+msgstr "ઈતિહાસ"
+
+#. module: auction
+#: field:aie.category,code:0
+msgid "Code"
+msgstr "કોડ"
+
+#. module: auction
+#: report:auction.code_bar_lot:0
+msgid "Nr."
+msgstr ""
+
+#. module: auction
+#: model:ir.actions.report.xml,name:auction.v_report_barcode_lot
+msgid "Barcode batch"
+msgstr ""
+
+#. module: auction
+#: report:report.auction.buyer.result:0
+msgid "Num"
+msgstr ""
+
+#. module: auction
+#: view:auction.catalog.flagey:0
+#: view:auction.taken:0
+msgid "Cancel"
+msgstr "રદ કરો"
+
+#. module: auction
+#: view:auction.lots:0
+msgid "Buyer's Payment History"
+msgstr ""
+
+#. module: auction
+#: view:auction.artists:0
+#: field:auction.artists,biography:0
+msgid "Biography"
+msgstr ""
+
+#. module: auction
+#: view:auction.lots:0
+msgid "Inventory"
+msgstr ""
+
+#. module: auction
+#: view:auction.pay.buy:0
+msgid "Pay"
+msgstr ""
+
+#. module: auction
+#: view:auction.lots.make.invoice:0
+msgid "Create Invoices For Seller"
+msgstr ""
+
+#. module: auction
+#: field:report.object.encoded,obj_margin:0
+msgid "Net margin"
+msgstr ""
+
+#. module: auction
+#: help:auction.lots,lot_local:0
+msgid "Auction Location"
+msgstr ""
+
+#. module: auction
+#: view:auction.dates:0
+msgid "Analytic"
+msgstr ""
+
+#. module: auction
+#: help:auction.lots,paid_ach:0
+msgid ""
+"When state of Buyer Invoice is 'Paid', this field is selected as True."
+msgstr ""
+
+#. module: auction
+#: report:bids.lots:0
+#: report:bids.phones.details:0
+msgid "Cat.N"
+msgstr ""
+
+#. module: auction
+#: selection:auction.deposit,method:0
+msgid "Decrease limit of 10%"
+msgstr ""
+
+#. module: auction
+#: field:auction.dates,adj_total:0
+#: field:report.auction.adjudication,adj_total:0
+msgid "Total Adjudication"
+msgstr ""
+
+#. module: auction
+#: model:ir.actions.act_window,name:auction.action_auction_lots_make_invoice_buyer
+msgid "Invoice Buyer objects"
+msgstr ""
+
+#. module: auction
+#: view:report.auction:0
+msgid "My Auction"
+msgstr ""
+
+#. module: auction
+#: help:auction.lots,gross_margin:0
+msgid "(Gross Revenue*100.0)/ Object Price"
+msgstr ""
+
+#. module: auction
+#: field:auction.bid,contact_tel:0
+msgid "Contact Number"
+msgstr ""
+
+#. module: auction
+#: view:auction.lots:0
+msgid "Price"
+msgstr "કિંમત"
+
+#. module: auction
+#: report:bids.phones.details:0
+msgid "-"
+msgstr "-"
+
+#. module: auction
+#: view:auction.deposit:0
+msgid "Photos"
+msgstr "ફોટાઓ"
+
+#. module: auction
+#: field:auction.lots.make.invoice,number:0
+#: field:auction.lots.make.invoice.buyer,number:0
+msgid "Invoice Number"
+msgstr ""
+
+#. module: auction
+#: code:addons/auction/wizard/auction_lots_buyer_map.py:87
+#: code:addons/auction/wizard/auction_lots_numerotate.py:77
+#: code:addons/auction/wizard/auction_lots_numerotate.py:95
+#: code:addons/auction/wizard/auction_lots_numerotate.py:122
+#: code:addons/auction/wizard/auction_lots_numerotate.py:137
+#: code:addons/auction/wizard/auction_lots_numerotate.py:173
+#, python-format
+msgid "Active IDs not Found"
+msgstr ""
+
+#. module: auction
+#: code:addons/auction/wizard/auction_aie_send.py:166
+#: code:addons/auction/wizard/auction_aie_send_result.py:117
+#, python-format
+msgid "Connection to WWW.Auction-in-Europe.com failed !"
+msgstr ""
+
+#. module: auction
+#: model:ir.actions.act_window,name:auction.act_auction_lot_open_bid
+#: model:ir.actions.act_window,name:auction.action_bid_open
+msgid "Open Bids"
+msgstr ""
+
+#. module: auction
+#: model:ir.actions.act_window,name:auction.open_board_auction
+msgid "Auction board"
+msgstr ""
+
+#. module: auction
+#: field:aie.category,name:0
+#: view:auction.artists:0
+#: report:bids.lots:0
+msgid "Name"
+msgstr "નામ"
+
+#. module: auction
+#: field:auction.deposit,name:0
+#: view:auction.lots:0
+#: field:auction.lots,bord_vnd_id:0
+msgid "Depositer Inventory"
+msgstr ""
+
+#. module: auction
+#: code:addons/auction/auction.py:692
+#, python-format
+msgid "The Buyer has no Invoice Address."
+msgstr ""
+
+#. module: auction
+#: model:ir.actions.act_window,name:auction.action_report_auction_adjudication_tree
+msgid "Auction Adjudication Report"
+msgstr ""
+
+#. module: auction
+#: field:auction.lots.sms.send,user:0
+msgid "Login"
+msgstr "લોગ ઇન"
+
+#. module: auction
+#: model:ir.model,name:auction.model_report_auction_adjudication
+msgid "report_auction_adjudication"
+msgstr ""
+
+#. module: auction
+#: model:ir.actions.report.xml,name:auction.seller_lots_3
+msgid "Seller Form"
+msgstr ""
+
+#. module: auction
+#: field:auction.lots,lot_type:0
+#: field:report.auction,lot_type:0
+msgid "Object category"
+msgstr ""
+
+#. module: auction
+#: view:auction.taken:0
+msgid "Mark Lots"
+msgstr ""
+
+#. module: auction
+#: model:ir.model,name:auction.model_auction_lots
+msgid "Auction Object"
+msgstr ""
+
+#. module: auction
+#: field:auction.lots,obj_num:0
+#: field:auction.lots.enable,confirm_en:0
+msgid "Catalog Number"
+msgstr ""
+
+#. module: auction
+#: view:auction.dates:0
+msgid "Accounting"
+msgstr ""
+
+#. module: auction
+#: model:ir.actions.report.xml,name:auction.bid_phone
+msgid "Bids phones"
+msgstr ""
+
+#. module: auction
+#: field:report.auction,avg_estimation:0
+msgid "Avg estimation"
+msgstr ""
+
+#. module: auction
+#: report:auction.total.rml:0
+msgid "Debit:"
+msgstr ""
+
+#. module: auction
+#: code:addons/auction/wizard/auction_aie_send.py:166
+#: code:addons/auction/wizard/auction_aie_send_result.py:116
+#: code:addons/auction/wizard/auction_lots_buyer_map.py:70
+#: code:addons/auction/wizard/auction_lots_numerotate.py:145
+#, python-format
+msgid "Error"
+msgstr "ભૂલ"
+
+#. module: auction
+#: field:auction.lots,author_right:0
+msgid "Author rights"
+msgstr ""
+
+#. module: auction
+#: view:auction.bid:0
+#: view:auction.dates:0
+#: view:auction.deposit:0
+#: view:auction.lots:0
+#: view:report.auction:0
+msgid "Group By..."
+msgstr "ગ્રુપ દ્વારા..."
+
+#. module: auction
+#: view:report.auction:0
+msgid "Auction during last month."
+msgstr ""
+
+#. module: auction
+#: help:auction.dates,journal_id:0
+msgid "Account journal for buyer"
+msgstr ""
+
+#. module: auction
+#: field:auction.bid,bid_lines:0
+#: report:auction.bids:0
+#: report:bids.lots:0
+#: model:ir.model,name:auction.model_auction_bid_line
+msgid "Bid"
+msgstr ""
+
+#. module: auction
+#: view:report.object.encoded:0
+msgid "Total net rev."
+msgstr ""
+
+#. module: auction
+#: view:auction.lots.buyer_map:0
+msgid "Update"
+msgstr "સુધારો"
+
+#. module: auction
+#: report:auction.total.rml:0
+#: model:ir.ui.menu,name:auction.auction_seller_menu
+msgid "Sellers"
+msgstr "વેચનાર"
+
+#. module: auction
+#: view:auction.dates:0
+msgid "Draft Auction"
+msgstr ""
+
+#. module: auction
+#: help:auction.lots,lot_est2:0
+msgid "Maximum Estimate Price"
+msgstr ""
+
+#. module: auction
+#: view:auction.lots:0
+msgid "Notes"
+msgstr "નોંધ"
+
+#. module: auction
+#: view:auction.lots.auction.move:0
+msgid "Move to Auction date"
+msgstr ""
+
+#. module: auction
+#: report:auction.total.rml:0
+msgid "# of unsold items:"
+msgstr ""
+
+#. module: auction
+#: view:auction.dates:0
+msgid "Create Invoices"
+msgstr ""
+
+#. module: auction
+#: field:auction.bid,auction_id:0
+#: view:auction.dates:0
+#: field:auction.lots.auction.move,auction_id:0
+msgid "Auction Date"
+msgstr ""
+
+#. module: auction
+#: report:auction.code_bar_lot:0
+msgid ", ID"
+msgstr ""
+
+#. module: auction
+#: report:buyer.list:0
+msgid "Adj.("
+msgstr ""
+
+#. module: auction
+#: model:ir.actions.report.xml,name:auction.lot_list_inv
+msgid "Lots List - Landscape"
+msgstr ""
+
+#. module: auction
+#: view:auction.artists:0
+msgid "Author/Artist"
+msgstr "લેખક / કલાકાર"
+
+#. module: auction
+#: field:auction.lots,ach_login:0
+#: field:auction.lots.buyer_map,ach_login:0
+msgid "Buyer Username"
+msgstr "ખરીદનાર ઉપભોક્તા"
+
+#. module: auction
+#: field:auction.lot.category,priority:0
+msgid "Priority"
+msgstr "પ્રાથમિકતા"
+
+#. module: auction
+#: view:board.board:0
+#: model:ir.actions.act_window,name:auction.action_report_latest_objects_tree
+msgid "Latest objects"
+msgstr ""
+
+#. module: auction
+#: field:auction.lots,lot_local:0
+msgid "Location"
+msgstr "સ્થળ"
+
+#. module: auction
+#: view:report.auction:0
+msgid "Month -1"
+msgstr ""
+
+#. module: auction
+#: help:auction.lots,is_ok:0
+msgid "When buyer pay for bank statement', this field is marked"
+msgstr ""
+
+#. module: auction
+#: field:auction.lots,ach_emp:0
+msgid "Taken Away"
+msgstr ""
+
+#. module: auction
+#: view:report.object.encoded:0
+msgid "Total gross rev."
+msgstr ""
+
+#. module: auction
+#: help:auction.lots,lot_est1:0
+msgid "Minimum Estimate Price"
+msgstr ""
+
+#. module: auction
+#: view:auction.deposit:0
+msgid "Deposit Date"
+msgstr ""
+
+#. module: auction
+#: code:addons/auction/wizard/auction_lots_numerotate.py:145
+#, python-format
+msgid "This lot does not exist !"
+msgstr ""
+
+#. module: auction
+#: selection:report.auction,month:0
+msgid "July"
+msgstr "જુલાઈ"
+
+#. module: auction
+#: field:auction.bid_line,call:0
+msgid "To be Called"
+msgstr ""
+
+#. module: auction
+#: view:auction.lots:0
+#: model:ir.actions.act_window,name:auction.action_report_auction_lots_estimation_adj_category_tree
+msgid "Min est/Adj/Max est"
+msgstr ""
+
+#. module: auction
+#: field:auction.lots,lot_est1:0
+msgid "Minimum Estimation"
+msgstr ""
+
+#. module: auction
+#: model:ir.model,name:auction.model_auction_lots_sms_send
+msgid "Sms send "
+msgstr ""
+
+#. module: auction
+#: view:auction.lots.auction.move:0
+#: model:ir.actions.act_window,name:auction.action_auction_lots_auction_move
+msgid "Change Auction Date"
+msgstr ""
+
+#. module: auction
+#: field:auction.artists,birth_death_dates:0
+msgid "Lifespan"
+msgstr ""
+
+#. module: auction
+#: view:auction.deposit:0
+#: field:auction.deposit,method:0
+msgid "Withdrawned method"
+msgstr ""
+
+#. module: auction
+#: view:auction.dates:0
+msgid "Buyer Commissions"
+msgstr ""
+
+#. module: auction
+#: model:ir.actions.act_window,name:auction.action_report_auction
+#: model:ir.ui.menu,name:auction.menu_report_auction
+msgid "Auction Analysis"
+msgstr ""
+
+#. module: auction
+#: code:addons/auction/wizard/auction_pay_buy.py:80
+#, python-format
+msgid "Payment aborted !"
+msgstr ""
+
+#. module: auction
+#: field:auction.lot.history,price:0
+msgid "Withdrawn price"
+msgstr ""
+
+#. module: auction
+#: view:auction.dates:0
+msgid "Beginning of the auction"
+msgstr ""
+
+#. module: auction
+#: help:auction.pay.buy,statement_id3:0
+msgid "Third Bank Statement For Buyer"
+msgstr ""
+
+#. module: auction
+#: view:report.auction:0
+#: field:report.auction,month:0
+#: field:report.auction.object.date,month:0
+msgid "Month"
+msgstr "મહિનો"
+
+#. module: auction
+#: report:auction.total.rml:0
+msgid "Max Estimate:"
+msgstr ""
+
+#. module: auction
+#: view:auction.lots:0
+msgid "Statistical"
+msgstr ""
+
+#. module: auction
+#: model:ir.model,name:auction.model_auction_deposit
+msgid "Auction Deposit Border"
+msgstr ""
+
+#. module: auction
+#: model:ir.actions.act_window,name:auction.action_report_object_encoded_tree
+msgid "Object statistics"
+msgstr ""
+
+#. module: auction
+#: help:auction.lots,net_margin:0
+msgid "(Net Revenue * 100)/ Object Price"
+msgstr ""
+
+#. module: auction
+#: model:ir.model,name:auction.model_auction_lot_history
+msgid "Lot History"
+msgstr ""
+
+#. module: auction
+#: view:auction.lots.make.invoice:0
+#: view:auction.lots.make.invoice.buyer:0
+msgid "Create invoices"
+msgstr ""
+
+#. module: auction
+#: model:account.tax.code,name:auction.account_tax_code_id5
+msgid "VAT 5%"
+msgstr ""
+
+#. module: auction
+#: model:ir.model,name:auction.model_auction_lots_buyer_map
+msgid "Map Buyer"
+msgstr ""
+
+#. module: auction
+#: report:buyer.list:0
+msgid "Lot"
+msgstr "લોત"
+
+#. module: auction
+#: model:ir.actions.act_window,name:auction.action_report_auction_object_date_tree
+msgid "Auction Object Date"
+msgstr ""
+
+#. module: auction
+#: model:ir.model,name:auction.model_auction_artists
+msgid "auction.artists"
+msgstr ""
+
+#. module: auction
+#: field:report.auction,avg_price:0
+msgid "Avg Price."
+msgstr ""
+
+#. module: auction
+#: help:auction.pay.buy,statement_id2:0
+msgid "Second Bank Statement For Buyer"
+msgstr ""
+
+#. module: auction
+#: field:auction.dates,journal_id:0
+msgid "Buyer Journal"
+msgstr ""
+
+#. module: auction
+#: selection:auction.lots,state:0
+#: selection:report.object.encoded,state:0
+msgid "Paid"
+msgstr ""
+
+#. module: auction
+#: report:bids.lots:0
+#: report:bids.phones.details:0
+msgid "Phone"
+msgstr "ફોન"
+
+#. module: auction
+#: field:auction.lot.category,active:0
+msgid "Active"
+msgstr "સક્રિય"
+
+#. module: auction
+#: view:auction.dates:0
+msgid "Exposition Dates"
+msgstr ""
+
+#. module: auction
+#: model:account.tax,name:auction.auction_tax1
+msgid "TVA"
+msgstr ""
+
+#. module: auction
+#: field:auction.lots,important:0
+msgid "To be Emphatized"
+msgstr ""
+
+#. module: auction
+#: report:buyer.list:0
+msgid "Total:"
+msgstr "કુલ:"
+
+#. module: auction
+#: model:account.tax,name:auction.auction_tax2
+msgid "TVA1"
+msgstr ""
+
+#. module: auction
+#: view:report.auction.object.date:0
+msgid "Objects per Day"
+msgstr ""
+
+#. module: auction
+#: field:auction.dates,seller_invoice_history:0
+#: field:auction.lots,sel_inv_id:0
+#: view:auction.lots.make.invoice:0
+msgid "Seller Invoice"
+msgstr ""
+
+#. module: auction
+#: view:board.board:0
+msgid "Objects by day"
+msgstr ""
+
+#. module: auction
+#: help:auction.dates,expo2:0
+msgid "Last exposition date for auction"
+msgstr ""
+
+#. module: auction
+#: code:addons/auction/auction.py:571
+#: code:addons/auction/auction.py:686
+#, python-format
+msgid "Missed buyer !"
+msgstr ""
+
+#. module: auction
+#: report:auction.code_bar_lot:0
+msgid "Flagey"
+msgstr ""
+
+#. module: auction
+#: view:board.board:0
+msgid "Auction manager "
+msgstr ""
+
+#. module: auction
+#: code:addons/auction/wizard/auction_lots_invoice.py:67
+#, python-format
+msgid ""
+"Two different buyers for the same invoice !\n"
+"Please correct this problem before invoicing"
+msgstr ""
+
+#. module: auction
+#: view:auction.dates:0
+msgid "Invoice"
+msgstr "બિલ"
+
+#. module: auction
+#: view:auction.dates:0
+msgid "Commissions"
+msgstr ""
+
+#. module: auction
+#: field:auction.lots,vnd_lim:0
+msgid "Seller limit"
+msgstr ""
+
+#. module: auction
+#: field:auction.deposit,transfer:0
+msgid "Transfer"
+msgstr "મોકલો"
+
+#. module: auction
+#: view:auction.pay.buy:0
+msgid "Line3"
+msgstr "લાઈન૩"
+
+#. module: auction
+#: view:auction.pay.buy:0
+msgid "Line2"
+msgstr "લાઈન૨"
+
+#. module: auction
+#: help:auction.lots,obj_ret:0
+msgid "Object Ret"
+msgstr ""
+
+#. module: auction
+#: view:report.auction.adjudication:0
+msgid "Total adjudication"
+msgstr ""
+
+#. module: auction
+#: selection:auction.deposit,method:0
+msgid "Contact the Seller"
+msgstr ""
+
+#. module: auction
+#: field:auction.taken,lot_ids:0
+msgid "Lots Emportes"
+msgstr ""
+
+#. module: auction
+#: field:auction.lots,net_margin:0
+msgid "Net Margin (%)"
+msgstr ""
+
+#. module: auction
+#: field:auction.lots,product_id:0
+msgid "Product"
+msgstr "વસ્તુ"
+
+#. module: auction
+#: report:buyer.list:0
+msgid ")"
+msgstr ")"
+
+#. module: auction
+#: view:auction.lots:0
+msgid "Seller Information"
+msgstr ""
+
+#. module: auction
+#: view:auction.deposit:0
+#: field:auction.deposit,lot_id:0
+#: view:auction.lots:0
+#: model:ir.actions.act_window,name:auction.action_all_objects
+#: model:ir.ui.menu,name:auction.auction_all_objects_menu
+msgid "Objects"
+msgstr "ઘટકો"
+
+#. module: auction
+#: view:auction.dates:0
+msgid "Seller Invoices"
+msgstr ""
+
+#. module: auction
+#: report:auction.total.rml:0
+msgid "Paid:"
+msgstr ""
+
+#. module: auction
+#: field:auction.deposit,total_neg:0
+msgid "Allow Negative Amount"
+msgstr ""
+
+#. module: auction
+#: help:auction.pay.buy,amount2:0
+msgid "Amount For Second Bank Statement"
+msgstr ""
+
+#. module: auction
+#: field:auction.lot.history,auction_id:0
+#: field:report.auction,auction:0
+#: field:report.auction.adjudication,name:0
+msgid "Auction date"
+msgstr ""
+
+#. module: auction
+#: view:auction.lots.sms.send:0
+msgid "SMS Text"
+msgstr ""
+
+#. module: auction
+#: field:auction.dates,auction1:0
+msgid "First Auction Day"
+msgstr ""
+
+#. module: auction
+#: view:auction.lots.make.invoice.buyer:0
+msgid "Create Invoices For Buyer"
+msgstr ""
+
+#. module: auction
+#: model:res.groups,name:auction.group_auction_manager
+msgid "Manager"
+msgstr "વ્યવસ્થાપક"
+
+#. module: auction
+#: view:auction.dates:0
+msgid "Names"
+msgstr ""
+
+#. module: auction
+#: view:auction.artists:0
+#: model:ir.ui.menu,name:auction.menu_auction_artist
+msgid "Artists"
+msgstr "કલાકારો"
+
+#. module: auction
+#: view:auction.pay.buy:0
+msgid "Pay Objects"
+msgstr ""
+
+#. module: auction
+#: help:auction.dates,expo1:0
+msgid "Beginning exposition date for auction"
+msgstr ""
+
+#. module: auction
+#: model:ir.actions.act_window,name:auction.act_auction_lot_line_open
+msgid "Open lots"
+msgstr ""
+
+#. module: auction
+#: model:ir.actions.act_window,name:auction.act_auction_lot_open_deposit
+msgid "Deposit slip"
+msgstr ""
+
+#. module: auction
+#: model:ir.model,name:auction.model_auction_lots_enable
+msgid "Lots Enable"
+msgstr ""
+
+#. module: auction
+#: view:auction.lots:0
+msgid "Lots"
+msgstr ""
+
+#. module: auction
+#: model:ir.actions.act_window,name:auction.action_auction_artist
+msgid "Auction Artists"
+msgstr ""
+
+#. module: auction
+#: field:auction.lots,seller_price:0
+msgid "Seller price"
+msgstr ""
+
+#. module: auction
+#: model:account.tax,name:auction.auction_tax20
+msgid "Frais de vente0"
+msgstr ""
+
+#. module: auction
+#: model:ir.actions.report.xml,name:auction.buy_id_list
+msgid "Buyer List"
+msgstr ""
+
+#. module: auction
+#: report:buyer.list:0
+msgid "Buyer costs("
+msgstr ""
+
+#. module: auction
+#: field:auction.pay.buy,statement_id1:0
+#: field:auction.pay.buy,statement_id2:0
+#: field:auction.pay.buy,statement_id3:0
+msgid "Statement"
+msgstr "વિધાન"
+
+#. module: auction
+#: help:auction.lots,seller_price:0
+#: help:auction.lots.make.invoice,amount:0
+msgid "Seller Price"
+msgstr ""
+
+#. module: auction
+#: model:account.tax,name:auction.auction_tax6
+msgid "Frais de vente"
+msgstr ""
+
+#. module: auction
+#: model:account.tax.code,name:auction.account_tax_code_id1
+msgid "VAT 1%"
+msgstr ""
+
+#. module: auction
+#: model:account.tax,name:auction.auction_tax
+msgid "Droit d'auteur"
+msgstr ""
+
+#. module: auction
+#: field:auction.dates,expo1:0
+msgid "First Exposition Day"
+msgstr ""
+
+#. module: auction
+#: field:report.auction.object.date,name:0
+msgid "Created date"
+msgstr ""
+
+#. module: auction
+#: help:auction.lots,bord_vnd_id:0
+msgid ""
+"Provide deposit information: seller, Withdrawned Method, Object, Deposit "
+"Costs"
+msgstr ""
+
+#. module: auction
+#: field:auction.lots,net_revenue:0
+#: field:report.object.encoded,net_revenue:0
+msgid "Net revenue"
+msgstr ""
+
+#. module: auction
+#: code:addons/auction/wizard/auction_catalog_flagey_report.py:63
+#: code:addons/auction/wizard/auction_pay_buy.py:89
+#, python-format
+msgid "Error!"
+msgstr "ભૂલ!"
+
+#. module: auction
+#: model:ir.actions.act_window,name:auction.action_report_latest_doposit_tree
+msgid "Latest Deposits"
+msgstr ""
+
+#. module: auction
+#: report:auction.total.rml:0
+msgid "# of items:"
+msgstr ""
+
+#. module: auction
+#: model:account.tax,name:auction.tax_buyer_author
+msgid "Author rights (4%)"
+msgstr ""
+
+#. module: auction
+#: field:report.object.encoded,estimation:0
+msgid "Estimation"
+msgstr ""
+
+#. module: auction
+#: view:auction.taken:0
+msgid "OK"
+msgstr "બરાબર"
+
+#. module: auction
+#: model:ir.actions.report.xml,name:auction.buyer_form_id
+msgid "Buyer Form"
+msgstr ""
+
+#. module: auction
+#: field:auction.bid,partner_id:0
+msgid "Buyer Name"
+msgstr ""
+
+#. module: auction
+#: view:report.auction:0
+#: field:report.auction,day:0
+msgid "Day"
+msgstr "દિવસ"
+
+#. module: auction
+#: model:ir.actions.act_window,name:auction.action_auction_lots_make_invoice
+msgid "Invoice Seller objects"
+msgstr ""
+
+#. module: auction
+#: field:auction.lots,gross_margin:0
+msgid "Gross Margin (%)"
+msgstr ""
+
+#. module: auction
+#: selection:auction.dates,state:0
+#: selection:report.auction.adjudication,state:0
+msgid "Closed"
+msgstr "બંધ થયેલ"
+
+#. module: auction
+#: view:auction.dates:0
+msgid "Search Next Auction Dates"
+msgstr ""
+
+#. module: auction
+#: view:auction.catalog.flagey:0
+msgid "Print Auction Catalog Flagey Report..."
+msgstr ""
+
+#. module: auction
+#: field:auction.lots,ach_avance:0
+msgid "Buyer Advance"
+msgstr ""
+
+#. module: auction
+#: field:auction.lots,obj_comm:0
+msgid "Commission"
+msgstr ""
+
+#. module: auction
+#: view:board.board:0
+msgid "Min/Adj/Max"
+msgstr ""
+
+#. module: auction
+#: view:auction.catalog.flagey:0
+msgid "Catalog Flagey Report"
+msgstr ""
+
+#. module: auction
+#: help:auction.lots,obj_price:0
+msgid "Object Price"
+msgstr ""
+
+#. module: auction
+#: view:auction.bid:0
+msgid "Bids Lines"
+msgstr ""
+
+#. module: auction
+#: view:auction.lots:0
+msgid "Catalog"
+msgstr "મદદપત્રિકા"
+
+#. module: auction
+#: help:auction.lots,auction_id:0
+msgid "Auction for object"
+msgstr ""
+
+#. module: auction
+#: field:auction.deposit.cost,account:0
+msgid "Destination Account"
+msgstr ""
+
+#. module: auction
+#: model:ir.ui.menu,name:auction.auction_config_menu
+msgid "Configuration"
+msgstr "રુપરેખાંકન"
+
+#. module: auction
+#: model:ir.actions.act_window,name:auction.action_report_auction_object_date_tree_my
+msgid "My Auction Object Date"
+msgstr ""
+
+#. module: auction
+#: code:addons/auction/wizard/auction_pay_buy.py:80
+#, python-format
+msgid ""
+"You should pay all the total: \"%.2f\" are missing to accomplish the payment."
+msgstr ""
+
+#. module: auction
+#: model:ir.model,name:auction.model_auction_pay_buy
+msgid "Pay buy"
+msgstr ""
+
+#. module: auction
+#: model:ir.ui.menu,name:auction.auction_outils_menu
+msgid "Tools Bar Codes"
+msgstr ""
+
+#. module: auction
+#: field:auction.deposit.cost,deposit_id:0
+msgid "Deposit"
+msgstr ""
+
+#. module: auction
+#: field:auction.dates,expo2:0
+msgid "Last Exposition Day"
+msgstr ""
+
+#. module: auction
+#: model:ir.model,name:auction.model_auction_lots_able
+msgid "Lots able"
+msgstr ""
+
+#. module: auction
+#: model:account.tax.code,name:auction.account_tax_code_id3
+msgid "VAT 10%"
+msgstr ""
+
+#. module: auction
+#: field:auction.artists,name:0
+msgid "Artist/Author Name"
+msgstr ""
+
+#. module: auction
+#: selection:report.auction,month:0
+msgid "December"
+msgstr "ડિસેમ્બર"
+
+#. module: auction
+#: view:auction.deposit:0
+#: field:auction.lots,image:0
+msgid "Image"
+msgstr "ચિત્ર"
+
+#. module: auction
+#: help:auction.lots,buyer_price:0
+#: help:auction.lots.make.invoice.buyer,amount:0
+msgid "Buyer Price"
+msgstr ""
+
+#. module: auction
+#: model:ir.model,name:auction.model_auction_lot_category
+msgid "Auction Lots Category"
+msgstr ""
+
+#. module: auction
+#: model:account.tax.code,name:auction.account_tax_code_id2
+msgid "VAT 20%"
+msgstr ""
+
+#. module: auction
+#: model:ir.model,name:auction.model_auction_payer_sel
+msgid "Auction payment for seller"
+msgstr ""
+
+#. module: auction
+#: view:auction.lots:0
+#: selection:auction.lots,state:0
+msgid "Taken away"
+msgstr ""
+
+#. module: auction
+#: model:ir.actions.report.xml,name:auction.seller_form_id
+msgid "Seller List"
+msgstr ""
+
+#. module: auction
+#: view:report.object.encoded:0
+msgid "Total adj."
+msgstr ""
+
+#. module: auction
+#: view:auction.deposit:0
+msgid "Deposit Costs"
+msgstr ""
+
+#. module: auction
+#: field:auction.lot.category,name:0
+msgid "Category Name"
+msgstr "શ્રેણીનું નામ"
+
+#. module: auction
+#: report:buyer.list:0
+msgid "........."
+msgstr "........."
+
+#. module: auction
+#: view:report.auction:0
+msgid "Auction Summary tree view"
+msgstr ""
+
+#. module: auction
+#: report:report.auction.buyer.result:0
+msgid "Adj"
+msgstr ""
+
+#. module: auction
+#: view:auction.dates:0
+#: model:ir.model,name:auction.model_auction_dates
+msgid "Auction Dates"
+msgstr ""
+
+#. module: auction
+#: model:ir.ui.menu,name:auction.menu_board_auction_open
+msgid "Auction DashBoard"
+msgstr ""
+
+#. module: auction
+#: view:report.auction:0
+#: field:report.auction,user_id:0
+#: field:report.auction.adjudication,user_id:0
+#: field:report.auction.object.date,user_id:0
+#: field:report.object.encoded,user_id:0
+#: model:res.groups,name:auction.group_auction_user
+msgid "User"
+msgstr "વપરાશકર્તા"
+
+#. module: auction
+#: view:auction.pay.buy:0
+msgid "Payment Lines"
+msgstr ""
+
+#. module: auction
+#: code:addons/auction/auction.py:692
+#, python-format
+msgid "Missed Address !"
+msgstr ""
+
+#. module: auction
+#: help:auction.lots,net_revenue:0
+msgid "Buyer Price - Seller Price - Indirect Cost"
+msgstr ""
+
+#. module: auction
+#: help:auction.lots,state:0
+msgid ""
+" * The 'Draft' state is used when a object is encoding as a new object.      "
+"           \n"
+"* The 'Unsold' state is used when object does not sold for long time, user "
+"can also set it as draft state after unsold.                 \n"
+"* The 'Paid' state is used when user pay for the object                 \n"
+"* The 'Sold' state is used when user buy the object."
+msgstr ""
+
+#. module: auction
+#: field:auction.artists,pseudo:0
+msgid "Pseudo"
+msgstr ""
+
+#. module: auction
+#: view:auction.lots:0
+msgid "Not sold"
+msgstr ""
+
+#. module: auction
+#: model:account.tax,name:auction.auction_tax3
+#: field:auction.dates,buyer_costs:0
+msgid "Buyer Costs"
+msgstr ""
+
+#. module: auction
+#: report:auction.total.rml:0
+msgid "Auction Date:"
+msgstr ""
+
+#. module: auction
+#: view:auction.deposit:0
+msgid "Objects Description"
+msgstr ""
+
+#. module: auction
+#: field:auction.dates,buyer_invoice_history:0
+#: field:auction.lots,ach_inv_id:0
+#: view:auction.lots.make.invoice.buyer:0
+msgid "Buyer Invoice"
+msgstr ""
+
+#. module: auction
+#: report:auction.bids:0
+msgid "Tel"
+msgstr ""
+
+#. module: auction
+#: field:auction.lots,artist_id:0
+msgid "Artist/Author"
+msgstr ""
+
+#. module: auction
+#: model:ir.actions.report.xml,name:auction.total_result1
+msgid "Auction Totals with lists"
+msgstr ""
+
+#. module: auction
+#: view:auction.deposit:0
+msgid "General Information"
+msgstr "સામાન્ય માહિતી"
+
+#. module: auction
+#: view:auction.lots.auction.move:0
+#: view:auction.lots.buyer_map:0
+#: view:auction.lots.make.invoice:0
+#: view:auction.lots.make.invoice.buyer:0
+#: view:auction.lots.sms.send:0
+#: view:auction.pay.buy:0
+msgid "Close"
+msgstr "બંધ"
+
+#. module: auction
+#: model:ir.model,name:auction.model_report_object_encoded
+msgid "Object encoded"
+msgstr ""
+
+#. module: auction
+#: view:auction.bid:0
+msgid "Search Auction Bid"
+msgstr ""
+
+#. module: auction
+#: report:bids.phones.details:0
+msgid "Est"
+msgstr ""
+
+#. module: auction
+#: view:auction.dates:0
+msgid "Seller Commissions"
+msgstr ""
+
+#. module: auction
+#: view:report.object.encoded:0
+msgid "Object statistic"
+msgstr ""
+
+#. module: auction
+#: help:auction.dates,journal_seller_id:0
+msgid "Account journal for seller"
+msgstr ""
+
+#. module: auction
+#: field:auction.dates,auction2:0
+msgid "Last Auction Day"
+msgstr ""
+
+#. module: auction
+#: code:addons/auction/wizard/auction_pay_buy.py:89
+#, python-format
+msgid "No auction date for \"%s\": Please set one."
+msgstr ""
+
+#. module: auction
+#: view:auction.deposit:0
+#: field:auction.deposit,info:0
+#: report:bids.phones.details:0
+msgid "Description"
+msgstr "વર્ણન"
+
+#. module: auction
+#: selection:report.auction,month:0
+msgid "May"
+msgstr "મે"
+
+#. module: auction
+#: field:auction.lots,obj_price:0
+msgid "Adjudication price"
+msgstr ""
+
+#. module: auction
+#: field:auction.dates,acc_income:0
+msgid "Income Account"
+msgstr ""
+
+#. module: auction
+#: field:auction.lots.sms.send,password:0
+msgid "Password"
+msgstr "પાસવર્ડ"
+
+#. module: auction
+#: selection:report.auction,month:0
+msgid "February"
+msgstr "ફેબ્રુઆરી"
+
+#. module: auction
+#: selection:report.auction,month:0
+msgid "April"
+msgstr "એપ્રિલ"
+
+#. module: auction
+#: view:auction.pay.buy:0
+msgid "Pay objects"
+msgstr ""
+
+#. module: auction
+#: view:report.object.encoded:0
+msgid "# objects"
+msgstr ""
+
+#. module: auction
+#: report:auction.total.rml:0
+msgid "Adjudication:"
+msgstr ""
+
+#. module: auction
+#: model:ir.actions.report.xml,name:auction.details_bids_phones
+msgid "Bids per lot (phone)"
+msgstr ""
+
+#. module: auction
+#: field:report.auction,buyer_login:0
+msgid "Buyer Login"
+msgstr ""
+
+#. module: auction
+#: field:auction.deposit,tax_id:0
+msgid "Expenses"
+msgstr "ખર્ચાઓ"
+
+#. module: auction
+#: view:report.auction:0
+msgid "Auction during current month."
+msgstr ""
+
+#. module: auction
+#: model:ir.model,name:auction.model_auction_payer
+msgid "Auction payer"
+msgstr ""
+
+#. module: auction
+#: view:report.auction:0
+msgid "Auction during current year."
+msgstr ""
+
+#. module: auction
+#: report:auction.total.rml:0
+msgid "Auction name:"
+msgstr ""
+
+#. module: auction
+#: view:board.board:0
+msgid "Latest deposits"
+msgstr ""
+
+#. module: auction
+#: model:ir.actions.report.xml,name:auction.art2
+msgid "Artists Biography"
+msgstr ""
+
+#. module: auction
+#: view:report.auction:0
+#: field:report.auction,year:0
+msgid "Year"
+msgstr "વર્ષ"
+
+#. module: auction
+#: field:auction.lots,history_ids:0
+msgid "Auction history"
+msgstr ""
diff --git a/addons/crm/i18n/ja.po b/addons/crm/i18n/ja.po
index 5d7f6e0c551..e38caf8c8af 100644
--- a/addons/crm/i18n/ja.po
+++ b/addons/crm/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-16 04:19+0000\n"
+"PO-Revision-Date: 2012-04-17 03:29+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-16 04:40+0000\n"
+"X-Launchpad-Export-Date: 2012-04-17 04:51+0000\n"
 "X-Generator: Launchpad (build 15099)\n"
 
 #. module: crm
@@ -46,7 +46,7 @@ msgstr "お問い合わせ対応状況"
 #. module: crm
 #: view:crm.meeting:0
 msgid "Visibility"
-msgstr ""
+msgstr "表示"
 
 #. module: crm
 #: field:crm.lead,title:0
@@ -435,7 +435,7 @@ msgstr ""
 #. module: crm
 #: view:crm.meeting:0
 msgid "Privacy"
-msgstr ""
+msgstr "プライバシー"
 
 #. module: crm
 #: model:ir.actions.act_window,help:crm.crm_case_stage_form_installer
@@ -451,12 +451,12 @@ msgstr ""
 #. module: crm
 #: view:crm.lead.report:0
 msgid "Opportunity Analysis"
-msgstr ""
+msgstr "商談分析"
 
 #. module: crm
 #: help:crm.meeting,location:0
 msgid "Location of Event"
-msgstr ""
+msgstr "イベント場所"
 
 #. module: crm
 #: field:crm.meeting,rrule:0
@@ -490,7 +490,7 @@ msgstr ""
 #: selection:crm.lead.report,deadline_month:0
 #: selection:crm.meeting,month_list:0 selection:crm.phonecall.report,month:0
 msgid "August"
-msgstr ""
+msgstr "8月"
 
 #. module: crm
 #: code:addons/crm/crm.py:433 view:crm.lead:0 view:res.partner:0
@@ -513,7 +513,7 @@ msgstr ""
 #: selection:crm.lead.report,deadline_month:0
 #: selection:crm.meeting,month_list:0 selection:crm.phonecall.report,month:0
 msgid "June"
-msgstr ""
+msgstr "6月"
 
 #. module: crm
 #: selection:crm.segmentation,state:0
@@ -523,7 +523,7 @@ msgstr ""
 #. module: crm
 #: field:crm.lead,email:0
 msgid "E-Mail"
-msgstr ""
+msgstr "メール"
 
 #. module: crm
 #: view:crm.phonecall:0
@@ -535,7 +535,7 @@ msgstr ""
 #: selection:crm.lead.report,deadline_month:0
 #: selection:crm.meeting,month_list:0 selection:crm.phonecall.report,month:0
 msgid "October"
-msgstr ""
+msgstr "10月"
 
 #. module: crm
 #: view:crm.segmentation:0
@@ -572,12 +572,12 @@ msgstr ""
 #. module: crm
 #: field:crm.lead,partner_address_name:0
 msgid "Partner Contact Name"
-msgstr ""
+msgstr "パートナの担当者名"
 
 #. module: crm
 #: selection:crm.meeting,end_type:0
 msgid "End date"
-msgstr ""
+msgstr "終了日"
 
 #. module: crm
 #: view:crm.opportunity2phonecall:0 view:crm.phonecall2phonecall:0
@@ -615,7 +615,7 @@ msgstr ""
 #. module: crm
 #: selection:crm.add.note,state:0 selection:crm.lead,state:0
 msgid "In Progress"
-msgstr ""
+msgstr "進行中"
 
 #. module: crm
 #: help:crm.case.section,reply_to:0
@@ -643,7 +643,7 @@ msgstr ""
 #. module: crm
 #: view:crm.lead:0 view:crm.meeting:0
 msgid "Details"
-msgstr ""
+msgstr "詳細"
 
 #. module: crm
 #: help:crm.meeting,exrule:0
@@ -675,7 +675,7 @@ msgstr ""
 #. module: crm
 #: field:crm.lead2opportunity.partner.mass,user_ids:0
 msgid "Salesmans"
-msgstr ""
+msgstr "営業"
 
 #. module: crm
 #: field:crm.lead.report,probable_revenue:0
@@ -685,7 +685,7 @@ msgstr ""
 #. module: crm
 #: help:crm.lead.report,creation_month:0
 msgid "Creation month"
-msgstr ""
+msgstr "作成月"
 
 #. module: crm
 #: help:crm.segmentation,name:0
@@ -753,7 +753,7 @@ msgstr ""
 #. module: crm
 #: view:crm.lead2partner:0 view:crm.phonecall2partner:0
 msgid "Continue"
-msgstr ""
+msgstr "続行"
 
 #. module: crm
 #: field:crm.segmentation,som_interval:0
@@ -792,18 +792,18 @@ msgstr ""
 #: code:addons/crm/crm_lead.py:451
 #, python-format
 msgid "From %s : %s"
-msgstr ""
+msgstr "%s : %sから"
 
 #. module: crm
 #: field:crm.lead.report,creation_year:0
 msgid "Creation Year"
-msgstr ""
+msgstr "作成年"
 
 #. module: crm
 #: field:crm.lead.report,create_date:0
 #: field:crm.phonecall.report,create_date:0
 msgid "Create Date"
-msgstr ""
+msgstr "作成日"
 
 #. module: crm
 #: field:crm.lead,ref2:0
@@ -876,7 +876,7 @@ msgstr ""
 #. module: crm
 #: field:crm.lead,is_supplier_add:0
 msgid "Supplier"
-msgstr ""
+msgstr "仕入先"
 
 #. module: crm
 #: view:crm.lead:0
@@ -886,7 +886,7 @@ msgstr ""
 #. module: crm
 #: selection:crm.segmentation.line,expr_name:0
 msgid "Purchase Amount"
-msgstr ""
+msgstr "仕入高"
 
 #. module: crm
 #: view:crm.lead:0
@@ -898,7 +898,7 @@ msgstr ""
 #: selection:crm.lead.report,deadline_month:0
 #: selection:crm.meeting,month_list:0 selection:crm.phonecall.report,month:0
 msgid "March"
-msgstr ""
+msgstr "3月"
 
 #. module: crm
 #: code:addons/crm/crm_lead.py:491
@@ -906,7 +906,7 @@ msgstr ""
 #: code:addons/crm/wizard/crm_lead_to_partner.py:47
 #, python-format
 msgid "Warning !"
-msgstr ""
+msgstr "警告"
 
 #. module: crm
 #: view:crm.phonecall.report:0
@@ -916,7 +916,7 @@ msgstr ""
 #. module: crm
 #: field:crm.lead,day_open:0
 msgid "Days to Open"
-msgstr ""
+msgstr "開始日"
 
 #. module: crm
 #: view:crm.meeting:0
@@ -931,22 +931,22 @@ msgstr ""
 #. module: crm
 #: selection:crm.segmentation.line,expr_operator:0
 msgid "<"
-msgstr ""
+msgstr "<"
 
 #. module: crm
 #: field:crm.lead,mobile:0 field:crm.phonecall,partner_mobile:0
 msgid "Mobile"
-msgstr ""
+msgstr "携帯電話"
 
 #. module: crm
 #: view:crm.lead:0
 msgid "Next Stage"
-msgstr ""
+msgstr "次へ"
 
 #. module: crm
 #: view:crm.meeting:0
 msgid "My Meetings"
-msgstr ""
+msgstr "私のミーティング"
 
 #. module: crm
 #: view:crm.phonecall:0
@@ -961,7 +961,7 @@ msgstr ""
 #. module: crm
 #: field:crm.lead,ref:0
 msgid "Reference"
-msgstr ""
+msgstr "参照"
 
 #. module: crm
 #: field:crm.lead,optin:0
@@ -978,13 +978,13 @@ msgstr ""
 #: field:res.partner,meeting_ids:0
 #, python-format
 msgid "Meetings"
-msgstr ""
+msgstr "ミーティング"
 
 #. module: crm
 #: field:crm.lead,date_action_next:0 field:crm.lead,title_action:0
 #: field:crm.meeting,date_action_next:0 field:crm.phonecall,date_action_next:0
 msgid "Next Action"
-msgstr ""
+msgstr "次の作業"
 
 #. module: crm
 #: field:crm.meeting,end_date:0
@@ -994,7 +994,7 @@ msgstr ""
 #. module: crm
 #: field:crm.meeting,date_deadline:0
 msgid "Deadline"
-msgstr ""
+msgstr "期限"
 
 #. module: crm
 #: help:crm.meeting,active:0
@@ -1006,7 +1006,7 @@ msgstr ""
 #. module: crm
 #: view:crm.lead:0
 msgid "Change Color"
-msgstr ""
+msgstr "色の変更"
 
 #. module: crm
 #: view:crm.segmentation:0
@@ -1017,7 +1017,7 @@ msgstr ""
 #: field:crm.meeting,user_id:0 view:crm.phonecall:0
 #: field:crm.phonecall,user_id:0 view:res.partner:0
 msgid "Responsible"
-msgstr ""
+msgstr "担当"
 
 #. module: crm
 #: view:crm.lead.report:0
@@ -1027,12 +1027,12 @@ msgstr ""
 #. module: crm
 #: view:res.partner:0
 msgid "Previous"
-msgstr ""
+msgstr "前へ"
 
 #. module: crm
 #: view:crm.lead:0
 msgid "New Leads"
-msgstr ""
+msgstr "新規見込み客"
 
 #. module: crm
 #: view:crm.lead:0
@@ -1042,7 +1042,7 @@ msgstr ""
 #. module: crm
 #: view:crm.meeting:0
 msgid "From"
-msgstr ""
+msgstr "差出人"
 
 #. module: crm
 #: view:crm.lead2opportunity.partner.mass:0
@@ -1052,32 +1052,32 @@ msgstr ""
 #. module: crm
 #: view:crm.lead:0
 msgid "Show Sales Team"
-msgstr ""
+msgstr "営業チームを表示"
 
 #. module: crm
 #: view:res.partner:0
 msgid "Next"
-msgstr ""
+msgstr "次へ"
 
 #. module: crm
 #: view:crm.lead:0
 msgid "Stage:"
-msgstr ""
+msgstr "段階"
 
 #. module: crm
 #: model:crm.case.stage,name:crm.stage_lead5 view:crm.lead:0
 msgid "Won"
-msgstr ""
+msgstr "勝利"
 
 #. module: crm
 #: field:crm.lead.report,delay_expected:0
 msgid "Overpassed Deadline"
-msgstr ""
+msgstr "期限を過ぎる。"
 
 #. module: crm
 #: model:crm.case.section,name:crm.section_sales_department
 msgid "Sales Department"
-msgstr ""
+msgstr "営業部"
 
 #. module: crm
 #: selection:crm.segmentation.line,expr_name:0
@@ -1088,7 +1088,7 @@ msgstr ""
 #: field:crm.lead,type:0 field:crm.lead.report,type:0
 #: view:crm.opportunity2phonecall:0 view:crm.phonecall2phonecall:0
 msgid "Type"
-msgstr ""
+msgstr "タイプ"
 
 #. module: crm
 #: view:crm.segmentation:0
@@ -1105,12 +1105,12 @@ msgstr ""
 #: view:crm.phonecall:0 field:crm.phonecall,create_date:0
 #: field:crm.phonecall.report,creation_date:0
 msgid "Creation Date"
-msgstr ""
+msgstr "作成日"
 
 #. module: crm
 #: view:board.board:0
 msgid "My Opportunities"
-msgstr ""
+msgstr "私の商談"
 
 #. module: crm
 #: model:crm.case.categ,name:crm.categ_oppor5
@@ -1130,28 +1130,28 @@ msgstr ""
 #. module: crm
 #: view:crm.lead:0 view:crm.meeting:0 view:res.partner:0
 msgid "Subject"
-msgstr ""
+msgstr "標題"
 
 #. module: crm
 #: field:crm.meeting,tu:0
 msgid "Tue"
-msgstr ""
+msgstr "火曜日"
 
 #. module: crm
 #: view:crm.case.stage:0 view:crm.lead:0 field:crm.lead,stage_id:0
 #: view:crm.lead.report:0 field:crm.lead.report,stage_id:0
 msgid "Stage"
-msgstr ""
+msgstr "段階"
 
 #. module: crm
 #: view:crm.lead:0
 msgid "History Information"
-msgstr ""
+msgstr "履歴情報"
 
 #. module: crm
 #: field:base.action.rule,act_mail_to_partner:0
 msgid "Mail to Partner"
-msgstr ""
+msgstr "パートナへ送付する。"
 
 #. module: crm
 #: view:crm.opportunity2phonecall:0 view:crm.phonecall2phonecall:0
@@ -1166,7 +1166,7 @@ msgstr ""
 #. module: crm
 #: view:crm.opportunity2phonecall:0 view:crm.phonecall2phonecall:0
 msgid "Log call"
-msgstr ""
+msgstr "通話記録"
 
 #. module: crm
 #: help:crm.meeting,rrule_type:0
@@ -1190,7 +1190,7 @@ msgstr ""
 #: model:ir.actions.act_window,name:crm.crm_lead_stage_act
 #: model:ir.ui.menu,name:crm.menu_crm_lead_stage_act
 msgid "Stages"
-msgstr ""
+msgstr "段階"
 
 #. module: crm
 #: field:crm.lead,planned_revenue:0
@@ -1211,7 +1211,7 @@ msgstr ""
 #: selection:crm.lead.report,deadline_month:0
 #: selection:crm.meeting,month_list:0 selection:crm.phonecall.report,month:0
 msgid "September"
-msgstr ""
+msgstr "9月"
 
 #. module: crm
 #: field:crm.segmentation,partner_id:0
@@ -1229,7 +1229,7 @@ msgstr ""
 #: model:ir.actions.act_window,name:crm.action_report_crm_phonecall
 #: model:ir.ui.menu,name:crm.menu_report_crm_phonecalls_tree
 msgid "Phone Calls Analysis"
-msgstr ""
+msgstr "通話分析"
 
 #. module: crm
 #: field:crm.lead.report,opening_date:0
@@ -1250,12 +1250,12 @@ msgstr ""
 #. module: crm
 #: field:crm.partner2opportunity,name:0 field:crm.phonecall2opportunity,name:0
 msgid "Opportunity Name"
-msgstr ""
+msgstr "商談名"
 
 #. module: crm
 #: help:crm.lead.report,deadline_day:0
 msgid "Expected closing day"
-msgstr ""
+msgstr "受注見込日"
 
 #. module: crm
 #: help:crm.case.section,active:0
@@ -1267,7 +1267,7 @@ msgstr ""
 #. module: crm
 #: field:crm.lead,street2:0
 msgid "Street2"
-msgstr ""
+msgstr "番地"
 
 #. module: crm
 #: help:crm.case.stage,case_default:0
@@ -1279,7 +1279,7 @@ msgstr ""
 #. module: crm
 #: field:crm.meeting,fr:0
 msgid "Fri"
-msgstr ""
+msgstr "金曜日"
 
 #. module: crm
 #: model:ir.model,name:crm.model_crm_lead
@@ -1289,7 +1289,7 @@ msgstr ""
 #. module: crm
 #: field:crm.meeting,write_date:0
 msgid "Write Date"
-msgstr ""
+msgstr "記入日"
 
 #. module: crm
 #: view:crm.meeting:0
@@ -1299,7 +1299,7 @@ msgstr ""
 #. module: crm
 #: view:crm.meeting:0
 msgid "Reminder"
-msgstr ""
+msgstr "リマインダー"
 
 #. module: crm
 #: help:crm.segmentation,sales_purchase_active:0
@@ -1316,7 +1316,7 @@ msgstr ""
 #. module: crm
 #: model:ir.actions.act_window,name:crm.crm_case_categ_phone_create_partner
 msgid "Schedule a Call"
-msgstr ""
+msgstr "通話予定"
 
 #. module: crm
 #: view:crm.lead2partner:0 view:crm.phonecall:0 view:crm.phonecall2partner:0
@@ -1324,7 +1324,7 @@ msgstr ""
 #: model:ir.actions.act_window,name:crm.action_crm_lead2partner
 #: model:ir.actions.act_window,name:crm.action_crm_phonecall2partner
 msgid "Create a Partner"
-msgstr ""
+msgstr "パートナを作成"
 
 #. module: crm
 #: field:crm.segmentation,state:0
@@ -1346,17 +1346,17 @@ msgstr ""
 #. module: crm
 #: selection:crm.meeting,week_list:0
 msgid "Monday"
-msgstr ""
+msgstr "月曜日"
 
 #. module: crm
 #: field:crm.lead,day_close:0
 msgid "Days to Close"
-msgstr ""
+msgstr "契約日"
 
 #. module: crm
 #: field:crm.case.section,complete_name:0
 msgid "unknown"
-msgstr ""
+msgstr "不明"
 
 #. module: crm
 #: code:addons/crm/crm_lead.py:296
@@ -1374,7 +1374,7 @@ msgstr ""
 #: view:crm.phonecall:0 field:crm.phonecall,date:0
 #: field:crm.phonecall2phonecall,date:0 view:res.partner:0
 msgid "Date"
-msgstr ""
+msgstr "日付"
 
 #. module: crm
 #: view:crm.lead.report:0 view:crm.phonecall.report:0
@@ -1389,12 +1389,12 @@ msgstr ""
 #. module: crm
 #: view:crm.phonecall.report:0
 msgid "Search"
-msgstr ""
+msgstr "検索"
 
 #. module: crm
 #: view:board.board:0
 msgid "Opportunities by Categories"
-msgstr ""
+msgstr "商談"
 
 #. module: crm
 #: model:crm.case.section,name:crm.section_sales_marketing_department
@@ -1404,7 +1404,7 @@ msgstr ""
 #. module: crm
 #: view:crm.phonecall.report:0
 msgid "Date of call"
-msgstr ""
+msgstr "通話日"
 
 #. module: crm
 #: help:crm.lead,section_id:0
@@ -1426,7 +1426,7 @@ msgstr ""
 #: view:crm.phonecall:0
 #: model:ir.actions.act_window,name:crm.crm_case_categ_meet_create_partner
 msgid "Schedule a Meeting"
-msgstr ""
+msgstr "ミーティング予定"
 
 #. module: crm
 #: code:addons/crm/crm_lead.py:431
@@ -3567,13 +3567,13 @@ msgstr "秒"
 #. module: crm
 #: model:crm.case.stage,name:crm.stage_lead3
 msgid "Proposition"
-msgstr ""
+msgstr "案件"
 
 #. module: crm
 #: field:crm.lead.report,date_closed:0
 #: field:crm.phonecall.report,date_closed:0
 msgid "Close Date"
-msgstr ""
+msgstr "契約日"
 
 #. module: crm
 #: view:crm.lead.report:0 view:crm.phonecall.report:0
@@ -3584,7 +3584,7 @@ msgstr "年"
 #. module: crm
 #: constraint:res.partner:0
 msgid "Error ! You cannot create recursive associated members."
-msgstr ""
+msgstr "エラーです。再帰的な関係となる会員を作ることはできません。"
 
 #. module: crm
 #: model:crm.case.resource.type,name:crm.type_lead8
diff --git a/addons/hr/i18n/ja.po b/addons/hr/i18n/ja.po
new file mode 100644
index 00000000000..1486a75741d
--- /dev/null
+++ b/addons/hr/i18n/ja.po
@@ -0,0 +1,695 @@
+# 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-17 01:59+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-17 04:51+0000\n"
+"X-Generator: Launchpad (build 15099)\n"
+
+#. module: hr
+#: model:process.node,name:hr.process_node_openerpuser0
+msgid "Openerp user"
+msgstr "OpenERPユーザ"
+
+#. module: hr
+#: view:hr.job:0 field:hr.job,requirements:0
+msgid "Requirements"
+msgstr "必要事項"
+
+#. module: hr
+#: constraint:hr.department:0
+msgid "Error! You can not create recursive departments."
+msgstr "エラー。反復する部署を作ることはできません。"
+
+#. module: hr
+#: model:process.transition,name:hr.process_transition_contactofemployee0
+msgid "Link the employee to information"
+msgstr ""
+
+#. module: hr
+#: field:hr.employee,sinid:0
+msgid "SIN No"
+msgstr ""
+
+#. module: hr
+#: model:ir.ui.menu,name:hr.menu_hr_main
+#: model:ir.ui.menu,name:hr.menu_hr_management
+#: model:ir.ui.menu,name:hr.menu_hr_root
+msgid "Human Resources"
+msgstr ""
+
+#. module: hr
+#: view:hr.employee:0 view:hr.job:0
+msgid "Group By..."
+msgstr "グループ化…"
+
+#. module: hr
+#: model:ir.actions.act_window,name:hr.view_department_form_installer
+msgid "Create Your Departments"
+msgstr "部門を作る"
+
+#. module: hr
+#: model:ir.actions.act_window,help:hr.action_hr_job
+msgid ""
+"Job Positions are used to define jobs and their requirements. You can keep "
+"track of the number of employees you have per job position and how many you "
+"expect in the future. You can also attach a survey to a job position that "
+"will be used in the recruitment process to evaluate the applicants for this "
+"job position."
+msgstr ""
+"職種は、仕事内容とその要件を定義するのに使います。職種ごとの従業員数と将来の必要人数を記録することができます。職種への応募者を評価するための採用プロセスで"
+"使う質問票を、ここに添付することができます。"
+
+#. module: hr
+#: view:hr.employee:0 field:hr.employee,department_id:0 view:hr.job:0
+#: field:hr.job,department_id:0 view:res.users:0
+msgid "Department"
+msgstr "部門"
+
+#. module: hr
+#: view:hr.job:0
+msgid "Mark as Old"
+msgstr "古い印をつける。"
+
+#. module: hr
+#: view:hr.job:0
+msgid "Jobs"
+msgstr "業務"
+
+#. module: hr
+#: view:hr.job:0
+msgid "In Recruitment"
+msgstr "採用中"
+
+#. module: hr
+#: field:hr.department,company_id:0 view:hr.employee:0 view:hr.job:0
+#: field:hr.job,company_id:0
+msgid "Company"
+msgstr "会社"
+
+#. module: hr
+#: field:hr.job,no_of_recruitment:0
+msgid "Expected in Recruitment"
+msgstr "採用予定"
+
+#. module: hr
+#: model:ir.actions.todo.category,name:hr.category_hr_management_config
+msgid "HR Management"
+msgstr "人材管理"
+
+#. module: hr
+#: help:hr.employee,partner_id:0
+msgid ""
+"Partner that is related to the current employee. Accounting transaction will "
+"be written on this partner belongs to employee."
+msgstr "この従業員に関係するパートナ。会計トトランザクションは従業員に関係するこのパートナについて記録されます。"
+
+#. module: hr
+#: model:process.transition,name:hr.process_transition_employeeuser0
+msgid "Link a user to an employee"
+msgstr "ユーザを従業員に連携"
+
+#. module: hr
+#: field:hr.department,parent_id:0
+msgid "Parent Department"
+msgstr "上位の部門"
+
+#. module: hr
+#: view:hr.employee:0 field:hr.employee,notes:0
+msgid "Notes"
+msgstr "注記"
+
+#. module: hr
+#: selection:hr.employee,marital:0
+msgid "Married"
+msgstr "既婚"
+
+#. module: hr
+#: model:ir.actions.act_window,help:hr.action_create_hr_employee_installer
+msgid ""
+"Create employees form and link them to an OpenERP user if you want them to "
+"access this instance. Categories can be set on employees to perform massive "
+"operations on all the employees of the same category, i.e. allocating "
+"holidays."
+msgstr ""
+"従業員を作成して、このインスタンスをアクセスできるようにOpenERPに連携する。従業員に区分を設定すると，同じ区分の全ての従業員と同じ処理が適用されるま"
+"す。例えば、休日の割当てなど。"
+
+#. module: hr
+#: model:ir.actions.act_window,help:hr.open_module_tree_department
+msgid ""
+"Your Company's Department Structure is used to manage all documents related "
+"to employees by departments: expenses and timesheet validation, leaves "
+"management, recruitments, etc."
+msgstr ""
+
+#. module: hr
+#: field:hr.employee,color:0
+msgid "Color Index"
+msgstr "カラーインデックス"
+
+#. module: hr
+#: model:process.transition,note:hr.process_transition_employeeuser0
+msgid ""
+"The Related user field on the Employee form allows to link the OpenERP user "
+"(and her rights) to the employee."
+msgstr "従業員票のユーザ項目を使って、この従業員をOpenERPユーザとして連携することができます。"
+
+#. module: hr
+#: view:hr.job:0 selection:hr.job,state:0
+msgid "In Recruitement"
+msgstr "採用中"
+
+#. module: hr
+#: field:hr.employee,identification_id:0
+msgid "Identification No"
+msgstr "識別番号"
+
+#. module: hr
+#: selection:hr.employee,gender:0
+msgid "Female"
+msgstr "女"
+
+#. module: hr
+#: help:hr.job,expected_employees:0
+msgid "Required number of employees in total for that job."
+msgstr "この職種に必要な従業員の数"
+
+#. module: hr
+#: model:ir.ui.menu,name:hr.menu_open_view_attendance_reason_new_config
+msgid "Attendance"
+msgstr "出欠"
+
+#. module: hr
+#: view:hr.employee:0
+msgid "Social IDs"
+msgstr "社会保障番号"
+
+#. module: hr
+#: field:hr.employee,work_phone:0
+msgid "Work Phone"
+msgstr "勤務先電話"
+
+#. module: hr
+#: field:hr.employee.category,child_ids:0
+msgid "Child Categories"
+msgstr "子関係の区分"
+
+#. module: hr
+#: view:hr.job:0 field:hr.job,description:0
+#: model:ir.model,name:hr.model_hr_job
+msgid "Job Description"
+msgstr "職務内容"
+
+#. module: hr
+#: field:hr.employee,work_location:0
+msgid "Office Location"
+msgstr "勤務先住所"
+
+#. module: hr
+#: view:hr.employee:0
+msgid "My Departments Employee"
+msgstr "私の部門の従業員"
+
+#. module: hr
+#: view:hr.employee:0 model:ir.model,name:hr.model_hr_employee
+#: model:process.node,name:hr.process_node_employee0
+msgid "Employee"
+msgstr "従業員"
+
+#. module: hr
+#: model:process.node,note:hr.process_node_employeecontact0
+msgid "Other information"
+msgstr "その他の情報"
+
+#. module: hr
+#: field:hr.employee,work_email:0
+msgid "Work E-mail"
+msgstr "勤務先のEメール"
+
+#. module: hr
+#: field:hr.employee,birthday:0
+msgid "Date of Birth"
+msgstr "誕生日"
+
+#. module: hr
+#: model:ir.ui.menu,name:hr.menu_hr_reporting
+msgid "Reporting"
+msgstr "レポート"
+
+#. module: hr
+#: model:ir.actions.act_window,name:hr.open_board_hr
+#: model:ir.ui.menu,name:hr.menu_hr_dashboard_user
+msgid "Human Resources Dashboard"
+msgstr "人材ダッシュボード"
+
+#. module: hr
+#: view:hr.employee:0 field:hr.employee,job_id:0 view:hr.job:0
+msgid "Job"
+msgstr "職務"
+
+#. module: hr
+#: field:hr.department,member_ids:0
+msgid "Members"
+msgstr "メンバー"
+
+#. module: hr
+#: model:ir.ui.menu,name:hr.menu_hr_configuration
+msgid "Configuration"
+msgstr "設定"
+
+#. module: hr
+#: view:hr.employee:0 field:hr.employee,category_ids:0
+msgid "Categories"
+msgstr "区分"
+
+#. module: hr
+#: field:hr.job,expected_employees:0
+msgid "Expected Employees"
+msgstr "従業員候補"
+
+#. module: hr
+#: selection:hr.employee,marital:0
+msgid "Divorced"
+msgstr "離婚"
+
+#. module: hr
+#: field:hr.employee.category,parent_id:0
+msgid "Parent Category"
+msgstr "親分類"
+
+#. module: hr
+#: constraint:hr.employee.category:0
+msgid "Error ! You cannot create recursive Categories."
+msgstr "エラー。反復区分を作ることはできません。"
+
+#. module: hr
+#: view:hr.department:0
+#: model:ir.actions.act_window,name:hr.open_module_tree_department
+#: model:ir.ui.menu,name:hr.menu_hr_department_tree
+#: field:res.users,context_department_id:0
+msgid "Departments"
+msgstr "部門"
+
+#. module: hr
+#: model:process.node,name:hr.process_node_employeecontact0
+msgid "Employee Contact"
+msgstr "従業員の連絡先"
+
+#. module: hr
+#: view:board.board:0
+msgid "My Board"
+msgstr "私のボード"
+
+#. module: hr
+#: selection:hr.employee,gender:0
+msgid "Male"
+msgstr "男"
+
+#. module: hr
+#: model:ir.actions.act_window,name:hr.open_view_categ_form
+#: model:ir.ui.menu,name:hr.menu_view_employee_category_form
+msgid "Categories of Employee"
+msgstr "従業員の区分"
+
+#. module: hr
+#: view:hr.employee.category:0
+#: model:ir.model,name:hr.model_hr_employee_category
+msgid "Employee Category"
+msgstr "従業員の区分"
+
+#. module: hr
+#: model:process.process,name:hr.process_process_employeecontractprocess0
+msgid "Employee Contract"
+msgstr "従業員契約"
+
+#. module: hr
+#: model:ir.model,name:hr.model_hr_department
+msgid "hr.department"
+msgstr "hr.department"
+
+#. module: hr
+#: model:ir.actions.act_window,name:hr.action_create_hr_employee_installer
+msgid "Create your Employees"
+msgstr "従業員を作成する。"
+
+#. module: hr
+#: field:hr.employee.category,name:0
+msgid "Category"
+msgstr "分類"
+
+#. module: hr
+#: model:ir.actions.act_window,help:hr.open_view_employee_list_my
+msgid ""
+"Here you can manage your work force by creating employees and assigning them "
+"specific properties in the system. Maintain all employee related information "
+"and keep track of anything that needs to be recorded for them. The personal "
+"information tab will help you maintain their identity data. The Categories "
+"tab gives you the opportunity to assign them related employee categories "
+"depending on their position and activities within the company. A category "
+"can be a seniority level within the company or a department. The Timesheets "
+"tab allows to assign them a specific timesheet and analytic journal where "
+"they will be able to enter time through the system. In the note tab, you can "
+"enter text data that should be recorded for a specific employee."
+msgstr ""
+"ここでは従業員を作成して、各人の特性を指定することができます。個人情報タブでは、従業員に関する必要な情報を記録・保持してください。カテゴリータブでは、従業"
+"員の職位と職種に応じたカテゴリーを割り当てることができます。カテゴリーは、会社あるいは部門における年功のレベルで決まるでしょう。タイムシートタブでは、従業"
+"員に分析記録のためのタイムシートを割り当てて、本人が作業時間を記録するのに使います。注記タブでは、その従業員に関する情報を追記することができます。"
+
+#. module: hr
+#: help:hr.employee,bank_account_id:0
+msgid "Employee bank salary account"
+msgstr "従業員の給与振込の銀行口座"
+
+#. module: hr
+#: field:hr.department,note:0
+msgid "Note"
+msgstr "注記"
+
+#. module: hr
+#: model:ir.actions.act_window,name:hr.open_view_employee_tree
+msgid "Employees Structure"
+msgstr "従業員体系"
+
+#. module: hr
+#: constraint:res.users:0
+msgid "The chosen company is not in the allowed companies for this user"
+msgstr "選択した会社は、このユーザに許された会社ではありません。"
+
+#. module: hr
+#: view:hr.employee:0
+msgid "Contact Information"
+msgstr "連絡先の情報"
+
+#. module: hr
+#: field:hr.employee,address_id:0
+msgid "Working Address"
+msgstr "勤務先住所"
+
+#. module: hr
+#: model:ir.actions.act_window,name:hr.open_board_hr_manager
+#: model:ir.ui.menu,name:hr.menu_hr_dashboard_manager
+msgid "HR Manager Dashboard"
+msgstr "人事マネジャのダッシュボード"
+
+#. module: hr
+#: field:hr.department,child_ids:0
+msgid "Child Departments"
+msgstr "下位部門"
+
+#. module: hr
+#: view:hr.employee:0
+msgid "Status"
+msgstr "ステータス"
+
+#. module: hr
+#: model:ir.actions.act_window,name:hr.open_view_categ_tree
+#: model:ir.ui.menu,name:hr.menu_view_employee_category_tree
+msgid "Categories structure"
+msgstr "カテゴリー体系"
+
+#. module: hr
+#: field:hr.employee,partner_id:0
+msgid "unknown"
+msgstr "不明"
+
+#. module: hr
+#: help:hr.job,no_of_employee:0
+msgid "Number of employees with that job."
+msgstr "この職種の従業員数"
+
+#. module: hr
+#: field:hr.employee,ssnid:0
+msgid "SSN No"
+msgstr "社会保障番号"
+
+#. module: hr
+#: view:hr.employee:0
+msgid "Active"
+msgstr "有効"
+
+#. module: hr
+#: constraint:hr.employee:0
+msgid "Error ! You cannot create recursive Hierarchy of Employees."
+msgstr "エラー。従業員の反復した階層構造を作ることはできません。"
+
+#. module: hr
+#: model:ir.actions.act_window,name:hr.action2
+msgid "Subordonate Hierarchy"
+msgstr "下位の階層構造"
+
+#. module: hr
+#: model:ir.actions.act_window,help:hr.view_department_form_installer
+msgid ""
+"Your departments structure is used to manage all documents related to "
+"employees by departments: expenses and timesheet validation, leaves "
+"management, recruitments, etc."
+msgstr "部門組織構造は，従業員に関する全ての文書を管理するために使われます。：経費、タイムシートの検証、休暇の管理、採用など。"
+
+#. module: hr
+#: field:hr.employee,bank_account_id:0
+msgid "Bank Account Number"
+msgstr "銀行口座番号"
+
+#. module: hr
+#: view:hr.department:0
+msgid "Companies"
+msgstr "会社"
+
+#. module: hr
+#: model:process.transition,note:hr.process_transition_contactofemployee0
+msgid ""
+"In the Employee form, there are different kind of information like Contact "
+"information."
+msgstr "従業員票には、連絡先などのように異なる種類の情報があります。"
+
+#. module: hr
+#: model:ir.ui.menu,name:hr.menu_hr_dashboard
+msgid "Dashboard"
+msgstr "ダッシュボード"
+
+#. module: hr
+#: selection:hr.job,state:0
+msgid "Old"
+msgstr "旧"
+
+#. module: hr
+#: sql_constraint:res.users:0
+msgid "You can not have two users with the same login !"
+msgstr "同一のログインに２つのユーザを指定することはできません。"
+
+#. module: hr
+#: view:hr.job:0 field:hr.job,state:0
+msgid "State"
+msgstr "状態"
+
+#. module: hr
+#: field:hr.employee,marital:0
+msgid "Marital Status"
+msgstr "婚姻区分"
+
+#. module: hr
+#: model:ir.model,name:hr.model_ir_actions_act_window
+msgid "ir.actions.act_window"
+msgstr "ir.actions.act_window"
+
+#. module: hr
+#: model:process.node,note:hr.process_node_employee0
+msgid "Employee form and structure"
+msgstr "従業員票と構造"
+
+#. module: hr
+#: field:hr.employee,photo:0
+msgid "Photo"
+msgstr "写真"
+
+#. module: hr
+#: model:ir.model,name:hr.model_res_users
+msgid "res.users"
+msgstr "res.users"
+
+#. module: hr
+#: view:hr.employee:0
+msgid "Personal Information"
+msgstr "個人情報"
+
+#. module: hr
+#: field:hr.employee,city:0
+msgid "City"
+msgstr "市"
+
+#. module: hr
+#: field:hr.employee,passport_id:0
+msgid "Passport No"
+msgstr "旅券番号"
+
+#. module: hr
+#: field:hr.employee,mobile_phone:0
+msgid "Work Mobile"
+msgstr "会社の携帯"
+
+#. module: hr
+#: view:hr.employee.category:0
+msgid "Employees Categories"
+msgstr "従業員カテゴリー"
+
+#. module: hr
+#: field:hr.employee,address_home_id:0
+msgid "Home Address"
+msgstr "自宅住所"
+
+#. module: hr
+#: view:hr.job:0
+msgid "Description"
+msgstr "詳細"
+
+#. module: hr
+#: selection:hr.employee,marital:0
+msgid "Single"
+msgstr "独身"
+
+#. module: hr
+#: field:hr.job,name:0
+msgid "Job Name"
+msgstr "職務名"
+
+#. module: hr
+#: view:hr.job:0 selection:hr.job,state:0
+msgid "In Position"
+msgstr "職位"
+
+#. module: hr
+#: view:hr.department:0
+msgid "department"
+msgstr "部門"
+
+#. module: hr
+#: field:hr.employee,country_id:0
+msgid "Nationality"
+msgstr "国籍"
+
+#. module: hr
+#: model:ir.ui.menu,name:hr.menu_open_view_attendance_reason_config
+msgid "Leaves"
+msgstr "作業終了"
+
+#. module: hr
+#: view:board.board:0
+msgid "HR Manager Board"
+msgstr "人材マネジャボード"
+
+#. module: hr
+#: field:hr.employee,resource_id:0
+msgid "Resource"
+msgstr "リソース"
+
+#. module: hr
+#: field:hr.department,complete_name:0
+#: field:hr.employee.category,complete_name:0
+msgid "Name"
+msgstr "氏名"
+
+#. module: hr
+#: field:hr.employee,gender:0
+msgid "Gender"
+msgstr "性別"
+
+#. module: hr
+#: view:hr.employee:0 view:hr.employee.category:0
+#: field:hr.employee.category,employee_ids:0 view:hr.job:0
+#: field:hr.job,employee_ids:0
+#: model:ir.actions.act_window,name:hr.hr_employee_normal_action_tree
+#: model:ir.actions.act_window,name:hr.open_view_employee_list
+#: model:ir.actions.act_window,name:hr.open_view_employee_list_my
+#: model:ir.ui.menu,name:hr.menu_open_view_employee_list_my
+#: model:ir.ui.menu,name:hr.menu_view_employee_category_configuration_form
+msgid "Employees"
+msgstr "従業員"
+
+#. module: hr
+#: help:hr.employee,sinid:0
+msgid "Social Insurance Number"
+msgstr "社会保険番号"
+
+#. module: hr
+#: field:hr.department,name:0
+msgid "Department Name"
+msgstr "部門名"
+
+#. module: hr
+#: help:hr.employee,ssnid:0
+msgid "Social Security Number"
+msgstr "社会保障番号"
+
+#. module: hr
+#: model:process.node,note:hr.process_node_openerpuser0
+msgid "Creation of a OpenERP user"
+msgstr "OpenERPユーザ作成日"
+
+#. module: hr
+#: field:hr.employee,login:0
+msgid "Login"
+msgstr "ログイン"
+
+#. module: hr
+#: view:hr.employee:0
+msgid "Job Information"
+msgstr "職務情報"
+
+#. module: hr
+#: model:ir.actions.act_window,name:hr.action_hr_job
+#: model:ir.ui.menu,name:hr.menu_hr_job
+msgid "Job Positions"
+msgstr "職位"
+
+#. module: hr
+#: field:hr.employee,otherid:0
+msgid "Other Id"
+msgstr "その他のID"
+
+#. module: hr
+#: view:hr.employee:0 field:hr.employee,coach_id:0
+msgid "Coach"
+msgstr "コーチ"
+
+#. module: hr
+#: sql_constraint:hr.job:0
+msgid "The name of the job position must be unique per company!"
+msgstr "職位名は会社ごとにユニークでなければいけません。"
+
+#. module: hr
+#: view:hr.job:0
+msgid "My Departments Jobs"
+msgstr "私の部門の職種"
+
+#. module: hr
+#: field:hr.department,manager_id:0 view:hr.employee:0
+#: field:hr.employee,parent_id:0
+msgid "Manager"
+msgstr "マネジャ"
+
+#. module: hr
+#: selection:hr.employee,marital:0
+msgid "Widower"
+msgstr "寡夫"
+
+#. module: hr
+#: field:hr.employee,child_ids:0
+msgid "Subordinates"
+msgstr "部下"
+
+#. module: hr
+#: field:hr.job,no_of_employee:0
+msgid "Number of Employees"
+msgstr "従業員数"
diff --git a/addons/hr_payroll/i18n/ja.po b/addons/hr_payroll/i18n/ja.po
index b0ed529374f..1d1144a8b6d 100644
--- a/addons/hr_payroll/i18n/ja.po
+++ b/addons/hr_payroll/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-16 04:41+0000\n"
+"X-Launchpad-Export-Date: 2012-04-17 04:51+0000\n"
 "X-Generator: Launchpad (build 15099)\n"
 
 #. module: hr_payroll
@@ -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/mrp_repair/i18n/sr@latin.po b/addons/mrp_repair/i18n/sr@latin.po
index 1902ff9d981..24da07afb79 100644
--- a/addons/mrp_repair/i18n/sr@latin.po
+++ b/addons/mrp_repair/i18n/sr@latin.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: 2010-12-23 16:21+0000\n"
-"Last-Translator: OpenERP Administrators <Unknown>\n"
+"PO-Revision-Date: 2012-04-16 16:35+0000\n"
+"Last-Translator: Maroje Delibasic <maroje.delibasic@gmail.com>\n"
 "Language-Team: Serbian latin <sr@latin@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-02-09 06:50+0000\n"
-"X-Generator: Launchpad (build 14763)\n"
+"X-Launchpad-Export-Date: 2012-04-17 04:51+0000\n"
+"X-Generator: Launchpad (build 15099)\n"
 
 #. module: mrp_repair
 #: view:mrp.repair:0
@@ -102,7 +102,7 @@ msgstr "Fakturisati"
 #. module: mrp_repair
 #: report:repair.order:0
 msgid "Printing Date"
-msgstr "Datum Štampanja"
+msgstr "Datum štampanja"
 
 #. module: mrp_repair
 #: field:mrp.repair.make_invoice,group:0
@@ -171,7 +171,7 @@ msgstr "Napomene"
 #: field:mrp.repair.fee,tax_id:0
 #: field:mrp.repair.line,tax_id:0
 msgid "Taxes"
-msgstr "Takse"
+msgstr "Porezi"
 
 #. module: mrp_repair
 #: report:repair.order:0
diff --git a/addons/web/i18n/gu.po b/addons/web/i18n/gu.po
new file mode 100644
index 00000000000..4f675076ece
--- /dev/null
+++ b/addons/web/i18n/gu.po
@@ -0,0 +1,1544 @@
+# Gujarati translation for openerp-web
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openerp-web package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openerp-web\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-02-14 15:27+0100\n"
+"PO-Revision-Date: 2012-04-16 11:31+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-17 05:24+0000\n"
+"X-Generator: Launchpad (build 15099)\n"
+
+#. openerp-web
+#: addons/web/static/src/js/chrome.js:172
+#: addons/web/static/src/js/chrome.js:198
+#: addons/web/static/src/js/chrome.js:414
+#: addons/web/static/src/js/view_form.js:419
+#: addons/web/static/src/js/view_form.js:1233
+#: addons/web/static/src/xml/base.xml:1695
+#: addons/web/static/src/js/view_form.js:424
+#: addons/web/static/src/js/view_form.js:1239
+msgid "Ok"
+msgstr "બરાબર"
+
+#. openerp-web
+#: addons/web/static/src/js/chrome.js:180
+msgid "Send OpenERP Enterprise Report"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/js/chrome.js:194
+msgid "Dont send"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/js/chrome.js:256
+#, python-format
+msgid "Loading (%d)"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/js/chrome.js:288
+msgid "Invalid database name"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/js/chrome.js:483
+msgid "Backed"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/js/chrome.js:484
+msgid "Database backed up successfully"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/js/chrome.js:527
+msgid "Restored"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/js/chrome.js:527
+msgid "Database restored successfully"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/js/chrome.js:708
+#: addons/web/static/src/xml/base.xml:359
+msgid "About"
+msgstr "ના વિશે"
+
+#. openerp-web
+#: addons/web/static/src/js/chrome.js:787
+#: addons/web/static/src/xml/base.xml:356
+msgid "Preferences"
+msgstr "સામાન્ય પસંદગીઓ"
+
+#. openerp-web
+#: addons/web/static/src/js/chrome.js:790
+#: addons/web/static/src/js/search.js:239
+#: addons/web/static/src/js/search.js:288
+#: addons/web/static/src/js/view_editor.js:95
+#: addons/web/static/src/js/view_editor.js:836
+#: addons/web/static/src/js/view_editor.js:962
+#: addons/web/static/src/js/view_form.js:1228
+#: addons/web/static/src/xml/base.xml:738
+#: addons/web/static/src/xml/base.xml:1496
+#: addons/web/static/src/xml/base.xml:1506
+#: addons/web/static/src/xml/base.xml:1515
+#: addons/web/static/src/js/search.js:293
+#: addons/web/static/src/js/view_form.js:1234
+msgid "Cancel"
+msgstr "રદ કરો"
+
+#. openerp-web
+#: addons/web/static/src/js/chrome.js:791
+msgid "Change password"
+msgstr "પાસવર્ડ બદલો"
+
+#. openerp-web
+#: addons/web/static/src/js/chrome.js:792
+#: addons/web/static/src/js/view_editor.js:73
+#: addons/web/static/src/js/views.js:962
+#: addons/web/static/src/xml/base.xml:737
+#: addons/web/static/src/xml/base.xml:1500
+#: addons/web/static/src/xml/base.xml:1514
+msgid "Save"
+msgstr "સાચવો"
+
+#. openerp-web
+#: addons/web/static/src/js/chrome.js:811
+#: addons/web/static/src/xml/base.xml:226
+#: addons/web/static/src/xml/base.xml:1729
+msgid "Change Password"
+msgstr "પાસવર્ડ બદલો"
+
+#. openerp-web
+#: addons/web/static/src/js/chrome.js:1096
+#: addons/web/static/src/js/chrome.js:1100
+msgid "OpenERP - Unsupported/Community Version"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/js/chrome.js:1131
+#: addons/web/static/src/js/chrome.js:1135
+msgid "Client Error"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/js/data_export.js:6
+msgid "Export Data"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/js/data_export.js:19
+#: addons/web/static/src/js/data_import.js:69
+#: addons/web/static/src/js/view_editor.js:49
+#: addons/web/static/src/js/view_editor.js:398
+#: addons/web/static/src/js/view_form.js:692
+#: addons/web/static/src/js/view_form.js:3044
+#: addons/web/static/src/js/views.js:963
+#: addons/web/static/src/js/view_form.js:698
+#: addons/web/static/src/js/view_form.js:3067
+msgid "Close"
+msgstr "બંધ કરો"
+
+#. openerp-web
+#: addons/web/static/src/js/data_export.js:20
+msgid "Export To File"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/js/data_export.js:125
+msgid "Please enter save field list name"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/js/data_export.js:360
+msgid "Please select fields to save export list..."
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/js/data_export.js:373
+msgid "Please select fields to export..."
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/js/data_import.js:34
+msgid "Import Data"
+msgstr "માહિતી આયાત કરો"
+
+#. openerp-web
+#: addons/web/static/src/js/data_import.js:70
+msgid "Import File"
+msgstr "ફાઈલ આયાત કરો"
+
+#. openerp-web
+#: addons/web/static/src/js/data_import.js:105
+msgid "External ID"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/js/formats.js:300
+#: addons/web/static/src/js/view_page.js:245
+#: addons/web/static/src/js/formats.js:322
+#: addons/web/static/src/js/view_page.js:251
+msgid "Download"
+msgstr "ડાઉનલોડ"
+
+#. openerp-web
+#: addons/web/static/src/js/formats.js:305
+#: addons/web/static/src/js/formats.js:327
+#, python-format
+msgid "Download \"%s\""
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/js/search.js:191
+msgid "Filter disabled due to invalid syntax"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/js/search.js:237
+msgid "Filter Entry"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/js/search.js:242
+#: addons/web/static/src/js/search.js:291
+#: addons/web/static/src/js/search.js:296
+msgid "OK"
+msgstr "ઓકે"
+
+#. openerp-web
+#: addons/web/static/src/js/search.js:286
+#: addons/web/static/src/xml/base.xml:1292
+#: addons/web/static/src/js/search.js:291
+msgid "Add to Dashboard"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/js/search.js:415
+#: addons/web/static/src/js/search.js:420
+msgid "Invalid Search"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/js/search.js:415
+#: addons/web/static/src/js/search.js:420
+msgid "triggered from search view"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/js/search.js:503
+#: addons/web/static/src/js/search.js:508
+#, python-format
+msgid "Incorrect value for field %(fieldname)s: [%(value)s] is %(message)s"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/js/search.js:839
+#: addons/web/static/src/js/search.js:844
+msgid "not a valid integer"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/js/search.js:853
+#: addons/web/static/src/js/search.js:858
+msgid "not a valid number"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/js/search.js:931
+#: addons/web/static/src/xml/base.xml:968
+#: addons/web/static/src/js/search.js:936
+msgid "Yes"
+msgstr "હાં"
+
+#. openerp-web
+#: addons/web/static/src/js/search.js:932
+#: addons/web/static/src/js/search.js:937
+msgid "No"
+msgstr "નહીં"
+
+#. openerp-web
+#: addons/web/static/src/js/search.js:1290
+#: addons/web/static/src/js/search.js:1295
+msgid "contains"
+msgstr "સમાવે છે"
+
+#. openerp-web
+#: addons/web/static/src/js/search.js:1291
+#: addons/web/static/src/js/search.js:1296
+msgid "doesn't contain"
+msgstr "સમાવતું નથી"
+
+#. openerp-web
+#: addons/web/static/src/js/search.js:1292
+#: addons/web/static/src/js/search.js:1306
+#: addons/web/static/src/js/search.js:1325
+#: addons/web/static/src/js/search.js:1344
+#: addons/web/static/src/js/search.js:1365
+#: addons/web/static/src/js/search.js:1297
+#: addons/web/static/src/js/search.js:1311
+#: addons/web/static/src/js/search.js:1330
+#: addons/web/static/src/js/search.js:1349
+#: addons/web/static/src/js/search.js:1370
+msgid "is equal to"
+msgstr "ને બરાબર છે"
+
+#. openerp-web
+#: addons/web/static/src/js/search.js:1293
+#: addons/web/static/src/js/search.js:1307
+#: addons/web/static/src/js/search.js:1326
+#: addons/web/static/src/js/search.js:1345
+#: addons/web/static/src/js/search.js:1366
+#: addons/web/static/src/js/search.js:1298
+#: addons/web/static/src/js/search.js:1312
+#: addons/web/static/src/js/search.js:1331
+#: addons/web/static/src/js/search.js:1350
+#: addons/web/static/src/js/search.js:1371
+msgid "is not equal to"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/js/search.js:1294
+#: addons/web/static/src/js/search.js:1308
+#: addons/web/static/src/js/search.js:1327
+#: addons/web/static/src/js/search.js:1346
+#: addons/web/static/src/js/search.js:1367
+#: addons/web/static/src/js/search.js:1299
+#: addons/web/static/src/js/search.js:1313
+#: addons/web/static/src/js/search.js:1332
+#: addons/web/static/src/js/search.js:1351
+#: addons/web/static/src/js/search.js:1372
+msgid "greater than"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/js/search.js:1295
+#: addons/web/static/src/js/search.js:1309
+#: addons/web/static/src/js/search.js:1328
+#: addons/web/static/src/js/search.js:1347
+#: addons/web/static/src/js/search.js:1368
+#: addons/web/static/src/js/search.js:1300
+#: addons/web/static/src/js/search.js:1314
+#: addons/web/static/src/js/search.js:1333
+#: addons/web/static/src/js/search.js:1352
+#: addons/web/static/src/js/search.js:1373
+msgid "less than"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/js/search.js:1296
+#: addons/web/static/src/js/search.js:1310
+#: addons/web/static/src/js/search.js:1329
+#: addons/web/static/src/js/search.js:1348
+#: addons/web/static/src/js/search.js:1369
+#: addons/web/static/src/js/search.js:1301
+#: addons/web/static/src/js/search.js:1315
+#: addons/web/static/src/js/search.js:1334
+#: addons/web/static/src/js/search.js:1353
+#: addons/web/static/src/js/search.js:1374
+msgid "greater or equal than"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/js/search.js:1297
+#: addons/web/static/src/js/search.js:1311
+#: addons/web/static/src/js/search.js:1330
+#: addons/web/static/src/js/search.js:1349
+#: addons/web/static/src/js/search.js:1370
+#: addons/web/static/src/js/search.js:1302
+#: addons/web/static/src/js/search.js:1316
+#: addons/web/static/src/js/search.js:1335
+#: addons/web/static/src/js/search.js:1354
+#: addons/web/static/src/js/search.js:1375
+msgid "less or equal than"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/js/search.js:1360
+#: addons/web/static/src/js/search.js:1383
+#: addons/web/static/src/js/search.js:1365
+#: addons/web/static/src/js/search.js:1388
+msgid "is"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/js/search.js:1384
+#: addons/web/static/src/js/search.js:1389
+msgid "is not"
+msgstr "એ નથી"
+
+#. openerp-web
+#: addons/web/static/src/js/search.js:1396
+#: addons/web/static/src/js/search.js:1401
+msgid "is true"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/js/search.js:1397
+#: addons/web/static/src/js/search.js:1402
+msgid "is false"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/js/view_editor.js:20
+#, python-format
+msgid "Manage Views (%s)"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/js/view_editor.js:46
+#: addons/web/static/src/js/view_list.js:17
+#: addons/web/static/src/xml/base.xml:100
+#: addons/web/static/src/xml/base.xml:327
+#: addons/web/static/src/xml/base.xml:756
+msgid "Create"
+msgstr "બનાવો"
+
+#. openerp-web
+#: addons/web/static/src/js/view_editor.js:47
+#: addons/web/static/src/xml/base.xml:483
+#: addons/web/static/src/xml/base.xml:755
+msgid "Edit"
+msgstr "ફેરફાર કરો"
+
+#. openerp-web
+#: addons/web/static/src/js/view_editor.js:48
+#: addons/web/static/src/xml/base.xml:1647
+msgid "Remove"
+msgstr "દૂર કરો"
+
+#. openerp-web
+#: addons/web/static/src/js/view_editor.js:71
+#, python-format
+msgid "Create a view (%s)"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/js/view_editor.js:168
+msgid "Do you really want to remove this view?"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/js/view_editor.js:364
+#, python-format
+msgid "View Editor %d - %s"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/js/view_editor.js:367
+msgid "Inherited View"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/js/view_editor.js:371
+msgid "Do you really wants to create an inherited view here?"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/js/view_editor.js:381
+msgid "Preview"
+msgstr "પૂર્વદર્શન"
+
+#. openerp-web
+#: addons/web/static/src/js/view_editor.js:501
+msgid "Do you really want to remove this node?"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/js/view_editor.js:815
+#: addons/web/static/src/js/view_editor.js:939
+msgid "Properties"
+msgstr "ગુણધર્મો"
+
+#. openerp-web
+#: addons/web/static/src/js/view_editor.js:818
+#: addons/web/static/src/js/view_editor.js:942
+msgid "Update"
+msgstr "સુધારો"
+
+#. openerp-web
+#: addons/web/static/src/js/view_form.js:16
+msgid "Form"
+msgstr "ફોર્મ"
+
+#. openerp-web
+#: addons/web/static/src/js/view_form.js:121
+#: addons/web/static/src/js/views.js:803
+msgid "Customize"
+msgstr "વૈવિધ્યપૂર્ણ"
+
+#. openerp-web
+#: addons/web/static/src/js/view_form.js:123
+#: addons/web/static/src/js/view_form.js:686
+#: addons/web/static/src/js/view_form.js:692
+msgid "Set Default"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/js/view_form.js:469
+#: addons/web/static/src/js/view_form.js:475
+msgid ""
+"Warning, the record has been modified, your changes will be discarded."
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/js/view_form.js:693
+#: addons/web/static/src/js/view_form.js:699
+msgid "Save default"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/js/view_form.js:754
+#: addons/web/static/src/js/view_form.js:760
+msgid "Attachments"
+msgstr "જોડાણો"
+
+#. openerp-web
+#: addons/web/static/src/js/view_form.js:792
+#: addons/web/static/src/js/view_form.js:798
+#, python-format
+msgid "Do you really want to delete the attachment %s?"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/js/view_form.js:822
+#: addons/web/static/src/js/view_form.js:828
+#, python-format
+msgid "Unknown operator %s in domain %s"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/js/view_form.js:830
+#: addons/web/static/src/js/view_form.js:836
+#, python-format
+msgid "Unknown field %s in domain %s"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/js/view_form.js:868
+#: addons/web/static/src/js/view_form.js:874
+#, python-format
+msgid "Unsupported operator %s in domain %s"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/js/view_form.js:1225
+#: addons/web/static/src/js/view_form.js:1231
+msgid "Confirm"
+msgstr "ખાતરી"
+
+#. openerp-web
+#: addons/web/static/src/js/view_form.js:1921
+#: addons/web/static/src/js/view_form.js:2578
+#: addons/web/static/src/js/view_form.js:2741
+#: addons/web/static/src/js/view_form.js:1933
+#: addons/web/static/src/js/view_form.js:2590
+#: addons/web/static/src/js/view_form.js:2760
+msgid "Open: "
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/js/view_form.js:2049
+#: addons/web/static/src/js/view_form.js:2061
+msgid "<em>   Search More...</em>"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/js/view_form.js:2062
+#: addons/web/static/src/js/view_form.js:2074
+#, python-format
+msgid "<em>   Create \"<strong>%s</strong>\"</em>"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/js/view_form.js:2068
+#: addons/web/static/src/js/view_form.js:2080
+msgid "<em>   Create and Edit...</em>"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/js/view_form.js:2101
+#: addons/web/static/src/js/views.js:675
+#: addons/web/static/src/js/view_form.js:2113
+msgid "Search: "
+msgstr "શોધો: "
+
+#. openerp-web
+#: addons/web/static/src/js/view_form.js:2101
+#: addons/web/static/src/js/view_form.js:2550
+#: addons/web/static/src/js/view_form.js:2113
+#: addons/web/static/src/js/view_form.js:2562
+msgid "Create: "
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/js/view_form.js:2661
+#: addons/web/static/src/xml/base.xml:750
+#: addons/web/static/src/xml/base.xml:772
+#: addons/web/static/src/xml/base.xml:1646
+#: addons/web/static/src/js/view_form.js:2680
+msgid "Add"
+msgstr "ઉમેરવું"
+
+#. openerp-web
+#: addons/web/static/src/js/view_form.js:2721
+#: addons/web/static/src/js/view_form.js:2740
+msgid "Add: "
+msgstr "ઉમેરવું: "
+
+#. openerp-web
+#: addons/web/static/src/js/view_list.js:8
+msgid "List"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/js/view_list.js:269
+msgid "Unlimited"
+msgstr "અમર્યાદિત"
+
+#. openerp-web
+#: addons/web/static/src/js/view_list.js:305
+#: addons/web/static/src/js/view_list.js:309
+#, python-format
+msgid "[%(first_record)d to %(last_record)d] of %(records_count)d"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/js/view_list.js:524
+#: addons/web/static/src/js/view_list.js:528
+msgid "Do you really want to remove these records?"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/js/view_list.js:1230
+#: addons/web/static/src/js/view_list.js:1232
+msgid "Undefined"
+msgstr "અવ્યાખ્યાયિત"
+
+#. openerp-web
+#: addons/web/static/src/js/view_list.js:1327
+#: addons/web/static/src/js/view_list.js:1331
+#, python-format
+msgid "%(page)d/%(page_count)d"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/js/view_page.js:8
+msgid "Page"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/js/view_page.js:52
+msgid "Do you really want to delete this record?"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/js/view_tree.js:11
+msgid "Tree"
+msgstr "ટ્રી"
+
+#. openerp-web
+#: addons/web/static/src/js/views.js:565
+#: addons/web/static/src/xml/base.xml:480
+msgid "Fields View Get"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/js/views.js:573
+#, python-format
+msgid "View Log (%s)"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/js/views.js:600
+#, python-format
+msgid "Model %s fields"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/js/views.js:610
+#: addons/web/static/src/xml/base.xml:482
+msgid "Manage Views"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/js/views.js:611
+msgid "Could not find current view declaration"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/js/views.js:805
+msgid "Translate"
+msgstr "ભાષાંતર"
+
+#. openerp-web
+#: addons/web/static/src/js/views.js:807
+msgid "Technical translation"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/js/views.js:811
+msgid "Other Options"
+msgstr "અન્ય વિકલ્પો"
+
+#. openerp-web
+#: addons/web/static/src/js/views.js:814
+#: addons/web/static/src/xml/base.xml:1736
+msgid "Import"
+msgstr "આયાત"
+
+#. openerp-web
+#: addons/web/static/src/js/views.js:817
+#: addons/web/static/src/xml/base.xml:1606
+msgid "Export"
+msgstr "નિકાસ"
+
+#. openerp-web
+#: addons/web/static/src/js/views.js:825
+msgid "Reports"
+msgstr "અહેવાલો"
+
+#. openerp-web
+#: addons/web/static/src/js/views.js:825
+msgid "Actions"
+msgstr "ક્રિયાઓ"
+
+#. openerp-web
+#: addons/web/static/src/js/views.js:825
+msgid "Links"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/js/views.js:919
+msgid "You must choose at least one record."
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/js/views.js:920
+msgid "Warning"
+msgstr "ચેતવણી"
+
+#. openerp-web
+#: addons/web/static/src/js/views.js:957
+msgid "Translations"
+msgstr "ભાષાંતરો"
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:44
+#: addons/web/static/src/xml/base.xml:315
+msgid "Powered by"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:44
+#: addons/web/static/src/xml/base.xml:315
+#: addons/web/static/src/xml/base.xml:1813
+msgid "OpenERP"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:52
+msgid "Loading..."
+msgstr "લાવી રહ્યા છીએ..."
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:61
+msgid "CREATE DATABASE"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:68
+#: addons/web/static/src/xml/base.xml:211
+msgid "Master password:"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:72
+#: addons/web/static/src/xml/base.xml:191
+msgid "New database name:"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:77
+msgid "Load Demonstration data:"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:81
+msgid "Default language:"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:91
+msgid "Admin password:"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:95
+msgid "Confirm password:"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:109
+msgid "DROP DATABASE"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:116
+#: addons/web/static/src/xml/base.xml:150
+#: addons/web/static/src/xml/base.xml:301
+msgid "Database:"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:128
+#: addons/web/static/src/xml/base.xml:162
+#: addons/web/static/src/xml/base.xml:187
+msgid "Master Password:"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:132
+#: addons/web/static/src/xml/base.xml:328
+msgid "Drop"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:143
+msgid "BACKUP DATABASE"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:166
+#: addons/web/static/src/xml/base.xml:329
+msgid "Backup"
+msgstr "બેકઅપ"
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:175
+msgid "RESTORE DATABASE"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:182
+msgid "File:"
+msgstr "ફાઇલ:"
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:195
+#: addons/web/static/src/xml/base.xml:330
+msgid "Restore"
+msgstr "પુનઃસ્થાપિત કરો"
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:204
+msgid "CHANGE MASTER PASSWORD"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:216
+msgid "New master password:"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:221
+msgid "Confirm new master password:"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:251
+msgid ""
+"Your version of OpenERP is unsupported. Support & maintenance services are "
+"available here:"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:251
+msgid "OpenERP Entreprise"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:256
+msgid "OpenERP Enterprise Contract."
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:257
+msgid "Your report will be sent to the OpenERP Enterprise team."
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:259
+msgid "Summary:"
+msgstr "સાર:"
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:263
+msgid "Description:"
+msgstr "વર્ણન:"
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:267
+msgid "What you did:"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:297
+msgid "Invalid username or password"
+msgstr "અયોગ્ય વપરાશકર્તા નામ અથવા પાસવર્ડ"
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:306
+msgid "Username"
+msgstr "વપરાશકર્તા નામ"
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:308
+#: addons/web/static/src/xml/base.xml:331
+msgid "Password"
+msgstr "પાસવર્ડ"
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:310
+msgid "Log in"
+msgstr "લોગ ઇન"
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:314
+msgid "Manage Databases"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:332
+msgid "Back to Login"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:353
+msgid "Home"
+msgstr "હોમ"
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:363
+msgid "LOGOUT"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:388
+msgid "Fold menu"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:389
+msgid "Unfold menu"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:454
+msgid "Hide this tip"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:455
+msgid "Disable all tips"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:463
+msgid "Add / Remove Shortcut..."
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:471
+msgid "More…"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:477
+msgid "Debug View#"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:478
+msgid "View Log (perm_read)"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:479
+msgid "View Fields"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:483
+msgid "View"
+msgstr "દેખાવ"
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:484
+msgid "Edit SearchView"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:485
+msgid "Edit Action"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:486
+msgid "Edit Workflow"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:491
+msgid "ID:"
+msgstr "ID:"
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:494
+msgid "XML ID:"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:497
+msgid "Creation User:"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:500
+msgid "Creation Date:"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:503
+msgid "Latest Modification by:"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:506
+msgid "Latest Modification Date:"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:542
+msgid "Field"
+msgstr "ક્ષેત્ર"
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:632
+#: addons/web/static/src/xml/base.xml:758
+#: addons/web/static/src/xml/base.xml:1708
+msgid "Delete"
+msgstr "રદ્દ કરો"
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:757
+msgid "Duplicate"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:775
+msgid "Add attachment"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:801
+msgid "Default:"
+msgstr "મૂળભૂત:"
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:818
+msgid "Condition:"
+msgstr "શરત:"
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:837
+msgid "Only you"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:844
+msgid "All users"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:851
+msgid "Unhandled widget"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:900
+msgid "Notebook Page \""
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:905
+#: addons/web/static/src/xml/base.xml:964
+msgid "Modifiers:"
+msgstr "સુધારકો:"
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:931
+msgid "(nolabel)"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:936
+msgid "Field:"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:940
+msgid "Object:"
+msgstr "વસ્તુ:"
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:944
+msgid "Type:"
+msgstr "પ્રકાર:"
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:948
+msgid "Widget:"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:952
+msgid "Size:"
+msgstr "કદ:"
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:956
+msgid "Context:"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:960
+msgid "Domain:"
+msgstr "ડોમેઇન:"
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:968
+msgid "Change default:"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:972
+msgid "On change:"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:976
+msgid "Relation:"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:980
+msgid "Selection:"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:1020
+msgid "Send an e-mail with your default e-mail client"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:1034
+msgid "Open this resource"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:1056
+msgid "Select date"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:1090
+msgid "Open..."
+msgstr "ખોલો..."
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:1091
+msgid "Create..."
+msgstr "બનાવો..."
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:1092
+msgid "Search..."
+msgstr "શોધ..."
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:1095
+msgid "..."
+msgstr "..."
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:1155
+#: addons/web/static/src/xml/base.xml:1198
+msgid "Set Image"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:1163
+#: addons/web/static/src/xml/base.xml:1213
+#: addons/web/static/src/xml/base.xml:1215
+#: addons/web/static/src/xml/base.xml:1272
+msgid "Clear"
+msgstr "સાફ"
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:1172
+#: addons/web/static/src/xml/base.xml:1223
+msgid "Uploading ..."
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:1200
+#: addons/web/static/src/xml/base.xml:1495
+msgid "Select"
+msgstr "પસંદ કરો"
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:1207
+#: addons/web/static/src/xml/base.xml:1209
+msgid "Save As"
+msgstr "આ રીતે સંગ્રહિત કરો"
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:1238
+msgid "Button"
+msgstr "બટન"
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:1241
+msgid "(no string)"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:1248
+msgid "Special:"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:1253
+msgid "Button Type:"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:1257
+msgid "Method:"
+msgstr "પદ્દતિ:"
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:1261
+msgid "Action ID:"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:1271
+msgid "Search"
+msgstr "શોધો"
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:1279
+msgid "Filters"
+msgstr "ફિલ્ટરો"
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:1280
+msgid "-- Filters --"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:1289
+msgid "-- Actions --"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:1290
+msgid "Add Advanced Filter"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:1291
+msgid "Save Filter"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:1293
+msgid "Manage Filters"
+msgstr "ફિલ્ટરો ને સંચાલિત કરો"
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:1298
+msgid "Filter Name:"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:1300
+msgid "(Any existing filter with the same name will be replaced)"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:1305
+msgid "Select Dashboard to add this filter to:"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:1309
+msgid "Title of new Dashboard item:"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:1416
+msgid "Advanced Filters"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:1426
+msgid "Any of the following conditions must match"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:1427
+msgid "All the following conditions must match"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:1428
+msgid "None of the following conditions must match"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:1435
+msgid "Add condition"
+msgstr "શરત ઉમેરો"
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:1436
+msgid "and"
+msgstr "અને"
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:1503
+msgid "Save & New"
+msgstr "સંગ્રહો અને નવું"
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:1504
+msgid "Save & Close"
+msgstr "સંગ્રહો અને બંધ કરો"
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:1611
+msgid ""
+"This wizard will export all data that matches the current search criteria to "
+"a CSV file.\n"
+"            You can export all data or only the fields that can be "
+"reimported after modification."
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:1618
+msgid "Export Type:"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:1620
+msgid "Import Compatible Export"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:1621
+msgid "Export all Data"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:1624
+msgid "Export Formats"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:1630
+msgid "Available fields"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:1632
+msgid "Fields to export"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:1634
+msgid "Save fields list"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:1648
+msgid "Remove All"
+msgstr "બધું દૂર કરો"
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:1660
+msgid "Name"
+msgstr "નામ"
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:1693
+msgid "Save as:"
+msgstr "આ રૂપમાં સાચવો:"
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:1700
+msgid "Saved exports:"
+msgstr "સચવાયેલા નિકાસ:"
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:1714
+msgid "Old Password:"
+msgstr "જૂનું પાસવર્ડ:"
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:1719
+msgid "New Password:"
+msgstr "નવો પાસવર્ડ:"
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:1724
+msgid "Confirm Password:"
+msgstr "પાસવર્ડની પુષ્ટિ કરો:"
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:1742
+msgid "1. Import a .CSV file"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:1743
+msgid ""
+"Select a .CSV file to import. If you need a sample of file to import,\n"
+"       you should use the export tool with the \"Import Compatible\" option."
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:1747
+msgid "CSV File:"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:1750
+msgid "2. Check your file format"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:1753
+msgid "Import Options"
+msgstr "આયાત વિકલ્પો"
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:1757
+msgid "Does your file have titles?"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:1763
+msgid "Separator:"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:1765
+msgid "Delimiter:"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:1769
+msgid "Encoding:"
+msgstr "એનકોડીંગ:"
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:1772
+msgid "UTF-8"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:1773
+msgid "Latin 1"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:1776
+msgid "Lines to skip"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:1776
+msgid ""
+"For use if CSV files have titles on multiple lines, skips more than a single "
+"line during import"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:1803
+msgid "The import failed due to:"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:1805
+msgid "Here is a preview of the file we could not import:"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:1812
+msgid "Activate the developper mode"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:1814
+msgid "Version"
+msgstr "આવૃત્તિ"
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:1815
+msgid "Copyright © 2004-TODAY OpenERP SA. All Rights Reserved."
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:1816
+msgid "OpenERP is a trademark of the"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:1817
+msgid "OpenERP SA Company"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:1819
+msgid "Licenced under the terms of"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:1820
+msgid "GNU Affero General Public License"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:1822
+msgid "For more information visit"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:1823
+msgid "OpenERP.com"
+msgstr ""
diff --git a/addons/web/i18n/nl.po b/addons/web/i18n/nl.po
index 78cd13ffd97..d2f97026967 100644
--- a/addons/web/i18n/nl.po
+++ b/addons/web/i18n/nl.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openerp-web\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-02-14 15:27+0100\n"
-"PO-Revision-Date: 2012-04-02 13:15+0000\n"
+"PO-Revision-Date: 2012-04-16 12:21+0000\n"
 "Last-Translator: Erwin <Unknown>\n"
 "Language-Team: Dutch <nl@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-03 05:16+0000\n"
-"X-Generator: Launchpad (build 15052)\n"
+"X-Launchpad-Export-Date: 2012-04-17 05:23+0000\n"
+"X-Generator: Launchpad (build 15099)\n"
 
 #. openerp-web
 #: addons/web/static/src/js/chrome.js:172
@@ -53,7 +53,7 @@ msgstr "Ongeldige database naam"
 #. openerp-web
 #: addons/web/static/src/js/chrome.js:483
 msgid "Backed"
-msgstr ""
+msgstr "Back-up gereed"
 
 #. openerp-web
 #: addons/web/static/src/js/chrome.js:484
diff --git a/addons/web_diagram/i18n/bs.po b/addons/web_diagram/i18n/bs.po
new file mode 100644
index 00000000000..d51c0ca2420
--- /dev/null
+++ b/addons/web_diagram/i18n/bs.po
@@ -0,0 +1,57 @@
+# Bosnian translation for openerp-web
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openerp-web package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openerp-web\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-02-06 17:33+0100\n"
+"PO-Revision-Date: 2012-04-16 15:36+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Bosnian <bs@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 05:24+0000\n"
+"X-Generator: Launchpad (build 15099)\n"
+
+#. openerp-web
+#: addons/web_diagram/static/src/js/diagram.js:11
+msgid "Diagram"
+msgstr "Dijagram"
+
+#. openerp-web
+#: addons/web_diagram/static/src/js/diagram.js:208
+#: addons/web_diagram/static/src/js/diagram.js:224
+#: addons/web_diagram/static/src/js/diagram.js:257
+msgid "Activity"
+msgstr "Aktivnost"
+
+#. openerp-web
+#: addons/web_diagram/static/src/js/diagram.js:208
+#: addons/web_diagram/static/src/js/diagram.js:289
+#: addons/web_diagram/static/src/js/diagram.js:308
+msgid "Transition"
+msgstr "Prijelaz"
+
+#. openerp-web
+#: addons/web_diagram/static/src/js/diagram.js:214
+#: addons/web_diagram/static/src/js/diagram.js:262
+#: addons/web_diagram/static/src/js/diagram.js:314
+msgid "Create:"
+msgstr "Kreiraj"
+
+#. openerp-web
+#: addons/web_diagram/static/src/js/diagram.js:231
+#: addons/web_diagram/static/src/js/diagram.js:232
+#: addons/web_diagram/static/src/js/diagram.js:296
+msgid "Open: "
+msgstr "Otvori: "
+
+#. openerp-web
+#: addons/web_diagram/static/src/xml/base_diagram.xml:5
+#: addons/web_diagram/static/src/xml/base_diagram.xml:6
+msgid "New Node"
+msgstr "Novi čvor"
diff --git a/addons/web_gantt/i18n/bs.po b/addons/web_gantt/i18n/bs.po
new file mode 100644
index 00000000000..2e6f985dfaf
--- /dev/null
+++ b/addons/web_gantt/i18n/bs.po
@@ -0,0 +1,28 @@
+# Bosnian translation for openerp-web
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openerp-web package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openerp-web\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-02-06 17:33+0100\n"
+"PO-Revision-Date: 2012-04-16 15:37+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Bosnian <bs@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 05:24+0000\n"
+"X-Generator: Launchpad (build 15099)\n"
+
+#. openerp-web
+#: addons/web_gantt/static/src/js/gantt.js:11
+msgid "Gantt"
+msgstr "Gant"
+
+#. openerp-web
+#: addons/web_gantt/static/src/xml/web_gantt.xml:10
+msgid "Create"
+msgstr "Kreiraj"
diff --git a/addons/web_graph/i18n/bs.po b/addons/web_graph/i18n/bs.po
new file mode 100644
index 00000000000..d8ca1b91203
--- /dev/null
+++ b/addons/web_graph/i18n/bs.po
@@ -0,0 +1,23 @@
+# Bosnian translation for openerp-web
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openerp-web package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openerp-web\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-02-06 17:33+0100\n"
+"PO-Revision-Date: 2012-04-16 15:37+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Bosnian <bs@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 05:24+0000\n"
+"X-Generator: Launchpad (build 15099)\n"
+
+#. openerp-web
+#: addons/web_graph/static/src/js/graph.js:19
+msgid "Graph"
+msgstr "Graf"
diff --git a/addons/web_kanban/i18n/bs.po b/addons/web_kanban/i18n/bs.po
new file mode 100644
index 00000000000..b2c55c8d618
--- /dev/null
+++ b/addons/web_kanban/i18n/bs.po
@@ -0,0 +1,55 @@
+# Bosnian translation for openerp-web
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openerp-web package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openerp-web\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-02-14 15:27+0100\n"
+"PO-Revision-Date: 2012-04-16 15:39+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Bosnian <bs@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 05:24+0000\n"
+"X-Generator: Launchpad (build 15099)\n"
+
+#. openerp-web
+#: addons/web_kanban/static/src/js/kanban.js:10
+msgid "Kanban"
+msgstr ""
+
+#. openerp-web
+#: addons/web_kanban/static/src/js/kanban.js:294
+#: addons/web_kanban/static/src/js/kanban.js:295
+msgid "Undefined"
+msgstr "Nedefinisano"
+
+#. openerp-web
+#: addons/web_kanban/static/src/js/kanban.js:469
+#: addons/web_kanban/static/src/js/kanban.js:470
+msgid "Are you sure you want to delete this record ?"
+msgstr "Jeste li sigurni da želite izbrisati zapis?"
+
+#. openerp-web
+#: addons/web_kanban/static/src/xml/web_kanban.xml:5
+msgid "Create"
+msgstr "Kreiraj"
+
+#. openerp-web
+#: addons/web_kanban/static/src/xml/web_kanban.xml:41
+msgid "Show more... ("
+msgstr "Prikaži više"
+
+#. openerp-web
+#: addons/web_kanban/static/src/xml/web_kanban.xml:41
+msgid "remaining)"
+msgstr "Preostalo"
+
+#. openerp-web
+#: addons/web_kanban/static/src/xml/web_kanban.xml:59
+msgid "</tr><tr>"
+msgstr "</tr><tr>"

From 1be2406a0534a21d1a7c6defbddf9824dcdd4b08 Mon Sep 17 00:00:00 2001
From: Fabien Meghazi <fme@openerp.com>
Date: Tue, 17 Apr 2012 10:30:16 +0200
Subject: [PATCH 116/238] [FIX] Fix missing modifiers on notebook page tab

bzr revid: fme@openerp.com-20120417083016-cvku8xv0bsajzy91
---
 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 7cbffe865e5..f365abf8856 100644
--- a/addons/web/static/src/xml/base.xml
+++ b/addons/web/static/src/xml/base.xml
@@ -811,7 +811,7 @@
 <t t-name="FormRenderingNotebook">
     <div>
         <ul t-attf-class="oe_form_notebook #{classnames}">
-            <li t-foreach="pages" t-as="page">
+            <li t-foreach="pages" t-as="page" t-att-modifiers="page.modifiers">
                 <a t-attf-href="##{page.id}">
                     <t t-esc="page.string"/>
                 </a>

From b12d4bce8d0eecd08437cc403efec009c3e5f3b4 Mon Sep 17 00:00:00 2001
From: niv-openerp <nicolas.vanhoren@openerp.com>
Date: Tue, 17 Apr 2012 11:18:36 +0200
Subject: [PATCH 117/238] [imp] implemented dao interface

bzr revid: nicolas.vanhoren@openerp.com-20120417091836-ej2g238h7x7firnp
---
 addons/point_of_sale/static/src/js/pos.js | 94 ++++++++++++++++-------
 1 file changed, 68 insertions(+), 26 deletions(-)

diff --git a/addons/point_of_sale/static/src/js/pos.js b/addons/point_of_sale/static/src/js/pos.js
index d1873b1bdde..8605e8cac9c 100644
--- a/addons/point_of_sale/static/src/js/pos.js
+++ b/addons/point_of_sale/static/src/js/pos.js
@@ -36,10 +36,46 @@ openerp.point_of_sale = function(db) {
     var _t = db.web._t;
     
     var DAOInterface = {
-        
+        add_operation: function(operation) {},
+        remove_operation: function(id) {},
+        get_operations: function() {},
     };
     var LocalStorageDAO = db.web.Class.extend({
-        
+        add_operation: function(operation) {
+            var self = this;
+            return $.async_when().pipe(function() {
+                var tmp = self._get('oe_pos_operations', []);
+                var last_id = self._get('oe_pos_operations_sequence', 1);
+                tmp.push({'id': last_id, 'data': operation});
+                self._set('oe_pos_operations', tmp);
+                self._set('oe_pos_operations_sequence', last_id + 1);
+            });
+        },
+        remove_operation: function(id) {
+            var self = this;
+            return $.async_when().pipe(function() {
+                var tmp = self._get('oe_pos_operations', []);
+                tmp = _.filter(tmp, function(el) {
+                    return el.id !== id;
+                });
+                self._set('oe_pos_operations', tmp);
+            });
+        },
+        get_operations: function() {
+            var self = this;
+            return $.async_when().pipe(function() {
+                return self._get('oe_pos_operations', []);
+            });
+        },
+        _get: function(key, default_) {
+            var txt = localStorage[key];
+            if (! txt)
+                return default_;
+            return JSON.parse(txt);
+        },
+        _set: function(key, value) {
+            localStorage[key] = JSON.stringify(value);
+        },
     });
     
     var fetch = function(osvModel, fields, domain) {
@@ -59,7 +95,7 @@ openerp.point_of_sale = function(db) {
             this.flush_mutex = new $.Mutex();
             this.build_tree = _.bind(this.build_tree, this);
             this.session = session;
-            this.set({'pending_operations': [],
+            this.set({'nbr_pending_operations': 0,
                 'currency': {symbol: '$', position: 'after'},
                 'shop': {},
                 'company': {},
@@ -80,7 +116,7 @@ openerp.point_of_sale = function(db) {
             var tax_def = fetch('account.tax', ['amount', 'price_include', 'type']).then(function(result) {
                 return self.set({'taxes': result});
             });
-            $.when(cat_def, prod_def, bank_def, tax_def, this.get_app_data())
+            $.when(cat_def, prod_def, bank_def, tax_def, this.get_app_data(), this.flush())
                 .pipe(_.bind(this.build_tree, this));
         },
         get_app_data: function() {
@@ -102,10 +138,10 @@ openerp.point_of_sale = function(db) {
             }));
         },
         pushOrder: function(record) {
-            var ops = _.clone(this.get('pending_operations'));
-            ops.push(record);
-            this.set({pending_operations: ops});
-            return this.flush();
+            var self = this;
+            return this.dao.add_operation(record).pipe(function() {
+                return self.flush();
+            });
         },
         flush: function() {
             return this.flush_mutex.exec(_.bind(function() {
@@ -113,21 +149,27 @@ openerp.point_of_sale = function(db) {
             }, this));
         },
         _int_flush : function() {
-            var ops = this.get('pending_operations');
-            if (ops.length === 0)
-                return $.when();
-            var op = ops[0];
-            /* we prevent the default error handler and assume errors
-             * are a normal use case, except we stop the current iteration
-             */
-            return new db.web.Model("pos.order").get_func("create_from_ui")([op]).fail(function(unused, event) {
-                event.preventDefault();
-            }).pipe(_.bind(function() {
-                console.debug('saved 1 record');
-                var ops2 = this.get('pending_operations');
-                this.set({'pending_operations': _.without(ops2, op)});
-                return this._int_flush();
-            }, this), function() {return $.when()});
+            var self = this;
+            this.dao.get_operations().pipe(function(ops) {
+                self.set({"nbr_pending_operations": ops.length});
+                if (ops.length === 0)
+                    return $.when();
+                var op = ops[0].data;
+                var op_id = ops[0].id;
+                /* we prevent the default error handler and assume errors
+                 * are a normal use case, except we stop the current iteration
+                 */
+                return new db.web.Model("pos.order").get_func("create_from_ui")([op]).fail(function(unused, event) {
+                    event.preventDefault();
+                }).pipe(function() {
+                    console.debug('saved 1 record');
+                    self.dao.remove_operation(op_id).pipe(function() {
+                        return self._int_flush();
+                    });
+                }, function() {
+                    return $.when();
+                });
+            });
         },
         categories: {},
         build_tree: function() {
@@ -1299,7 +1341,7 @@ openerp.point_of_sale = function(db) {
                 this.synch_notification.replace($('.oe_pos_synch-notification', this.$element));
                 this.synch_notification.on_synch.add(_.bind(pos.flush, pos));
                 
-                pos.bind('change:pending_operations', this.changed_pending_operations, this);
+                pos.bind('change:nbr_pending_operations', this.changed_pending_operations, this);
                 this.changed_pending_operations();
                 
                 this.$element.find("#loggedas button").click(function() {
@@ -1323,12 +1365,12 @@ openerp.point_of_sale = function(db) {
             return qweb_template("PointOfSale")();
         },
         changed_pending_operations: function () {
-            this.synch_notification.on_change_nbr_pending(pos.get('pending_operations').length);
+            this.synch_notification.on_change_nbr_pending(pos.get('nbr_pending_operations'));
         },
         try_close: function() {
             pos.flush().then(_.bind(function() {
                 var close = _.bind(this.close, this);
-                if (pos.get('pending_operations').length > 0) {
+                if (pos.get('nbr_pending_operations') > 0) {
                     var confirm = false;
                     $(QWeb.render('pos-close-warning')).dialog({
                         resizable: false,

From 17fbe120db26cfe58b4c4e0c11c03bed27029510 Mon Sep 17 00:00:00 2001
From: "Turkesh Patel (Open ERP)" <tpa@tinyerp.com>
Date: Tue, 17 Apr 2012 15:40:26 +0530
Subject: [PATCH 118/238] [IMP] Improved code in rng file for new attribute
 fonts.

bzr revid: tpa@tinyerp.com-20120417101026-see9y162am9k7bf9
---
 openerp/addons/base/rng/view.rng | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/openerp/addons/base/rng/view.rng b/openerp/addons/base/rng/view.rng
index c058795e0f0..c6ce513f1e1 100644
--- a/openerp/addons/base/rng/view.rng
+++ b/openerp/addons/base/rng/view.rng
@@ -222,7 +222,7 @@
             <rng:ref name="overload"/>
             <rng:optional><rng:attribute name="string"/></rng:optional>
             <rng:optional><rng:attribute name="colors"/></rng:optional>
-            <rng:optional><rng:attribute name="fontbold"/></rng:optional>
+            <rng:optional><rng:attribute name="fonts"/></rng:optional>
             <rng:optional>
               <rng:attribute name="editable">
                 <rng:choice>

From 03b62d9b21283d21dcef7c4e89856e2cfef58585 Mon Sep 17 00:00:00 2001
From: "Quentin (OpenERP)" <qdp-launchpad@openerp.com>
Date: Tue, 17 Apr 2012 12:18:10 +0200
Subject: [PATCH 119/238] [FIX] base: name_search of res_partner can now handle
 properly when limit=None is passed

bzr revid: qdp-launchpad@openerp.com-20120417101810-wwijmbp06aflcebs
---
 openerp/addons/base/res/res_partner.py | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/openerp/addons/base/res/res_partner.py b/openerp/addons/base/res/res_partner.py
index c8065403148..bcbeb0f3d99 100644
--- a/openerp/addons/base/res/res_partner.py
+++ b/openerp/addons/base/res/res_partner.py
@@ -307,10 +307,15 @@ class res_partner(osv.osv):
         if name and operator in ('=', 'ilike', '=ilike', 'like'):
             # search on the name of the contacts and of its company
             name2 = operator == '=' and name or '%' + name + '%'
+            limit_str = ''
+            query_args = [name2]
+            if limit:
+                limit_str = ' limit %s'
+                query_args += [limit] 
             cr.execute('''SELECT partner.id FROM res_partner partner
                           LEFT JOIN res_partner company ON partner.parent_id = company.id
                           WHERE partner.name || ' (' || COALESCE(company.name,'') || ')'
-                          ''' + operator + ''' %s limit '''+str(limit), (name2,))
+                          ''' + operator + ''' %s ''' + limit_str, query_args)
             ids = map(lambda x: x[0], cr.fetchall())
             if args:
                 ids = self.search(cr, uid, [('id', 'in', ids)] + args, limit=limit, context=context)

From 68185632ba9251109f0db942a35e655052ce5a0f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Tue, 17 Apr 2012 13:00:43 +0200
Subject: [PATCH 120/238] [FIX] mail: fixed error with icon and icon_web_hover.
 also resized icons.

bzr revid: tde@openerp.com-20120417110043-zrywu5ag4fat6onz
---
 addons/mail/mail_thread_view.xml           |   7 +++----
 addons/mail/static/src/img/feeds-hover.png | Bin 41761 -> 15696 bytes
 addons/mail/static/src/img/feeds.png       | Bin 13316 -> 5647 bytes
 3 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/addons/mail/mail_thread_view.xml b/addons/mail/mail_thread_view.xml
index af0c6cedda1..35508477009 100644
--- a/addons/mail/mail_thread_view.xml
+++ b/addons/mail/mail_thread_view.xml
@@ -3,11 +3,10 @@
     <data>
 
         <!-- toplevel menu -->
+        <menuitem id="mail_feeds_main" name="Feeds" sequence="0"
+            web_icon="static/src/img/feeds.png"
+            web_icon_hover="static/src/img/feeds-hover.png" />
         <record id="mail_feeds_main" model="ir.ui.menu">
-            <field name="name">Feeds</field>
-            <field name="sequence">0</field>
-            <field name="web_icon" eval="static/src/img/feeds.png"/>
-            <field name="web_icon_hover" eval="static/src/img/feeds-hover.png"/>
             <field name="action" ref="action_mail_all_feeds"/>
         </record>
 
diff --git a/addons/mail/static/src/img/feeds-hover.png b/addons/mail/static/src/img/feeds-hover.png
index 81f098d35c29de21809add39569ce45ba2e7b628..67070d3e7dfb003cca7ef8896ed04f810eb05ea6 100644
GIT binary patch
literal 15696
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
VO&d1z-`Qp$DKUA`T4BTB{|nfHS~>s#

literal 41761
zcmV)VK(D`vP)<h;3K|Lk000e1NJLTq007|t007|#0ssI2vC%~>00001b5ch_0Itp)
z=>Px#32;bRa{vGf6951U69E94oEQKA00(qQO+^RX1O^E)6snbHr~m*U07*naRCwCt
zz1ealNs=XYRMpJyhAkpv$;`;A%38a6WwU!)WXO4-$dLUoGs0(n4(mJk0es;fj8OPQ
zig1P$;YiQ)QcG4<E){zO5WwBs%}fs;%<lydfg2ef4OC@yUxBzFBLRmmYN~2Sj~<l;
zsek}ZC?SgaF~Hy`1$l{Xj_wrg66F*Re-2+EC8UJ5Mb|NBcQ-R!`JrRbhaB?L4i;d@
zpC~%;a?0@Q8E^|i8T1@D=w{(84jJ$(3fplx9Q1rtH_ut*!ZF~3dpNv<d!OR&1H^sk
z1Uf<j5;5C{P9S07@PG~=aUhTtDS!Y%2#e|FnUP>YYOy@U$x}Rk*uHpF<}b#&RCYsN
z^3B>PJrA-`aRGF|`QK;F{4=sq_k8tziENMCZ(Q`{eBId?qdnXEVEn-+haY|i_dmwo
z5zs&)ToI?#um+ZnpqK%&CIyH<Nvj|kCZGcj0w*tzfAiI=$6xxZXXCs+h&~HU>sKnJ
z{?+XVB6Q#J4t$`A-mD)Lm*Lkl<Q8t&Mt!JXcgmpWLmjqec3jWJ_qerJ7cj<E#ym-j
z=%a&X|AXn_oj5(%`@tVz|28B-C(tQ1v_O}!A0TTo08Fi=r8Ev?Fk^oD;@7_}t3^6H
z&5Kt}x14D?h>9ri7AzpQUvIN2p*Vl9ZFHBP*mZU|2id6Zuu)!z9~C+VuCakOx--t?
zoL_UI07MBBN=O>BG;7AzwPQ$>y<2xb{?Q-f(;vgekUiLx79B7mC;&$Q(Ez>%*Le0-
z_w@1n^UoWVsmW->aif|ux;ff}@WxY>cd(=ZHaa*r&_QNB@bm+{E`&pWXW-u@ZusMa
z-V4dAbBRmNX%qLIC~Fll9hpYe*wCDoq048dPgf`R=EwNapJ5DiYl#QeOh6ALR0t(J
z!&^N0qW$vcubw>oVAQB5bV*7nB?(-_q0%QU@9zJG#ipSz(ud{}1OI>zwh6f&Biivi
zIWW!)3-rVH19*F~`&w42aE!;GM>>$A=K^smp|fDi#na=@(yiR#dw+^spFj&dK_#%R
zdpel$@^Sj|7wz+hGp@pVX+jeb6R5xe&u~FA6=;7a+lc=)uf~V@q8t6ld*sJ{bMIKl
zEALo#uK8iNa7{~QuwS<gLUbwO3wd@b3TQwuK#epKgsV-aNAq;{o1gxt+liBZaSI_}
zwZi_bAOzh7#CnM*k6%4|G%2gutphAxAv;PzaR^}n<1s8^xh7OD0t)q;9r?=O;Cem&
z=KB1^O<uon;F1*oEd={vxWSI+`DQW-5kRCF0~szz1<Vky$d7h{*o-jIl+T_$oc#Ld
z`1Fr3IRp@*!B-tZe)_ln#h-t9dpr)S6`wy5mF<cE40Lo3BxsQH<--e$iNjXlu6x_{
z^E+^Z^L6sBws=j~b4};p<rJ^Z|5#tS-{e{ymXC_am9KvL^B4b)R=fxX**qsYB=_sp
zlek8V+QqBS|L$+Tb9fhbrZ5I^7&6XYA+61mGJ)knfKbTh_&y8Rug{<TZv4bQ)l1sx
z{|3M2q512D%?ur)fTH3LxtNq$fHReLj;CMZ);-`Tz*oqN#lv57y$B^kvJ?ja7YHEY
zb%(?X?Yi#D&)$+hUHw>Z_*o2o#~k>lIqWn$F*pv(BX`->&^&nHW0tpt4Ig6b6-m<i
zLkb54Qs5amON`^FUCF6i9Dn)Qtxvv>(Vc+w3agiAkH4^XZr)ibEJe;Y@5W1;#P`_h
z{%%~+m3~6rl9O<l4ZU?u{<HDx!ri$6ci+PXzNEUqU_!DcZJs4}(K$1mJ^B3Blh1MM
z+X3APjvwZehf~WVwo;OCgE3LP_smYAz(L2ZG~ci39S_Y7hOYZ-vy8X-iJLtC)hX=G
zd~pXR&$szwzU%Yn@HhadxYLN<x&$x)%n(H>UgnLB#v@yuE>>Uubn?AF4=AVk$*)Iw
zK2|j7P!do8g%h%c;|P*c00$Mn7n$TWx#OXJLUz^+uSA&qZLa<5Pr140f3sloW<d(j
zn<W%bBC}ew8B&Yf1qHJ0X}fs(#iV@|P!@}4U(7T$B0vE%K&YYsfD%ROe$oZ5{XOW-
z`iWsdbXa{E7~&^xK6t;+su`BQ{ubiQJLg*HktR`dNJWMV1cZnh9O8-uSIk%YalBq0
zqdN;I>vZ<=aDN696hZ(Mh-|1(E*p?vd!r4I8g2YM?uhad;OBt%kKyWiw7!ldRop<X
zvTtr|=*s8HZRyJ|y^@_+_ctvH{Ekvga=-$<?lmlQ5iz<8l&;lUDbRpG0PSKvx;u?&
zjVHej_~p-T?M+sT`FK1QRWLvV6i8*{Q2WbJKwWf^@;EjP9jOBy;{fG4x3L)uRWgAL
zI@m%BM4?mAK*D`flp@^wmC#?Zfg7aL{f(5%`)9F@MD_pDfdE>)w#z^4H9tAWIQrjG
zh+es;C5HK%-Ft$v19FkKoL&gZ<)hODN?bg?C2s7_N6V0n{cebH7Y^<E?zX#q$wC+i
zByJvoYD95RfCj{9?+B|ru@N5qG@v9qf86TAO1E>qwtw$2hS0<qA~YibB_R=`U?F5k
z|NdP-LTctjq!lE93MDl3@R-QCcO=OSfG$d)a${?zU#;r=25s|B71%&)(9I9;dc1!A
zJ}#Z`n-sw1^<x1+6yV}fc`baE-{I$cGgEWl%P!#j{;FdYIOZ<`awe&&vZ-f^$Xfv3
zC=khgP++CTSqO1e++B=Nue^SRD-~>vA{!4;xVb2Kb6rvhNP0cjq$q$Qwq2WBdYuwh
z?_|4<HtdCMon0%kD}1|k?&ic?ovg?}zdIDy)PKSoQ+W%8>a}mAtX2VCN3vSX_C4(m
zWKJ*WfI@&UgDQwb&>|!hiUb!|h?QV24jOBGCrIy)fW1-E6GEwgZ1PwI3ZWoe)Y&sX
z2?6Vt5Do{DUOW%aZ`k{|a&A-#7xLX5soc2Vy6I$eC=-$N>%j#17XAj`X|qLA#nnqd
zw<e1!04KdCr|d{#1g=V?gyMk03`CbX_ae<0hz`vH6{A{`Aj}Qa2vJtPK2$-661ntg
zB8ieWM5@v|BI$uW5d}q{!fJ6!sQ0@z6;SDda>3VaOxbHbtruSufk2m?P~Y#sEOzlP
zIk1kk8w(q<hv$3T0)<23#@9U#+1yLNi}vnyKPvJyCkZOhik>PUAd@y2O;?PL7{$yf
z5*#732=bv=^><_eNfxCL9;gr~M1+vg$2K9#>e3bm4p9LO6!xu1?9&<*WJLioSQ7vR
zV6GH6om8Muw0i8CH;7+NhT~0RPXjq6*NA!E+!_-OTr)i${H}f!DBg8}xdV%;)xL{O
z%37{8Rstnw6G3R;f=t&iIl4Q$`|(*P&L)(`9AKg3E)?}-ZD+|#DPEH2&U5lo+)EGw
zu5h7?Z?FUDf|$s52U|98x4^du!<+jdZm0@`^wyvhO2K)C(63<GN&DsXyyELJp@F#O
zwOyz4-IopD6M*%vJuCZ{sGioLl=8a!yquf9_S@@}#uh^e5JfIIPMg~w;nP3d*C{YU
ziEsfOk|tIF$7+q@=0qv*jFM0?Sg>58B+p&ft#jLTsm)yyUqy+AwudKJ3kRs>1FgQY
zwgg_H1#XS-93mA~Q&&CDTcj2velNh$x5e%Oev2}cTp_>96#0$2a3eyfcwuo=T3>M#
zw;gFi5ybH%7lh;}^e{O~@<H4K#`NeI2}eo=obV*c#lzm=CM$AfE&8MHm7^;--h2-d
zOv^8RE_v;_%k8>r+tRMRTS-Y#N+cUYKv5KwOm~zlF>cauMGfQiK1=D5*Gsq@Amz%9
z`pzVW19wdWdHdW^AD6cfllboNr3~)58=S-JI?wy;Hm_htJHzn2N(px=VMSsV%Q^}=
zYB9-}DWXUax~nHmSs@xL{w(mCMG9R2@gi`5y6x?B8q4(0|20a7c8&E4t3_GOy<16M
zx2LZpE!)*{xjth`Knf~qK2w1Lq7X-Mq~s}i$yTdtL7@f!o>2<Cps|~E5**5{=P&~r
zOgbC#3-8gtb)z@~2{61zqa;ZeP_&3<u_R4ENHWS21takQb&6*RSpkjP+DJ_V1yq7s
zDvGOc)*Mkt#j7(B87ubVm|<L++a<C9IjomRE3D_feAUk9tHrCua*1xeYR@!v@B(*J
zjC3-Z?gdp}E(DI^aEA!g&_tLbEeGvGhdmzQV9M|Cee`wVk=J8M@1gNAi1NmPepCo}
z5kSez(!-D-MP0NY2!e_L=7J*dx_@V12fRS5aZm|V=?GzMN@s!0DK2K95|Je;ja`H{
zqgfbdJ#h7IQu3r*qgx}dyXOzFp05^*Zn<dJt7Yk|V~}#VciT%Rsbx-5vSf!8C~%{0
zbm$8f-ms1fhVrBaY6rbXZZNp-Gz|J3ftwU1lx}S3Nowq-LpEQu3R^<l$dPA#qok{s
zd$npQhXh3T_ojK9)UhN_xoAQuru0s71}!M!>@XghD4V?xP`bu5)~j}Lwmf;+o*ge&
z^Z9DtKpHeLglNT3#0!{AD0pXC2kO9Q%3-md@4=(RjsCoR<0v;W)Q>VS(+e1lLL?=O
z8B9j^3M2taFXF}mxDxgT&4Qa`ev<`ovpsQNuBa*-+JLC28DLIQ#+2-y*Y3=PsTh3}
zk77d;G<&7Fl}7iL=$6Rqm!E%zc2QPmxm~Qfb$~P>Hfov|GGKj|VUG8oKmqe+`)oP%
z{4N-pk2*XHbLIX9&%srhfnrF7NvT3p5_GbIkXj12n`3z$0jtP5E02)oI0&XBiR|t@
z?k`R*yJTjeX+jgJ;*?TKrpsuuW@hT7bU|!9X{OUXLB4(eL(GqH{JeenczyD+U7mJb
z+mv)D3jcjJuN&{x9_UMX!}&2Ka9FIrfZB=!ot$s>0{~;*Fp|!BNEGK*sA7|{NnaWA
zEt*0K#XV<rC!nIWcnTp!n%T5~+0k{Ki;AkMS{SWTfvRa^Vjh}|yz(58xturQ5FZ|l
z?tL;^EpT=+KRNcr$&2T|9(lV-SD^IZzR^3$8`kL-uhC73%CAm0d&<@2UPlaJSA8@4
zV_#<q?mph6f!4DR#hw%#1G%qWN;V0Q0G%d`T>`Wf*G@++Dr|(Aa)p+n2;e-YkM@KQ
z6-W{*+S|uP`LN35GJ%N!a1y1U&^E}u&=o>jf)oU4no>&uLYX?I-<jNZMH^my*`2<4
z`Rv*1#dBS)rtlA<O`>AGKw2QT5Qh=!C<)Ha4H8snQu*S9m(4wF$${3hyenpYC4zHt
zmC74dKEQYeY7-4Qzqn9A@B4}0={Pju9i|;A;$iUef`A4wN)b539ibo+!J&2YL>W0m
zp@MKVKuz#!E`ky$qF)<@>>M9>^9))52(r9sCuw|dym#lp!M8FO^X}#I<>QCXpFAut
zU)&za)S3_sY0h>j$QU=6j+;%M49`7F-NL#5<Ca+K(!Vo5Zvo&pk*oSnp6FeV*O<a^
zms1Saa_TMN@0<SYDecn7VH8IDm>f*@Z%=OD{oug^Uz|Mo)n{E^g}e^1QJfjG(y?44
zCNQB0L`bDI&?sWLPzaTpC)7Gw+61VtYfJn`hWBCNa!~R&xK8$4$W;dBqr7CDHAa)a
zN4r^V!akVVbrv9Ml>OT{I8-Sg-TNrNe0KWy;o0%aWw&a?8=%25bWeZ;1c=ehVT2Kt
zB<r9Wwv8)g6KV#?NetCn<xTd54#szH+@}CQcptv^76SZwPV_g;g4MJEN6ws?R_s7C
zP3k(n{ZY7e|Mr9L<M`$B$>aI+XN$9WlW?HZMgVOfR_TZ&>0Pbv3Z3vvJ?S#c0_29D
z&yC}qeuLb_icyC5J{QUQ!hVnPEQhXJS4dHFQ&*!hX%Xhr<@{hgp5D5JqYtNdzCC&R
z^wpCm-N~aD$6bR_AjRFp187JFw;B_-cQ3VF(FYd#21ohp;>quPLWA{9Z~PNDl+$|A
zQINlHu^w?c_5#9_C-*=hXd*VdJzFoA^OI#PoP}}o;ipG;zlCn`_@_tSovfCxxIB*C
z>Bv_zWRrxFHZ1G_L|3CUE-t0pW}|X})_%#KT}UX075LwaC;uKk?YEyE$nL&__uMnR
zyIp>*KILy2^;_l+RH|r*CUl`F0iT~PV~FGZ+v-^7u5(({W;Ffqul|~6FV3F)dimtn
z-SJnle$n{cYR$oYBP||C$pTOf`bPV*UV4jL1Ko5U4D>}eoi7gEpWLvH9}#3=&p(rk
zh=d3)UP|`9t#s#Y+^{VUS_1@<lHx+B(+ES~y)cmm?xkZExJFu)CqP-^aQ5-RkM12j
z_|zZ&V)gLn>E#z(y_}fBbFWS)6?-ZGRF#{LI7MqejBPa6{dHfsqw)UQ^ibud^;56b
zL*1ztJ9uqqz(1#ti&KOf5f&wkZr=MjiWWt#j4jb*t{$dGle6V&F<;F%ncV-u?BF(D
ze1zk#9)I=^d(o%C6gj8FQi6$wklL)OszMfeDcK8MM55_+IKtnZ6W!6DgqxR$3co|#
z>v!^@=K3zQ&Q)=k_wl#3(A1VL7ZB>=x$6v+IB^*jnc3(7`}gq4AKf|n-ty@ekDh!X
z>yx9=XgURQS5}McY9YiBNOdUyVvG_3Qun$waHn|Z2Fx0;SLa*$u{iYozB8fW`fNnr
zW}|~=4B+<yuD`k;OI#fkx4!03dqppeY^wfM31e+josXJv9FI%k%k@&dnT;poy$?f~
z9Nhk7cK<u`N1vTM{`}SP%l(MG$<*3x7PqoMq9SH!8g?yYI|XG^qk4~rDFgGx!Di$)
z_QUU&kG_qEf93D!@3j-H#)r-9NeZ%V1YD?;ewe6vKMu&;n`kWSHg`n=!#Il`7nhT6
z+T7ls9@)|T!`mNEZ{43i`F!!}`LaFRS5>Wb{URdnC3l^bvSWKb{CQqiU+CL<wTI|*
z@3K^03(-~I=0|tfb&=m^GZm`woUr18txm+nhf+;BI22GpsYNx@5JwqOx}4~v@$9r+
z#+;`IAIHPnw;p_d@x^B+zxny<?4jpX5ET(KQw586-8xzTD7;wvAf&+c>TL~&2%Hb^
zBi)6+4$m)dG#~YU%6q0=TI0bL($iL4QRJM$B7nMXYMuSt?F1TvHKPJarK7V^8_!1F
zdOeP#IBJr&zEron;XAh;eEWy~pZ>j`JzB39EUqSI28g^#l)l7`8fK2e^jv=n1M_$d
zr{6iVlY{F_TBJ&p76=QpYMX06he?Z66v`p$@amBC%GI&s_y$<`+I&yHSiE%sXoG7V
z)J>~fPygG<vtPP8rMe(Aqk>YrkW?sC4Ft=0HuYTQsbitoBsNn~1rGI3{#!i$WqS1G
z>eUM^X@p`(LTPj}T7a8tfLvumZxr+||AhRG$k==v7Uq3oed)-5JlC|oj=-I7_-cGn
zLV(conxHqcb=GOl(gb9ucv2G(NRV74kQy`0Ur%Ru@nwr5v-ZFH<_cVT7GLd(@-1#G
zfQuH4%2nyd)wt}2uvZs@!qqQ1rCNn|K{n3{h<m9P+)E8^S4ir5p=*@@Ad5RuIGNr3
zbKLoZ{qLUW!(YDq;%BGFzuA}7t-VQEoQU_`+mK!}b;G0fH#yWiUx%BA2CZ5cJJPM8
z^OlC;qr8eRDSc&Dt5)a5V^2irzsI&fDZ~D(L-NpmCauOK?tnX0sOGhA1QZo0#0ABu
z+a9IYR)NcfYr1?SKv8a0Lg|2dZ=L3q_9k9MN_oK%zWb-h>$#e}@kS|La5V+)O&y+X
zi$M`&2}?+j@nmm0{d9kF>(1iQFHgSs`_G?#d3QD&NgKSVCsge>P`FjV){V;5_N<rq
zj)YQl_aLEboVPT@xr$b#;!=dzeSAMaC=Argq!hvlhZ2plDToCqXbK>z=(|LUC?pg`
zrw;Q?z<0di9xjGpt+OF6xZD1%$rVu#eXG99H-=6oaHY7X1RsrOI{NPZWM-qua{u1T
zN59$+`5+YY7VR9lMad!pYc_p{y!433jYpu1Qc6`+C5PilycQf_Fs^y?82(!>l;>Zy
zq6orVO@Z^t%qrD{)B%6Z+flIP?`&ed3g`mc3gc`ZLXip#^@@2_RkRwtu|%}SZxH3N
z2`EK!lC#doux4^^`n|*Hw|~sP`Hx&YJ3W0CQ<_OI%Rq-x0Nc>@{Q`9F{V*&5P^J5u
zO(yS#wcT_+y32U42WJ5J7M+qE`s$QkPoB7_x?7b?ux+$c7p;xa=K7jn>?QUuE84M2
z;|i+|8L_oUt+9V=pu8|BO>SKKWw0L&Vj%|CnCbH@3Ll5PadUY0FaG=PtDl~H_Mg}5
zHOu-?Y?H8LY=g|jUML4pASy!kQ?>{p$Q}BrJNcIbZSMULq8r2w24hb}Xd4{7Na;kf
zdQ=woWUd=U?;=P70Kv~k<!!gmy<|Sm!v(7-E{nkhr7{LxRH%d+=qQ9Z1EmmZC@x|H
zMKyjaW=b!fDTOhcI<#{xQg>k1Joxdwg9HBN&isr2a`NKK8DeZkD0$;Pw}NVX?OiL>
z#rswJ%_>pf@LX+izD1Ml%BYeB$v{EKPDKvh25)1Ygq%>aW+iH5FA|ct5pdt`>ubDr
zs1fcxqTpKyhN7TJk&SC1N*&j?*(It=3)jn?(BG`_gsEN8rGsPvbs{0SnV@<4>iLIz
zhxYMI_V)Ih=B$}6PM?l^Wn2dDL{#8FzTki^IKetv1h4f~zuVqu@chq#bC-Eda}0N!
zMBalxniZ6)F+(aTh0H)F2wH<Lpa4Osu2J&Eef>7Rmvc?qO=OqaRxb(#RaiICZmyK7
z8(Ln27+s{ul?d$b?6X>}VvM6^7PMJAJr^+%!T#+#XNwa%UF>Ni-};mN!@Fmn|Kj<V
zKigLw$wEj&4z5xK3SRHxcU0h+!|}_(vwH^e_HQ1U4cHMbuUt12<_roaK~?qDYB9F`
zvYun{%FHPvl_LE(s9-uGR8+Hqq?4pjK!=O=?$d&ZKtxOhYOrqYbrOim1`QQgLdEF0
zl){n$1XVLJZMb17{g$!oT|YjZ>_OaFP`VKUMcfO3R9r2{^l<Hy$Tl49?;n1;|HuF0
z(f{$kd27teNE-(>O5`=F5?}~00|nVx`6;F--L=dw-NozW4$FI+zNx(X&jUWJ^FW63
zo`f)m(^-<JObIjD3joqY3M2sqtYyS96GFne?TUgFt)oo9Dx+r_2t{rw>VRhf;2uI4
z3$((A^jvZ&+2Ou7oroxrAwl4(8cb;6-Sx$OO9`5YQWbz?(76HXtF0sromh)eeOoh)
zAN@Cfz4+Vz@c7~9(?C&QuID3{$?PzlybP5cp#n3hcyyxNXv}zzJ*W)rjed_k(~x{c
zfrB{8T^I5i!ZF3Xm1j>8enpInXsC0;;81gkordw9+faiBn86}~K@DnHExh8=b)QZJ
zkY%*?*m>{0f{MjaGnoa|uImVKF&7sWp|nNBh4M{e3i2FgS5jEem(4)cOd~>3Yhf<p
z7K-Qx5B_jQ-ksh)e)8q>`SD1n7DlOLw~@oG)cJr4(2J99JLdFV&r{&F;ihjxlLp87
zp?I4k6l^90=Ge^_kG?7=>$Nm4+ISbxgGb4ltl^moP0gZ)7(%enhy|$K`rZ!|3biU|
zVlaqC9Zx3KS(6Ig-HW3jC(VF{27qW#p-9u?h9Es(OICDUSPTVDt@%myF&i*LO_=J|
zTs6T6>ug+>3;Xbg2mAMI?;l=#@mZQbTa<aX?#5vfP=JD*nUlLyRaJ)PqeFG=%0Rz+
z<3NM(fBBz=*t<ERq%7qORv-d~jM-AA3{wD&w}B~uF31vHqmy+iO)u39rKm&KZPFOW
zli75(KR!6bY=+4cqbV@vcq*d_#uHcs6$MUdix&i1ED|6_5r+aU%<@gLQDLpW_f=CR
zYXTts_AV4yhPh|~f|pS~8|CFJ628WhFP?n%H_J!AYVuj^&h`T*!QjcembsW2qJmei
z$sO0PGEC3M!7?m-`@r};y!U$WzFtG<2Z4HmDS`#nnV@59f(C1_1>B$}8CW5AJ%%7~
zN(JEy<)9fkCC|^=vxoEFNTGXSD|Ybl18>GQ8jq%X<Jpn!9b$T*qy33AP<KTZNkmsz
z9PU19Zd{moIA(aRh*Y#jYN)6HgsXVNLZ^!Y(%H0iYt#BLntk-?{c%{1n&Z#^zFRGm
z`j{dist7D&GcIsQT)*M@sKkxyP!F|H7ceT-0tA_m4yw@3p{cmj4Xt_GH}6UWfU<&6
zU?QfvNk*aT?u;U)O)wqDNEOu}QrZ{)klj1_iji>^X9qgH&C%Z7@BWx^kIjLO_L?v@
zjZH9z7W%d55L{o6b;Z#((;{m{Qy4@AuE^rWNH7UJ$>>ZD;{JYV7cUpj?luu0emd1M
zX197~wm$8;d0b}=fCZF{oGP$)CE9%*Ho^ChvAyZf?tT4L|L)*&u?R||h#JHIgXiMQ
zs8N}f30oYmf|_ERoxb<uf4o3+9P0CE3x%mASO`IxF^dXD4J<;sb$+=#K3y^V;;YYe
zayU7<JH2&(cI)<d?+~LsG}F#Q(xzWOvY9C+eZ{pW57h7LXb5pi@7wxK@`d4KJsXh!
zsLjZB&3GMcDyS18&!-BDD=1Er(ij~@N7jU+wwsTZ3+#QUe|a?f>EZgx=dT`qj`i_D
z#JCZZjIKkB5W%^mtM|;oete%o0MQ~nBo};BntF}j`4%@fKzo#%BH3lAORm>Ocb)Gl
z|Dht|N*%!%i2YDm$VddtLI(t*K(o1H1MM7fkgYsIk3fl3jXC1N<^o>Owm_mtgJ7b2
zFj})-yjY$5V*X34Mx(v`!@Ywe?0?vN@?Yh+FBUDDhbS?+D#db6rqM(svvi5ML<tDe
zg;WAX3=*K?wCo_M8iaKUp46s$rPooUgQ=qzo&W$K07*naRQ&XYT!3@g)p~O-wFyr|
z9jY)GAZ+prFHVFG+G$*cqrfuqHvaMdfXUycH1Zc;WS&9RU<NaMjA+n8CIrz@gRaA3
z1qpBk1sY%>nXN()__XU9&*-%$wN6>}%ed*~8%%XnYo)2a{U}un<DyaWwZgZ&_E&ad
zXS-_(L-+L_t6QLMiSyuQV91vDDHpJqOKZSi_fNzdO#JhI7eG+zFlK}@G90RaBs$E`
zuz0k3`qkrKekn&E9^JWnc;}uR9Rd@Ic2uXPB8k?->3B9%Shr5gZq2AE7xxUInVZ2x
zK@$B;b77@fd2KQHM?s~R-0@aty^cDsZax{3(UZWXNzzbFTw6`Ho*#Ydj~>isCqMgt
z=U@Jvlr#%th+&-ofq6!upeZ%2(2HcWtwC%6d9NVIh9`bOWBaPQQT4m;a=ery$k*<j
zbT|Uzcn?mAFu!j5=WT1cEx~W7pDLH;Yugp5UX8rspb8XT&Tp4niznI^st6IPQox+s
zyefJ9$(ZTUi|!$g$J20lYjXFac>m+k;hoX+sKjQ?uq^4-a!zX`Haa;H)0{ixWI!|o
zDac*!+7RlaFhX5|OQ<A3tuuUX3|A?LF7DD4M8XJ#XrVQ6OcA;B@lpKCGP0*X|C>cy
z?#*UwUkVBo>gHt0s!mEYC`>o<yt#3QBq738IDnpWrS&q#IaKqEHTAw=shh=7X>q)0
zIpr<IS?=O16T|iJSuW;o+ZEMMimm(ip5dTMSH7)Oxk+gX2|+=fTzb_NrIb_^PF1b8
z8$uXKfuF=wrj(pR+dgmS&z4WV=q3l_yPt$x_h)xLp3V+iHfPCKd9_a6c(U)s6jWsp
zQ8-Ix>dY#qMaw3yt*%b5iCVQ|{;E(Sfr8)&+=!P`6k&9_SR9Jr)<^auIYM~x)n`wa
zFZV~yL<`J9jC9Z0OU>{tXy4W8KrzR}H*Rzrk+)fSf2_mUFL}XDOTNCf>+Hf&FVqzJ
zGw;qv->0X^!@waDem;}n(xvEm4z~GsiVNMCaA~USYq4H&G5S<YSgug%jxkmWC3Epg
zN~an!x|dKQjzbs)VP3cM#f!DaeEckr_T%A)(|aH9-}}~h?~rOsxA_vJzza-^sVE&L
zaa<(SET(MQae5s7M$1y7g;jiCdIM#@jXPT}55{{LLEAH(-kto}zq)hlqep-L|LExw
z<utgOm@=4`F1PL?Q2`iSKy`;Z=zXsB`bde5n*G%#@$N$7THo4v3NFg?J=_JO<ZDH#
zLHba%|M`FX;~{~bK)JBuq^=zZD@el)DM~>l4OzT{mp&^Zdn@mC<F`z+?Z5DX8uF!2
zaTgI$6SFGgMS|Yy7|;yQ$O$<sI1aYo#F0A}^VN%|^QRA&PrtJH^Tt<A;GXHkFcFV%
zFq06AI+`YGmQchfHDf6Xudn<jtyCTAuzvSgN0*Z#PS0`Fn1w7N5;RU^a&UO-_UZ9&
zN^ZOCC>m*S!YN8IP_v5*T;Xs>VZUvai`{M)`r_&y_xwme;2THtTEE<tM-i9mRAlo9
zgd54vtyNxdgM(*02pERp{;ca{Lv5_^gOqJFv3{?!rIP!l*0Fcmg6Nf~0_)gMIMf7U
zq6TJd)+9n`qNxOUKz6ii&21y6AH>NAq3QD3`q`8G@@K0rCNjG{{^4K7y*qJs1e+Da
z6)hnanXI*Hrx#;3q`+JW)Q)&9+`k>Mo`P+G)5R;ZkpM=MQJY$rj%P<*+s+rKAspTM
z^x$y*WqLSSJbuP@HF5@0k)TLu9mT}~H*Byz2uv>XQ2ZQy5(VY_2wak&+T9v?@knTe
z)wT|D({@qLt&^|qm51^6higE{wm)4jka6oc#_IiY?<xDFCj$C)=Bagp=v#O<VLU!x
zCnQMHDatT&NJqC!%S8)O2tvkV<WsCuqiBLbwVe9u?5orH%h~<!+Jhh9)<+f(8<Y&A
zG!O-}I;HAVHdN~yEY(z(<@Bmyel7?lp1Kl3aJ5C79g4}p+VOmTeCNl1wbXFB`e{0T
zo^u<xgea7u=2ShvD~8Y;AFS`~?o*c<C7c3*W7F7q9=NuJ(08%XUWlOoX44j~T6bPo
zPxu|Y0kxm}yB|y6VEpx80CI5+5g`zgE6G$<L`Z5shAV>^QosZe*sPN#BW6gEK#LMb
z2%|RTOes(oa~Rd2fnrj7^+>NDvU(sPQPV81IYZ4JReU5q3Lc`HR5(@?N|YAJ2pOTk
zI_Mf<ty+A(IDPW?<jc>?tCtfMn@z{#vCzpvPr@S1;zjy|MAaI1y8A{OM@uPP*O^^Q
z4VKC}->E3FA&0(OhE~amtT~Vt4YVN9+_`t>{@!@+)w7qYlNSfk5P`+Z)#^mG#3qU<
zl1Nc00W=T6Rq8Y;vhIk40#OqPDgj$`^M%4fP=x-*kpdC;r6W~(0<Z`b5b67PJ!d-M
zq!(WJ?2=o>ZjQG7<lp__u%&MS5GON1u}Wg1if<4=sY$07I8mgNQI;lH2qCBi5s)mU
zG%=c)^-`b?cY5(sEC#5F1vS-;^<O2!%f5ibMk&GNLhZQ5xdJJhNxRv_YnNasx;Gxr
z8cVC?^QRBz&!0$MO&iP(CS&O|b;zv>gIS0pwU~?dfpPOOvlyfMbqH(|ilTIpVsu46
zu3E&USBDY`T$B)sP&7dS9XFH1y}icE{P>x4XW?*azSba)YThG}Mq~_)ZX2w$-;6p*
z!o~X$?<8g0+AmOK)gpp7kD`@$ndlBA_W~Ai!i)4o#JbraNUbbjIWHzxU!yuW)P$kK
z%}Ex*ArPZl2l31TiE(T~fd{zO@nRrEwe=`PSy13Pc}dKvlwzYsvDG@<9s|44R)DFF
zjuTZCIrpZQKH0e5q;MC8cYzQ^jd$W;B;5fpm^Ml>uVY?~%5h#jU(6q^zx?3#w|@{1
z@5ZD1m>f~U($VIMgz5G{lgv5e8pWx_g|4*@aw!OI!AsWZCE5pZO)@=mo$ZbFd(*L&
zu0378=tkb@<OsfY_kQ?^#3F<U-6>@YQrm`2AX?|7Z#B}m;iqq>X<l_y6}Z%n)+$Mp
zGXQu#_l0#$)Hu__<Z|JO`OrRsFqD&)QwK4PBZQ{QTqVyIt!b8Bsq;T;FOtwrXe^By
zyns}?S!|k-s6ZWE2ROX+fUB1}MN~vUb><r6%}mXp%9P%G!F}!S^(5)s&q6lpHD2on
zq84*X?yIrcY|>EL#p$nKJ^$?Ki(ilLe0=c95A~z(%l@62Oj%@=0SknRh^m@dHPf7P
z(=^uvKd}n2@G@uWqM)C`oiGBTkO&KBd45n#?tkatFG~B<_|<2Bb7ya6MZjWEKy&WM
zy10{pJw34R5@!#ju)rOqpcHsUogplR;zE7xSQ*0#Ll8(n5WxD-UPn@qy}AlF4J6gq
z^j+GUeXtLl5yH3Vl<Y#!JX;Vk$-=gHr*V4g-qHP!lUssiB9-j9<eal-D{WbwS!r`>
zOHN3ww8iLxV#on7WrUiV7!U|CNK}f^xNVf7qm;{j)VF&zAo;eMaG~M_r&4OiZ&g4+
zeaB<7AeuAs8f77hJ+r-O?9#LO!;{A^9*%zVtAkJeAm0D>-sE5sW($q$f}C>*A;zex
zs@JxKVs%iW+jYj*VB-zP#U$6jLJv(dN@e|`<DJP7zWb*mIu@&!r%#)V3DY!+uqam)
zL<?Z<<8Rq!^9As<oC}@BQF1ATzL|4fdl{=D+Z#ti&?tr=0fqn-8BHMu5vcSdtW^8|
z+=@K8*Xm=xvA$Z;@GZJ|1G!rv*63N7HB)pnIr{KZ{P<6zO`}Ax_Qw~H?ylY;w<s&*
zg0#YV?W?oAUNWsukDnK2_0*O`&nOuzS~Ai)3Qg3^q;G`=`(hQZj1Ri08kBQMQLmyB
zMpxD;rnQm7;YFB*1)hKeuZjSvL6|Xcnb!~3>Fjv_<-^&>-?6*jIXKvdHz}o>M%P{3
zb(*Q5Kq`W>m19AVmAb-ff2`I~)pUAl7&+O?=4WVU((1kMeexIa%m45H&c{#N)$v&C
z9H}~+UExH@$OSngr;=LaM3!#7)?T=y7kdkR*ncDcx^&FQ{eRWMOfz1K8Z00Lga)BO
zh<$5tMY%i|SCS4POA`n0HHT{H5P>KerIxcJHDWZy<TjQLnUpXtvGFFlDZ~Vx7we#m
zqNXk^>Z$PrPj|gVT4T9L%hUDzbhVtft7X%k9<3k6be40MN=Bj@qMDicRti}zjOK7f
z={ureFolR`tG&@)O;uT}l60zzN^7v7#?H`yMAxQO2MKX9yET#4SF2ZFwd)tntFQdU
zllHrDJ^QF>8WBk;)qJ$Z{cEW+VXM85;3_U!p*;nJZY(BQ2uLwH2xcI)5*kdV^A3w#
z_9u5{pX@(aaq)}4%@2QG@~K6DiTPA=!8)N3rFbcxy5hOo=txcACL2&xHq;BZtAWD4
z5YO|knxL;2wO`H5)B-|;Hn4!uRIN{lQlf~c)K<!}qqNCgG{^UtbLU_|Ng*_2__CC<
zRob6-#b+yv*)>5$qkE{CW!O9H+`S}}EX*d1!ByOlZCqqlf~P$%dv%jo=6LaQyn0-Y
zpPwDSY*(u&m^L<!+O6isVsv8`sW?}?7=Ye0f2p;$P((BPPXAB=JbGW_$Qe-)4ODa;
z=^_><4Jj$DQrqfibT}GAy5*B+Prmw9c-2lm{^NrO-_pIqB{_F562z*~YA-Y?=Q}*z
zIvrk6HuZBd#|1aJ(aYeu<LtE_^fEkE<)6H!bxcgi=!y}l2$MF4P-OH+|8l(cXU8Y9
z%ndq}EQ@3BmhG|tRymZ$ERI+irLkN{;(5N4*~L$|YMUr3MlW>al8aWw144^vY{sx)
zA!=+aIzmJ+m|>N!t|ncK=UYYrC}bEmzej*Vz_JL_`amb${1w6o)7v>uAkkwBaVa$R
z-B_Nw`Ub>m&5a4FKtd1+Duhk8TUz6hOh1U9rU@`f%k=8x?AgPUr@!e=UyMeR#@kU|
z#nPE~5i}Q|!>Ic8f+CrgrJ;^t=DC21;$9%Rhj1W(D(J}7FdC7~P!XX;6@b#Fv<48>
zA2i+aXa9SA^mpaa5A@rAF#YI<<Jkwt*<N+sbhe*zXQeZ6WM+^$uPRtmnbbA$s9@5T
zOf6KU_1^%XD-w_ax4zU}E|{oSJydSBd;uK?fj4ZC>ns#;Sch3Y?Ph=V*Y_r~|NQU&
z*Xgsz55n`k^@%vf2^>vM)3Ox5y*CmPiw*{KbwD3lLjlZfR015(+()X{HE*vv0wSW@
z-Hj9j2#rKLU#OUvAqI_2uN9yTZry|H=9Selq);H?eBwG)0cV}=HoTunDwBYK(owqT
zQbZt@F-odLyJZ+Cz1B0{<fs?um4xjgqj_s4I*B%!%4jd$zW@E(>r<q&_R;5lcDz1*
ze0K88muHQ4joD0#t&bsw(7-gPl1Qn`osZ%uC}Y@2fAx=po6Y9=pWf7!3pQ*E>v=P7
zjtO!;`FycFmRHY4XD6d?|LB8T4-Re}Jbd<SvbR5(&2pEzc5SKwrk6=57iO?rbdDR5
z+t=H!-F8zhHmuV=HHdKWqJ%>WLPC(yq<it|;O@77^e_MQ!~gTe$&;shX6T9#;(26N
zf{}t%D{IvL{`2W3eP@gHp-KE53!xi`_qEG*0AqznQ6b!sGD_V@jer1cP~VGcg}tQ0
z3q8OmWW|U`r-{Brr{rqY${X%x*U{vFDj8*wy(1eLHzRA}-sqD9u$z<)>p4$eynOuV
z$<rt4<oTz2cdc9GvMSvgSVt-2;3~xF8A5<XKoilLl}Q+dXl)xRR4SKQJY<ck*6&75
zKr&_<yG3QUeDaI4vuD$1zq<APKaHP!|J$>}<Mn*rl{ns$@p!dbDt&J}Dy5vS%q??j
zYkX8?9Rs12i$fWpc}qbN6AIxbqAY|J2~Guc*_MO7quC$+*Ponx@uYqE{Ir|N$;5!N
z4upk95Q>c~CTRjnSMNJi@qf=7w(j+iWi8k_p{YJ_vPfnp2u*0B#0ZN}g&I`A(knFe
z1b5b|n3)dMamG!5Vh9;h`;{{VFltk@C?-*;>ew%G)ZM<noGuq(J^$=K{$I0ZZ>&B+
z+xR@DGilF|mz!)gL)d|>1&LNh;;9goPYs~dxUyx<OO^52X!24*wh)`qzOY#@7O%cY
ztLG<+r{Uo*_x|i(9q7?QLYKM(Ef!6sgqXRym`aLV@{V=SylF7%#V_7{-8(cxAwtrb
zR18F>J8YfG?C93n`t(R9lfV4$9{Bq6|FCw-WVArrX^YZz)Um}G)rBpr=X!=3Gf1H8
zf%<DA%vQVH6th9XQHYkMFtsp^aU?OKX%NF!V_i3G?v-Lr(th%9f3z#8zxmZaD1k$T
zP*__69{gy0|I_57qC!m+s5j{GF%D|Ks+G|?%Gg9z3^1o=#3W(Kuqe99VXae6@5DPF
z$9vzp^TQwP-}^XgJUd&jPnNPSjRuUTFrYCsiYP^kC{-A|NXbB@I8i{zh7LzDK&S$N
z*ETGp1jLw1hxV+I)g<~%6BZ}0o<8JaKH1+J-?@ua7HtlbsZICS?v7l;IJL^Hi;+sy
zqt>1yDIzYC(5I^J`iv;jA$X6(7lMUSBoxRxmC1C!OF5@@a&&0>d%5$){P-XrE3+z$
zmJ=MI1?F8RqrhI+@HM)p3?FND#lMwuZk>II)Y`#aU1laTya-*~krPx=t6?G{P&HLi
z6`|Wt{>=}Earb*YyBo4msu%O3UWA3Eq^@h*cGaagn!p-sCLE33#w(XsZ8=@9o9U?8
z+aKTi_~5~}_V0Yyj3$d!H$PjbM!GoRpr{!jx%I9y3AI^FSV^vR_zC;5=Ue%HDqvD&
zs=1P~veJPCEWtf8ug*@pv$N=Bbg*}@zn_R@&TcBqsPqd+{i>zOzFDdd?ln`d^44}G
zuZmaq<yxw5l37TB6JCb`6tR@@cru1+p3g@IN3)|3&Q4yOJ^E>rQq%}(BzgAY0ofcu
zAQGIiq3oXfp`n#txtg-vcM=Iipel8Ys^_HeC>m5$g(an~Yr9np5hYiV*<Q?2wU*fI
zC;#?`Z|UQB^G}Q5=4{mH=oZmCqepn7G72(o!nBE-YI!atWiM*ljGM_QoV|RWa$<-&
zo$AqT-21S3@SVwbe%LMr7;^=*j4lxn6qFKRN~%LibBb5YdP}F03-E_PvdSuGX9_rx
z3KF3jnm7%1`uNL}XOCtEn~ZWPty4n~6!tG$g%uvG8$_uD5egvgS|Kq3!n@ljr4kQ|
zRe=_Il?kc-x{z_yP-L-gqs1^e7&Rd+p0>*qS+R+Yzyn)rD2*i{M1q^T_SU3ZGra~I
z6{(w|Efr@o(x57PNdXADd#<WUa4)%|J6ZI+8_C~pqr0Nb4ce%Jdm%K64c{r#DYfq*
zC$jG~5|GTEyOKK*FovX|RqMjon_1YqEqk|{Tld3wuPxFhcZy0-2|`h-Rj=05P|gwQ
z&C1;3l>{<Ei@f%f1%@y|GXjAwAz&6HFXxXRez{oAZ+~#>@NmED)?z*RTM1(&tZ4<k
zTzUkI)dxx?eFPa`qf+3)qRfV3o&>%@7iG3LTd&(L<-LQ0vvvDw+1~l&!Tz4Tdj5R*
za();Bw7^?MNys$RQnaz326N#muE9n%1ld~X=63qjrt$>}SzJgli59x`x_I3xus)X_
z-XeF#`faGX^i|1Sy$U!~LgxXW{AhgtyQwtSVxwN%U25gHXQqLm_i2h0Q5s-ElcLJ<
z|5NwoO_E&6o!HOa-+K{}nRWCHGzP$6I2>}wCApGz`IjVHQe2YyQcLJ#$!txwW|FP6
zGLa@8!?`%X;O?`!s<JXOBHnZN{o_ScRRi5%CxnJLZDD1FLRwX3q^CbWen*Th5r|{~
zDrQnF77n~R;J4mN@4nq0-MAR+{CuR+bn%c<gakMt7wt!AArYj2VSq4V09WjxQ6MBh
zw;(5upa>6B^+ts47D9_Q63Y46$@<xYMbN`LH@%oSv4gZaJ26v$h)!NCq<|92G(9Ep
zNTADzyu?|~(Anp{H&eg_8eD@HCKqxd5U~)n6cCuHs8WcbS(KvfYI%6?d!PK|XK{Pc
zbq*RZAVz2<a#=$jq=ME-FEuLuzsKm8Hd4=F@M$7hO?!U0!OWZ{wSO~H*X$+xIC6?F
zjnS_IqR<?p;KAlR`fbGM<d#T5NsNMWFq#~Yjpo07b!J-41msCv0C9*BXF+DZu)He;
z%<1Oc?t8y|aQkib#k2EW-d<2qG9eOhsJ3+z7^hMkxl$l>)WPy7QcFsi&%(LL5<y56
ztHxe}ZgKH=_vGQxoA2bYV9bjcmu<(Ov8XDHgAprDK$m$W$)R>>U&)=<qxSL}nwGys
zTnUpS8BL@eqH9H^g8)`0>JEmB-P>=y`RPCWzc<HI5=DZIRn?Qp6CeaIIjDS#dGw_Z
ze31rBrB^Z4%nN2>a=2A*BYFQXfAE}{&DUQ(;a3#IP7Il1^zOUg%31FeGNqB4%rSE^
z1f`_RO2H`@iA{`-iA5<EyP<1JVkcwD;w5Bb1(#LVvAGq%o6sKM=w812&f@;t$eA1$
zgANKwT}T~3xr{_UGqH5m+A<?DiHblKjcyrU>IBg!Dx^4rDN$+jTF$@NJbk$Ctxb#L
z!&L%V9)(z9qaY<#syJnuMNF7LGJD_sGpGD~Rtk#1X2-p`&6(kuT-P+UZ2&2SQMzt%
zkd}*Xd-mXipB}9QP;!veT*s4&`6QkCjf}qNn?8`PZH5>`G-2Lh<mP5Dvy$cg|M`b|
zVe=}a$cV|nB)y8i_1oW|9)00Ep~Ol_xrQV8{MBb5I)UqZ>|iGnlc<eUUk5Vhs*LIk
z8+JQlk!ESB+i|;-E-!DiM>pD|gRod}=yonU_0i!h5@Im}gF)`5s-~G45>i2ONEHg0
zu>Al?Mwbjy5W!lMh#YO3%szj72IIph2qbQ9X6BGk;Kmg}LNuQT;#X8Jp9hLxlS*q|
zVYn03L&IyXsP$X*&b!>R5R7=Rc(7dQ(?^T@cWHfc@$94}B~iK>G}$bcMdb2LbaG!k
zM!z}=zWkI)tzIh@(ctE;@M3E6{$IYgM;@&}zpFgT-*z5lBO%b#8`bw>VjDW9|E@IO
zYN^deQrHP5uF*7^PZp>o15swy5G=LMVN@S>{c5qq&D-Jb{cd@*Q9mED5=lx!&N0N0
z5;38u73Ip}r3T>OMpd!4LU)M^8A+&H5cWbP!%ZmMIJkBC=)wBYr$=qX@gckQ<51iY
z#RwI`P42;5+{G(*<^{+43x8NgViowS6pW%F8A<)b(v`?mjZ}g&lZ@M5*xQtvci;K^
zpFYsyq$PTh3jd?RD3?HjNlEVY#3%^#<xc1N__Tg_eF~f^$PBM%{a&!#>Z#0R5RzU6
z-}_N}_uI*%a4;F8FbYG(m0j6u5jKr*_-dy>PEb~7buLqp>eYxlEDjEdLRJhz(J{Mf
z1XAFkD927#M|5~|b#xTkX3S-~-HiPpOo^CS2qMf}#VC!*eNxo9l=mPThC##|VIe0i
zC<YfGaFBNFht1jU{A?kCZrp4Z%OPjP#%J_}z{DZbfYV==HNW~pnqridf>JDqMq&s~
zLNh{|CNt7$G?|$D?Y28yDJXRZtHtVzUw;%;Ta1iyIdmWgS%M3wyv7&>Fr^`$#`S)=
zx}j_GVRPN$V8Y%pT7`US&m<(h27l|fyKm{NXK3=Ae26|q9|dDT3CQ9qUc_rRT;tUk
zMpR6;D!sC0@xmc<DAYKb-NhI@9>#Vhq0t=jCh8XKXWX74_D-p3!@*&*T68faVQ~)*
z9Y)E8iNFC6sIg^nBZ87BMXP-k8C#zy6BW3@Sh>rz5(GMX92RmA`Skq!>|(QQ7kqHU
zDLIQxL&K_@W5G>)J|kWsK&NFWkwKKAQZx$nYh9~yrG8ezCJ_K}4S5JcqXb&4o}KNE
zzyDiuy4LkcJD!R4m%tu!hqZ79&-Kh}iBX<S5T*`zD%|KA_U1Zjr2>QZjnP`T7%{su
zQ*VT~ez$$&2ib!XD?7mKft<cUj1n}uF$!v1P=zpNfgZXfXktp4AT=&k*`xOLPV7^Q
z15)#xJ&$ZTut$N5?6^VfNF-+~V<E(J^G<sA2aR(9Uu<@}T`z_RM;<Zk5GuBhmAOz-
z5)c?3mK{P}>nV)Qxgfw@qG7j&>EWU&WB=sw12S9Qy~jij!6ZpSAQ!K#w9#bo<G36v
zOb+Gs<yU1<vT23OPFyA1o!H44J|XrmE56B6l^9N?Cq{{BQ^?yRE^_?+_a6NGC$xLo
z;q1A}vqJr+3DgUB;V<>IC4a@QwN#@kfj;so5;l2F;`zTrfJ6T3FMsPLPv`{~Rbso7
zJ28xC=nc64`_0|=M(09g;F%*eIU-M6#uw}%Uhoe@fEdZFTqinxFY{YMe)%p=*f0?b
z<igJEU`KExD$GXWF7;#;<)9P|(g2NVaDc?5En%5?<ygeq-%B^%K(p*s$8iXP5FL_{
zPmvTMW<#ME(vqaHjF1a*ffks7lv!C!SjikrAcYPK3=12!Cyze)<uC62=*KpgQpyMy
z!yqZ8Hf}fP!F$nh9)H&JpHNu>GuIvjXEJ86(7dY>IHLqFg2FJF{HLjEhd9_l1O&E9
zs#Q)sAMSYNh;RM)cRu;)-vr;4%_cRl5k#;-DP@o=i7^>HcX>60n-qVqryhD`9N$!{
zRL}xXd*@55_?K>AYmDxZL}3+N80w0+H^%)xNcY|=U?r|gM+VJudG7mR6ebqAUv;ef
zVr0v;l^cQCd46<#*)}ul-KlmEY$WWIT*G9!9twv-DRau)?6M&MVnCh0#O3kLgIl+R
z{OtU+?}rqb4;%EmVJx9pGNmg&6K?<jAOJ~3K~&vl>zWtK1B?SMyKSyAmi2ZsNZ?xK
zFa#yK1K2z}KYrt_cCp&!ygXPrVdytEZ{Ene3j&;^4u&h)^0Hd3Cx#I@k+L||pVwG1
zzIM@b$!EG4CMX0bg+k4aSA_$B7Q<l}KK{i&941Sixefi9#e0kkM}XD26kV!$P2{9&
zD4cIxjp7Ae_&)<=B6<HWev4i?k<NC@<Pf-$*iHra|FF6DUh$gqWM2H*H;U2Mj828i
zgy*<AG3(6<LP0pT9gdFU@*r`$&a}zJ^C&4v>})JH?i$jC5XuO%S)f3Gsy0%yTcS(e
zI;QMnglFfcWf&IA#p>|DRGAP{JB(RXooaoV>Nu&+DFsS(Qd_sCBvrah9Iq~u#-!1+
zgEDs`w+4w`TH7vc)7@CulSikIKR;X~4BMD6X_(E!hY9+Ox|y`+<;bp&jb8h^EAQ`<
zM=u5aodTdF)@$%L|Dd_|gWr@GWmj@Hs#a5%+A<y_FtMox1(rv0^UbC`yvTlX^0aB&
z5IfDi<eUOPhP(p>fNINPB$sO*MKWTZKGue*rqm|JFFyZd?6*e;%M?QjjXOU+d6r_U
zs11-9g}Lmml6^LhIZ27Fj=5)_vR8Y(7Q7gEC(F!<osy58ZKI8`X;wFnPCxskU!NxL
z<AOI&EFB5diJYd-oX_Xdm6+03qVn~}=wJQC5B5Ln$shzH)|yAt-S-N9Lt=D-&yvlB
zM1`OCLk35u*elF}qyt*sS>C$GA?<ek#rY<YF9aCYC<9^xGe^i24PrFa6mTjOty-9p
zakcz26Xa0(W$^Xm2fK^&gFAOAHWz0Xv0WH9g+ifd6r2RpDqEkAQJHsaVBarB*^5)?
zWod|loV;(WXBc^qgX0@b`rzk(e>0h`H%$ju=T|sR{i;9tF5cSxWArkQy0X~rGLQZy
z#3;zg>g;Ud?D(Ya=0rT?Y(~;7Mx^shB`#Mt?ksK`Cl1@qcDKC<R#IdLp(se`a>p}C
ziy3)Uf2L^~O~hV}Lo@dmDe;o6zc}BWok!5>;Hc@Ay-T5{HieVmqB~Jt$16~aO*Upn
zs3qneG3w4RWy!PvQDbBDLEHfDsSOn5aIvuQ;je$%@VK~f<KlGJgs-gB{i_+1u7lEF
z|5^VR-`_(wZ`L`lXFap-Ea3icOpMk;Y#LP6SqN1T1WPGeF>~jTOj4ncDY=9;q;PP&
zXqUN|Yw4N>VBc*?0#K*%Dy}>^On_k^b0QF1wMVc06BTSur3p#LkN)Xb!*+Y))=f@}
z!rjPm8t=~nx%2ebrsjx(L7W1n!LaX<RH(}E262r(1XltTmcol{z92Mj-aY-`XMs(J
zAyNrnvi`yIJN!%Yo;qV8;@5BHB!Bhi-{0pwu3mjy&-%+4O?Tf@gx`cbT7mU)Wo|@T
z1EP#$*R^fijAQPH%n~J}qF%BEiQ)L>^44uKfBf{>xa$|o6*PkiTqkn!<P4>R!Z2VS
zlMw>6DmQ=)XHUlSGnhYn@`(C=_3rm2ED9&Co|E$ucn(k})P{-cTw?DS1=S2K?g1ru
z0lZLDN(kLB=GAh+nr|F-AO8Gj!{+Sv@ydrC``3=>X&%2!Aa3CGN?k+#!=JzN!qq$x
zUhu<d97gJFmW6d|fxq{!7x#ZSD(NJfUD0zhBm5;k!Qa-uy)@MvWE7l&&x7*XoiH>I
zpre+N;SvIqkvYM;)zNyJOX2p$z3|4{2hDQ5*_@s}J?t9TfV_ncV1o#V;RRBt^s43}
zprD3GL`{SK0=o^iYa6y?`KXOj`Uk)M=++<p8)RcINm$t7l>}I^=r&E`rzr#x5PT2$
za|dTi05#r69~ovOnVLdT9Vtn_+qF@6br8yM{^UXQp<^C*qZx$f3>xrU9L_OXPkMHL
z?J@dSfBr6BGGl-F(u)iNR}tG;q__U4ed7nC(F^nF>yFWVU#}q;O^!Ts)2aj$D7()S
za;u|e0(OIPv+&Sng*eN>QQNgF^z8BHRQe=969Ay^VT2eeCR#YSlUC_EIOiQMPBCtg
zM==C10Yz+3(??Iv@4fe4o9N=%)5C*h)1>uw9aA#9oa|C1L=mc+qrZBL8i`T@S!bK%
zqY)QQBe%)|EkYQ^!QHy$vJ0U<dvx-}Ckvr~B7vxGh5{zRi06)bGNLLC`5nY);D1@(
zkl#+ee1%`f^H%!GU2j^tx(Upn04riH%Bd|BF2+2B<2yGFLW+mWuD>`NPd|*~X(C6U
zs(8T!s8%q47zcBe5KYUlyBIIFjg{yiMs%QTRd-=1CmTIHJh=Ub|MvFsX4yXR=I|gj
z=etcztrO3sA+yh(f_uJDqiV<KRhZ4eO5$L0Wq>4{5B+j+(EQ+!Zl8Sg?DJo5hetu0
zz;G+>14{(d)R_PO%Pa4{B#(YAfZzprG&>uKQy{9c)sqVKzpQ%n3It}LI)}1Z3g%MB
zbyC!<;yV($q3Ec_F&T#;XCjZQ#qw}TX6uW!=F&(+OvGU}0;oU(1S_6<?=N)N_}CK}
z)x)vwqZIHycI~4FpRGvK{Wm$LGUSnXba03^udrxBjuKxg0KYQU5nzEf))RR}q9{cW
zf{#%^EMqBS(ZjBbQ6%riN1yVzRrhKo!Em^fUGuHDI_sy=!D~P3-~WrZYyJ327iv-T
zq8K&)4e0AZmn3(dl%^~DNR0T}81f299b?p-i4dFUWZQmM%$k(K%{w7A*?2dWaa3F~
zJtaXa=B}XhygQ}cx#$qch3hFfi<dAWdmAA(oIHNmmJ+}BPUsfvO&^y>1+104TXp8$
z1crGV`Re(E;NnJP22l$2b%|>bQY{jg3F9yjA$7~;a?yYEGh06$a}F^PxfW%A-k9Wi
zJ^CHR=%2r{=llHP7%eWZHIIHP-reLLeD0d3041BZ`9|XPE2gg?qEcd@6v$B=8lteI
z!JQG~@~}O)K@=~}&v)xHDq{?RxXTL81KEIajqM4IBU9l(Ol*@;rEx9i1cE;5Zs>=T
z^;#&l_rJfq@#f>R4K-a|U)7r_aGDYLuYNz-J$PZ5k|>3$LnknX2MObliP5CUWaeaH
z(FR_ge(dLuwtXL%nFv}c!RU%QN0$hY?<hvYOMk!n%g_4X)PD>UR|4Eg83k-$t@3Qd
zmm2h!W?0b+m0c4A7~PzMNLmaYcD;>`F}25cmrHKg@&==yeX2$ScP4?yos2u|PNyY!
z0g$UBwbehw8q8}dkK1zlcz8HG`^UfjKYw)e_U(UrpC%2nN`amPY8i$}mW*Hh^#;!l
z9=UT+m@IS$1Di)kAb0lC2(r@|mWd9#-~PSTvk&^dFQpeCghVK&BjW|=Jo-+WnQxFs
z8ITG|4?=^=;>{n#+xJr0bv8D(>ulHQwzF+(+vo$kGIH=N(3vk*1wtxPt4bsgp$gg7
zLEzNS(uB1~)o-6y##N@XqWIXaV0(D(@mC|WD>?!uO}x63s2Q{#TYPzbk<%=$0RjSf
z$zv&nnMi^e26ZJ)?P|!y+}myuyM;P7ec9&1?hTKkJKdgf-cFzDGFhY6Y<+1n$CZB4
zA&{CDcU)Xt5aRtG{%9E85bIN#!A+I%C?LL$maMYg*U=q*1p;z$11NJcaMfiIHzFzs
zAtfO%xwn#yQ|69c7dJYbKii%@EB$%WvJfzM?DHhO$QABdcec|u|2v4$@4q^J6d=T8
zW@E{!3W}@ao52-NKgRk2PCw?;Px<^)zWAKB53qg6{nOZZqA{UwyiYy`FVQW!M;5Wk
z%gGB-31ra`c5a1831D$%CKfU#Z=zI%Pk@;dg{Dv{CdSc7jJb+*5>VBYW`6T*0F6l>
zxvqbdYsJY_(Qb|a1oz-RNj<@XPtpi3(L*u{>Y@&I3PA9(O2JCG*bLkqFYo{8d~yHr
z+4=4Ac_-)FXOB*vout$RsINg+QkIn|Aq)gp2u4W`rkyT)yoqPSqfb%BgEzjH;%ZZv
zB!Ofc`w*mQ;*hg*ti$vAL1G7iXE-fY5OGC(YJC*gs7lq_>^96w0f3vi8xcbSNC;%i
z>k<xr?~gVg{p|eLKYOzi47+|)+Qm}g#%_$lR44+7)y3-d_Z$1^<~cyBMBc<;1_kfV
z&U}3VlF?usi35lsfjBUSEGaLJEH0aN(XI~L)sZZY&>bRnh+Xs$jI)a(5Jzy*5X#sy
zhZJLq!s=!0cl|DpV~mlAgkz9M%x)@L)SM*w1iH1^^4cn*?Amd}K5_KqOD@p$f6Jtw
z`+^y`63;F#(=exEw^5)_cgh?$lC10EyQ}-6=l|)a&wlmG6vFMhcZTy5FWw##@<dyz
zLwKLzo{G30dDTha3<Im(vi17G&)5IYe?0gf?%Yc4<9<^l9jp#vdDE|(wi~h=h$nGy
zugrLWt43rcT+KLX7_rfGbFROlxoWF8TAojsQkXZ3yUlQN=lB1(eDsgIXTR<W+Qnir
z!vY)B$Y1VX^WDbiOL`O=cfAOU1Yu&QTx`rGt2gZuG=imCHyM+H#TXy|S|B8GjLj}3
zjZKN|7}DzAeK|N-+`il0yp81nBxbY0(ou6*%(2_)){H2Gkd{k6y0sayq4GjZ${3(a
zlm+vkYLkJG(S$|!N#(W5CVIWOG#LlJR954~ex9>HL5=jQ38jb-69wUz%q-{Jc8i0z
ze|Yx8KmPpj=jr_O8z=|CJY#ZX<*FiKVs?Er8?=w;Ad`S|Oj6cQKKsZ2@;h(;xcjX?
zKH#ILL&kDZ9OGCP3$apWp@Xk!4JT{FeTU!V)*^4W7q@=!M{oYo|M<y&eE3H6D1c|U
zk)zrcv1b5I0s{GWaMu6(z3NeCD_jeAas~n;1x`^?;3O2`kv&ws7nD}}gM>DeHslU{
z=i8_oE^8W3H_txboP2um=%e#5el<M)*iJtW+oxezuMU<=FAE=nWvLp!&e@zKnG>wQ
zHL^#tfC8^b4r3H{W3o$Uky>%W#i_#Z$RYF8^VKmKPS^B7XN0d^c9ldB5xA97a?WIW
zc;onRv3&O6(~C!+-8g7S%D9F^DwJ$eTPT;mu996tBml*oW2DeJpytoc&Trhj)g9j%
zmHMK^>I-6<G4XT_d34ES@+%U}%=W|{_&FjYFVV(TXs|kb_RF6~9c4J@1hN9MI*nih
zJCuTxd?&M~fB*KY^Xmytk*6MGcJ?Mf$k~l7lV$eIn#o4e0k(sm8J(MNoOX&Wybs<d
zACAOUd7IX!@!3Op^jUcDseJLNfBqpq{s^a^kq@D5Q@08s4NCo(t&Bcy#fBz$n*xW>
zD{Y3c5vj~(q8V5@EnyiGeEqV+;A_X=D-Rf*oxs<&<dbh|DLH2|WoDM(L~d%JraOv9
zN78TBPrgXQx?vLnVl-zbW(Sd7VcrNr08A-bY#_<Z19BJq<jF&3>Tcd!9^Tv)D$Y&Q
znAO?STx!qXTsGL(1D7Y5=N<vX(11aRcLNsPQD^1xryqv?Sre74TuQ{$U#S!gapqCI
z)_wh-z5VKEJ;9+FWRry)CZAa^g@O=)$Qi`s0UqE%lo!kmaUvEl8<Pc?cn*Xp-o>zp
zVL@o}E}T8fr;pYTf4zD7aensL&!6z_LZDrW2a9HrVhS=rfqZh+3@mch7){C?HX+C4
z%H3|_Z(lCE{Z(t5$y@NbR8-&f7$X2T1;CTD7#r~>TO(=t#+^g9Pe1&X_5Jc_g<<eX
zMWhZ6{JB42Fo{T=I^}Uk<0!gIZ0DzE6uS0}`^&|#QUt{bB2RWTpQJC(121pIY+JQQ
zj1n}ly3>VqIpgrH`;UI{4+}kO^EtlsoC$@a69?DV9;5I7+1oE};Qd8>CW7XX+=&G|
z4?*f@tBfcGT2Mx4h89>cQ!Qf|&5A=E#??=q5Mb`PSijYNgFG?}O^S=SXsIh(J^j4@
z;)DL-Kk3s?{Nm|&aoRMUazN|~r%|<(5>eVDrVg;9%J0-w$^;y_^!TmVb*=!2z4hLS
zu0T>(;gwQiW)M%xa0G`JGX)o5aePY-Z;YGW_Tns+A==0=hFYbo67zK?xmPg;aZ|FK
z)Tv;(#JJmBZ2Lvqh1+j7X}QhF5Mn1%o(}ivaH~A-FNG;ry@-8gm;#Grkg(&U(fG!}
z0go4U`kAdCCo0cHJ5S2|-$fpM|0Q|!Wgj$-ZS`8dDgkOE5v#e0Og20s5FrU%NL<*3
zT(}lsE^zGn!Qn0}DN<w$P*doZbxXEOJ}gi;?}m$$v&Rn}e)iGD*@>6_V9_j_AYN?P
zYVKVNbE*M4sdq42otswjF1b|JntO01+Iv<)FG;=QI93zU$?|%Vb2N_8Irc+dbO#4_
z?`=<>J^lQn+c%dOcbH_b*@);;A~yksVg@yMX(L#i6(CzCIbW}LgC5?0myd2;^fo%h
zfSC&Cv&`h>@&2W3N_5>H?A7{>0ONMK@g{ah7wfaTZ`^(Si@z!74-R}cg(A(PQ3OI&
zaCzPJ=%0P>Yj(X~Nu+G<?(9BmF->kbGS46}pS?cW{8@wtLLd)7AP;p{$|-sb9ykk+
zLW58a#H3+7gAQ;8Cz41U1m2+Mi!ZjH{p|e1ztxkE4@4KMW!JW9Y#z<XNhCJ0=^$aq
zwj0I}<D{2B$}mCoDRrg&G^naSIc7nCs{x0ZndvP1UL``oBr!@%E{ma1is|U)?O?+P
zKmW<?!*+X~qj>0|4g&|~CiEK%3=je%kOfo=b3lNI{+S-F=wiKoc5-(7?r*PdzjMCb
zbzS4oN%D%RZ5kHphaHPtX49(bU%zwOV;w}WUB4~P%I#pDof@*ctMK^4pC0N7i{Ttt
zVi;kPQX|8*Pp=;jwPzlkwsTiqh)-14SqzJK-qFm|czY3xdOjW<m%42RH*pJAtx*Gr
z2?(yq`_}rEZyUXkVLhBbzIgi3HYXih>K1M4n%D#(wbBnmKMo|)cHJzW?REbtP<Ea4
z5%yW}GfiZ=FL|+j$-jP{mXo?WXmm2LNK7e-qmAK<Pk(*y)`D!v7bP7g7P;7toPskk
zuIXgZ)oLs-Sc`}iio#92`DWWKRn-9@VvxG2mQu8o5+v3<P1ivTd&ek*1r)33Lx!X%
ztq-<-y!-5@%SP)8k5cCxblir?kDgw0jQ&se_t4EFsEb|Gv6{HQJ`2}YEt5H%on1vO
zDA-&KWMHcU4t5tWK|N|oswrzzG<dv_8-pA;M}d;<$hK@3VmmHlVgzy<clqoIPCrX$
zpUV0%7RNdkA2y5<qog2eI*tPiDgu}5e#ET`avRBBF-j929#_SmU-el2oJ0j1(WvU=
zFm)>&V$&?c;-Edg^~J{@cY&~bmJC=ZvYr=kcSLFoW&aAb&4Cu!Aw}Db`sn2R#;rHv
z?R$AptCSLAchgeTR3s3~tn76esi+Pr`<(R@Lkl8vW2Q_Tf*iDA#re_C{`v+RlK8Ih
z>e$`Nc5Kpjf#Hz%|Lm<j^JpDvTx}Zb;*sYq@ikdHGIA#cRriW3l>0PY^vSdb)qB7l
z6t`iSxnXF4vX?qNhAXsyAc94p11c$R?DWCelLwC<Jk@bLT!hetSV|r@a0{`5M5{)Z
zUp9QzgKM9AYIV8pMA!5|>DnCN+UZYq%$b=%TI&D-CB#KY-7?7+pL~dmC(9$k&c_k5
zSQMjxB3}4;kr5|&0Y#ty<b&d3+lSP2$2Yh+EYz48+yVz95OdQcGrJ}+G>eMVIlw;k
zVu;C1;e{e+Vz@4w5Q6oeemI^!UBqO0<P@QqJj+BPeeHR4uNZYUC%5M>r|aV9*RJYi
z!)9zQwT3mHJCGUn@%#kAfSP3uAQG-ZAkGknW#lc&KrmqsL@?T}&&IRIcJ?TZYfh9F
zO_!of9BaQCZ4-Hwqaxbpo_bZyt@L@jg82FM7_B79X}s?_FaiPK;#43?QJA|sxB90K
zhxL=>*>eVgBU|npXt?}Md?k!z2Fjp>QNbak5c2w2;+Wq0T{MTL#Z4s!VyS?vX>@wo
zEL}BD`^6}^17@z$h`Ht52l55bx_$o9N1c@fr96=Ll6XoquRTWp^!}bePW#dT`BKGh
zf;oJ7hGkWfX(|pUdD|HndHt$*Ue6Jkp*-yniK{9C%XIJ-N11$tBg=6jzj$)?=#$;)
z)0R}a7AXcMRX4Cr1xe-a);%rnb<kh#`fB$+VXCUK?d5@b2}*|w#=y=JU6NAcl88A7
zHG+eqm99@7J^XCZa@U}2#+F_DT8BETELH98tdOSJW@}QrYGXeAVmFrV?f=#f?g~p$
zl@LKbmSPiD#{H^8n5)u#Vw4=PA_Rj;5GT$3j@;S2TP#n%_<}A@mOjvM4gj6N4E`Nx
z>Fk$BD^$s5RDsRu@bW9>nOxP+p9Bqk5?-7y1V?ZZ<LM_#0v3X@@7OQINAXd-Ocs`u
zj2g%SVFg)&S~W2>&O7ucU9=mE$YuB7(Sy^+kD!{Gj#H~w6H_+gYX3mA$Li(s6X>%P
zl1&`tdh~OxLFd6XiI>KA3>&E_)MRc59LYL1Y|rJ!!NO_1K11n~^(mLh2nKLQ;R-dJ
zv|$lgV%%CP2*MI{*X4ef^P|OkeB<42(V0237<^PE5m4RPvR|I{RgVSx#3&h;!ot~|
zgoz7u2*eET!YY|<Kl@eMJqfx60d6Kj=Ks=S)F)qFe064gX&619;I&+Lf4;Gpv_b1(
zY}ePU4nkoa;AO5BYTe34Y#c|$Sj<Qy1c{M}fr5^qJ^C#)Hvwej{N&N6AO7<GZ@t$-
z#hs>+WK@a{5-1~!8&A<zr7PHpiHuRirzliJL!e0wuOg#(o?Fpen0npl`!w3n1atLl
zQcPe@t`QpGrR10kAKyqMpMCV9UOYQomI+rntp@@?!K~h0Bw(?6)*E8$uH|Br8b}$w
z*zm14-tKN58wKZN#04HxbT_ICb+}BX;%o%oD@NgDDk1b<To8%eDDaZ09g7_;+mm1Z
z4V{0nh+DXC3ZzYL`nqYG^8TN_{X!?E7hluVh_A5)u3vn8OI2s2Jdc*Xayd<Xx7R(;
ztY%n!dlD#A-LLwa*i}dao1nlmX$CTJReNKI2z&CO(epN+F7nx@fBSzmWxF^&Xq(oQ
zdJh_x9AdCt@*#L3Rn6LGWa*GPC1NVUhk(q0dK|G*YG_)Kk%P=;VwYcYZlp`GMP~<D
zB8m~*LR-%X8KB~<aXC<ehQ*Cr=y%T^KRJ-Vc|!s)I3;$`?HKZ8(G6f@!;rcXgb7Pg
z87;Wow6kXqe|_*fe-Ib9);$f7co;XkbwdH*3d32H63moBmC4<w9(4$1GK*#~6cJyU
z9+)>-hr=bB-NW^x50_=f9S=b_MH`wB*VnWlU;6c%?(6?_zrKE|k?G~0x6eI%>Nft_
zi!V=A0!Zc}bsj~}tBp%-)mf&slKShAPRX+PkSr%38?yDu(_wwSSS*^u8%!bR3@a(*
z6iGm;AZ}B8K$1qyfeUyHK31NFqEU1J5hgFWxuO5^W`8at>%~B2*J(f&6oM;BA))S|
z&n7W;!plHD>`tCMj6z;|D==3P5eD3$)91Y~GDimoL$n;s;1FyVP1<>v-u~TP2_?4K
zMi#D{PbaW@G!Q1hKkXNz)rrqd3P8acc<0_aM51y&U9{!Nul~OCF_L9bHEW#MUsWOZ
zo8h75ul76ZCpr9A=8?{php+BivQHCglYsZ^`*nGri3~K9e7?RoeRe`6A9eAtl|;Ef
zRU*j(v@nfcERijelWhp2vKz4>!9!Chx)P1oSN#7B&A&31XSsJ{Qzj!WEEx>)E(yvm
z+~}4Gk3Ra9=f1OTbT@|xp%J)3t0H-QPdOT*mFT6qwn0$1`|R=d=KZ(%*4?#%ETq_G
zD$dp@iBXnVCVQ5>`}#{mUUsQYBMxRNF&O7{bKKFRPc9yP+BI(DCaQ<I1b+23!RwCE
z{Q=mvp8<elFKwJD@m9{{Tq}bdrRbvTgmH0pvN?I2tZ!NiEvKei4?gA~aYdYR9>w}a
zW2QSIQ(~n6PwbpbqZcK!E5NA#bI*q|ixYtqJUiwREAx8WH(eu)aeJ|B1gj-&*JqC(
zuTa|H%x*Adosxi{F2tfrG?OYLRg0+@w>uq29bJxo=f@k5F&-F&OqodAV(hY$R5%2K
zIQD{-OtMvkYKk?B*BeL)Wg!$Tw~P4M&;D+~#W$x7)xzX;$LOEDftO4-Uvz=oUY(AA
ziLu>7D%$sY{A|Ta*RYc0aAGS^T{LoYk$7Bh9()i_zlbP&_ifj>Eixh?H6aPxHt$Z8
zC<Ern5ebnUjg3UPz-s6IWgD6oEvt+~ITRwQ2H<2)sPeX15n{|ahZsc17{cPljsEm>
zeE9hiPGsh#MyK(-*it4d?1f=W$b!rWlyuCCfb-2o`^NVdcitIjS-4Re7}^!UrI$uI
zM01`DVtv0-4kQz|#y|>EP$9KOg6?+V=8g4dA8ej{c2w3W&w_uiH%9lGkCN?4SN#U4
zt-byLS#{R(s*hkaCt`9JadKnrWxSB_+}BUe9z9wvZa2%DtD_se`8xLqCQ_{QiG@AD
z8X%DqyAlmfTB>Z_S1spW9HU%FoIp@QrT&4y25P!x&SlKw@zIfLDPu`D?i>i6{PJhI
zJ0oO~Qi1)>Gz^Fw;SRHz35!9<NP;1fu?^Y%B-5QA{{BY0k`}NrIK<6~Go?!FyEX@W
zWl#w*fudD7wmKJZ28>-)F*+|&T1ffq=YRXA?07dK?B{p?&CdEa_R%TXyT0_7Z=qhi
znwmfPuW~t@eCne3n$5~|FPaF;yR#GI-Kq-><?(F2c``JJa=en3*EDRA5zsaZE+Lji
ztO+UvH!eknB5spQ0=|?=Ulya6<~VhXbxAW3X*4S;ESo}6s8YLFw!8Dq(+6cZUnZua
z?2ypp(F64JzFhzSAOJ~3K~%?D(_XHivIr0wE96FI5S*^d;^>~<`CiX4nXr+H8Iib%
zQz20n#$NbNuC6G-NZhP$%6KF|kksNR4Vae)asBbn4^AJ1vYo|#UT2K{hd+5^&orld
zJt2CX8ma`a>$PSd^BjP|uwf*4T(luD`VFAn!HxANPcBZ+K;!bxYH@QpLWcqg9hW55
ziUxLov~U@N6?PQ<lE3`dob^88{~?n_Sbbtd&O@JLOl|7UPS-I+iS5Iav*WgFZXIks
z`PFuPa?mjPffdv)D`TLJ?XI??6bKZ&pa(@{8&$(a<~RQEzgrh-s3C~5fsjnud6b|`
zRloPu@2E1dQ!-+hb9TzrkC~_gcUzCC>lQT7`J?`y{%$E{Ul{c_iP8V%Pv3m;EYx4-
z(ez?#rLUVsy=>I_GT8ebk2gT!HLntZiO44?K26Y1t%ytk2!pPiy}uayNABBZ5v1)#
zYA=SsIO=!WP)LzR-DMhcq|Hzw#mm0+`Ir0RH^9N{9$gt0Y%)q>C+1KkovT|zF*MzZ
z-P^KV-8nq@;Fq@Btk{WAb|xWtEgb0j0z|}|w}x(VOHJII_T!1t5B~MPIeD~M9^86*
z@pRdxwiJT*q3a70?-!#+%+5)j$Up_GPUgh$=6qA)@g2a+_Vnf|jKBIx+?<Vh7n?vS
zk(rsZ2#FBU%XDtONsPY#r*FQ_`tmieAl%_PZO}0*cTCJM@@e_WRP|@-=O{LfjJkWg
zT|Wll@W!ps-r5ZUUJ@trlFP;@$3-d>`eAH%FBC5k&13^Nam>E0#Llw_9y`HMpPMz&
zc-$Tadh*F93s6vFPFk`Da#H52RKYInGaA<+QAB8$H7pN~?!6NicQ2Hh6ujhBATvKN
zAvUe}xPOd#a1hM7II9!j5m*#&Ja&2P8{aNC<H09qk3Q`h7gDI2*#uYgubV}EvlzX%
zpYO82B=WxQOt*dh#7oT^Uml}=%{hqRWPtl*BBp>>y|jwQ)g4l4uq)?J`)8*#Qrq5I
z9Ng)R(FB*VP$tq`v=m-6%c|!5>TU5PWnZ}pR~mD(MB{|QV$ftw=%gu-93NeL^znFh
z-i5$!fI`%%RB9t#-FB-!hOVGCaiC4V4NA-QFunKVvq5hzk9KG0Z5Kx1Vno-rq<P;M
ztxH`-CYVpC_UOKVv_z7(>s7EWA?Ez>*S}cF5Oim%X4l&a|C*!b8^q`vd&I;y`1#9j
z&`Tdrd**4s!nBcGQ+4xM{Am(zujr&atb>mT+y=(k#o420ig0-Ac3O0Wa$mL_(RST9
z<g)YC;-Kib&uK8JLRac0z%*O9PP<dO22>#e=`aqf<$~SXQXYT$Q7hzS8#^KEF@HWP
zYiX+bWCkb+Lv$QQ9(7Ree)O-9mJKySUo284cIU`Mp7+sxuG;%9$e`JS6v@yQB<4u&
zly^(<7KW}p`Q!sU`}Gn#VxGt{Tr&Z_)foMgd#@R`;``)L+V53V#cQG&-B*9+3@5is
zKU|u$b=V1>!Z?nx6r?smxZma7Zrq(8ym9P4?8=}V7K>%z&IZ?<N%raqoTz}bn&=sc
z@}=@w1$S3_NS$_d@M6}r3)>FOqTQW7JwJKac;AFVrDwlx=`y`a1Ev*H)#Pz-w)HNr
z-h8{e`_?#6k;PdyYMNCH+OL`S(0ZQ~+Q^tPqYwa(?yVsy1tJ6+JLH9{=TTNi{rQvg
zpa17uVMI#MVulciL-?9c#di>+`--#Jo_W+?CS3Ru{(CJtdFDSl$lwY$awRu{&hB2*
zudon_Q*=f)xF#_fFHWC*p*l3HuDx+{blLUphz&=W`d%?gO30Ie4T({;!milbx<EFN
zdJR(mgb-RY0uY!FI{Ng3e>~uAGoIDw%z#6b*x0FR_k)QOkwc9PF@T6RS##)?Z+?Ho
za%d0F3PNm-q-cLZLHv~=vjj3CX9X34iW9lGFN~5(04(OsiY@3kWE;Cxq+$1u|LG=e
zKm;=YB8=Lqew#hhpWJ;(OuR7p)dA!S|Cha_e%&*yonNv>ev#oCks>OI&xYYsn_qFR
zR{$#zRYE8a7GrxDLg!;4-9bvQH4P_E9)H0xtZuz6-L12o_oFv4rACUCePYx=#mSVb
z6A%}!F$yLFw948!X@!LYEJ#*>n84bu#Lge!?BjMkuX4H|a*Bn;SZDp|)?CPkY9<MS
zH=#(}p6`xtzKQ!kdM1axcTsq$r_uYuO_gGN<$9Dr1{xS1mB}0Pg;7%i6XnpK9<XsP
zD&d3|tHzce|KH8_Vc88t5MeWeJBh&T+lo<s={WuCQsbU~VpeAR^4{OSa=}0&sDKJk
zugm{?E$k<F-z4vJ4PO1?BADFSz;5Ig1F7X*8A~8E4I%^mDxV#ke{%8n|NHhQ|Hr}Z
z;ajbDTm~C^z)`it>X~akJ-5kpezMG-lv6LIeB}E5y=oh03hbr0ym--Z1JhB1FYe~{
z-o5|kzdvh^^WtE_;+l&Uz#XAVtwjzfnRJqY1|bL^N0LXM<d1)vQg8XZi2|k4_bCS6
zYZOy!P@ffgsX{{y(7?`cRUKW6JEg8SM|ZS*`(J5u_hJWEAWCrzrOp8-c$!VCAAWUd
z->>G;+xs-#{vxyPOOEJ^u1PP1uIakiHI&oy*_U(<Py^|8oB(VV10gDeLMX&WE~Eij
z>ajj8!w6itCH1Nt6(T2h1A0(T7=Z%K*lxYwBAb+PiTw1lkB%FPckU2i-La+x3guzU
znmMsFP-H73U=bV);zB;1=2dixoXG=uAZPJvSmwcJ_FF|RLCA%`?0%5k^5|IYvTQsY
z-+N<o_TaN${p5`{gR5?zTl8YgCA6~OT@GIA!eX0{iDK_E=wS>WKlsA$-9LKwy|ILY
zZn2^~Y<3!2edRnl>*tdgkq1L?B4Y!MZi9G<Q3{Jn9EmtcD!E-AfAo`|9gG)kWBo94
z0>vO9BIjz&>jW`@hkBxY17Ez?&fuTw03yRoTDpvKnnmHSuHcif^D7p+E<Q)>B_?a)
za`3G0Jm)zlf<+8bw`2n>tEyH`InV{rlc#rvClCMnf6M>ypAS1nf4W<rF>_3<q^1fu
zx)v75)RbKl>ASk00aJihevDPMnK?kOE^=l^$$giCfX0zax^Ysv_MP9S+i#DVpwp+=
z&4f5ohf$_+TU9V;s($paf_!!y$FmRrK5ZU%G7P)5Iq9q3%I9k;M-}XHuo9dKC<`*7
zC~=`MNGQzW<`7S}{mzdDG;pbwR(|~)rn!D|!Z)3khrRo+myVeHg_D@;n9%u*<4X*l
z6RuYRMh0ZKUCNJBCFosh#!ULzV29NK=uDjdDh%?fn3*bR7dXt>73!Le3aA)+ZJ4bQ
z^h5vXgMV7LfBnOE|M1q~_s71dh{_z6<~;QutWGYoguXjDq5`nJC}>8=*}G-K1zyI$
z%{b&Y-ubQa?vI~6{@|YPYSY99j)hI36@Lf_oDej?8DtQH;-H}qe)*HTfAGoj2k$-D
zY;q%olE2P0WB{6Q`+IL~f7wpV1P7@Br7HTf&v8-5)@0x4tp9hn_nd?72OwZFt~xfA
z^X+wXNpr|nw&$$SG&!ZRU(xg?UdlC%_o|n#Ro#956wr%5W3}^hf>(6A!bWJJK|LEv
z5w%G;X>dAP>UMy%7b7&|=$-FJ;xRP68oPBNEJ72U++ZY`C<`02G1wt)(JUDD68t0p
zZo&a3>PoCJ>ay{bjVB-cERJW<fCv$|yBN=m=E;PQJ&6lQt8Wvx@#$K_>fYgdzqc`p
z5)I@MULSK)P!i>ib{8N19gl0HfdN(ssK(~B$u<GV*qruH?0~%g@9yjm<aqUm7V?pN
zgcpL6)l<)^gk7!G*o{HrmCxi(b1yK{aIfU*$WVXaPCog0&O?r?qISZU__e`8{obo*
z(iWvqF_h|XTD7yS-qYZ;JUH6+<N4Y7-J_#;cqm6V*Trbet;7V@Y-52EXQ7c<2}THR
z(XA<9m|l|fUab^LA@=<kIYy!FxH~-TwBM$~#qjwj<M|2aZR`L7dXOoY;aayqMlop1
z4iz&t34jfa9Gq?a_=mqQhqskdMsTLrw~-c@@ED`zPk+&$J!UFw8WmTvD^nXnPB2!~
z;{DsINB!IQ2X}a`;>)lMSD3;Lrt?)ujWpLwEQ_kBk~&=7-Jk|js8eN3+5`@q>)e0l
z{+rLKw02;IVZ=D16fqY!GC&RLXd8Q+5m`#V)Qf}R@#p{Lf5m4%S@>olnqW2z<8B-W
zQ=?*}B(v~oeO9xF*q-;_C1o{2X=2sz=5>x(ym|9?|F|5#v*l2$ceZ-6<%t$U1ee;M
zDM9~hdvDe&*>$CfeQT|~&kzxJ$dQ?($V`f&Bx<ZdrK;-gD#7i3>29F90Y4cwV8Aba
zHsB{e)ju)()DM1g0d2!&xZ7x#tJ>8yYZfUEB9qMd<{cv9oU`{@%MbfR+_=f4lyS){
z35DEBgoq?F?}>BPS>w09kAVmbzAuB_etZ7jk7kqrD2HbXm{7t%g4xdW<=5t+&D@OY
zo}1msPyZ(T;qPC5GPBbs;hsK8+Wr%Nf5hy77!<IM?^vly`}(IUImBJu1jeL9nP6kD
zXXQ@`PBuQMGV@%=GG0YbochtyEA<u0NXGJbO)fERq?NZtn6jaA44p7nVvD1P$;kI!
zKsB4z5#}kwW3*8B?vPL-m$(P>;4Tg;*!k_Ixq-|hX<%2fK4+JTvo(7=^V_%bqgy*X
zjGPyRGhYfFN+hq?qO#|Zh%GoU0M=QOuDQ5(<Bf&1OP4_YEV&n5G0en8=eOSaL5;r3
zeO>OqoiQ3?c+sW$4E^Y5R@AdN*G{!lZ5)j&<LDGuF?}_|EX`5R@B!YF^<sUr6wpU6
zMWvonT~cZFhbLXXZPaLb+K7b#8Ez=QH@<~5lKVI?B)qhXK>=-J!s70gxHx+IuMU3n
zSJly-Sw)iwjxKFYO`{-ygK?#()QaX)W>emlwu6V9LS2Det#4wS&zGUSaBmL0@LIm~
za@Ss-dyQ2$H0wCq6=N~hA`o3-O9luy$`@kFx8B6@9nQU4dbZD(C_{P@TzYXHcLr(=
z)#KTqucOVlJG8wY{m$j>i@7K3-9G{I$#T@YNsDS~QV%AbVsOb$gOwVXxUegb!5z?%
z_Qo@`N9tgi1yTjlw1SZ`xt#9!lb>edrmM!Qp04|wLd{c`x}`4XGSWDdJq&gR2~z;X
z(f6a-d#<9B^~Un{2M4cy{)^n!62jauH<HQZXg+TwMzdPADkKPGnOPaOotvPdgv%J*
z&749#=`2)rn~om7@XGb>)|<nlJ2Osz*&H$*h3#1bc~Bu`Bklvh1|(nt4s!2dzkBI(
z&CM?zJA%kFB)cISauTw(<{kEjKmE}(FWO+}6l)+2iLsYrxv=zaTQxoN{^;J`Zj>-|
z%YNCpdyFwgDN>Zo5FrYJ00bHpD*_=6=$FuhDo_=X({T8R&DfO8$$ZthqO%FKu9~I_
zH;}^=nqdkZ$V}Wvt!*0h+I*Z_W-ZDNe2QryM{u3!$%{OH=TH9_-F-X0TUTy8EV}t*
zHe<J_R;g8H;^rvp@VspiO{4xnf%J_^$x7161aWtE<16!cu|o?Yo~(V+=oyUFco6qs
zfC3RvAkVLa)PL}%q{AsE_WUdzDT~B}D)SC@uW7ZDT;O@*X09f1#k-s<>5xDCy-S}k
zQSwjPP}=4-Q=K1$yr|e}v5GW!X3OHa4kVP=2UrIi;5|Hn3Ijp}3z)~5uS98DsILgS
zcobkMlOtMB8CS{ZNDRs_Tk-QNR0+<!qQG0p#Q2IUpmYRIH5kV?SOsBzc-#c8UwiFj
zkz{B8;n945?*jFGG^;!dO1FXr5#v!C>FMu~`1mc9*UdN~kV7XG+CUH9{xL5Or(|dV
zwW0~e8bHvHh;mh!GYzQV2~OTr?ZaiBec`Ls?&a)KRPCOXkusALgd6LR-u!+zxjWMn
zI<?WtiA*wp;OkN2ua+Nm2?})R4sCwm%M<b}bquo^O<HQEUNssjlL)C$H)wWxnGVe!
zW|z@kNMSN$*5nv$)XOZNzE(|kz)qPKT~EOP#e?R-(_ncp&qa@ZO)s@-_KqcmkHT=!
zjcw~-I_d7eR4?BD>;HiJKij3Ay5mXYyjbukGHa*Pij6`1Q#(;B4m2|rPBH-E#>mF9
zpopul)GvPVkxv#@!~B%no(!CrdV$ggdqygmlg@E+dwBc1(N2OrOFs$@R2$;bo49{{
zvVYa6N*F5zXDY43;y=jGDUK(9`1_Z)4^B^y2h9+L_AsSbQQIQaL$c##I!S(#>BMD$
zYEE%U&628PpWN5>VUoihJz}V5v6>QsCF3$$Sq&GQ)X6YLNGr{<F&`i6N`+-)b<Ji*
zrXxY<sJB#jmLMw~qjD3SRt=3+w2+)*NQvdq!}*18e!H9J-Tf<Fp9KU`aw~6*vN#0J
z!MEb&Lo_!=A2@ShXE6i=!&KBQ&seBiJbL@Bs0$g6LKqeMjLBIGBjH#jay=Nc7#KPX
zR9A-yJ2&63xYtYbtkO|OL<OhBv{wm#^!D)4PwM<I1|&vifk!78=OTo>YMO56N5d!0
zlb(#%B-<+7lM$8))daH|7Un%4J2dY3Y^R#-dp!+x9h#PzouH~_UUkX4MLK$PusG_v
z#gws2lcufF&Ea{qFQH|hVe@K7tFltJyQf6OOkwN>g1fl_906v}W87I~pW-X^K3Wz2
z>lbZ#ykGDC;LYz{`@!E``pWMe9v|;aFLXn%FqFAd(c3hp?W0&3<twU8B_wO`!C?bo
zP+xM~ed&ws<s03t+tq-k0u;nZ!9d>R(;lQs)2mJ*xekfY#NolMxAC)|#y4(0Q$LDi
z5@IsSQtiC>%A#pK1F}*`wUHI@bXvcC1-IqAerqgfr0I1J)zZR|;Uu*2;`J-9zA<_6
zHSAqRn4oGAA|yJ&3}OQo_c0vf(ZiG5@6A7WcX;^GayVx53K0N2t=<!(5zoOZg_Di>
zt$RvI+?c#j?7ABi3J~)tbH`a0`cY*WD-rHddK3`&$-N6<^8G*glV7|3wOB`=>XJ;^
zw6G{T$he?ae7k605(ZWxrBEgc(bbTn#Li@(*zR4u^2+P?ZvQP;rvYq`5%e&=r;Gu?
zBmi(9swoCNY5K$Cx4u97(s!Prg*r?%hQ^$hgYR6q9-9W;O1agUh#8~I49;t&+v+ZJ
zW-wUHR^7){XTPkK6+J}ak~;R>KD5~~Pk6F(;qy1X@cFOe`VBM}Ko#2k<YAF*ku7I{
zgNU>tPc>BS1zfl>yZMdT$pJom`}mz7AKrO~Pwq83uYD2RfdQ^C+X&jFPYCvLwnVun
za$-i=cvC1~hSR~z$2R=P!Oo9&;A?=uxu4Ndy7zYv|NM_G{=t8D_vn#Mb_e3hmxLTV
zvqKSV?6Yq-tl<&+Qkn}2WO1z!6U3?+i0W%Mm$Jig5B=fFIQ*21u8fI2RWXXY8)C!D
zgS;dCqYr<wWAn<F@Te3r1tS2NVZjW55<9UH$T?VH@!3jX)L=^NraafMbK#}Fy%>)o
z`A{y8kqelcKgG;R{_r~&K8dL5<G+-{B81FRtHUyM00wY&@h%O-kuqs#K;U*KRn={8
z-;)=cFaP7$e&?T0zy7<p@XEkDNp^j5>2UC+OGf1qS!(7$By3)TfokwcPdj~eNiW`<
z-u&wHtH1tWzPNLAK!moI{^%e=(KJ{tsPGq)ILNZ*zQb}(i-n9y`fA`*VB&$fg#Ob3
z*e3rVt@fY%^z~x^=v{UjztG*9Km6(ROW(4cmrklnIZPW(d%<IOl)DA0o#bHNg1e?j
zQy6iki6gR8K#txsY0lm>yIl&yFw8FRKX~s4a`NE>3mU0U3k5$B5m-PJpuv}%djT+b
z#SqxBp?c}nYVUF@)8)bz&S+Z~W8_+sAS>}8)CDo(MiI<?n=u5#+UQ*xc=z(W&zG9!
z<nH_Y;or8}n+ds8US8nHPVDP@PS4Vhl3CfhbsrzUImFz(olS?OvPqcis`G>6+)XRL
z^zzrg^{;X9rte>}s_Bw<Zi<RBE7i84Oth*qIHS(gbQ}{)PeRC*w^OZN{?GnEZ@%*0
zpZy<4AH8{V?;6q^hljYZkL8>JH8KUXh(p+!?8nEL>Z?+E-9CR(W@C@1JnCSsL!|y#
z2$$^M@%R6v{mvT>Q-!7k9fGR38^E!0>$lV<w6Yy6Wn@&C5*?93-)E20K_>kY7jL|N
za_dhoNzHi)M>JOwL&!|*g|{c2{@4QFqape{J^FChd+1Pc3koIvx*I{o0WvQHuC(pC
z<M@-z2ZSo;Ox5f`PVveO<pz34%mNZuIHZ8^UC*0QY;)MO(Z1Fm$Y2InkO)L}@jh|R
z5C`)K#jd?Ded%kje*GU``23gmE?oujvQL9*;rGfpukPiFBiD`H4BT_ubE7DXG+A5$
zWQv$xl~=#{`G52;_g??4Td94R8gDOQsUU(Wa__0LG_WZ_u%4~>Y34-d)4y=QEQo0W
zDyY<N|IMF;!w)7pudKJ!<(w18fh%K?@ELR>OHRxp{g4d|maflNzwqT8XFXM?-~=~<
z$tOw5j-l2M?tBCrO#4ugu)~csle?F~vrH=t;wug9El)N8P}LZv>xRqMu5&%jhO>))
z8>B$npRlDxTRZmKN}g9_Z4GXzTUPB3C?52~vb}KO=2s_Q`!-&A1HCLYXM=-XB1sIy
zTBan<Yri%2kBAdR6pWka!n+BgO!3~M#eTIPzx3NzcP`$S>Ct=NXDoKP<KY2vH!ck8
z3TRCMl(3O{63(m8Qao`Q0t1f0rN8&?$y<N1^XoTJSHy6zht?E;NMR7&exg_wq<Cy7
zl>QPa;HKn+*x>T@y=ynRTL(2x0<?&=iDx4oLA3tl{_D~0+gO~S-ID-Tz*GR3`?y=f
z>?{tpvHCto2h+@$p{nAJ3zwVyE8T;)i#{jt^JqPu-jC|j|02uCJ+uQ-66=|IVmF3T
zRZqd;#A(^?G%tT)^2TrD#jioGq%h^!hGrsl%OQdo5{j_)$4T<xoG1<yl~Ket%ECmZ
z$a~lN$@RmN8kgR<{4f6Ni(mOC@AoZsud5MMS^JPXv7QTxf*6P^N{CZedY)OFL=bEN
zs&L}5w|Koy2jBg_>qqbI+3_SWNu|=}P-jry{_h{Rd{!bY1v0A?k|M-vNSYkgbPv>C
z{lYhvVVWtPzIg6pO8$ww!oe*+x~KPV0|RIX?BXWs;v+&wi2y`JG&q^EZ4HQKQq>T`
zFmxf-sM^U3uXfTJg(u|Y=Q38_I`Fx}te`oS%ttb7K{Y*^=Z99eH@<xF8^41WUx)85
z=1`fsL`an(U9yytnKARmWgB57m$<o0K&7}L2P;)M&gS0C<HbJgWBTIm*Z#@g7k~SQ
zcjk-CC`5_w>|isvyOEOs;dDi_z@pD#qs&F~229G0IbN7xc>lZ0xBs%4-)_Xc@HtAA
z!AY~7(`OiOj;z4RoF%%u6H_yR272WU%&umtezD^p*J?bPR>R`(!*>|HdC#OU6*mSe
zvC+6z6?C-#y8XpdsoY#um1BT2uH8u0uC8M}jgR=;cFHSax2O6wjt^0oh6ko3NN|U<
zb+q6;zV?N^ulzP{e0_))9;GVF?n(AV^5vjI%GseHcURT5?=052!iHu+FX+WHIm!Zw
zQc#kk<K<D8CVQ7UnLfCEj7v9O{?<S1X4g-wPLC~&s3mnn&?1nBPlvR12eULl_Rvh2
zs7j07^x*LO|AFrQgz}KGCv_(_P|90}`Z7M<gxeO{AA=hK!W^VemZiboi(&tB1J|cd
z+3}bngY&7J1%Tjr2kH2OpTaxO^FUdk!HIdiv2Ye+aflV6%B>~Ah$w_G41E<?-C&H1
zFWTgyl3=rlTmLgXb3a<t=h@xJvsfqA!4q7LQynkgy!gd$^DAFV)rEV5EUc1d$GBDs
z#!;%euIm`1yQh@a3GPNw4|c138GR{8fElq;FbJHhs%olue0;p<`g;FLqUmCC?Kl7V
ze|hX}=Mftt9(Ol`QE+0=Ig}tCb8s0<s4*l=>LwE9`EaT7<vV|ggSWXm&dFRy)6D*9
zbl=8sZ(t>M5><^tA%w-C*31xguy<{sI#Yc7N&7mfCnH{Mt0Gw5@su9khA&+gOo_+R
zsPtl~=t_%m*<m!^PVc}728uBb{W8XolMM)%Tu#lto+))4+bOa?W}~0PHSbU4XaK?l
zaY8^v8g0S4M36!01nutUe`E6H-yLQzAJEPacTA-3mmn_m>Z5`IxbSz5!F`=sfr`La
zrSnFQ#S_SkqH+ZiBI4XjUexF+wq(BWD$icP)z_|k`Pc7t@M;DF=0FBDjl^I$i|{BD
zDQwR~;0{$NVxalqfoLBDob4J8@BZcg#jI5nF>7N~O`AE)(>-H$Vne}W74n6V;UZK~
zM98i0dnG>XY^m|uZ++)ck1*L?rV+F~<}zV@8#lfqL0ntw^TF-({#&!?Y+0=zhCx*e
zLXn+$g;+e_8HT}Jg&@ovBvZufg$u8IX)s9GsKOkUPZd|Uw9)N&N*D;B2q)wW%VjdT
zB;iXh>4nb?&DDoKIq?>85@K{$CzQPB=VO9wTw;b;FW$j>_cF*L1Hm=;5DPNjvjYRi
zg|xlQ_Fw(A_N6Z!W_B58LeRvgI8Ix?#?IwRwv8O)E{YMN50$6#7w&j&=ePad`xDV9
z<~DE<+1OezV7$~7kZKj~-OUQ=l7d+!^fE)7RTo~ECqk@@PP@OS7LRaR89K;Qql;Z0
z7WZy3sp>KWF#<_oXL2sYf}dh>bll!9gGB=k6v5L}Ur>ow$oy9+avAwO^O^@OMacjF
zAOJ~3K~%{J0}5*@BRLG<=uUHPc5Z$-UcK4J3yahwWr-mMfKwTwKb8S+B9PsT^Vt`w
z<ej$8%>2wM9l42XaIGvwPvVJSPRJA%GNmv6=Ec{4<3Ot(VQr%;?75AT$x+dH6$H1P
zTYwzIj#~S;-o7Bv{N96izSnx!3Oo$~Nua!?uUN^=*cvlfu240RXSPHInZQ+!6U5!U
zYp)z8r?{gWMlW?b1z{sHDiM4=YMt*;dicRlF)Y}URItFtM9$(Y#^mf^WdiIRBqBtl
z?lQh^lqmE(!_EtkN_F(t<0BA;glBG}Mo_51$r%~&3euiX)lc_kH(%$yE17Cj5r`Nd
z#^G@g0l}VVppIa~3dtl^s9a7B)c8!<%f6}-6AN}<tY7`Lp}p8kU80=XnA;KZW0kXR
z|03JUiH`fw>v=Z8md6M0d=Ja}6{%W^ut0fR_EZ~5QrE@rhRm~N_AIW2yiBFFFunNF
z=R2!3HZJj0pOxSsB~gUacr`9E<_2AN_ahwMuf?+^u0;vt2+Cp%aOp#B9|Hh@gx$S7
z69Xs2CAD$y1*uvyH(Qxlk&<RQmyMpT5&z;}WC~LA1dv+*CcyM0?9k;GaqT5*TFY9)
zCjjL>=Z-42Cs9+Z-Q>zZxhQgEs+Qa=xET-)&X&an_JK?RC`qE2sSxFXkPSTVBCdR)
zx%z4^lfsQ*1oK45Al)3wE3wk(t+%SX9n9+{xo=dbYI^4_+<D7W@9yG5M568dD6cZe
z$BPvv4^Z(e7?>O+nPTFauD;^UUXQ3;JD;*<tw}UCpj)GvN?ywHc=^$-w&Fey+*Fxd
zoP&)mr_9J){@B*-IU*{o%>~Svz#TR9{tKaLM<CkzMdEV;>bLx3<bktk4+v2Mnk_J0
z#@*RVH&C|<aOzvP){WATEg6se#q6h@rVRrf>lh>Uf-I-F<mp1DiDQ|C1~2j+rWha6
zKy|4Z1qr~t0Xn(5_qi_&(hRnuy&o~Ac4qKS<g{&WQ>ar;#m-NE-ykCO;@<LS-%Z_|
zAi*`dZc7)lv3R{{rWOdo6j=j|k=;Fm5&|y1(Cl4VW++!mJQhecGVb_D8+~>TtjpHy
z==MkCmMv+3g4j5gokJ%jF5=1C&NzH!qrBQ>P?sfQy?3c<rnHI7D$f4YuRb#yB{$|w
z+QS*tD$nNLE~=f`^&2@SGp&%D+{M%jawhLAKTZBu4AhA;howxGJjoOdEJ)E)@I-K>
zFi_ib+jCurxPm8!<v8o=-QDXqJT$hhXxUF6xo>8ETkph;%Xt1+BZZeLv7XLodGOv3
z`sJKMbQ{<cZ(X~dx^^Bd6#!T$FvOin3FhwVNXBS)XBV!V3_kkH5+%y0nb;oNry4m*
zy>aUgk5b=3Fqn=+=*D7H(1E^M+T1o66UmDG-ibs(34x}2RnwlaQ3K49>AC!9VWWAv
zPlGda0VI@Lk&T_(X8-DO?*lP0n`QGs2n5Nwv_sCwSZy?!d6kO!iuSVbqmVm&jPqm+
zWGnXY@wCkpRPo-$Tun?`5R^g8XWG#OFxb3|2DVLxHes?OH4IEus~C4E<-6~;^V>Uq
zLgrS$2A_qWU=n5~VJEi2m1mlq&|I{=YdH^LWWWRn2_RVTA$STtgt7~|2GIyNSV;Fs
zmwiRG_kFMoSY{+qAIWw>ey)79uv9Yvs4PVr2#TuJ>cSBAa{>2`A*cwCY~6p7|MA<?
zLOcg1fJp=_2vVkh0B?R8^J2&`M#)QvvHNkx<ocI(Ui~JfFD`i2lVmCS(#%wov#jtU
z>$%v-*6D6eUKm8&$&FpvRXoQ6I)r0P1Eeq!6I|f3VrTY(oiwzz2soU7@MC#+w@%AU
z7zoM&P%r~QBa{)`YBSzW1I+{mxRDrz4R`8w74u?V1$6yzd~|Z@D__fUc^NOd`Bvec
zPI)eA1I|k3mYvLzNeZP(AY#F^-KVsuKKu*1|9%sk0vSaRh4H3oWr<4Dhsi~#W-~SI
z4tiYrjen7wtF38tQ<6bQ*;Uj4agUw}v{smS>aK@7)4;-JJ44q}qG+;w#0L)_eDHqT
zCK@_fy()Yz9s5wl=(PSH+>G4a9Og#OPMe=_Fb5Q_56?gratamVR8eP&USLpGIF4yV
zC~ic`buifsNoyk(Khypw?P#UV|7_DAvw_9k%uqGd&J@u+QY>(SRe&eY1Siz)bdDyn
zg9$x{!mk-DubRije67)CoPUUuJ8|#T>_Lb=6V8Qlf0Q=wQa13Rw{dpG$twaA9G*eU
z0xd{QUEge_DpQPXYF%Zi_PH%P*`Y{oZgaLwD|jr%W-E_NUFX3Q0y+2~rd<>#@bt=|
zw)<5jKqLkg0<ZJcOw1#*r(0P__nbW^n33sYpKy!hOe<9+0yxANQB_VTvDijhS`hqM
zYlt}^gR>FZwrQs&DX4@AE>;o@FO~U<kZSwV^6WCn={FKFj6mt-`~(LF6+3Bq)?YcL
zG}+lfs64DEFzbD;Cm2sDx0ylii{ppE2Qt-X`9w+`-0oc%av~xx6+NxE49{bu+CwvJ
zfGIqY+sK;D#)QW{16zQKk8)840x?TOtja>Q5%~&g#D&86eDklTo&qVT2N3JJuAN|H
zBxR2{%j!p$Ov?~Jd>%7hJBu^0EGm>{LX?&Zd+?EXlC44b=dn@Dc0#j<7>w8*<oZN;
z8+PLr{~-|=wm7&aHk{HCkm1u|JLzmjy_zWk0QUF6VN}E}q%`N<uV?F*)-OHv$V1um
zU8%G@QFmF{6L~5fIUg}lYZhkOoEV8`@w_!1<d$!3qLQsr86$xV$TITpoi;PsODL1`
zJ(E)9ooUS&KmvCmkPeS--$H*_V-SC~HtOyOO>^;T3ayT5`l=-TM1?>iW`WP|->S5O
ztBu-f<r~>)?sTp^Wz|YxrP3H+fY46rot<PGLmWTnEHr4p1i;M9yxO8%eLnHU@c~>A
zYvjac&@`YQNQ@nYz^^o=%Z=l83*Z?XBe;lrK+@FrUfvp2@iTJ3Vkq3u1_=0^uk&Mm
zK;4<3SwgH}NB3^+AK$C1i;A%AcEff~g&BtS^5^C<i78b`r|3gJ<KGA%Uljw);@Um<
zDCojTJgitD$UYOU8uBs3YneGCKxF^&<@A9~2(XbaR?hd8;R;u`ta;GXTk5S}TDL&z
zpYUr~LKC!L-3iXBs(puUAtOyl=@1FPgi}xU><$qzGrDEBn2%yzY31}ccSZb(5<FYH
z4qOOGR)1$QClXbU%#$edgOBv+ev4l0*?#2^f(?qRuPmq?Kp+SKuD-dhbvh*R66`@F
z81(2iY|aJg11`(}{Hc?Zl@97S$pgf}P`hyTdd|wsZY%!R^ZC&LH3FF{K#p8?rU|uY
z-=LQnXD#Fi00sCMW!MyHiT)(CL+~LX>PWm;8o~x6f71BklfwG8Wide`Ir>4nWhl&w
z1+nI5h8%*j>3z<UrVxs3{#jL(5X~TrR@~=@ynM*$2o(^YosEh}H|S*dg-)i^k!{%5
zvQ@N+k64AX5&?oKEgwSX2<oc_7ktx?mVp(Y2ZrnbNSU|{4k2(%_V@3r6G`?Q%T>sE
z?mrWp;Y<h&VMIX;r~;lmvR8xI{O*9|QWpyylBfRRNAIC~6o+FT=7mWxn-+B0VzKx+
z{_lxr%Ufd=a*KrHgXO{f$Q~o$8^Lz9AiqI9a=ut*j}=3)s>f{Hb#eG$ul74X{VtY|
z1o}+<=zKm$sB!sobDGw(eE>G#lt%k;Uu7kUgM+NA`bYTaErFNHX3cE1PKrKd2vFk0
z<OoiTs^X^5CJ>7xbp*k=+8(@WsXWzZ`5sXKA~%C;M3Uhc4{m|GN;~9%;4HCt_NJaZ
z(+9?GHh<LQ1s>gxeFq)JTcBqvPX~OBDzbC`tj#yfiPec2Fs(@|>;2?D(8)99`viz6
zgMe0cuJ(ELURxP#@Y#CX2<EQL3^UQZ%S)Wxk72!8XX6Nv)}<4l>&}ekQLbT}$5PM`
zzyVK!5Nw-|ZYN(4hZMA+8EL9~2*cs>gEv9l1WVSAQRv%(fn#0yGh`8lAlJh&`bUco
z->HX1u(XLza+1un>NOd=j!3BUn1+FT^FFAPs!NDa4Xn|Z!@+IX@>$pQ5-5X#y1nx9
zJShpU7Kiu@DsNrnnKLuY$#h3jet27g_-FT2RzvMFZ7KOE8&M)4Rvf}82g4}bl;=yd
zw!SC{B^PzERAZ?6qr+Q2!SX@iVZx4_&CJ0H(PvyTiR;D2v3Pj$v$vYOXvj7kr6`3=
zoN47tDR1pZX{6u%_$=Gq%?Tnfi$LvpIJ|@95k2ErFCylYz23R<a-W^(Nn7!>qGc~!
zP(*HE!<5tF;Rg_2E&3VAH<xzKg8|1W{6e`<p|gV%5!ZE)3eHqk?cLAkO1HOBFXIgd
zj4f5xw>lple1JReLg%yS$SG%2M>g~+KT{gsU|AaA{(JqM_nX{R;wv7x;0T!{a~Q{o
zUhM5NGaxVR*n)ZnA_fe{IJ(cz*pCvCap<XPFJ3bWW9d2ecKG90Sv0TQAr96>I(z`l
zkQJI|bEouE4LH`lCoV{?4C1=sGTfmRBgEg6A9a9`9f26GqQiuTsz21Xe~3r-gC~Z%
zySb>lul8M@S*%x_JQ&{naabO<+9T`8is7UrN+B^RKi(!eXFNMI*=1*84xV%Q{ouJl
z!h<`{dd@^dAQ`x-XBQ;4<Id1(SzzO_@~KUmmFgISdOAVsf_&DU2Vap@l~=c*EUGGm
z;2VUS=e5yK+6#T+uM!aqR<ay7XjijMD1Gqe_tM?>^Wr23g%He4onq5I+Xv>heCsE-
z-}=!`aQ1|LRn(i8?XxoXTCdc6T9<ydbw$i6X$iFqo7Ca(!QE$VqW~yGa80p|Rc-1&
zkF18k%&J;40wi!wdD%$}r$Z+C3=*<6fT#T5NCy;xh_J6xi1Xf<ZTUyZLAj)2%qTUi
zpn)BI^!DYu?@mAW(S>T~gzF>o1d(>fat5tYn`d_K$^fLG5X#H95?n+X^wXJYnm49P
zV0U&*bbkBozggb;;cN!voDyOLD#Bo8?iFm6Y|*)hhsNeG&ioAo07A;lDWj^!Z!!(O
zIC>x}TGo|ZFL3the46*fsf@RZ{y3@_$Dih9kT$N0o;FGy?Bu$_wI+Z<O1%j8h)x`^
zT;UK{3mrj`e0s`e6F5^~2YV8jAR7wAiQFT&1-FJ!dA1ROe;!i}Tlrrj&WJ9|jO;4p
z6o5Q9`{#Cd=0E*U&CXu)2IVk6p?%C=c$fqn0vQwW$Z%42lA-E`Lg*iq*+>dV-pCjh
z%_=i74OYaJnIsTV&Y3h%f{1E9Il|%F-H-p|Mth85fOsr#Tyiji_hhKj#w^=M!O?B)
zg4gD{GEgTA-a|2&@W@5L(&*yuM{i%Yr35UxB}oXePDv>UaVP<I<#KG@%-U+5njP@m
z1g8Fk(!7!A%7_Ywp-?@lcs8(%DJo%^D-tk)(I;Kngom!ni-Bh#tFaVMWeC?xbV%^@
z^r0YA=%fy2d+8{mH;1AIOeqK^i2Lo{i~Y}jRHK*dumA`oZE2<+wof}4#EiW8lLTqM
z#+&c{pr`8Pt1r%OT+GAbVSmh#lMRlXVbJWROkRf=V^mG!iY*yCI~jw`SL)x!VjL9W
z>_nL{AF`8O*x$kO(aGKSE>9{sxb@e6^grFq4;wpPy=a?F>@5B<k$`jLqP`KrXtSk|
zPXiqZ3{1JQ0eKM50w;HI%P=l8IcHE26t&g2e!OaVDnClBj8Iy%B)%eXgmc*{Qt)ad
zwrYZsfdoXx!5r{q^pr~*5f*$9l}wUZl$eUR!c+Pz0U)3peTcq<aUwD|jQF0Q5{v;(
zU;r7!&pg&MEO^3ri;Y%Ua4^`gm<I0;K6?1Q|G4kX{>$H(RFiv0b8aF@QH&;cC`gF~
z42(Pt;%3Ov7*Ho<H*&O@qgJBPA<GaJ480I~pC8TdUE-4$uSNXyZ$J98f7jmsej69~
z<sM(*c}mxD$V~<^K}e`P9fF(biVB@Zz|p!AdwM1?CGLe2TsR=KF2T64o3FwDMx%1$
z>J1BS1Y&i71hBc}d2LJA3AwdJ>M{o<4$7IsR#8UW$Wmpg%_$-~v9qcxpx^}VvZOu?
zIp(6m$mp>(9&l@QDHABp!ZnI3=})?=yE{ig@BZYk4|{*LuB%tVOV#9lrp_B7a$*V<
z5jh71GOd^y0QO94<c@-!NyROgRRhNXaX?W73G7{iIhMEXe(&EM{pjDnak<q;{V&Nf
z$JXPfnYud$B_pBWBbrj!*_6p$d=;-ZdWvPG_c2_=Cw;20bI5Qd@lYYQN&%i$!%!;{
z%thw%R1A$r!(aw^_S8jWvqX*ni#DQ`!bW!Ul-J|n%5D5h=oGc%g@z)~AQ%KGfOUL7
zc}w8C)0Tde;7`aU2yirnv^ZuScB=h!=SO${T(2%3;H$qsJFYZGbr1;!MhHgeVM+<C
zgj{&CsmKvJi&h0IorP666DI~>c678`Ew4?YzW?64|IhzoZ~cEa+DDi_l<jrXK3hvY
zW2VmCU;~1So0C(O*_ewG-5ShVG^N(KU@~w4fBeGFOsphEu3USpJ=SH@3k-&>E4rea
zaoWuw<Po4pX0V};Blet~IB{f;ikK;8VnCkeO3J4al$f0pMX(JV2C9`KV8oKGN>ZuB
z%m@szb80ben~$EhNFQs-QbbTRxfeNJoY2Wn9)-oh#pTd^^<P0KIS)?BDXV2?uqa{V
z_8gb#M&ckP0YVn|NMqecveweY3CH>U#gG2-?qC10zVqG7>0kmYQSO&wqHF8iG*g2P
zxi@4MfvZt+Ca}4lGHpBDN{%>|{9M2U*x*F@<WD0C?&e?#HA!VGaK=bKXdAr`XAq4G
zy>NvwMQU70la<@9#63rXJJm|D=fYZ$3tj%xT#pk0!4ZurII9Pznk|BiHHyZN>#S{s
zHl`)ps;qye+Bcur87qB=3AM?6xtLZd%4GQ2ci%cZxm;gPm%lvSzdWfX3zL+^QL)sp
zz#a&~9>k+~EuNJzAZ7s}3x?pSvcApzEH80*gm->;=g<Dn{NWEjKg-b!b6_7>;+O73
z*Z)8;)nlP!4wYpS2#5k_+W?x3Wz%|MyNz=Z3IZ~7b^|esWUxAobW7{ZcGWu&XQ%)H
zW(XCba&Ig#T%0(w<WMO?z0IfxfgtUsKG@TzPqldk53m{(;X$<KT#IWZE$7Lsn}+4A
z4g<O#Y6uM366#DI&Tp3t2N|J=gLnq@jsXq8H5|jya-JW_oB!MYy#K{-UHZze@zs}G
zo-|seYM0{PLP;sCwjTpVA}3Q)qFnj1w#8JBCwhW3M_S(b<9~bb)(<XNe`)IZ{;kNs
z40s4Mzr;|#;Y3%Zzq%QDASlD!3`BIMDsmc^*~gOpDKo#Z<!QAo-K=&7GLx@JFUALf
zb+3TdGnxQYaDzvpnw3OTZK=1x2#V~)3R6~Rb0lTcr_PTJraZuS5Cd6eb2p~M$czDQ
zN<p~-*FYR6w%8gM7IJoGNDO(%B19rXmt&+~FcoBEie&?a-I=mP#cCA;%S1?1Mw1`z
z9W0iA`sV$={@*X&{8ISJx2HGXK)8hCgSMJ2!(<56z(FCYJUY)6_pL4V@=5e#9DRga
zZ!X^a?xS1p*!<BY8fx@Dq-GM46Bg&h%zkDw$&Zy#>U{gr{IcwLs89NZgi1l4gHv3O
z1ZfqQS8SZ2bVr`%Gup7ri;z1S08Tr*v%9I6ruII8_!QN(d1*PpJxnGpadCJYn%a);
z!;YuD1rB0;FC3tW#aIDktFt#xc|As^bRv=*3fLludDVK%o{xtI6IuGzc+fhr?==&9
zbWq9G0BTbNks`9?TlrBXQDR55;usuEx`{CbAsB*pHM*S;kdEg+zVq;%zmqFB_Fnr&
zc=`3Jy-1V2o!JGR&P-x<bZPL^(Qw$NV>-NZ{N9gG-u_;?_g<Ul7osO!jD1HkP(F<p
zzdR@U@l#oPeYdJ*0q-yHAVJmOAh3*mfHBZJ)(n3T-<V<j{7;b{+=Dx~VK{~jv#J88
zvY$Mz8Ti;REsut#HIgO_I`m}Ay?Sq2ci>|Yn@E_1q4X610`*R8)Vjx~ydEcY?g>L6
z2VoJ!v1|~<6%$4GsF68wH&4fmWdI`EmK+c)O&vH!9TMD$FtXUt;~{Kw7E0tRzF-<B
zLk=P{Ct3H8Hc4y-pvkCpVw#5T_``#fgSYX$eKdR0%-Y$0GnsOzR5cGnO3Bl3(x2G;
zK<D>lc`!jgjnqO|`y#Cgn2Qsya%uk+veBJ<Vt@5Vxcy_zmeo)-LslmtVfPgW<7vmO
zkWhxFkM+h#Y>BuVs*BWzcYmCh$CyaYKqMo^V}wei$O{BmRLWWf*K}ui|8J`Q=zhYA
zY6wGSHk$%qS_(2*D6^HP%RK-P!%3lxK9Un7Ga-jviQPeX=SMH-F>F~QRRp9m*?d|v
zRbrX#k^lFzd~{MsW!;@ca#H3`+$$m!`Kd6nT@u7WNR<ubXKd7IMa|+cAN6Dh#OyK{
z4cUo9U||kI?uBkdDWDyOL4DEGn9Mi^Ps_!yuxUjFuIyx1^mZ8Js4~c&tuOU0dhFGs
zj_S$&vhSUws+ulkA|{FE1S-slrTQKf{z~uZX=jhj$K*qtcD}b?;mYCLv*BU2)1dD<
zi3F`T%AKNi-wlu!-Vmu*$56%n$t2a6yszOhgyaxdOR#`N@PWtu#HXCiGCZ)6I5P9R
zf&sMxu)fOTi_3YKa&lS{6vJxO?5S-ua}{2GJ)o}LPu!iE%^dDOk0z3Q1;jLV2IT@w
zB-mprK}BQ;U`|Sao0*wqlh9AvfN2HIunu|EKf<cHms&_f<t}|U=&}bnstQzyavj8A
z(nRP5<Pd$9o5I^>_cmOv0KGp=nS&r#IVX__r!tpc74^V+gKwMhV0K)p<HEZ`%k>gd
zUsjQzrrE)vr1Tqt=MJE%U;%?UWmFCcn9*YBQCrK-S(Aa_Z7{8HES_k!GWpcA@qiU)
z@l@gDjRKUHKpGaU1BT@0j+!y<2yTH{kubRwP*oVYOle&WeB#pPn$i+F&Y%l%*9Ohd
z8hzpr1Ltf}NMaNi;sAAY8GRlvccs9+LUIFn3F%9!<_=~w6`};3<ng8$lbIC#2mefv
zWuK+bg#(_M08#idl!VhwoX&QbxA)ROa1V~w<^uAB+Io0KPHN>H2#>e10TH;u9MQ)S
zY3mU08gn?5lM};pK!SG#lC#Anjq-t9AWco#3UM#?ni->_p{_P^w?v;Q1<Wo5#JIN6
zkzwVNZFK$32@t4{oPhoWb#iB;;DqMV4BbiYmT&|Cs#BKwahX*F#O7iS1cZsG4r&HR
z8$bYhAm`Gg0t3Xb5VNrv;9~TvWu!eQt{jF!2_neJ;l3U&ot@YF(|-fWfC8E)@gb;%
z7>JR)nzY&J2`<^;1B^gbRk47VNXUj{R#O5jv6V2Vo@*apF?;G9-vK2DnK+D)0C6-1
z04K+YH6j3G76Fyv8pHdi$2}P_W)}lwl3hR$iAuSwW3jKg3si{IR_M;NV|w~Hw(=|h
z1#bP}i7-MnViQNoJu657hO@im!iNtAJ4ZHA(gX#SO_K;zKzH`<H<s~7+uwubJ#7s^
z$Qa45z>L9|fVyJuoJdyjm)9N_Afhc=+U8~bx1t0Hn4pSms9m6V!b&O;gUvZP#iH)v
zRiH{D27nO7m;s0QI)~kYZ^!_X5%enrXUJ+TaS|XCLNC5lgL7dB4bf8ql?L3$BqV9Q
zX+Hj2CBo!V!1XU5|KMj~!cteRnFLrSB%ovuQt)8TPBQ9i>xQ$W(*SpdB!k3_J%Owc
zcOh>WIDx{50|u1f5$wogH)e@Ig~n>!)WNX%9nOd~{ynuqpMJO7DK-u*H))0NnRibR
z+dD5CMR_Oy-~+OO95o?#6`iGT-jIn8OhSg-kDHkWSb4xE3O2wu7#+8{DhA@l*XNCN
zMgS}wrWCm$2NbTJ(jWqG@Lp_V{f0^>*PShdK#a81cp-fB;lbYZn*rBucGO&$PM5=c
z5^GRKPMez{YpUfHoiRNjE1{21M~xm28uWACM*27^;IaSy6D8(<)eb!Y;qYmi1)p@Q
z$u`ua*TYqM;+-DZ3pbzLSYWMbA<vmIZ8lXNuMI}eHG&2~z{vY)XQ-)GvJ)Y2=8y@2
zIW`LO{i|1S{U+m;o7zl-8}vC+fU^RKK!giriexdEh~r}{O3%;pvu#AOGgRnnG#|kn
zs2gT+gCTg;rrxjKcpbY}1NN`A*KZ!)|6t}3d4Ok+$N`z6LBxW%i6=lopCUp%KhF;U
zco^L`9AwN`wK_SLs$C23aZ)+ScJ0O+h%-jqz4XOz9?V@ri%u~NQlV$`B8e+SgjX;*
z)53gyo}W+Aohz%GN}MTXsxwC=K@`~FsVBnH<x%Ekdl@f&31P~h-T0MnW9PC;tER<W
ziem*(Sc!P}6O^c*pXcX1HaaHc>=+q3q|hAYB!Ihj&U2YfZ+sKiUI({~$%}aPo0q=u
z^%D{c0RiaH7#dB{dWNp()wVABo}cIE7k4Q<2TSA$LxO@B?%t!ay_c?j<2$(g8mwZ(
zt7tCozxI`fkX$ziKo1z|jMjQV=ajW{oSz%$^Yd9bQ!1`63zR&K9YzNNGO(nH?_S53
zehck2gqq<~(0={KZ(RDyub(s%1<(KvWY7T8PO0-qs3IIA5y<oN{G9ugC06DTxMm7I
zAOiys#$MIJ7(175{QB?V>g(_+DDsd2nc{P=U;EbY9mKu+8n6?P$3bO?fao%Johs@Y
z7k8f*P0!D#>pzu2v6yP=mYy5|m;r~t^^gt6G?~5p#p$p8BUG0+9B@Sd00MVOL_t)%
znK-Tao@9nMzV*d__OBOvH$S|c(S|a#G=QVjZ6l$=U^tvVQy#qM=O6y5poY{XB8t0H
z+Noja9|Bj<-_0lWmA%(~<8%M&zryY{NLwb1p{f7^vY@_-Z~x2d59jZl{I8Gncz-9s
zms$JeA{%mW2r3R0e0YAJpP%y|W{E7$uAb+;!9(4~Y3NYDzwCFfe&vP#_J6?i6;%6+
z!MH9w<LYjpV9*5)Z^Mr9qyO}yfBSFZ!F&5*F_j+L=WYo@#i0rnwEue>ls`ZJ06R|v
zFPnnWnA8K+ON&QZb@k59%Wu5&U;H<?{CULv+(+8E*ehBAc~0Qqgl>_=wW@*s9)9?z
zKm6l=Gd+B_KK!6gN7DcyB(*%`X)V9<6Z7ZiSJ*}~)Q|{Dl&ak>?#*TYQ1)K?)<50*
z&;J0ktB5o2L9^YHF11a~0C_%yw5oB@LndHAJDtX3y!Yq$@&9Xo_3yiPzZZtXD#Dry
zFiMG@m-f%kr?649K&Tc=e=szB^|cqj`A_MM-^J&D6YUj**~y}Bcj~O>sjHg^L~=W^
zOcW*q;b=frApnggvHR%n;O?9F;a}kUe{uKLJ6-M@wuyGp1}+kFo<|_yY0dWhJU<&I
zNo-&zR)`ZTab{j5wK%=}${Y39e+OUs7A}4s)g{P<tQAeF3@n#Esi|TE%n`_wgW)_%
z=MWGJ$SN;^0eKGYkmfi(z@vwF=ll5JZ!y1v`JtaY^u;5jIp<9YGs3CZVZoI?H{5^N
zW>_`~XvGO!P_qS3DrhFCCMpwecEY9Wxb`ZpeF2wlVCN$CuR><92Gs->5Gx?8{^XhS
Z{{!4k-{>o~9fSY?002ovPDHLkV1h_)W5oaf

diff --git a/addons/mail/static/src/img/feeds.png b/addons/mail/static/src/img/feeds.png
index 5ca849e168c03a69e2396b72ee0668ac3d941c17..ac2293c0bf5ae591a8a5e4bd404a64a93f578ccf 100644
GIT binary patch
literal 5647
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
UNjnbxOKfq#nox~ewHKlP0Xin0a{vGU

literal 13316
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
O0000<MNUMnLSTX*++B$P


From 5b89624fcf297b4a8a39cd5e2597abe63badac35 Mon Sep 17 00:00:00 2001
From: niv-openerp <nicolas.vanhoren@openerp.com>
Date: Tue, 17 Apr 2012 13:43:58 +0200
Subject: [PATCH 121/238] [imp] renammed some usage of instance for future
 refactoring

bzr revid: nicolas.vanhoren@openerp.com-20120417114358-ilya1z6iv0o61m6t
---
 addons/web/static/src/js/view_form.js |  2 +-
 addons/web/static/src/js/view_list.js | 14 +++++++-------
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js
index c462ae49798..bcf3ffd2600 100644
--- a/addons/web/static/src/js/view_form.js
+++ b/addons/web/static/src/js/view_form.js
@@ -1926,7 +1926,7 @@ openerp.web.DateTimeWidget = openerp.web.OldWidget.extend({
     picker: function() {
         return $.fn[this.jqueryui_object].apply(this.$input_picker, arguments);
     },
-    on_picker_select: function(text, instance) {
+    on_picker_select: function(text, instance_) {
         var date = this.picker('getDate');
         this.$input.val(date ? this.format_client(date) : '').change();
     },
diff --git a/addons/web/static/src/js/view_list.js b/addons/web/static/src/js/view_list.js
index f137bd6c211..d8ef6ecb34f 100644
--- a/addons/web/static/src/js/view_list.js
+++ b/addons/web/static/src/js/view_list.js
@@ -1654,19 +1654,19 @@ var Collection = openerp.web.Class.extend(/** @lends Collection# */{
         var records = record instanceof Array ? record : [record];
 
         for(var i=0, length=records.length; i<length; ++i) {
-            var instance = (records[i] instanceof Record) ? records[i] : new Record(records[i]);
-            instance.bind(null, this._onRecordEvent);
-            this._byId[instance.get('id')] = instance;
+            var instance_ = (records[i] instanceof Record) ? records[i] : new Record(records[i]);
+            instance_.bind(null, this._onRecordEvent);
+            this._byId[instance_.get('id')] = instance_;
             if (options.at == undefined) {
-                this.records.push(instance);
+                this.records.push(instance_);
                 if (!options.silent) {
-                    this.trigger('add', this, instance, this.records.length-1);
+                    this.trigger('add', this, instance_, this.records.length-1);
                 }
             } else {
                 var insertion_index = options.at + i;
-                this.records.splice(insertion_index, 0, instance);
+                this.records.splice(insertion_index, 0, instance_);
                 if (!options.silent) {
-                    this.trigger('add', this, instance, insertion_index);
+                    this.trigger('add', this, instance_, insertion_index);
                 }
             }
             this.length++;

From e35f513f44d51a87a8437c96d2b4142060cfdbc3 Mon Sep 17 00:00:00 2001
From: niv-openerp <nicolas.vanhoren@openerp.com>
Date: Tue, 17 Apr 2012 13:48:37 +0200
Subject: [PATCH 122/238] [imp] refactored chrome.js

bzr revid: nicolas.vanhoren@openerp.com-20120417114837-z4j94uy9f1qstbue
---
 addons/web/static/src/js/chrome.js | 104 ++++++++++++++---------------
 1 file changed, 52 insertions(+), 52 deletions(-)

diff --git a/addons/web/static/src/js/chrome.js b/addons/web/static/src/js/chrome.js
index 892c86f2a92..f1d3faef367 100644
--- a/addons/web/static/src/js/chrome.js
+++ b/addons/web/static/src/js/chrome.js
@@ -1,16 +1,16 @@
 /*---------------------------------------------------------
  * OpenERP Web chrome
  *---------------------------------------------------------*/
-openerp.web.chrome = function(openerp) {
-var QWeb = openerp.web.qweb,
-    _t = openerp.web._t;
+openerp.web.chrome = function(instance) {
+var QWeb = instance.web.qweb,
+    _t = instance.web._t;
 
-openerp.web.Notification =  openerp.web.Widget.extend({
+instance.web.Notification =  instance.web.Widget.extend({
     template: 'Notification',
     init: function() {
         this._super.apply(this, arguments);
-        // move to openerp.web.notification
-        openerp.notification = this;
+        // move to instance.web.notification
+        instance.notification = this;
     },
     start: function() {
         this._super.apply(this, arguments);
@@ -43,13 +43,13 @@ openerp.web.Notification =  openerp.web.Widget.extend({
     }
 });
 
-openerp.web.dialog = function(element) {
+instance.web.dialog = function(element) {
     var result = element.dialog.apply(element, _.rest(_.toArray(arguments)));
     result.dialog("widget").addClass("openerp");
     return result;
 }
 
-openerp.web.Dialog = openerp.web.Widget.extend({
+instance.web.Dialog = instance.web.Widget.extend({
     dialog_title: "",
     init: function (parent, options, content) {
         var self = this;
@@ -83,7 +83,7 @@ openerp.web.Dialog = openerp.web.Widget.extend({
         if (this.dialog_options.autoOpen) {
             this.open();
         } else {
-            openerp.web.dialog(this.$element, this.get_options());
+            instance.web.dialog(this.$element, this.get_options());
         }
     },
     get_options: function(options) {
@@ -122,7 +122,7 @@ openerp.web.Dialog = openerp.web.Widget.extend({
             this.$element.html(this.renderElement());
         }
         var o = this.get_options(options);
-        openerp.web.dialog(this.$element, o).dialog('open');
+        instance.web.dialog(this.$element, o).dialog('open');
         if (o.height === 'auto' && o.max_height) {
             this.$element.css({ 'max-height': o.max_height, 'overflow-y': 'auto' });
         }
@@ -146,7 +146,7 @@ openerp.web.Dialog = openerp.web.Widget.extend({
     }
 });
 
-openerp.web.CrashManager = openerp.web.CallbackEnabled.extend({
+instance.web.CrashManager = instance.web.CallbackEnabled.extend({
     on_rpc_error: function(error) {
         if (error.data.fault_code) {
             var split = ("" + error.data.fault_code).split('\n')[0].split(' -- ');
@@ -162,7 +162,7 @@ openerp.web.CrashManager = openerp.web.CallbackEnabled.extend({
         }
     },
     on_managed_error: function(error) {
-    	openerp.web.dialog($('<div>' + QWeb.render('CrashManager.warning', {error: error}) + '</div>'), {
+    	instance.web.dialog($('<div>' + QWeb.render('CrashManager.warning', {error: error}) + '</div>'), {
             title: "OpenERP " + _.str.capitalize(error.type),
             buttons: [
                 {text: _t("Ok"), click: function() { $(this).dialog("close"); }}
@@ -172,14 +172,14 @@ openerp.web.CrashManager = openerp.web.CallbackEnabled.extend({
     on_traceback: function(error) {
         var self = this;
         var buttons = {};
-        if (openerp.connection.openerp_entreprise) {
+        if (instance.connection.openerp_entreprise) {
             buttons[_t("Send OpenERP Enterprise Report")] = function() {
                 var $this = $(this);
                 var issuename = $('#issuename').val();
                 var explanation = $('#explanation').val();
                 var remark = $('#remark').val();
                 // Call the send method from server to send mail with details
-                new openerp.web.DataSet(self, 'publisher_warranty.contract').call_and_eval('send', [error.data,explanation,remark,issuename]).then(function(result){
+                new instance.web.DataSet(self, 'publisher_warranty.contract').call_and_eval('send', [error.data,explanation,remark,issuename]).then(function(result){
                     if (result === false) {
                         alert('There was a communication error.')
                     } else {
@@ -195,7 +195,7 @@ openerp.web.CrashManager = openerp.web.CallbackEnabled.extend({
                 $(this).dialog("close");
             };
         }
-        var dialog = new openerp.web.Dialog(this, {
+        var dialog = new instance.web.Dialog(this, {
             title: "OpenERP " + _.str.capitalize(error.type),
             width: '80%',
             height: '50%',
@@ -203,11 +203,11 @@ openerp.web.CrashManager = openerp.web.CallbackEnabled.extend({
             min_height: '600px',
             buttons: buttons
         }).open();
-        dialog.$element.html(QWeb.render('CrashManager.error', {session: openerp.connection, error: error}));
+        dialog.$element.html(QWeb.render('CrashManager.error', {session: instance.connection, error: error}));
     }
 });
 
-openerp.web.Loading = openerp.web.Widget.extend({
+instance.web.Loading = instance.web.Widget.extend({
     template: 'Loading',
     init: function(parent) {
         this._super(parent);
@@ -258,7 +258,7 @@ openerp.web.Loading = openerp.web.Widget.extend({
     }
 });
 
-openerp.web.DatabaseManager = openerp.web.Widget.extend({
+instance.web.DatabaseManager = instance.web.Widget.extend({
     init: function(parent) {
         this._super(parent);
         this.unblockUIFunction = $.unblockUI;
@@ -344,7 +344,7 @@ openerp.web.DatabaseManager = openerp.web.Widget.extend({
      * @param {String} error.error message of the error dialog
      */
     display_error: function (error) {
-        return openerp.web.dialog($('<div>'), {
+        return instance.web.dialog($('<div>'), {
             modal: true,
             title: error.title,
             buttons: [
@@ -388,7 +388,7 @@ openerp.web.DatabaseManager = openerp.web.Widget.extend({
             success: function () {
                 self.do_notify(_t("Backed"), _t("Database backed up successfully"));
             },
-            error: openerp.webclient.crashmanager.on_rpc_error,
+            error: instance.webclient.crashmanager.on_rpc_error,
             complete: function() {
                 self.unblockUI();
             }
@@ -439,7 +439,7 @@ openerp.web.DatabaseManager = openerp.web.Widget.extend({
     }
 });
 
-openerp.web.Login =  openerp.web.Widget.extend({
+instance.web.Login =  instance.web.Widget.extend({
     template: "Login",
     remember_credentials: true,
     init: function(parent) {
@@ -464,7 +464,7 @@ openerp.web.Login =  openerp.web.Widget.extend({
         self.$element.find('.oe_login_manage_db').click(function() {
             self.$element.find('.oe_login_bottom').hide();
             self.$element.find('.oe_login_pane').hide();
-            self.databasemanager = new openerp.web.DatabaseManager(self);
+            self.databasemanager = new instance.web.DatabaseManager(self);
             self.databasemanager.appendTo(self.$element);
             self.databasemanager.do_exit.add_last(function() {
                 self.databasemanager.destroy();
@@ -486,7 +486,7 @@ openerp.web.Login =  openerp.web.Widget.extend({
         });
     },
     set_db_list: function (list) {
-        this.$element.find("[name=db]").replaceWith(openerp.web.qweb.render('Login.dblist', { db_list: list, selected_db: this.selected_db}))
+        this.$element.find("[name=db]").replaceWith(instance.web.qweb.render('Login.dblist', { db_list: list, selected_db: this.selected_db}))
     },
     on_submit: function(ev) {
         if(ev) {
@@ -538,7 +538,7 @@ openerp.web.Login =  openerp.web.Widget.extend({
     }
 });
 
-openerp.web.Menu =  openerp.web.Widget.extend({
+instance.web.Menu =  instance.web.Widget.extend({
     template: 'Menu',
     init: function() {
         this._super.apply(this, arguments);
@@ -682,7 +682,7 @@ openerp.web.Menu =  openerp.web.Widget.extend({
     }
 });
 
-openerp.web.UserMenu =  openerp.web.Widget.extend({
+instance.web.UserMenu =  instance.web.Widget.extend({
     template: "UserMenu",
     init: function(parent) {
         this._super(parent);
@@ -707,7 +707,7 @@ openerp.web.UserMenu =  openerp.web.Widget.extend({
     },
     change_password :function() {
         var self = this;
-        this.dialog = new openerp.web.Dialog(this, {
+        this.dialog = new instance.web.Dialog(this, {
             title: _t("Change Password"),
             width : 'auto'
         }).open();
@@ -721,14 +721,14 @@ openerp.web.UserMenu =  openerp.web.Widget.extend({
                         self.display_error(result);
                         return;
                     } else {
-                        openerp.webclient.on_logout();
+                        instance.webclient.on_logout();
                     }
                 });
             }
         });
     },
     display_error: function (error) {
-        return openerp.web.dialog($('<div>'), {
+        return instance.web.dialog($('<div>'), {
             modal: true,
             title: error.title,
             buttons: [
@@ -743,10 +743,10 @@ openerp.web.UserMenu =  openerp.web.Widget.extend({
             $avatar.attr('src', $avatar.data('default-src'));
             if (!self.session.uid)
                 return;
-            var func = new openerp.web.Model("res.users").get_func("read");
+            var func = new instance.web.Model("res.users").get_func("read");
             return func(self.session.uid, ["name", "company_id"]).pipe(function(res) {
                 // TODO: Show company if multicompany is in use
-                var topbar_name = _.str.sprintf("%s (%s)", res.name, openerp.connection.db, res.company_id[1]);
+                var topbar_name = _.str.sprintf("%s (%s)", res.name, instance.connection.db, res.company_id[1]);
                 self.$element.find('.oe_topbar_name').text(topbar_name);
                 var avatar_src = _.str.sprintf('%s/web/binary/image?session_id=%s&model=res.users&field=avatar&id=%s', self.session.prefix, self.session.session_id, self.session.uid);
                 $avatar.attr('src', avatar_src);
@@ -760,7 +760,7 @@ openerp.web.UserMenu =  openerp.web.Widget.extend({
     shortcut_load :function(){
         var self = this,
             sc = self.session.shortcuts,
-            shortcuts_ds = new openerp.web.DataSet(this, 'ir.ui.view_sc');
+            shortcuts_ds = new instance.web.DataSet(this, 'ir.ui.view_sc');
         self.$element.find('.oe_dropdown_options a[data-menu=shortcut]').each(function() {
             $(this).parent().remove();
         });
@@ -807,8 +807,8 @@ openerp.web.UserMenu =  openerp.web.Widget.extend({
     },
     on_menu_settings: function() {
         var self = this;
-        var action_manager = new openerp.web.ActionManager(this);
-        var dataset = new openerp.web.DataSet (this,'res.users',this.context);
+        var action_manager = new instance.web.ActionManager(this);
+        var dataset = new instance.web.DataSet (this,'res.users',this.context);
         dataset.call ('action_get','',function (result){
             self.rpc('/web/action/load', {action_id:result}, function(result){
                 action_manager.do_action(_.extend(result['result'], {
@@ -825,7 +825,7 @@ openerp.web.UserMenu =  openerp.web.Widget.extend({
                 }));
             });
         });
-        this.dialog = new openerp.web.Dialog(this,{
+        this.dialog = new instance.web.Dialog(this,{
             title: _t("Preferences"),
             width: '700px',
             buttons: [
@@ -855,7 +855,7 @@ openerp.web.UserMenu =  openerp.web.Widget.extend({
                 window.location = $.param.querystring(
                         window.location.href, 'debug');
             });
-            openerp.web.dialog($help, {autoOpen: true,
+            instance.web.dialog($help, {autoOpen: true,
                 modal: true, width: 960, title: _t("About")});
         });
     },
@@ -871,11 +871,11 @@ openerp.web.UserMenu =  openerp.web.Widget.extend({
     }
 });
 
-openerp.web.WebClient = openerp.web.Widget.extend({
+instance.web.WebClient = instance.web.Widget.extend({
     init: function(parent) {
         var self = this;
         this._super(parent);
-        openerp.webclient = this;
+        instance.webclient = this;
         this.querystring = '?' + jQuery.param.querystring();
         this._current_state = null;
     },
@@ -900,7 +900,7 @@ openerp.web.WebClient = openerp.web.Widget.extend({
             self.menu.do_reload();
             if(self.action_manager)
                 self.action_manager.destroy();
-            self.action_manager = new openerp.web.ActionManager(self);
+            self.action_manager = new instance.web.ActionManager(self);
             self.action_manager.appendTo(self.$element.find('.oe_application'));
             self.bind_hashchange();
             var version_label = _t("OpenERP - Unsupported/Community Version");
@@ -917,7 +917,7 @@ openerp.web.WebClient = openerp.web.Widget.extend({
         var self = this;
         this.destroy_content();
         this.show_common();
-        self.login = new openerp.web.Login(self);
+        self.login = new instance.web.Login(self);
         self.login.appendTo(self.$element);
     },
     show_application: function() {
@@ -926,10 +926,10 @@ openerp.web.WebClient = openerp.web.Widget.extend({
         this.show_common();
         self.$table = $(QWeb.render("WebClient", {}));
         self.$element.append(self.$table);
-        self.menu = new openerp.web.Menu(self);
+        self.menu = new instance.web.Menu(self);
         self.menu.replace(this.$element.find('.oe_menu_placeholder'));
         self.menu.on_action.add(this.proxy('on_menu_action'));
-        self.user_menu = new openerp.web.UserMenu(self);
+        self.user_menu = new instance.web.UserMenu(self);
         self.user_menu.replace(this.$element.find('.oe_user_menu_placeholder'));
         self.user_menu.on_menu_logout.add(this.proxy('on_logout'));
         self.user_menu.on_action.add(this.proxy('on_menu_action'));
@@ -937,8 +937,8 @@ openerp.web.WebClient = openerp.web.Widget.extend({
     show_common: function() {
         var self = this;
         if (!this.crashmanager) {
-            this.crashmanager =  new openerp.web.CrashManager();
-            openerp.connection.on_rpc_error.add(this.crashmanager.on_rpc_error);
+            this.crashmanager =  new instance.web.CrashManager();
+            instance.connection.on_rpc_error.add(this.crashmanager.on_rpc_error);
             window.onerror = function (message, file, line) {
                 self.crashmanager.on_traceback({
                     type: _t("Client Error"),
@@ -947,9 +947,9 @@ openerp.web.WebClient = openerp.web.Widget.extend({
                 });
             }
         }
-        this.notification = new openerp.web.Notification(this);
+        this.notification = new instance.web.Notification(this);
         this.notification.appendTo(this.$element);
-        this.loading = new openerp.web.Loading(this);
+        this.loading = new instance.web.Loading(this);
         this.loading.appendTo(this.$element);
     },
     destroy_content: function() {
@@ -961,7 +961,7 @@ openerp.web.WebClient = openerp.web.Widget.extend({
     do_reload: function() {
         var self = this;
         return this.session.session_reload().pipe(function () {
-            openerp.connection.load_modules(true).pipe(
+            instance.connection.load_modules(true).pipe(
                 self.menu.proxy('do_reload')); });
 
     },
@@ -1025,14 +1025,14 @@ openerp.web.WebClient = openerp.web.Widget.extend({
     }
 });
 
-openerp.web.EmbeddedClient = openerp.web.Widget.extend({
+instance.web.EmbeddedClient = instance.web.Widget.extend({
     template: 'EmptyComponent',
     init: function(parent, action_id, options) {
         this._super(parent);
         // TODO take the xmlid of a action instead of its id 
         this.action_id = action_id;
         this.options = options || {};
-        this.am = new openerp.web.ActionManager(this);
+        this.am = new instance.web.ActionManager(this);
     },
     start: function() {
         var self = this;
@@ -1052,7 +1052,7 @@ openerp.web.EmbeddedClient = openerp.web.Widget.extend({
     }
 });
 
-openerp.web.embed = function (origin, dbname, login, key, action, options) {
+instance.web.embed = function (origin, dbname, login, key, action, options) {
     $('head').append($('<link>', {
         'rel': 'stylesheet',
         'type': 'text/css',
@@ -1063,9 +1063,9 @@ openerp.web.embed = function (origin, dbname, login, key, action, options) {
         var sc = document.getElementsByTagName('script');
         currentScript = sc[sc.length-1];
     }
-    openerp.connection.session_bind(origin).then(function () {
-        openerp.connection.session_authenticate(dbname, login, key, true).then(function () {
-            var client = new openerp.web.EmbeddedClient(null, action, options);
+    instance.connection.session_bind(origin).then(function () {
+        instance.connection.session_authenticate(dbname, login, key, true).then(function () {
+            var client = new instance.web.EmbeddedClient(null, action, options);
             client.insertAfter(currentScript);
         });
     });

From 1d488be821bc603bc796525480d9393fdf0d9dd7 Mon Sep 17 00:00:00 2001
From: niv-openerp <nicolas.vanhoren@openerp.com>
Date: Tue, 17 Apr 2012 13:52:47 +0200
Subject: [PATCH 123/238] [imp] refactored corelib.js

bzr revid: nicolas.vanhoren@openerp.com-20120417115247-an5dj09s7k1a2su0
---
 addons/web/static/src/js/corelib.js | 126 ++++++++++++++--------------
 1 file changed, 63 insertions(+), 63 deletions(-)

diff --git a/addons/web/static/src/js/corelib.js b/addons/web/static/src/js/corelib.js
index 2da804c3d2c..5475f4ad53c 100644
--- a/addons/web/static/src/js/corelib.js
+++ b/addons/web/static/src/js/corelib.js
@@ -23,7 +23,7 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-openerp.web.corelib = function(openerp) {
+openerp.web.corelib = function(instance) {
 
 /**
  * Improved John Resig's inheritance, based on:
@@ -39,7 +39,7 @@ openerp.web.corelib = function(openerp) {
  *
  * Example:
  *
- * var Person = openerp.web.Class.extend({
+ * var Person = instance.web.Class.extend({
  *  init: function(isDancing){
  *     this.dancing = isDancing;
  *   },
@@ -75,14 +75,14 @@ openerp.web.corelib = function(openerp) {
     var initializing = false,
         fnTest = /xyz/.test(function(){xyz;}) ? /\b_super\b/ : /.*/;
     // The web Class implementation (does nothing)
-    openerp.web.Class = function(){};
+    instance.web.Class = function(){};
 
     /**
      * Subclass an existing class
      *
      * @param {Object} prop class-level properties (class attributes and instance methods) to set on the new class
      */
-    openerp.web.Class.extend = function() {
+    instance.web.Class.extend = function() {
         var _super = this.prototype;
         // Support mixins arguments
         var args = _.toArray(arguments);
@@ -180,7 +180,7 @@ openerp.web.corelib = function(openerp) {
  * When an object is destroyed, all its children are destroyed too releasing
  * any resource they could have reserved before.
  */
-openerp.web.ParentedMixin = {
+instance.web.ParentedMixin = {
     __parentedMixin : true,
     init: function() {
         this.__parentedDestroyed = false;
@@ -253,7 +253,7 @@ openerp.web.ParentedMixin = {
  * events is done in EventDispatcherMixin.
  *
  */
-openerp.web.Events = openerp.web.Class.extend({
+instance.web.Events = instance.web.Class.extend({
 
     on : function(events, callback, context) {
         var ev;
@@ -324,11 +324,11 @@ openerp.web.Events = openerp.web.Class.extend({
     }
 });
 
-openerp.web.EventDispatcherMixin = _.extend({}, openerp.web.ParentedMixin, {
+instance.web.EventDispatcherMixin = _.extend({}, instance.web.ParentedMixin, {
     __eventDispatcherMixin: true,
     init: function() {
-        openerp.web.ParentedMixin.init.call(this);
-        this.__edispatcherEvents = new openerp.web.Events();
+        instance.web.ParentedMixin.init.call(this);
+        this.__edispatcherEvents = new instance.web.Events();
         this.__edispatcherRegisteredEvents = [];
     },
     on: function(events, dest, func) {
@@ -369,13 +369,13 @@ openerp.web.EventDispatcherMixin = _.extend({}, openerp.web.ParentedMixin, {
             debugger;
         }
         this.__edispatcherEvents.off();
-        openerp.web.ParentedMixin.destroy.call(this);
+        instance.web.ParentedMixin.destroy.call(this);
     }
 });
 
-openerp.web.GetterSetterMixin = _.extend({}, openerp.web.EventDispatcherMixin, {
+instance.web.GetterSetterMixin = _.extend({}, instance.web.EventDispatcherMixin, {
     init: function() {
-        openerp.web.EventDispatcherMixin.init.call(this);
+        instance.web.EventDispatcherMixin.init.call(this);
         this.__getterSetterInternalMap = {};
     },
     set: function(map) {
@@ -400,9 +400,9 @@ openerp.web.GetterSetterMixin = _.extend({}, openerp.web.EventDispatcherMixin, {
     }
 });
 
-openerp.web.CallbackEnabledMixin = _.extend({}, openerp.web.GetterSetterMixin, {
+instance.web.CallbackEnabledMixin = _.extend({}, instance.web.GetterSetterMixin, {
     init: function() {
-        openerp.web.GetterSetterMixin.init.call(this);
+        instance.web.GetterSetterMixin.init.call(this);
         var self = this;
         var callback_maker = function(obj, name, method) {
             var callback = function() {
@@ -421,7 +421,7 @@ openerp.web.CallbackEnabledMixin = _.extend({}, openerp.web.GetterSetterMixin, {
                         r = result;
                     }
                     // TODO special value to stop the chain
-                    // openerp.web.callback_stop
+                    // instance.web.callback_stop
                 }
                 return r;
             };
@@ -500,7 +500,7 @@ openerp.web.CallbackEnabledMixin = _.extend({}, openerp.web.GetterSetterMixin, {
     }
 });
 
-openerp.web.WidgetMixin = _.extend({},openerp.web.CallbackEnabledMixin, {
+instance.web.WidgetMixin = _.extend({},instance.web.CallbackEnabledMixin, {
     /**
      * Tag name when creating a default $element.
      * @type string
@@ -509,10 +509,10 @@ openerp.web.WidgetMixin = _.extend({},openerp.web.CallbackEnabledMixin, {
     /**
      * Constructs the widget and sets its parent if a parent is given.
      *
-     * @constructs openerp.web.Widget
-     * @extends openerp.web.CallbackEnabled
+     * @constructs instance.web.Widget
+     * @extends instance.web.CallbackEnabled
      *
-     * @param {openerp.web.Widget} parent Binds the current instance to the given Widget instance.
+     * @param {instance.web.Widget} parent Binds the current instance to the given Widget instance.
      * When that widget is destroyed by calling destroy(), the current instance will be
      * destroyed too. Can be null.
      * @param {String} element_id Deprecated. Sets the element_id. Only useful when you want
@@ -521,7 +521,7 @@ openerp.web.WidgetMixin = _.extend({},openerp.web.CallbackEnabledMixin, {
      * for new components this argument should not be provided any more.
      */
     init: function(parent) {
-        openerp.web.CallbackEnabledMixin.init.call(this);
+        instance.web.CallbackEnabledMixin.init.call(this);
         this.$element = $(document.createElement(this.tagName));
         this.setParent(parent);
     },
@@ -535,7 +535,7 @@ openerp.web.WidgetMixin = _.extend({},openerp.web.CallbackEnabledMixin, {
         if(this.$element != null) {
             this.$element.remove();
         }
-        openerp.web.GetterSetterMixin.destroy.call(this);
+        instance.web.GetterSetterMixin.destroy.call(this);
     },
     /**
      * Renders the current widget and appends it to the given jQuery object or Widget.
@@ -616,9 +616,9 @@ openerp.web.WidgetMixin = _.extend({},openerp.web.CallbackEnabledMixin, {
 
 // Classes
 
-openerp.web.CallbackEnabled = openerp.web.Class.extend(openerp.web.CallbackEnabledMixin, {
+instance.web.CallbackEnabled = instance.web.Class.extend(instance.web.CallbackEnabledMixin, {
     init: function() {
-        openerp.web.CallbackEnabledMixin.init.call(this);
+        instance.web.CallbackEnabledMixin.init.call(this);
     }
 });
 
@@ -637,7 +637,7 @@ openerp.web.CallbackEnabled = openerp.web.Class.extend(openerp.web.CallbackEnabl
  *
  * Here is a sample child class:
  *
- * MyWidget = openerp.base.Widget.extend({
+ * MyWidget = instance.base.Widget.extend({
  *     // the name of the QWeb template to use for rendering
  *     template: "MyQWebTemplate",
  *
@@ -670,7 +670,7 @@ openerp.web.CallbackEnabled = openerp.web.Class.extend(openerp.web.CallbackEnabl
  *
  * That will kill the widget in a clean way and erase its content from the dom.
  */
-openerp.web.Widget = openerp.web.Class.extend(openerp.web.WidgetMixin, {
+instance.web.Widget = instance.web.Class.extend(instance.web.WidgetMixin, {
     /**
      * The name of the QWeb template that will be used for rendering. Must be
      * redefined in subclasses or the default render() method can not be used.
@@ -681,10 +681,10 @@ openerp.web.Widget = openerp.web.Class.extend(openerp.web.WidgetMixin, {
     /**
      * Constructs the widget and sets its parent if a parent is given.
      *
-     * @constructs openerp.web.Widget
-     * @extends openerp.web.CallbackEnabled
+     * @constructs instance.web.Widget
+     * @extends instance.web.CallbackEnabled
      *
-     * @param {openerp.web.Widget} parent Binds the current instance to the given Widget instance.
+     * @param {instance.web.Widget} parent Binds the current instance to the given Widget instance.
      * When that widget is destroyed by calling destroy(), the current instance will be
      * destroyed too. Can be null.
      * @param {String} element_id Deprecated. Sets the element_id. Only useful when you want
@@ -693,8 +693,8 @@ openerp.web.Widget = openerp.web.Class.extend(openerp.web.WidgetMixin, {
      * for new components this argument should not be provided any more.
      */
     init: function(parent) {
-        openerp.web.WidgetMixin.init.call(this,parent);
-        this.session = openerp.connection;
+        instance.web.WidgetMixin.init.call(this,parent);
+        this.session = instance.connection;
     },
     /**
      * Renders the element. The default implementation renders the widget using QWeb,
@@ -704,7 +704,7 @@ openerp.web.Widget = openerp.web.Class.extend(openerp.web.WidgetMixin, {
     renderElement: function() {
         var rendered = null;
         if (this.template)
-            rendered = openerp.web.qweb.render(this.template, {widget: this});
+            rendered = instance.web.qweb.render(this.template, {widget: this});
         if (_.str.trim(rendered)) {
             var elem = $(rendered);
             this.$element.replaceWith(elem);
@@ -737,7 +737,7 @@ openerp.web.Widget = openerp.web.Class.extend(openerp.web.WidgetMixin, {
     rpc: function(url, data, success, error) {
         var def = $.Deferred().then(success, error);
         var self = this;
-        openerp.connection.rpc(url, data). then(function() {
+        instance.connection.rpc(url, data). then(function() {
             if (!self.isDestroyed())
                 def.resolve.apply(def, arguments);
         }, function() {
@@ -748,7 +748,7 @@ openerp.web.Widget = openerp.web.Class.extend(openerp.web.WidgetMixin, {
     }
 });
 
-openerp.web.Registry = openerp.web.Class.extend({
+instance.web.Registry = instance.web.Class.extend({
     /**
      * Stores a mapping of arbitrary key (strings) to object paths (as strings
      * as well).
@@ -757,11 +757,11 @@ openerp.web.Registry = openerp.web.Class.extend({
      * object, even if those objects have been overloaded/replaced after the
      * registry was created.
      *
-     * An object path is simply a dotted name from the openerp root to the
-     * object pointed to (e.g. ``"openerp.web.Connection"`` for an OpenERP
+     * An object path is simply a dotted name from the instance root to the
+     * object pointed to (e.g. ``"instance.web.Connection"`` for an OpenERP
      * connection object).
      *
-     * @constructs openerp.web.Registry
+     * @constructs instance.web.Registry
      * @param {Object} mapping a mapping of keys to object-paths
      */
     init: function (mapping) {
@@ -785,7 +785,7 @@ openerp.web.Registry = openerp.web.Class.extend({
             return null;
         }
 
-        var object_match = openerp;
+        var object_match = instance;
         var path = path_string.split('.');
         // ignore first section
         for(var i=1; i<path.length; ++i) {
@@ -838,7 +838,7 @@ openerp.web.Registry = openerp.web.Class.extend({
      *
      * @param {String} key
      * @param {String} object_path fully qualified dotted object path
-     * @returns {openerp.web.Registry} itself
+     * @returns {instance.web.Registry} itself
      */
     add: function (key, object_path) {
         this.map[key] = object_path;
@@ -854,7 +854,7 @@ openerp.web.Registry = openerp.web.Class.extend({
      * @param {Object} [mapping={}] a mapping of keys to object-paths
      */
     extend: function (mapping) {
-        var child = new openerp.web.Registry(mapping);
+        var child = new instance.web.Registry(mapping);
         child.parent = this;
         return child;
     },
@@ -867,10 +867,10 @@ openerp.web.Registry = openerp.web.Class.extend({
     }
 });
 
-openerp.web.Connection = openerp.web.CallbackEnabled.extend( /** @lends openerp.web.Connection# */{
+instance.web.Connection = instance.web.CallbackEnabled.extend( /** @lends instance.web.Connection# */{
     /**
-     * @constructs openerp.web.Connection
-     * @extends openerp.web.CallbackEnabled
+     * @constructs instance.web.Connection
+     * @extends instance.web.CallbackEnabled
      *
      * @param {String} [server] JSON-RPC endpoint hostname
      * @param {String} [port] JSON-RPC endpoint port
@@ -880,7 +880,7 @@ openerp.web.Connection = openerp.web.CallbackEnabled.extend( /** @lends openerp.
         this.server = null;
         this.debug = ($.deparam($.param.querystring()).debug != undefined);
         // TODO: session store in cookie should be optional
-        this.name = openerp._session_id;
+        this.name = instance._session_id;
         this.qweb_mutex = new $.Mutex();
     },
     session_bind: function(origin) {
@@ -888,7 +888,7 @@ openerp.web.Connection = openerp.web.CallbackEnabled.extend( /** @lends openerp.
         this.origin = origin ? _.str.rtrim(origin,'/') : window_origin;
         this.prefix = this.origin;
         this.server = this.origin; // keep chs happy
-        openerp.web.qweb.default_dict['_s'] = this.origin;
+        instance.web.qweb.default_dict['_s'] = this.origin;
         this.rpc_function = (this.origin == window_origin) ? this.rpc_json : this.rpc_jsonp;
         this.session_id = false;
         this.uid = false;
@@ -896,7 +896,7 @@ openerp.web.Connection = openerp.web.CallbackEnabled.extend( /** @lends openerp.
         this.user_context= {};
         this.db = false;
         this.openerp_entreprise = false;
-        this.module_list = openerp._modules.slice();
+        this.module_list = instance._modules.slice();
         this.module_loaded = {};
         _(this.module_list).each(function (mod) {
             self.module_loaded[mod] = true;
@@ -1069,7 +1069,7 @@ openerp.web.Connection = openerp.web.CallbackEnabled.extend( /** @lends openerp.
         try {
             var ctx = this.test_eval_contexts(source.contexts);
             if (!_.isEqual(ctx, expected.context)) {
-                openerp.webclient.notification.warn('Context mismatch, report to xmo',
+                instance.webclient.notification.warn('Context mismatch, report to xmo',
                     _.str.sprintf(match_template, {
                         source: JSON.stringify(source.contexts),
                         local: JSON.stringify(ctx),
@@ -1077,7 +1077,7 @@ openerp.web.Connection = openerp.web.CallbackEnabled.extend( /** @lends openerp.
                     }), true);
             }
         } catch (e) {
-            openerp.webclient.notification.warn('Context fail, report to xmo',
+            instance.webclient.notification.warn('Context fail, report to xmo',
                 _.str.sprintf(fail_template, {
                     error: e.message,
                     source: JSON.stringify(source.contexts)
@@ -1087,7 +1087,7 @@ openerp.web.Connection = openerp.web.CallbackEnabled.extend( /** @lends openerp.
         try {
             var dom = this.test_eval_domains(source.domains, this.test_eval_get_context());
             if (!_.isEqual(dom, expected.domain)) {
-                openerp.webclient.notification.warn('Domains mismatch, report to xmo',
+                instance.webclient.notification.warn('Domains mismatch, report to xmo',
                     _.str.sprintf(match_template, {
                         source: JSON.stringify(source.domains),
                         local: JSON.stringify(dom),
@@ -1095,7 +1095,7 @@ openerp.web.Connection = openerp.web.CallbackEnabled.extend( /** @lends openerp.
                     }), true);
             }
         } catch (e) {
-            openerp.webclient.notification.warn('Domain fail, report to xmo',
+            instance.webclient.notification.warn('Domain fail, report to xmo',
                 _.str.sprintf(fail_template, {
                     error: e.message,
                     source: JSON.stringify(source.domains)
@@ -1105,7 +1105,7 @@ openerp.web.Connection = openerp.web.CallbackEnabled.extend( /** @lends openerp.
         try {
             var groups = this.test_eval_groupby(source.group_by_seq);
             if (!_.isEqual(groups, expected.group_by)) {
-                openerp.webclient.notification.warn('GroupBy mismatch, report to xmo',
+                instance.webclient.notification.warn('GroupBy mismatch, report to xmo',
                     _.str.sprintf(match_template, {
                         source: JSON.stringify(source.group_by_seq),
                         local: JSON.stringify(groups),
@@ -1113,7 +1113,7 @@ openerp.web.Connection = openerp.web.CallbackEnabled.extend( /** @lends openerp.
                     }), true);
             }
         } catch (e) {
-            openerp.webclient.notification.warn('GroupBy fail, report to xmo',
+            instance.webclient.notification.warn('GroupBy fail, report to xmo',
                 _.str.sprintf(fail_template, {
                     error: e.message,
                     source: JSON.stringify(source.group_by_seq)
@@ -1369,7 +1369,7 @@ openerp.web.Connection = openerp.web.CallbackEnabled.extend( /** @lends openerp.
         // TODO: session store in cookie should be optional
         this.session_id = this.get_cookie('session_id');
         return this.session_reload().pipe(function(result) {
-            var modules = openerp._modules.join(',');
+            var modules = instance._modules.join(',');
             var deferred = self.rpc('/web/webclient/qweblist', {mods: modules}).pipe(self.do_load_qweb);
             if(self.session_is_valid()) {
                 return deferred.pipe(function() { return self.load_modules(); });
@@ -1491,7 +1491,7 @@ openerp.web.Connection = openerp.web.CallbackEnabled.extend( /** @lends openerp.
                     self.rpc('/web/webclient/csslist', {mods: to_load}, self.do_load_css),
                     self.rpc('/web/webclient/qweblist', {mods: to_load}).pipe(self.do_load_qweb),
                     self.rpc('/web/webclient/translations', params).pipe(function(trans) {
-                        openerp.web._t.database.set_bundle(trans);
+                        instance.web._t.database.set_bundle(trans);
                         var file_list = ["/web/static/lib/datejs/globalization/" + lang.replace("_", "-") + ".js"];
                         return self.rpc('/web/webclient/jslist', {mods: to_load}).pipe(function(files) {
                             return self.do_load_js(file_list.concat(files));
@@ -1553,7 +1553,7 @@ openerp.web.Connection = openerp.web.CallbackEnabled.extend( /** @lends openerp.
             self.qweb_mutex.exec(function() {
                 return self.rpc('/web/proxy/load', {path: file}).pipe(function(xml) {
                     if (!xml) { return; }
-                    openerp.web.qweb.add_template(_.str.trim(xml));
+                    instance.web.qweb.add_template(_.str.trim(xml));
                 });
             });
         });
@@ -1564,10 +1564,10 @@ openerp.web.Connection = openerp.web.CallbackEnabled.extend( /** @lends openerp.
             var mod = this.module_list[j];
             if(this.module_loaded[mod])
                 continue;
-            openerp[mod] = {};
+            instance[mod] = {};
             // init module mod
-            if(openerp._openerp[mod] != undefined) {
-                openerp._openerp[mod](openerp);
+            if(instance._openerp[mod] != undefined) {
+                instance._openerp[mod](instance);
                 this.module_loaded[mod] = true;
             }
         }
@@ -1687,10 +1687,10 @@ openerp.web.Connection = openerp.web.CallbackEnabled.extend( /** @lends openerp.
     }
 });
 
-openerp.web.TranslationDataBase = openerp.web.Class.extend(/** @lends openerp.web.TranslationDataBase# */{
+instance.web.TranslationDataBase = instance.web.Class.extend(/** @lends instance.web.TranslationDataBase# */{
     /**
-     * @constructs openerp.web.TranslationDataBase
-     * @extends openerp.web.Class
+     * @constructs instance.web.TranslationDataBase
+     * @extends instance.web.Class
      */
     init: function() {
         this.db = {};
@@ -1741,9 +1741,9 @@ openerp.web.TranslationDataBase = openerp.web.Class.extend(/** @lends openerp.we
 });
 
 /**
- * @deprecated use :class:`openerp.web.Widget`
+ * @deprecated use :class:`instance.web.Widget`
  */
-openerp.web.OldWidget = openerp.web.Widget.extend({
+instance.web.OldWidget = instance.web.Widget.extend({
     init: function(parent, element_id) {
         this._super(parent);
         this.element_id = element_id;
@@ -1762,7 +1762,7 @@ openerp.web.OldWidget = openerp.web.Widget.extend({
     },
     render: function (additional) {
         if (this.template)
-            return openerp.web.qweb.render(this.template, _.extend({widget: this}, additional || {}));
+            return instance.web.qweb.render(this.template, _.extend({widget: this}, additional || {}));
         return null;
     }
 });

From 62373eafe9ff2da83e6a50e22a90105bcac7918c Mon Sep 17 00:00:00 2001
From: niv-openerp <nicolas.vanhoren@openerp.com>
Date: Tue, 17 Apr 2012 13:53:56 +0200
Subject: [PATCH 124/238] [imp] refactored coresetup.js

bzr revid: nicolas.vanhoren@openerp.com-20120417115356-vl4sna742qrtgpg0
---
 addons/web/static/src/js/coresetup.js | 28 +++++++++++++--------------
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/addons/web/static/src/js/coresetup.js b/addons/web/static/src/js/coresetup.js
index a68a7bb3d7e..86040302668 100644
--- a/addons/web/static/src/js/coresetup.js
+++ b/addons/web/static/src/js/coresetup.js
@@ -9,10 +9,10 @@ if (!console.debug) {
     console.debug = console.log;
 }
 
-openerp.web.coresetup = function(openerp) {
+openerp.web.coresetup = function(instance) {
 
 /** Configure default qweb */
-openerp.web._t = new openerp.web.TranslationDataBase().build_translation_function();
+instance.web._t = new instance.web.TranslationDataBase().build_translation_function();
 /**
  * Lazy translation function, only performs the translation when actually
  * printed (e.g. inserted into a template)
@@ -24,16 +24,16 @@ openerp.web._t = new openerp.web.TranslationDataBase().build_translation_functio
  * @param {String} s string to translate
  * @returns {Object} lazy translation object
  */
-openerp.web._lt = function (s) {
-    return {toString: function () { return openerp.web._t(s); }}
+instance.web._lt = function (s) {
+    return {toString: function () { return instance.web._t(s); }}
 };
-openerp.web.qweb = new QWeb2.Engine();
-openerp.web.qweb.debug = ($.deparam($.param.querystring()).debug != undefined);
-openerp.web.qweb.default_dict = {
+instance.web.qweb = new QWeb2.Engine();
+instance.web.qweb.debug = ($.deparam($.param.querystring()).debug != undefined);
+instance.web.qweb.default_dict = {
     '_' : _,
-    '_t' : openerp.web._t
+    '_t' : instance.web._t
 };
-openerp.web.qweb.preprocess_node = function() {
+instance.web.qweb.preprocess_node = function() {
     // Note that 'this' is the Qweb Node
     switch (this.node.nodeType) {
         case 3:
@@ -47,7 +47,7 @@ openerp.web.qweb.preprocess_node = function() {
             if (ts.length === 0) {
                 return;
             }
-            var tr = openerp.web._t(ts);
+            var tr = instance.web._t(ts);
             if (tr !== ts) {
                 this.node.data = tr;
             }
@@ -57,7 +57,7 @@ openerp.web.qweb.preprocess_node = function() {
             var attr, attrs = ['label', 'title', 'alt'];
             while (attr = attrs.pop()) {
                 if (this.attributes[attr]) {
-                    this.attributes[attr] = openerp.web._t(this.attributes[attr]);
+                    this.attributes[attr] = instance.web._t(this.attributes[attr]);
                 }
             }
     }
@@ -99,8 +99,8 @@ $.Mutex = (function() {
 })();
 
 /** Setup default connection */
-openerp.connection = new openerp.web.Connection();
-openerp.web.qweb.default_dict['__debug__'] = openerp.connection.debug;
+instance.connection = new instance.web.Connection();
+instance.web.qweb.default_dict['__debug__'] = instance.connection.debug;
 
 $.async_when = function() {
     var async = false;
@@ -131,7 +131,7 @@ $.async_when = function() {
 // special tweak for the web client
 var old_async_when = $.async_when;
 $.async_when = function() {
-	if (openerp.connection.synch)
+	if (instance.connection.synch)
 		return $.when.apply(this, arguments);
 	else
 		return old_async_when.apply(this, arguments);

From 0cccd29dcc76f8376d9400141f20e70d668937b9 Mon Sep 17 00:00:00 2001
From: niv-openerp <nicolas.vanhoren@openerp.com>
Date: Tue, 17 Apr 2012 13:55:33 +0200
Subject: [PATCH 125/238] [imp] refactored data.js

bzr revid: nicolas.vanhoren@openerp.com-20120417115533-w0wfyon5fn1kk5jn
---
 addons/web/static/src/js/data.js | 76 ++++++++++++++++----------------
 1 file changed, 38 insertions(+), 38 deletions(-)

diff --git a/addons/web/static/src/js/data.js b/addons/web/static/src/js/data.js
index d9cfc5c4002..4f18a4c53d9 100644
--- a/addons/web/static/src/js/data.js
+++ b/addons/web/static/src/js/data.js
@@ -1,5 +1,5 @@
 
-openerp.web.data = function(openerp) {
+openerp.web.data = function(instance) {
 
 /**
  * Serializes the sort criterion array of a dataset into a form which can be
@@ -8,7 +8,7 @@ openerp.web.data = function(openerp) {
  * @param {Array} criterion array of fields, from first to last criteria, prefixed with '-' for reverse sorting
  * @returns {String} SQL-like sorting string (``ORDER BY``) clause
  */
-openerp.web.serialize_sort = function (criterion) {
+instance.web.serialize_sort = function (criterion) {
     return _.map(criterion,
         function (criteria) {
             if (criteria[0] === '-') {
@@ -18,7 +18,7 @@ openerp.web.serialize_sort = function (criterion) {
         }).join(', ');
 };
 
-openerp.web.DataGroup =  openerp.web.OldWidget.extend( /** @lends openerp.web.DataGroup# */{
+instance.web.DataGroup =  instance.web.OldWidget.extend( /** @lends instance.web.DataGroup# */{
     /**
      * Management interface between views and grouped collections of OpenERP
      * records.
@@ -26,13 +26,13 @@ openerp.web.DataGroup =  openerp.web.OldWidget.extend( /** @lends openerp.web.Da
      * The root DataGroup is instantiated with the relevant information
      * (a session, a model, a domain, a context and a group_by sequence), the
      * domain and context may be empty. It is then interacted with via
-     * :js:func:`~openerp.web.DataGroup.list`, which is used to read the
+     * :js:func:`~instance.web.DataGroup.list`, which is used to read the
      * content of the current grouping level.
      *
-     * @constructs openerp.web.DataGroup
-     * @extends openerp.web.OldWidget
+     * @constructs instance.web.DataGroup
+     * @extends instance.web.OldWidget
      *
-     * @param {openerp.web.OldWidget} parent widget
+     * @param {instance.web.OldWidget} parent widget
      * @param {String} model name of the model managed by this DataGroup
      * @param {Array} domain search domain for this DataGroup
      * @param {Object} context context of the DataGroup's searches
@@ -43,9 +43,9 @@ openerp.web.DataGroup =  openerp.web.OldWidget.extend( /** @lends openerp.web.Da
         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);
+                return new instance.web.ContainerDataGroup( this, model, domain, context, group_by, level);
             } else {
-                return new openerp.web.GrouplessDataGroup( this, model, domain, context, level);
+                return new instance.web.GrouplessDataGroup( this, model, domain, context, level);
             }
         }
 
@@ -57,11 +57,11 @@ openerp.web.DataGroup =  openerp.web.OldWidget.extend( /** @lends openerp.web.Da
     },
     cls: 'DataGroup'
 });
-openerp.web.ContainerDataGroup = openerp.web.DataGroup.extend( /** @lends openerp.web.ContainerDataGroup# */ {
+instance.web.ContainerDataGroup = instance.web.DataGroup.extend( /** @lends instance.web.ContainerDataGroup# */ {
     /**
      *
-     * @constructs openerp.web.ContainerDataGroup
-     * @extends openerp.web.DataGroup
+     * @constructs instance.web.ContainerDataGroup
+     * @extends instance.web.DataGroup
      *
      * @param session
      * @param model
@@ -146,7 +146,7 @@ openerp.web.ContainerDataGroup = openerp.web.DataGroup.extend( /** @lends opener
             domain: this.domain,
             fields: _.uniq(this.group_by.concat(fields)),
             group_by_fields: this.group_by,
-            sort: openerp.web.serialize_sort(this.sort)
+            sort: instance.web.serialize_sort(this.sort)
         }, function () { }).then(function (response) {
             var data_groups = _(response).map(
                     _.bind(self.transform_group, self));
@@ -186,7 +186,7 @@ openerp.web.ContainerDataGroup = openerp.web.DataGroup.extend( /** @lends opener
             ifGroups(_(group_records).map(function (group) {
                 var child_context = _.extend({}, self.context, group.__context);
                 return _.extend(
-                    new openerp.web.DataGroup(
+                    new instance.web.DataGroup(
                         self, self.model, group.__domain,
                         child_context, child_context.group_by,
                         self.level + 1),
@@ -195,11 +195,11 @@ openerp.web.ContainerDataGroup = openerp.web.DataGroup.extend( /** @lends opener
         });
     }
 });
-openerp.web.GrouplessDataGroup = openerp.web.DataGroup.extend( /** @lends openerp.web.GrouplessDataGroup# */ {
+instance.web.GrouplessDataGroup = instance.web.DataGroup.extend( /** @lends instance.web.GrouplessDataGroup# */ {
     /**
      *
-     * @constructs openerp.web.GrouplessDataGroup
-     * @extends openerp.web.DataGroup
+     * @constructs instance.web.GrouplessDataGroup
+     * @extends instance.web.DataGroup
      *
      * @param session
      * @param model
@@ -212,17 +212,17 @@ openerp.web.GrouplessDataGroup = openerp.web.DataGroup.extend( /** @lends opener
     },
     list: function (fields, ifGroups, ifRecords) {
         ifRecords(_.extend(
-            new openerp.web.DataSetSearch(this, this.model),
+            new instance.web.DataSetSearch(this, this.model),
             {domain: this.domain, context: this.context, _sort: this.sort}));
     }
 });
-openerp.web.StaticDataGroup = openerp.web.GrouplessDataGroup.extend( /** @lends openerp.web.StaticDataGroup# */ {
+instance.web.StaticDataGroup = instance.web.GrouplessDataGroup.extend( /** @lends instance.web.StaticDataGroup# */ {
     /**
      * A specialization of groupless data groups, relying on a single static
      * dataset as its records provider.
      *
-     * @constructs openerp.web.StaticDataGroup
-     * @extends openerp.web.GrouplessDataGroup
+     * @constructs instance.web.StaticDataGroup
+     * @extends instance.web.GrouplessDataGroup
      * @param {openep.web.DataSetStatic} dataset a static dataset backing the groups
      */
     init: function (dataset) {
@@ -233,13 +233,13 @@ openerp.web.StaticDataGroup = openerp.web.GrouplessDataGroup.extend( /** @lends
     }
 });
 
-openerp.web.DataSet =  openerp.web.OldWidget.extend( /** @lends openerp.web.DataSet# */{
+instance.web.DataSet =  instance.web.OldWidget.extend( /** @lends instance.web.DataSet# */{
     /**
      * DateaManagement interface between views and the collection of selected
      * OpenERP records (represents the view's state?)
      *
-     * @constructs openerp.web.DataSet
-     * @extends openerp.web.OldWidget
+     * @constructs instance.web.DataSet
+     * @extends instance.web.OldWidget
      *
      * @param {String} model the OpenERP model this dataset will manage
      */
@@ -494,7 +494,7 @@ openerp.web.DataSet =  openerp.web.OldWidget.extend( /** @lends openerp.web.Data
     },
     get_context: function(request_context) {
         if (request_context) {
-            return new openerp.web.CompoundContext(this.context, request_context);
+            return new instance.web.CompoundContext(this.context, request_context);
         }
         return this.context;
     },
@@ -513,7 +513,7 @@ openerp.web.DataSet =  openerp.web.OldWidget.extend( /** @lends openerp.web.Data
      */
     sort: function (field, force_reverse) {
         if (!field) {
-            return openerp.web.serialize_sort(this._sort);
+            return instance.web.serialize_sort(this._sort);
         }
         var reverse = force_reverse || (this._sort[0] === field);
         this._sort.splice.apply(
@@ -530,7 +530,7 @@ openerp.web.DataSet =  openerp.web.OldWidget.extend( /** @lends openerp.web.Data
     	this.ids = n_ids;
     },
 });
-openerp.web.DataSetStatic =  openerp.web.DataSet.extend({
+instance.web.DataSetStatic =  instance.web.DataSet.extend({
     init: function(parent, model, context, ids) {
         this._super(parent, model, context);
         // all local records
@@ -560,10 +560,10 @@ openerp.web.DataSetStatic =  openerp.web.DataSet.extend({
         this.set_ids(_.without.apply(null, [this.ids].concat(ids)));
     }
 });
-openerp.web.DataSetSearch =  openerp.web.DataSet.extend(/** @lends openerp.web.DataSetSearch */{
+instance.web.DataSetSearch =  instance.web.DataSet.extend(/** @lends instance.web.DataSetSearch */{
     /**
-     * @constructs openerp.web.DataSetSearch
-     * @extends openerp.web.DataSet
+     * @constructs instance.web.DataSetSearch
+     * @extends instance.web.DataSet
      *
      * @param {Object} parent
      * @param {String} model
@@ -612,7 +612,7 @@ openerp.web.DataSetSearch =  openerp.web.DataSet.extend(/** @lends openerp.web.D
     },
     get_domain: function (other_domain) {
         if (other_domain) {
-            return new openerp.web.CompoundDomain(this.domain, other_domain);
+            return new instance.web.CompoundDomain(this.domain, other_domain);
         }
         return this.domain;
     },
@@ -635,7 +635,7 @@ openerp.web.DataSetSearch =  openerp.web.DataSet.extend(/** @lends openerp.web.D
         return this._super();
     }
 });
-openerp.web.BufferedDataSet = openerp.web.DataSetStatic.extend({
+instance.web.BufferedDataSet = instance.web.DataSetStatic.extend({
     virtual_id_prefix: "one2many_v_id_",
     debug_mode: true,
     init: function() {
@@ -800,9 +800,9 @@ openerp.web.BufferedDataSet = openerp.web.DataSetStatic.extend({
         this.on_change();
     },
 });
-openerp.web.BufferedDataSet.virtual_id_regex = /^one2many_v_id_.*$/;
+instance.web.BufferedDataSet.virtual_id_regex = /^one2many_v_id_.*$/;
 
-openerp.web.ProxyDataSet = openerp.web.DataSetSearch.extend({
+instance.web.ProxyDataSet = instance.web.DataSetSearch.extend({
     init: function() {
         this._super.apply(this, arguments);
         this.create_function = null;
@@ -848,13 +848,13 @@ openerp.web.ProxyDataSet = openerp.web.DataSetSearch.extend({
     on_unlink: function(ids) {}
 });
 
-openerp.web.Model = openerp.web.CallbackEnabled.extend({
+instance.web.Model = instance.web.CallbackEnabled.extend({
     init: function(model_name) {
         this._super();
         this.model_name = model_name;
     },
     rpc: function() {
-        var c = openerp.connection;
+        var c = instance.connection;
         return c.rpc.apply(c, arguments);
     },
     /*
@@ -876,7 +876,7 @@ openerp.web.Model = openerp.web.CallbackEnabled.extend({
     }
 });
 
-openerp.web.CompoundContext = openerp.web.Class.extend({
+instance.web.CompoundContext = instance.web.Class.extend({
     init: function () {
         this.__ref = "compound_context";
         this.__contexts = [];
@@ -899,7 +899,7 @@ openerp.web.CompoundContext = openerp.web.Class.extend({
     }
 });
 
-openerp.web.CompoundDomain = openerp.web.Class.extend({
+instance.web.CompoundDomain = instance.web.Class.extend({
     init: function () {
         this.__ref = "compound_domain";
         this.__domains = [];

From ac4b895a41a7f10a8d151a2cdf81107dfb04e57a Mon Sep 17 00:00:00 2001
From: niv-openerp <nicolas.vanhoren@openerp.com>
Date: Tue, 17 Apr 2012 13:56:37 +0200
Subject: [PATCH 126/238] [imp] refactored data_export.js

bzr revid: nicolas.vanhoren@openerp.com-20120417115637-533ls7fxw0okk7ly
---
 addons/web/static/src/js/data_export.js | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/addons/web/static/src/js/data_export.js b/addons/web/static/src/js/data_export.js
index 3d15a4e3607..ebe82ddb4b4 100644
--- a/addons/web/static/src/js/data_export.js
+++ b/addons/web/static/src/js/data_export.js
@@ -1,14 +1,14 @@
-openerp.web.data_export = function(openerp) {
-var QWeb = openerp.web.qweb,
-      _t = openerp.web._t;
-openerp.web.DataExport = openerp.web.Dialog.extend({
+openerp.web.data_export = function(instance) {
+var QWeb = instance.web.qweb,
+      _t = instance.web._t;
+instance.web.DataExport = instance.web.Dialog.extend({
     template: 'ExportTreeView',
     dialog_title: {toString: function () { return _t("Export Data"); }},
     init: function(parent, dataset) {
         this._super(parent);
         this.records = {};
         this.dataset = dataset;
-        this.exports = new openerp.web.DataSetSearch(
+        this.exports = new instance.web.DataSetSearch(
             this, 'ir.exports', this.dataset.get_context());
     },
     start: function() {

From d5ae31540905b1e4c4eab5156d0182ddb2dd408d Mon Sep 17 00:00:00 2001
From: niv-openerp <nicolas.vanhoren@openerp.com>
Date: Tue, 17 Apr 2012 13:57:26 +0200
Subject: [PATCH 127/238] [imp] refactored data_import.js

bzr revid: nicolas.vanhoren@openerp.com-20120417115726-5zwzwyp1lzdjxwh7
---
 addons/web/static/src/js/data_import.js | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/addons/web/static/src/js/data_import.js b/addons/web/static/src/js/data_import.js
index 3054a7784c4..30f9323f723 100644
--- a/addons/web/static/src/js/data_import.js
+++ b/addons/web/static/src/js/data_import.js
@@ -1,6 +1,6 @@
-openerp.web.data_import = function(openerp) {
-var QWeb = openerp.web.qweb,
-    _t = openerp.web._t;
+openerp.web.data_import = function(instance) {
+var QWeb = instance.web.qweb,
+    _t = instance.web._t;
 /**
  * Safari does not deal well at all with raw JSON data being returned. As a
  * result, we're going to cheat by using a pseudo-jsonp: instead of getting
@@ -29,7 +29,7 @@ function jsonp(form, attributes, callback) {
     $(form).ajaxSubmit(attributes);
 }
 
-openerp.web.DataImport = openerp.web.Dialog.extend({
+instance.web.DataImport = instance.web.Dialog.extend({
     template: 'ImportDataView',
     dialog_title: {toString: function () { return _t("Import Data"); }},
     init: function(parent, dataset){
@@ -79,10 +79,10 @@ openerp.web.DataImport = openerp.web.Dialog.extend({
         this.$element.delegate('fieldset legend', 'click', function() {
             $(this).parent().toggleClass('oe-closed');
         });
-        this.ready.push(new openerp.web.DataSet(this, this.model).call(
+        this.ready.push(new instance.web.DataSet(this, this.model).call(
             'fields_get', [], function (fields) {
                 self.graft_fields(fields);
-                self.ready.push(new openerp.web.DataSet(self, self.model)
+                self.ready.push(new instance.web.DataSet(self, self.model)
                         .default_get(_.pluck(self.fields, 'id')).then(function (fields) {
                     _.each(fields, function(val, key) {
                         if (val) {
@@ -140,7 +140,7 @@ openerp.web.DataImport = openerp.web.Dialog.extend({
                 f.fields = [];
                 // only fetch sub-fields to a depth of 2 levels
                 if (level < 2) {
-                    self.ready.push(new openerp.web.DataSet(self, field.relation).call(
+                    self.ready.push(new instance.web.DataSet(self, field.relation).call(
                         'fields_get', [], function (fields) {
                             self.graft_fields(fields, f, level+1);
                     }));
@@ -151,7 +151,7 @@ openerp.web.DataImport = openerp.web.Dialog.extend({
         });
     },
     toggle_import_button: function (newstate) {
-    	openerp.web.dialog(this.$element, 'widget')
+    	instance.web.dialog(this.$element, 'widget')
                 .find('.oe-dialog-import-button')
                 .button('option', 'disabled', !newstate);
     },

From abd76257a9cdd858d6f8a00218428a93e6e4be1a Mon Sep 17 00:00:00 2001
From: niv-openerp <nicolas.vanhoren@openerp.com>
Date: Tue, 17 Apr 2012 13:58:05 +0200
Subject: [PATCH 128/238] [imp] refactored dates.js

bzr revid: nicolas.vanhoren@openerp.com-20120417115805-z74z6sqdzwkvj0kw
---
 addons/web/static/src/js/dates.js | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/addons/web/static/src/js/dates.js b/addons/web/static/src/js/dates.js
index d61223113f8..3db48c8412a 100644
--- a/addons/web/static/src/js/dates.js
+++ b/addons/web/static/src/js/dates.js
@@ -1,5 +1,5 @@
 
-openerp.web.dates = function(openerp) {
+openerp.web.dates = function(instance) {
 
 /**
  * Converts a string to a Date javascript object using OpenERP's
@@ -11,7 +11,7 @@ openerp.web.dates = function(openerp) {
  * @param {String} str A string representing a datetime.
  * @returns {Date}
  */
-openerp.web.str_to_datetime = function(str) {
+instance.web.str_to_datetime = function(str) {
     if(!str) {
         return str;
     }
@@ -38,7 +38,7 @@ openerp.web.str_to_datetime = function(str) {
  * @param {String} str A string representing a date.
  * @returns {Date}
  */
-openerp.web.str_to_date = function(str) {
+instance.web.str_to_date = function(str) {
     if(!str) {
         return str;
     }
@@ -65,7 +65,7 @@ openerp.web.str_to_date = function(str) {
  * @param {String} str A string representing a time.
  * @returns {Date}
  */
-openerp.web.str_to_time = function(str) {
+instance.web.str_to_time = function(str) {
     if(!str) {
         return str;
     }
@@ -104,7 +104,7 @@ var zpad = function(str, size) {
  * @param {Date} obj
  * @returns {String} A string representing a datetime.
  */
-openerp.web.datetime_to_str = function(obj) {
+instance.web.datetime_to_str = function(obj) {
     if (!obj) {
         return false;
     }
@@ -124,7 +124,7 @@ openerp.web.datetime_to_str = function(obj) {
  * @param {Date} obj
  * @returns {String} A string representing a date.
  */
-openerp.web.date_to_str = function(obj) {
+instance.web.date_to_str = function(obj) {
     if (!obj) {
         return false;
     }
@@ -143,7 +143,7 @@ openerp.web.date_to_str = function(obj) {
  * @param {Date} obj
  * @returns {String} A string representing a time.
  */
-openerp.web.time_to_str = function(obj) {
+instance.web.time_to_str = function(obj) {
     if (!obj) {
         return false;
     }

From 753fac33ced1574c231d4cb3a693b47eba1f3c49 Mon Sep 17 00:00:00 2001
From: niv-openerp <nicolas.vanhoren@openerp.com>
Date: Tue, 17 Apr 2012 13:59:16 +0200
Subject: [PATCH 129/238] [imp] refactored formats.js

bzr revid: nicolas.vanhoren@openerp.com-20120417115916-k57s4rh3wmbajzyz
---
 addons/web/static/src/js/formats.js | 82 ++++++++++++++---------------
 1 file changed, 41 insertions(+), 41 deletions(-)

diff --git a/addons/web/static/src/js/formats.js b/addons/web/static/src/js/formats.js
index 53863e63e97..107a923b625 100644
--- a/addons/web/static/src/js/formats.js
+++ b/addons/web/static/src/js/formats.js
@@ -1,6 +1,6 @@
 
-openerp.web.formats = function(openerp) {
-var _t = openerp.web._t;
+openerp.web.formats = function(instance) {
+var _t = instance.web._t;
 
 /**
  * Intersperses ``separator`` in ``str`` at the positions indicated by
@@ -23,7 +23,7 @@ var _t = openerp.web._t;
  * @param {String} separator
  * @returns {String}
  */
-openerp.web.intersperse = function (str, indices, separator) {
+instance.web.intersperse = function (str, indices, separator) {
     separator = separator || '';
     var result = [], last = str.length;
 
@@ -55,10 +55,10 @@ openerp.web.intersperse = function (str, indices, separator) {
  * @param {String} num
  * @returns {String}
  */
-openerp.web.insert_thousand_seps = function (num) {
+instance.web.insert_thousand_seps = function (num) {
     var negative = num[0] === '-';
     num = (negative ? num.slice(1) : num);
-    return (negative ? '-' : '') + openerp.web.intersperse(
+    return (negative ? '-' : '') + instance.web.intersperse(
         num, _t.database.parameters.grouping, _t.database.parameters.thousands_sep);
 };
 
@@ -69,7 +69,7 @@ openerp.web.insert_thousand_seps = function (num) {
  *
  * @param {String} value original format
  */
-openerp.web.strip_raw_chars = function (value) {
+instance.web.strip_raw_chars = function (value) {
     var isletter = /[a-zA-Z]/, output = [];
     for(var index=0; index < value.length; ++index) {
         var character = value[index];
@@ -81,7 +81,7 @@ openerp.web.strip_raw_chars = function (value) {
     return output.join('');
 };
 var normalize_format = function (format) {
-    return Date.normalizeFormat(openerp.web.strip_raw_chars(format));
+    return Date.normalizeFormat(instance.web.strip_raw_chars(format));
 };
 /**
  * Formats a single atomic value based on a field descriptor
@@ -93,7 +93,7 @@ var normalize_format = function (format) {
  * @param {Object} [descriptor.digits] used for the formatting of floats
  * @param {String} [value_if_empty=''] returned if the ``value`` argument is considered empty
  */
-openerp.web.format_value = function (value, descriptor, value_if_empty) {
+instance.web.format_value = function (value, descriptor, value_if_empty) {
     // If NaN value, display as with a `false` (empty cell)
     if (typeof value === 'number' && isNaN(value)) {
         value = false;
@@ -115,12 +115,12 @@ openerp.web.format_value = function (value, descriptor, value_if_empty) {
         case 'id':
             return value.toString();
         case 'integer':
-            return openerp.web.insert_thousand_seps(
+            return instance.web.insert_thousand_seps(
                 _.str.sprintf('%d', value));
         case 'float':
             var precision = descriptor.digits ? descriptor.digits[1] : 2;
             var formatted = _.str.sprintf('%.' + precision + 'f', value).split('.');
-            formatted[0] = openerp.web.insert_thousand_seps(formatted[0]);
+            formatted[0] = instance.web.insert_thousand_seps(formatted[0]);
             return formatted.join(l10n.decimal_point);
         case 'float_time':
             var pattern = '%02d:%02d';
@@ -136,17 +136,17 @@ openerp.web.format_value = function (value, descriptor, value_if_empty) {
             return value[1];
         case 'datetime':
             if (typeof(value) == "string")
-                value = openerp.web.auto_str_to_date(value);
+                value = instance.web.auto_str_to_date(value);
 
             return value.toString(normalize_format(l10n.date_format)
                         + ' ' + normalize_format(l10n.time_format));
         case 'date':
             if (typeof(value) == "string")
-                value = openerp.web.auto_str_to_date(value);
+                value = instance.web.auto_str_to_date(value);
             return value.toString(normalize_format(l10n.date_format));
         case 'time':
             if (typeof(value) == "string")
-                value = openerp.web.auto_str_to_date(value);
+                value = instance.web.auto_str_to_date(value);
             return value.toString(normalize_format(l10n.time_format));
         case 'selection': case 'statusbar':
             // Each choice is [value, label]
@@ -163,7 +163,7 @@ openerp.web.format_value = function (value, descriptor, value_if_empty) {
     }
 };
 
-openerp.web.parse_value = function (value, descriptor, value_if_empty) {
+instance.web.parse_value = function (value, descriptor, value_if_empty) {
     var date_pattern = normalize_format(_t.database.parameters.date_format),
         time_pattern = normalize_format(_t.database.parameters.time_format);
     switch (value) {
@@ -176,7 +176,7 @@ openerp.web.parse_value = function (value, descriptor, value_if_empty) {
             var tmp;
             do {
                 tmp = value;
-                value = value.replace(openerp.web._t.database.parameters.thousands_sep, "");
+                value = value.replace(instance.web._t.database.parameters.thousands_sep, "");
             } while(tmp !== value);
             tmp = Number(value);
             if (isNaN(tmp))
@@ -190,9 +190,9 @@ openerp.web.parse_value = function (value, descriptor, value_if_empty) {
             var tmp2 = value;
             do {
                 tmp = tmp2;
-                tmp2 = tmp.replace(openerp.web._t.database.parameters.thousands_sep, "");
+                tmp2 = tmp.replace(instance.web._t.database.parameters.thousands_sep, "");
             } while(tmp !== tmp2);
-            var reformatted_value = tmp.replace(openerp.web._t.database.parameters.decimal_point, ".");
+            var reformatted_value = tmp.replace(instance.web._t.database.parameters.decimal_point, ".");
             var parsed = Number(reformatted_value);
             if (isNaN(parsed))
                 throw new Error(value + " is not a correct float");
@@ -205,62 +205,62 @@ openerp.web.parse_value = function (value, descriptor, value_if_empty) {
             }
             var float_time_pair = value.split(":");
             if (float_time_pair.length != 2)
-                return factor * openerp.web.parse_value(value, {type: "float"});
-            var hours = openerp.web.parse_value(float_time_pair[0], {type: "integer"});
-            var minutes = openerp.web.parse_value(float_time_pair[1], {type: "integer"});
+                return factor * instance.web.parse_value(value, {type: "float"});
+            var hours = instance.web.parse_value(float_time_pair[0], {type: "integer"});
+            var minutes = instance.web.parse_value(float_time_pair[1], {type: "integer"});
             return factor * (hours + (minutes / 60));
         case 'progressbar':
-            return openerp.web.parse_value(value, {type: "float"});
+            return instance.web.parse_value(value, {type: "float"});
         case 'datetime':
             var datetime = Date.parseExact(
                     value, (date_pattern + ' ' + time_pattern));
             if (datetime !== null)
-                return openerp.web.datetime_to_str(datetime);
+                return instance.web.datetime_to_str(datetime);
             datetime = Date.parse(value);
             if (datetime !== null)
-                return openerp.web.datetime_to_str(datetime);
+                return instance.web.datetime_to_str(datetime);
             throw new Error(value + " is not a valid datetime");
         case 'date':
             var date = Date.parseExact(value, date_pattern);
             if (date !== null)
-                return openerp.web.date_to_str(date);
+                return instance.web.date_to_str(date);
             date = Date.parse(value);
             if (date !== null)
-                return openerp.web.date_to_str(date);
+                return instance.web.date_to_str(date);
             throw new Error(value + " is not a valid date");
         case 'time':
             var time = Date.parseExact(value, time_pattern);
             if (time !== null)
-                return openerp.web.time_to_str(time);
+                return instance.web.time_to_str(time);
             time = Date.parse(value);
             if (time !== null)
-                return openerp.web.time_to_str(time);
+                return instance.web.time_to_str(time);
             throw new Error(value + " is not a valid time");
     }
     return value;
 };
 
-openerp.web.auto_str_to_date = function(value, type) {
+instance.web.auto_str_to_date = function(value, type) {
     try {
-        return openerp.web.str_to_datetime(value);
+        return instance.web.str_to_datetime(value);
     } catch(e) {}
     try {
-        return openerp.web.str_to_date(value);
+        return instance.web.str_to_date(value);
     } catch(e) {}
     try {
-        return openerp.web.str_to_time(value);
+        return instance.web.str_to_time(value);
     } catch(e) {}
     throw new Error("'" + value + "' is not a valid date, datetime nor time");
 };
 
-openerp.web.auto_date_to_str = function(value, type) {
+instance.web.auto_date_to_str = function(value, type) {
     switch(type) {
         case 'datetime':
-            return openerp.web.datetime_to_str(value);
+            return instance.web.datetime_to_str(value);
         case 'date':
-            return openerp.web.date_to_str(value);
+            return instance.web.date_to_str(value);
         case 'time':
-            return openerp.web.time_to_str(value);
+            return instance.web.time_to_str(value);
         default:
             throw new Error(type + " is not convertible to date, datetime nor time");
     }
@@ -290,7 +290,7 @@ openerp.web.auto_date_to_str = function(value, type) {
  * @param {Number} [options.id] current record's id
  *
  */
-openerp.web.format_cell = function (row_data, column, options) {
+instance.web.format_cell = function (row_data, column, options) {
     options = options || {};
     var attrs = {};
     if (options.process_modifiers !== false) {
@@ -303,9 +303,9 @@ openerp.web.format_cell = function (row_data, column, options) {
             '<img src="<%-prefix%>/web/static/src/img/icons/<%-icon%>.png" alt="<%-alt%>"/>' +
             '</button>', {
                 title: column.string || '',
-                additional_attributes: isNaN(row_data["id"].value) && openerp.web.BufferedDataSet.virtual_id_regex.test(row_data["id"].value) ?
+                additional_attributes: isNaN(row_data["id"].value) && instance.web.BufferedDataSet.virtual_id_regex.test(row_data["id"].value) ?
                     'disabled="disabled" class="oe-listview-button-disabled"' : '',
-                prefix: openerp.connection.prefix,
+                prefix: instance.connection.prefix,
                 icon: column.icon,
                 alt: column.string || ''
             });
@@ -320,11 +320,11 @@ openerp.web.format_cell = function (row_data, column, options) {
                  row_data[column.id].value ? 'checked="checked"' : '');
     case "binary":
         var text = _t("Download"),
-            download_url = _.str.sprintf('/web/binary/saveas?session_id=%s&model=%s&field=%s&id=%d', openerp.connection.session_id, options.model, column.id, options.id);
+            download_url = _.str.sprintf('/web/binary/saveas?session_id=%s&model=%s&field=%s&id=%d', instance.connection.session_id, options.model, column.id, options.id);
         if (column.filename) {
             download_url += '&filename_field=' + column.filename;
             if (row_data[column.filename]) {
-                text = _.str.sprintf(_t("Download \"%s\""), openerp.web.format_value(
+                text = _.str.sprintf(_t("Download \"%s\""), instance.web.format_value(
                         row_data[column.filename].value, {type: 'char'}));
             }
         }
@@ -340,7 +340,7 @@ openerp.web.format_cell = function (row_data, column, options) {
             });
     }
 
-    return _.escape(openerp.web.format_value(
+    return _.escape(instance.web.format_value(
             row_data[column.id].value, column, options.value_if_empty));
 }
 

From 827964936f77b1edcc81d011986932bdd908ee1e Mon Sep 17 00:00:00 2001
From: niv-openerp <nicolas.vanhoren@openerp.com>
Date: Tue, 17 Apr 2012 14:02:10 +0200
Subject: [PATCH 130/238] [imp] refactored search.js

bzr revid: nicolas.vanhoren@openerp.com-20120417120210-kejvstgamtpufbeq
---
 addons/web/static/src/js/search.js | 262 ++++++++++++++---------------
 1 file changed, 131 insertions(+), 131 deletions(-)

diff --git a/addons/web/static/src/js/search.js b/addons/web/static/src/js/search.js
index 6e1026b48a1..18ac6b78de5 100644
--- a/addons/web/static/src/js/search.js
+++ b/addons/web/static/src/js/search.js
@@ -1,7 +1,7 @@
-openerp.web.search = function(openerp) {
-var QWeb = openerp.web.qweb,
-      _t =  openerp.web._t,
-     _lt = openerp.web._lt;
+openerp.web.search = function(instance) {
+var QWeb = instance.web.qweb,
+      _t =  instance.web._t,
+     _lt = instance.web._lt;
 _.mixin({
     sum: function (obj) { return _.reduce(obj, function (a, b) { return a + b; }, 0); }
 });
@@ -70,11 +70,11 @@ _.extend(VS.model.SearchFacet.prototype, {
     }
 });
 
-openerp.web.SearchView = openerp.web.Widget.extend(/** @lends openerp.web.SearchView# */{
+instance.web.SearchView = instance.web.Widget.extend(/** @lends instance.web.SearchView# */{
     template: "SearchView",
     /**
-     * @constructs openerp.web.SearchView
-     * @extends openerp.web.OldWidget
+     * @constructs instance.web.SearchView
+     * @extends instance.web.OldWidget
      *
      * @param parent
      * @param element_id
@@ -178,7 +178,7 @@ openerp.web.SearchView = openerp.web.Widget.extend(/** @lends openerp.web.Search
 
         var running_count = 0;
         // get total filters count
-        var is_group = function (i) { return i instanceof openerp.web.search.FilterGroup; };
+        var is_group = function (i) { return i instanceof instance.web.search.FilterGroup; };
         var filters_count = _(this.controls).chain()
             .flatten()
             .filter(is_group)
@@ -212,12 +212,12 @@ openerp.web.SearchView = openerp.web.Widget.extend(/** @lends openerp.web.Search
             name: _t("Custom Filters"),
             filters: _.map(this.custom_filters, function (filter) {
                 // FIXME: handling of ``disabled`` being set
-                var f = new openerp.web.search.Filter({attrs: {
+                var f = new instance.web.search.Filter({attrs: {
                     string: filter.name,
                     context: filter.context,
                     domain: filter.domain
                 }}, self);
-                return new openerp.web.search.FilterGroup([f], self);
+                return new instance.web.search.FilterGroup([f], self);
             }),
             length: 3
         });
@@ -225,7 +225,7 @@ openerp.web.SearchView = openerp.web.Widget.extend(/** @lends openerp.web.Search
         return $.when(
             this.render_column(col1, $('<div>').appendTo($filters)),
             this.render_column(col2, $('<div>').appendTo($filters)),
-            (new openerp.web.search.Advanced(this).appendTo($drawer)));
+            (new instance.web.search.Advanced(this).appendTo($drawer)));
     },
     render_column: function (column, $el) {
         return $.when.apply(null, _(column).map(function (group) {
@@ -314,10 +314,10 @@ openerp.web.SearchView = openerp.web.Widget.extend(/** @lends openerp.web.Search
      * @param {VS.model.SearchFacet} options.model facet object to render
      */
     make_visualsearch_facet: function (options) {
-        return new openerp.web.search.FilterGroupFacet(options);
+        return new instance.web.search.FilterGroupFacet(options);
 
-//        if (options.model.get('field') instanceof openerp.web.search.FilterGroup) {
-//            return new openerp.web.search.FilterGroupFacet(options);
+//        if (options.model.get('field') instanceof instance.web.search.FilterGroup) {
+//            return new instance.web.search.FilterGroupFacet(options);
 //        }
 //        return new VS.ui.SearchFacet(options);
     },
@@ -363,7 +363,7 @@ openerp.web.SearchView = openerp.web.Widget.extend(/** @lends openerp.web.Search
         var filters = [];
         _.each(items, function (item) {
             if (filters.length && item.tag !== 'filter') {
-                group.push(new openerp.web.search.FilterGroup(filters, this));
+                group.push(new instance.web.search.FilterGroup(filters, this));
                 filters = [];
             }
 
@@ -371,7 +371,7 @@ openerp.web.SearchView = openerp.web.Widget.extend(/** @lends openerp.web.Search
             case 'separator': case 'newline':
                 break;
             case 'filter':
-                filters.push(new openerp.web.search.Filter(item, this));
+                filters.push(new instance.web.search.Filter(item, this));
                 break;
             case 'group':
                 self.make_widgets(item.children, fields, item.attrs.string);
@@ -385,7 +385,7 @@ openerp.web.SearchView = openerp.web.Widget.extend(/** @lends openerp.web.Search
         }, this);
 
         if (filters.length) {
-            group.push(new openerp.web.search.FilterGroup(filters, this));
+            group.push(new instance.web.search.FilterGroup(filters, this));
         }
     },
     /**
@@ -394,10 +394,10 @@ openerp.web.SearchView = openerp.web.Widget.extend(/** @lends openerp.web.Search
      *
      * @param {Object} item fields_view_get node for the field
      * @param {Object} field fields_get result for the field
-     * @returns openerp.web.search.Field
+     * @returns instance.web.search.Field
      */
     make_field: function (item, field) {
-        var obj = openerp.web.search.fields.get_any( [item.attrs.widget, field.type]);
+        var obj = instance.web.search.fields.get_any( [item.attrs.widget, field.type]);
         if(obj) {
             return new (obj) (item, field, this);
         } else {
@@ -460,11 +460,11 @@ openerp.web.SearchView = openerp.web.Widget.extend(/** @lends openerp.web.Search
             break;
         case 'save_filter':
             var data = this.build_search_data();
-            var context = new openerp.web.CompoundContext();
+            var context = new instance.web.CompoundContext();
             _.each(data.contexts, function(x) {
                 context.add(x);
             });
-            var domain = new openerp.web.CompoundDomain();
+            var domain = new instance.web.CompoundDomain();
             _.each(data.domains, function(x) {
                 domain.add(x);
             });
@@ -472,7 +472,7 @@ openerp.web.SearchView = openerp.web.Widget.extend(/** @lends openerp.web.Search
             context.add({"group_by": groupbys});
             var dial_html = QWeb.render("SearchView.managed-filters.add");
             var $dial = $(dial_html);
-            openerp.web.dialog($dial, {
+            instance.web.dialog($dial, {
                 modal: true,
                 title: _t("Filter Entry"),
                 buttons: [
@@ -525,13 +525,13 @@ openerp.web.SearchView = openerp.web.Widget.extend(/** @lends openerp.web.Search
     on_add_to_dashboard: function() {
         this.$element.find(".oe_search-view-filters-management")[0].selectedIndex = 0;
         var self = this,
-            menu = openerp.webclient.menu,
+            menu = instance.webclient.menu,
             $dialog = $(QWeb.render("SearchView.add_to_dashboard", {
                 dashboards : menu.data.data.children,
                 selected_menu_id : menu.$element.find('a.active').data('menu')
             }));
         $dialog.find('input').val(this.fields_view.name);
-        openerp.web.dialog($dialog, {
+        instance.web.dialog($dialog, {
             modal: true,
             title: _t("Add to Dashboard"),
             buttons: [
@@ -543,8 +543,8 @@ openerp.web.SearchView = openerp.web.Widget.extend(/** @lends openerp.web.Search
                     var menu_id = $(this).find("select").val(),
                         title = $(this).find("input").val(),
                         data = self.build_search_data(),
-                        context = new openerp.web.CompoundContext(),
-                        domain = new openerp.web.CompoundDomain();
+                        context = new instance.web.CompoundContext(),
+                        domain = new instance.web.CompoundDomain();
                     _.each(data.contexts, function(x) {
                         context.add(x);
                     });
@@ -573,10 +573,10 @@ openerp.web.SearchView = openerp.web.Widget.extend(/** @lends openerp.web.Search
      * Performs the search view collection of widget data.
      *
      * If the collection went well (all fields are valid), then triggers
-     * :js:func:`openerp.web.SearchView.on_search`.
+     * :js:func:`instance.web.SearchView.on_search`.
      *
      * If at least one field failed its validation, triggers
-     * :js:func:`openerp.web.SearchView.on_invalid` instead.
+     * :js:func:`instance.web.SearchView.on_invalid` instead.
      *
      * @param e jQuery event object coming from the "Search" button
      */
@@ -599,7 +599,7 @@ openerp.web.SearchView = openerp.web.Widget.extend(/** @lends openerp.web.Search
                     groupbys.push.apply(groupbys, group_by);
                 }
             } catch (e) {
-                if (e instanceof openerp.web.search.Invalid) {
+                if (e instanceof instance.web.search.Invalid) {
                     errors.push(e);
                 } else {
                     throw e;
@@ -648,9 +648,9 @@ openerp.web.SearchView = openerp.web.Widget.extend(/** @lends openerp.web.Search
 });
 
 /** @namespace */
-openerp.web.search = {};
+instance.web.search = {};
 
-openerp.web.search.FilterGroupFacet = VS.ui.SearchFacet.extend({
+instance.web.search.FilterGroupFacet = VS.ui.SearchFacet.extend({
     events: _.extend({
         'click': 'selectFacet'
     }, VS.ui.SearchFacet.prototype.events),
@@ -682,30 +682,30 @@ openerp.web.search.FilterGroupFacet = VS.ui.SearchFacet.extend({
     }
 });
 /**
- * Registry of search fields, called by :js:class:`openerp.web.SearchView` to
+ * Registry of search fields, called by :js:class:`instance.web.SearchView` to
  * find and instantiate its field widgets.
  */
-openerp.web.search.fields = new openerp.web.Registry({
-    'char': 'openerp.web.search.CharField',
-    'text': 'openerp.web.search.CharField',
-    'boolean': 'openerp.web.search.BooleanField',
-    'integer': 'openerp.web.search.IntegerField',
-    'id': 'openerp.web.search.IntegerField',
-    'float': 'openerp.web.search.FloatField',
-    'selection': 'openerp.web.search.SelectionField',
-    'datetime': 'openerp.web.search.DateTimeField',
-    'date': 'openerp.web.search.DateField',
-    'many2one': 'openerp.web.search.ManyToOneField',
-    'many2many': 'openerp.web.search.CharField',
-    'one2many': 'openerp.web.search.CharField'
+instance.web.search.fields = new instance.web.Registry({
+    'char': 'instance.web.search.CharField',
+    'text': 'instance.web.search.CharField',
+    'boolean': 'instance.web.search.BooleanField',
+    'integer': 'instance.web.search.IntegerField',
+    'id': 'instance.web.search.IntegerField',
+    'float': 'instance.web.search.FloatField',
+    'selection': 'instance.web.search.SelectionField',
+    'datetime': 'instance.web.search.DateTimeField',
+    'date': 'instance.web.search.DateField',
+    'many2one': 'instance.web.search.ManyToOneField',
+    'many2many': 'instance.web.search.CharField',
+    'one2many': 'instance.web.search.CharField'
 });
-openerp.web.search.Invalid = openerp.web.Class.extend( /** @lends openerp.web.search.Invalid# */{
+instance.web.search.Invalid = instance.web.Class.extend( /** @lends instance.web.search.Invalid# */{
     /**
      * Exception thrown by search widgets when they hold invalid values,
      * which they can not return when asked.
      *
-     * @constructs openerp.web.search.Invalid
-     * @extends openerp.web.Class
+     * @constructs instance.web.search.Invalid
+     * @extends instance.web.Class
      *
      * @param field the name of the field holding an invalid value
      * @param value the invalid value
@@ -723,13 +723,13 @@ openerp.web.search.Invalid = openerp.web.Class.extend( /** @lends openerp.web.se
         );
     }
 });
-openerp.web.search.Widget = openerp.web.OldWidget.extend( /** @lends openerp.web.search.Widget# */{
+instance.web.search.Widget = instance.web.OldWidget.extend( /** @lends instance.web.search.Widget# */{
     template: null,
     /**
      * Root class of all search widgets
      *
-     * @constructs openerp.web.search.Widget
-     * @extends openerp.web.OldWidget
+     * @constructs instance.web.search.Widget
+     * @extends instance.web.OldWidget
      *
      * @param view the ancestor view of this widget
      */
@@ -738,14 +738,14 @@ openerp.web.search.Widget = openerp.web.OldWidget.extend( /** @lends openerp.web
         this.view = view;
     }
 });
-openerp.web.search.add_expand_listener = function($root) {
+instance.web.search.add_expand_listener = function($root) {
     $root.find('a.searchview_group_string').click(function (e) {
         $root.toggleClass('folded expanded');
         e.stopPropagation();
         e.preventDefault();
     });
 };
-openerp.web.search.Group = openerp.web.search.Widget.extend({
+instance.web.search.Group = instance.web.search.Widget.extend({
     template: 'SearchView.group',
     init: function (view_section, view, fields) {
         this._super(view);
@@ -755,10 +755,10 @@ openerp.web.search.Group = openerp.web.search.Widget.extend({
     }
 });
 
-openerp.web.search.Input = openerp.web.search.Widget.extend( /** @lends openerp.web.search.Input# */{
+instance.web.search.Input = instance.web.search.Widget.extend( /** @lends instance.web.search.Input# */{
     /**
-     * @constructs openerp.web.search.Input
-     * @extends openerp.web.search.Widget
+     * @constructs instance.web.search.Input
+     * @extends instance.web.search.Widget
      *
      * @param view
      */
@@ -784,7 +784,7 @@ openerp.web.search.Input = openerp.web.search.Widget.extend( /** @lends openerp.
      * they apply to this widget, or null if they don't.
      *
      * This default implementation will try calling
-     * :js:func:`openerp.web.search.Input#facet_for` if the widget's name
+     * :js:func:`instance.web.search.Input#facet_for` if the widget's name
      * matches the input key
      *
      * @param {Object} defaults
@@ -820,17 +820,17 @@ openerp.web.search.Input = openerp.web.search.Widget.extend( /** @lends openerp.
         this.attrs = attrs;
     }
 });
-openerp.web.search.FilterGroup = openerp.web.search.Input.extend(/** @lends openerp.web.search.FilterGroup# */{
+instance.web.search.FilterGroup = instance.web.search.Input.extend(/** @lends instance.web.search.FilterGroup# */{
     template: 'SearchView.filters',
     /**
      * Inclusive group of filters, creates a continuous "button" with clickable
      * sections (the normal display for filters is to be a self-contained button)
      *
-     * @constructs openerp.web.search.FilterGroup
-     * @extends openerp.web.search.Input
+     * @constructs instance.web.search.FilterGroup
+     * @extends instance.web.search.Input
      *
-     * @param {Array<openerp.web.search.Filter>} filters elements of the group
-     * @param {openerp.web.SearchView} view view in which the filters are contained
+     * @param {Array<instance.web.search.Filter>} filters elements of the group
+     * @param {instance.web.SearchView} view view in which the filters are contained
      */
     init: function (filters, view) {
         this._super(view);
@@ -868,7 +868,7 @@ openerp.web.search.FilterGroup = openerp.web.search.Input.extend(/** @lends open
 
         if (!contexts.length) { return; }
         if (contexts.length === 1) { return contexts[0]; }
-        return _.extend(new openerp.web.CompoundContext, {
+        return _.extend(new instance.web.CompoundContext, {
             __contexts: contexts
         });
     },
@@ -901,7 +901,7 @@ openerp.web.search.FilterGroup = openerp.web.search.Input.extend(/** @lends open
         for (var i=domains.length; --i;) {
             domains.unshift(['|']);
         }
-        return _.extend(new openerp.web.CompoundDomain(), {
+        return _.extend(new instance.web.CompoundDomain(), {
             __domains: domains
         });
     },
@@ -945,7 +945,7 @@ openerp.web.search.FilterGroup = openerp.web.search.Input.extend(/** @lends open
         });
     }
 });
-openerp.web.search.Filter = openerp.web.search.Input.extend(/** @lends openerp.web.search.Filter# */{
+instance.web.search.Filter = instance.web.search.Input.extend(/** @lends instance.web.search.Filter# */{
     template: 'SearchView.filter',
     /**
      * Implementation of the OpenERP filters (button with a context and/or
@@ -955,8 +955,8 @@ openerp.web.search.Filter = openerp.web.search.Input.extend(/** @lends openerp.w
      * domains and contexts, converting between facets and filters) is
      * performed by the filter group.
      *
-     * @constructs openerp.web.search.Filter
-     * @extends openerp.web.search.Input
+     * @constructs instance.web.search.Filter
+     * @extends instance.web.search.Input
      *
      * @param node
      * @param view
@@ -969,12 +969,12 @@ openerp.web.search.Filter = openerp.web.search.Input.extend(/** @lends openerp.w
     get_context: function () { },
     get_domain: function () { },
 });
-openerp.web.search.Field = openerp.web.search.Input.extend( /** @lends openerp.web.search.Field# */ {
+instance.web.search.Field = instance.web.search.Input.extend( /** @lends instance.web.search.Field# */ {
     template: 'SearchView.field',
     default_operator: '=',
     /**
-     * @constructs openerp.web.search.Field
-     * @extends openerp.web.search.Input
+     * @constructs instance.web.search.Field
+     * @extends instance.web.search.Input
      *
      * @param view_section
      * @param field
@@ -1005,7 +1005,7 @@ openerp.web.search.Field = openerp.web.search.Input.extend( /** @lends openerp.w
         if (!(has_value && context)) {
             return;
         }
-        return new openerp.web.CompoundContext(context)
+        return new instance.web.CompoundContext(context)
                 .set_eval_context({self: val});
     },
     get_groupby: function () { },
@@ -1036,7 +1036,7 @@ openerp.web.search.Field = openerp.web.search.Input.extend( /** @lends openerp.w
                 this.attrs.operator || this.default_operator,
                 facet);
         }
-        return new openerp.web.CompoundDomain(domain)
+        return new instance.web.CompoundDomain(domain)
                 .set_eval_context({self: val});
     }
 });
@@ -1048,9 +1048,9 @@ openerp.web.search.Field = openerp.web.search.Input.extend( /** @lends openerp.w
  * * The Javascript and the HTML values are identical (strings)
  *
  * @class
- * @extends openerp.web.search.Field
+ * @extends instance.web.search.Field
  */
-openerp.web.search.CharField = openerp.web.search.Field.extend( /** @lends openerp.web.search.CharField# */ {
+instance.web.search.CharField = instance.web.search.Field.extend( /** @lends instance.web.search.CharField# */ {
     default_operator: 'ilike',
     complete: function (value) {
         if (_.isEmpty(value)) { return $.when(null); }
@@ -1066,7 +1066,7 @@ openerp.web.search.CharField = openerp.web.search.Field.extend( /** @lends opene
         }]);
     }
 });
-openerp.web.search.NumberField = openerp.web.search.Field.extend(/** @lends openerp.web.search.NumberField# */{
+instance.web.search.NumberField = instance.web.search.Field.extend(/** @lends instance.web.search.NumberField# */{
     get_value: function () {
         if (!this.$element.val()) {
             return null;
@@ -1075,7 +1075,7 @@ openerp.web.search.NumberField = openerp.web.search.Field.extend(/** @lends open
           check = Number(this.$element.val());
         if (isNaN(val) || val !== check) {
             this.$element.addClass('error');
-            throw new openerp.web.search.Invalid(
+            throw new instance.web.search.Invalid(
                 this.attrs.name, this.$element.val(), this.error_message);
         }
         this.$element.removeClass('error');
@@ -1084,13 +1084,13 @@ openerp.web.search.NumberField = openerp.web.search.Field.extend(/** @lends open
 });
 /**
  * @class
- * @extends openerp.web.search.NumberField
+ * @extends instance.web.search.NumberField
  */
-openerp.web.search.IntegerField = openerp.web.search.NumberField.extend(/** @lends openerp.web.search.IntegerField# */{
+instance.web.search.IntegerField = instance.web.search.NumberField.extend(/** @lends instance.web.search.IntegerField# */{
     error_message: _t("not a valid integer"),
     parse: function (value) {
         try {
-            return openerp.web.parse_value(value, {'widget': 'integer'});
+            return instance.web.parse_value(value, {'widget': 'integer'});
         } catch (e) {
             return NaN;
         }
@@ -1098,13 +1098,13 @@ openerp.web.search.IntegerField = openerp.web.search.NumberField.extend(/** @len
 });
 /**
  * @class
- * @extends openerp.web.search.NumberField
+ * @extends instance.web.search.NumberField
  */
-openerp.web.search.FloatField = openerp.web.search.NumberField.extend(/** @lends openerp.web.search.FloatField# */{
+instance.web.search.FloatField = instance.web.search.NumberField.extend(/** @lends instance.web.search.FloatField# */{
     error_message: _t("not a valid number"),
     parse: function (value) {
         try {
-            return openerp.web.parse_value(value, {'widget': 'float'});
+            return instance.web.parse_value(value, {'widget': 'float'});
         } catch (e) {
             return NaN;
         }
@@ -1112,9 +1112,9 @@ openerp.web.search.FloatField = openerp.web.search.NumberField.extend(/** @lends
 });
 /**
  * @class
- * @extends openerp.web.search.Field
+ * @extends instance.web.search.Field
  */
-openerp.web.search.SelectionField = openerp.web.search.Field.extend(/** @lends openerp.web.search.SelectionField# */{
+instance.web.search.SelectionField = instance.web.search.Field.extend(/** @lends instance.web.search.SelectionField# */{
     // This implementation is a basic <select> field, but it may have to be
     // altered to be more in line with the GTK client, which uses a combo box
     // (~ jquery.autocomplete):
@@ -1171,10 +1171,10 @@ openerp.web.search.SelectionField = openerp.web.search.Field.extend(/** @lends o
         return facet.get('json');
     }
 });
-openerp.web.search.BooleanField = openerp.web.search.SelectionField.extend(/** @lends openerp.web.search.BooleanField# */{
+instance.web.search.BooleanField = instance.web.search.SelectionField.extend(/** @lends instance.web.search.BooleanField# */{
     /**
-     * @constructs openerp.web.search.BooleanField
-     * @extends openerp.web.search.BooleanField
+     * @constructs instance.web.search.BooleanField
+     * @extends instance.web.search.BooleanField
      */
     init: function () {
         this._super.apply(this, arguments);
@@ -1193,16 +1193,16 @@ openerp.web.search.BooleanField = openerp.web.search.SelectionField.extend(/** @
 });
 /**
  * @class
- * @extends openerp.web.search.DateField
+ * @extends instance.web.search.DateField
  */
-openerp.web.search.DateField = openerp.web.search.Field.extend(/** @lends openerp.web.search.DateField# */{
+instance.web.search.DateField = instance.web.search.Field.extend(/** @lends instance.web.search.DateField# */{
     get_value: function (facet) {
-        return openerp.web.date_to_str(facet.get('json'));
+        return instance.web.date_to_str(facet.get('json'));
     },
     complete: function (needle) {
         var d = Date.parse(needle);
         if (!d) { return $.when(null); }
-        var value = openerp.web.format_value(d, this.attrs);
+        var value = instance.web.format_value(d, this.attrs);
         var label = _.str.sprintf(_.str.escapeHTML(
             _t("Search %(field)s at: %(value)s")), {
                 field: '<em>' + this.attrs.string + '</em>',
@@ -1225,17 +1225,17 @@ openerp.web.search.DateField = openerp.web.search.Field.extend(/** @lends opener
  *   spanning the whole day selected by the date widget
  *
  * @class
- * @extends openerp.web.DateField
+ * @extends instance.web.DateField
  */
-openerp.web.search.DateTimeField = openerp.web.search.DateField.extend(/** @lends openerp.web.search.DateTimeField# */{
+instance.web.search.DateTimeField = instance.web.search.DateField.extend(/** @lends instance.web.search.DateTimeField# */{
     get_value: function (facet) {
-        return openerp.web.datetime_to_str(facet.get('json'));
+        return instance.web.datetime_to_str(facet.get('json'));
     }
 });
-openerp.web.search.ManyToOneField = openerp.web.search.CharField.extend({
+instance.web.search.ManyToOneField = instance.web.search.CharField.extend({
     init: function (view_section, field, view) {
         this._super(view_section, field, view);
-        this.model = new openerp.web.Model(this.attrs.relation);
+        this.model = new instance.web.Model(this.attrs.relation);
     },
     complete: function (needle) {
         var self = this;
@@ -1289,7 +1289,7 @@ openerp.web.search.ManyToOneField = openerp.web.search.CharField.extend({
     }
 });
 
-openerp.web.search.Advanced = openerp.web.search.Input.extend({
+instance.web.search.Advanced = instance.web.search.Input.extend({
     template: 'SearchView.advanced',
     start: function () {
         var self = this;
@@ -1314,7 +1314,7 @@ openerp.web.search.Advanced = openerp.web.search.Input.extend({
         });
     },
     append_proposition: function () {
-        return (new openerp.web.search.ExtendedSearchProposition(this, this.fields))
+        return (new instance.web.search.ExtendedSearchProposition(this, this.fields))
             .appendTo(this.$element.find('ul'));
     },
     commit_search: function () {
@@ -1323,14 +1323,14 @@ openerp.web.search.Advanced = openerp.web.search.Input.extend({
         var children = this.getChildren(),
             domain = _.invoke(children, 'get_proposition');
         var filters = _(domain).map(function (section) {
-            return new openerp.web.search.Filter({attrs: {
+            return new instance.web.search.Filter({attrs: {
                 string: _.str.sprintf('%s(%s)%s',
                     section[0], section[1], section[2]),
                 domain: [section]
             }}, self.view);
         });
         // Create Filter (& FilterGroup around it) with that domain
-        var f = new openerp.web.search.FilterGroup(filters, this.view);
+        var f = new instance.web.search.FilterGroup(filters, this.view);
         // add group to query
         this.view.vs.searchQuery.add({
             category: _t("Advanced"),
@@ -1349,11 +1349,11 @@ openerp.web.search.Advanced = openerp.web.search.Input.extend({
     }
 });
 
-openerp.web.search.ExtendedSearchProposition = openerp.web.OldWidget.extend(/** @lends openerp.web.search.ExtendedSearchProposition# */{
+instance.web.search.ExtendedSearchProposition = instance.web.OldWidget.extend(/** @lends instance.web.search.ExtendedSearchProposition# */{
     template: 'SearchView.extended_search.proposition',
     /**
-     * @constructs openerp.web.search.ExtendedSearchProposition
-     * @extends openerp.web.OldWidget
+     * @constructs instance.web.search.ExtendedSearchProposition
+     * @extends instance.web.OldWidget
      *
      * @param parent
      * @param fields
@@ -1401,10 +1401,10 @@ openerp.web.search.ExtendedSearchProposition = openerp.web.OldWidget.extend(/**
         }
 
         var type = field.type;
-        var obj = openerp.web.search.custom_filters.get_object(type);
+        var obj = instance.web.search.custom_filters.get_object(type);
         if(obj === null) {
             console.log('Unknow field type ' + e.key);
-            obj = openerp.web.search.custom_filters.get_object("char");
+            obj = instance.web.search.custom_filters.get_object("char");
         }
         this.value = new (obj) (this);
         if(this.value.set_field) {
@@ -1430,12 +1430,12 @@ openerp.web.search.ExtendedSearchProposition = openerp.web.OldWidget.extend(/**
     }
 });
 
-openerp.web.search.ExtendedSearchProposition.Field = openerp.web.OldWidget.extend({
+instance.web.search.ExtendedSearchProposition.Field = instance.web.OldWidget.extend({
     start: function () {
         this.$element = $("#" + this.element_id);
     }
 });
-openerp.web.search.ExtendedSearchProposition.Char = openerp.web.search.ExtendedSearchProposition.Field.extend({
+instance.web.search.ExtendedSearchProposition.Char = instance.web.search.ExtendedSearchProposition.Field.extend({
     template: 'SearchView.extended_search.proposition.char',
     operators: [
         {value: "ilike", text: _lt("contains")},
@@ -1447,7 +1447,7 @@ openerp.web.search.ExtendedSearchProposition.Char = openerp.web.search.ExtendedS
         return this.$element.val();
     }
 });
-openerp.web.search.ExtendedSearchProposition.DateTime = openerp.web.search.ExtendedSearchProposition.Field.extend({
+instance.web.search.ExtendedSearchProposition.DateTime = instance.web.search.ExtendedSearchProposition.Field.extend({
     template: 'SearchView.extended_search.proposition.empty',
     operators: [
         {value: "=", text: _lt("is equal to")},
@@ -1462,11 +1462,11 @@ openerp.web.search.ExtendedSearchProposition.DateTime = openerp.web.search.Exten
     },
     start: function() {
         this._super();
-        this.datewidget = new openerp.web.DateTimeWidget(this);
+        this.datewidget = new instance.web.DateTimeWidget(this);
         this.datewidget.prependTo(this.$element);
     }
 });
-openerp.web.search.ExtendedSearchProposition.Date = openerp.web.search.ExtendedSearchProposition.Field.extend({
+instance.web.search.ExtendedSearchProposition.Date = instance.web.search.ExtendedSearchProposition.Field.extend({
     template: 'SearchView.extended_search.proposition.empty',
     operators: [
         {value: "=", text: _lt("is equal to")},
@@ -1481,11 +1481,11 @@ openerp.web.search.ExtendedSearchProposition.Date = openerp.web.search.ExtendedS
     },
     start: function() {
         this._super();
-        this.datewidget = new openerp.web.DateWidget(this);
+        this.datewidget = new instance.web.DateWidget(this);
         this.datewidget.prependTo(this.$element);
     }
 });
-openerp.web.search.ExtendedSearchProposition.Integer = openerp.web.search.ExtendedSearchProposition.Field.extend({
+instance.web.search.ExtendedSearchProposition.Integer = instance.web.search.ExtendedSearchProposition.Field.extend({
     template: 'SearchView.extended_search.proposition.integer',
     operators: [
         {value: "=", text: _lt("is equal to")},
@@ -1497,16 +1497,16 @@ openerp.web.search.ExtendedSearchProposition.Integer = openerp.web.search.Extend
     ],
     get_value: function() {
         try {
-            return openerp.web.parse_value(this.$element.val(), {'widget': 'integer'});
+            return instance.web.parse_value(this.$element.val(), {'widget': 'integer'});
         } catch (e) {
             return "";
         }
     }
 });
-openerp.web.search.ExtendedSearchProposition.Id = openerp.web.search.ExtendedSearchProposition.Integer.extend({
+instance.web.search.ExtendedSearchProposition.Id = instance.web.search.ExtendedSearchProposition.Integer.extend({
     operators: [{value: "=", text: _lt("is")}]
 });
-openerp.web.search.ExtendedSearchProposition.Float = openerp.web.search.ExtendedSearchProposition.Field.extend({
+instance.web.search.ExtendedSearchProposition.Float = instance.web.search.ExtendedSearchProposition.Field.extend({
     template: 'SearchView.extended_search.proposition.float',
     operators: [
         {value: "=", text: _lt("is equal to")},
@@ -1518,13 +1518,13 @@ openerp.web.search.ExtendedSearchProposition.Float = openerp.web.search.Extended
     ],
     get_value: function() {
         try {
-            return openerp.web.parse_value(this.$element.val(), {'widget': 'float'});
+            return instance.web.parse_value(this.$element.val(), {'widget': 'float'});
         } catch (e) {
             return "";
         }
     }
 });
-openerp.web.search.ExtendedSearchProposition.Selection = openerp.web.search.ExtendedSearchProposition.Field.extend({
+instance.web.search.ExtendedSearchProposition.Selection = instance.web.search.ExtendedSearchProposition.Field.extend({
     template: 'SearchView.extended_search.proposition.selection',
     operators: [
         {value: "=", text: _lt("is")},
@@ -1537,7 +1537,7 @@ openerp.web.search.ExtendedSearchProposition.Selection = openerp.web.search.Exte
         return this.$element.val();
     }
 });
-openerp.web.search.ExtendedSearchProposition.Boolean = openerp.web.search.ExtendedSearchProposition.Field.extend({
+instance.web.search.ExtendedSearchProposition.Boolean = instance.web.search.ExtendedSearchProposition.Field.extend({
     template: 'SearchView.extended_search.proposition.boolean',
     operators: [
         {value: "=", text: _lt("is true")},
@@ -1548,21 +1548,21 @@ openerp.web.search.ExtendedSearchProposition.Boolean = openerp.web.search.Extend
     }
 });
 
-openerp.web.search.custom_filters = new openerp.web.Registry({
-    'char': 'openerp.web.search.ExtendedSearchProposition.Char',
-    'text': 'openerp.web.search.ExtendedSearchProposition.Char',
-    'one2many': 'openerp.web.search.ExtendedSearchProposition.Char',
-    'many2one': 'openerp.web.search.ExtendedSearchProposition.Char',
-    'many2many': 'openerp.web.search.ExtendedSearchProposition.Char',
+instance.web.search.custom_filters = new instance.web.Registry({
+    'char': 'instance.web.search.ExtendedSearchProposition.Char',
+    'text': 'instance.web.search.ExtendedSearchProposition.Char',
+    'one2many': 'instance.web.search.ExtendedSearchProposition.Char',
+    'many2one': 'instance.web.search.ExtendedSearchProposition.Char',
+    'many2many': 'instance.web.search.ExtendedSearchProposition.Char',
 
-    'datetime': 'openerp.web.search.ExtendedSearchProposition.DateTime',
-    'date': 'openerp.web.search.ExtendedSearchProposition.Date',
-    'integer': 'openerp.web.search.ExtendedSearchProposition.Integer',
-    'float': 'openerp.web.search.ExtendedSearchProposition.Float',
-    'boolean': 'openerp.web.search.ExtendedSearchProposition.Boolean',
-    'selection': 'openerp.web.search.ExtendedSearchProposition.Selection',
+    'datetime': 'instance.web.search.ExtendedSearchProposition.DateTime',
+    'date': 'instance.web.search.ExtendedSearchProposition.Date',
+    'integer': 'instance.web.search.ExtendedSearchProposition.Integer',
+    'float': 'instance.web.search.ExtendedSearchProposition.Float',
+    'boolean': 'instance.web.search.ExtendedSearchProposition.Boolean',
+    'selection': 'instance.web.search.ExtendedSearchProposition.Selection',
 
-    'id': 'openerp.web.search.ExtendedSearchProposition.Id'
+    'id': 'instance.web.search.ExtendedSearchProposition.Id'
 });
 
 };

From 6ca9b6ffad24e7e9065b4d7215b585c35cabe66e Mon Sep 17 00:00:00 2001
From: niv-openerp <nicolas.vanhoren@openerp.com>
Date: Tue, 17 Apr 2012 14:09:49 +0200
Subject: [PATCH 131/238] [imp] wip

bzr revid: nicolas.vanhoren@openerp.com-20120417120949-djxj7re89x0ae20m
---
 addons/web/static/src/js/view_editor.js |  68 ++---
 addons/web/static/src/js/view_form.js   | 350 ++++++++++++------------
 2 files changed, 209 insertions(+), 209 deletions(-)

diff --git a/addons/web/static/src/js/view_editor.js b/addons/web/static/src/js/view_editor.js
index 2c0dc3d70b4..59d1fed9345 100644
--- a/addons/web/static/src/js/view_editor.js
+++ b/addons/web/static/src/js/view_editor.js
@@ -1,15 +1,15 @@
-openerp.web.view_editor = function(openerp) {
-var _t = openerp.web._t;
-var QWeb = openerp.web.qweb;
-openerp.web.ViewEditor =   openerp.web.OldWidget.extend({
+openerp.web.view_editor = function(instance) {
+var _t = instance.web._t;
+var QWeb = instance.web.qweb;
+instance.web.ViewEditor =   instance.web.OldWidget.extend({
     init: function(parent, element_id, dataset, view, options) {
         this._super(parent);
         this.element_id = element_id;
         this.parent = parent;
-        this.dataset = new openerp.web.DataSetSearch(this, 'ir.ui.view', null, null),
+        this.dataset = new instance.web.DataSetSearch(this, 'ir.ui.view', null, null),
         this.model = dataset.model;
         this.xml_element_id = 0;
-        this.property = openerp.web.ViewEditor.property_widget;
+        this.property = instance.web.ViewEditor.property_widget;
         this.one_object = false;
     },
     start: function() {
@@ -39,7 +39,7 @@ openerp.web.ViewEditor =   openerp.web.OldWidget.extend({
                 select_view_id: self.parent.fields_view.view_id
             }
         };
-        this.view_edit_dialog = new openerp.web.Dialog(this, {
+        this.view_edit_dialog = new instance.web.Dialog(this, {
             title: action_title,
             width: 850,
             buttons: [
@@ -51,7 +51,7 @@ openerp.web.ViewEditor =   openerp.web.OldWidget.extend({
         }).open();
         this.view_edit_dialog.on_close.add_last(function(){window.location.reload();});
         this.main_view_id = this.parent.fields_view.view_id;
-        this.action_manager = new openerp.web.ActionManager(this);
+        this.action_manager = new instance.web.ActionManager(this);
         this.action_manager.appendTo(this.view_edit_dialog);
         $.when(this.action_manager.do_action(action)).then(function() {
             var viewmanager = self.action_manager.inner_viewmanager,
@@ -67,7 +67,7 @@ openerp.web.ViewEditor =   openerp.web.OldWidget.extend({
     },
     on_create_view: function() {
         var self = this;
-        this.create_view_dialog = new openerp.web.Dialog(this, {
+        this.create_view_dialog = new instance.web.Dialog(this, {
             title: _.str.sprintf(_t("Create a view (%s)"), self.model),
             buttons: [
                 {text: _t("Save"), click: function () {
@@ -115,8 +115,8 @@ openerp.web.ViewEditor =   openerp.web.OldWidget.extend({
     },
     do_save_view: function(values) {
         def = $.Deferred();
-        var field_dataset = new openerp.web.DataSetSearch(this, this.model, null, null);
-        var model_dataset = new openerp.web.DataSetSearch(this, 'ir.model', null, null);
+        var field_dataset = new instance.web.DataSetSearch(this, this.model, null, null);
+        var model_dataset = new instance.web.DataSetSearch(this, 'ir.model', null, null);
         var view_string = "", field_name = false, self = this;
         field_dataset.call( 'fields_get', [],  function(fields) {
             _.each(['name', 'x_name'], function(value) {
@@ -360,7 +360,7 @@ openerp.web.ViewEditor =   openerp.web.OldWidget.extend({
     edit_view: function(one_object) {
         var self = this;
         this.one_object = one_object;
-        this.edit_xml_dialog = new openerp.web.Dialog(this, {
+        this.edit_xml_dialog = new instance.web.Dialog(this, {
             title: _.str.sprintf(_t("View Editor %d - %s"), self.main_view_id, self.model),
             height: '90%',
             buttons: [
@@ -392,7 +392,7 @@ openerp.web.ViewEditor =   openerp.web.OldWidget.extend({
                             action_buttons: false
                         }
                     };
-                    var action_manager = new openerp.web.ActionManager(self);
+                    var action_manager = new instance.web.ActionManager(self);
                     action_manager.do_action(action);
                 }},
                 {text: _t("Close"), click: function(){
@@ -517,7 +517,7 @@ openerp.web.ViewEditor =   openerp.web.OldWidget.extend({
         var self = this;
         var tr = self.get_object_by_id(this.one_object.clicked_tr_id, this.one_object['main_object'], [])[0].att_list[0];
         var parent_tr = ($(side).prevAll("tr[level=" + String(this.one_object.clicked_tr_level - 1) + "]"))[0];
-        var field_dataset = new openerp.web.DataSetSearch(this, this.model, null, null);
+        var field_dataset = new instance.web.DataSetSearch(this, this.model, null, null);
         parent_tr = $(parent_tr).find('a').text();
         field_dataset.call( 'fields_get', [],  function(result) {
             var fields = _.keys(result);
@@ -811,7 +811,7 @@ openerp.web.ViewEditor =   openerp.web.OldWidget.extend({
     },
     on_edit_node: function(properties){
         var self = this;
-        this.edit_node_dialog = new openerp.web.Dialog(this,{
+        this.edit_node_dialog = new instance.web.Dialog(this,{
             title: _t("Properties"),
             width: 450,
             buttons: [
@@ -880,7 +880,7 @@ openerp.web.ViewEditor =   openerp.web.OldWidget.extend({
         this.edit_widget = [];
         self.ready  = $.when(self.on_groups(properties)).then(function () {
             _PROPERTIES_ATTRIBUTES['groups']['selection'] = self.groups;
-            var values = _.keys( openerp.web.form.widgets.map);
+            var values = _.keys( instance.web.form.widgets.map);
             values.push('');
             values.sort();
             _PROPERTIES_ATTRIBUTES['widget']['selection'] = values;
@@ -908,8 +908,8 @@ openerp.web.ViewEditor =   openerp.web.OldWidget.extend({
             def.resolve();
         }
         var group_ids = [], group_names = {}, groups = [];
-        var res_groups = new openerp.web.DataSetSearch(this,'res.groups', null, null),
-            model_data = new openerp.web.DataSetSearch(self,'ir.model.data', null, null);
+        var res_groups = new instance.web.DataSetSearch(this,'res.groups', null, null),
+            model_data = new instance.web.DataSetSearch(self,'ir.model.data', null, null);
             res_groups.read_slice([], {}).done(function (res_grp) {
                 _.each(res_grp, function (res) {
                     var key = res.id;
@@ -935,7 +935,7 @@ openerp.web.ViewEditor =   openerp.web.OldWidget.extend({
                             {'name': 'field_value','selection': fields, 'value': false, 'string': '','type': 'selection'},
                             {'name': 'position','selection': ['After','Before','Inside'], 'value': false, 'string': 'Position','type': 'selection'}];
         this.add_widget = [];
-        this.add_node_dialog = new openerp.web.Dialog(this,{
+        this.add_node_dialog = new instance.web.Dialog(this,{
             title: _t("Properties"),
             width: 450,
             buttons: [
@@ -980,7 +980,7 @@ openerp.web.ViewEditor =   openerp.web.OldWidget.extend({
         });
         table_selector.find("td[id^=]").attr("width","100px");
         self.add_node_dialog.$element.find('#new_field').click(function() {
-            model_data = new openerp.web.DataSetSearch(self,'ir.model', null, null);
+            model_data = new instance.web.DataSetSearch(self,'ir.model', null, null);
             model_data.read_slice([], {domain: [['model','=', self.model]]}).then(function(result) {
                 self.render_new_field(result[0].id);
             });
@@ -998,7 +998,7 @@ openerp.web.ViewEditor =   openerp.web.OldWidget.extend({
                 action_buttons: true
             }
         };
-        var action_manager = new openerp.web.ActionManager(self);
+        var action_manager = new instance.web.ActionManager(self);
         $.when(action_manager.do_action(action)).then(function() {
             var controller = action_manager.dialog_viewmanager.views['form'].controller;
             controller.on_button_cancel.add_last(function(){
@@ -1015,7 +1015,7 @@ openerp.web.ViewEditor =   openerp.web.OldWidget.extend({
         });
     }
 });
-openerp.web.ViewEditor.Field = openerp.web.Class.extend({
+instance.web.ViewEditor.Field = instance.web.Class.extend({
     init: function(view, widget) {
         this.$element = view.$element;
         this.dirty = false;
@@ -1041,7 +1041,7 @@ openerp.web.ViewEditor.Field = openerp.web.Class.extend({
     validate: function() {
         this.is_invalid = false;
         try {
-            var value = openerp.web.parse_value(this.get_value(), this, '');
+            var value = instance.web.parse_value(this.get_value(), this, '');
             this.is_invalid = this.required && value === '';
         } catch(e) {
             this.is_invalid = true;
@@ -1051,7 +1051,7 @@ openerp.web.ViewEditor.Field = openerp.web.Class.extend({
         return _.str.sprintf("<td id = %s>%s</td>", this.name, QWeb.render(this.template, {widget: this}))
     }
 });
-openerp.web.ViewEditor.FieldBoolean = openerp.web.ViewEditor.Field.extend({
+instance.web.ViewEditor.FieldBoolean = instance.web.ViewEditor.Field.extend({
     template : "vieweditor_boolean",
     start: function() {
         var self = this;
@@ -1069,7 +1069,7 @@ openerp.web.ViewEditor.FieldBoolean = openerp.web.ViewEditor.Field.extend({
         return  this.$element.find("input[id=" + this.name + "]").is(':checked')? "1" : null;
     }
 });
-openerp.web.ViewEditor.FieldChar = openerp.web.ViewEditor.Field.extend({
+instance.web.ViewEditor.FieldChar = instance.web.ViewEditor.Field.extend({
     template : "vieweditor_char",
     start: function () {
         var self = this;
@@ -1085,7 +1085,7 @@ openerp.web.ViewEditor.FieldChar = openerp.web.ViewEditor.Field.extend({
         return this.$element.find("input[id=" + this.name + "]").val();
     }
 });
-openerp.web.ViewEditor.FieldSelect = openerp.web.ViewEditor.Field.extend({
+instance.web.ViewEditor.FieldSelect = instance.web.ViewEditor.Field.extend({
     template : "vieweditor_selection",
     start: function () {
         var self = this;
@@ -1115,7 +1115,7 @@ openerp.web.ViewEditor.FieldSelect = openerp.web.ViewEditor.Field.extend({
         return this.$element.find("select[id=" + this.name + "]").val();
     }
 });
-openerp.web.ViewEditor.FieldSelectMulti = openerp.web.ViewEditor.FieldSelect.extend({
+instance.web.ViewEditor.FieldSelectMulti = instance.web.ViewEditor.FieldSelect.extend({
     start: function () {
         this._super();
         this.$element.find("select[id=" + this.name + "]").css('height', '100px').attr("multiple", true);
@@ -1131,7 +1131,7 @@ openerp.web.ViewEditor.FieldSelectMulti = openerp.web.ViewEditor.FieldSelect.ext
         });
     }
 });
-openerp.web.ViewEditor.FieldFloat = openerp.web.ViewEditor.FieldChar.extend({
+instance.web.ViewEditor.FieldFloat = instance.web.ViewEditor.FieldChar.extend({
 });
 
 var _PROPERTIES = {
@@ -1196,11 +1196,11 @@ var _ICONS = ['','STOCK_ABOUT', 'STOCK_ADD', 'STOCK_APPLY', 'STOCK_BOLD',
             'terp-sale', 'terp-tools', 'terp-administration', 'terp-hr', 'terp-partner',
             'terp-project', 'terp-report', 'terp-stock', 'terp-calendar', 'terp-graph'
 ];
-openerp.web.ViewEditor.property_widget = new openerp.web.Registry({
-    'boolean' : 'openerp.web.ViewEditor.FieldBoolean',
-    'selection_multi' : 'openerp.web.ViewEditor.FieldSelectMulti',
-    'selection' : 'openerp.web.ViewEditor.FieldSelect',
-    'char' : 'openerp.web.ViewEditor.FieldChar',
-    'float' : 'openerp.web.ViewEditor.FieldFloat'
+instance.web.ViewEditor.property_widget = new instance.web.Registry({
+    'boolean' : 'instance.web.ViewEditor.FieldBoolean',
+    'selection_multi' : 'instance.web.ViewEditor.FieldSelectMulti',
+    'selection' : 'instance.web.ViewEditor.FieldSelect',
+    'char' : 'instance.web.ViewEditor.FieldChar',
+    'float' : 'instance.web.ViewEditor.FieldFloat'
 });
 };
diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js
index bcf3ffd2600..fdff2d95069 100644
--- a/addons/web/static/src/js/view_form.js
+++ b/addons/web/static/src/js/view_form.js
@@ -1,13 +1,13 @@
-openerp.web.form = function (openerp) {
-var _t = openerp.web._t,
-   _lt = openerp.web._lt;
-var QWeb = openerp.web.qweb;
+openerp.web.form = function (instance) {
+var _t = instance.web._t,
+   _lt = instance.web._lt;
+var QWeb = instance.web.qweb;
 
 /** @namespace */
-openerp.web.form = {};
+instance.web.form = {};
 
-openerp.web.views.add('form', 'openerp.web.FormView');
-openerp.web.FormView = openerp.web.View.extend({
+instance.web.views.add('form', 'instance.web.FormView');
+instance.web.FormView = instance.web.View.extend({
     /**
      * Indicates that this view is not searchable, and thus that no search
      * view should be displayed (if there is one active).
@@ -17,17 +17,17 @@ openerp.web.FormView = openerp.web.View.extend({
     display_name: _lt('Form'),
     view_type: "form",
     /**
-     * @constructs openerp.web.FormView
-     * @extends openerp.web.View
+     * @constructs instance.web.FormView
+     * @extends instance.web.View
      *
-     * @param {openerp.web.Session} session the current openerp session
-     * @param {openerp.web.DataSet} dataset the dataset this view will work with
+     * @param {instance.web.Session} session the current openerp session
+     * @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 {openerp.web.Registry} registry=openerp.web.form.widgets widgets registry for this form view instance
+     * @property {instance.web.Registry} registry=instance.web.form.widgets widgets registry for this form view instance
      */
     init: function(parent, dataset, view_id, options) {
         this._super(parent);
@@ -41,8 +41,8 @@ openerp.web.FormView = openerp.web.View.extend({
         this.datarecord = {};
         this.default_focus_field = null;
         this.default_focus_button = null;
-        this.fields_registry = openerp.web.form.widgets;
-        this.tags_registry = openerp.web.form.tags;
+        this.fields_registry = instance.web.form.widgets;
+        this.tags_registry = instance.web.form.tags;
         this.has_been_loaded = $.Deferred();
         this.translatable_fields = [];
         _.defaults(this.options, {
@@ -54,7 +54,7 @@ openerp.web.FormView = openerp.web.View.extend({
         this.on_change_mutex = new $.Mutex();
         this.reload_mutex = new $.Mutex();
         this.mode = null;
-        this.rendering_engine = new openerp.web.form.FormRenderingEngineReadonly(this);
+        this.rendering_engine = new instance.web.form.FormRenderingEngineReadonly(this);
         this.qweb = null; // A QWeb instance will be created if the view is a QWeb template
     },
     destroy: function() {
@@ -110,7 +110,7 @@ openerp.web.FormView = openerp.web.View.extend({
         });
 
         if (!this.sidebar && this.options.sidebar) {
-            this.sidebar = new openerp.web.Sidebar(this);
+            this.sidebar = new instance.web.Sidebar(this);
             this.sidebar.appendTo(this.$sidebar);
             this.sidebar.add_toolbar(this.fields_view.toolbar);
             this.sidebar.add_items('other', [{
@@ -131,7 +131,7 @@ openerp.web.FormView = openerp.web.View.extend({
             var child = fvg.arch.children[i];
             if (child.tag === "templates") {
                 this.qweb = new QWeb2.Engine();
-                this.qweb.add_template(openerp.web.json_node_to_xml(child));
+                this.qweb.add_template(instance.web.json_node_to_xml(child));
                 if (!this.qweb.has_template('form')) {
                     throw new Error("No QWeb template found for form view");
                 }
@@ -144,7 +144,7 @@ openerp.web.FormView = openerp.web.View.extend({
     get_fvg_from_qweb: function(record) {
         var view = this.qweb.render('form', this.get_qweb_context(record));
         var fvg = _.clone(this.fields_view);
-        fvg.arch = openerp.web.xml_to_json(openerp.web.str_to_xml(view).firstChild);
+        fvg.arch = instance.web.xml_to_json(instance.web.str_to_xml(view).firstChild);
         return fvg;
     },
     get_qweb_context: function(record) {
@@ -153,11 +153,11 @@ openerp.web.FormView = openerp.web.View.extend({
         _.each(record, function(value, name) {
             var r = _.clone(self.fields_view.fields[name] || {});
             if ((r.type === 'date' || r.type === 'datetime') && value) {
-                r.raw_value = openerp.web.auto_str_to_date(value);
+                r.raw_value = instance.web.auto_str_to_date(value);
             } else {
                 r.raw_value = value;
             }
-            r.value = openerp.web.format_value(value, r);
+            r.value = instance.web.format_value(value, r);
             new_record[name] = r;
         });
         return {
@@ -337,7 +337,7 @@ openerp.web.FormView = openerp.web.View.extend({
             'None': function () {return null;},
             'context': function (i) {
                 context_index = i;
-                var ctx = new openerp.web.CompoundContext(self.dataset.get_context(), widget.build_context() ? widget.build_context() : {});
+                var ctx = new instance.web.CompoundContext(self.dataset.get_context(), widget.build_context() ? widget.build_context() : {});
                 return ctx;
             }
         };
@@ -483,7 +483,7 @@ openerp.web.FormView = openerp.web.View.extend({
             this.on_form_changed();
         }
         if (!_.isEmpty(result.warning)) {
-        	openerp.web.dialog($(QWeb.render("CrashManagerWarning", result.warning)), {
+        	instance.web.dialog($(QWeb.render("CrashManagerWarning", result.warning)), {
                 modal: true,
                 buttons: [
                     {text: _t("Ok"), click: function() { $(this).dialog("close"); }}
@@ -703,7 +703,7 @@ openerp.web.FormView = openerp.web.View.extend({
             if (this.sidebar) {
                 this.sidebar.do_attachement_update(this.dataset, this.datarecord.id);
             }
-            //openerp.log("The record has been created with id #" + this.datarecord.id);
+            //instance.log("The record has been created with id #" + this.datarecord.id);
             this.reload();
             return $.when(_.extend(r, {created: true})).then(success);
         }
@@ -729,7 +729,7 @@ openerp.web.FormView = openerp.web.View.extend({
     },
     get_widgets: function() {
         return _.filter(this.getChildren(), function(obj) {
-            return obj instanceof openerp.web.form.Widget;
+            return obj instanceof instance.web.form.Widget;
         });
     },
     get_fields_values: function(blacklist) {
@@ -767,7 +767,7 @@ openerp.web.FormView = openerp.web.View.extend({
             if (this.options.not_interactible_on_create)
                 return false;
         } else if (typeof(id) === "string") {
-            if(openerp.web.BufferedDataSet.virtual_id_regex.test(id))
+            if(instance.web.BufferedDataSet.virtual_id_regex.test(id))
                 return false;
         }
         return true;
@@ -819,7 +819,7 @@ openerp.web.FormView = openerp.web.View.extend({
             .filter(function (field) { return field.change_default; })
             .value();
 
-        var d = new openerp.web.Dialog(this, {
+        var d = new instance.web.Dialog(this, {
             title: _t("Set Default"),
             args: {
                 fields: fields,
@@ -836,7 +836,7 @@ openerp.web.FormView = openerp.web.View.extend({
                     }
                     var condition = d.$element.find('#formview_default_conditions').val(),
                         all_users = d.$element.find('#formview_default_all').is(':checked');
-                    new openerp.web.DataSet(self, 'ir.values').call(
+                    new instance.web.DataSet(self, 'ir.values').call(
                         'set_default', [
                             self.dataset.model,
                             field_to_set,
@@ -860,7 +860,7 @@ openerp.web.FormView = openerp.web.View.extend({
 /**
  * Interface to be implemented by rendering engines for the form view.
  */
-openerp.web.form.FormRenderingEngineInterface = {
+instance.web.form.FormRenderingEngineInterface = {
     set_fields_view: function(fields_view) {},
     set_fields_registry: function(fields_registry) {},
     render_to: function($element) {},
@@ -871,7 +871,7 @@ openerp.web.form.FormRenderingEngineInterface = {
  * 
  * It is necessary to set the view using set_view() before usage.
  */
-openerp.web.form.FormRenderingEngine = openerp.web.Class.extend({
+instance.web.form.FormRenderingEngine = instance.web.Class.extend({
     init: function(view) {
         this.view = view;
     },
@@ -890,7 +890,7 @@ openerp.web.form.FormRenderingEngine = openerp.web.Class.extend({
 
         // TODO: I know this will save the world and all the kitten for a moment,
         //       but one day, we will have to get rid of xml2json
-        var xml = openerp.web.json_node_to_xml(this.fvg.arch);
+        var xml = instance.web.json_node_to_xml(this.fvg.arch);
         this.$form = $('<div class="oe_form">' + xml + '</div>');
         if (this.fvg.arch.attrs && this.fvg.arch.attrs['layout'] !== 'manual') {
             this.$form.attr('layout', 'auto');
@@ -912,7 +912,7 @@ openerp.web.form.FormRenderingEngine = openerp.web.Class.extend({
             if (!obj) {
                 throw new Error("Widget type '"+ key + "' is not implemented");
             }
-            var w = new (obj)(self.view, openerp.web.xml_to_json($elem[0]));
+            var w = new (obj)(self.view, instance.web.xml_to_json($elem[0]));
             var $label = self.labels[$elem.attr("name")];
             if ($label) {
                 w.set_input_id($label.attr("for"));
@@ -924,7 +924,7 @@ openerp.web.form.FormRenderingEngine = openerp.web.Class.extend({
         _.each(this.tags_to_init, function($elem) {
             var tag_name = $elem[0].tagName.toLowerCase();
             var obj = self.tags_registry.get_object(tag_name);
-            var w = new (obj)(self.view, openerp.web.xml_to_json($elem[0]));
+            var w = new (obj)(self.view, instance.web.xml_to_json($elem[0]));
             w.replace($elem);
         })
         // TODO: return a deferred
@@ -1183,18 +1183,18 @@ openerp.web.form.FormRenderingEngine = openerp.web.Class.extend({
         var str_modifiers = $node.attr("modifiers") || "{}"
         var modifiers = JSON.parse(str_modifiers);
         if (modifiers.invisible !== undefined)
-            new openerp.web.form.InvisibilityChanger(this.view, this.view, modifiers.invisible, $new_element);
+            new instance.web.form.InvisibilityChanger(this.view, this.view, modifiers.invisible, $new_element);
         $new_element.addClass($node.attr("class") || "");
     },
 });
 
-openerp.web.form.FormRenderingEngineReadonly = openerp.web.form.FormRenderingEngine.extend({
+instance.web.form.FormRenderingEngineReadonly = instance.web.form.FormRenderingEngine.extend({
     alter_field: function(field) {
         field.set({"force_readonly": true});
     },
 });
 
-openerp.web.form.FormDialog = openerp.web.Dialog.extend({
+instance.web.form.FormDialog = instance.web.Dialog.extend({
     init: function(parent, options, view_id, dataset) {
         this._super(parent, options);
         this.dataset = dataset;
@@ -1203,7 +1203,7 @@ openerp.web.form.FormDialog = openerp.web.Dialog.extend({
     },
     start: function() {
         this._super();
-        this.form = new openerp.web.FormView(this, this.dataset, this.view_id, {
+        this.form = new instance.web.FormView(this, this.dataset, this.view_id, {
             sidebar: false,
             pager: false
         });
@@ -1225,7 +1225,7 @@ openerp.web.form.FormDialog = openerp.web.Dialog.extend({
     }
 });
 
-openerp.web.form.compute_domain = function(expr, fields) {
+instance.web.form.compute_domain = function(expr, fields) {
     var stack = [];
     for (var i = expr.length - 1; i >= 0; i--) {
         var ex = expr[i];
@@ -1301,13 +1301,13 @@ openerp.web.form.compute_domain = function(expr, fields) {
  *
  * Apply the result of the "invisible" domain to this.$element.
  */
-openerp.web.form.InvisibilityChangerMixin = {
+instance.web.form.InvisibilityChangerMixin = {
     init: function(field_manager, invisible_domain) {
         this._ic_field_manager = field_manager
         this._ic_invisible_modifier = invisible_domain;
         this._ic_field_manager.on("view_content_has_changed", this, function() {
             var result = this._ic_invisible_modifier === undefined ? false :
-                openerp.web.form.compute_domain(this._ic_invisible_modifier, this._ic_field_manager.fields);
+                instance.web.form.compute_domain(this._ic_invisible_modifier, this._ic_field_manager.fields);
             this.set({"invisible": result});
         });
         this.set({invisible: this._ic_invisible_modifier === true});
@@ -1325,20 +1325,20 @@ openerp.web.form.InvisibilityChangerMixin = {
     },
 };
 
-openerp.web.form.InvisibilityChanger = openerp.web.Class.extend(_.extend({}, openerp.web.GetterSetterMixin, openerp.web.form.InvisibilityChangerMixin, {
+instance.web.form.InvisibilityChanger = instance.web.Class.extend(_.extend({}, instance.web.GetterSetterMixin, instance.web.form.InvisibilityChangerMixin, {
     init: function(parent, field_manager, invisible_domain, $element) {
         this.setParent(parent);
-        openerp.web.GetterSetterMixin.init.call(this);
-        openerp.web.form.InvisibilityChangerMixin.init.call(this, field_manager, invisible_domain);
+        instance.web.GetterSetterMixin.init.call(this);
+        instance.web.form.InvisibilityChangerMixin.init.call(this, field_manager, invisible_domain);
         this.$element = $element;
         this.start();
     },
 }));
 
-openerp.web.form.Widget = openerp.web.Widget.extend(_.extend({}, openerp.web.form.InvisibilityChangerMixin, {
+instance.web.form.Widget = instance.web.Widget.extend(_.extend({}, instance.web.form.InvisibilityChangerMixin, {
     /**
-     * @constructs openerp.web.form.Widget
-     * @extends openerp.web.Widget
+     * @constructs instance.web.form.Widget
+     * @extends instance.web.Widget
      *
      * @param view
      * @param node
@@ -1348,7 +1348,7 @@ openerp.web.form.Widget = openerp.web.Widget.extend(_.extend({}, openerp.web.for
         this.view = view;
         this.node = node;
         this.modifiers = JSON.parse(this.node.attrs.modifiers || '{}');
-        openerp.web.form.InvisibilityChangerMixin.init.call(this, view, this.modifiers.invisible);
+        instance.web.form.InvisibilityChangerMixin.init.call(this, view, this.modifiers.invisible);
 
         this.view.on("view_content_has_changed", this, this.process_modifiers);
     },
@@ -1358,14 +1358,14 @@ openerp.web.form.Widget = openerp.web.Widget.extend(_.extend({}, openerp.web.for
     },
     start: function() {
         this._super();
-        openerp.web.form.InvisibilityChangerMixin.start.call(this);
+        instance.web.form.InvisibilityChangerMixin.start.call(this);
     },
     destroy: function() {
         $.fn.tipsy.clear();
         this._super.apply(this, arguments);
     },
     process_modifiers: function() {
-        var compute_domain = openerp.web.form.compute_domain;
+        var compute_domain = instance.web.form.compute_domain;
         var to_set = {};
         for (var a in this.modifiers) {
             if (!_.include(["invisible"], a)) {
@@ -1390,7 +1390,7 @@ openerp.web.form.Widget = openerp.web.Widget.extend(_.extend({}, openerp.web.for
                         template = 'WidgetLabel.tooltip';
                     }
                     return QWeb.render(template, {
-                        debug: openerp.connection.debug,
+                        debug: instance.connection.debug,
                         widget: widget
                 })},
                 gravity: $.fn.tipsy.autoBounds(50, 'nw'),
@@ -1417,7 +1417,7 @@ openerp.web.form.Widget = openerp.web.Widget.extend(_.extend({}, openerp.web.for
     },
     _build_eval_context: function(blacklist) {
         var a_dataset = this.view.dataset;
-        return new openerp.web.CompoundContext(a_dataset.get_context(), this._build_view_fields_values(blacklist));
+        return new instance.web.CompoundContext(a_dataset.get_context(), this._build_view_fields_values(blacklist));
     },
     /**
      * Builds a new context usable for operations related to fields by merging
@@ -1432,7 +1432,7 @@ openerp.web.form.Widget = openerp.web.Widget.extend(_.extend({}, openerp.web.for
         
         if (v_context.__ref || true) { //TODO: remove true
             var fields_values = this._build_eval_context(blacklist);
-            v_context = new openerp.web.CompoundContext(v_context).set_eval_context(fields_values);
+            v_context = new instance.web.CompoundContext(v_context).set_eval_context(fields_values);
         }
         return v_context;
     },
@@ -1443,13 +1443,13 @@ openerp.web.form.Widget = openerp.web.Widget.extend(_.extend({}, openerp.web.for
         var final_domain = n_domain !== null ? n_domain : f_domain;
         if (!(final_domain instanceof Array) || true) { //TODO: remove true
             var fields_values = this._build_eval_context();
-            final_domain = new openerp.web.CompoundDomain(final_domain).set_eval_context(fields_values);
+            final_domain = new instance.web.CompoundDomain(final_domain).set_eval_context(fields_values);
         }
         return final_domain;
     }
 }));
 
-openerp.web.form.WidgetButton = openerp.web.form.Widget.extend({
+instance.web.form.WidgetButton = instance.web.form.Widget.extend({
     template: 'WidgetButton',
     init: function(view, node) {
         this._super(view, node);
@@ -1463,7 +1463,7 @@ openerp.web.form.WidgetButton = openerp.web.form.Widget.extend({
     start: function() {
         this._super.apply(this, arguments);
         this.$element.click(this.on_click);
-        if (this.node.attrs.help || openerp.connection.debug) {
+        if (this.node.attrs.help || instance.connection.debug) {
             this.do_attach_tooltip();
         }
     },
@@ -1481,7 +1481,7 @@ openerp.web.form.WidgetButton = openerp.web.form.Widget.extend({
         var exec_action = function() {
             if (self.node.attrs.confirm) {
                 var def = $.Deferred();
-                var dialog = openerp.web.dialog($('<div/>').text(self.node.attrs.confirm), {
+                var dialog = instance.web.dialog($('<div/>').text(self.node.attrs.confirm), {
                     title: _t('Confirm'),
                     modal: true,
                     buttons: [
@@ -1515,7 +1515,7 @@ openerp.web.form.WidgetButton = openerp.web.form.Widget.extend({
 
         var context = this.node.attrs.context;
         if (context && context.__ref) {
-            context = new openerp.web.CompoundContext(context);
+            context = new instance.web.CompoundContext(context);
             context.set_eval_context(this._build_eval_context());
         }
 
@@ -1546,7 +1546,7 @@ openerp.web.form.WidgetButton = openerp.web.form.Widget.extend({
  *     - view_content_has_changed : when the values of the fields have changed. When
  *     this event is triggered all fields should reprocess their modifiers.
  */
-openerp.web.form.FieldManagerInterface = {
+instance.web.form.FieldManagerInterface = {
 
 };
 
@@ -1561,7 +1561,7 @@ openerp.web.form.FieldManagerInterface = {
  *     - ...
  * 
  */
-openerp.web.form.FieldInterface = {
+instance.web.form.FieldInterface = {
     /**
      * Constructor takes 2 arguments:
      * - field_manager: Implements FieldManagerInterface
@@ -1618,10 +1618,10 @@ openerp.web.form.FieldInterface = {
  *      the values of the "readonly" property and the "force_readonly" property on the field manager.
  * 
  */
-openerp.web.form.AbstractField = openerp.web.form.Widget.extend(/** @lends openerp.web.form.AbstractField# */{
+instance.web.form.AbstractField = instance.web.form.Widget.extend(/** @lends instance.web.form.AbstractField# */{
     /**
-     * @constructs openerp.web.form.AbstractField
-     * @extends openerp.web.form.Widget
+     * @constructs instance.web.form.AbstractField
+     * @extends instance.web.form.Widget
      *
      * @param field_manager
      * @param node
@@ -1651,7 +1651,7 @@ openerp.web.form.AbstractField = openerp.web.form.Widget.extend(/** @lends opene
             this.$element.addClass('oe_form_field_translatable');
             this.$element.find('.oe_field_translate').click(this.on_translate);
         }
-        if (this.node.attrs.nolabel && openerp.connection.debug) {
+        if (this.node.attrs.nolabel && instance.connection.debug) {
             this.do_attach_tooltip(this, this.$label || this.$element);
         }
         if (!this.disable_utility_classes) {
@@ -1737,7 +1737,7 @@ openerp.web.form.AbstractField = openerp.web.form.Widget.extend(/** @lends opene
  * A mixin to apply on any field that has to completely re-render when its readonly state
  * switch.
  */
-openerp.web.form.ReinitializeFieldMixin =  {
+instance.web.form.ReinitializeFieldMixin =  {
     /**
      * Default implementation of start(), use it or call explicitly initialize_field().
      */
@@ -1770,7 +1770,7 @@ openerp.web.form.ReinitializeFieldMixin =  {
     render_value: function() {},
 };
 
-openerp.web.form.FieldChar = openerp.web.form.AbstractField.extend(_.extend({}, openerp.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);
@@ -1784,7 +1784,7 @@ openerp.web.form.FieldChar = openerp.web.form.AbstractField.extend(_.extend({},
         this.render_value();
     },
     render_value: function() {
-        var show_value = openerp.web.format_value(this.value, this, '');
+        var show_value = instance.web.format_value(this.value, this, '');
         if (!this.get("effective_readonly")) {
             this.$element.find('input').val(show_value);
         } else {
@@ -1795,14 +1795,14 @@ openerp.web.form.FieldChar = openerp.web.form.AbstractField.extend(_.extend({},
         }
     },
     set_value_from_ui: function() {
-        this.value = openerp.web.parse_value(this.$element.find('input').val(), this);
+        this.value = instance.web.parse_value(this.$element.find('input').val(), this);
         this._super();
     },
     validate: function() {
         this.invalid = false;
         if (!this.get("effective_readonly")) {
             try {
-                var value = openerp.web.parse_value(this.$element.find('input').val(), this, '');
+                var value = instance.web.parse_value(this.$element.find('input').val(), this, '');
                 this.invalid = this.get("required") && value === '';
             } catch(e) {
                 this.invalid = true;
@@ -1814,11 +1814,11 @@ openerp.web.form.FieldChar = openerp.web.form.AbstractField.extend(_.extend({},
     }
 }));
 
-openerp.web.form.FieldID = openerp.web.form.FieldChar.extend({
+instance.web.form.FieldID = instance.web.form.FieldChar.extend({
     
 });
 
-openerp.web.form.FieldEmail = openerp.web.form.FieldChar.extend({
+instance.web.form.FieldEmail = instance.web.form.FieldChar.extend({
     template: 'FieldEmail',
     initialize_content: function() {
         this._super();
@@ -1842,7 +1842,7 @@ openerp.web.form.FieldEmail = openerp.web.form.FieldChar.extend({
     }
 });
 
-openerp.web.form.FieldUrl = openerp.web.form.FieldChar.extend({
+instance.web.form.FieldUrl = instance.web.form.FieldChar.extend({
     template: 'FieldUrl',
     initialize_content: function() {
         this._super();
@@ -1872,7 +1872,7 @@ openerp.web.form.FieldUrl = openerp.web.form.FieldChar.extend({
     }
 });
 
-openerp.web.form.FieldFloat = openerp.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);
@@ -1892,7 +1892,7 @@ openerp.web.form.FieldFloat = openerp.web.form.FieldChar.extend({
     }
 });
 
-openerp.web.DateTimeWidget = openerp.web.OldWidget.extend({
+instance.web.DateTimeWidget = instance.web.OldWidget.extend({
     template: "web.datetimepicker",
     jqueryui_object: 'datetimepicker',
     type_of_date: "datetime",
@@ -1914,7 +1914,7 @@ openerp.web.DateTimeWidget = openerp.web.OldWidget.extend({
         });
         this.$element.find('img.oe_datepicker_trigger').click(function() {
             if (!self.get("effective_readonly") && !self.picker('widget').is(':visible')) {
-                self.picker('setDate', self.value ? openerp.web.auto_str_to_date(self.value) : new Date());
+                self.picker('setDate', self.value ? instance.web.auto_str_to_date(self.value) : new Date());
                 self.$input_picker.show();
                 self.picker('show');
                 self.$input_picker.hide();
@@ -1960,10 +1960,10 @@ openerp.web.DateTimeWidget = openerp.web.OldWidget.extend({
         }
     },
     parse_client: function(v) {
-        return openerp.web.parse_value(v, {"widget": this.type_of_date});
+        return instance.web.parse_value(v, {"widget": this.type_of_date});
     },
     format_client: function(v) {
-        return openerp.web.format_value(v, {"widget": this.type_of_date});
+        return instance.web.format_value(v, {"widget": this.type_of_date});
     },
     on_change: function() {
         if (this.is_valid()) {
@@ -1972,15 +1972,15 @@ openerp.web.DateTimeWidget = openerp.web.OldWidget.extend({
     }
 });
 
-openerp.web.DateWidget = openerp.web.DateTimeWidget.extend({
+instance.web.DateWidget = instance.web.DateTimeWidget.extend({
     jqueryui_object: 'datepicker',
     type_of_date: "date"
 });
 
-openerp.web.form.FieldDatetime = openerp.web.form.AbstractField.extend(_.extend({}, openerp.web.form.ReinitializeFieldMixin, {
+instance.web.form.FieldDatetime = instance.web.form.AbstractField.extend(_.extend({}, instance.web.form.ReinitializeFieldMixin, {
     template: "EmptyComponent",
     build_widget: function() {
-        return new openerp.web.DateTimeWidget(this);
+        return new instance.web.DateTimeWidget(this);
     },
     destroy_content: function() {
         if (this.datewidget) {
@@ -2003,7 +2003,7 @@ openerp.web.form.FieldDatetime = openerp.web.form.AbstractField.extend(_.extend(
         if (!this.get("effective_readonly")) {
             this.datewidget.set_value(this.value);
         } else {
-            this.$element.text(openerp.web.format_value(this.value, this, ''));
+            this.$element.text(instance.web.format_value(this.value, this, ''));
         }
     },
     get_value: function() {
@@ -2024,13 +2024,13 @@ openerp.web.form.FieldDatetime = openerp.web.form.AbstractField.extend(_.extend(
     }
 }));
 
-openerp.web.form.FieldDate = openerp.web.form.FieldDatetime.extend({
+instance.web.form.FieldDate = instance.web.form.FieldDatetime.extend({
     build_widget: function() {
-        return new openerp.web.DateWidget(this);
+        return new instance.web.DateWidget(this);
     }
 });
 
-openerp.web.form.FieldText = openerp.web.form.AbstractField.extend(_.extend({}, openerp.web.form.ReinitializeFieldMixin, {
+instance.web.form.FieldText = instance.web.form.AbstractField.extend(_.extend({}, instance.web.form.ReinitializeFieldMixin, {
     template: 'FieldText',
     initialize_content: function() {
         this.$textarea = undefined;
@@ -2044,7 +2044,7 @@ openerp.web.form.FieldText = openerp.web.form.AbstractField.extend(_.extend({},
         this.render_value();
     },
     render_value: function() {
-        var show_value = openerp.web.format_value(this.value, this, '');
+        var show_value = instance.web.format_value(this.value, this, '');
         if (!this.get("effective_readonly")) {
             this.$textarea.val(show_value);
             if (!this.resized && this.view.options.resize_textareas) {
@@ -2056,14 +2056,14 @@ openerp.web.form.FieldText = openerp.web.form.AbstractField.extend(_.extend({},
         }
     },
     set_value_from_ui: function() {
-        this.value = openerp.web.parse_value(this.$textarea.val(), this);
+        this.value = instance.web.parse_value(this.$textarea.val(), this);
         this._super();
     },
     validate: function() {
         this.invalid = false;
         if (!this.get("effective_readonly")) {
             try {
-                var value = openerp.web.parse_value(this.$textarea.val(), this, '');
+                var value = instance.web.parse_value(this.$textarea.val(), this, '');
                 this.invalid = this.get("required") && value === '';
             } catch(e) {
                 this.invalid = true;
@@ -2098,7 +2098,7 @@ openerp.web.form.FieldText = openerp.web.form.AbstractField.extend(_.extend({},
     }
 }));
 
-openerp.web.form.FieldBoolean = openerp.web.form.AbstractField.extend({
+instance.web.form.FieldBoolean = instance.web.form.AbstractField.extend({
     template: 'FieldBoolean',
     start: function() {
         this._super.apply(this, arguments);
@@ -2123,7 +2123,7 @@ openerp.web.form.FieldBoolean = openerp.web.form.AbstractField.extend({
     }
 });
 
-openerp.web.form.FieldProgressBar = openerp.web.form.AbstractField.extend({
+instance.web.form.FieldProgressBar = instance.web.form.AbstractField.extend({
     template: 'FieldProgressBar',
     start: function() {
         this._super.apply(this, arguments);
@@ -2138,16 +2138,16 @@ openerp.web.form.FieldProgressBar = openerp.web.form.AbstractField.extend({
         if (isNaN(show_value)) {
             show_value = 0;
         }
-        var formatted_value = openerp.web.format_value(show_value, { type : 'float' }, '0');
+        var formatted_value = instance.web.format_value(show_value, { type : 'float' }, '0');
         this.$element.progressbar('option', 'value', show_value).find('span').html(formatted_value + '%');
     }
 });
 
-openerp.web.form.FieldTextXml = openerp.web.form.AbstractField.extend({
+instance.web.form.FieldTextXml = instance.web.form.AbstractField.extend({
 // to replace view editor
 });
 
-openerp.web.form.FieldSelection = openerp.web.form.AbstractField.extend(_.extend({}, openerp.web.form.ReinitializeFieldMixin, {
+instance.web.form.FieldSelection = instance.web.form.AbstractField.extend(_.extend({}, instance.web.form.ReinitializeFieldMixin, {
     template: 'FieldSelection',
     init: function(view, node) {
         var self = this;
@@ -2252,17 +2252,17 @@ openerp.web.form.FieldSelection = openerp.web.form.AbstractField.extend(_.extend
     });
 })();
 
-openerp.web.form.dialog = function(content, options) {
+instance.web.form.dialog = function(content, options) {
     options = _.extend({
         width: '90%',
         height: 'auto',
         min_width: '800px'
     }, options || {});
-    var dialog = new openerp.web.Dialog(null, options, content).open();
+    var dialog = new instance.web.Dialog(null, options, content).open();
     return dialog.$element;
 };
 
-openerp.web.form.FieldMany2One = openerp.web.form.AbstractField.extend(_.extend({}, openerp.web.form.ReinitializeFieldMixin, {
+instance.web.form.FieldMany2One = instance.web.form.AbstractField.extend(_.extend({}, instance.web.form.ReinitializeFieldMixin, {
     template: "FieldMany2One",
     init: function(view, node) {
         this._super(view, node);
@@ -2275,7 +2275,7 @@ openerp.web.form.FieldMany2One = openerp.web.form.AbstractField.extend(_.extend(
     },
     start: function() {
         this._super();
-        openerp.web.form.ReinitializeFieldMixin.start.call(this);
+        instance.web.form.ReinitializeFieldMixin.start.call(this);
         this.on("change:value", this, function() {
             this.floating = false;
             this.render_value();
@@ -2308,7 +2308,7 @@ openerp.web.form.FieldMany2One = openerp.web.form.AbstractField.extend(_.extend(
             if (!self.get('value')) {
                 return;
             }
-            var pop = new openerp.web.form.FormOpenPopup(self.view);
+            var pop = new instance.web.form.FormOpenPopup(self.view);
             pop.show_element(
                 self.field.relation,
                 self.get("value"),
@@ -2427,7 +2427,7 @@ openerp.web.form.FieldMany2One = openerp.web.form.AbstractField.extend(_.extend(
             this.abort_last();
             delete this.abort_last;
         }
-        var dataset = new openerp.web.DataSetStatic(this, this.field.relation, self.build_context());
+        var dataset = new instance.web.DataSetStatic(this, this.field.relation, self.build_context());
 
         dataset.name_search(search_val, self.build_domain(), 'ilike',
                 this.limit + 1, function(data) {
@@ -2477,7 +2477,7 @@ openerp.web.form.FieldMany2One = openerp.web.form.AbstractField.extend(_.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());
+            var dataset = new instance.web.DataSetStatic(this, this.field.relation, self.build_context());
             dataset.name_create(name, function(data) {
                 self.display_value = {};
                 self.display_value["" + data[0]] = data[1];
@@ -2492,7 +2492,7 @@ openerp.web.form.FieldMany2One = openerp.web.form.AbstractField.extend(_.extend(
     // all search/create popup handling
     _search_create_popup: function(view, ids, context) {
         var self = this;
-        var pop = new openerp.web.form.SelectCreatePopup(this);
+        var pop = new instance.web.form.SelectCreatePopup(this);
         pop.select_element(
             self.field.relation,
             {
@@ -2502,7 +2502,7 @@ openerp.web.form.FieldMany2One = openerp.web.form.AbstractField.extend(_.extend(
                 disable_multiple_selection: true
             },
             self.build_domain(),
-            new openerp.web.CompoundContext(self.build_context(), context || {})
+            new instance.web.CompoundContext(self.build_context(), context || {})
         );
         pop.on_select_elements.add(function(element_ids) {
             self.set({value: element_ids[0]});
@@ -2520,7 +2520,7 @@ openerp.web.form.FieldMany2One = openerp.web.form.AbstractField.extend(_.extend(
             return;
         }
         if (! no_recurse) {
-            var dataset = new openerp.web.DataSetStatic(this, this.field.relation, self.view.dataset.get_context());
+            var dataset = new instance.web.DataSetStatic(this, this.field.relation, self.view.dataset.get_context());
             dataset.name_get([self.get("value")], function(data) {
                 self.display_value["" + self.get("value")] = data[0][1];
                 self.render_value(true);
@@ -2617,7 +2617,7 @@ var commands = {
         return [6, false, ids];
     }
 };
-openerp.web.form.FieldOne2Many = openerp.web.form.AbstractField.extend({
+instance.web.form.FieldOne2Many = instance.web.form.AbstractField.extend({
     multi_selection: false,
     disable_utility_classes: true,
     init: function(view, node) {
@@ -2634,7 +2634,7 @@ openerp.web.form.FieldOne2Many = openerp.web.form.AbstractField.extend({
 
         var self = this;
 
-        this.dataset = new openerp.web.form.One2ManyDataSet(this, this.field.relation);
+        this.dataset = new instance.web.form.One2ManyDataSet(this, this.field.relation);
         this.dataset.o2m = this;
         this.dataset.parent_view = this.view;
         this.dataset.child_name = this.name;
@@ -2695,12 +2695,12 @@ openerp.web.form.FieldOne2Many = openerp.web.form.AbstractField.extend({
         });
         this.views = views;
 
-        this.viewmanager = new openerp.web.ViewManager(this, this.dataset, views, {});
+        this.viewmanager = new instance.web.ViewManager(this, this.dataset, views, {});
         this.viewmanager.template = 'One2Many.viewmanager';
-        this.viewmanager.registry = openerp.web.views.extend({
-            list: 'openerp.web.form.One2ManyListView',
-            form: 'openerp.web.form.One2ManyFormView',
-            kanban: 'openerp.web.form.One2ManyKanbanView',
+        this.viewmanager.registry = instance.web.views.extend({
+            list: 'instance.web.form.One2ManyListView',
+            form: 'instance.web.form.One2ManyFormView',
+            kanban: 'instance.web.form.One2ManyKanbanView',
         });
         var once = $.Deferred().then(function() {
             self.init_form_last_update.resolve();
@@ -2894,21 +2894,21 @@ openerp.web.form.FieldOne2Many = openerp.web.form.AbstractField.extend({
     }
 });
 
-openerp.web.form.One2ManyDataSet = openerp.web.BufferedDataSet.extend({
+instance.web.form.One2ManyDataSet = instance.web.BufferedDataSet.extend({
     get_context: function() {
         this.context = this.o2m.build_context([this.o2m.name]);
         return this.context;
     }
 });
 
-openerp.web.form.One2ManyListView = openerp.web.ListView.extend({
+instance.web.form.One2ManyListView = instance.web.ListView.extend({
     _template: 'One2Many.listview',
     do_add_record: function () {
         if (this.options.editable) {
             this._super.apply(this, arguments);
         } else {
             var self = this;
-            var pop = new openerp.web.form.SelectCreatePopup(this);
+            var pop = new instance.web.form.SelectCreatePopup(this);
             pop.on_default_get.add(self.dataset.on_default_get);
             pop.select_element(
                 self.o2m.field.relation,
@@ -2939,7 +2939,7 @@ openerp.web.form.One2ManyListView = openerp.web.ListView.extend({
     },
     do_activate_record: function(index, id) {
         var self = this;
-        var pop = new openerp.web.form.FormOpenPopup(self.o2m.view);
+        var pop = new instance.web.form.FormOpenPopup(self.o2m.view);
         pop.show_element(self.o2m.field.relation, id, self.o2m.build_context(), {
             title: _t("Open: ") + self.name,
             auto_write: false,
@@ -2965,7 +2965,7 @@ openerp.web.form.One2ManyListView = openerp.web.ListView.extend({
     }
 });
 
-openerp.web.form.One2ManyFormView = openerp.web.FormView.extend({
+instance.web.form.One2ManyFormView = instance.web.FormView.extend({
     form_template: 'One2Many.formview',
     on_loaded: function(data) {
         this._super(data);
@@ -2984,12 +2984,12 @@ openerp.web.form.One2ManyFormView = openerp.web.FormView.extend({
 });
 
 var lazy_build_o2m_kanban_view = function() {
-if (! openerp.web_kanban || openerp.web.form.One2ManyKanbanView)
+if (! instance.web_kanban || instance.web.form.One2ManyKanbanView)
     return;
-openerp.web.form.One2ManyKanbanView = openerp.web_kanban.KanbanView.extend({
+instance.web.form.One2ManyKanbanView = instance.web_kanban.KanbanView.extend({
     open_record: function(id) {
         var self = this;
-        var pop = new openerp.web.form.FormOpenPopup(self.o2m.view);
+        var pop = new instance.web.form.FormOpenPopup(self.o2m.view);
         pop.show_element(self.o2m.field.relation, id, self.o2m.build_context(), {
             title: _t("Open: ") + self.name,
             auto_write: false,
@@ -3015,7 +3015,7 @@ openerp.web.form.One2ManyKanbanView = openerp.web_kanban.KanbanView.extend({
 /*
  * TODO niv: clean those deferred stuff, it could be better
  */
-openerp.web.form.FieldMany2Many = openerp.web.form.AbstractField.extend({
+instance.web.form.FieldMany2Many = instance.web.form.AbstractField.extend({
     multi_selection: false,
     disable_utility_classes: true,
     init: function(view, node) {
@@ -3029,7 +3029,7 @@ openerp.web.form.FieldMany2Many = openerp.web.form.AbstractField.extend({
 
         var self = this;
 
-        this.dataset = new openerp.web.form.Many2ManyDataSet(this, this.field.relation);
+        this.dataset = new instance.web.form.Many2ManyDataSet(this, this.field.relation);
         this.dataset.m2m = this;
         this.dataset.on_unlink.add_last(function(ids) {
             self.on_ui_change();
@@ -3068,7 +3068,7 @@ openerp.web.form.FieldMany2Many = openerp.web.form.AbstractField.extend({
     },
     load_view: function() {
         var self = this;
-        this.list_view = new openerp.web.form.Many2ManyListView(this, this.dataset, false, {
+        this.list_view = new instance.web.form.Many2ManyListView(this, this.dataset, false, {
                     'addable': self.get("effective_readonly") ? null : _t("Add"),
                     'deletable': self.get("effective_readonly") ? false : true,
                     'selectable': self.multi_selection,
@@ -3097,7 +3097,7 @@ openerp.web.form.FieldMany2Many = openerp.web.form.AbstractField.extend({
     },
 });
 
-openerp.web.form.Many2ManyDataSet = openerp.web.DataSetStatic.extend({
+instance.web.form.Many2ManyDataSet = instance.web.DataSetStatic.extend({
     get_context: function() {
         this.context = this.m2m.build_context();
         return this.context;
@@ -3106,17 +3106,17 @@ openerp.web.form.Many2ManyDataSet = openerp.web.DataSetStatic.extend({
 
 /**
  * @class
- * @extends openerp.web.ListView
+ * @extends instance.web.ListView
  */
-openerp.web.form.Many2ManyListView = openerp.web.ListView.extend(/** @lends openerp.web.form.Many2ManyListView# */{
+instance.web.form.Many2ManyListView = instance.web.ListView.extend(/** @lends instance.web.form.Many2ManyListView# */{
     do_add_record: function () {
-        var pop = new openerp.web.form.SelectCreatePopup(this);
+        var pop = new instance.web.form.SelectCreatePopup(this);
         pop.select_element(
             this.model,
             {
                 title: _t("Add: ") + this.name
             },
-            new openerp.web.CompoundDomain(this.m2m_field.build_domain(), ["!", ["id", "in", this.m2m_field.dataset.ids]]),
+            new instance.web.CompoundDomain(this.m2m_field.build_domain(), ["!", ["id", "in", this.m2m_field.dataset.ids]]),
             this.m2m_field.build_context()
         );
         var self = this;
@@ -3132,7 +3132,7 @@ openerp.web.form.Many2ManyListView = openerp.web.ListView.extend(/** @lends open
     },
     do_activate_record: function(index, id) {
         var self = this;
-        var pop = new openerp.web.form.FormOpenPopup(this);
+        var pop = new instance.web.form.FormOpenPopup(this);
         pop.show_element(this.dataset.model, id, this.m2m_field.build_context(), {
             title: _t("Open: ") + this.name,
             readonly: this.getParent().get("effective_readonly")
@@ -3145,9 +3145,9 @@ openerp.web.form.Many2ManyListView = openerp.web.ListView.extend(/** @lends open
 
 /**
  * @class
- * @extends openerp.web.OldWidget
+ * @extends instance.web.OldWidget
  */
-openerp.web.form.SelectCreatePopup = openerp.web.OldWidget.extend(/** @lends openerp.web.form.SelectCreatePopup# */{
+instance.web.form.SelectCreatePopup = instance.web.OldWidget.extend(/** @lends instance.web.form.SelectCreatePopup# */{
     template: "SelectCreatePopup",
     /**
      * options:
@@ -3173,7 +3173,7 @@ openerp.web.form.SelectCreatePopup = openerp.web.OldWidget.extend(/** @lends ope
         this.initial_ids = this.options.initial_ids;
         this.created_elements = [];
         this.renderElement();
-        openerp.web.form.dialog(this.$element, {
+        instance.web.form.dialog(this.$element, {
             close: function() {
                 self.check_exit();
             },
@@ -3184,7 +3184,7 @@ openerp.web.form.SelectCreatePopup = openerp.web.OldWidget.extend(/** @lends ope
     start: function() {
         this._super();
         var self = this;
-        this.dataset = new openerp.web.ProxyDataSet(this, this.model,
+        this.dataset = new instance.web.ProxyDataSet(this, this.model,
             this.context);
         this.dataset.create_function = function() {
             return self.options.create_function.apply(null, arguments).then(function(r) {
@@ -3225,7 +3225,7 @@ openerp.web.form.SelectCreatePopup = openerp.web.OldWidget.extend(/** @lends ope
         if (this.searchview) {
             this.searchview.destroy();
         }
-        this.searchview = new openerp.web.SearchView(this,
+        this.searchview = new instance.web.SearchView(this,
                 this.dataset, false,  search_defaults);
         this.searchview.on_search.add(function(domains, contexts, groupbys) {
             if (self.initial_ids) {
@@ -3237,7 +3237,7 @@ openerp.web.form.SelectCreatePopup = openerp.web.OldWidget.extend(/** @lends ope
             }
         });
         this.searchview.on_loaded.add_last(function () {
-            self.view_list = new openerp.web.form.SelectCreateListView(self,
+            self.view_list = new instance.web.form.SelectCreateListView(self,
                     self.dataset, false,
                     _.extend({'deletable': false,
                         'selectable': !self.options.disable_multiple_selection
@@ -3279,14 +3279,14 @@ openerp.web.form.SelectCreatePopup = openerp.web.OldWidget.extend(/** @lends ope
     },
     create_row: function() {
         var self = this;
-        var wdataset = new openerp.web.DataSetSearch(this, this.model, this.context, this.domain);
+        var wdataset = new instance.web.DataSetSearch(this, this.model, this.context, this.domain);
         wdataset.parent_view = this.options.parent_view;
         wdataset.child_name = this.options.child_name;
         return wdataset.create.apply(wdataset, arguments);
     },
     write_row: function() {
         var self = this;
-        var wdataset = new openerp.web.DataSetSearch(this, this.model, this.context, this.domain);
+        var wdataset = new instance.web.DataSetSearch(this, this.model, this.context, this.domain);
         wdataset.parent_view = this.options.parent_view;
         wdataset.child_name = this.options.child_name;
         return wdataset.write.apply(wdataset, arguments);
@@ -3310,7 +3310,7 @@ openerp.web.form.SelectCreatePopup = openerp.web.OldWidget.extend(/** @lends ope
             this.view_list.$element.hide();
         }
         this.dataset.index = null;
-        this.view_form = new openerp.web.FormView(this, this.dataset, false, self.options.form_view_options);
+        this.view_form = new instance.web.FormView(this, this.dataset, false, self.options.form_view_options);
         if (this.options.alternative_form_view) {
             this.view_form.set_embedded_view(this.options.alternative_form_view);
         }
@@ -3350,7 +3350,7 @@ openerp.web.form.SelectCreatePopup = openerp.web.OldWidget.extend(/** @lends ope
     on_default_get: function(res) {}
 });
 
-openerp.web.form.SelectCreateListView = openerp.web.ListView.extend({
+instance.web.form.SelectCreateListView = instance.web.ListView.extend({
     do_add_record: function () {
         this.popup.new_object();
     },
@@ -3366,9 +3366,9 @@ openerp.web.form.SelectCreateListView = openerp.web.ListView.extend({
 
 /**
  * @class
- * @extends openerp.web.OldWidget
+ * @extends instance.web.OldWidget
  */
-openerp.web.form.FormOpenPopup = openerp.web.OldWidget.extend(/** @lends openerp.web.form.FormOpenPopup# */{
+instance.web.form.FormOpenPopup = instance.web.OldWidget.extend(/** @lends instance.web.form.FormOpenPopup# */{
     template: "FormOpenPopup",
     /**
      * options:
@@ -3386,7 +3386,7 @@ openerp.web.form.FormOpenPopup = openerp.web.OldWidget.extend(/** @lends openerp
         this.context = context || {};
         this.options = _.defaults(options || {}, {"auto_write": true});
         this.renderElement();
-        openerp.web.dialog(this.$element, {
+        instance.web.dialog(this.$element, {
             title: options.title || '',
             modal: true,
             width: 960,
@@ -3396,7 +3396,7 @@ openerp.web.form.FormOpenPopup = openerp.web.OldWidget.extend(/** @lends openerp
     },
     start: function() {
         this._super();
-        this.dataset = new openerp.web.form.FormOpenDataset(this, this.model, this.context);
+        this.dataset = new instance.web.form.FormOpenDataset(this, this.model, this.context);
         this.dataset.fop = this;
         this.dataset.ids = [this.row_id];
         this.dataset.index = 0;
@@ -3408,7 +3408,7 @@ openerp.web.form.FormOpenPopup = openerp.web.OldWidget.extend(/** @lends openerp
         if (!this.options.auto_write)
             return;
         var self = this;
-        var wdataset = new openerp.web.DataSetSearch(this, this.model, this.context, this.domain);
+        var wdataset = new instance.web.DataSetSearch(this, this.model, this.context, this.domain);
         wdataset.parent_view = this.options.parent_view;
         wdataset.child_name = this.options.child_name;
         wdataset.write(id, data, {}, function(r) {
@@ -3418,7 +3418,7 @@ openerp.web.form.FormOpenPopup = openerp.web.OldWidget.extend(/** @lends openerp
     on_write_completed: function() {},
     setup_form_view: function() {
         var self = this;
-        var FormClass = openerp.web.views.get_object('form');
+        var FormClass = instance.web.views.get_object('form');
         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);
@@ -3449,7 +3449,7 @@ openerp.web.form.FormOpenPopup = openerp.web.OldWidget.extend(/** @lends openerp
     }
 });
 
-openerp.web.form.FormOpenDataset = openerp.web.ProxyDataSet.extend({
+instance.web.form.FormOpenDataset = instance.web.ProxyDataSet.extend({
     read_ids: function() {
         if (this.fop.options.read_function) {
             return this.fop.options.read_function.apply(null, arguments);
@@ -3459,7 +3459,7 @@ openerp.web.form.FormOpenDataset = openerp.web.ProxyDataSet.extend({
     }
 });
 
-openerp.web.form.FieldReference = openerp.web.form.AbstractField.extend(_.extend({}, openerp.web.form.ReinitializeFieldMixin, {
+instance.web.form.FieldReference = instance.web.form.AbstractField.extend(_.extend({}, instance.web.form.ReinitializeFieldMixin, {
     template: 'FieldReference',
     init: function(view, node) {
         this._super(view, node);
@@ -3503,7 +3503,7 @@ openerp.web.form.FieldReference = openerp.web.form.AbstractField.extend(_.extend
         }
     },
     initialize_content: function() {
-        this.selection = new openerp.web.form.FieldSelection(this, { attrs: {
+        this.selection = new instance.web.form.FieldSelection(this, { attrs: {
             name: 'selection',
             widget: 'selection'
         }});
@@ -3513,7 +3513,7 @@ openerp.web.form.FieldReference = openerp.web.form.AbstractField.extend(_.extend
         this.selection.renderElement();
         this.selection.start();
 
-        this.m2o = new openerp.web.form.FieldMany2One(this, { attrs: {
+        this.m2o = new instance.web.form.FieldMany2One(this, { attrs: {
             name: 'm2o',
             widget: 'many2one'
         }});
@@ -3560,7 +3560,7 @@ openerp.web.form.FieldReference = openerp.web.form.AbstractField.extend(_.extend
     }
 }));
 
-openerp.web.form.FieldBinary = openerp.web.form.AbstractField.extend(_.extend({}, openerp.web.form.ReinitializeFieldMixin, {
+instance.web.form.FieldBinary = instance.web.form.AbstractField.extend(_.extend({}, instance.web.form.ReinitializeFieldMixin, {
     init: function(view, node) {
         this._super(view, node);
         this.iframe = this.element_id + '_iframe';
@@ -3619,7 +3619,7 @@ openerp.web.form.FieldBinary = openerp.web.form.AbstractField.extend(_.extend({}
                 context: this.view.dataset.get_context()
             })},
             complete: $.unblockUI,
-            error: openerp.webclient.crashmanager.on_rpc_error
+            error: instance.webclient.crashmanager.on_rpc_error
         });
     },
     on_clear: function() {
@@ -3632,7 +3632,7 @@ openerp.web.form.FieldBinary = openerp.web.form.AbstractField.extend(_.extend({}
     }
 }));
 
-openerp.web.form.FieldBinaryFile = openerp.web.form.FieldBinary.extend({
+instance.web.form.FieldBinaryFile = instance.web.form.FieldBinary.extend({
     template: 'FieldBinaryFile',
     initialize_content: function() {
         this._super();
@@ -3688,7 +3688,7 @@ openerp.web.form.FieldBinaryFile = openerp.web.form.FieldBinary.extend({
     }
 });
 
-openerp.web.form.FieldBinaryImage = openerp.web.form.FieldBinary.extend({
+instance.web.form.FieldBinaryImage = instance.web.form.FieldBinary.extend({
     template: 'FieldBinaryImage',
     initialize_content: function() {
         this._super();
@@ -3730,7 +3730,7 @@ openerp.web.form.FieldBinaryImage = openerp.web.form.FieldBinary.extend({
     }
 });
 
-openerp.web.form.FieldStatus = openerp.web.form.AbstractField.extend({
+instance.web.form.FieldStatus = instance.web.form.AbstractField.extend({
     template: "EmptyComponent",
     start: function() {
         this._super();
@@ -3758,7 +3758,7 @@ openerp.web.form.FieldStatus = openerp.web.form.AbstractField.extend({
             });
         }
 
-        var content = openerp.web.qweb.render("FieldStatus.content", {widget: this, _:_});
+        var content = instance.web.qweb.render("FieldStatus.content", {widget: this, _:_});
         this.$element.html(content);
 
         var colors = JSON.parse((this.node.attrs || {}).statusbar_colors || "{}");
@@ -3796,34 +3796,34 @@ openerp.web.form.FieldStatus = openerp.web.form.AbstractField.extend({
 });
 
 /**
- * Registry of form widgets, called by :js:`openerp.web.FormView`
+ * Registry of form widgets, called by :js:`instance.web.FormView`
  */
-openerp.web.form.widgets = new openerp.web.Registry({
-    'char' : 'openerp.web.form.FieldChar',
-    'id' : 'openerp.web.form.FieldID',
-    'email' : 'openerp.web.form.FieldEmail',
-    'url' : 'openerp.web.form.FieldUrl',
-    'text' : 'openerp.web.form.FieldText',
-    'date' : 'openerp.web.form.FieldDate',
-    'datetime' : 'openerp.web.form.FieldDatetime',
-    'selection' : 'openerp.web.form.FieldSelection',
-    'many2one' : 'openerp.web.form.FieldMany2One',
-    'many2many' : 'openerp.web.form.FieldMany2Many',
-    'one2many' : 'openerp.web.form.FieldOne2Many',
-    'one2many_list' : 'openerp.web.form.FieldOne2Many',
-    'reference' : 'openerp.web.form.FieldReference',
-    'boolean' : 'openerp.web.form.FieldBoolean',
-    'float' : 'openerp.web.form.FieldFloat',
-    'integer': 'openerp.web.form.FieldFloat',
-    'float_time': 'openerp.web.form.FieldFloat',
-    'progressbar': 'openerp.web.form.FieldProgressBar',
-    'image': 'openerp.web.form.FieldBinaryImage',
-    'binary': 'openerp.web.form.FieldBinaryFile',
-    'statusbar': 'openerp.web.form.FieldStatus'
+instance.web.form.widgets = new instance.web.Registry({
+    'char' : 'instance.web.form.FieldChar',
+    'id' : 'instance.web.form.FieldID',
+    'email' : 'instance.web.form.FieldEmail',
+    'url' : 'instance.web.form.FieldUrl',
+    'text' : 'instance.web.form.FieldText',
+    'date' : 'instance.web.form.FieldDate',
+    'datetime' : 'instance.web.form.FieldDatetime',
+    'selection' : 'instance.web.form.FieldSelection',
+    'many2one' : 'instance.web.form.FieldMany2One',
+    'many2many' : 'instance.web.form.FieldMany2Many',
+    'one2many' : 'instance.web.form.FieldOne2Many',
+    'one2many_list' : 'instance.web.form.FieldOne2Many',
+    'reference' : 'instance.web.form.FieldReference',
+    'boolean' : 'instance.web.form.FieldBoolean',
+    'float' : 'instance.web.form.FieldFloat',
+    'integer': 'instance.web.form.FieldFloat',
+    'float_time': 'instance.web.form.FieldFloat',
+    'progressbar': 'instance.web.form.FieldProgressBar',
+    'image': 'instance.web.form.FieldBinaryImage',
+    'binary': 'instance.web.form.FieldBinaryFile',
+    'statusbar': 'instance.web.form.FieldStatus'
 });
 
-openerp.web.form.tags = new openerp.web.Registry({
-    'button' : 'openerp.web.form.WidgetButton',
+instance.web.form.tags = new instance.web.Registry({
+    'button' : 'instance.web.form.WidgetButton',
 });
 
 };

From 759be357ce22c2ebde17a509cb80b9af01089f81 Mon Sep 17 00:00:00 2001
From: niv-openerp <nicolas.vanhoren@openerp.com>
Date: Tue, 17 Apr 2012 14:15:59 +0200
Subject: [PATCH 132/238] [imp] remaining of refactoring

bzr revid: nicolas.vanhoren@openerp.com-20120417121559-e94wr8ym8sb2f7c1
---
 addons/web/static/src/js/view_list.js         |  94 ++++++++--------
 .../web/static/src/js/view_list_editable.js   |  30 ++---
 addons/web/static/src/js/view_tree.js         |  20 ++--
 addons/web/static/src/js/views.js             | 104 +++++++++---------
 4 files changed, 124 insertions(+), 124 deletions(-)

diff --git a/addons/web/static/src/js/view_list.js b/addons/web/static/src/js/view_list.js
index d8ef6ecb34f..d149ef28840 100644
--- a/addons/web/static/src/js/view_list.js
+++ b/addons/web/static/src/js/view_list.js
@@ -1,9 +1,9 @@
-openerp.web.list = function (openerp) {
-var _t = openerp.web._t,
-   _lt = openerp.web._lt;
-var QWeb = openerp.web.qweb;
-openerp.web.views.add('list', 'openerp.web.ListView');
-openerp.web.ListView = openerp.web.View.extend( /** @lends openerp.web.ListView# */ {
+openerp.web.list = function (instance) {
+var _t = instance.web._t,
+   _lt = instance.web._lt;
+var QWeb = instance.web.qweb;
+instance.web.views.add('list', 'instance.web.ListView');
+instance.web.ListView = instance.web.View.extend( /** @lends instance.web.ListView# */ {
     _template: 'ListView',
     display_name: _lt('List'),
     defaults: {
@@ -33,11 +33,11 @@ openerp.web.ListView = openerp.web.View.extend( /** @lends openerp.web.ListView#
      * See constructor parameters and method documentations for information on
      * the default behaviors and possible options for the list view.
      *
-     * @constructs openerp.web.ListView
-     * @extends openerp.web.View
+     * @constructs instance.web.ListView
+     * @extends instance.web.View
      *
      * @param parent parent object
-     * @param {openerp.web.DataSet} dataset the dataset the view should work with
+     * @param {instance.web.DataSet} dataset the dataset the view should work with
      * @param {String} view_id the listview's identifier, if any
      * @param {Object} options A set of options used to configure the view
      * @param {Boolean} [options.selectable=true] determines whether view rows are selectable (e.g. via a checkbox)
@@ -61,12 +61,12 @@ openerp.web.ListView = openerp.web.View.extend( /** @lends openerp.web.ListView#
 
         this.records = new Collection();
 
-        this.set_groups(new openerp.web.ListView.Groups(this));
+        this.set_groups(new instance.web.ListView.Groups(this));
 
-        if (this.dataset instanceof openerp.web.DataSetStatic) {
-            this.groups.datagroup = new openerp.web.StaticDataGroup(this.dataset);
+        if (this.dataset instanceof instance.web.DataSetStatic) {
+            this.groups.datagroup = new instance.web.StaticDataGroup(this.dataset);
         } else {
-            this.groups.datagroup = new openerp.web.DataGroup(
+            this.groups.datagroup = new instance.web.DataGroup(
                 this, this.model,
                 dataset.get_domain(),
                 dataset.get_context(),
@@ -104,7 +104,7 @@ openerp.web.ListView = openerp.web.View.extend( /** @lends openerp.web.ListView#
     /**
      * Set a custom Group construct as the root of the List View.
      *
-     * @param {openerp.web.ListView.Groups} groups
+     * @param {instance.web.ListView.Groups} groups
      */
     set_groups: function (groups) {
         var self = this;
@@ -302,7 +302,7 @@ openerp.web.ListView = openerp.web.View.extend( /** @lends openerp.web.ListView#
 
         // Sidebar
         if (!this.sidebar && this.options.sidebar && this.options.$sidebar) {
-            this.sidebar = new openerp.web.Sidebar(this);
+            this.sidebar = new instance.web.Sidebar(this);
             this.sidebar.appendTo(this.options.$sidebar);
             this.sidebar.add_toolbar(this.fields_view.toolbar);
         }
@@ -312,7 +312,7 @@ openerp.web.ListView = openerp.web.View.extend( /** @lends openerp.web.ListView#
      *
      * Horrifying side-effect: sets the dataset's data on this.dataset?
      *
-     * @param {openerp.web.DataSet} dataset
+     * @param {instance.web.DataSet} dataset
      */
     configure_pager: function (dataset) {
         this.dataset.ids = dataset.ids;
@@ -336,7 +336,7 @@ openerp.web.ListView = openerp.web.View.extend( /** @lends openerp.web.ListView#
      * @param {Boolean} [grouped] Should the grouping columns (group and count) be displayed
      */
     setup_columns: function (fields, grouped) {
-        var domain_computer = openerp.web.form.compute_domain;
+        var domain_computer = instance.web.form.compute_domain;
 
         var noop = function () { return {}; };
         var field_to_column = function (field) {
@@ -405,7 +405,7 @@ openerp.web.ListView = openerp.web.View.extend( /** @lends openerp.web.ListView#
      *
      * The default implementation asks the list view's view manager to switch
      * to a different view (by calling
-     * :js:func:`~openerp.web.ViewManager.on_mode_switch`), using the
+     * :js:func:`~instance.web.ViewManager.on_mode_switch`), using the
      * provided record index (within the current list view's dataset).
      *
      * If the index is null, ``switch_to_record`` asks for the creation of a
@@ -526,7 +526,7 @@ openerp.web.ListView = openerp.web.View.extend( /** @lends openerp.web.ListView#
      */
     do_search: function (domain, context, group_by) {
         this.page = 0;
-        this.groups.datagroup = new openerp.web.DataGroup(
+        this.groups.datagroup = new instance.web.DataGroup(
             this, this.model, domain, context, group_by);
         this.groups.datagroup.sort = this.dataset._sort;
 
@@ -598,7 +598,7 @@ openerp.web.ListView = openerp.web.View.extend( /** @lends openerp.web.ListView#
             return;
         }
 
-        var c = new openerp.web.CompoundContext();
+        var c = new instance.web.CompoundContext();
         c.set_eval_context(_.extend({
             active_id: id,
             active_ids: [id],
@@ -615,7 +615,7 @@ openerp.web.ListView = openerp.web.View.extend( /** @lends openerp.web.ListView#
      *
      * @param {Number} index index of the record in the dataset
      * @param {Object} id identifier of the activated record
-     * @param {openerp.web.DataSet} dataset dataset in which the record is available (may not be the listview's dataset in case of nested groups)
+     * @param {instance.web.DataSet} dataset dataset in which the record is available (may not be the listview's dataset in case of nested groups)
      */
     do_activate_record: function (index, id, dataset, view) {
         this.dataset.ids = dataset.ids;
@@ -639,11 +639,11 @@ openerp.web.ListView = openerp.web.View.extend( /** @lends openerp.web.ListView#
     /**
      * Computes the aggregates for the current list view, either on the
      * records provided or on the records of the internal
-     * :js:class:`~openerp.web.ListView.Group`, by calling
-     * :js:func:`~openerp.web.ListView.group.get_records`.
+     * :js:class:`~instance.web.ListView.Group`, by calling
+     * :js:func:`~instance.web.ListView.group.get_records`.
      *
      * Then displays the aggregates in the table through
-     * :js:method:`~openerp.web.ListView.display_aggregates`.
+     * :js:method:`~instance.web.ListView.display_aggregates`.
      *
      * @param {Array} [records]
      */
@@ -719,7 +719,7 @@ openerp.web.ListView = openerp.web.View.extend( /** @lends openerp.web.ListView#
             }
 
             $footer_cells.filter(_.str.sprintf('[data-field=%s]', column.id))
-                .html(openerp.web.format_cell(aggregation, column, {
+                .html(instance.web.format_cell(aggregation, column, {
                     process_modifiers: false
             }));
         });
@@ -772,7 +772,7 @@ openerp.web.ListView = openerp.web.View.extend( /** @lends openerp.web.ListView#
         }
     }
 });
-openerp.web.ListView.List = openerp.web.Class.extend( /** @lends openerp.web.ListView.List# */{
+instance.web.ListView.List = instance.web.Class.extend( /** @lends instance.web.ListView.List# */{
     /**
      * List display for the ListView, handles basic DOM events and transforms
      * them in the relevant higher-level events, to which the list view (or
@@ -797,10 +797,10 @@ openerp.web.ListView.List = openerp.web.Class.extend( /** @lends openerp.web.Lis
      *   Triggered when a row of the table is clicked, provides the index (in
      *   the rows array) and id of the selected record to the handle function.
      *
-     * @constructs openerp.web.ListView.List
-     * @extends openerp.web.Class
+     * @constructs instance.web.ListView.List
+     * @extends instance.web.Class
      * 
-     * @param {Object} opts display options, identical to those of :js:class:`openerp.web.ListView`
+     * @param {Object} opts display options, identical to those of :js:class:`instance.web.ListView`
      */
     init: function (group, opts) {
         var self = this;
@@ -915,7 +915,7 @@ openerp.web.ListView.List = openerp.web.Class.extend( /** @lends openerp.web.Lis
                 // to get a correctly displayable value in the field
                 var model = ref_match[1],
                     id = parseInt(ref_match[2], 10);
-                new openerp.web.DataSet(this.view, model).name_get([id], function(names) {
+                new instance.web.DataSet(this.view, model).name_get([id], function(names) {
                     if (!names.length) { return; }
                     record.set(column.id, names[0][1]);
                 });
@@ -930,14 +930,14 @@ openerp.web.ListView.List = openerp.web.Class.extend( /** @lends openerp.web.Lis
                 // fetch the name, set it on the record (in the right field)
                 // and let the various registered events handle refreshing the
                 // row
-                new openerp.web.DataSet(this.view, column.relation)
+                new instance.web.DataSet(this.view, column.relation)
                         .name_get([value], function (names) {
                     if (!names.length) { return; }
                     record.set(column.id, names[0]);
                 });
             }
         }
-        return openerp.web.format_cell(record.toForm().data, column, {
+        return instance.web.format_cell(record.toForm().data, column, {
             model: this.dataset.model,
             id: record.get('id')
         });
@@ -1091,19 +1091,19 @@ openerp.web.ListView.List = openerp.web.Class.extend( /** @lends openerp.web.Lis
         });
     }
 });
-openerp.web.ListView.Groups = openerp.web.Class.extend( /** @lends openerp.web.ListView.Groups# */{
+instance.web.ListView.Groups = instance.web.Class.extend( /** @lends instance.web.ListView.Groups# */{
     passtrough_events: 'action deleted row_link',
     /**
      * Grouped display for the ListView. Handles basic DOM events and interacts
-     * with the :js:class:`~openerp.web.DataGroup` bound to it.
+     * with the :js:class:`~instance.web.DataGroup` bound to it.
      *
      * Provides events similar to those of
-     * :js:class:`~openerp.web.ListView.List`
+     * :js:class:`~instance.web.ListView.List`
      *
-     * @constructs openerp.web.ListView.Groups
-     * @extends openerp.web.Class
+     * @constructs instance.web.ListView.Groups
+     * @extends instance.web.Class
      *
-     * @param {openerp.web.ListView} view
+     * @param {instance.web.ListView} view
      * @param {Object} [options]
      * @param {Collection} [options.records]
      * @param {Object} [options.options]
@@ -1214,7 +1214,7 @@ openerp.web.ListView.Groups = openerp.web.Class.extend( /** @lends openerp.web.L
                 self.records.proxy(group.value).reset();
                 delete self.children[group.value];
             }
-            var child = self.children[group.value] = new openerp.web.ListView.Groups(self.view, {
+            var child = self.children[group.value] = new instance.web.ListView.Groups(self.view, {
                 records: self.records.proxy(group.value),
                 options: self.options,
                 columns: self.columns
@@ -1250,7 +1250,7 @@ openerp.web.ListView.Groups = openerp.web.Class.extend( /** @lends openerp.web.L
                 var group_column = _(self.columns).detect(function (column) {
                     return column.id === group.grouped_on; });
                 try {
-                    $group_column.html(openerp.web.format_cell(
+                    $group_column.html(instance.web.format_cell(
                         row_data, group_column, {
                             value_if_empty: _t("Undefined"),
                             process_modifiers: false
@@ -1287,7 +1287,7 @@ openerp.web.ListView.Groups = openerp.web.Class.extend( /** @lends openerp.web.L
                         var r = {};
                         r[column.id] = {value: group.aggregates[column.id]};
                         $('<td class="oe-number">')
-                            .html(openerp.web.format_cell(
+                            .html(instance.web.format_cell(
                                 r, column, {process_modifiers: false}))
                             .appendTo($row);
                     } else {
@@ -1320,7 +1320,7 @@ openerp.web.ListView.Groups = openerp.web.Class.extend( /** @lends openerp.web.L
     },
     render_dataset: function (dataset) {
         var self = this,
-            list = new openerp.web.ListView.List(this, {
+            list = new instance.web.ListView.List(this, {
                 options: this.options,
                 columns: this.columns,
                 dataset: dataset,
@@ -1533,10 +1533,10 @@ var Events = /** @lends Events# */{
         return this;
     }
 };
-var Record = openerp.web.Class.extend(/** @lends Record# */{
+var Record = instance.web.Class.extend(/** @lends Record# */{
     /**
      * @constructs Record
-     * @extends openerp.web.Class
+     * @extends instance.web.Class
      * 
      * @mixes Events
      * @param {Object} [data]
@@ -1614,7 +1614,7 @@ var Record = openerp.web.Class.extend(/** @lends Record# */{
     }
 });
 Record.include(Events);
-var Collection = openerp.web.Class.extend(/** @lends Collection# */{
+var Collection = instance.web.Class.extend(/** @lends Collection# */{
     /**
      * Smarter collections, with events, very strongly inspired by Backbone's.
      *
@@ -1622,7 +1622,7 @@ var Collection = openerp.web.Class.extend(/** @lends Collection# */{
      * various serious 
      *
      * @constructs Collection
-     * @extends openerp.web.Class
+     * @extends instance.web.Class
      * 
      * @mixes Events
      * @param {Array} [records] records to initialize the collection with
@@ -1797,7 +1797,7 @@ var Collection = openerp.web.Class.extend(/** @lends Collection# */{
     }
 });
 Collection.include(Events);
-openerp.web.list = {
+instance.web.list = {
     Events: Events,
     Record: Record,
     Collection: Collection
diff --git a/addons/web/static/src/js/view_list_editable.js b/addons/web/static/src/js/view_list_editable.js
index 41f8c012731..ac19e3f341d 100644
--- a/addons/web/static/src/js/view_list_editable.js
+++ b/addons/web/static/src/js/view_list_editable.js
@@ -2,16 +2,16 @@
  * handles editability case for lists, because it depends on form and forms already depends on lists it had to be split out
  * @namespace
  */
-openerp.web.list_editable = function (openerp) {
+openerp.web.list_editable = function (instance) {
     var KEY_RETURN = 13,
         KEY_ESCAPE = 27;
-    var QWeb = openerp.web.qweb;
+    var QWeb = instance.web.qweb;
 
     // editability status of list rows
-    openerp.web.ListView.prototype.defaults.editable = null;
+    instance.web.ListView.prototype.defaults.editable = null;
 
     // TODO: not sure second @lends on existing item is correct, to check
-    openerp.web.ListView.include(/** @lends openerp.web.ListView# */{
+    instance.web.ListView.include(/** @lends instance.web.ListView# */{
         init: function () {
             var self = this;
             this._super.apply(this, arguments);
@@ -37,7 +37,7 @@ openerp.web.list_editable = function (openerp) {
          *
          * @param {Number} index index of the record in the dataset
          * @param {Object} id identifier of the record being edited
-         * @param {openerp.web.DataSet} dataset dataset in which the record is available
+         * @param {instance.web.DataSet} dataset dataset in which the record is available
          */
         do_edit: function (index, id, dataset) {
             _.extend(this.dataset, dataset);
@@ -93,8 +93,8 @@ openerp.web.list_editable = function (openerp) {
         }
     });
 
-    openerp.web.ListView.Groups.include(/** @lends openerp.web.ListView.Groups# */{
-        passtrough_events: openerp.web.ListView.Groups.prototype.passtrough_events + " edit saved",
+    instance.web.ListView.Groups.include(/** @lends instance.web.ListView.Groups# */{
+        passtrough_events: instance.web.ListView.Groups.prototype.passtrough_events + " edit saved",
         new_record: function () {
             // TODO: handle multiple children
             this.children[null].new_record();
@@ -113,7 +113,7 @@ openerp.web.list_editable = function (openerp) {
         }
     });
 
-    openerp.web.ListView.List.include(/** @lends openerp.web.ListView.List# */{
+    instance.web.ListView.List.include(/** @lends instance.web.ListView.List# */{
         row_clicked: function (event) {
             if (!this.options.editable) {
                 return this._super.apply(this, arguments);
@@ -236,7 +236,7 @@ openerp.web.list_editable = function (openerp) {
                 self.edition = true;
                 self.edition_id = record_id;
                 $new_row.addClass("oe_form_container");
-                self.edition_form = new openerp.web.ListEditableFormView(self.view, self.dataset, false);
+                self.edition_form = new instance.web.ListEditableFormView(self.view, self.dataset, false);
                 self.edition_form.$element = $new_row;
                 self.edition_form.editable_list = self;
                 // HO HO
@@ -274,7 +274,7 @@ openerp.web.list_editable = function (openerp) {
                         // insert after the source record
                         var index = self.records.indexOf(
                             self.records.get(source_record_id)) + 1;
-                        record = new openerp.web.list.Record({id: id});
+                        record = new instance.web.list.Record({id: id});
                         self.records.add(record, {at: index});
                         self.dataset.ids.splice(index, 0, id);
                     }
@@ -368,15 +368,15 @@ openerp.web.list_editable = function (openerp) {
         }
     });
     
-    openerp.web.ListEditableFormView = openerp.web.FormView.extend({
+    instance.web.ListEditableFormView = instance.web.FormView.extend({
         init: function() {
             this._super.apply(this, arguments);
-            this.rendering_engine = new openerp.web.ListEditableRenderingEngine(this);
+            this.rendering_engine = new instance.web.ListEditableRenderingEngine(this);
         },
         renderElement: function() {}
     });
     
-    openerp.web.ListEditableRenderingEngine = openerp.web.Class.extend({
+    instance.web.ListEditableRenderingEngine = instance.web.Class.extend({
         init: function(view) {
             this.view = view;
         },
@@ -392,7 +392,7 @@ openerp.web.list_editable = function (openerp) {
         render_to: function($element) {
             var self = this;
     
-            var xml = openerp.web.json_node_to_xml(this.fvg.arch);
+            var xml = instance.web.json_node_to_xml(this.fvg.arch);
             var $xml = $(xml);
             
             if (this.view.editable_list.options.selectable)
@@ -412,7 +412,7 @@ openerp.web.list_editable = function (openerp) {
                     key = $(el).attr('widget') || self.fvg.fields[name].type;
                 }
                 var obj = self.view.fields_registry.get_object(key);
-                var w = new (obj)(self.view, openerp.web.xml_to_json(el));
+                var w = new (obj)(self.view, instance.web.xml_to_json(el));
                 self.view.register_field(w, $(el).attr("name"));
                 w.appendTo($td);
                 $td.appendTo($element);
diff --git a/addons/web/static/src/js/view_tree.js b/addons/web/static/src/js/view_tree.js
index 72a643b3d51..9e938fe293a 100644
--- a/addons/web/static/src/js/view_tree.js
+++ b/addons/web/static/src/js/view_tree.js
@@ -2,12 +2,12 @@
  * OpenERP web library
  *---------------------------------------------------------*/
 
-openerp.web.view_tree = function(openerp) {
-var QWeb = openerp.web.qweb,
-      _lt = openerp.web._lt;
+openerp.web.view_tree = function(instance) {
+var QWeb = instance.web.qweb,
+      _lt = instance.web._lt;
 
-openerp.web.views.add('tree', 'openerp.web.TreeView');
-openerp.web.TreeView = openerp.web.View.extend(/** @lends openerp.web.TreeView# */{
+instance.web.views.add('tree', 'instance.web.TreeView');
+instance.web.TreeView = instance.web.View.extend(/** @lends instance.web.TreeView# */{
     display_name: _lt('Tree'),
     /**
      * Indicates that this view is not searchable, and thus that no search
@@ -17,8 +17,8 @@ openerp.web.TreeView = openerp.web.View.extend(/** @lends openerp.web.TreeView#
     /**
      * Genuine tree view (the one displayed as a tree, not the list)
      *
-     * @constructs openerp.web.TreeView
-     * @extends openerp.web.View
+     * @constructs instance.web.TreeView
+     * @extends instance.web.View
      *
      * @param parent
      * @param dataset
@@ -203,7 +203,7 @@ openerp.web.TreeView = openerp.web.View.extend(/** @lends openerp.web.TreeView#
                 'fields_view': self.fields_view.arch.children,
                 'fields': self.fields,
                 'level': $curr_node.data('level') || 0,
-                'render': openerp.web.format_value,
+                'render': instance.web.format_value,
                 'color_for': self.color_for
             });
 
@@ -226,12 +226,12 @@ openerp.web.TreeView = openerp.web.View.extend(/** @lends openerp.web.TreeView#
         return this.rpc('/web/treeview/action', {
             id: id,
             model: this.dataset.model,
-            context: new openerp.web.CompoundContext(
+            context: new instance.web.CompoundContext(
                 this.dataset.get_context(), local_context)
         }).pipe(function (actions) {
             if (!actions.length) { return; }
             var action = actions[0][2];
-            var c = new openerp.web.CompoundContext(local_context);
+            var c = new instance.web.CompoundContext(local_context);
             if (action.context) {
                 c.add(action.context);
             }
diff --git a/addons/web/static/src/js/views.js b/addons/web/static/src/js/views.js
index 79d3d4cd167..3e4d2056c93 100644
--- a/addons/web/static/src/js/views.js
+++ b/addons/web/static/src/js/views.js
@@ -2,11 +2,11 @@
  * OpenERP web library
  *---------------------------------------------------------*/
 
-openerp.web.views = function(session) {
-var QWeb = session.web.qweb,
-    _t = session.web._t;
+openerp.web.views = function(instance) {
+var QWeb = instance.web.qweb,
+    _t = instance.web._t;
 
-session.web.ActionManager = session.web.Widget.extend({
+instance.web.ActionManager = instance.web.Widget.extend({
     init: function(parent) {
         this._super(parent);
         this.inner_action = null;
@@ -52,8 +52,8 @@ session.web.ActionManager = session.web.Widget.extend({
             if (run_action) {
                 this.null_action();
                 action_loaded = this.do_action(state.action_id);
-                session.webclient.menu.has_been_loaded.then(function() {
-                    session.webclient.menu.open_action(state.action_id);
+                instance.webclient.menu.has_been_loaded.then(function() {
+                    instance.webclient.menu.open_action(state.action_id);
                 });
             }
         } else if (state.model && state.id) {
@@ -124,31 +124,31 @@ session.web.ActionManager = session.web.Widget.extend({
                 .contains(action.res_model)) {
             var old_close = on_close;
             on_close = function () {
-                session.webclient.do_reload().then(old_close);
+                instance.webclient.do_reload().then(old_close);
             };
         }
         if (action.target === 'new') {
             if (this.dialog == null) {
-                this.dialog = new session.web.Dialog(this, { width: '80%' });
+                this.dialog = new instance.web.Dialog(this, { width: '80%' });
                 if(on_close)
                     this.dialog.on_close.add(on_close);
             } else {
                 this.dialog_viewmanager.destroy();
             }
             this.dialog.dialog_title = action.name;
-            this.dialog_viewmanager = new session.web.ViewManagerAction(this, action);
+            this.dialog_viewmanager = new instance.web.ViewManagerAction(this, action);
             this.dialog_viewmanager.appendTo(this.dialog.$element);
             this.dialog.open();
         } else  {
             if(action.menu_id) {
                 return this.getParent().do_action(action, function () {
-                    session.webclient.menu.open_menu(action.menu_id);
+                    instance.webclient.menu.open_menu(action.menu_id);
                 });
             }
             this.dialog_stop();
             this.content_stop();
             this.inner_action = action;
-            this.inner_viewmanager = new session.web.ViewManagerAction(this, action);
+            this.inner_viewmanager = new instance.web.ViewManagerAction(this, action);
             this.inner_viewmanager.appendTo(this.$element);
         }
     },
@@ -170,7 +170,7 @@ session.web.ActionManager = session.web.Widget.extend({
     ir_actions_client: function (action) {
         this.content_stop();
         this.dialog_stop();
-        var ClientWidget = session.web.client_actions.get_object(action.tag);
+        var ClientWidget = instance.web.client_actions.get_object(action.tag);
         (this.client_widget = new ClientWidget(this, action.params)).appendTo(this.$element);
     },
     ir_actions_report_xml: function(action, on_closed) {
@@ -192,7 +192,7 @@ session.web.ActionManager = session.web.Widget.extend({
                     }
                     self.dialog_stop();
                 },
-                error: session.webclient.crashmanager.on_rpc_error
+                error: instance.webclient.crashmanager.on_rpc_error
             })
         });
     },
@@ -204,7 +204,7 @@ session.web.ActionManager = session.web.Widget.extend({
     }
 });
 
-session.web.ViewManager =  session.web.Widget.extend({
+instance.web.ViewManager =  instance.web.Widget.extend({
     template: "ViewManager",
     init: function(parent, dataset, views, flags) {
         this._super(parent);
@@ -214,7 +214,7 @@ session.web.ViewManager =  session.web.Widget.extend({
         this.active_view = null;
         this.views_src = _.map(views, function(x) {
             if (x instanceof Array) {
-                var View = session.web.views.get_object(x[1], true);
+                var View = instance.web.views.get_object(x[1], true);
                 return {
                     view_id: x[0],
                     view_type: x[1],
@@ -226,7 +226,7 @@ session.web.ViewManager =  session.web.Widget.extend({
         });
         this.views = {};
         this.flags = flags || {};
-        this.registry = session.web.views;
+        this.registry = instance.web.views;
         this.views_history = [];
     },
     /**
@@ -376,7 +376,7 @@ session.web.ViewManager =  session.web.Widget.extend({
         if (this.searchview) {
             this.searchview.destroy();
         }
-        this.searchview = new session.web.SearchView(this, this.dataset, view_id, search_defaults, this.flags.search_view === false);
+        this.searchview = new instance.web.SearchView(this, this.dataset, view_id, search_defaults, this.flags.search_view === false);
 
         this.searchview.on_search.add(this.do_searchview_search);
         return this.searchview.appendTo(this.$element.find(".oe_view_manager_view_search"));
@@ -435,13 +435,13 @@ session.web.ViewManager =  session.web.Widget.extend({
     }
 });
 
-session.web.ViewManagerAction = session.web.ViewManager.extend({
+instance.web.ViewManagerAction = instance.web.ViewManager.extend({
     template:"ViewManagerAction",
     /**
-     * @constructs session.web.ViewManagerAction
-     * @extends session.web.ViewManager
+     * @constructs instance.web.ViewManagerAction
+     * @extends instance.web.ViewManager
      *
-     * @param {session.web.ActionManager} parent parent object/widget
+     * @param {instance.web.ActionManager} parent parent object/widget
      * @param {Object} action descriptor for the action this viewmanager needs to manage its views.
      */
     init: function(parent, action) {
@@ -466,7 +466,7 @@ session.web.ViewManagerAction = session.web.ViewManager.extend({
         this._super(parent, null, action.views, flags);
         this.session = parent.session;
         this.action = action;
-        var dataset = new session.web.DataSetSearch(this, action.res_model, action.context, action.domain);
+        var dataset = new instance.web.DataSetSearch(this, action.res_model, action.context, action.domain);
         if (action.res_id) {
             dataset.ids.push(action.res_id);
             dataset.index = 0;
@@ -507,7 +507,7 @@ session.web.ViewManagerAction = session.web.ViewManager.extend({
         this.$element.find('.oe_debug_view').change(this.on_debug_changed);
 
         if (this.action.help && !this.flags.low_profile) {
-            var Users = new session.web.DataSet(self, 'res.users'),
+            var Users = new instance.web.DataSet(self, 'res.users'),
                 $tips = this.$element.find('.oe_view_manager_menu_tips');
             $tips.delegate('blockquote button', 'click', function() {
                 var $this = $(this);
@@ -541,19 +541,19 @@ session.web.ViewManagerAction = session.web.ViewManager.extend({
             current_view = this.views[this.active_view].controller;
         switch (val) {
             case 'fvg':
-                var dialog = new session.web.Dialog(this, { title: _t("Fields View Get"), width: '95%' }).open();
-                $('<pre>').text(session.web.json_node_to_xml(current_view.fields_view.arch, true)).appendTo(dialog.$element);
+                var dialog = new instance.web.Dialog(this, { title: _t("Fields View Get"), width: '95%' }).open();
+                $('<pre>').text(instance.web.json_node_to_xml(current_view.fields_view.arch, true)).appendTo(dialog.$element);
                 break;
             case 'perm_read':
                 var ids = current_view.get_selected_ids();
                 if (ids.length === 1) {
                     this.dataset.call('perm_read', [ids]).then(function(result) {
-                        var dialog = new session.web.Dialog(this, {
+                        var dialog = new instance.web.Dialog(this, {
                             title: _.str.sprintf(_t("View Log (%s)"), self.dataset.model),
                             width: 400
                         }, QWeb.render('ViewManagerDebugViewLog', {
                             perm : result[0],
-                            format : session.web.format_value
+                            format : instance.web.format_value
                         })).open();
                     });
                 }
@@ -578,7 +578,7 @@ session.web.ViewManagerAction = session.web.ViewManager.extend({
                                 .append($('<dd style="white-space: pre-wrap;">').text(def));
                         });
                     });
-                    new session.web.Dialog(self, {
+                    new instance.web.Dialog(self, {
                         title: _.str.sprintf(_t("Model %s fields"),
                                              self.dataset.model),
                         width: '95%'}, $root).open();
@@ -586,7 +586,7 @@ session.web.ViewManagerAction = session.web.ViewManager.extend({
                 break;
             case 'manage_views':
                 if (current_view.fields_view && current_view.fields_view.arch) {
-                    var view_editor = new session.web.ViewEditor(current_view, current_view.$element, this.dataset, current_view.fields_view.arch);
+                    var view_editor = new instance.web.ViewEditor(current_view, current_view.$element, this.dataset, current_view.fields_view.arch);
                     view_editor.start();
                 } else {
                     this.do_warn(_t("Manage Views"),
@@ -723,7 +723,7 @@ session.web.ViewManagerAction = session.web.ViewManager.extend({
     }
 });
 
-session.web.Sidebar = session.web.Widget.extend({
+instance.web.Sidebar = instance.web.Widget.extend({
     init: function(parent) {
         this._super(parent);
         var view = this.getParent();
@@ -832,7 +832,7 @@ session.web.Sidebar = session.web.Widget.extend({
         self.getParent().sidebar_context().then(function (context) {
             var ids = self.getParent().get_selected_ids();
             if (ids.length == 0) {
-                session.web.dialog($("<div />").text(_t("You must choose at least one record.")), { title: _t("Warning"), modal: true });
+                instance.web.dialog($("<div />").text(_t("You must choose at least one record.")), { title: _t("Warning"), modal: true });
                 return false;
             }
             var additional_context = _.extend({
@@ -860,7 +860,7 @@ session.web.Sidebar = session.web.Widget.extend({
             this.on_attachments_loaded([]);
         } else {
             var dom = [ ['res_model', '=', dataset.model], ['res_id', '=', model_id], ['type', 'in', ['binary', 'url']] ];
-            var ds = new session.web.DataSetSearch(this, 'ir.attachment', dataset.get_context(), dom);
+            var ds = new instance.web.DataSetSearch(this, 'ir.attachment', dataset.get_context(), dom);
             ds.read_slice(['name', 'url', 'type'], {}).then(this.on_attachments_loaded);
         }
     },
@@ -908,7 +908,7 @@ session.web.Sidebar = session.web.Widget.extend({
     }
 });
 
-session.web.TranslateDialog = session.web.Dialog.extend({
+instance.web.TranslateDialog = instance.web.Dialog.extend({
     dialog_title: {toString: function () { return _t("Translations"); }},
     init: function(view) {
         // TODO fme: should add the language to fields_view_get because between the fields view get
@@ -928,14 +928,14 @@ session.web.TranslateDialog = session.web.Dialog.extend({
         this.translatable_fields_keys = _.map(this.view.translatable_fields || [], function(i) { return i.name });
         this.languages = null;
         this.languages_loaded = $.Deferred();
-        (new session.web.DataSetSearch(this, 'res.lang', this.view.dataset.get_context(),
+        (new instance.web.DataSetSearch(this, 'res.lang', this.view.dataset.get_context(),
             [['translatable', '=', '1']])).read_slice(['code', 'name'], { sort: 'id' }).then(this.on_languages_loaded);
     },
     start: function() {
         var self = this;
         this._super();
         $.when(this.languages_loaded).then(function() {
-            self.$element.html(session.web.qweb.render('TranslateDialog', { widget: self }));
+            self.$element.html(instance.web.qweb.render('TranslateDialog', { widget: self }));
             self.$fields_form = self.$element.find('.oe_translation_form');
             self.$fields_form.find('.oe_trad_field').change(function() {
                 $(this).toggleClass('touched', ($(this).val() != $(this).attr('data-value')));
@@ -1024,7 +1024,7 @@ session.web.TranslateDialog = session.web.Dialog.extend({
     }
 });
 
-session.web.View = session.web.Widget.extend({
+instance.web.View = instance.web.Widget.extend({
     template: "EmptyComponent",
     // name displayed in view switchers
     display_name: '',
@@ -1048,7 +1048,7 @@ session.web.View = session.web.Widget.extend({
             $.async_when().then(function() {def.resolve(self.embedded_view);});
             return def.pipe(this.on_loaded);
         } else {
-            var context = new session.web.CompoundContext(this.dataset.get_context());
+            var context = new instance.web.CompoundContext(this.dataset.get_context());
             if (! this.view_type)
                 console.warn("view_type is not defined", this);
             return this.rpc("/web/view/load", {
@@ -1079,7 +1079,7 @@ session.web.View = session.web.Widget.extend({
     },
     open_translate_dialog: function(field) {
         if (!this.translate_dialog) {
-            this.translate_dialog = new session.web.TranslateDialog(this).start();
+            this.translate_dialog = new instance.web.TranslateDialog(this).start();
         }
         this.translate_dialog.open(field);
     },
@@ -1091,7 +1091,7 @@ session.web.View = session.web.Widget.extend({
      * @param {String} [action_data.special=null] special action handlers (currently: only ``'cancel'``)
      * @param {String} [action_data.type='workflow'] the action type, if present, one of ``'object'``, ``'action'`` or ``'workflow'``
      * @param {Object} [action_data.context=null] additional action context, to add to the current context
-     * @param {session.web.DataSet} dataset a dataset object used to communicate with the server
+     * @param {instance.web.DataSet} dataset a dataset object used to communicate with the server
      * @param {Object} [record_id] the identifier of the object on which the action is to be applied
      * @param {Function} on_closed callback to execute when dialog is closed or when the action does not generate any result (no new action)
      */
@@ -1103,12 +1103,12 @@ session.web.View = session.web.Widget.extend({
                 return self.getParent().on_action_executed.apply(null, arguments);
             }
         };
-        var context = new session.web.CompoundContext(dataset.get_context(), action_data.context || {});
+        var context = new instance.web.CompoundContext(dataset.get_context(), action_data.context || {});
 
         var handler = function (r) {
             var action = r.result;
             if (action && action.constructor == Object) {
-                var ncontext = new session.web.CompoundContext(context);
+                var ncontext = new instance.web.CompoundContext(context);
                 if (record_id) {
                     ncontext.add({
                         active_id: record_id,
@@ -1157,7 +1157,7 @@ session.web.View = session.web.Widget.extend({
     /**
      * Directly set a view to use instead of calling fields_view_get. This method must
      * be called before start(). When an embedded view is set, underlying implementations
-     * of session.web.View must use the provided view instead of any other one.
+     * of instance.web.View must use the provided view instead of any other one.
      *
      * @param embedded_view A view.
      */
@@ -1197,11 +1197,11 @@ session.web.View = session.web.Widget.extend({
     do_search: function(view) {
     },
     on_sidebar_import: function() {
-        var import_view = new session.web.DataImport(this, this.dataset);
+        var import_view = new instance.web.DataImport(this, this.dataset);
         import_view.start();
     },
     on_sidebar_export: function() {
-        var export_view = new session.web.DataExport(this, this.dataset);
+        var export_view = new instance.web.DataExport(this, this.dataset);
         export_view.start();
     },
     on_sidebar_translate: function() {
@@ -1226,7 +1226,7 @@ session.web.View = session.web.Widget.extend({
     }
 });
 
-session.web.xml_to_json = function(node) {
+instance.web.xml_to_json = function(node) {
     switch (node.nodeType) {
         case 3:
         case 4:
@@ -1244,11 +1244,11 @@ session.web.xml_to_json = function(node) {
             return {
                 tag: node.tagName.toLowerCase(),
                 attrs: attrs,
-                children: _.map(node.childNodes, session.web.xml_to_json)
+                children: _.map(node.childNodes, instance.web.xml_to_json)
             }
     }
 }
-session.web.json_node_to_xml = function(node, human_readable, indent) {
+instance.web.json_node_to_xml = function(node, human_readable, indent) {
     // For debugging purpose, this function will convert a json node back to xml
     // Maybe useful for xml view editor
     indent = indent || 0;
@@ -1277,7 +1277,7 @@ session.web.json_node_to_xml = function(node, human_readable, indent) {
         r += '>' + cr;
         var childs = [];
         for (var i = 0, ii = node.children.length; i < ii; i++) {
-            childs.push(session.web.json_node_to_xml(node.children[i], human_readable, indent + 1));
+            childs.push(instance.web.json_node_to_xml(node.children[i], human_readable, indent + 1));
         }
         r += childs.join(cr);
         r += cr + sindent + '</' + node.tag + '>';
@@ -1286,14 +1286,14 @@ session.web.json_node_to_xml = function(node, human_readable, indent) {
         return r + '/>';
     }
 }
-session.web.xml_to_str = function(node) {
+instance.web.xml_to_str = function(node) {
     if (window.ActiveXObject) {
         return node.xml;
     } else {
         return (new XMLSerializer()).serializeToString(node);
     }
 }
-session.web.str_to_xml = function(s) {
+instance.web.str_to_xml = function(s) {
     if (window.DOMParser) {
         var dp = new DOMParser();
         var r = dp.parseFromString(s, "text/xml");
@@ -1317,12 +1317,12 @@ session.web.str_to_xml = function(s) {
 /**
  * Registry for all the client actions key: tag value: widget
  */
-session.web.client_actions = new session.web.Registry();
+instance.web.client_actions = new instance.web.Registry();
 
 /**
  * Registry for all the main views
  */
-session.web.views = new session.web.Registry();
+instance.web.views = new instance.web.Registry();
 
 };
 

From 13e64388249c6c3ad6ff86c0109914a02fb25e6a Mon Sep 17 00:00:00 2001
From: niv-openerp <nicolas.vanhoren@openerp.com>
Date: Tue, 17 Apr 2012 14:26:11 +0200
Subject: [PATCH 133/238] [imp] further more into the refactoring

bzr revid: nicolas.vanhoren@openerp.com-20120417122611-ftc4vuct77bldhts
---
 addons/web_calendar/static/src/js/calendar.js | 40 ++++++-------
 .../web_dashboard/static/src/js/dashboard.js  | 60 +++++++++----------
 addons/web_diagram/static/src/js/diagram.js   | 24 ++++----
 3 files changed, 62 insertions(+), 62 deletions(-)

diff --git a/addons/web_calendar/static/src/js/calendar.js b/addons/web_calendar/static/src/js/calendar.js
index ed88be3fe4a..fe261ba6fec 100644
--- a/addons/web_calendar/static/src/js/calendar.js
+++ b/addons/web_calendar/static/src/js/calendar.js
@@ -2,12 +2,12 @@
  * OpenERP web_calendar
  *---------------------------------------------------------*/
 
-openerp.web_calendar = function(openerp) {
-var _t = openerp.web._t,
-   _lt = openerp.web._lt;
-var QWeb = openerp.web.qweb;
-openerp.web.views.add('calendar', 'openerp.web_calendar.CalendarView');
-openerp.web_calendar.CalendarView = openerp.web.View.extend({
+openerp.web_calendar = function(instance) {
+var _t = instance.web._t,
+   _lt = instance.web._lt;
+var QWeb = instance.web.qweb;
+instance.web.views.add('calendar', 'instance.web_calendar.CalendarView');
+instance.web_calendar.CalendarView = instance.web.View.extend({
     display_name: _lt('Calendar'),
 // Dhtmlx scheduler ?
     init: function(parent, dataset, view_id, options) {
@@ -22,7 +22,7 @@ openerp.web_calendar.CalendarView = openerp.web.View.extend({
         this.has_been_loaded = $.Deferred();
         this.creating_event_id = null;
         this.dataset_events = [];
-        this.form_dialog = new openerp.web_calendar.CalendarFormDialog(this, {
+        this.form_dialog = new instance.web_calendar.CalendarFormDialog(this, {
                 destroy_on_close: false,
                 width: '80%',
                 min_width: 850
@@ -103,7 +103,7 @@ openerp.web_calendar.CalendarView = openerp.web.View.extend({
         this.init_scheduler();
 
         if (this.options.sidebar) {
-            this.sidebar = new openerp.web_calendar.Sidebar(this);
+            this.sidebar = new instance.web_calendar.Sidebar(this);
             this.has_been_loaded.pipe(this.sidebar.appendTo(this.$element));
         }
 
@@ -207,10 +207,10 @@ openerp.web_calendar.CalendarView = openerp.web.View.extend({
             }
 
             if (this.fields[this.date_start]['type'] == 'date') {
-                evt[this.date_start] = openerp.web.auto_str_to_date(evt[this.date_start]).set({hour: 9}).toString('yyyy-MM-dd HH:mm:ss');
+                evt[this.date_start] = instance.web.auto_str_to_date(evt[this.date_start]).set({hour: 9}).toString('yyyy-MM-dd HH:mm:ss');
             }
             if (this.date_stop && evt[this.date_stop] && this.fields[this.date_stop]['type'] == 'date') {
-                evt[this.date_stop] = openerp.web.auto_str_to_date(evt[this.date_stop]).set({hour: 17}).toString('yyyy-MM-dd HH:mm:ss');
+                evt[this.date_stop] = instance.web.auto_str_to_date(evt[this.date_stop]).set({hour: 17}).toString('yyyy-MM-dd HH:mm:ss');
             }
             res_events.push(this.convert_event(evt));
         }
@@ -222,8 +222,8 @@ openerp.web_calendar.CalendarView = openerp.web.View.extend({
         }
     },
     convert_event: function(evt) {
-        var date_start = openerp.web.str_to_datetime(evt[this.date_start]),
-            date_stop = this.date_stop ? openerp.web.str_to_datetime(evt[this.date_stop]) : null,
+        var date_start = instance.web.str_to_datetime(evt[this.date_start]),
+            date_stop = this.date_stop ? instance.web.str_to_datetime(evt[this.date_stop]) : null,
             date_delay = evt[this.date_delay] || 1.0,
             res_text = '',
             res_description = [];
@@ -354,9 +354,9 @@ openerp.web_calendar.CalendarView = openerp.web.View.extend({
         var data = {
             name: event_obj.text
         };
-        data[this.date_start] = openerp.web.datetime_to_str(event_obj.start_date);
+        data[this.date_start] = instance.web.datetime_to_str(event_obj.start_date);
         if (this.date_stop) {
-            data[this.date_stop] = openerp.web.datetime_to_str(event_obj.end_date);
+            data[this.date_stop] = instance.web.datetime_to_str(event_obj.end_date);
         }
         if (this.date_delay) {
             var diff_seconds = Math.round((event_obj.end_date.getTime() - event_obj.start_date.getTime()) / 1000);
@@ -383,7 +383,7 @@ openerp.web_calendar.CalendarView = openerp.web.View.extend({
         });
     },
     get_range_domain: function() {
-        var format = openerp.web.date_to_str,
+        var format = instance.web.date_to_str,
             domain = this.last_search[0].slice(0);
         domain.unshift([this.date_start, '>=', format(this.range_start.clone().addDays(-6))]);
         domain.unshift([this.date_start, '<=', format(this.range_stop.clone().addDays(6))]);
@@ -402,7 +402,7 @@ openerp.web_calendar.CalendarView = openerp.web.View.extend({
     }
 });
 
-openerp.web_calendar.CalendarFormDialog = openerp.web.Dialog.extend({
+instance.web_calendar.CalendarFormDialog = instance.web.Dialog.extend({
     init: function(view, options, view_id, dataset) {
         this._super(view, options);
         this.dataset = dataset;
@@ -412,7 +412,7 @@ openerp.web_calendar.CalendarFormDialog = openerp.web.Dialog.extend({
     start: function() {
         var self = this;
         this._super();
-        this.form = new openerp.web.FormView(this, this.dataset, this.view_id, {
+        this.form = new instance.web.FormView(this, this.dataset, this.view_id, {
             sidebar: false,
             pager: false
         });
@@ -440,7 +440,7 @@ openerp.web_calendar.CalendarFormDialog = openerp.web.Dialog.extend({
     }
 });
 
-openerp.web_calendar.Sidebar = openerp.web.Widget.extend({
+instance.web_calendar.Sidebar = instance.web.Widget.extend({
     template: 'CalendarView.sidebar',
     start: function() {
         this._super();
@@ -452,11 +452,11 @@ openerp.web_calendar.Sidebar = openerp.web.Widget.extend({
                 scheduler.setCurrentView(date, 'day');
             }
         });
-        this.filter = new openerp.web_calendar.SidebarFilter(this, this.getParent());
+        this.filter = new instance.web_calendar.SidebarFilter(this, this.getParent());
         this.filter.appendTo(this.$element.find('.oe_calendar_filter'));
     }
 });
-openerp.web_calendar.SidebarFilter = openerp.web.Widget.extend({
+instance.web_calendar.SidebarFilter = instance.web.Widget.extend({
     init: function(parent, view) {
         this._super(parent);
         this.view = view;
diff --git a/addons/web_dashboard/static/src/js/dashboard.js b/addons/web_dashboard/static/src/js/dashboard.js
index 2de8a04141e..f0c04d6d270 100644
--- a/addons/web_dashboard/static/src/js/dashboard.js
+++ b/addons/web_dashboard/static/src/js/dashboard.js
@@ -1,13 +1,13 @@
-openerp.web_dashboard = function(openerp) {
-var QWeb = openerp.web.qweb,
-    _t = openerp.web._t;
+openerp.web_dashboard = function(instance) {
+var QWeb = instance.web.qweb,
+    _t = instance.web._t;
 
-if (!openerp.web_dashboard) {
+if (!instance.web_dashboard) {
     /** @namespace */
-    openerp.web_dashboard = {};
+    instance.web_dashboard = {};
 }
 
-openerp.web.form.DashBoard = openerp.web.form.Widget.extend({
+instance.web.form.DashBoard = instance.web.form.Widget.extend({
     init: function(view, node) {
         this._super(view, node);
         this.form_template = 'DashBoard';
@@ -56,7 +56,7 @@ openerp.web.form.DashBoard = openerp.web.form.Widget.extend({
         var qdict = {
             current_layout : this.$element.find('.oe-dashboard').attr('data-layout')
         };
-        var $dialog = openerp.web.dialog($('<div>'), {
+        var $dialog = instance.web.dialog($('<div>'), {
                             modal: true,
                             title: _t("Edit Layout"),
                             width: 'auto',
@@ -188,7 +188,7 @@ openerp.web.form.DashBoard = openerp.web.form.Widget.extend({
                 selectable: false
             }
         };
-        var am = new openerp.web.ActionManager(this),
+        var am = new instance.web.ActionManager(this),
             // FIXME: ideally the dashboard view shall be refactored like kanban.
             $action = $('#' + this.view.element_id + '_action_' + index);
         $action.parent().data('action_attrs', action_attrs);
@@ -249,7 +249,7 @@ openerp.web.form.DashBoard = openerp.web.form.Widget.extend({
         action_manager.do_action(view_manager.action);
     }
 });
-openerp.web.form.DashBoardLegacy = openerp.web.form.DashBoard.extend({
+instance.web.form.DashBoardLegacy = instance.web.form.DashBoard.extend({
     renderElement: function() {
         if (this.node.tag == 'hpaned') {
             this.node.attrs.style = '2-1';
@@ -273,25 +273,25 @@ openerp.web.form.DashBoardLegacy = openerp.web.form.DashBoard.extend({
     }
 });
 
-openerp.web.form.tags.add('hpaned', 'openerp.web.form.DashBoardLegacy');
-openerp.web.form.tags.add('vpaned', 'openerp.web.form.DashBoardLegacy');
-openerp.web.form.tags.add('board', 'openerp.web.form.DashBoard');
+instance.web.form.tags.add('hpaned', 'instance.web.form.DashBoardLegacy');
+instance.web.form.tags.add('vpaned', 'instance.web.form.DashBoardLegacy');
+instance.web.form.tags.add('board', 'instance.web.form.DashBoard');
 
 /*
  * ConfigOverview
  * This client action designed to be used as a dashboard widget display
  * ir.actions.todo in a fancy way
  */
-openerp.web.client_actions.add( 'board.config.overview', 'openerp.web_dashboard.ConfigOverview');
-openerp.web_dashboard.ConfigOverview = openerp.web.View.extend({
+instance.web.client_actions.add( 'board.config.overview', 'instance.web_dashboard.ConfigOverview');
+instance.web_dashboard.ConfigOverview = instance.web.View.extend({
     template: 'ConfigOverview',
     init: function (parent) {
         this._super(parent);
-        this.user = _.extend(new openerp.web.DataSet(this, 'res.users'), {
+        this.user = _.extend(new instance.web.DataSet(this, 'res.users'), {
             index: 0,
             ids: [this.session.uid]
         });
-        this.dataset = new openerp.web.DataSetSearch(this, 'ir.actions.todo');
+        this.dataset = new instance.web.DataSetSearch(this, 'ir.actions.todo');
     },
     start: function () {
         var self = this;
@@ -363,15 +363,15 @@ openerp.web_dashboard.ConfigOverview = openerp.web.View.extend({
  * This client action designed to be used as a dashboard widget display
  * the html content of a res_widget given as argument
  */
-openerp.web.client_actions.add( 'board.home.widgets', 'openerp.web_dashboard.Widget');
-openerp.web_dashboard.Widget = openerp.web.View.extend(/** @lends openerp.web_dashboard.Widgets# */{
+instance.web.client_actions.add( 'board.home.widgets', 'instance.web_dashboard.Widget');
+instance.web_dashboard.Widget = instance.web.View.extend(/** @lends instance.web_dashboard.Widgets# */{
     template: 'HomeWidget',
     /**
      * Initializes a "HomeWidget" client widget: handles the display of a given
      * res.widget objects in an OpenERP view (mainly a dashboard).
      *
-     * @constructs openerp.web_dashboard.Widget
-     * @extends openerp.web.View
+     * @constructs instance.web_dashboard.Widget
+     * @extends instance.web.View
      *
      * @param {Object} parent
      * @param {Object} options
@@ -382,7 +382,7 @@ openerp.web_dashboard.Widget = openerp.web.View.extend(/** @lends openerp.web_da
         this.widget_id = options.widget_id;
     },
     start: function () {
-        var ds = new openerp.web.DataSet(this, 'res.widget');
+        var ds = new instance.web.DataSet(this, 'res.widget');
         return ds.read_ids([this.widget_id], ['title']).then(this.on_widget_loaded);
     },
     on_widget_loaded: function (widgets) {
@@ -401,8 +401,8 @@ openerp.web_dashboard.Widget = openerp.web.View.extend(/** @lends openerp.web_da
  * HomeTiles this client action display either the list of application to
  * install (if none is installed yet) or a list of root menu items
  */
-openerp.web.client_actions.add('default_home', 'session.web_dashboard.ApplicationTiles');
-openerp.web_dashboard.ApplicationTiles = openerp.web.OldWidget.extend({
+instance.web.client_actions.add('default_home', 'session.web_dashboard.ApplicationTiles');
+instance.web_dashboard.ApplicationTiles = instance.web.OldWidget.extend({
     template: 'web_dashboard.ApplicationTiles',
     init: function(parent) {
         this._super(parent);
@@ -410,7 +410,7 @@ openerp.web_dashboard.ApplicationTiles = openerp.web.OldWidget.extend({
     start: function() {
         var self = this;
         var domain = [['application','=',true], ['state','=','installed'], ['name', '!=', 'base']];
-        var ds = new openerp.web.DataSetSearch(this, 'ir.module.module',{},domain);
+        var ds = new instance.web.DataSetSearch(this, 'ir.module.module',{},domain);
         ds.read_slice(['id']).then(function(result) {
             if(result.length) {
                 self.on_installed_database();
@@ -420,17 +420,17 @@ openerp.web_dashboard.ApplicationTiles = openerp.web.OldWidget.extend({
         });
     },
     on_uninstalled_database: function() {
-        installer = new openerp.web_dashboard.ApplicationInstaller(this);
+        installer = new instance.web_dashboard.ApplicationInstaller(this);
         installer.appendTo(this.$element);
     },
     on_installed_database: function() {
         var self = this;
         self.rpc('/web/menu/get_user_roots', {}).then(function (menu_ids) {
-            var menuds = new openerp.web.DataSet(this, 'ir.ui.menu',{})
+            var menuds = new instance.web.DataSet(this, 'ir.ui.menu',{})
                 .read_ids(menu_ids, ['name', 'web_icon_data', 'web_icon_hover_data', 'module']).then(function (applications) {
                     var tiles = QWeb.render('ApplicationTiles.content', {applications: applications});
                     $(tiles).appendTo(self.$element).find('.oe_install-module-link').click(function () {
-                        openerp.webclient.menu.on_menu_click(null, $(this).data('menu'))
+                        instance.webclient.menu.on_menu_click(null, $(this).data('menu'))
                     });
                 });
         });
@@ -441,13 +441,13 @@ openerp.web_dashboard.ApplicationTiles = openerp.web.OldWidget.extend({
  * ApplicationInstaller
  * This client action  display a list of applications to install.
  */
-openerp.web.client_actions.add( 'board.application.installer', 'openerp.web_dashboard.ApplicationInstaller');
-openerp.web_dashboard.ApplicationInstaller = openerp.web.OldWidget.extend({
+instance.web.client_actions.add( 'board.application.installer', 'instance.web_dashboard.ApplicationInstaller');
+instance.web_dashboard.ApplicationInstaller = instance.web.OldWidget.extend({
     template: 'web_dashboard.ApplicationInstaller',
     start: function () {
         // TODO menu hide
         var r = this._super();
-        this.action_manager = new openerp.web.ActionManager(this);
+        this.action_manager = new instance.web.ActionManager(this);
         this.action_manager.appendTo(this.$element.find('.oe_installer'));
         this.action_manager.do_action({
             type: 'ir.actions.act_window',
diff --git a/addons/web_diagram/static/src/js/diagram.js b/addons/web_diagram/static/src/js/diagram.js
index a38031ed4f3..ddbd385cb84 100644
--- a/addons/web_diagram/static/src/js/diagram.js
+++ b/addons/web_diagram/static/src/js/diagram.js
@@ -2,12 +2,12 @@
  * OpenERP diagram library
  *---------------------------------------------------------*/
 
-openerp.web_diagram = function (openerp) {
-var QWeb = openerp.web.qweb,
-      _t = openerp.web._t,
-     _lt = openerp.web._lt;
-openerp.web.views.add('diagram', 'openerp.web.DiagramView');
-openerp.web.DiagramView = openerp.web.View.extend({
+openerp.web_diagram = function (instance) {
+var QWeb = instance.web.qweb,
+      _t = instance.web._t,
+     _lt = instance.web._lt;
+instance.web.views.add('diagram', 'instance.web.DiagramView');
+instance.web.DiagramView = instance.web.View.extend({
     display_name: _lt('Diagram'),
     searchable: false,
     init: function(parent, dataset, view_id, options) {
@@ -194,7 +194,7 @@ openerp.web.DiagramView = openerp.web.View.extend({
             if(!confirm(_t("Deleting this node cannot be undone.\nIt will also delete all connected transitions.\n\nAre you sure ?"))){
                 return $.Deferred().reject().promise();
             }
-            return new openerp.web.DataSet(self,self.node).unlink([cutenode.id]);
+            return new instance.web.DataSet(self,self.node).unlink([cutenode.id]);
         };
         CuteEdge.double_click_callback = function(cuteedge){
             self.edit_connector(cuteedge.id);
@@ -212,7 +212,7 @@ openerp.web.DiagramView = openerp.web.View.extend({
             if(!confirm(_t("Deleting this transition cannot be undone.\n\nAre you sure ?"))){
                 return $.Deferred().reject().promise();
             }
-            return new openerp.web.DataSet(self,self.connector).unlink([cuteedge.id]);
+            return new instance.web.DataSet(self,self.connector).unlink([cuteedge.id]);
         };
 
     },
@@ -221,7 +221,7 @@ openerp.web.DiagramView = openerp.web.View.extend({
     edit_node: function(node_id){
         var self = this;
         var title = _t('Activity');
-        var pop = new openerp.web.form.FormOpenPopup(self);
+        var pop = new instance.web.form.FormOpenPopup(self);
 
         pop.show_element(
                 self.node,
@@ -254,7 +254,7 @@ openerp.web.DiagramView = openerp.web.View.extend({
     add_node: function(){
         var self = this;
         var title = _t('Activity');
-        var pop = new openerp.web.form.SelectCreatePopup(self);
+        var pop = new instance.web.form.SelectCreatePopup(self);
         pop.select_element(
             self.node,
             {
@@ -286,7 +286,7 @@ openerp.web.DiagramView = openerp.web.View.extend({
     edit_connector: function(connector_id){
         var self = this;
         var title = _t('Transition');
-        var pop = new openerp.web.form.FormOpenPopup(self);
+        var pop = new instance.web.form.FormOpenPopup(self);
         pop.show_element(
             self.connector,
             parseInt(connector_id,10),      //FIXME Isn't connector_id supposed to be an int ?
@@ -305,7 +305,7 @@ openerp.web.DiagramView = openerp.web.View.extend({
     add_connector: function(node_source_id, node_dest_id, dummy_cuteedge){
         var self = this;
         var title = _t('Transition');
-        var pop = new openerp.web.form.SelectCreatePopup(self);
+        var pop = new instance.web.form.SelectCreatePopup(self);
 
         pop.select_element(
             self.connector,

From eab7adeacf3268836caf8d95d403f0aabc825dca Mon Sep 17 00:00:00 2001
From: niv-openerp <nicolas.vanhoren@openerp.com>
Date: Tue, 17 Apr 2012 14:48:30 +0200
Subject: [PATCH 134/238] [imp] remaining of refactoring for 'openerp'

bzr revid: nicolas.vanhoren@openerp.com-20120417124830-6vy3nsjch3w94rt2
---
 addons/web_gantt/static/src/js/gantt.js       | 28 +++++------
 addons/web_graph/static/src/js/graph.js       | 10 ++--
 addons/web_hello/static/openerp/base_hello.js |  6 +--
 addons/web_kanban/static/src/js/kanban.js     | 44 ++++++++---------
 .../web_mobile/static/src/js/chrome_mobile.js | 48 +++++++++----------
 .../web_mobile/static/src/js/form_mobile.js   | 20 ++++----
 .../web_mobile/static/src/js/list_mobile.js   | 10 ++--
 addons/web_process/static/src/js/process.js   | 22 ++++-----
 addons/web_tests/static/src/js/web_tests.js   | 14 +++---
 9 files changed, 101 insertions(+), 101 deletions(-)

diff --git a/addons/web_gantt/static/src/js/gantt.js b/addons/web_gantt/static/src/js/gantt.js
index 132d95e309e..5643e0cefb3 100644
--- a/addons/web_gantt/static/src/js/gantt.js
+++ b/addons/web_gantt/static/src/js/gantt.js
@@ -1,13 +1,13 @@
 /*---------------------------------------------------------
  * OpenERP web_gantt
  *---------------------------------------------------------*/
-openerp.web_gantt = function (openerp) {
-var _t = openerp.web._t,
-   _lt = openerp.web._lt;
-var QWeb = openerp.web.qweb;
-openerp.web.views.add('gantt', 'openerp.web_gantt.GanttView');
+openerp.web_gantt = function (instance) {
+var _t = instance.web._t,
+   _lt = instance.web._lt;
+var QWeb = instance.web.qweb;
+instance.web.views.add('gantt', 'instance.web_gantt.GanttView');
 
-openerp.web_gantt.GanttView = openerp.web.View.extend({
+instance.web_gantt.GanttView = instance.web.View.extend({
     display_name: _lt('Gantt'),
     template: "GanttView",
     view_type: "gantt",
@@ -122,7 +122,7 @@ openerp.web_gantt.GanttView = openerp.web.View.extend({
                     return memo === undefined || date > memo ? date : memo;
                 }, undefined);
                 var duration = (task_stop.getTime() - task_start.getTime()) / (1000 * 60 * 60);
-                var group_name = openerp.web.format_value(task.name, self.fields[group_bys[level]]);
+                var group_name = instance.web.format_value(task.name, self.fields[group_bys[level]]);
                 if (level == 0) {
                     var group = new GanttProjectInfo(_.uniqueId("gantt_project_"), group_name, task_start);
                     _.each(task_infos, function(el) {
@@ -138,16 +138,16 @@ openerp.web_gantt.GanttView = openerp.web.View.extend({
                 }
             } else {
                 var task_name = task.__name;
-                var task_start = openerp.web.auto_str_to_date(task[self.fields_view.arch.attrs.date_start]);
+                var task_start = instance.web.auto_str_to_date(task[self.fields_view.arch.attrs.date_start]);
                 if (!task_start)
                     return;
                 var task_stop;
                 if (self.fields_view.arch.attrs.date_stop) {
-                    task_stop = openerp.web.auto_str_to_date(task[self.fields_view.arch.attrs.date_stop]);
+                    task_stop = instance.web.auto_str_to_date(task[self.fields_view.arch.attrs.date_stop]);
                     if (!task_stop)
                         return;
                 } else { // we assume date_duration is defined
-                    var tmp = openerp.web.format_value(task[self.fields_view.arch.attrs.date_delay],
+                    var tmp = instance.web.format_value(task[self.fields_view.arch.attrs.date_delay],
                         self.fields[self.fields_view.arch.attrs.date_delay]);
                     if (!tmp)
                         return;
@@ -197,10 +197,10 @@ openerp.web_gantt.GanttView = openerp.web.View.extend({
         var end = start.clone().addMilliseconds(duration * 60 * 60 * 1000);
         var data = {};
         data[self.fields_view.arch.attrs.date_start] =
-            openerp.web.auto_date_to_str(start, self.fields[self.fields_view.arch.attrs.date_start].type);
+            instance.web.auto_date_to_str(start, self.fields[self.fields_view.arch.attrs.date_start].type);
         if (self.fields_view.arch.attrs.date_stop) {
             data[self.fields_view.arch.attrs.date_stop] = 
-                openerp.web.auto_date_to_str(end, self.fields[self.fields_view.arch.attrs.date_stop].type);
+                instance.web.auto_date_to_str(end, self.fields[self.fields_view.arch.attrs.date_stop].type);
         } else { // we assume date_duration is defined
             data[self.fields_view.arch.attrs.date_delay] = duration;
         }
@@ -210,7 +210,7 @@ openerp.web_gantt.GanttView = openerp.web.View.extend({
     },
     on_task_display: function(task) {
         var self = this;
-        var pop = new openerp.web.form.FormOpenPopup(self);
+        var pop = new instance.web.form.FormOpenPopup(self);
         pop.on_write_completed.add_last(function() {
             self.reload();
         });
@@ -223,7 +223,7 @@ openerp.web_gantt.GanttView = openerp.web.View.extend({
     },
     on_task_create: function() {
         var self = this;
-        var pop = new openerp.web.form.SelectCreatePopup(this);
+        var pop = new instance.web.form.SelectCreatePopup(this);
         pop.on_select_elements.add_last(function() {
             self.reload();
         });
diff --git a/addons/web_graph/static/src/js/graph.js b/addons/web_graph/static/src/js/graph.js
index a55d8f15fbf..7016b9d8d85 100644
--- a/addons/web_graph/static/src/js/graph.js
+++ b/addons/web_graph/static/src/js/graph.js
@@ -2,7 +2,7 @@
  * OpenERP web_graph
  *---------------------------------------------------------*/
 
-openerp.web_graph = function (openerp) {
+openerp.web_graph = function (instance) {
 var COLOR_PALETTE = [
     '#cc99ff', '#ccccff', '#48D1CC', '#CFD784', '#8B7B8B', '#75507b',
     '#b0008c', '#ff0000', '#ff8e00', '#9000ff', '#0078ff', '#00ff00',
@@ -12,10 +12,10 @@ var COLOR_PALETTE = [
     '#ad7fa8', '#729fcf', '#8ae234', '#e9b96e', '#fce94f', '#f57900',
     '#cc0000', '#d400a8'];
 
-var QWeb = openerp.web.qweb,
-     _lt = openerp.web._lt;
-openerp.web.views.add('graph', 'openerp.web_graph.GraphView');
-openerp.web_graph.GraphView = openerp.web.View.extend({
+var QWeb = instance.web.qweb,
+     _lt = instance.web._lt;
+instance.web.views.add('graph', 'instance.web_graph.GraphView');
+instance.web_graph.GraphView = instance.web.View.extend({
     display_name: _lt('Graph'),
     view_type: "graph",
 
diff --git a/addons/web_hello/static/openerp/base_hello.js b/addons/web_hello/static/openerp/base_hello.js
index 91caf263196..a74b8ef8f2f 100644
--- a/addons/web_hello/static/openerp/base_hello.js
+++ b/addons/web_hello/static/openerp/base_hello.js
@@ -2,9 +2,9 @@
  * OpenERP base_hello (Example module)
  *---------------------------------------------------------*/
 
-openerp.web_hello = function(openerp) {
+openerp.web_hello = function(instance) {
 
-openerp.web.SearchView = openerp.web.SearchView.extend({
+instance.web.SearchView = instance.web.SearchView.extend({
     init:function() {
         this._super.apply(this,arguments);
         this.on_search.add(function(){console.log('hello');});
@@ -13,7 +13,7 @@ openerp.web.SearchView = openerp.web.SearchView.extend({
 
 // here you may tweak globals object, if any, and play with on_* or do_* callbacks on them
 
-openerp.web.Login = openerp.web.Login.extend({
+instance.web.Login = instance.web.Login.extend({
     start: function() {
         console.log('Hello there');
         this._super.apply(this,arguments);
diff --git a/addons/web_kanban/static/src/js/kanban.js b/addons/web_kanban/static/src/js/kanban.js
index 1118c6388c8..d3ba0c74f5a 100644
--- a/addons/web_kanban/static/src/js/kanban.js
+++ b/addons/web_kanban/static/src/js/kanban.js
@@ -1,11 +1,11 @@
-openerp.web_kanban = function (openerp) {
+openerp.web_kanban = function (instance) {
 
-var _t = openerp.web._t,
-   _lt = openerp.web._lt;
-var QWeb = openerp.web.qweb;
-openerp.web.views.add('kanban', 'openerp.web_kanban.KanbanView');
+var _t = instance.web._t,
+   _lt = instance.web._lt;
+var QWeb = instance.web.qweb;
+instance.web.views.add('kanban', 'instance.web_kanban.KanbanView');
 
-openerp.web_kanban.KanbanView = openerp.web.View.extend({
+instance.web_kanban.KanbanView = instance.web.View.extend({
     template: "KanbanView",
     display_name: _lt('Kanban'),
     default_nr_columns: 3,
@@ -23,12 +23,12 @@ openerp.web_kanban.KanbanView = openerp.web.View.extend({
             records : {}
         };
         this.groups = [];
-        this.form_dialog = new openerp.web.form.FormDialog(this, {}, this.options.action_views_ids.form, dataset).start();
+        this.form_dialog = new instance.web.form.FormDialog(this, {}, this.options.action_views_ids.form, dataset).start();
         this.form_dialog.on_form_dialog_saved.add_last(this.do_reload);
         this.aggregates = {};
         this.group_operators = ['avg', 'max', 'min', 'sum', 'count'];
         this.qweb = new QWeb2.Engine();
-        this.qweb.debug = openerp.connection.debug;
+        this.qweb.debug = instance.connection.debug;
         this.qweb.default_dict = _.clone(QWeb.default_dict);
         this.has_been_loaded = $.Deferred();
         this.search_domain = this.search_context = this.search_group_by = null;
@@ -57,7 +57,7 @@ openerp.web_kanban.KanbanView = openerp.web.View.extend({
             var child = this.fields_view.arch.children[i];
             if (child.tag === "templates") {
                 this.transform_qweb_template(child);
-                this.qweb.add_template(openerp.web.json_node_to_xml(child));
+                this.qweb.add_template(instance.web.json_node_to_xml(child));
                 break;
             } else if (child.tag === 'field') {
                 this.extract_aggregates(child);
@@ -109,7 +109,7 @@ openerp.web_kanban.KanbanView = openerp.web.View.extend({
                         node.children = [{
                             tag: 'img',
                             attrs: {
-                                src: openerp.connection.prefix + '/web/static/src/img/icons/' + node.attrs['data-icon'] + '.png',
+                                src: instance.connection.prefix + '/web/static/src/img/icons/' + node.attrs['data-icon'] + '.png',
                                 width: '16',
                                 height: '16'
                             }
@@ -141,7 +141,7 @@ openerp.web_kanban.KanbanView = openerp.web.View.extend({
         this.search_group_by = group_by;
         $.when(this.has_been_loaded).then(function() {
             self.group_by = group_by.length ? group_by[0] : self.fields_view.arch.attrs.default_group_by;
-            self.datagroup = new openerp.web.DataGroup(self, self.dataset.model, domain, context, self.group_by ? [self.group_by] : []);
+            self.datagroup = new instance.web.DataGroup(self, self.dataset.model, domain, context, self.group_by ? [self.group_by] : []);
             self.datagroup.list(self.fields_keys, self.do_process_groups, self.do_process_dataset);
         });
     },
@@ -154,10 +154,10 @@ openerp.web_kanban.KanbanView = openerp.web.View.extend({
             var remaining = groups.length - 1,
                 groups_array = [];
             _.each(groups, function (group, index) {
-                var dataset = new openerp.web.DataSetSearch(self, self.dataset.model, group.context, group.domain);
+                var dataset = new instance.web.DataSetSearch(self, self.dataset.model, group.context, group.domain);
                 dataset.read_slice(self.fields_keys.concat(['__last_update']), { 'limit': self.limit }).then(function(records) {
                     self.dataset.ids.push.apply(self.dataset.ids, dataset.ids);
-                    groups_array[index] = new openerp.web_kanban.KanbanGroup(self, records, group, dataset);
+                    groups_array[index] = new instance.web_kanban.KanbanGroup(self, records, group, dataset);
                     if (!remaining--) {
                         self.dataset.index = self.dataset.size() ? 0 : null;
                         def.pipe(self.do_add_groups(groups_array));
@@ -175,7 +175,7 @@ openerp.web_kanban.KanbanView = openerp.web.View.extend({
             var def = $.Deferred();
             self.do_clear_groups();
             self.dataset.read_slice(self.fields_keys.concat(['__last_update']), { 'limit': self.limit }).then(function(records) {
-                var kgroup = new openerp.web_kanban.KanbanGroup(self, records, null, self.dataset);
+                var kgroup = new instance.web_kanban.KanbanGroup(self, records, null, self.dataset);
                 self.do_add_groups([kgroup]).then(function() {
                     def.resolve();
                 });
@@ -293,7 +293,7 @@ openerp.web_kanban.KanbanView = openerp.web.View.extend({
     },
 });
 
-openerp.web_kanban.KanbanGroup = openerp.web.OldWidget.extend({
+instance.web_kanban.KanbanGroup = instance.web.OldWidget.extend({
     template: 'KanbanView.group_header',
     init: function (parent, records, group, dataset) {
         var self = this;
@@ -315,7 +315,7 @@ openerp.web_kanban.KanbanGroup = openerp.web.OldWidget.extend({
             var field = this.view.fields_view.fields[this.view.group_by];
             if (field) {
                 try {
-                    this.title = openerp.web.format_value(group.value, field, false);
+                    this.title = instance.web.format_value(group.value, field, false);
                 } catch(e) {}
             }
             _.each(this.view.aggregates, function(value, key) {
@@ -376,7 +376,7 @@ openerp.web_kanban.KanbanGroup = openerp.web.OldWidget.extend({
     do_add_records: function(records) {
         var self = this;
         _.each(records, function(record) {
-            var rec = new openerp.web_kanban.KanbanRecord(self, record);
+            var rec = new instance.web_kanban.KanbanRecord(self, record);
             rec.insertBefore(self.$records.find('.oe_kanban_show_more'));
             self.records.push(rec);
         });
@@ -404,7 +404,7 @@ openerp.web_kanban.KanbanGroup = openerp.web.OldWidget.extend({
     }
 });
 
-openerp.web_kanban.KanbanRecord = openerp.web.OldWidget.extend({
+instance.web_kanban.KanbanRecord = instance.web.OldWidget.extend({
     template: 'KanbanView.record',
     init: function (parent, record) {
         this._super(parent);
@@ -434,11 +434,11 @@ openerp.web_kanban.KanbanRecord = openerp.web.OldWidget.extend({
         _.each(record, function(value, name) {
             var r = _.clone(self.view.fields_view.fields[name] || {});
             if ((r.type === 'date' || r.type === 'datetime') && value) {
-                r.raw_value = openerp.web.auto_str_to_date(value);
+                r.raw_value = instance.web.auto_str_to_date(value);
             } else {
                 r.raw_value = value;
             }
-            r.value = openerp.web.format_value(value, r);
+            r.value = instance.web.format_value(value, r);
             new_record[name] = r;
         });
         return new_record;
@@ -584,9 +584,9 @@ openerp.web_kanban.KanbanRecord = openerp.web.OldWidget.extend({
     },
     kanban_image: function(model, field, id) {
         id = id || '';
-        var url = openerp.connection.prefix + '/web/binary/image?session_id=' + this.session.session_id + '&model=' + model + '&field=' + field + '&id=' + id;
+        var url = instance.connection.prefix + '/web/binary/image?session_id=' + this.session.session_id + '&model=' + model + '&field=' + field + '&id=' + id;
         if (this.record.__last_update && this.record.__last_update.raw_value) {
-            var time = openerp.web.str_to_datetime(this.record.__last_update.raw_value).getTime();
+            var time = instance.web.str_to_datetime(this.record.__last_update.raw_value).getTime();
             url += '&t=' + time;
         }
         return url;
diff --git a/addons/web_mobile/static/src/js/chrome_mobile.js b/addons/web_mobile/static/src/js/chrome_mobile.js
index a28956a0cab..a507e3b5943 100644
--- a/addons/web_mobile/static/src/js/chrome_mobile.js
+++ b/addons/web_mobile/static/src/js/chrome_mobile.js
@@ -2,36 +2,36 @@
  * OpenERP Web Mobile chrome
  *---------------------------------------------------------*/
 
-openerp.web_mobile.chrome_mobile = function(openerp) {
+openerp.web_mobile.chrome_mobile = function(instance) {
 
-openerp.web_mobile.mobilewebclient = function(element_id) {
-    // TODO Helper to start mobile webclient rename it openerp.web.webclient
-    var client = new openerp.web_mobile.MobileWebClient(element_id);
+instance.web_mobile.mobilewebclient = function(element_id) {
+    // TODO Helper to start mobile webclient rename it instance.web.webclient
+    var client = new instance.web_mobile.MobileWebClient(element_id);
     client.start();
     return client;
 };
 
-openerp.web_mobile.MobileWebClient = openerp.web.OldWidget.extend({
+instance.web_mobile.MobileWebClient = instance.web.OldWidget.extend({
 
     template: "WebClient",
 
     init: function(element_id) {
         this._super(null, element_id);
-        this.crashmanager =  new openerp.web.CrashManager(this);
-        this.login = new openerp.web_mobile.Login(this, "oe_login");
+        this.crashmanager =  new instance.web.CrashManager(this);
+        this.login = new instance.web_mobile.Login(this, "oe_login");
     },
     start: function() {
         this._super.apply(this, arguments);
         var self = this;
         this.session.bind_session().then(function() {
-            openerp.web.qweb.add_template("xml/web_mobile.xml");
+            instance.web.qweb.add_template("xml/web_mobile.xml");
             self.$element.html(self.render());
             self.login.start();
         });
     }
 });
 
-openerp.web_mobile.Login =  openerp.web.OldWidget.extend({
+instance.web_mobile.Login =  instance.web.OldWidget.extend({
 
     template: "Login",
 
@@ -103,7 +103,7 @@ openerp.web_mobile.Login =  openerp.web.OldWidget.extend({
             .addClass("login_valid");
             //.hide();
         if(!$('#oe_menu').html().length){
-            this.menu = new openerp.web_mobile.Menu(this, "oe_menu", "oe_secondary_menu");
+            this.menu = new instance.web_mobile.Menu(this, "oe_menu", "oe_secondary_menu");
             this.menu.start();
         }else{
             $.mobile.changePage("#oe_menu", "slide", false, true);
@@ -119,7 +119,7 @@ openerp.web_mobile.Login =  openerp.web.OldWidget.extend({
     }
 });
 
-openerp.web_mobile.Header =  openerp.web.OldWidget.extend({
+instance.web_mobile.Header =  instance.web.OldWidget.extend({
 
     template: "Header",
 
@@ -131,7 +131,7 @@ openerp.web_mobile.Header =  openerp.web.OldWidget.extend({
     }
 });
 
-openerp.web_mobile.Footer =  openerp.web.OldWidget.extend({
+instance.web_mobile.Footer =  instance.web.OldWidget.extend({
 
     template: "Footer",
 
@@ -143,7 +143,7 @@ openerp.web_mobile.Footer =  openerp.web.OldWidget.extend({
     }
 });
 
-openerp.web_mobile.Shortcuts =  openerp.web.OldWidget.extend({
+instance.web_mobile.Shortcuts =  instance.web.OldWidget.extend({
 
     template: "Shortcuts",
 
@@ -171,7 +171,7 @@ openerp.web_mobile.Shortcuts =  openerp.web.OldWidget.extend({
         res_id = $shortcut.data('res');
         if(!$('[id^="oe_list_'+res_id+'"]').html()){
             $('<div id="oe_list_'+res_id+'" data-role="page" data-url="oe_list_'+res_id+'"> </div>').appendTo('#moe');
-            this.listview = new openerp.web_mobile.ListView(self, "oe_list_"+res_id, res_id);
+            this.listview = new instance.web_mobile.ListView(self, "oe_list_"+res_id, res_id);
             this.listview.start();
         }else{
             $.mobile.changePage('#oe_list_'+res_id, "slide", false, true);
@@ -182,7 +182,7 @@ openerp.web_mobile.Shortcuts =  openerp.web.OldWidget.extend({
     }
 });
 
-openerp.web_mobile.Menu =  openerp.web.OldWidget.extend({
+instance.web_mobile.Menu =  instance.web.OldWidget.extend({
 
     template: "Menu",
 
@@ -199,16 +199,16 @@ openerp.web_mobile.Menu =  openerp.web.OldWidget.extend({
     on_loaded: function(data) {
         var self = this;
         this.data = data;
-        this.header = new openerp.web_mobile.Header(this, "oe_header");
+        this.header = new instance.web_mobile.Header(this, "oe_header");
         this.header.start();
-        this.footer = new openerp.web_mobile.Footer(this, "oe_footer");
+        this.footer = new instance.web_mobile.Footer(this, "oe_footer");
         this.footer.start();
         this.$element.html(this.render(this.data));
         this.$element.find("[data-role=header]").find('h1').html('Applications');
         this.$element.find("[data-role=header]").find('#home').hide();
         this.$element.find("[data-role=footer]").find('#shrotcuts').click(function(){
             if(!$('#oe_shortcuts').html().length){
-                this.shortcuts = new openerp.web_mobile.Shortcuts(self, "oe_shortcuts");
+                this.shortcuts = new instance.web_mobile.Shortcuts(self, "oe_shortcuts");
                 this.shortcuts.start();
             }else{
                 $.mobile.changePage($("#oe_shortcuts"), "slide", false, true);
@@ -216,7 +216,7 @@ openerp.web_mobile.Menu =  openerp.web.OldWidget.extend({
         });
         this.$element.find("[data-role=footer]").find('#preference').click(function(){
             if(!$('#oe_options').html().length){
-                this.options = new openerp.web_mobile.Options(self, "oe_options");
+                this.options = new instance.web_mobile.Options(self, "oe_options");
                 this.options.start();
             }else{
                 $.mobile.changePage("#oe_options", "slide", false, true);
@@ -240,7 +240,7 @@ openerp.web_mobile.Menu =  openerp.web.OldWidget.extend({
             .addClass("secondary_menu");
         if(!$('[id^="oe_sec_menu_'+id+'"]').html()){
             $('<div id="oe_sec_menu_'+id+'" data-role="page" data-url="oe_sec_menu_'+id+'"> </div>').appendTo('#moe');
-            this.secondary = new openerp.web_mobile.Secondary(this, "oe_sec_menu_"+id, this.children);
+            this.secondary = new instance.web_mobile.Secondary(this, "oe_sec_menu_"+id, this.children);
             this.secondary.start();
         }else{
             $.mobile.changePage('#oe_sec_menu_'+id, "slide", false, true);
@@ -248,7 +248,7 @@ openerp.web_mobile.Menu =  openerp.web.OldWidget.extend({
     }
 });
 
-openerp.web_mobile.Secondary =  openerp.web.OldWidget.extend({
+instance.web_mobile.Secondary =  instance.web.OldWidget.extend({
 
     template: "Menu.secondary",
 
@@ -287,7 +287,7 @@ openerp.web_mobile.Secondary =  openerp.web.OldWidget.extend({
             .addClass("secondary_menu");
             if(!$('[id^="oe_sec_menu_'+id+'"]').html()){
                 $('<div id="oe_sec_menu_'+id+'" data-role="page" data-url="oe_sec_menu_'+id+'"> </div>').appendTo('#moe');
-                this.secondary = new openerp.web_mobile.Secondary(this, "oe_sec_menu_"+id, this.children);
+                this.secondary = new instance.web_mobile.Secondary(this, "oe_sec_menu_"+id, this.children);
                 this.secondary.start();
             }else{
                 $.mobile.changePage('#oe_sec_menu_'+id, "slide", false, true);
@@ -295,7 +295,7 @@ openerp.web_mobile.Secondary =  openerp.web.OldWidget.extend({
         }else {
             if(!$('[id^="oe_list_'+id+'"]').html()){
                 $('<div id="oe_list_'+id+'" data-role="page" data-url="oe_list_'+id+'"> </div>').appendTo('#moe');
-                this.listview = new openerp.web_mobile.ListView(this, "oe_list_"+id, id);
+                this.listview = new instance.web_mobile.ListView(this, "oe_list_"+id, id);
                 this.listview.start();
             }else{
                 $.mobile.changePage('#oe_list_'+id, "slide", false, true);
@@ -305,7 +305,7 @@ openerp.web_mobile.Secondary =  openerp.web.OldWidget.extend({
     }
 });
 
-openerp.web_mobile.Options =  openerp.web.OldWidget.extend({
+instance.web_mobile.Options =  instance.web.OldWidget.extend({
 
     template: "Options",
 
diff --git a/addons/web_mobile/static/src/js/form_mobile.js b/addons/web_mobile/static/src/js/form_mobile.js
index cf44cca1879..c3c2025ac1f 100644
--- a/addons/web_mobile/static/src/js/form_mobile.js
+++ b/addons/web_mobile/static/src/js/form_mobile.js
@@ -2,9 +2,9 @@
  * OpenERP Web Mobile Form View
  *---------------------------------------------------------*/
 
-openerp.web_mobile.form_mobile = function (openerp) {
+openerp.web_mobile.form_mobile = function (instance) {
 
-openerp.web_mobile.FormView = openerp.web.OldWidget.extend({
+instance.web_mobile.FormView = instance.web.OldWidget.extend({
 
     template: 'FormView',
 
@@ -25,8 +25,8 @@ openerp.web_mobile.FormView = openerp.web.OldWidget.extend({
         }else{
             var view_id = this.viewid;
         }
-        this.dataset = new openerp.web.DataSetSearch(this, model, null, null);
-        var context = new openerp.web.CompoundContext(this.dataset.get_context());
+        this.dataset = new instance.web.DataSetSearch(this, model, null, null);
+        var context = new instance.web.CompoundContext(this.dataset.get_context());
         this.dataset.read_slice([]).then(function (result) {
             for (var i = 0; i < result.length; i++) {
                 if (result[i].id == id) {
@@ -71,14 +71,14 @@ openerp.web_mobile.FormView = openerp.web.OldWidget.extend({
             var head = rel_field.string;
             if (rel_ids) {
                 var list_ids = [];
-                var datasearch = new openerp.web.DataSetSearch(self, rel_field.relation, rel_field.context);
+                var datasearch = new instance.web.DataSetSearch(self, rel_field.relation, rel_field.context);
                 datasearch.domain=[['id', 'in', rel_ids]];
                 datasearch.read_slice(['name'], {context:rel_field.context, domain: datasearch.domain, limit:80}).then(function(listrec){
                     _.each(listrec, function(i) {
                         list_ids.push(i.id);
                     });
                     _.extend(rel_field.context,{"html_name_get" : true});
-                    var dataset = new openerp.web.DataSet(self, rel_field.relation,rel_field.context);
+                    var dataset = new instance.web.DataSet(self, rel_field.relation,rel_field.context);
                     dataset.name_get(list_ids,function(res){
                         var additional = "";
                         if(res['html_name_get']){
@@ -86,7 +86,7 @@ openerp.web_mobile.FormView = openerp.web.OldWidget.extend({
                         }
                         if(!$('[id^="oe_list_'+relational+'_'+self.element_id+'"]').html()){
                             $('<div id="oe_list_'+relational+'_'+self.element_id+'" data-role="page" data-url="oe_list_'+relational+'_'+self.element_id+'"> </div>').appendTo('#moe');
-                            $('[id^="oe_list_'+relational+'_'+self.element_id+'"]').html(openerp.web.qweb.render("ListView", {'records' : res,'data': additional}));
+                            $('[id^="oe_list_'+relational+'_'+self.element_id+'"]').html(instance.web.qweb.render("ListView", {'records' : res,'data': additional}));
                             $('[id^="oe_list_'+relational+'_'+self.element_id+'"]').find("[data-role=header]").find('h1').html(head);
                             $('[id^="oe_list_'+relational+'_'+self.element_id+'"]').find("[data-role=header]").find('#home').click(function(){
                                 $.mobile.changePage("#oe_menu", "slide", false, true);
@@ -98,7 +98,7 @@ openerp.web_mobile.FormView = openerp.web.OldWidget.extend({
                                 var listid = $(ev.currentTarget).data('id');
                                 if(!$('[id^="oe_form_'+listid+rel_field.relation+'"]').html()){
                                     $('<div id="oe_form_'+listid+rel_field.relation+'" data-role="page" data-url="oe_form_'+listid+rel_field.relation+'"> </div>').appendTo('#moe');
-                                        this.formview = new openerp.web_mobile.FormView(self, "oe_form_"+listid+rel_field.relation, listid, '', head, rel_field.relation, false);
+                                        this.formview = new instance.web_mobile.FormView(self, "oe_form_"+listid+rel_field.relation, listid, '', head, rel_field.relation, false);
                                         this.formview.start();
                                 }else{
                                     $.mobile.changePage('#oe_form_'+listid+rel_field.relation, "slide", false, true);
@@ -126,7 +126,7 @@ openerp.web_mobile.FormView = openerp.web.OldWidget.extend({
         if(selected_id){
             if(!$('[id^="oe_form_'+selected_id+select_model+'"]').html()){
                 $('<div id="oe_form_'+selected_id+select_model+'" data-role="page" data-url="oe_form_'+selected_id+select_model+'"> </div>').appendTo('#moe');
-                    this.formview = new openerp.web_mobile.FormView(self, "oe_form_"+selected_id+select_model, selected_id, '', head, select_model, false);
+                    this.formview = new instance.web_mobile.FormView(self, "oe_form_"+selected_id+select_model, selected_id, '', head, select_model, false);
                     this.formview.start();
             }else{
                 $.mobile.changePage('#oe_form_'+selected_id+select_model, "slide", false, true);
@@ -168,7 +168,7 @@ openerp.web_mobile.FormView = openerp.web.OldWidget.extend({
                         // Temp: Set as disabled
                         $("#"+getfields[i].attrs.name).attr('disabled', 'true');
                         if(result.fields[getfields[i].attrs.name]){
-                            var dateresult = openerp.web.format_value(data[getfields[i].attrs.name], {"widget": result.fields[getfields[i].attrs.name].type});
+                            var dateresult = instance.web.format_value(data[getfields[i].attrs.name], {"widget": result.fields[getfields[i].attrs.name].type});
                             $(this).val(dateresult);
                         }
                     }
diff --git a/addons/web_mobile/static/src/js/list_mobile.js b/addons/web_mobile/static/src/js/list_mobile.js
index 16296df59e7..abe5620a0a3 100644
--- a/addons/web_mobile/static/src/js/list_mobile.js
+++ b/addons/web_mobile/static/src/js/list_mobile.js
@@ -2,9 +2,9 @@
  * OpenERP Web Mobile List View
  *---------------------------------------------------------*/
 
-openerp.web_mobile.list_mobile = function (openerp) {
+openerp.web_mobile.list_mobile = function (instance) {
 
-openerp.web_mobile.ListView = openerp.web.OldWidget.extend({
+instance.web_mobile.ListView = instance.web.OldWidget.extend({
 
     template: 'ListView',
 
@@ -31,14 +31,14 @@ openerp.web_mobile.ListView = openerp.web.OldWidget.extend({
     on_search_data: function(ev){
         var self = this;
         var list_ids = [];
-        var datasearch = new openerp.web.DataSetSearch(self, self.action.res_model,self.action.context);
+        var datasearch = new instance.web.DataSetSearch(self, self.action.res_model,self.action.context);
         datasearch.domain = self.action.domain;
         datasearch.read_slice(['name'], {context:datasearch.context, domain: datasearch.domain, limit:80}).then(function(listresult){
             _.each(listresult, function(i) {
                 list_ids.push(i.id);
             });
             _.extend(self.action.context,{"html_name_get" : true});
-            var dataset = new openerp.web.DataSet(self, datasearch.model,datasearch.context);
+            var dataset = new instance.web.DataSet(self, datasearch.model,datasearch.context);
             dataset.name_get(list_ids,function(res){
                 var additional = "";
                 if(res['html_name_get']){
@@ -64,7 +64,7 @@ openerp.web_mobile.ListView = openerp.web.OldWidget.extend({
         head_title = $.trim($record.text());
         if(!$('[id^="oe_form_'+id+this.action.res_model+'"]').html()){
             $('<div id="oe_form_'+id+this.action.res_model+'" data-role="page" data-url="oe_form_'+id+this.action.res_model+'"> </div>').appendTo('#moe');
-            this.formview = new openerp.web_mobile.FormView(this, "oe_form_"+id+this.action.res_model, id, this.action, head_title, '' ,'');
+            this.formview = new instance.web_mobile.FormView(this, "oe_form_"+id+this.action.res_model, id, this.action, head_title, '' ,'');
             this.formview.start();
         }else{
             $.mobile.changePage('#oe_form_'+id+this.action.res_model, "slide", false, true);
diff --git a/addons/web_process/static/src/js/process.js b/addons/web_process/static/src/js/process.js
index 4a731b9d3f6..85bb3447b71 100644
--- a/addons/web_process/static/src/js/process.js
+++ b/addons/web_process/static/src/js/process.js
@@ -1,7 +1,7 @@
-openerp.web_process = function (openerp) {
-    var QWeb = openerp.web.qweb,
-          _t = openerp.web._t;
-    openerp.web.ViewManager.include({
+openerp.web_process = function (instance) {
+    var QWeb = instance.web.qweb,
+          _t = instance.web._t;
+    instance.web.ViewManager.include({
         start: function() {
             this._super();
             this.process_check();
@@ -15,7 +15,7 @@ openerp.web_process = function (openerp) {
             grandparent = this.getParent() && this.getParent().getParent(),
             view = this.views[this.views_src[0].view_type],
             $process_view = this.$element.find('.oe-process-view');
-            if (!(grandparent instanceof openerp.web.WebClient) ||
+            if (!(grandparent instanceof instance.web.WebClient) ||
                 !(view.view_type === this.views_src[0].view_type
                     && view.view_id === this.views_src[0].view_id)) {
                         $process_view.hide();
@@ -86,7 +86,7 @@ openerp.web_process = function (openerp) {
             if(!this.subflow_model) {
                 def.resolve(this.action ? (this.action.help!=false ? this.action.help : 'Help: Not Defined') : 'Help: Not Defined');
             } else {
-                 var dataset = new openerp.web.DataSetSearch(this, "ir.actions.act_window", this.session.context, []);
+                 var dataset = new instance.web.DataSetSearch(this, "ir.actions.act_window", this.session.context, []);
                  dataset
                     .read_slice(['help'],
                     {
@@ -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 instance.web.DataSetStatic(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 instance.web.DataSetStatic(this, 'ir.values', this.session.context);
             dataset.call('get',
                 ['action', 'tree_but_open',[['ir.ui.menu', id]], dataset.context],
                 function(res) {
@@ -246,7 +246,7 @@ openerp.web_process = function (openerp) {
                         action_id: action.id,
                         context: dataset.context
                         }, function(result) {
-                            var action_manager = new openerp.web.ActionManager(self);
+                            var action_manager = new instance.web.ActionManager(self);
                             action_manager.replace(self.$element);
                             action_manager.do_action(result.result);
                         });
@@ -254,8 +254,8 @@ openerp.web_process = function (openerp) {
         },
         edit_process_view: function() {
             var self = this;
-            var action_manager = new openerp.web.ActionManager(this);
-            var dialog = new openerp.web.Dialog(this, {
+            var action_manager = new instance.web.ActionManager(this);
+            var dialog = new instance.web.Dialog(this, {
                 width: 800,
                 buttons : [
                     {text: _t("Cancel"), click: function() { $(this).dialog('destroy'); }},
diff --git a/addons/web_tests/static/src/js/web_tests.js b/addons/web_tests/static/src/js/web_tests.js
index f98dd95f66f..e6e6079ede5 100644
--- a/addons/web_tests/static/src/js/web_tests.js
+++ b/addons/web_tests/static/src/js/web_tests.js
@@ -1,16 +1,16 @@
-openerp.web_tests = function (db) {
-    db.web.client_actions.add(
+openerp.web_tests = function (instance) {
+    instance.web.client_actions.add(
         'buncha-forms', 'instance.web_tests.BunchaForms');
-    db.web_tests = {};
-    db.web_tests.BunchaForms = db.web.OldWidget.extend({
+    instance.web_tests = {};
+    instance.web_tests.BunchaForms = instance.web.OldWidget.extend({
         init: function (parent) {
             this._super(parent);
-            this.dataset = new db.web.DataSetSearch(this, 'test.listview.relations');
-            this.form = new db.web.FormView(this, this.dataset, false, {
+            this.dataset = new instance.web.DataSetSearch(this, 'test.listview.relations');
+            this.form = new instance.web.FormView(this, this.dataset, false, {
                 action_buttons: false,
                 pager: false
             });
-            this.form.registry = db.web.form.readonly;
+            this.form.registry = instance.web.form.readonly;
         },
         render: function () {
             return '<div class="oe-bunchaforms"></div>';

From fe7b7d235d73ac04c7513f921f0e1fd5c9c86042 Mon Sep 17 00:00:00 2001
From: niv-openerp <nicolas.vanhoren@openerp.com>
Date: Tue, 17 Apr 2012 15:33:07 +0200
Subject: [PATCH 135/238] [imp] some improvements in fields to be less
 dependant of the view

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

diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js
index fdff2d95069..1ca04071cac 100644
--- a/addons/web/static/src/js/view_form.js
+++ b/addons/web/static/src/js/view_form.js
@@ -854,6 +854,12 @@ instance.web.FormView = instance.web.View.extend({
     register_field: function(field, name) {
         this.fields[name] = field;
         this.fields_order.push(name);
+        if (this.get_field(name).translate) {
+            translatable_fields.push(field);
+        }
+    },
+    get_field: function(field_name) {
+        return this.fields_view.fields[field_name];
     },
 });
 
@@ -1547,7 +1553,14 @@ instance.web.form.WidgetButton = instance.web.form.Widget.extend({
  *     this event is triggered all fields should reprocess their modifiers.
  */
 instance.web.form.FieldManagerInterface = {
-
+    /**
+     * Must return the asked field as in fields_get.
+     */
+    get_field: function(field_name) {},
+    /**
+     * Called by the field when the translate button is clicked.
+     */
+    open_translate_dialog: function(field) {},
 };
 
 /**
@@ -1628,9 +1641,10 @@ instance.web.form.AbstractField = instance.web.form.Widget.extend(/** @lends ins
      */
     init: function(field_manager, node) {
         this._super(field_manager, node);
+        this.field_manager = field_manager;
         this.name = this.node.attrs.name;
         this.value = false;
-        this.field = this.view.fields_view.fields[this.name] || {};
+        this.field = this.field_manager.get_field(this.name);
         this.set({required: this.modifiers['required'] === true});
         this.invalid = this.dirty = false;
         
@@ -1647,12 +1661,11 @@ instance.web.form.AbstractField = instance.web.form.Widget.extend(/** @lends ins
     start: function() {
         this._super.apply(this, arguments);
         if (this.field.translate) {
-            this.view.translatable_fields.push(this);
             this.$element.addClass('oe_form_field_translatable');
             this.$element.find('.oe_field_translate').click(this.on_translate);
         }
-        if (this.node.attrs.nolabel && instance.connection.debug) {
-            this.do_attach_tooltip(this, this.$label || this.$element);
+        if (instance.connection.debug) {
+            this.do_attach_tooltip(this, this.$element);
         }
         if (!this.disable_utility_classes) {
             var set_required = function() {
@@ -1674,7 +1687,7 @@ instance.web.form.AbstractField = instance.web.form.Widget.extend(/** @lends ins
     on_value_changed: function() {
     },
     on_translate: function() {
-        this.view.open_translate_dialog(this);
+        this.field_manager.open_translate_dialog(this);
     },
     get_value: function() {
         return this.value;

From f80c7eee961ace09a10673f39a25c78a917b9c3c Mon Sep 17 00:00:00 2001
From: Antony Lesuisse <al@openerp.com>
Date: Tue, 17 Apr 2012 15:32:42 +0200
Subject: [PATCH 136/238] [FIX] toolbar is optional

bzr revid: al@openerp.com-20120417133242-x76s3qfn28l40yzb
---
 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 1ca04071cac..0cde20535ad 100644
--- a/addons/web/static/src/js/view_form.js
+++ b/addons/web/static/src/js/view_form.js
@@ -112,7 +112,9 @@ instance.web.FormView = instance.web.View.extend({
         if (!this.sidebar && this.options.sidebar) {
             this.sidebar = new instance.web.Sidebar(this);
             this.sidebar.appendTo(this.$sidebar);
-            this.sidebar.add_toolbar(this.fields_view.toolbar);
+            if(this.fields_view.toolbar) {
+                this.sidebar.add_toolbar(this.fields_view.toolbar);
+            }
             this.sidebar.add_items('other', [{
                 label: _t('Set Default'),
                 form: this,

From 5584a2e6d68965fa5b03905366a9e7bb09dcc611 Mon Sep 17 00:00:00 2001
From: niv-openerp <nicolas.vanhoren@openerp.com>
Date: Tue, 17 Apr 2012 16:32:27 +0200
Subject: [PATCH 137/238] [imp] big refactoring of 'value' in form view

bzr revid: nicolas.vanhoren@openerp.com-20120417143227-qzez1yxysqnw0sbv
---
 addons/web/static/src/js/view_form.js | 279 +++++++++++++-------------
 1 file changed, 141 insertions(+), 138 deletions(-)

diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js
index 0cde20535ad..e79276458b3 100644
--- a/addons/web/static/src/js/view_form.js
+++ b/addons/web/static/src/js/view_form.js
@@ -152,14 +152,14 @@ instance.web.FormView = instance.web.View.extend({
     get_qweb_context: function(record) {
         var self = this,
             new_record = {};
-        _.each(record, function(value, name) {
+        _.each(record, function(value_, name) {
             var r = _.clone(self.fields_view.fields[name] || {});
-            if ((r.type === 'date' || r.type === 'datetime') && value) {
-                r.raw_value = instance.web.auto_str_to_date(value);
+            if ((r.type === 'date' || r.type === 'datetime') && value_) {
+                r.raw_value = instance.web.auto_str_to_date(value_);
             } else {
-                r.raw_value = value;
+                r.raw_value = value_;
             }
-            r.value = instance.web.format_value(value, r);
+            r.value = instance.web.format_value(value_, r);
             new_record[name] = r;
         });
         return {
@@ -357,8 +357,8 @@ instance.web.FormView = instance.web.View.extend({
             }
             // form field
             if (self.fields[field]) {
-                var value = self.fields[field].get_value();
-                return value == null ? false : value;
+                var value_ = self.fields[field].get_value();
+                return value_ == null ? false : value_;
             }
             // parent field
             var splitted = field.split('.');
@@ -421,17 +421,17 @@ instance.web.FormView = instance.web.View.extend({
                 }
 
                 if (widget.field['change_default']) {
-                    var fieldname = widget.name, value;
+                    var fieldname = widget.name, value_;
                     if (response.value && (fieldname in response.value)) {
                         // Use value from onchange if onchange executed
-                        value = response.value[fieldname];
+                        value_ = response.value[fieldname];
                     } else {
                         // otherwise get form value for field
-                        value = self.fields[fieldname].get_value();
+                        value_ = self.fields[fieldname].get_value();
                     }
-                    var condition = fieldname + '=' + value;
+                    var condition = fieldname + '=' + value_;
 
-                    if (value) {
+                    if (value_) {
                         can_process_onchange = self.rpc({
                             url: '/web/dataset/call',
                             async: false
@@ -472,9 +472,9 @@ instance.web.FormView = instance.web.View.extend({
                 var field = this.fields[f];
                 // If field is not defined in the view, just ignore it
                 if (field) {
-                    var value = result.value[f];
-                    if (field.get_value() != value) {
-                        field.set_value(value);
+                    var value_ = result.value[f];
+                    if (field.get_value() != value_) {
+                        field.set_value(value_);
                         field.dirty = true;
                         if (!_.contains(processed, field.name)) {
                             this.do_onchange(field, processed);
@@ -739,10 +739,10 @@ instance.web.FormView = instance.web.View.extend({
         var values = {};
         var ids = this.get_selected_ids();
         values["id"] = ids.length > 0 ? ids[0] : false;
-        _.each(this.fields, function(value, key) {
+        _.each(this.fields, function(value_, key) {
         	if (_.include(blacklist, key))
         		return;
-            var val = value.get_value();
+            var val = value_.get_value();
             values[key] = val;
         });
         return values;
@@ -759,8 +759,8 @@ instance.web.FormView = instance.web.View.extend({
         });
     },
     is_dirty: function() {
-        return _.any(this.fields, function (value) {
-            return value.is_dirty();
+        return _.any(this.fields, function (value_) {
+            return value_.is_dirty();
         });
     },
     is_interactible_record: function() {
@@ -781,10 +781,10 @@ instance.web.FormView = instance.web.View.extend({
         var self = this;
         var fields = _.chain(this.fields)
             .map(function (field, name) {
-                var value = field.get_value();
+                var value_ = field.get_value();
                 // ignore fields which are empty, invisible, readonly, o2m
                 // or m2m
-                if (!value
+                if (!value_
                         || field.get('invisible')
                         || field.get("readonly")
                         || field.field.type === 'one2many'
@@ -795,20 +795,20 @@ instance.web.FormView = instance.web.View.extend({
                 switch(field.field.type) {
                 case 'selection':
                     displayed = _(field.values).find(function (option) {
-                            return option[0] === value;
+                            return option[0] === value_;
                         })[1];
                     break;
                 case 'many2one':
-                    displayed = field.value[1] || value;
+                    displayed = value_;
                     break;
                 default:
-                    displayed = value;
+                    displayed = value_;
                 }
 
                 return {
                     name: name,
                     string: field.node_atts.string,
-                    value: value,
+                    value: value_,
                     displayed: displayed,
                     // convert undefined to false
                     change_default: !!field.field.change_default
@@ -857,12 +857,15 @@ instance.web.FormView = instance.web.View.extend({
         this.fields[name] = field;
         this.fields_order.push(name);
         if (this.get_field(name).translate) {
-            translatable_fields.push(field);
+            this.translatable_fields.push(field);
         }
     },
     get_field: function(field_name) {
         return this.fields_view.fields[field_name];
     },
+    is_create_mode: function() {
+        return !this.datarecord.id;
+    },
 });
 
 /**
@@ -1262,7 +1265,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 ? fields[ex[0]].get_value() : fields[ex[0]].value;
+        var field_value = field.get_value();
         var op = ex[1];
         var val = ex[2];
 
@@ -1563,6 +1566,10 @@ instance.web.form.FieldManagerInterface = {
      * Called by the field when the translate button is clicked.
      */
     open_translate_dialog: function(field) {},
+    /**
+     * Returns true when the view is in create mode.
+     */
+    is_create_mode: function() {},
 };
 
 /**
@@ -1599,7 +1606,7 @@ instance.web.form.FieldInterface = {
      * as well as any format commonly returned in a on_change. It must be able to autodetect those formats as
      * no information is ever given to know which format is used.
      */
-    set_value: function(value) {},
+    set_value: function(value_) {},
     /**
      * Get the current value of the widget.
      * 
@@ -1645,7 +1652,7 @@ instance.web.form.AbstractField = instance.web.form.Widget.extend(/** @lends ins
         this._super(field_manager, node);
         this.field_manager = field_manager;
         this.name = this.node.attrs.name;
-        this.value = false;
+        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;
@@ -1677,8 +1684,8 @@ instance.web.form.AbstractField = instance.web.form.Widget.extend(/** @lends ins
             _.bind(set_required, this)();
         }
     },
-    set_value: function(value) {
-        this.value = value;
+    set_value: function(value_) {
+        this.set({'value': value_});
         this.invalid = false;
         this.update_dom();
         this.on_value_changed();
@@ -1692,7 +1699,7 @@ instance.web.form.AbstractField = instance.web.form.Widget.extend(/** @lends ins
         this.field_manager.open_translate_dialog(this);
     },
     get_value: function() {
-        return this.value;
+        return this.get('value');
     },
     is_valid: function() {
         return !this.invalid;
@@ -1703,7 +1710,7 @@ instance.web.form.AbstractField = instance.web.form.Widget.extend(/** @lends ins
     update_dom: function(show_invalid) {
         this._super.apply(this, arguments);
         if (this.field.translate) {
-            this.$element.find('.oe_field_translate').toggle(!!this.view.datarecord.id);
+            this.$element.find('.oe_field_translate').toggle(!this.field_manager.is_create_mode());
         }
         if (!this.disable_utility_classes) {
             if (show_invalid) {
@@ -1794,12 +1801,12 @@ instance.web.form.FieldChar = instance.web.form.AbstractField.extend(_.extend({}
     initialize_content: function() {
         this.$element.find('input').change(this.on_ui_change);
     },
-    set_value: function(value) {
+    set_value: function(value_) {
         this._super.apply(this, arguments);
         this.render_value();
     },
     render_value: function() {
-        var show_value = instance.web.format_value(this.value, this, '');
+        var show_value = instance.web.format_value(this.get('value'), this, '');
         if (!this.get("effective_readonly")) {
             this.$element.find('input').val(show_value);
         } else {
@@ -1810,15 +1817,15 @@ instance.web.form.FieldChar = instance.web.form.AbstractField.extend(_.extend({}
         }
     },
     set_value_from_ui: function() {
-        this.value = instance.web.parse_value(this.$element.find('input').val(), this);
+        this.set('value', instance.web.parse_value(this.$element.find('input').val(), this));
         this._super();
     },
     validate: function() {
         this.invalid = false;
         if (!this.get("effective_readonly")) {
             try {
-                var value = instance.web.parse_value(this.$element.find('input').val(), this, '');
-                this.invalid = this.get("required") && value === '';
+                var value_ = instance.web.parse_value(this.$element.find('input').val(), this, '');
+                this.invalid = this.get("required") && value_ === '';
             } catch(e) {
                 this.invalid = true;
             }
@@ -1844,15 +1851,15 @@ instance.web.form.FieldEmail = instance.web.form.FieldChar.extend({
             this._super();
         } else {
             this.$element.find('a')
-                    .attr('href', 'mailto:' + this.value)
-                    .text(this.value);
+                    .attr('href', 'mailto:' + this.get('value'))
+                    .text(this.get('value'));
         }
     },
     on_button_clicked: function() {
-        if (!this.value || !this.is_valid()) {
+        if (!this.get('value') || !this.is_valid()) {
             this.do_warn("E-mail error", "Can't send email to invalid e-mail address");
         } else {
-            location.href = 'mailto:' + this.value;
+            location.href = 'mailto:' + this.get('value');
         }
     }
 });
@@ -1867,19 +1874,19 @@ instance.web.form.FieldUrl = instance.web.form.FieldChar.extend({
         if (!this.get("effective_readonly")) {
             this._super();
         } else {
-            var tmp = this.value;
+            var tmp = this.get('value');
             var s = /(\w+):(.+)/.exec(tmp);
             if (!s) {
-                tmp = "http://" + this.value;
+                tmp = "http://" + this.get('value');
             }
             this.$element.find('a').attr('href', tmp).text(tmp);
         }
     },
     on_button_clicked: function() {
-        if (!this.value) {
+        if (!this.get('value')) {
             this.do_warn("Resource error", "This resource is empty");
         } else {
-            var url = $.trim(this.value);
+            var url = $.trim(this.get('value'));
             if(/^www\./i.test(url))
                 url = 'http://'+url;
             window.open(url);
@@ -1891,19 +1898,19 @@ instance.web.form.FieldFloat = instance.web.form.FieldChar.extend({
     is_field_number: true,
     init: function (view, node) {
         this._super(view, node);
-        this.value = 0;
+        this.set({'value': 0});
         if (this.node.attrs.digits) {
             this.digits = py.eval(node.attrs.digits);
         } else {
             this.digits = this.field.digits;
         }
     },
-    set_value: function(value) {
-        if (value === false || value === undefined) {
+    set_value: function(value_) {
+        if (value_ === false || value_ === undefined) {
             // As in GTK client, floats default to 0
-            value = 0;
+            value_ = 0;
         }
-        this._super.apply(this, [value]);
+        this._super.apply(this, [value_]);
     }
 });
 
@@ -1929,14 +1936,14 @@ instance.web.DateTimeWidget = instance.web.OldWidget.extend({
         });
         this.$element.find('img.oe_datepicker_trigger').click(function() {
             if (!self.get("effective_readonly") && !self.picker('widget').is(':visible')) {
-                self.picker('setDate', self.value ? instance.web.auto_str_to_date(self.value) : new Date());
+                self.picker('setDate', self.get('value') ? instance.web.auto_str_to_date(self.get('value')) : new Date());
                 self.$input_picker.show();
                 self.picker('show');
                 self.$input_picker.hide();
             }
         });
         this.set_readonly(false);
-        this.value = false;
+        this.set({'value': false});
     },
     picker: function() {
         return $.fn[this.jqueryui_object].apply(this.$input_picker, arguments);
@@ -1945,16 +1952,16 @@ instance.web.DateTimeWidget = instance.web.OldWidget.extend({
         var date = this.picker('getDate');
         this.$input.val(date ? this.format_client(date) : '').change();
     },
-    set_value: function(value) {
-        this.value = value;
-        this.$input.val(value ? this.format_client(value) : '');
+    set_value: function(value_) {
+        this.set({'value': value_});
+        this.$input.val(value_ ? this.format_client(value_) : '');
     },
     get_value: function() {
-        return this.value;
+        return this.get('value');
     },
     set_value_from_ui: function() {
-        var value = this.$input.val() || false;
-        this.value = this.parse_client(value);
+        var value_ = this.$input.val() || false;
+        this.set({'value': this.parse_client(value_)});
     },
     set_readonly: function(readonly) {
         this.readonly = readonly;
@@ -1962,12 +1969,12 @@ instance.web.DateTimeWidget = instance.web.OldWidget.extend({
         this.$element.find('img.oe_datepicker_trigger').toggleClass('oe_input_icon_disabled', readonly);
     },
     is_valid: function() {
-        var value = this.$input.val();
-        if (value === "") {
+        var value_ = this.$input.val();
+        if (value_ === "") {
             return true;
         } else {
             try {
-                this.parse_client(value);
+                this.parse_client(value_);
                 return true;
             } catch(e) {
                 return false;
@@ -2010,22 +2017,22 @@ instance.web.form.FieldDatetime = instance.web.form.AbstractField.extend(_.exten
             this.datewidget.appendTo(this.$element);
         }
     },
-    set_value: function(value) {
-        this._super(value);
+    set_value: function(value_) {
+        this._super(value_);
         this.render_value();
     },
     render_value: function() {
         if (!this.get("effective_readonly")) {
-            this.datewidget.set_value(this.value);
+            this.datewidget.set_value(this.get('value'));
         } else {
-            this.$element.text(instance.web.format_value(this.value, this, ''));
+            this.$element.text(instance.web.format_value(this.get('value'), this, ''));
         }
     },
     get_value: function() {
         if (!this.get("effective_readonly")) {
             return this.datewidget.get_value();
         } else {
-            return this.value;
+            return this.get('value');
         }
     },
     validate: function() {
@@ -2054,12 +2061,12 @@ instance.web.form.FieldText = instance.web.form.AbstractField.extend(_.extend({}
             this.resized = false;
         }
     },
-    set_value: function(value) {
+    set_value: function(value_) {
         this._super.apply(this, arguments);
         this.render_value();
     },
     render_value: function() {
-        var show_value = instance.web.format_value(this.value, this, '');
+        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) {
@@ -2071,15 +2078,15 @@ instance.web.form.FieldText = instance.web.form.AbstractField.extend(_.extend({}
         }
     },
     set_value_from_ui: function() {
-        this.value = instance.web.parse_value(this.$textarea.val(), this);
+        this.set({'value': instance.web.parse_value(this.$textarea.val(), this)});
         this._super();
     },
     validate: function() {
         this.invalid = false;
         if (!this.get("effective_readonly")) {
             try {
-                var value = instance.web.parse_value(this.$textarea.val(), this, '');
-                this.invalid = this.get("required") && value === '';
+                var value_ = instance.web.parse_value(this.$textarea.val(), this, '');
+                this.invalid = this.get("required") && value_ === '';
             } catch(e) {
                 this.invalid = true;
             }
@@ -2125,12 +2132,12 @@ instance.web.form.FieldBoolean = instance.web.form.AbstractField.extend({
         this.on("change:effective_readonly", this, check_readonly);
         _.bind(check_readonly, this)();
     },
-    set_value: function(value) {
+    set_value: function(value_) {
         this._super.apply(this, arguments);
-        this.$checkbox[0].checked = value;
+        this.$checkbox[0].checked = value_;
     },
     set_value_from_ui: function() {
-        this.value = this.$checkbox.is(':checked');
+        this.set({value: this.$checkbox.is(':checked')});
         this._super.apply(this, arguments);
     },
     focus: function($element) {
@@ -2143,13 +2150,13 @@ instance.web.form.FieldProgressBar = instance.web.form.AbstractField.extend({
     start: function() {
         this._super.apply(this, arguments);
         this.$element.progressbar({
-            value: this.value,
+            value: this.get('value'),
             disabled: this.get("effective_readonly")
         });
     },
-    set_value: function(value) {
+    set_value: function(value_) {
         this._super.apply(this, arguments);
-        var show_value = Number(value);
+        var show_value = Number(value_);
         if (isNaN(show_value)) {
             show_value = 0;
         }
@@ -2198,28 +2205,28 @@ instance.web.form.FieldSelection = instance.web.form.AbstractField.extend(_.exte
                 ischanging = false;
             });
     },
-    set_value: function(value) {
-        value = value === null ? false : value;
-        value = value instanceof Array ? value[0] : value;
-        this._super(value);
+    set_value: function(value_) {
+        value_ = value_ === null ? false : value_;
+        value_ = value_ instanceof Array ? value_[0] : value_;
+        this._super(value_);
         this.render_value();
     },
     render_value: function() {
         if (!this.get("effective_readonly")) {
             var index = 0;
             for (var i = 0, ii = this.values.length; i < ii; i++) {
-                if (this.values[i][0] === this.value) index = i;
+                if (this.values[i][0] === this.get('value')) index = i;
             }
             this.$element.find('select')[0].selectedIndex = index;
         } else {
             var self = this;
             var option = _(this.values)
-                .detect(function (record) { return record[0] === self.value; }); 
+                .detect(function (record) { return record[0] === self.get('value'); }); 
             this.$element.text(option ? option[1] : this.values[0][1]);
         }
     },
     set_value_from_ui: function() {
-        this.value = this.values[this.$element.find('select')[0].selectedIndex][0];
+        this.set({'value': this.values[this.$element.find('select')[0].selectedIndex][0]});
         this._super();
     },
     validate: function() {
@@ -2227,8 +2234,8 @@ instance.web.form.FieldSelection = instance.web.form.AbstractField.extend(_.exte
             this.invalid = false;
             return;
         }
-        var value = this.values[this.$element.find('select')[0].selectedIndex];
-        this.invalid = !(value && !(this.get("required") && value[0] === false));
+        var value_ = this.values[this.$element.find('select')[0].selectedIndex];
+        this.invalid = !(value_ && !(this.get("required") && value_[0] === false));
     },
     focus: function($element) {
         this._super($element || this.$element.find('select:first'));
@@ -2242,8 +2249,8 @@ instance.web.form.FieldSelection = instance.web.form.AbstractField.extend(_.exte
 
     function filter( array, term ) {
         var matcher = new RegExp( $.ui.autocomplete.escapeRegex(term), "i" );
-        return $.grep( array, function(value) {
-            return matcher.test( $( "<div>" ).html( value.label || value.value || value ).text() );
+        return $.grep( array, function(value_) {
+            return matcher.test( $( "<div>" ).html( value_.label || value_.value || value_ ).text() );
         });
     }
 
@@ -2282,7 +2289,7 @@ instance.web.form.FieldMany2One = instance.web.form.AbstractField.extend(_.exten
     init: function(view, node) {
         this._super(view, node);
         this.limit = 7;
-        this.set({value: false});
+        this.set({'value': false});
         this.display_value = {};
         this.last_search = [];
         this.floating = false;
@@ -2563,21 +2570,17 @@ instance.web.form.FieldMany2One = instance.web.form.AbstractField.extend(_.exten
                  });
         }
     },
-    set_value: function(value) {
+    set_value: function(value_) {
         var self = this;
-        if (value instanceof Array) {
+        if (value_ instanceof Array) {
             this.display_value = {};
-            this.display_value["" + value[0]] = value[1];
-            value = value[0];
+            this.display_value["" + value_[0]] = value_[1];
+            value_ = value_[0];
         }
-        value = value || false;
+        value_ = value_ || false;
         this.inhibit_on_change = true;
-        this.set({value: value});
+        this._super(value_);
         this.inhibit_on_change = false;
-        this._super(value);
-    },
-    get_value: function() {
-        return this.get("value");
     },
     validate: function() {
         this.invalid = this.get("required") && ! this.get("value");
@@ -2777,13 +2780,13 @@ instance.web.form.FieldOne2Many = instance.web.form.AbstractField.extend({
             }
         }, undefined);
     },
-    set_value: function(value) {
-        value = value || [];
+    set_value: function(value_) {
+        value_ = value_ || [];
         var self = this;
         this.dataset.reset_ids([]);
-        if(value.length >= 1 && value[0] instanceof Array) {
+        if(value_.length >= 1 && value_[0] instanceof Array) {
             var ids = [];
-            _.each(value, function(command) {
+            _.each(value_, function(command) {
                 var obj = {values: command[2]};
                 switch (command[0]) {
                     case commands.CREATE:
@@ -2812,10 +2815,10 @@ instance.web.form.FieldOne2Many = instance.web.form.AbstractField.extend({
             });
             this._super(ids);
             this.dataset.set_ids(ids);
-        } else if (value.length >= 1 && typeof(value[0]) === "object") {
+        } else if (value_.length >= 1 && typeof(value_[0]) === "object") {
             var ids = [];
             this.dataset.delete_all = true;
-            _.each(value, function(command) {
+            _.each(value_, function(command) {
                 var obj = {values: command};
                 obj['id'] = _.uniqueId(self.dataset.virtual_id_prefix);
                 obj.defaults = {};
@@ -2826,8 +2829,8 @@ instance.web.form.FieldOne2Many = instance.web.form.AbstractField.extend({
             this._super(ids);
             this.dataset.set_ids(ids);
         } else {
-            this._super(value);
-            this.dataset.reset_ids(value);
+            this._super(value_);
+            this.dataset.reset_ids(value_);
         }
         if (this.dataset.index === null && this.dataset.ids.length > 0) {
             this.dataset.index = 0;
@@ -3064,13 +3067,13 @@ instance.web.form.FieldMany2Many = instance.web.form.AbstractField.extend({
             });
         })
     },
-    set_value: function(value) {
-        value = value || [];
-        if (value.length >= 1 && value[0] instanceof Array) {
-            value = value[0][2];
+    set_value: function(value_) {
+        value_ = value_ || [];
+        if (value_.length >= 1 && value_[0] instanceof Array) {
+            value_ = value_[0][2];
         }
-        this._super(value);
-        this.dataset.set_ids(value);
+        this._super(value_);
+        this.dataset.set_ids(value_);
         var self = this;
         self.reload_content();
         this.is_setted.resolve();
@@ -3219,10 +3222,10 @@ instance.web.form.SelectCreatePopup = instance.web.OldWidget.extend(/** @lends i
                 contexts: [this.context]
             }, function (results) {
                 var search_defaults = {};
-                _.each(results.context, function (value, key) {
+                _.each(results.context, function (value_, key) {
                     var match = /^search_default_(.*)$/.exec(key);
                     if (match) {
-                        search_defaults[match[1]] = value;
+                        search_defaults[match[1]] = value_;
                     }
                 });
                 self.setup_search_view(search_defaults);
@@ -3544,15 +3547,15 @@ instance.web.form.FieldReference = instance.web.form.AbstractField.extend(_.exte
     is_dirty: function() {
         return this.selection.is_dirty() || this.m2o.is_dirty();
     },
-    set_value: function(value) {
-        this._super(value);
+    set_value: function(value_) {
+        this._super(value_);
         this.render_value();
     },
     render_value: function() {
         this.reference_ready = false;
         var vals = [], sel_val, m2o_val;
-        if (typeof(this.value) === 'string') {
-            vals = this.value.split(',');
+        if (typeof(this.get('value')) === 'string') {
+            vals = this.get('value').split(',');
         }
         sel_val = vals[0] || false;
         m2o_val = vals[1] ? parseInt(vals[1], 10) : false;
@@ -3638,8 +3641,8 @@ instance.web.form.FieldBinary = instance.web.form.AbstractField.extend(_.extend(
         });
     },
     on_clear: function() {
-        if (this.value !== false) {
-            this.value = false;
+        if (this.get('value') !== false) {
+            this.set({'value': false});
             this.binary_value = false;
             this.on_ui_change();
         }
@@ -3654,14 +3657,14 @@ instance.web.form.FieldBinaryFile = instance.web.form.FieldBinary.extend({
         if (this.get("effective_readonly")) {
             var self = this;
             this.$element.find('a').click(function() {
-                if (self.value) {
+                if (self.get('value')) {
                     self.on_save_as();
                 }
                 return false;
             });
         }
     },
-    set_value: function(value) {
+    set_value: function(value_) {
         this._super.apply(this, arguments);
         this.render_value();
     },
@@ -3671,28 +3674,28 @@ instance.web.form.FieldBinaryFile = instance.web.form.FieldBinary.extend({
             if (this.node.attrs.filename) {
                 show_value = this.view.datarecord[this.node.attrs.filename] || '';
             } else {
-                show_value = (this.value != null && this.value !== false) ? this.value : '';
+                show_value = (this.get('value') != null && this.get('value') !== false) ? this.get('value') : '';
             }
             this.$element.find('input').eq(0).val(show_value);
         } else {
-            this.$element.find('a').show(!!this.value);
-            if (this.value) {
+            this.$element.find('a').show(!!this.get('value'));
+            if (this.get('value')) {
                 var show_value = _t("Download") + " " + (this.view.datarecord[this.node.attrs.filename] || '');
                 this.$element.find('a').text(show_value);
             }
         }
     },
     on_file_uploaded_and_valid: function(size, name, content_type, file_base64) {
-        this.value = file_base64;
+        this.set({'value': file_base64});
         this.binary_value = true;
         var show_value = name + " (" + this.human_filesize(size) + ")";
         this.$element.find('input').eq(0).val(show_value);
         this.set_filename(name);
     },
-    set_filename: function(value) {
+    set_filename: function(value_) {
         var filename = this.node.attrs.filename;
         if (this.view.fields[filename]) {
-            this.view.fields[filename].set_value(value);
+            this.view.fields[filename].set_value(value_);
             this.view.fields[filename].on_ui_change();
         }
     },
@@ -3713,15 +3716,15 @@ instance.web.form.FieldBinaryImage = instance.web.form.FieldBinary.extend({
         else
             this.$element.find('.oe-binary').hide();
     },
-    set_value: function(value) {
+    set_value: function(value_) {
         this._super.apply(this, arguments);
         this.render_value();
     },
     render_value: function() {
         var url;
-        if (this.value && this.value.substr(0, 10).indexOf(' ') == -1) {
-            url = 'data:image/png;base64,' + this.value;
-        } else if (this.value) {
+        if (this.get('value') && this.get('value').substr(0, 10).indexOf(' ') == -1) {
+            url = 'data:image/png;base64,' + this.get('value');
+        } else if (this.get('value')) {
             url = '/web/binary/image?session_id=' + this.session.session_id + '&model=' +
                 this.view.dataset.model +'&id=' + (this.view.datarecord.id || '') + '&field=' + this.name + '&t=' + (new Date().getTime());
         } else {
@@ -3735,7 +3738,7 @@ instance.web.form.FieldBinaryImage = instance.web.form.FieldBinary.extend({
         this._super.apply(this, arguments);
     },
     on_file_uploaded_and_valid: function(size, name, content_type, file_base64) {
-        this.value = file_base64;
+        this.set({'value': file_base64});
         this.binary_value = true;
         this.render_value();
     },
@@ -3753,9 +3756,9 @@ instance.web.form.FieldStatus = instance.web.form.AbstractField.extend({
 
         this.render_list();
     },
-    set_value: function(value) {
-        this._super(value);
-        this.selected_value = value;
+    set_value: function(value_) {
+        this._super(value_);
+        this.selected_value = value_;
 
         this.render_list();
     },

From a8113986cb0f6b33d48a1f2d32c3b03f020adcec Mon Sep 17 00:00:00 2001
From: niv-openerp <nicolas.vanhoren@openerp.com>
Date: Tue, 17 Apr 2012 17:45:05 +0200
Subject: [PATCH 138/238] [imp] refactoring in form view: get rid of
 on_ui_change

bzr revid: nicolas.vanhoren@openerp.com-20120417154505-jhy2xhgx9s6qqd5z
---
 addons/web/static/src/js/view_form.js | 107 +++++++++++---------------
 1 file changed, 46 insertions(+), 61 deletions(-)

diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js
index e79276458b3..3f9ef8301fd 100644
--- a/addons/web/static/src/js/view_form.js
+++ b/addons/web/static/src/js/view_form.js
@@ -1666,9 +1666,16 @@ instance.web.form.AbstractField = instance.web.form.Widget.extend(/** @lends ins
         this.on("change:readonly", this, test_effective_readonly);
         this.on("change:force_readonly", this, test_effective_readonly);
         _.bind(test_effective_readonly, this)();
+        
+        this.on("change:value", this, function() {
+            if (this._field_is_started && ! 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);
@@ -1685,15 +1692,11 @@ instance.web.form.AbstractField = instance.web.form.Widget.extend(/** @lends ins
         }
     },
     set_value: function(value_) {
+        this._inhibit_on_change = true;
         this.set({'value': value_});
+        this._inhibit_on_change = false;
         this.invalid = false;
         this.update_dom();
-        this.on_value_changed();
-    },
-    set_value_from_ui: function() {
-        this.on_value_changed();
-    },
-    on_value_changed: function() {
     },
     on_translate: function() {
         this.field_manager.open_translate_dialog(this);
@@ -1718,11 +1721,10 @@ instance.web.form.AbstractField = instance.web.form.Widget.extend(/** @lends ins
             }
         }
     },
-    on_ui_change: function() {
+    _on_ui_change: function() {
         this.dirty = true;
         this.validate();
         if (this.is_valid()) {
-            this.set_value_from_ui();
             this.view.do_onchange(this);
             this.view.on_form_changed(true);
             this.view.do_notify_change();
@@ -1799,10 +1801,13 @@ instance.web.form.FieldChar = instance.web.form.AbstractField.extend(_.extend({}
         this.password = this.node.attrs.password === 'True' || this.node.attrs.password === '1';
     },
     initialize_content: function() {
-        this.$element.find('input').change(this.on_ui_change);
+        var self = this;
+        this.$element.find('input').change(function() {
+            self.set({'value': instance.web.parse_value(self.$element.find('input').val(), self)});
+        });
     },
     set_value: function(value_) {
-        this._super.apply(this, arguments);
+        this._super(value_);
         this.render_value();
     },
     render_value: function() {
@@ -1816,10 +1821,6 @@ instance.web.form.FieldChar = instance.web.form.AbstractField.extend(_.extend({}
             this.$element.text(show_value);
         }
     },
-    set_value_from_ui: function() {
-        this.set('value', instance.web.parse_value(this.$element.find('input').val(), this));
-        this._super();
-    },
     validate: function() {
         this.invalid = false;
         if (!this.get("effective_readonly")) {
@@ -1959,7 +1960,7 @@ instance.web.DateTimeWidget = instance.web.OldWidget.extend({
     get_value: function() {
         return this.get('value');
     },
-    set_value_from_ui: function() {
+    set_value_from_ui_: function() {
         var value_ = this.$input.val() || false;
         this.set({'value': this.parse_client(value_)});
     },
@@ -1989,7 +1990,7 @@ instance.web.DateTimeWidget = instance.web.OldWidget.extend({
     },
     on_change: function() {
         if (this.is_valid()) {
-            this.set_value_from_ui();
+            this.set_value_from_ui_();
         }
     }
 });
@@ -2013,7 +2014,9 @@ instance.web.form.FieldDatetime = instance.web.form.AbstractField.extend(_.exten
     initialize_content: function() {
         if (!this.get("effective_readonly")) {
             this.datewidget = this.build_widget();
-            this.datewidget.on_change.add_last(this.on_ui_change);
+            this.datewidget.on_change.add_last(_.bind(function() {
+                this.set({'value': this.datewidget.get_value()});
+            }, this));
             this.datewidget.appendTo(this.$element);
         }
     },
@@ -2028,13 +2031,6 @@ instance.web.form.FieldDatetime = instance.web.form.AbstractField.extend(_.exten
             this.$element.text(instance.web.format_value(this.get('value'), this, ''));
         }
     },
-    get_value: function() {
-        if (!this.get("effective_readonly")) {
-            return this.datewidget.get_value();
-        } else {
-            return this.get('value');
-        }
-    },
     validate: function() {
         this.invalid = false;
         if (!this.get("effective_readonly")) {
@@ -2057,7 +2053,10 @@ instance.web.form.FieldText = instance.web.form.AbstractField.extend(_.extend({}
     initialize_content: function() {
         this.$textarea = undefined;
         if (!this.get("effective_readonly")) {
-            this.$textarea = this.$element.find('textarea').change(this.on_ui_change);
+            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;
         }
     },
@@ -2077,10 +2076,6 @@ instance.web.form.FieldText = instance.web.form.AbstractField.extend(_.extend({}
             this.$element.text(show_value);
         }
     },
-    set_value_from_ui: function() {
-        this.set({'value': instance.web.parse_value(this.$textarea.val(), this)});
-        this._super();
-    },
     validate: function() {
         this.invalid = false;
         if (!this.get("effective_readonly")) {
@@ -2125,7 +2120,9 @@ instance.web.form.FieldBoolean = instance.web.form.AbstractField.extend({
     start: function() {
         this._super.apply(this, arguments);
         this.$checkbox = $("input", this.$element);
-        this.$element.click(this.on_ui_change);
+        this.$element.click(_.bind(function() {
+            this.set({'value': this.$checkbox.is(':checked')});
+        }, this));
         var check_readonly = function() {
             this.$checkbox.prop('disabled', this.get("effective_readonly"));
         };
@@ -2136,10 +2133,6 @@ instance.web.form.FieldBoolean = instance.web.form.AbstractField.extend({
         this._super.apply(this, arguments);
         this.$checkbox[0].checked = value_;
     },
-    set_value_from_ui: function() {
-        this.set({value: this.$checkbox.is(':checked')});
-        this._super.apply(this, arguments);
-    },
     focus: function($element) {
         this._super($element || this.$checkbox);
     }
@@ -2196,7 +2189,9 @@ instance.web.form.FieldSelection = instance.web.form.AbstractField.extend(_.exte
         //   row
         var ischanging = false;
         this.$element.find('select')
-            .change(this.on_ui_change)
+            .change(_.bind(function() {
+                this.set({'value': this.values[this.$element.find('select')[0].selectedIndex][0]});
+            }, this))
             .change(function () { ischanging = true; })
             .click(function () { ischanging = false; })
             .keyup(function (e) {
@@ -2225,10 +2220,6 @@ instance.web.form.FieldSelection = instance.web.form.AbstractField.extend(_.exte
             this.$element.text(option ? option[1] : this.values[0][1]);
         }
     },
-    set_value_from_ui: function() {
-        this.set({'value': this.values[this.$element.find('select')[0].selectedIndex][0]});
-        this._super();
-    },
     validate: function() {
         if (this.get("effective_readonly")) {
             this.invalid = false;
@@ -2301,9 +2292,6 @@ instance.web.form.FieldMany2One = instance.web.form.AbstractField.extend(_.exten
         this.on("change:value", this, function() {
             this.floating = false;
             this.render_value();
-            if (! this.inhibit_on_change) {
-                this.on_ui_change();
-            }
         });
     },
     initialize_content: function() {
@@ -2678,7 +2666,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._on_ui_change();
         this.doing_on_change = tmp;
     },
     load_views: function() {
@@ -3050,7 +3038,7 @@ instance.web.form.FieldMany2Many = instance.web.form.AbstractField.extend({
         this.dataset = new instance.web.form.Many2ManyDataSet(this, this.field.relation);
         this.dataset.m2m = this;
         this.dataset.on_unlink.add_last(function(ids) {
-            self.on_ui_change();
+            self.dataset_changed();
         });
         
         this.is_setted.then(function() {
@@ -3078,9 +3066,6 @@ instance.web.form.FieldMany2Many = instance.web.form.AbstractField.extend({
         self.reload_content();
         this.is_setted.resolve();
     },
-    get_value: function() {
-        return [commands.replace_with(this.dataset.ids)];
-    },
     validate: function() {
         this.invalid = false;
     },
@@ -3113,6 +3098,9 @@ instance.web.form.FieldMany2Many = instance.web.form.AbstractField.extend({
             return self.list_view.reload_content();
         });
     },
+    dataset_changed: function() {
+        this.set({'value': [commands.replace_with(this.dataset.ids)]});
+    },
 });
 
 instance.web.form.Many2ManyDataSet = instance.web.DataSetStatic.extend({
@@ -3142,7 +3130,7 @@ instance.web.form.Many2ManyListView = instance.web.ListView.extend(/** @lends in
             _.each(element_ids, function(one_id) {
                 if(! _.detect(self.dataset.ids, function(x) {return x == one_id;})) {
                     self.dataset.set_ids([].concat(self.dataset.ids, [one_id]));
-                    self.m2m_field.on_ui_change();
+                    self.m2m_field.dataset_changed();
                     self.reload_content();
                 }
             });
@@ -3506,7 +3494,7 @@ instance.web.form.FieldReference = instance.web.form.AbstractField.extend(_.exte
         if (this.reference_ready) {
             var sel = this.selection.get_value();
             this.m2o.field.relation = sel;
-            this.m2o.set_value(null);
+            this.m2o.set_value(false);
             this.m2o.$element.toggle(sel !== false);
         }
     },
@@ -3526,7 +3514,7 @@ instance.web.form.FieldReference = instance.web.form.AbstractField.extend(_.exte
             widget: 'selection'
         }});
         this.selection.set({readonly: this.get('effective_readonly')});
-        this.selection.on_value_changed.add_last(this.on_selection_changed);
+        this.selection.on("change:value", this, this.on_selection_changed);
         this.selection.$element = $(".oe_form_view_reference_selection", this.$element);
         this.selection.renderElement();
         this.selection.start();
@@ -3536,7 +3524,7 @@ instance.web.form.FieldReference = instance.web.form.AbstractField.extend(_.exte
             widget: 'many2one'
         }});
         this.m2o.set({"readonly": this.get("effective_readonly")});
-        this.m2o.on_ui_change.add_last(this.on_ui_change);
+        this.m2o.on("change:value", this, this.data_changed);
         this.m2o.$element = $(".oe_form_view_reference_m2o", this.$element);
         this.m2o.renderElement();
         this.m2o.start();
@@ -3567,15 +3555,15 @@ instance.web.form.FieldReference = instance.web.form.AbstractField.extend(_.exte
         this.m2o.$element.toggle(sel_val !== false);
         this.reference_ready = true;
     },
-    get_value: function() {
+    data_changed: function() {
         var model = this.selection.get_value(),
             id = this.m2o.get_value();
         if (typeof(model) === 'string' && typeof(id) === 'number') {
-            return model + ',' + id;
+            this.set({'value': model + ',' + id});
         } else {
-            return false;
+            this.set({'value': false});
         }
-    }
+    },
 }));
 
 instance.web.form.FieldBinary = instance.web.form.AbstractField.extend(_.extend({}, instance.web.form.ReinitializeFieldMixin, {
@@ -3618,7 +3606,6 @@ instance.web.form.FieldBinary = instance.web.form.AbstractField.extend(_.extend(
             console.warn("Error while uploading file : ", name);
         } else {
             this.on_file_uploaded_and_valid.apply(this, arguments);
-            this.on_ui_change();
         }
         this.$element.find('.oe-binary-progress').hide();
         this.$element.find('.oe-binary').show();
@@ -3642,9 +3629,8 @@ instance.web.form.FieldBinary = instance.web.form.AbstractField.extend(_.extend(
     },
     on_clear: function() {
         if (this.get('value') !== false) {
-            this.set({'value': false});
             this.binary_value = false;
-            this.on_ui_change();
+            this.set({'value': false});
         }
         return false;
     }
@@ -3686,8 +3672,8 @@ instance.web.form.FieldBinaryFile = instance.web.form.FieldBinary.extend({
         }
     },
     on_file_uploaded_and_valid: function(size, name, content_type, file_base64) {
-        this.set({'value': file_base64});
         this.binary_value = true;
+        this.set({'value': file_base64});
         var show_value = name + " (" + this.human_filesize(size) + ")";
         this.$element.find('input').eq(0).val(show_value);
         this.set_filename(name);
@@ -3695,8 +3681,7 @@ instance.web.form.FieldBinaryFile = instance.web.form.FieldBinary.extend({
     set_filename: function(value_) {
         var filename = this.node.attrs.filename;
         if (this.view.fields[filename]) {
-            this.view.fields[filename].set_value(value_);
-            this.view.fields[filename].on_ui_change();
+            this.view.fields[filename].set({value: value_});
         }
     },
     on_clear: function() {

From 8b531f7d178763fb90424a7fffa905319e76d4f2 Mon Sep 17 00:00:00 2001
From: Antony Lesuisse <al@openerp.com>
Date: Tue, 17 Apr 2012 19:11:36 +0200
Subject: [PATCH 139/238] [FIX] inherited views

bzr revid: al@openerp.com-20120417171136-qm2t8tpr3pqe7g3a
---
 .../project_mailgate_view.xml                 | 42 +++++++++----------
 addons/project_mrp/project_mrp_view.xml       | 14 +++----
 2 files changed, 27 insertions(+), 29 deletions(-)

diff --git a/addons/project_mailgate/project_mailgate_view.xml b/addons/project_mailgate/project_mailgate_view.xml
index 6bf9855f98a..ea9855e9ec1 100644
--- a/addons/project_mailgate/project_mailgate_view.xml
+++ b/addons/project_mailgate/project_mailgate_view.xml
@@ -1,22 +1,22 @@
 <?xml version="1.0" encoding="utf-8"?>
-	<openerp>
-		<data>
-			<record id="view_task_mailgate_form" model="ir.ui.view">
-		            <field name="name">task.mailgate.form</field>
-		            <field name="model">project.task</field>
-		            <field name="type">form</field>
-		            <field name="inherit_id" ref="project.view_task_form2"/>
-		            <field name="arch" type="xml">
-		                <xpath expr="/form/notebook/page[@string='Extra Info']" position="before">
-		                    <page string="History">
-	                        	<field name="message_ids" colspan="4" nolabel="1" mode="tree" readonly="1">
-			                        <tree string="History">
-			                            <field name="display_text" string="History Information"/>
-			                        </tree>
-	                    		</field>
-	                        </page>
-		                </xpath>
-		            </field>
-		       </record>
-	 	</data>
-</openerp> 
\ No newline at end of file
+<openerp>
+    <data>
+        <record id="view_task_mailgate_form" model="ir.ui.view">
+            <field name="name">task.mailgate.form</field>
+            <field name="model">project.task</field>
+            <field name="type">form</field>
+            <field name="inherit_id" ref="project.view_task_form2"/>
+            <field name="arch" type="xml">
+                <xpath expr="//notebook/page[@string='Extra Info']" position="before">
+                    <page string="History">
+                        <field name="message_ids" colspan="4" nolabel="1" mode="tree" readonly="1">
+                            <tree string="History">
+                                <field name="display_text" string="History Information"/>
+                            </tree>
+                        </field>
+                    </page>
+                </xpath>
+            </field>
+       </record>
+    </data>
+</openerp>
diff --git a/addons/project_mrp/project_mrp_view.xml b/addons/project_mrp/project_mrp_view.xml
index b5ce4e8190d..32d2113727b 100644
--- a/addons/project_mrp/project_mrp_view.xml
+++ b/addons/project_mrp/project_mrp_view.xml
@@ -12,8 +12,7 @@
                 </field>
             </field>
         </record>
-        
-  	<record id="view_product_task_form" model="ir.ui.view">
+        <record id="view_product_task_form" model="ir.ui.view">
             <field name="name">product.form.view.inherit</field>
             <field name="model">product.product</field>
             <field name="type">form</field>
@@ -24,18 +23,17 @@
                 </field>
             </field>
         </record>
-        
-    <record id="view_project_mrp_inherit_form2" model="ir.ui.view">
+        <record id="view_project_mrp_inherit_form2" model="ir.ui.view">
             <field name="name">project.mrp.form.view.inherit</field>
             <field name="model">project.task</field>
             <field name="type">form</field>
             <field name="inherit_id" ref="project.view_task_form2"/>
             <field name="arch" type="xml">
-            <xpath expr="/form/notebook/page[@string='Extra Info']/separator[@string='Notes']" position="before">
+            <xpath expr="//notebook/page[@string='Extra Info']/separator[@string='Notes']" position="before">
                 <field name="sale_line_id"/>
-            </xpath>    
+            </xpath>
             </field>
-        </record>  
+        </record>
     </data>
 </openerp>
-        
+

From 7617b65d6cbfe8f38b91289875bdb99bb4367131 Mon Sep 17 00:00:00 2001
From: Antony Lesuisse <al@openerp.com>
Date: Tue, 17 Apr 2012 19:35:28 +0200
Subject: [PATCH 140/238] [FIX] inherited views part2

bzr revid: al@openerp.com-20120417173528-s9t4pl0c2z2aqyfy
---
 addons/project_scrum/project_scrum_view.xml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/addons/project_scrum/project_scrum_view.xml b/addons/project_scrum/project_scrum_view.xml
index 7fb84f12213..fe1301eb4c3 100644
--- a/addons/project_scrum/project_scrum_view.xml
+++ b/addons/project_scrum/project_scrum_view.xml
@@ -545,9 +545,9 @@
             <field name="type">form</field>
             <field name="inherit_id" ref="project.view_task_form2"/>
             <field name="arch" type="xml">
-                <xpath expr="/form/group/field[@name='progress']" position="after">
+                <field name="progress" position="after">
                     <field domain="[('project_id','=',project_id),]" name="product_backlog_id" select="1"/>
-                </xpath>
+                </field>
             </field>
         </record>
 
@@ -557,9 +557,9 @@
             <field name="type">form</field>
             <field name="inherit_id" ref="project.view_task_form2"/>
             <field name="arch" type="xml">
-                <xpath expr="/form/notebook/page[@string='Extra Info']/group/field[@name='sequence']" position="after">
+                <field name="sequence" position="after">
                     <field name="sprint_id" domain="[('state', 'in', ['draft', 'open'])]" readonly="1"/>
-                </xpath>
+                </field>
             </field>
         </record>
 

From dbd05896bfab0f773f0a93f3e5da41f7f73bd420 Mon Sep 17 00:00:00 2001
From: Launchpad Translations on behalf of openerp <>
Date: Wed, 18 Apr 2012 04:41:29 +0000
Subject: [PATCH 141/238] Launchpad automatic translations update.

bzr revid: launchpad_translations_on_behalf_of_openerp-20120418044129-45ghxqbko60k5i4q
---
 openerp/addons/base/i18n/ja.po | 126 +++++++++++++++++++++++----------
 1 file changed, 89 insertions(+), 37 deletions(-)

diff --git a/openerp/addons/base/i18n/ja.po b/openerp/addons/base/i18n/ja.po
index 8f6da375214..b2433098807 100644
--- a/openerp/addons/base/i18n/ja.po
+++ b/openerp/addons/base/i18n/ja.po
@@ -8,14 +8,14 @@ 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-16 18:23+0000\n"
+"PO-Revision-Date: 2012-04-18 02:23+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-18 04:41+0000\n"
+"X-Generator: Launchpad (build 15108)\n"
 
 #. module: base
 #: model:res.country,name:base.sh
@@ -193,7 +193,7 @@ msgstr "販売分析の配布"
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_web_process
 msgid "Process"
-msgstr ""
+msgstr "プロセス"
 
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_analytic_journal_billing_rate
@@ -492,7 +492,7 @@ msgstr "PADの仕様"
 msgid ""
 "The user this filter is available to. When left empty the filter is usable "
 "by the system only."
-msgstr ""
+msgstr "このフィルタを使用可能であるユーザ。フィルタを空のままにすると、システムのみが使用します。"
 
 #. module: base
 #: help:res.partner,website:0
@@ -632,6 +632,22 @@ msgid ""
 "    Accounting/Reporting/Generic Reporting/Partners/Follow-ups Sent\n"
 "\n"
 msgstr ""
+"\n"
+"未払いの請求書のために多レベルで思い起こさせるための手紙の自動化モジュールです。\n"
+"==========================================================================\n"
+"\n"
+"メニューから思い出させるための多くのレベルが定義できます：\n"
+"　　会計 / 設定 / その他 / フォローアップ\n"
+"\n"
+"定義を終えたら、メニューから単純にクリックするだけで毎日自動的に印刷ができます：\n"
+"　　会計 / 定期処理 / 請求書 / フォローアップの送信\n"
+"\n"
+"定義された異なったレベルで思い出させる方法に従って全ての手紙をPDFで作成します。\n"
+"異なる会社のために異なるポリシーを定義でき、顧客にメールすることもできます。\n"
+"\n"
+"所定のパートナ / アカウントエントリーのためにフォローアップレベルをチェックしたい場合は、このメニューを使うことができます：\n"
+"　　会計 / レポート / 一般的なレポート / パートナ / フォローアップ送信済み\n"
+"\n"
 
 #. module: base
 #: field:res.country,name:0
@@ -661,7 +677,7 @@ msgstr ""
 #. module: base
 #: model:res.country,name:base.pw
 msgid "Palau"
-msgstr ""
+msgstr "パラオ"
 
 #. module: base
 #: view:res.partner:0
@@ -689,7 +705,7 @@ msgstr "ウィザード"
 #. module: base
 #: model:res.partner.category,name:base.res_partner_category_miscellaneoussuppliers0
 msgid "Miscellaneous Suppliers"
-msgstr ""
+msgstr "その他仕入先"
 
 #. module: base
 #: code:addons/base/ir/ir_model.py:287
@@ -763,7 +779,7 @@ msgstr "エリトリア"
 #. module: base
 #: sql_constraint:res.company:0
 msgid "The company name must be unique !"
-msgstr "会社名は固有でなければなりません。"
+msgstr "会社名は固有でなければいけません。"
 
 #. module: base
 #: view:res.config:0
@@ -859,7 +875,7 @@ msgstr "言語のインポート"
 #. module: base
 #: help:ir.cron,interval_number:0
 msgid "Repeat every x."
-msgstr ""
+msgstr "全ての x で繰り返す"
 
 #. module: base
 #: selection:base.language.install,lang:0
@@ -928,7 +944,7 @@ msgstr ""
 #. module: base
 #: model:res.partner.category,name:base.res_partner_category_4
 msgid "Basic Partner"
-msgstr ""
+msgstr "基本的なパートナ"
 
 #. module: base
 #: report:ir.module.reference.graph:0
@@ -1297,7 +1313,7 @@ msgstr "アクションURL"
 #. module: base
 #: field:base.module.import,module_name:0
 msgid "Module Name"
-msgstr ""
+msgstr "モジュール名"
 
 #. module: base
 #: model:res.country,name:base.mh
@@ -1384,6 +1400,8 @@ msgid ""
 "use the accounting application of OpenERP, journals and accounts will be "
 "created automatically based on these data."
 msgstr ""
+"あなたの会社の銀行口座を設定し、レポートのフッターに現れるべきそれを選択して下さい。リストビューから銀行口座の並べ替えができます。OpenERPの会計アプ"
+"リケーションを使う場合は、仕訳帳とアカウントはそれらのデータを元に自動的に作成されます。"
 
 #. module: base
 #: view:ir.module.module:0
@@ -1604,7 +1622,7 @@ msgstr "ログイン"
 #: model:ir.actions.act_window,name:base.action_wizard_update_translations
 #: model:ir.ui.menu,name:base.menu_wizard_update_translations
 msgid "Synchronize Terms"
-msgstr ""
+msgstr "用語の同期"
 
 #. module: base
 #: view:ir.actions.server:0
@@ -2224,7 +2242,7 @@ msgstr "表示モード"
 msgid ""
 "Display this bank account on the footer of printed documents like invoices "
 "and sales orders."
-msgstr ""
+msgstr "請求書や受注オーダーのような印刷されるドキュメントのフッターに現れる銀行口座を示して下さい。"
 
 #. module: base
 #: view:base.language.import:0
@@ -2457,7 +2475,7 @@ msgstr "ベリーズ"
 #. module: base
 #: help:ir.actions.report.xml,header:0
 msgid "Add or not the corporate RML header"
-msgstr ""
+msgstr "会社のRMLヘッダーを追加するか否か"
 
 #. module: base
 #: model:ir.module.module,description:base.module_hr_recruitment
@@ -2560,6 +2578,14 @@ msgid ""
 "and categorize your interventions with a channel and a priority level.\n"
 "    "
 msgstr ""
+"\n"
+"Helpdesk\n"
+"====================\n"
+"\n"
+"ライクレコード、クレーム処理、ヘルプデスク、サポートは仲裁の追跡のために良いツールです。\n"
+"このメニューは口頭コミュニケーションよりも適しており、必ずしもクレームとは関係がありません。\n"
+"顧客を選択し、注記を加えそしてチャンネルと優先度レベルとともに仲裁を分類して下さい。\n"
+"    "
 
 #. module: base
 #: sql_constraint:ir.ui.view_sc:0
@@ -2650,7 +2676,7 @@ msgstr "オブジェクト名は x_ で始める必要があり、特殊文字
 #. module: base
 #: field:ir.actions.configuration.wizard,note:0
 msgid "Next Wizard"
-msgstr ""
+msgstr "次のウィザード"
 
 #. module: base
 #: model:ir.actions.act_window,name:base.action_menu_admin
@@ -2830,7 +2856,7 @@ msgstr ""
 #. module: base
 #: model:res.country,name:base.tt
 msgid "Trinidad and Tobago"
-msgstr ""
+msgstr "トリニダード・トバゴ"
 
 #. module: base
 #: model:res.country,name:base.lv
@@ -2900,7 +2926,7 @@ msgstr "継承"
 #. module: base
 #: field:ir.model.fields,serialization_field_id:0
 msgid "Serialization Field"
-msgstr ""
+msgstr "シリアライズ項目"
 
 #. module: base
 #: model:ir.module.category,description:base.module_category_report_designer
@@ -2918,7 +2944,7 @@ msgstr "%y - ２桁の年[00,99]."
 #: code:addons/base/res/res_company.py:155
 #, python-format
 msgid "Fax: "
-msgstr ""
+msgstr "FAX： "
 
 #. module: base
 #: model:res.country,name:base.si
@@ -3245,7 +3271,7 @@ msgstr "オーストリア"
 #. module: base
 #: view:ir.module.module:0
 msgid "Cancel Install"
-msgstr ""
+msgstr "インストールのキャンセル"
 
 #. module: base
 #: model:ir.module.module,description:base.module_l10n_be_invoice_bba
@@ -3339,7 +3365,7 @@ msgstr ""
 #. module: base
 #: model:ir.model,name:base.model_ir_module_module_dependency
 msgid "Module dependency"
-msgstr ""
+msgstr "モジュール依存度"
 
 #. module: base
 #: selection:publisher_warranty.contract.wizard,state:0
@@ -6271,7 +6297,7 @@ msgstr ""
 #. module: base
 #: help:res.country.state,code:0
 msgid "The state code in three chars.\n"
-msgstr ""
+msgstr "３文字の状態コード\n"
 
 #. module: base
 #: model:res.country,name:base.sj
@@ -6294,7 +6320,7 @@ msgstr "基本かんばん"
 #: view:ir.actions.server:0
 #: view:res.request:0
 msgid "Group By"
-msgstr ""
+msgstr "グループ化"
 
 #. module: base
 #: view:res.config:0
@@ -6343,7 +6369,7 @@ msgstr "翻訳"
 #. module: base
 #: selection:res.request,state:0
 msgid "closed"
-msgstr ""
+msgstr "閉鎖済み"
 
 #. module: base
 #: model:ir.module.module,description:base.module_l10n_cr
@@ -7136,7 +7162,7 @@ msgstr "モジュール"
 #: field:workflow.activity,subflow_id:0
 #: field:workflow.workitem,subflow_id:0
 msgid "Subflow"
-msgstr ""
+msgstr "サブフロー"
 
 #. module: base
 #: model:ir.model,name:base.model_res_config
@@ -7428,7 +7454,7 @@ msgstr "保守契約"
 #: model:res.groups,name:base.group_user
 #: field:res.partner,employee:0
 msgid "Employee"
-msgstr ""
+msgstr "従業員"
 
 #. module: base
 #: field:ir.model.access,perm_create:0
@@ -7727,7 +7753,7 @@ msgstr "エクアドル - 会計"
 #. module: base
 #: field:res.partner.category,name:0
 msgid "Category Name"
-msgstr ""
+msgstr "分類名"
 
 #. module: base
 #: view:res.widget:0
@@ -8865,7 +8891,7 @@ msgstr "親分類"
 #. module: base
 #: selection:ir.property,type:0
 msgid "Integer Big"
-msgstr ""
+msgstr "大きな整数"
 
 #. module: base
 #: selection:res.partner.address,type:0
@@ -10761,7 +10787,7 @@ msgstr "会社"
 #. module: base
 #: help:res.currency,symbol:0
 msgid "Currency sign, to be used when printing amounts."
-msgstr ""
+msgstr "通貨記号：印刷時に使用される"
 
 #. module: base
 #: view:res.lang:0
@@ -11080,7 +11106,7 @@ msgstr "ガイアナ"
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_product_expiry
 msgid "Products Expiry Date"
-msgstr ""
+msgstr "製品の有効期限"
 
 #. module: base
 #: model:ir.module.module,description:base.module_account
@@ -11114,6 +11140,32 @@ msgid ""
 "module named account_voucher.\n"
 "    "
 msgstr ""
+"\n"
+"会計と財務管理\n"
+"====================================\n"
+"\n"
+"財務と会計モジュールは次をカバーします：\n"
+"--------------------------------------------\n"
+"一般的な会計\n"
+"コスト / 分析会計\n"
+"サードパーティ会計\n"
+"\n"
+"税金管理\n"
+"予算\n"
+"顧客と仕入先請求書\n"
+"銀行明細書\n"
+"パートナによる調整処理\n"
+"\n"
+"会計士のための次のものを含むダッシュボードを作成して下さい：\n"
+"--------------------------------------------------\n"
+"・承認すべき顧客請求書のリスト\n"
+"・ 会社分析\n"
+"・ 売掛金年齢表\n"
+"・ 金庫のグラフ\n"
+"\n"
+"総勘定元帳を維持するような処理が、特定の会計年度のため、そしてaccount_voucherというモジュールによる証書の準備のための定義された財務仕訳帳（"
+"エントリー移動行または仕訳帳を通して維持されたグループ化）を通して実行されます。\n"
+"    "
 
 #. module: base
 #: help:ir.actions.act_window,view_type:0
@@ -11350,7 +11402,7 @@ msgstr ""
 #: field:res.partner,comment:0
 #: model:res.widget,title:base.note_widget
 msgid "Notes"
-msgstr "注釈"
+msgstr "注記"
 
 #. module: base
 #: field:ir.config_parameter,value:0
@@ -11413,7 +11465,7 @@ msgstr "もし指定した場合は、このアクションは標準メニュー
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_google_map
 msgid "Google Maps on Customers"
-msgstr ""
+msgstr "顧客のGoogle Maps"
 
 #. module: base
 #: model:ir.actions.report.xml,name:base.preview_report
@@ -12752,7 +12804,7 @@ msgstr "アラビア語 / الْعَرَبيّة"
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_web_hello
 msgid "Hello"
-msgstr ""
+msgstr "こんにちは"
 
 #. module: base
 #: view:ir.actions.configuration.wizard:0
@@ -13508,7 +13560,7 @@ msgstr ""
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_account_analytic_plans
 msgid "Multiple Analytic Plans"
-msgstr ""
+msgstr "多数の分析プラン"
 
 #. module: base
 #: model:ir.module.module,description:base.module_project_timesheet
@@ -13674,7 +13726,7 @@ msgstr "ユーザの参照"
 #: code:addons/base/res/res_users.py:118
 #, python-format
 msgid "Warning !"
-msgstr "警告!"
+msgstr "警告"
 
 #. module: base
 #: model:res.widget,title:base.google_maps_widget
@@ -13877,7 +13929,7 @@ msgstr "Trueにセットする場合、ウィザードはフォームビュー
 #. module: base
 #: view:base.language.import:0
 msgid "- type,name,res_id,src,value"
-msgstr ""
+msgstr "- タイプ、名前、リソースID、ソース、値"
 
 #. module: base
 #: model:res.country,name:base.hm
@@ -17085,7 +17137,7 @@ msgstr "クック諸島"
 #. module: base
 #: field:ir.model.data,noupdate:0
 msgid "Non Updatable"
-msgstr ""
+msgstr "更新可能でない"
 
 #. module: base
 #: selection:base.language.install,lang:0
@@ -17191,7 +17243,7 @@ msgstr "国"
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_project_messages
 msgid "In-Project Messaging System"
-msgstr ""
+msgstr "プロジェクト内部のメッセージングシステム"
 
 #. module: base
 #: model:res.country,name:base.pn

From 79c1e97479535e794f3a298a625b6dd18f5544bd Mon Sep 17 00:00:00 2001
From: Launchpad Translations on behalf of openerp <>
Date: Wed, 18 Apr 2012 04:57:43 +0000
Subject: [PATCH 142/238] Launchpad automatic translations update.

bzr revid: launchpad_translations_on_behalf_of_openerp-20120418044206-a2vk0nr789l7d42j
bzr revid: launchpad_translations_on_behalf_of_openerp-20120418045743-hzbql3f1knlrc5yh
---
 addons/account/i18n/ja.po                     |  181 +--
 .../i18n/gu.po                                |  374 ++++++
 .../i18n/ja.po                                |    6 +-
 addons/account_budget/i18n/sr@latin.po        |   10 +-
 addons/crm/i18n/ja.po                         |    4 +-
 addons/hr/i18n/ja.po                          |   24 +-
 addons/hr_holidays/i18n/ja.po                 |  844 ++++++++++++
 addons/hr_payroll/i18n/ja.po                  |   12 +-
 addons/hr_payroll_account/i18n/ja.po          |   10 +-
 addons/hr_recruitment/i18n/ja.po              |   14 +-
 addons/hr_timesheet/i18n/ja.po                |   20 +-
 addons/hr_timesheet_invoice/i18n/ja.po        | 1147 +++++++++++++++++
 addons/hr_timesheet_sheet/i18n/ja.po          | 1042 +++++++++++++++
 addons/html_view/i18n/ja.po                   |   49 +
 addons/import_sugarcrm/i18n/fr.po             |  404 ++++++
 addons/web_dashboard/i18n/sv.po               |  112 ++
 addons/web_diagram/i18n/sv.po                 |   57 +
 addons/web_graph/i18n/sv.po                   |   23 +
 addons/web_kanban/i18n/sv.po                  |   55 +
 addons/web_mobile/i18n/sv.po                  |  106 ++
 addons/web_process/i18n/bs.po                 |  118 ++
 addons/web_process/i18n/sv.po                 |  118 ++
 22 files changed, 4597 insertions(+), 133 deletions(-)
 create mode 100644 addons/account_bank_statement_extensions/i18n/gu.po
 create mode 100644 addons/hr_holidays/i18n/ja.po
 create mode 100644 addons/hr_timesheet_invoice/i18n/ja.po
 create mode 100644 addons/hr_timesheet_sheet/i18n/ja.po
 create mode 100644 addons/html_view/i18n/ja.po
 create mode 100644 addons/import_sugarcrm/i18n/fr.po
 create mode 100644 addons/web_dashboard/i18n/sv.po
 create mode 100644 addons/web_diagram/i18n/sv.po
 create mode 100644 addons/web_graph/i18n/sv.po
 create mode 100644 addons/web_kanban/i18n/sv.po
 create mode 100644 addons/web_mobile/i18n/sv.po
 create mode 100644 addons/web_process/i18n/bs.po
 create mode 100644 addons/web_process/i18n/sv.po

diff --git a/addons/account/i18n/ja.po b/addons/account/i18n/ja.po
index 781f574222c..cdebfa4c93d 100644
--- a/addons/account/i18n/ja.po
+++ b/addons/account/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-17 04:15+0000\n"
+"PO-Revision-Date: 2012-04-17 21:27+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-18 04:41+0000\n"
+"X-Generator: Launchpad (build 15108)\n"
 
 #. module: account
 #: view:account.invoice.report:0
@@ -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
@@ -146,7 +146,7 @@ msgstr "参照"
 #. module: account
 #: view:account.open.closed.fiscalyear:0
 msgid "Choose Fiscal Year "
-msgstr "年度の選択 "
+msgstr "会計年度の選択 "
 
 #. module: account
 #: help:account.payment.term,active: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
@@ -263,29 +263,29 @@ msgstr ""
 #. module: account
 #: report:account.overdue:0
 msgid "Sub-Total :"
-msgstr ""
+msgstr "小計："
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_use_model_create_entry
 #: model:ir.actions.act_window,name:account.action_view_account_use_model
 #: model:ir.ui.menu,name:account.menu_action_manual_recurring
 msgid "Manual Recurring"
-msgstr ""
+msgstr "手動の自動継続"
 
 #. module: account
 #: view:account.fiscalyear.close.state:0
 msgid "Close Fiscalyear"
-msgstr ""
+msgstr "年度を閉じる"
 
 #. module: account
 #: field:account.automatic.reconcile,allow_write_off:0
 msgid "Allow write off"
-msgstr ""
+msgstr "帳消しの許可"
 
 #. module: account
 #: view:account.analytic.chart:0
 msgid "Select the Period for Analysis"
-msgstr ""
+msgstr "分析期間の選択"
 
 #. module: account
 #: view:account.move.line:0
@@ -296,19 +296,19 @@ msgstr ""
 #: code:addons/account/account_invoice.py:551
 #, python-format
 msgid "Invoice line account company does not match with invoice company."
-msgstr ""
+msgstr "請求書行のアカウントの会社が請求書の会社と一致しません。"
 
 #. module: account
 #: field:account.journal.column,field:0
 msgid "Field Name"
-msgstr ""
+msgstr "項目名"
 
 #. module: account
 #: help:account.installer,charts:0
 msgid ""
 "Installs localized accounting charts to match as closely as possible the "
 "accounting needs of your company based on your country."
-msgstr ""
+msgstr "あなたの国に基づき、あなたの会社の会計ニーズに可能な限り近くマッチする、ローカル化会計表をインストールします。"
 
 #. module: account
 #: code:addons/account/wizard/account_move_journal.py:63
@@ -319,17 +319,21 @@ msgid ""
 "You can create one in the menu: \n"
 "Configuration/Financial Accounting/Accounts/Journals."
 msgstr ""
+"この会社のために %s タイプのどんな会計仕訳帳も見つけることができません。\n"
+"\n"
+"メニューからそれを作成することができます： \n"
+"設定 / 金融会計 / アカウント / 仕訳帳"
 
 #. module: account
 #: model:ir.model,name:account.model_account_unreconcile
 msgid "Account Unreconcile"
-msgstr ""
+msgstr "照合なしアカウント"
 
 #. module: account
 #: view:product.product:0
 #: view:product.template:0
 msgid "Purchase Properties"
-msgstr ""
+msgstr "購入属性"
 
 #. module: account
 #: help:account.financial.report,style_overwrite:0
@@ -338,11 +342,13 @@ msgid ""
 "leave the automatic formatting, it will be computed based on the financial "
 "reports hierarchy (auto-computed field 'level')."
 msgstr ""
+"このレコードを表示させるための好みのフォーマットをここで設定できます。自動フォーマッティングを残す場合は、それは財務レポートの階層（自動計算項目\"レベル"
+"\"）に基づき計算されます。"
 
 #. module: account
 #: view:account.installer:0
 msgid "Configure"
-msgstr ""
+msgstr "設定"
 
 #. module: account
 #: selection:account.entries.report,month:0
@@ -351,7 +357,7 @@ msgstr ""
 #: selection:report.account.sales,month:0
 #: selection:report.account_type.sales,month:0
 msgid "June"
-msgstr ""
+msgstr "６月"
 
 #. module: account
 #: model:ir.actions.act_window,help:account.action_account_moves_bank
@@ -360,11 +366,13 @@ msgid ""
 "OpenERP. Journal items are created by OpenERP if you use Bank Statements, "
 "Cash Registers, or Customer/Supplier payments."
 msgstr ""
+"このビューはOpenERPの大量のエントリーを記録するために会計士によって利用されます。銀行明細書、キャッシュレジスター、または顧客 / "
+"仕入先支払いを利用する場合、仕訳帳項目はOpenERPによって作成されます。"
 
 #. module: account
 #: constraint:account.move.line:0
 msgid "You can not create journal items on an account of type view."
-msgstr ""
+msgstr "ビュータイプのアカウントでは仕訳項目を作ることはできません。"
 
 #. module: account
 #: model:ir.model,name:account.model_account_tax_template
@@ -380,49 +388,49 @@ msgstr ""
 #: field:account.move.line,date_created:0
 #: field:account.move.reconcile,create_date:0
 msgid "Creation date"
-msgstr ""
+msgstr "作成日"
 
 #. module: account
 #: selection:account.journal,type:0
 msgid "Purchase Refund"
-msgstr ""
+msgstr "購入の払い戻し"
 
 #. module: account
 #: selection:account.journal,type:0
 msgid "Opening/Closing Situation"
-msgstr ""
+msgstr "事態 開く / 閉じる"
 
 #. module: account
 #: help:account.journal,currency:0
 msgid "The currency used to enter statement"
-msgstr ""
+msgstr "明細入力に使用される通貨"
 
 #. module: account
 #: field:account.open.closed.fiscalyear,fyear_id:0
 msgid "Fiscal Year to Open"
-msgstr ""
+msgstr "会計年度を開く"
 
 #. module: account
 #: help:account.journal,sequence_id:0
 msgid ""
 "This field contains the informatin related to the numbering of the journal "
 "entries of this journal."
-msgstr ""
+msgstr "この項目にはこの仕訳帳の仕訳エントリーのナンバリングに冠する情報が含まれています。"
 
 #. module: account
 #: field:account.journal,default_debit_account_id:0
 msgid "Default Debit Account"
-msgstr ""
+msgstr "デフォルト借方アカウント"
 
 #. module: account
 #: view:account.move:0
 msgid "Total Credit"
-msgstr ""
+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
@@ -430,17 +438,17 @@ msgstr ""
 #: field:account.tax.template,chart_template_id:0
 #: field:wizard.multi.charts.accounts,chart_template_id:0
 msgid "Chart Template"
-msgstr ""
+msgstr "チャートテンプレート"
 
 #. module: account
 #: help:account.model.line,amount_currency:0
 msgid "The amount expressed in an optional other currency."
-msgstr ""
+msgstr "オプションの他の通貨で表現された金額"
 
 #. module: account
 #: field:accounting.report,enable_filter:0
 msgid "Enable Comparison"
-msgstr ""
+msgstr "比較を可能化"
 
 #. module: account
 #: help:account.journal.period,state:0
@@ -449,6 +457,7 @@ msgid ""
 "it comes to 'Printed' state. When all transactions are done, it comes in "
 "'Done' state."
 msgstr ""
+"仕訳帳期間が作成される場合、その状態はドラフトです。レポートが印刷された場合は、印刷済み状態になります。全ての取引が終了すると完了状態となります。"
 
 #. module: account
 #: model:ir.actions.act_window,help:account.action_account_tax_chart
@@ -458,6 +467,8 @@ msgid ""
 "amount of each area of the tax declaration for your country. It’s presented "
 "in a hierarchical structure, which can be modified to fit your needs."
 msgstr ""
+"税金のチャートは税金の事実（または税金コード）の構造を反映したツリービューで、現在の税金の状況を示します。税金チャートはあなたの国の税金申告の各領域の金額"
+"を表します。それはあなたのニーズに合わせて変更できる階層的な構造で表示されます。"
 
 #. module: account
 #: view:account.analytic.line:0
@@ -487,22 +498,22 @@ msgstr ""
 #: model:ir.model,name:account.model_account_journal
 #: field:validate.account.move,journal_id:0
 msgid "Journal"
-msgstr ""
+msgstr "仕訳帳"
 
 #. module: account
 #: model:ir.model,name:account.model_account_invoice_confirm
 msgid "Confirm the selected invoices"
-msgstr ""
+msgstr "選択した請求集書を確認"
 
 #. module: account
 #: field:account.addtmpl.wizard,cparent_id:0
 msgid "Parent target"
-msgstr ""
+msgstr "親ターゲット"
 
 #. module: account
 #: field:account.bank.statement,account_id:0
 msgid "Account used in this journal"
-msgstr ""
+msgstr "この仕訳帳で使用されるアカウント"
 
 #. module: account
 #: help:account.aged.trial.balance,chart_account_id:0
@@ -520,17 +531,17 @@ msgstr ""
 #: help:account.vat.declaration,chart_account_id:0
 #: help:accounting.report,chart_account_id:0
 msgid "Select Charts of Accounts"
-msgstr ""
+msgstr "勘定科目表の選択"
 
 #. module: account
 #: sql_constraint:res.company:0
 msgid "The company name must be unique !"
-msgstr ""
+msgstr "会社名は固有でなければいけません。"
 
 #. module: account
 #: model:ir.model,name:account.model_account_invoice_refund
 msgid "Invoice Refund"
-msgstr ""
+msgstr "請求書払い戻し"
 
 #. module: account
 #: report:account.overdue:0
@@ -540,31 +551,31 @@ msgstr ""
 #. module: account
 #: field:account.automatic.reconcile,unreconciled:0
 msgid "Not reconciled transactions"
-msgstr ""
+msgstr "照合なし取引"
 
 #. module: account
 #: report:account.general.ledger:0
 #: report:account.general.ledger_landscape:0
 msgid "Counterpart"
-msgstr ""
+msgstr "相手方"
 
 #. module: account
 #: view:account.fiscal.position:0
 #: field:account.fiscal.position,tax_ids:0
 #: field:account.fiscal.position.template,tax_ids:0
 msgid "Tax Mapping"
-msgstr ""
+msgstr "税金のマッピング"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_fiscalyear_close_state
 #: model:ir.ui.menu,name:account.menu_wizard_fy_close_state
 msgid "Close a Fiscal Year"
-msgstr ""
+msgstr "会計年度を閉じる"
 
 #. module: account
 #: model:process.transition,note:account.process_transition_confirmstatementfromdraft0
 msgid "The accountant confirms the statement."
-msgstr ""
+msgstr "会計士は明細書を確認します。"
 
 #. module: account
 #: selection:account.balance.report,display_account:0
@@ -573,45 +584,45 @@ msgstr ""
 #: selection:account.tax,type_tax_use:0
 #: selection:account.tax.template,type_tax_use:0
 msgid "All"
-msgstr ""
+msgstr "全て"
 
 #. module: account
 #: field:account.invoice.report,address_invoice_id:0
 msgid "Invoice Address Name"
-msgstr ""
+msgstr "請求書住所の名前"
 
 #. module: account
 #: selection:account.installer,period:0
 msgid "3 Monthly"
-msgstr ""
+msgstr "３ヶ月毎"
 
 #. module: account
 #: view:account.unreconcile.reconcile:0
 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
 msgid "   30 Days   "
-msgstr ""
+msgstr "   30日   "
 
 #. module: account
 #: field:ir.sequence,fiscal_ids:0
 msgid "Sequences"
-msgstr ""
+msgstr "順序"
 
 #. module: account
 #: field:account.financial.report,account_report_id:0
 #: selection:account.financial.report,type:0
 msgid "Report Value"
-msgstr ""
+msgstr "レポート値"
 
 #. module: account
 #: view:account.fiscal.position.template:0
 msgid "Taxes Mapping"
-msgstr ""
+msgstr "税金マッピング"
 
 #. module: account
 #: report:account.central.journal:0
@@ -621,18 +632,18 @@ msgstr ""
 #. module: account
 #: sql_constraint:account.sequence.fiscalyear:0
 msgid "Main Sequence must be different from current !"
-msgstr ""
+msgstr "主となる順序は現在と異なる必要があります。"
 
 #. module: account
 #: code:addons/account/account_move_line.py:1251
 #, python-format
 msgid "No period found or more than one period found for the given date."
-msgstr ""
+msgstr "所定の日付のために期間が見つからないか、複数の期間が見つかりました。"
 
 #. module: account
 #: field:account.invoice.tax,tax_amount:0
 msgid "Tax Code Amount"
-msgstr ""
+msgstr "税金コード金額"
 
 #. module: account
 #: code:addons/account/account.py:3116
@@ -644,29 +655,29 @@ msgstr ""
 #: view:account.period:0
 #: view:account.period.close:0
 msgid "Close Period"
-msgstr ""
+msgstr "期間を閉じる"
 
 #. module: account
 #: model:ir.model,name:account.model_account_common_partner_report
 msgid "Account Common Partner Report"
-msgstr ""
+msgstr "アカウント共有パートナレポート"
 
 #. module: account
 #: field:account.fiscalyear.close,period_id:0
 msgid "Opening Entries Period"
-msgstr ""
+msgstr "開始エントリーの期間"
 
 #. module: account
 #: model:ir.model,name:account.model_account_journal_period
 msgid "Journal Period"
-msgstr ""
+msgstr "仕訳帳期間"
 
 #. module: account
 #: code:addons/account/account_move_line.py:750
 #: 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
@@ -678,34 +689,34 @@ msgstr ""
 #: model:ir.actions.act_window,name:account.action_aged_receivable
 #, python-format
 msgid "Receivable Accounts"
-msgstr ""
+msgstr "売掛金アカウント"
 
 #. module: account
 #: 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 ""
+msgstr "仕訳帳エントリーの日付が定義された期間ではありません。日付を変更するか仕訳帳からこの制約を削除する必要があります。"
 
 #. module: account
 #: model:ir.model,name:account.model_account_report_general_ledger
 msgid "General Ledger Report"
-msgstr ""
+msgstr "総勘定元帳レポート"
 
 #. module: account
 #: view:account.invoice:0
 msgid "Re-Open"
-msgstr ""
+msgstr "再度開く"
 
 #. module: account
 #: view:account.use.model:0
 msgid "Are you sure you want to create entries?"
-msgstr ""
+msgstr "本当にエントリーを作成しますか？"
 
 #. module: account
 #: view:account.invoice:0
 msgid "Print Invoice"
-msgstr ""
+msgstr "請求書印刷"
 
 #. module: account
 #: field:account.partner.reconcile.process,today_reconciled:0
@@ -792,7 +803,7 @@ msgstr ""
 #. module: account
 #: view:account.invoice.report:0
 msgid "Supplier Invoices And Refunds"
-msgstr ""
+msgstr "仕入先請求書と払い戻し"
 
 #. module: account
 #: view:account.move.line.unreconcile.select:0
@@ -857,7 +868,7 @@ msgstr ""
 msgid ""
 "Can not %s invoice which is already reconciled, invoice should be "
 "unreconciled first. You can only Refund this invoice"
-msgstr ""
+msgstr "既に調整済みの %s は請求できません。請求書は未調整であるべきです。この請求書は払い戻しのみできます。"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_subscription_form_new
@@ -872,7 +883,7 @@ 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
@@ -960,7 +971,7 @@ msgstr ""
 #. module: account
 #: selection:account.journal,type:0
 msgid "Sale Refund"
-msgstr ""
+msgstr "販売払い戻し"
 
 #. module: account
 #: model:process.node,note:account.process_node_accountingstatemententries0
@@ -1473,6 +1484,8 @@ msgid ""
 "entry per accounting document: invoice, refund, supplier payment, bank "
 "statements, etc."
 msgstr ""
+"仕訳帳エントリーは幾つかの仕訳帳項目を含んでいます。それぞれは借方あるいは貸方取引の何れかです。OpenERPは会計ドキュメントごとにひとつの仕訳帳エント"
+"リーを自動的に作成します：請求書、払い戻し、仕入先支払い、銀行明細など"
 
 #. module: account
 #: view:account.entries.report:0
@@ -1495,7 +1508,7 @@ msgstr ""
 #: 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
@@ -1574,7 +1587,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
@@ -1651,7 +1664,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
@@ -2607,7 +2620,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
@@ -2819,7 +2832,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
@@ -3643,7 +3656,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
@@ -4447,7 +4460,7 @@ msgstr ""
 #: 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
@@ -4544,7 +4557,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
@@ -5177,7 +5190,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
@@ -5286,7 +5299,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
@@ -5342,7 +5355,7 @@ msgstr ""
 #. module: account
 #: view:account.invoice.refund:0
 msgid "Refund Invoice Options"
-msgstr ""
+msgstr "払い戻し請求書オプション"
 
 #. module: account
 #: help:account.automatic.reconcile,power:0
@@ -5581,7 +5594,7 @@ msgstr ""
 #. module: account
 #: view:account.invoice.refund:0
 msgid "Refund Invoice"
-msgstr ""
+msgstr "払い戻し請求書"
 
 #. module: account
 #: field:account.invoice,address_invoice_id:0
diff --git a/addons/account_bank_statement_extensions/i18n/gu.po b/addons/account_bank_statement_extensions/i18n/gu.po
new file mode 100644
index 00000000000..3e77a3b8a26
--- /dev/null
+++ b/addons/account_bank_statement_extensions/i18n/gu.po
@@ -0,0 +1,374 @@
+# 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-17 09:03+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-18 04:42+0000\n"
+"X-Generator: Launchpad (build 15108)\n"
+
+#. module: account_bank_statement_extensions
+#: view:account.bank.statement.line:0
+msgid "Search Bank Transactions"
+msgstr "બેન્ક વ્યવહારો શોધો"
+
+#. module: account_bank_statement_extensions
+#: view:account.bank.statement.line:0
+#: selection:account.bank.statement.line,state:0
+msgid "Confirmed"
+msgstr "સમર્થિત"
+
+#. module: account_bank_statement_extensions
+#: view:account.bank.statement:0
+#: view:account.bank.statement.line:0
+msgid "Glob. Id"
+msgstr ""
+
+#. module: account_bank_statement_extensions
+#: selection:account.bank.statement.line.global,type:0
+msgid "CODA"
+msgstr ""
+
+#. module: account_bank_statement_extensions
+#: field:account.bank.statement.line.global,parent_id:0
+msgid "Parent Code"
+msgstr "પેરેંટ કોડ"
+
+#. module: account_bank_statement_extensions
+#: view:account.bank.statement.line:0
+msgid "Debit"
+msgstr "ઉધાર"
+
+#. module: account_bank_statement_extensions
+#: view:cancel.statement.line:0
+#: model:ir.actions.act_window,name:account_bank_statement_extensions.action_cancel_statement_line
+#: model:ir.model,name:account_bank_statement_extensions.model_cancel_statement_line
+msgid "Cancel selected statement lines"
+msgstr ""
+
+#. module: account_bank_statement_extensions
+#: constraint:res.partner.bank:0
+msgid "The RIB and/or IBAN is not valid"
+msgstr ""
+
+#. module: account_bank_statement_extensions
+#: view:account.bank.statement.line:0
+msgid "Group By..."
+msgstr "ગ્રુપ દ્વારા..."
+
+#. module: account_bank_statement_extensions
+#: field:account.bank.statement.line,state:0
+msgid "State"
+msgstr "સ્થિતિ"
+
+#. module: account_bank_statement_extensions
+#: view:account.bank.statement.line:0
+#: selection:account.bank.statement.line,state:0
+msgid "Draft"
+msgstr "કાચું"
+
+#. module: account_bank_statement_extensions
+#: view:account.bank.statement.line:0
+msgid "Statement"
+msgstr "વિધાન"
+
+#. module: account_bank_statement_extensions
+#: view:confirm.statement.line:0
+#: model:ir.actions.act_window,name:account_bank_statement_extensions.action_confirm_statement_line
+#: model:ir.model,name:account_bank_statement_extensions.model_confirm_statement_line
+msgid "Confirm selected statement lines"
+msgstr ""
+
+#. module: account_bank_statement_extensions
+#: report:bank.statement.balance.report:0
+#: model:ir.actions.report.xml,name:account_bank_statement_extensions.bank_statement_balance_report
+msgid "Bank Statement Balances Report"
+msgstr ""
+
+#. module: account_bank_statement_extensions
+#: view:cancel.statement.line:0
+msgid "Cancel Lines"
+msgstr ""
+
+#. module: account_bank_statement_extensions
+#: view:account.bank.statement.line.global:0
+#: model:ir.model,name:account_bank_statement_extensions.model_account_bank_statement_line_global
+msgid "Batch Payment Info"
+msgstr ""
+
+#. module: account_bank_statement_extensions
+#: view:confirm.statement.line:0
+msgid "Confirm Lines"
+msgstr ""
+
+#. module: account_bank_statement_extensions
+#: code:addons/account_bank_statement_extensions/account_bank_statement.py:130
+#, python-format
+msgid ""
+"Delete operation not allowed !             Please go to the associated bank "
+"statement in order to delete and/or modify this bank statement line"
+msgstr ""
+
+#. module: account_bank_statement_extensions
+#: field:account.bank.statement.line.global,type:0
+msgid "Type"
+msgstr "પ્રકાર"
+
+#. module: account_bank_statement_extensions
+#: view:account.bank.statement.line:0
+#: field:account.bank.statement.line,journal_id:0
+#: report:bank.statement.balance.report:0
+msgid "Journal"
+msgstr "રોજનામું"
+
+#. module: account_bank_statement_extensions
+#: view:account.bank.statement.line:0
+msgid "Confirmed Statement Lines."
+msgstr ""
+
+#. module: account_bank_statement_extensions
+#: view:account.bank.statement.line:0
+msgid "Credit Transactions."
+msgstr ""
+
+#. module: account_bank_statement_extensions
+#: model:ir.actions.act_window,help:account_bank_statement_extensions.action_cancel_statement_line
+msgid "cancel selected statement lines."
+msgstr ""
+
+#. module: account_bank_statement_extensions
+#: field:account.bank.statement.line,counterparty_number:0
+msgid "Counterparty Number"
+msgstr ""
+
+#. module: account_bank_statement_extensions
+#: view:account.bank.statement.line.global:0
+msgid "Transactions"
+msgstr ""
+
+#. module: account_bank_statement_extensions
+#: code:addons/account_bank_statement_extensions/account_bank_statement.py:130
+#, python-format
+msgid "Warning"
+msgstr ""
+
+#. module: account_bank_statement_extensions
+#: report:bank.statement.balance.report:0
+msgid "Closing Balance"
+msgstr ""
+
+#. module: account_bank_statement_extensions
+#: report:bank.statement.balance.report:0
+msgid "Date"
+msgstr ""
+
+#. module: account_bank_statement_extensions
+#: view:account.bank.statement.line:0
+#: field:account.bank.statement.line,globalisation_amount:0
+msgid "Glob. Amount"
+msgstr ""
+
+#. module: account_bank_statement_extensions
+#: view:account.bank.statement.line:0
+msgid "Debit Transactions."
+msgstr ""
+
+#. module: account_bank_statement_extensions
+#: view:account.bank.statement.line:0
+msgid "Extended Filters..."
+msgstr ""
+
+#. module: account_bank_statement_extensions
+#: view:confirm.statement.line:0
+msgid "Confirmed lines cannot be changed anymore."
+msgstr ""
+
+#. module: account_bank_statement_extensions
+#: constraint:res.partner.bank:0
+msgid ""
+"\n"
+"Please define BIC/Swift code on bank for bank type IBAN Account to make "
+"valid payments"
+msgstr ""
+
+#. module: account_bank_statement_extensions
+#: field:account.bank.statement.line,val_date:0
+msgid "Valuta Date"
+msgstr ""
+
+#. module: account_bank_statement_extensions
+#: model:ir.actions.act_window,help:account_bank_statement_extensions.action_confirm_statement_line
+msgid "Confirm selected statement lines."
+msgstr ""
+
+#. module: account_bank_statement_extensions
+#: view:cancel.statement.line:0
+msgid "Are you sure you want to cancel the selected Bank Statement lines ?"
+msgstr ""
+
+#. module: account_bank_statement_extensions
+#: report:bank.statement.balance.report:0
+msgid "Name"
+msgstr ""
+
+#. module: account_bank_statement_extensions
+#: selection:account.bank.statement.line.global,type:0
+msgid "ISO 20022"
+msgstr ""
+
+#. module: account_bank_statement_extensions
+#: view:account.bank.statement.line:0
+msgid "Notes"
+msgstr ""
+
+#. module: account_bank_statement_extensions
+#: selection:account.bank.statement.line.global,type:0
+msgid "Manual"
+msgstr ""
+
+#. module: account_bank_statement_extensions
+#: view:account.bank.statement.line:0
+msgid "Credit"
+msgstr ""
+
+#. module: account_bank_statement_extensions
+#: field:account.bank.statement.line.global,amount:0
+msgid "Amount"
+msgstr ""
+
+#. module: account_bank_statement_extensions
+#: view:account.bank.statement.line:0
+msgid "Fin.Account"
+msgstr ""
+
+#. module: account_bank_statement_extensions
+#: field:account.bank.statement.line,counterparty_currency:0
+msgid "Counterparty Currency"
+msgstr ""
+
+#. module: account_bank_statement_extensions
+#: field:account.bank.statement.line,counterparty_bic:0
+msgid "Counterparty BIC"
+msgstr ""
+
+#. module: account_bank_statement_extensions
+#: field:account.bank.statement.line.global,child_ids:0
+msgid "Child Codes"
+msgstr ""
+
+#. module: account_bank_statement_extensions
+#: view:confirm.statement.line:0
+msgid "Are you sure you want to confirm the selected Bank Statement lines ?"
+msgstr ""
+
+#. module: account_bank_statement_extensions
+#: constraint:account.bank.statement.line:0
+msgid ""
+"The amount of the voucher must be the same amount as the one on the "
+"statement line"
+msgstr ""
+
+#. module: account_bank_statement_extensions
+#: help:account.bank.statement.line,globalisation_id:0
+msgid ""
+"Code to identify transactions belonging to the same globalisation level "
+"within a batch payment"
+msgstr ""
+
+#. module: account_bank_statement_extensions
+#: view:account.bank.statement.line:0
+msgid "Draft Statement Lines."
+msgstr ""
+
+#. module: account_bank_statement_extensions
+#: view:account.bank.statement.line:0
+msgid "Glob. Am."
+msgstr ""
+
+#. module: account_bank_statement_extensions
+#: model:ir.model,name:account_bank_statement_extensions.model_account_bank_statement_line
+msgid "Bank Statement Line"
+msgstr ""
+
+#. module: account_bank_statement_extensions
+#: field:account.bank.statement.line.global,code:0
+msgid "Code"
+msgstr ""
+
+#. module: account_bank_statement_extensions
+#: field:account.bank.statement.line,counterparty_name:0
+msgid "Counterparty Name"
+msgstr ""
+
+#. module: account_bank_statement_extensions
+#: field:account.bank.statement.line.global,name:0
+msgid "Communication"
+msgstr ""
+
+#. module: account_bank_statement_extensions
+#: model:ir.model,name:account_bank_statement_extensions.model_res_partner_bank
+msgid "Bank Accounts"
+msgstr ""
+
+#. module: account_bank_statement_extensions
+#: constraint:account.bank.statement:0
+msgid "The journal and period chosen have to belong to the same company."
+msgstr ""
+
+#. module: account_bank_statement_extensions
+#: model:ir.model,name:account_bank_statement_extensions.model_account_bank_statement
+msgid "Bank Statement"
+msgstr ""
+
+#. module: account_bank_statement_extensions
+#: view:account.bank.statement.line:0
+msgid "Statement Line"
+msgstr ""
+
+#. module: account_bank_statement_extensions
+#: sql_constraint:account.bank.statement.line.global:0
+msgid "The code must be unique !"
+msgstr ""
+
+#. module: account_bank_statement_extensions
+#: field:account.bank.statement.line.global,bank_statement_line_ids:0
+#: model:ir.actions.act_window,name:account_bank_statement_extensions.action_bank_statement_line
+#: model:ir.ui.menu,name:account_bank_statement_extensions.bank_statement_line
+msgid "Bank Statement Lines"
+msgstr ""
+
+#. module: account_bank_statement_extensions
+#: view:account.bank.statement.line.global:0
+msgid "Child Batch Payments"
+msgstr ""
+
+#. module: account_bank_statement_extensions
+#: view:cancel.statement.line:0
+#: view:confirm.statement.line:0
+msgid "Cancel"
+msgstr ""
+
+#. module: account_bank_statement_extensions
+#: view:account.bank.statement.line:0
+msgid "Statement Lines"
+msgstr ""
+
+#. module: account_bank_statement_extensions
+#: view:account.bank.statement.line:0
+msgid "Total Amount"
+msgstr ""
+
+#. module: account_bank_statement_extensions
+#: field:account.bank.statement.line,globalisation_id:0
+msgid "Globalisation ID"
+msgstr ""
diff --git a/addons/account_bank_statement_extensions/i18n/ja.po b/addons/account_bank_statement_extensions/i18n/ja.po
index b852e95c682..f040102bb83 100644
--- a/addons/account_bank_statement_extensions/i18n/ja.po
+++ b/addons/account_bank_statement_extensions/i18n/ja.po
@@ -14,8 +14,8 @@ 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-17 04:52+0000\n"
-"X-Generator: Launchpad (build 15099)\n"
+"X-Launchpad-Export-Date: 2012-04-18 04:42+0000\n"
+"X-Generator: Launchpad (build 15108)\n"
 
 #. module: account_bank_statement_extensions
 #: view:account.bank.statement.line:0
@@ -186,7 +186,7 @@ msgstr "借方取引"
 #. module: account_bank_statement_extensions
 #: view:account.bank.statement.line:0
 msgid "Extended Filters..."
-msgstr "拡張したフィルタ…"
+msgstr "拡張フィルタ…"
 
 #. module: account_bank_statement_extensions
 #: view:confirm.statement.line:0
diff --git a/addons/account_budget/i18n/sr@latin.po b/addons/account_budget/i18n/sr@latin.po
index 602ad560c1e..76b06435064 100644
--- a/addons/account_budget/i18n/sr@latin.po
+++ b/addons/account_budget/i18n/sr@latin.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: 2011-11-10 16:52+0000\n"
-"Last-Translator: Milan Milosevic <Unknown>\n"
+"PO-Revision-Date: 2012-04-17 05:29+0000\n"
+"Last-Translator: Maroje Delibasic <maroje.delibasic@gmail.com>\n"
 "Language-Team: Serbian latin <sr@latin@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-02-09 06:48+0000\n"
-"X-Generator: Launchpad (build 14763)\n"
+"X-Launchpad-Export-Date: 2012-04-18 04:41+0000\n"
+"X-Generator: Launchpad (build 15108)\n"
 
 #. module: account_budget
 #: field:crossovered.budget,creating_user_id:0
@@ -331,7 +331,7 @@ msgstr "Početak perioda"
 #. module: account_budget
 #: model:ir.model,name:account_budget.model_account_budget_crossvered_summary_report
 msgid "Account Budget  crossvered summary report"
-msgstr "Izvestaj rezimea budžeta za unakrsni konto"
+msgstr "Izveštaj rezimea budžeta za unakrsni konto"
 
 #. module: account_budget
 #: report:account.budget:0
diff --git a/addons/crm/i18n/ja.po b/addons/crm/i18n/ja.po
index e38caf8c8af..9039dcb8bec 100644
--- a/addons/crm/i18n/ja.po
+++ b/addons/crm/i18n/ja.po
@@ -14,8 +14,8 @@ 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-17 04:51+0000\n"
-"X-Generator: Launchpad (build 15099)\n"
+"X-Launchpad-Export-Date: 2012-04-18 04:41+0000\n"
+"X-Generator: Launchpad (build 15108)\n"
 
 #. module: crm
 #: view:crm.lead.report:0
diff --git a/addons/hr/i18n/ja.po b/addons/hr/i18n/ja.po
index 1486a75741d..1263a5c73b3 100644
--- a/addons/hr/i18n/ja.po
+++ b/addons/hr/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 01:37+0100\n"
-"PO-Revision-Date: 2012-04-17 01:59+0000\n"
+"PO-Revision-Date: 2012-04-17 18:27+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-17 04:51+0000\n"
-"X-Generator: Launchpad (build 15099)\n"
+"X-Launchpad-Export-Date: 2012-04-18 04:41+0000\n"
+"X-Generator: Launchpad (build 15108)\n"
 
 #. module: hr
 #: model:process.node,name:hr.process_node_openerpuser0
@@ -35,19 +35,19 @@ msgstr "エラー。反復する部署を作ることはできません。"
 #. module: hr
 #: model:process.transition,name:hr.process_transition_contactofemployee0
 msgid "Link the employee to information"
-msgstr ""
+msgstr "従業員を情報に連携"
 
 #. module: hr
 #: field:hr.employee,sinid:0
 msgid "SIN No"
-msgstr ""
+msgstr "社会保険番号"
 
 #. module: hr
 #: model:ir.ui.menu,name:hr.menu_hr_main
 #: model:ir.ui.menu,name:hr.menu_hr_management
 #: model:ir.ui.menu,name:hr.menu_hr_root
 msgid "Human Resources"
-msgstr ""
+msgstr "人材"
 
 #. module: hr
 #: view:hr.employee:0 view:hr.job:0
@@ -152,7 +152,7 @@ msgid ""
 "Your Company's Department Structure is used to manage all documents related "
 "to employees by departments: expenses and timesheet validation, leaves "
 "management, recruitments, etc."
-msgstr ""
+msgstr "部門組織構造は、従業員に関する全てのドキュメントの管理に使われます。例えば、経費、タイムシートの検証、休暇の管理、採用など。"
 
 #. module: hr
 #: field:hr.employee,color:0
@@ -189,7 +189,7 @@ msgstr "この職種に必要な従業員の数"
 #. module: hr
 #: model:ir.ui.menu,name:hr.menu_open_view_attendance_reason_new_config
 msgid "Attendance"
-msgstr "出欠"
+msgstr "勤怠"
 
 #. module: hr
 #: view:hr.employee:0
@@ -204,7 +204,7 @@ msgstr "勤務先電話"
 #. module: hr
 #: field:hr.employee.category,child_ids:0
 msgid "Child Categories"
-msgstr "子関係の区分"
+msgstr "下位区分"
 
 #. module: hr
 #: view:hr.job:0 field:hr.job,description:0
@@ -347,7 +347,7 @@ msgstr "従業員を作成する。"
 #. module: hr
 #: field:hr.employee.category,name:0
 msgid "Category"
-msgstr "分類"
+msgstr "カテゴリー"
 
 #. module: hr
 #: model:ir.actions.act_window,help:hr.open_view_employee_list_my
@@ -411,7 +411,7 @@ msgstr "下位部門"
 #. module: hr
 #: view:hr.employee:0
 msgid "Status"
-msgstr "ステータス"
+msgstr "状態"
 
 #. module: hr
 #: model:ir.actions.act_window,name:hr.open_view_categ_tree
@@ -582,7 +582,7 @@ msgstr "国籍"
 #. module: hr
 #: model:ir.ui.menu,name:hr.menu_open_view_attendance_reason_config
 msgid "Leaves"
-msgstr "作業終了"
+msgstr "休暇"
 
 #. module: hr
 #: view:board.board:0
diff --git a/addons/hr_holidays/i18n/ja.po b/addons/hr_holidays/i18n/ja.po
new file mode 100644
index 00000000000..b7f627c4a75
--- /dev/null
+++ b/addons/hr_holidays/i18n/ja.po
@@ -0,0 +1,844 @@
+# 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-18 04:38+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-Generator: Launchpad (build 15108)\n"
+
+#. module: hr_holidays
+#: selection:hr.holidays.status,color_name:0
+msgid "Blue"
+msgstr "青"
+
+#. module: hr_holidays
+#: field:hr.holidays,holiday_type:0
+msgid "Allocation Type"
+msgstr "割振りタイプ"
+
+#. module: hr_holidays
+#: selection:hr.employee,current_leave_state:0 selection:hr.holidays,state:0
+msgid "Waiting Second Approval"
+msgstr "2番目の承認待ち"
+
+#. module: hr_holidays
+#: help:hr.holidays.status,remaining_leaves:0
+msgid "Maximum Leaves Allowed - Leaves Already Taken"
+msgstr "休暇の最大値 - 既取得休暇"
+
+#. module: hr_holidays
+#: view:hr.holidays:0
+msgid "Leaves Management"
+msgstr "休暇管理"
+
+#. module: hr_holidays
+#: view:hr.holidays:0
+msgid "Group By..."
+msgstr "グループ化…"
+
+#. module: hr_holidays
+#: view:hr.holidays:0
+msgid "Allocation Mode"
+msgstr "割振りモード"
+
+#. module: hr_holidays
+#: view:hr.holidays:0 field:hr.holidays,department_id:0
+msgid "Department"
+msgstr "部門"
+
+#. module: hr_holidays
+#: model:ir.actions.act_window,name:hr_holidays.request_approve_holidays
+msgid "Requests Approve"
+msgstr "承認を申請"
+
+#. module: hr_holidays
+#: selection:hr.employee,current_leave_state:0 selection:hr.holidays,state:0
+msgid "Refused"
+msgstr "拒否"
+
+#. module: hr_holidays
+#: help:hr.holidays,category_id:0
+msgid "Category of Employee"
+msgstr "従業員のカテゴリー"
+
+#. module: hr_holidays
+#: view:hr.holidays:0
+msgid " Month-1"
+msgstr " 月-1"
+
+#. module: hr_holidays
+#: selection:hr.holidays.status,color_name:0
+msgid "Brown"
+msgstr "茶"
+
+#. module: hr_holidays
+#: view:hr.holidays:0
+msgid "Remaining Days"
+msgstr "残り日数"
+
+#. module: hr_holidays
+#: selection:hr.holidays,holiday_type:0
+msgid "By Employee"
+msgstr "従業員ごと"
+
+#. module: hr_holidays
+#: help:hr.holidays,employee_id:0
+msgid ""
+"Leave Manager can let this field empty if this leave request/allocation is "
+"for every employee"
+msgstr "この休暇申請 / 割振りが全ての従業員のためであるならば、この項目を空白にしておくことができます。"
+
+#. module: hr_holidays
+#: view:hr.holidays:0
+msgid "Set to Draft"
+msgstr "草稿に設定"
+
+#. module: hr_holidays
+#: selection:hr.holidays.status,color_name:0
+msgid "Light Cyan"
+msgstr "薄青緑色"
+
+#. module: hr_holidays
+#: selection:hr.holidays.status,color_name:0
+msgid "Light Green"
+msgstr "薄緑"
+
+#. module: hr_holidays
+#: field:hr.employee,current_leave_id:0
+msgid "Current Leave Type"
+msgstr "現在の休暇タイプ"
+
+#. module: hr_holidays
+#: model:ir.actions.act_window,help:hr_holidays.open_ask_holidays
+msgid ""
+"Leave requests can be recorded by employees and validated by their managers. "
+"Once a leave request is validated, it appears automatically in the agenda of "
+"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
+msgid "Summary Of Leaves"
+msgstr "休暇の要約"
+
+#. module: hr_holidays
+#: selection:hr.employee,current_leave_state:0 view:hr.holidays:0
+#: selection:hr.holidays,state:0
+msgid "Approved"
+msgstr "承認済み"
+
+#. module: hr_holidays
+#: field:hr.employee,last_login:0
+msgid "Latest Connection"
+msgstr "最新の接続"
+
+#. module: hr_holidays
+#: view:hr.holidays:0
+msgid "Refuse"
+msgstr "拒否"
+
+#. module: hr_holidays
+#: code:addons/hr_holidays/hr_holidays.py:344
+#, python-format
+msgid ""
+"You cannot validate leaves for employee %s: too few remaining days (%s)."
+msgstr "この従業員 %s の休暇を承認できません：残りの休暇日数が足りません (%s)"
+
+#. module: hr_holidays
+#: help:hr.holidays,state:0
+msgid ""
+"The state is set to 'Draft', when a holiday request is created.            \n"
+"The state is 'Waiting Approval', when holiday request is confirmed by user.  "
+"          \n"
+"The state is 'Refused', when holiday request is refused by manager.          "
+"  \n"
+"The state is 'Approved', when holiday request is approved by manager."
+msgstr ""
+
+#. module: hr_holidays
+#: view:board.board:0
+#: model:ir.actions.act_window,name:hr_holidays.act_hr_employee_holiday_request
+#: model:ir.ui.menu,name:hr_holidays.menu_hr_reporting_holidays
+#: model:ir.ui.menu,name:hr_holidays.menu_open_ask_holidays
+msgid "Leaves"
+msgstr "休暇"
+
+#. module: hr_holidays
+#: model:ir.model,name:hr_holidays.model_hr_holidays
+msgid "Leave"
+msgstr "休暇"
+
+#. module: hr_holidays
+#: model:ir.ui.menu,name:hr_holidays.menu_request_approve_holidays
+msgid "Leave Requests to Approve"
+msgstr "休暇申請の承認"
+
+#. module: hr_holidays
+#: model:ir.ui.menu,name:hr_holidays.menu_account_central_journal
+msgid "Leaves by Department"
+msgstr "部門ごとの休暇"
+
+#. module: hr_holidays
+#: selection:hr.employee,current_leave_state:0 selection:hr.holidays,state:0
+msgid "Cancelled"
+msgstr "キャンセルされました。"
+
+#. module: hr_holidays
+#: help:hr.holidays,type:0
+msgid ""
+"Choose 'Leave Request' if someone wants to take an off-day. \n"
+"Choose 'Allocation Request' if you want to increase the number of leaves "
+"available for someone"
+msgstr ""
+"休暇を希望している人がいたら、「休暇申請」を選んでください。　\n"
+"誰かの休暇を増やすのであれば、「割当て申請」を選んでください。"
+
+#. module: hr_holidays
+#: help:hr.employee,remaining_leaves:0
+msgid ""
+"Total number of legal leaves allocated to this employee, change this value "
+"to create allocation/leave requests."
+msgstr "この従業員の法定休暇の日数です。割当て/休暇申請を指定するには、この値を変更して下さい。"
+
+#. module: hr_holidays
+#: view:hr.holidays.status:0
+msgid "Validation"
+msgstr "承認"
+
+#. module: hr_holidays
+#: code:addons/hr_holidays/hr_holidays.py:377
+#, python-format
+msgid "Warning !"
+msgstr "警告"
+
+#. module: hr_holidays
+#: field:hr.holidays.status,color_name:0
+msgid "Color in Report"
+msgstr "報告書の色"
+
+#. module: hr_holidays
+#: model:ir.model,name:hr_holidays.model_hr_holidays_summary_employee
+msgid "HR Holidays Summary Report By Employee"
+msgstr "従業員ごとの休暇要約報告書"
+
+#. module: hr_holidays
+#: help:hr.holidays,manager_id:0
+msgid "This area is automatically filled by the user who validate the leave"
+msgstr "この項目は、休暇を承認されたユーザによって自動的に入力されます。"
+
+#. module: hr_holidays
+#: field:hr.holidays,holiday_status_id:0
+#: field:hr.holidays.remaining.leaves.user,leave_type:0
+#: view:hr.holidays.status:0 field:hr.holidays.status,name:0
+#: field:hr.holidays.summary.dept,holiday_type:0
+#: model:ir.actions.act_window,name:hr_holidays.open_view_holiday_status
+#: model:ir.model,name:hr_holidays.model_hr_holidays_status
+#: model:ir.ui.menu,name:hr_holidays.menu_open_view_holiday_status
+msgid "Leave Type"
+msgstr "休暇タイプ"
+
+#. module: hr_holidays
+#: code:addons/hr_holidays/hr_holidays.py:199
+#: code:addons/hr_holidays/hr_holidays.py:344
+#, python-format
+msgid "Warning!"
+msgstr "警告"
+
+#. module: hr_holidays
+#: selection:hr.holidays.status,color_name:0
+msgid "Magenta"
+msgstr "赤紫色"
+
+#. module: hr_holidays
+#: code:addons/hr_holidays/wizard/hr_holidays_summary_department.py:44
+#, python-format
+msgid "You have to select at least 1 Department. And try again"
+msgstr "少なくとも一つの部門を指定して、やり直して下さい。"
+
+#. module: hr_holidays
+#: selection:hr.holidays.summary.dept,holiday_type:0
+#: selection:hr.holidays.summary.employee,holiday_type:0
+msgid "Confirmed"
+msgstr "確認済み"
+
+#. module: hr_holidays
+#: field:hr.holidays.summary.dept,date_from:0
+#: field:hr.holidays.summary.employee,date_from:0
+msgid "From"
+msgstr "から"
+
+#. module: hr_holidays
+#: view:hr.holidays:0
+msgid "Confirm"
+msgstr "確認"
+
+#. module: hr_holidays
+#: code:addons/hr_holidays/hr_holidays.py:384
+#, python-format
+msgid "Leave Request for %s"
+msgstr "%s の休暇申請"
+
+#. module: hr_holidays
+#: field:hr.holidays.status,remaining_leaves:0
+msgid "Remaining Leaves"
+msgstr "残りの休暇日数"
+
+#. module: hr_holidays
+#: view:hr.holidays:0 field:hr.holidays,state:0
+msgid "State"
+msgstr "状態"
+
+#. module: hr_holidays
+#: model:ir.model,name:hr_holidays.model_hr_holidays_remaining_leaves_user
+msgid "Total holidays by type"
+msgstr "タイプごとの休暇日数"
+
+#. module: hr_holidays
+#: view:hr.employee:0 view:hr.holidays:0 field:hr.holidays,employee_id:0
+#: field:hr.holidays.remaining.leaves.user,name:0
+#: model:ir.model,name:hr_holidays.model_hr_employee
+msgid "Employee"
+msgstr "従業員"
+
+#. module: hr_holidays
+#: selection:hr.employee,current_leave_state:0 selection:hr.holidays,state:0
+msgid "New"
+msgstr "新規"
+
+#. module: hr_holidays
+#: view:hr.holidays:0
+msgid "Type"
+msgstr "タイプ"
+
+#. module: hr_holidays
+#: selection:hr.holidays.status,color_name:0
+msgid "Red"
+msgstr "赤色"
+
+#. module: hr_holidays
+#: view:hr.holidays.remaining.leaves.user:0
+msgid "Leaves by Type"
+msgstr "タイプごとの休暇"
+
+#. module: hr_holidays
+#: selection:hr.holidays.status,color_name:0
+msgid "Light Salmon"
+msgstr "薄桃色"
+
+#. module: hr_holidays
+#: selection:hr.holidays.status,color_name:0
+msgid "Wheat"
+msgstr "小麦色"
+
+#. module: hr_holidays
+#: constraint:resource.calendar.leaves:0
+msgid "Error! leave start-date must be lower then leave end-date."
+msgstr "エラー。休暇開始日は休暇終了日の前でなければいけません。"
+
+#. module: hr_holidays
+#: code:addons/hr_holidays/hr_holidays.py:382
+#, python-format
+msgid "Allocation for %s"
+msgstr "%s の割当て"
+
+#. module: hr_holidays
+#: view:hr.holidays:0 field:hr.holidays,number_of_days:0
+#: field:hr.holidays,number_of_days_temp:0
+msgid "Number of Days"
+msgstr "日数"
+
+#. module: hr_holidays
+#: code:addons/hr_holidays/hr_holidays.py:377
+#, python-format
+msgid ""
+"The feature behind the field 'Remaining Legal Leaves' can only be used when "
+"there is only one leave type with the option 'Allow to Override Limit' "
+"unchecked. (%s Found). Otherwise, the update is ambiguous as we cannot "
+"decide on which leave type the update has to be done. \n"
+"You may prefer to use the classic menus 'Leave Requests' and 'Allocation "
+"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 ""
+
+#. module: hr_holidays
+#: view:hr.holidays.status:0
+msgid "Search Leave Type"
+msgstr "休暇タイプを検索"
+
+#. module: hr_holidays
+#: sql_constraint:hr.holidays:0
+msgid "You have to select an employee or a category"
+msgstr "従業員あるいはカテゴリーを選んで下さい。"
+
+#. module: hr_holidays
+#: help:hr.holidays.status,double_validation:0
+msgid ""
+"If its True then its Allocation/Request have to be validated by second "
+"validator"
+msgstr "これが正しいならば、その割当て / 申請は第2の承認者によって承認されなければなりません。"
+
+#. module: hr_holidays
+#: selection:hr.employee,current_leave_state:0 selection:hr.holidays,state:0
+msgid "Waiting Approval"
+msgstr "承認待ち"
+
+#. module: hr_holidays
+#: field:hr.holidays.summary.employee,emp:0
+msgid "Employee(s)"
+msgstr "従業員"
+
+#. module: hr_holidays
+#: help:hr.holidays.status,categ_id:0
+msgid ""
+"If you set a meeting type, OpenERP will create a meeting in the calendar "
+"once a leave is validated."
+msgstr "ミーティングのタイプを設定すると、休暇が承認されるとカレンダーにミーティングが設定されます。"
+
+#. module: hr_holidays
+#: field:hr.holidays,linked_request_ids:0
+msgid "Linked Requests"
+msgstr "連係を持った申請"
+
+#. module: hr_holidays
+#: field:hr.holidays,parent_id:0
+msgid "Parent"
+msgstr "上位"
+
+#. module: hr_holidays
+#: selection:hr.holidays.status,color_name:0
+msgid "Lavender"
+msgstr "薄紫色"
+
+#. module: hr_holidays
+#: view:hr.holidays:0
+msgid "Month"
+msgstr "月"
+
+#. module: hr_holidays
+#: view:hr.holidays:0
+#: model:ir.actions.act_window,name:hr_holidays.open_ask_holidays
+#: model:ir.ui.menu,name:hr_holidays.menu_open_ask_holidays_new
+msgid "Leave Requests"
+msgstr "休暇申請"
+
+#. module: hr_holidays
+#: field:hr.holidays.status,limit:0
+msgid "Allow to Override Limit"
+msgstr "限界を無効にする。"
+
+#. module: hr_holidays
+#: view:hr.holidays.summary.employee:0
+#: model:ir.actions.act_window,name:hr_holidays.action_hr_holidays_summary_employee
+msgid "Employee's Holidays"
+msgstr "従業員の休暇"
+
+#. module: hr_holidays
+#: view:hr.holidays:0 field:hr.holidays,category_id:0
+msgid "Category"
+msgstr "カテゴリー"
+
+#. module: hr_holidays
+#: help:hr.holidays.status,max_leaves:0
+msgid ""
+"This value is given by the sum of all holidays requests with a positive "
+"value."
+msgstr "この値は休暇申請の総計であり、正数です。"
+
+#. module: hr_holidays
+#: view:board.board:0
+msgid "All Employee Leaves"
+msgstr "全ての従業員の休暇"
+
+#. module: hr_holidays
+#: selection:hr.holidays.status,color_name:0
+msgid "Light Coral"
+msgstr "サンゴ色"
+
+#. module: hr_holidays
+#: view:hr.holidays.summary.dept:0
+#: model:ir.actions.act_window,name:hr_holidays.action_hr_holidays_summary_dept
+msgid "Holidays by Department"
+msgstr "部門ごとの休暇"
+
+#. module: hr_holidays
+#: selection:hr.holidays.status,color_name:0
+msgid "Black"
+msgstr "黒"
+
+#. module: hr_holidays
+#: model:ir.actions.act_window,name:hr_holidays.hr_holidays_leaves_assign_legal
+msgid "Allocate Leaves for Employees"
+msgstr "従業員に休暇を割当てる。"
+
+#. module: hr_holidays
+#: field:resource.calendar.leaves,holiday_id:0
+msgid "Holiday"
+msgstr "休暇"
+
+#. module: hr_holidays
+#: field:hr.holidays,case_id:0 field:hr.holidays.status,categ_id:0
+msgid "Meeting"
+msgstr "ミーティング"
+
+#. module: hr_holidays
+#: selection:hr.holidays.status,color_name:0
+msgid "Ivory"
+msgstr "象牙色"
+
+#. module: hr_holidays
+#: selection:hr.holidays.summary.dept,holiday_type:0
+#: selection:hr.holidays.summary.employee,holiday_type:0
+msgid "Both Validated and Confirmed"
+msgstr "承認済み，確認済み"
+
+#. module: hr_holidays
+#: field:hr.holidays.status,leaves_taken:0
+msgid "Leaves Already Taken"
+msgstr "休暇を取得済み"
+
+#. module: hr_holidays
+#: field:hr.holidays,user_id:0
+#: field:hr.holidays.remaining.leaves.user,user_id:0
+msgid "User"
+msgstr "ユーザ"
+
+#. module: hr_holidays
+#: sql_constraint:hr.holidays:0
+msgid "The start date must be before the end date !"
+msgstr "開始日は終了日の前でなければなりません。"
+
+#. module: hr_holidays
+#: field:hr.holidays.status,active:0
+msgid "Active"
+msgstr "有効"
+
+#. module: hr_holidays
+#: model:ir.actions.act_window,name:hr_holidays.action_view_holiday_status_manager_board
+msgid "Leaves To Validate"
+msgstr "承認すべき休暇"
+
+#. module: hr_holidays
+#: constraint:hr.employee:0
+msgid "Error ! You cannot create recursive Hierarchy of Employees."
+msgstr ""
+
+#. module: hr_holidays
+#: view:hr.employee:0 field:hr.employee,remaining_leaves:0
+msgid "Remaining Legal Leaves"
+msgstr ""
+
+#. module: hr_holidays
+#: field:hr.holidays,manager_id:0
+msgid "First Approval"
+msgstr ""
+
+#. module: hr_holidays
+#: model:hr.holidays.status,name:hr_holidays.holiday_status_unpaid
+msgid "Unpaid"
+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 ""
+
+#. module: hr_holidays
+#: view:hr.holidays:0
+msgid "Holidays during last month"
+msgstr ""
+
+#. module: hr_holidays
+#: code:addons/hr_holidays/wizard/hr_holidays_summary_department.py:44
+#, python-format
+msgid "Error"
+msgstr ""
+
+#. module: hr_holidays
+#: view:hr.employee:0
+msgid "Assign Leaves"
+msgstr ""
+
+#. module: hr_holidays
+#: selection:hr.holidays.status,color_name:0
+msgid "Light Blue"
+msgstr ""
+
+#. module: hr_holidays
+#: view:hr.holidays:0
+msgid "My Department Leaves"
+msgstr ""
+
+#. module: hr_holidays
+#: field:hr.employee,current_leave_state:0
+msgid "Current Leave Status"
+msgstr ""
+
+#. module: hr_holidays
+#: field:hr.holidays,type:0
+msgid "Request Type"
+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 ""
+
+#. module: hr_holidays
+#: view:hr.holidays.status:0
+msgid "Misc"
+msgstr ""
+
+#. module: hr_holidays
+#: view:hr.holidays:0
+msgid "General"
+msgstr ""
+
+#. module: hr_holidays
+#: model:hr.holidays.status,name:hr_holidays.holiday_status_comp
+msgid "Compensatory Days"
+msgstr ""
+
+#. module: hr_holidays
+#: view:hr.holidays:0 field:hr.holidays,notes:0
+msgid "Reasons"
+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 ""
+
+#. module: hr_holidays
+#: view:hr.holidays.summary.dept:0 view:hr.holidays.summary.employee:0
+msgid "Cancel"
+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 ""
+
+#. 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 ""
+
+#. module: hr_holidays
+#: view:hr.holidays:0 selection:hr.holidays,type:0
+msgid "Allocation Request"
+msgstr ""
+
+#. module: hr_holidays
+#: model:ir.model,name:hr_holidays.model_resource_calendar_leaves
+msgid "Leave Detail"
+msgstr ""
+
+#. module: hr_holidays
+#: field:hr.holidays,double_validation:0
+#: field:hr.holidays.status,double_validation:0
+msgid "Apply Double Validation"
+msgstr ""
+
+#. module: hr_holidays
+#: view:hr.holidays.summary.dept:0 view:hr.holidays.summary.employee:0
+msgid "Print"
+msgstr ""
+
+#. module: hr_holidays
+#: view:hr.holidays.status:0
+msgid "Details"
+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 ""
+
+#. module: hr_holidays
+#: selection:hr.holidays,holiday_type:0
+msgid "By Employee Category"
+msgstr ""
+
+#. module: hr_holidays
+#: view:hr.holidays:0 selection:hr.holidays,type:0
+msgid "Leave Request"
+msgstr ""
+
+#. module: hr_holidays
+#: field:hr.holidays,name:0
+msgid "Description"
+msgstr ""
+
+#. module: hr_holidays
+#: model:hr.holidays.status,name:hr_holidays.holiday_status_cl
+msgid "Legal Leaves"
+msgstr ""
+
+#. module: hr_holidays
+#: sql_constraint:hr.holidays:0
+msgid "The number of days must be greater than 0 !"
+msgstr ""
+
+#. 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 ""
+
+#. 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 ""
+
+#. module: hr_holidays
+#: view:hr.holidays:0
+msgid "Search Leave"
+msgstr ""
+
+#. module: hr_holidays
+#: field:hr.holidays.summary.employee,holiday_type:0
+msgid "Select Holiday Type"
+msgstr ""
+
+#. module: hr_holidays
+#: field:hr.holidays.remaining.leaves.user,no_of_leaves:0
+msgid "Remaining leaves"
+msgstr ""
+
+#. module: hr_holidays
+#: field:hr.holidays.summary.dept,depts:0
+msgid "Department(s)"
+msgstr ""
+
+#. module: hr_holidays
+#: field:hr.holidays,manager_id2:0
+msgid "Second Approval"
+msgstr ""
+
+#. module: hr_holidays
+#: field:hr.holidays,date_to:0
+msgid "End Date"
+msgstr ""
+
+#. module: hr_holidays
+#: model:hr.holidays.status,name:hr_holidays.holiday_status_sl
+msgid "Sick Leaves"
+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 ""
+
+#. 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 ""
+
+#. module: hr_holidays
+#: selection:hr.holidays.status,color_name:0
+msgid "Violet"
+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 ""
+
+#. module: hr_holidays
+#: field:hr.holidays.status,max_leaves:0
+msgid "Maximum Allowed"
+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 ""
+
+#. module: hr_holidays
+#: view:hr.holidays:0
+msgid "Mode"
+msgstr ""
+
+#. module: hr_holidays
+#: model:ir.model,name:hr_holidays.model_hr_holidays_summary_dept
+msgid "HR Holidays Summary Report By Department"
+msgstr ""
+
+#. module: hr_holidays
+#: view:hr.holidays:0
+msgid "Approve"
+msgstr ""
+
+#. module: hr_holidays
+#: view:hr.holidays:0 field:hr.holidays,date_from:0
+msgid "Start Date"
+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 ""
+
+#. module: hr_holidays
+#: selection:hr.holidays.status,color_name:0
+msgid "Light Yellow"
+msgstr ""
+
+#. module: hr_holidays
+#: selection:hr.holidays.status,color_name:0
+msgid "Light Pink"
+msgstr ""
+
+#. module: hr_holidays
+#: view:hr.holidays:0
+msgid "Manager"
+msgstr ""
+
+#. module: hr_holidays
+#: view:hr.holidays:0
+msgid "To Confirm"
+msgstr ""
+
+#. module: hr_holidays
+#: view:hr.holidays:0
+msgid "Year"
+msgstr ""
+
+#. module: hr_holidays
+#: view:hr.holidays:0
+msgid "To Approve"
+msgstr ""
diff --git a/addons/hr_payroll/i18n/ja.po b/addons/hr_payroll/i18n/ja.po
index 1d1144a8b6d..c2dafc55d82 100644
--- a/addons/hr_payroll/i18n/ja.po
+++ b/addons/hr_payroll/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 01:37+0100\n"
-"PO-Revision-Date: 2012-04-16 01:14+0000\n"
+"PO-Revision-Date: 2012-04-17 18:29+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-17 04:51+0000\n"
-"X-Generator: Launchpad (build 15099)\n"
+"X-Launchpad-Export-Date: 2012-04-18 04:42+0000\n"
+"X-Generator: Launchpad (build 15108)\n"
 
 #. module: hr_payroll
 #: field:hr.payslip.line,condition_select:0
@@ -81,7 +81,7 @@ msgstr "給与明細"
 #: field:hr.payroll.structure,parent_id:0
 #: field:hr.salary.rule.category,parent_id:0
 msgid "Parent"
-msgstr "親クラス"
+msgstr "上位"
 
 #. module: hr_payroll
 #: report:paylip.details:0 report:payslip:0
@@ -151,7 +151,7 @@ msgstr "作成"
 #: help:hr.payslip.line,amount_percentage_base:0
 #: help:hr.salary.rule,amount_percentage_base:0
 msgid "result will be affected to a variable"
-msgstr ""
+msgstr "結果は変数に影響します。"
 
 #. module: hr_payroll
 #: report:contribution.register.lines:0
@@ -381,7 +381,7 @@ msgstr "例えば、50%を適用するには50.0と入れてください。"
 #. module: hr_payroll
 #: field:hr.payslip,paid:0
 msgid "Made Payment Order ? "
-msgstr ""
+msgstr "支払いの処理をしましたか？ "
 
 #. module: hr_payroll
 #: report:contribution.register.lines:0
diff --git a/addons/hr_payroll_account/i18n/ja.po b/addons/hr_payroll_account/i18n/ja.po
index a7f75f49052..69aa0531675 100644
--- a/addons/hr_payroll_account/i18n/ja.po
+++ b/addons/hr_payroll_account/i18n/ja.po
@@ -8,19 +8,19 @@ 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-08 06:04+0000\n"
+"PO-Revision-Date: 2012-04-17 18:31+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-09 04:56+0000\n"
-"X-Generator: Launchpad (build 15060)\n"
+"X-Launchpad-Export-Date: 2012-04-18 04:42+0000\n"
+"X-Generator: Launchpad (build 15108)\n"
 
 #. module: hr_payroll_account
 #: field:hr.payslip,move_id:0
 msgid "Accounting Entry"
-msgstr ""
+msgstr "会計入力"
 
 #. module: hr_payroll_account
 #: field:hr.salary.rule,account_tax_id:0
@@ -69,7 +69,7 @@ msgstr "給与明細書"
 #. module: hr_payroll_account
 #: constraint:hr.payslip:0
 msgid "Payslip 'Date From' must be before 'Date To'."
-msgstr "給与明細書の「開始日付」は「終了日付」の前でなければいけません。"
+msgstr "給与明細書の「開始日」は「終了日」の前でなければいけません。"
 
 #. module: hr_payroll_account
 #: help:hr.payslip,period_id:0
diff --git a/addons/hr_recruitment/i18n/ja.po b/addons/hr_recruitment/i18n/ja.po
index 21f1898f8b4..9c1494d91fb 100644
--- a/addons/hr_recruitment/i18n/ja.po
+++ b/addons/hr_recruitment/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 01:37+0100\n"
-"PO-Revision-Date: 2012-04-15 03:51+0000\n"
+"PO-Revision-Date: 2012-04-17 18:35+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-16 04:41+0000\n"
-"X-Generator: Launchpad (build 15099)\n"
+"X-Launchpad-Export-Date: 2012-04-18 04:42+0000\n"
+"X-Generator: Launchpad (build 15108)\n"
 
 #. module: hr_recruitment
 #: help:hr.applicant,active:0
@@ -107,7 +107,7 @@ msgstr "この応募者のための業務を定義しなければいけません
 #. module: hr_recruitment
 #: view:hr.applicant:0
 msgid "Job"
-msgstr "仕事"
+msgstr "職務"
 
 #. module: hr_recruitment
 #: field:hr.recruitment.partner.create,close:0
@@ -401,7 +401,7 @@ msgstr "予定日"
 #: view:hr.applicant:0 field:hr.applicant,priority:0
 #: field:hr.recruitment.report,priority:0
 msgid "Appreciation"
-msgstr ""
+msgstr "好意的評価"
 
 #. module: hr_recruitment
 #: model:hr.recruitment.stage,name:hr_recruitment.stage_job1
@@ -732,7 +732,7 @@ msgstr "件名なし"
 #. module: hr_recruitment
 #: view:hr.applicant:0
 msgid "Status"
-msgstr ""
+msgstr "状態"
 
 #. module: hr_recruitment
 #: view:hr.applicant:0
@@ -956,7 +956,7 @@ msgstr "主題 / 応募者"
 #. module: hr_recruitment
 #: help:hr.recruitment.degree,sequence:0
 msgid "Gives the sequence order when displaying a list of degrees."
-msgstr ""
+msgstr "学位の一覧が表示されたら、順番を指定してください。"
 
 #. module: hr_recruitment
 #: view:hr.applicant:0 field:hr.applicant,user_id:0
diff --git a/addons/hr_timesheet/i18n/ja.po b/addons/hr_timesheet/i18n/ja.po
index 22afdfa529b..2757a826a06 100644
--- a/addons/hr_timesheet/i18n/ja.po
+++ b/addons/hr_timesheet/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:48+0000\n"
+"PO-Revision-Date: 2012-04-17 22:36+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-15 04:42+0000\n"
-"X-Generator: Launchpad (build 15070)\n"
+"X-Launchpad-Export-Date: 2012-04-18 04:41+0000\n"
+"X-Generator: Launchpad (build 15108)\n"
 
 #. module: hr_timesheet
 #: code:addons/hr_timesheet/report/user_timesheet.py:43
@@ -33,7 +33,7 @@ msgstr "（現在、空白）"
 #: code:addons/hr_timesheet/wizard/hr_timesheet_sign_in_out.py:132
 #, python-format
 msgid "No employee defined for your user !"
-msgstr "従業員はユーザとして定義されていません。"
+msgstr "このユーザには従業員が定義されていません。"
 
 #. module: hr_timesheet
 #: view:hr.analytic.timesheet:0
@@ -254,17 +254,17 @@ msgstr "開始日"
 #. module: hr_timesheet
 #: view:hr.employee:0
 msgid "Categories"
-msgstr "分類"
+msgstr "カテゴリ"
 
 #. module: hr_timesheet
 #: constraint:hr.analytic.timesheet:0
 msgid "You cannot modify an entry in a Confirmed/Done timesheet !."
-msgstr "確認済みの勤務表のエントリーを変更することはできません。"
+msgstr "確認済み/完了した勤務表の記入項目を変更することはできません。"
 
 #. module: hr_timesheet
 #: help:hr.employee,product_id:0
 msgid "Specifies employee's designation as a product with type 'service'."
-msgstr "従業員の割振りを「サービス」という商品項目で指定する。"
+msgstr "従業員の割当てを「サービス」という製品項目で指定する。"
 
 #. module: hr_timesheet
 #: view:hr.analytic.timesheet:0
@@ -283,7 +283,7 @@ msgstr "9月"
 #. module: hr_timesheet
 #: model:ir.model,name:hr_timesheet.model_hr_analytic_timesheet
 msgid "Timesheet Line"
-msgstr "タイムシートの行"
+msgstr "勤務表の行"
 
 #. module: hr_timesheet
 #: field:hr.analytical.timesheet.users,employee_ids:0
@@ -527,7 +527,7 @@ msgstr "この機能で月間勤務表を印刷できます。"
 #: view:hr.analytic.timesheet:0
 #: field:hr.employee,product_id:0
 msgid "Product"
-msgstr "商品"
+msgstr "製品"
 
 #. module: hr_timesheet
 #: view:hr.analytic.timesheet:0
@@ -602,6 +602,8 @@ msgid ""
 "No analytic account defined on the project.\n"
 "Please set one or we can not automatically fill the timesheet."
 msgstr ""
+"このプロジェクトには分析アカウントが定義されていません。\n"
+"これを設定しないと、勤務表を自動的に記録できません。"
 
 #. module: hr_timesheet
 #: view:account.analytic.account:0
diff --git a/addons/hr_timesheet_invoice/i18n/ja.po b/addons/hr_timesheet_invoice/i18n/ja.po
new file mode 100644
index 00000000000..c3c8afffa9e
--- /dev/null
+++ b/addons/hr_timesheet_invoice/i18n/ja.po
@@ -0,0 +1,1147 @@
+# 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-17 22:35+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-Generator: Launchpad (build 15108)\n"
+
+#. module: hr_timesheet_invoice
+#: view:report.timesheet.line:0
+#: view:report_timesheet.user:0
+msgid "Timesheet by user"
+msgstr "ユーザごとの勤務表"
+
+#. module: hr_timesheet_invoice
+#: view:report.timesheet.line:0
+msgid "Timesheet lines in this year"
+msgstr "今年度の勤務表の行"
+
+#. module: hr_timesheet_invoice
+#: view:hr_timesheet_invoice.factor:0
+msgid "Type of invoicing"
+msgstr "請求書のタイプ"
+
+#. module: hr_timesheet_invoice
+#: report:account.analytic.profit:0
+msgid "Profit"
+msgstr "利益"
+
+#. module: hr_timesheet_invoice
+#: model:ir.model,name:hr_timesheet_invoice.model_hr_timesheet_invoice_create_final
+msgid "Create invoice from timesheet final"
+msgstr "勤務表から請求書を作成"
+
+#. module: hr_timesheet_invoice
+#: view:hr.timesheet.invoice.create:0
+msgid "Force to use a specific product"
+msgstr "特定の製品を使うことを強制"
+
+#. module: hr_timesheet_invoice
+#: view:report.timesheet.line:0
+msgid "    7 Days    "
+msgstr "    7日    "
+
+#. module: hr_timesheet_invoice
+#: report:account.analytic.profit:0
+msgid "Income"
+msgstr "収益"
+
+#. module: hr_timesheet_invoice
+#: view:report_timesheet.account.date:0
+msgid "Daily Timesheets for this year"
+msgstr "今年度の日々の勤務表"
+
+#. module: hr_timesheet_invoice
+#: view:account.analytic.account:0
+msgid "Re-open project"
+msgstr "プロジェクトを再開"
+
+#. module: hr_timesheet_invoice
+#: model:ir.model,name:hr_timesheet_invoice.model_report_timesheet_user
+msgid "Timesheet per day"
+msgstr "日々の勤務表"
+
+#. module: hr_timesheet_invoice
+#: selection:report.account.analytic.line.to.invoice,month:0
+#: selection:report.timesheet.line,month:0
+#: selection:report_timesheet.account,month:0
+#: selection:report_timesheet.account.date,month:0
+#: selection:report_timesheet.user,month:0
+msgid "March"
+msgstr "3月"
+
+#. module: hr_timesheet_invoice
+#: field:hr.timesheet.invoice.create.final,name:0
+msgid "Name of entry"
+msgstr "入力の名称"
+
+#. module: hr_timesheet_invoice
+#: help:account.analytic.account,pricelist_id:0
+msgid ""
+"The product to invoice is defined on the employee form, the price will be "
+"deduced by this pricelist on the product."
+msgstr "製品と請求額は従業員票で定義します。価格は製品の価格リストによって割引されます。"
+
+#. module: hr_timesheet_invoice
+#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:129
+#, python-format
+msgid "You cannot modify an invoiced analytic line!"
+msgstr "請求書を発行済みの分析行を変更することはできません。"
+
+#. module: hr_timesheet_invoice
+#: model:ir.model,name:hr_timesheet_invoice.model_hr_timesheet_invoice_factor
+msgid "Invoice Rate"
+msgstr "請求書発行率"
+
+#. module: hr_timesheet_invoice
+#: view:report.account.analytic.line.to.invoice:0
+#: view:report.timesheet.line:0
+#: view:report_timesheet.account:0
+#: view:report_timesheet.account.date:0
+#: view:report_timesheet.user:0
+msgid "This Year"
+msgstr "今年度"
+
+#. module: hr_timesheet_invoice
+#: help:hr.timesheet.invoice.create.final,time:0
+msgid "Display time in the history of works"
+msgstr "作業履歴の時間を表示"
+
+#. module: hr_timesheet_invoice
+#: view:hr.timesheet.analytic.profit:0
+msgid "Journals"
+msgstr "ジャーナル"
+
+#. module: hr_timesheet_invoice
+#: view:report.timesheet.line:0
+#: field:report.timesheet.line,day:0
+msgid "Day"
+msgstr "日"
+
+#. module: hr_timesheet_invoice
+#: field:report.account.analytic.line.to.invoice,product_uom_id:0
+msgid "UoM"
+msgstr "測定単位"
+
+#. module: hr_timesheet_invoice
+#: view:report.timesheet.line:0
+msgid "Account"
+msgstr "アカウント"
+
+#. module: hr_timesheet_invoice
+#: field:hr.timesheet.invoice.create,time:0
+#: field:hr.timesheet.invoice.create.final,time:0
+msgid "Time spent"
+msgstr "所要時間"
+
+#. module: hr_timesheet_invoice
+#: field:account.analytic.account,amount_invoiced:0
+msgid "Invoiced Amount"
+msgstr "請求額"
+
+#. module: hr_timesheet_invoice
+#: view:report.timesheet.line:0
+msgid "Uninvoiced line with billing rate"
+msgstr "請求書を未発行率"
+
+#. module: hr_timesheet_invoice
+#: sql_constraint:account.invoice:0
+msgid "Invoice Number must be unique per Company!"
+msgstr "請求書番号は会社ごとにユニークでなければいけません。"
+
+#. module: hr_timesheet_invoice
+#: field:report_timesheet.invoice,account_id:0
+msgid "Project"
+msgstr "プロジェクト"
+
+#. module: hr_timesheet_invoice
+#: field:report.account.analytic.line.to.invoice,amount:0
+msgid "Amount"
+msgstr "金額"
+
+#. module: hr_timesheet_invoice
+#: sql_constraint:account.move.line:0
+msgid "Wrong credit or debit value in accounting entry !"
+msgstr "会計入力において貸方または借方の値が誤っています。"
+
+#. module: hr_timesheet_invoice
+#: help:hr.timesheet.invoice.create,name:0
+msgid "The detail of each work done will be displayed on the invoice"
+msgstr "請求書には各作業の詳細が表示されます。"
+
+#. module: hr_timesheet_invoice
+#: code:addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create.py:209
+#, python-format
+msgid "Warning !"
+msgstr "警告"
+
+#. module: hr_timesheet_invoice
+#: model:ir.model,name:hr_timesheet_invoice.model_hr_timesheet_invoice_create
+msgid "Create invoice from timesheet"
+msgstr "勤務表から請求書を作成"
+
+#. module: hr_timesheet_invoice
+#: report:account.analytic.profit:0
+msgid "Period to enddate"
+msgstr "終了日までの期間"
+
+#. module: hr_timesheet_invoice
+#: model:ir.model,name:hr_timesheet_invoice.model_report_analytic_account_close
+msgid "Analytic account to close"
+msgstr "終了する分析アカウント"
+
+#. module: hr_timesheet_invoice
+#: view:board.board:0
+msgid "Uninvoice Lines With Billing Rate"
+msgstr "課金率を持った請求書を未発効の行"
+
+#. module: hr_timesheet_invoice
+#: view:report.timesheet.line:0
+msgid "Group By..."
+msgstr "グループ化…"
+
+#. module: hr_timesheet_invoice
+#: constraint:account.invoice:0
+msgid "Invalid BBA Structured Communication !"
+msgstr "無効なBBA構造のコミュニケーション"
+
+#. module: hr_timesheet_invoice
+#: view:hr.timesheet.invoice.create:0
+msgid "Create Invoices"
+msgstr "請求書を作成"
+
+#. module: hr_timesheet_invoice
+#: model:ir.model,name:hr_timesheet_invoice.model_report_timesheet_account_date
+#: view:report_timesheet.account.date:0
+msgid "Daily timesheet per account"
+msgstr "アカウントごとの日々の請求書"
+
+#. module: hr_timesheet_invoice
+#: code:addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create.py:64
+#, python-format
+msgid "Analytic Account incomplete"
+msgstr "分析アカウントが未完成"
+
+#. module: hr_timesheet_invoice
+#: model:ir.model,name:hr_timesheet_invoice.model_account_analytic_account
+#: field:report.timesheet.line,account_id:0
+#: field:report_timesheet.account,account_id:0
+#: field:report_timesheet.account.date,account_id:0
+msgid "Analytic Account"
+msgstr "分析アカウント"
+
+#. module: hr_timesheet_invoice
+#: field:report.analytic.account.close,date_deadline:0
+msgid "Deadline"
+msgstr "期限"
+
+#. module: hr_timesheet_invoice
+#: model:ir.actions.act_window,name:hr_timesheet_invoice.act_my_account
+msgid "Accounts to invoice"
+msgstr "請求するアカウント"
+
+#. module: hr_timesheet_invoice
+#: field:report.analytic.account.close,partner_id:0
+msgid "Partner"
+msgstr "パートナ"
+
+#. module: hr_timesheet_invoice
+#: constraint:account.analytic.account:0
+msgid "Error! You can not create recursive analytic accounts."
+msgstr "エラー。反復した分析アカウントを作ることはできません"
+
+#. module: hr_timesheet_invoice
+#: help:hr.timesheet.invoice.create,time:0
+msgid "The time of each work done will be displayed on the invoice"
+msgstr "請求書には各作業の所要時間が表示されます。"
+
+#. module: hr_timesheet_invoice
+#: model:ir.actions.act_window,name:hr_timesheet_invoice.act_account_analytic_account_2_report_timehsheet_account
+msgid "Timesheets"
+msgstr "勤務表"
+
+#. module: hr_timesheet_invoice
+#: model:ir.model,name:hr_timesheet_invoice.model_hr_timesheet_analytic_cost_ledger
+msgid "hr.timesheet.analytic.cost.ledger"
+msgstr "hr.timesheet.analytic.cost.ledger"
+
+#. module: hr_timesheet_invoice
+#: field:hr.timesheet.analytic.profit,date_from:0
+msgid "From"
+msgstr "から"
+
+#. module: hr_timesheet_invoice
+#: report:account.analytic.profit:0
+msgid "User or Journal Name"
+msgstr "ユーザあるいはジャーナルの名称"
+
+#. module: hr_timesheet_invoice
+#: model:ir.actions.act_window,name:hr_timesheet_invoice.act_res_users_2_report_timesheet_invoice
+#: model:ir.actions.act_window,name:hr_timesheet_invoice.action_account_analytic_line_to_invoice
+#: model:ir.model,name:hr_timesheet_invoice.model_report_timesheet_invoice
+msgid "Costs to invoice"
+msgstr "請求書へ計上する経費"
+
+#. module: hr_timesheet_invoice
+#: view:report_timesheet.user:0
+msgid "Timesheet by user in this month"
+msgstr "今月のユーザごとの勤務表"
+
+#. module: hr_timesheet_invoice
+#: field:report.account.analytic.line.to.invoice,account_id:0
+#: field:report.analytic.account.close,name:0
+msgid "Analytic account"
+msgstr "分析アカウント"
+
+#. module: hr_timesheet_invoice
+#: field:report.analytic.account.close,state:0
+msgid "State"
+msgstr "状態"
+
+#. module: hr_timesheet_invoice
+#: code:addons/hr_timesheet_invoice/wizard/hr_timesheet_analytic_profit.py:58
+#, python-format
+msgid "Data Insufficient!"
+msgstr "日付の指定が足りません。"
+
+#. module: hr_timesheet_invoice
+#: report:hr.timesheet.invoice.account.analytic.account.cost_ledger:0
+msgid "Debit"
+msgstr "借方"
+
+#. module: hr_timesheet_invoice
+#: view:hr.timesheet.analytic.cost.ledger:0
+#: view:hr.timesheet.analytic.profit:0
+msgid "Print"
+msgstr "印刷"
+
+#. module: hr_timesheet_invoice
+#: help:account.analytic.line,to_invoice:0
+msgid "It allows to set the discount while making invoice"
+msgstr "請求書で割引を指定できます。"
+
+#. module: hr_timesheet_invoice
+#: help:hr.timesheet.invoice.create,price:0
+msgid ""
+"The cost of each work done will be displayed on the invoice. You probably "
+"don't want to check this"
+msgstr "各作業の経費を請求書に表示できます。チェックしなくても良いでしょう。"
+
+#. module: hr_timesheet_invoice
+#: view:hr.timesheet.invoice.create.final:0
+msgid "Force to use a special product"
+msgstr "特殊な製品を使うことを強制する。"
+
+#. module: hr_timesheet_invoice
+#: model:ir.actions.act_window,name:hr_timesheet_invoice.act_acc_analytic_acc_2_report_acc_analytic_line_to_invoice
+msgid "Lines to Invoice"
+msgstr "請求書の行"
+
+#. module: hr_timesheet_invoice
+#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:128
+#, python-format
+msgid "Error !"
+msgstr "エラー"
+
+#. module: hr_timesheet_invoice
+#: model:hr_timesheet_invoice.factor,name:hr_timesheet_invoice.timesheet_invoice_factor3
+msgid "Gratis"
+msgstr "無料"
+
+#. module: hr_timesheet_invoice
+#: view:account.analytic.line:0
+msgid "To Invoice"
+msgstr "請求書発行"
+
+#. module: hr_timesheet_invoice
+#: help:account.analytic.account,to_invoice:0
+msgid ""
+"Fill this field if you plan to automatically generate invoices based on the "
+"costs in this analytic account: timesheets, expenses, ...You can configure "
+"an automatic invoice rate on analytic accounts."
+msgstr ""
+"この分析アカウントで、経費に基づいて請求書を自動的に発行するのであれば、勤務表、経費…などの項目を入力してください。分析アカウントで請求書の自動発行を設定"
+"することができます。"
+
+#. module: hr_timesheet_invoice
+#: view:hr.timesheet.analytic.profit:0
+#: model:ir.actions.act_window,name:hr_timesheet_invoice.action_hr_timesheet_analytic_profit
+#: model:ir.actions.report.xml,name:hr_timesheet_invoice.report_analytical_profit
+#: model:ir.ui.menu,name:hr_timesheet_invoice.menu_hr_timesheet_analytic_profit
+msgid "Timesheet Profit"
+msgstr "勤務表における利益"
+
+#. module: hr_timesheet_invoice
+#: code:addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create.py:68
+#, python-format
+msgid "Partner incomplete"
+msgstr "パートナが指定されていません。"
+
+#. module: hr_timesheet_invoice
+#: help:hr.timesheet.invoice.create.final,name:0
+msgid "Display detail of work in the invoice line."
+msgstr "請求行の作業の詳細を表示"
+
+#. module: hr_timesheet_invoice
+#: selection:report.account.analytic.line.to.invoice,month:0
+#: selection:report.timesheet.line,month:0
+#: selection:report_timesheet.account,month:0
+#: selection:report_timesheet.account.date,month:0
+#: selection:report_timesheet.user,month:0
+msgid "July"
+msgstr "7月"
+
+#. module: hr_timesheet_invoice
+#: report:hr.timesheet.invoice.account.analytic.account.cost_ledger:0
+msgid "Printing date"
+msgstr "印刷日"
+
+#. module: hr_timesheet_invoice
+#: model:ir.actions.act_window,name:hr_timesheet_invoice.action_hr_analytic_timesheet_open_tree
+#: model:ir.ui.menu,name:hr_timesheet_invoice.menu_hr_analytic_timesheet_tree
+msgid "Bill Tasks Works"
+msgstr "課金が"
+
+#. module: hr_timesheet_invoice
+#: model:ir.actions.act_window,name:hr_timesheet_invoice.action_hr_timesheet_invoice_factor_form
+#: model:ir.ui.menu,name:hr_timesheet_invoice.hr_timesheet_invoice_factor_view
+msgid "Types of Invoicing"
+msgstr "請求書の種類"
+
+#. module: hr_timesheet_invoice
+#: report:account.analytic.profit:0
+msgid "Theorical"
+msgstr "理論上"
+
+#. module: hr_timesheet_invoice
+#: code:addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create.py:132
+#, python-format
+msgid "Configuration Error"
+msgstr "設定エラー"
+
+#. module: hr_timesheet_invoice
+#: model:ir.model,name:hr_timesheet_invoice.model_report_account_analytic_line_to_invoice
+msgid "Analytic lines to invoice report"
+msgstr "請求書への分析行"
+
+#. module: hr_timesheet_invoice
+#: field:account.analytic.account,to_invoice:0
+msgid "Invoice on Timesheet & Costs"
+msgstr "勤務表と経費の請求書"
+
+#. module: hr_timesheet_invoice
+#: model:ir.actions.act_window,name:hr_timesheet_invoice.action_timesheet_user_stat_all
+msgid "Timesheet by User"
+msgstr "ユーザごとの勤務表"
+
+#. module: hr_timesheet_invoice
+#: model:ir.actions.act_window,name:hr_timesheet_invoice.action_timesheet_invoice_stat_all
+msgid "Timesheet by Invoice"
+msgstr "請求書ごとの勤務表"
+
+#. module: hr_timesheet_invoice
+#: model:ir.actions.act_window,name:hr_timesheet_invoice.action_analytic_account_tree
+#: view:report.analytic.account.close:0
+msgid "Expired analytic accounts"
+msgstr "期限切れの分析カウント"
+
+#. module: hr_timesheet_invoice
+#: field:hr_timesheet_invoice.factor,factor:0
+msgid "Discount (%)"
+msgstr "割引 (%)"
+
+#. module: hr_timesheet_invoice
+#: model:hr_timesheet_invoice.factor,name:hr_timesheet_invoice.timesheet_invoice_factor1
+msgid "Yes (100%)"
+msgstr "はい (100%)"
+
+#. module: hr_timesheet_invoice
+#: code:addons/hr_timesheet_invoice/wizard/hr_timesheet_final_invoice_create.py:55
+#: code:addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create.py:220
+#, python-format
+msgid "Invoices"
+msgstr "請求書"
+
+#. module: hr_timesheet_invoice
+#: selection:report.account.analytic.line.to.invoice,month:0
+#: selection:report.timesheet.line,month:0
+#: selection:report_timesheet.account,month:0
+#: selection:report_timesheet.account.date,month:0
+#: selection:report_timesheet.user,month:0
+msgid "December"
+msgstr "12月"
+
+#. module: hr_timesheet_invoice
+#: view:hr.timesheet.invoice.create.final:0
+msgid "Invoice contract"
+msgstr "請求書の連絡先"
+
+#. module: hr_timesheet_invoice
+#: 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: hr_timesheet_invoice
+#: field:report.account.analytic.line.to.invoice,month:0
+#: view:report.timesheet.line:0
+#: field:report.timesheet.line,month:0
+#: field:report_timesheet.account,month:0
+#: field:report_timesheet.account.date,month:0
+#: field:report_timesheet.user,month:0
+msgid "Month"
+msgstr "月"
+
+#. module: hr_timesheet_invoice
+#: report:account.analytic.profit:0
+msgid "Currency"
+msgstr "通貨"
+
+#. module: hr_timesheet_invoice
+#: model:ir.model,name:hr_timesheet_invoice.model_account_move_line
+msgid "Journal Items"
+msgstr "仕訳項目"
+
+#. module: hr_timesheet_invoice
+#: help:hr.timesheet.invoice.create,product:0
+msgid ""
+"Complete this field only if you want to force to use a specific product. "
+"Keep empty to use the real product that comes from the cost."
+msgstr "特定の製品を使うのであれば、この項目を完成させて下さい。経費でしたい製品を使うのであれば、空欄にして下さい。"
+
+#. module: hr_timesheet_invoice
+#: view:hr.timesheet.analytic.profit:0
+msgid "Users"
+msgstr "ユーザ"
+
+#. module: hr_timesheet_invoice
+#: view:report.timesheet.line:0
+msgid "Non Assigned timesheets to users"
+msgstr "ユーザに割り当てられていない勤務表"
+
+#. module: hr_timesheet_invoice
+#: view:account.analytic.line:0
+#: field:report.timesheet.line,invoice_id:0
+msgid "Invoiced"
+msgstr "請求済み"
+
+#. module: hr_timesheet_invoice
+#: field:report.analytic.account.close,quantity_max:0
+msgid "Max. Quantity"
+msgstr "最大数"
+
+#. module: hr_timesheet_invoice
+#: 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: hr_timesheet_invoice
+#: code:addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create.py:132
+#, python-format
+msgid "No income account defined for product '%s'"
+msgstr "製品 '%s' の収益アカウントが定義されていません。"
+
+#. module: hr_timesheet_invoice
+#: report:account.analytic.profit:0
+msgid "Invoice rate by user"
+msgstr "ユーザごとの請求書率"
+
+#. module: hr_timesheet_invoice
+#: view:report_timesheet.account:0
+msgid "Timesheet by account"
+msgstr "アカウントごとの勤務表"
+
+#. module: hr_timesheet_invoice
+#: view:account.analytic.account:0
+msgid "Pending"
+msgstr "保留"
+
+#. module: hr_timesheet_invoice
+#: help:account.analytic.account,amount_invoiced:0
+msgid "Total invoiced"
+msgstr "全ての請求済み"
+
+#. module: hr_timesheet_invoice
+#: report:hr.timesheet.invoice.account.analytic.account.cost_ledger:0
+msgid "Period to"
+msgstr "期間まで"
+
+#. module: hr_timesheet_invoice
+#: model:ir.model,name:hr_timesheet_invoice.model_account_analytic_line
+msgid "Analytic Line"
+msgstr "分析行"
+
+#. module: hr_timesheet_invoice
+#: selection:report.account.analytic.line.to.invoice,month:0
+#: selection:report.timesheet.line,month:0
+#: selection:report_timesheet.account,month:0
+#: selection:report_timesheet.account.date,month:0
+#: selection:report_timesheet.user,month:0
+msgid "August"
+msgstr "8月"
+
+#. module: hr_timesheet_invoice
+#: report:hr.timesheet.invoice.account.analytic.account.cost_ledger:0
+#: model:ir.actions.act_window,name:hr_timesheet_invoice.action_hr_timesheet_invoice_cost_ledger
+#: model:ir.actions.report.xml,name:hr_timesheet_invoice.account_analytic_account_cost_ledger
+msgid "Cost Ledger"
+msgstr "経費台帳"
+
+#. module: hr_timesheet_invoice
+#: selection:report.account.analytic.line.to.invoice,month:0
+#: selection:report.timesheet.line,month:0
+#: selection:report_timesheet.account,month:0
+#: selection:report_timesheet.account.date,month:0
+#: selection:report_timesheet.user,month:0
+msgid "October"
+msgstr "10月"
+
+#. module: hr_timesheet_invoice
+#: model:hr_timesheet_invoice.factor,name:hr_timesheet_invoice.timesheet_invoice_factor2
+msgid "50%"
+msgstr "50%"
+
+#. module: hr_timesheet_invoice
+#: selection:report.account.analytic.line.to.invoice,month:0
+#: selection:report.timesheet.line,month:0
+#: selection:report_timesheet.account,month:0
+#: selection:report_timesheet.account.date,month:0
+#: selection:report_timesheet.user,month:0
+msgid "June"
+msgstr "6月"
+
+#. module: hr_timesheet_invoice
+#: help:hr.timesheet.invoice.create.final,date:0
+msgid "Display date in the history of works"
+msgstr "作業履歴の日付を表示"
+
+#. module: hr_timesheet_invoice
+#: model:ir.model,name:hr_timesheet_invoice.model_report_timesheet_account
+#: view:report_timesheet.account:0
+msgid "Timesheet per account"
+msgstr "アカウントごとの勤務表"
+
+#. module: hr_timesheet_invoice
+#: model:ir.actions.act_window,name:hr_timesheet_invoice.action_timesheet_account_stat_all
+msgid "Timesheet by Account"
+msgstr "アカウントごとの勤務表"
+
+#. module: hr_timesheet_invoice
+#: field:hr.timesheet.invoice.create,date:0
+#: field:hr.timesheet.invoice.create.final,date:0
+#: field:report.timesheet.line,date:0
+msgid "Date"
+msgstr "日付"
+
+#. module: hr_timesheet_invoice
+#: code:addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create.py:69
+#, python-format
+msgid "Please fill in the Address field in the Partner: %s."
+msgstr "パートナ %s の住所を入力して下さい。"
+
+#. module: hr_timesheet_invoice
+#: selection:report.account.analytic.line.to.invoice,month:0
+#: selection:report.timesheet.line,month:0
+#: selection:report_timesheet.account,month:0
+#: selection:report_timesheet.account.date,month:0
+#: selection:report_timesheet.user,month:0
+msgid "November"
+msgstr "11月"
+
+#. module: hr_timesheet_invoice
+#: view:report.timesheet.line:0
+msgid "Extended Filters..."
+msgstr "拡張フィルタ…"
+
+#. module: hr_timesheet_invoice
+#: field:report_timesheet.invoice,amount_invoice:0
+msgid "To invoice"
+msgstr "請求書発行"
+
+#. module: hr_timesheet_invoice
+#: report:account.analytic.profit:0
+msgid "Eff."
+msgstr "有効"
+
+#. module: hr_timesheet_invoice
+#: field:hr.timesheet.analytic.profit,employee_ids:0
+#: view:report.timesheet.line:0
+#: field:report.timesheet.line,user_id:0
+#: field:report_timesheet.account,user_id:0
+#: field:report_timesheet.account.date,user_id:0
+#: field:report_timesheet.invoice,user_id:0
+#: field:report_timesheet.user,user_id:0
+msgid "User"
+msgstr "ユーザ"
+
+#. module: hr_timesheet_invoice
+#: report:hr.timesheet.invoice.account.analytic.account.cost_ledger:0
+msgid "J.C. /Move name"
+msgstr "職務カテゴリ / 氏名を移す"
+
+#. module: hr_timesheet_invoice
+#: report:hr.timesheet.invoice.account.analytic.account.cost_ledger:0
+msgid "Total:"
+msgstr "合計:"
+
+#. module: hr_timesheet_invoice
+#: selection:report.account.analytic.line.to.invoice,month:0
+#: selection:report.timesheet.line,month:0
+#: selection:report_timesheet.account,month:0
+#: selection:report_timesheet.account.date,month:0
+#: selection:report_timesheet.user,month:0
+msgid "January"
+msgstr "1月"
+
+#. module: hr_timesheet_invoice
+#: constraint:account.move.line:0
+msgid "You can not create journal items on closed account."
+msgstr "閉じたアカウントには仕訳項目を作ることはできません。"
+
+#. module: hr_timesheet_invoice
+#: report:hr.timesheet.invoice.account.analytic.account.cost_ledger:0
+msgid "Credit"
+msgstr "貸勘定"
+
+#. module: hr_timesheet_invoice
+#: code:addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create.py:108
+#, python-format
+msgid "Error"
+msgstr "エラー"
+
+#. module: hr_timesheet_invoice
+#: field:hr.timesheet.analytic.cost.ledger,date2:0
+msgid "End of period"
+msgstr "期末"
+
+#. module: hr_timesheet_invoice
+#: view:hr.timesheet.invoice.create.final:0
+msgid "Do you want to display work details on the invoice ?"
+msgstr "この請求書の作業明細を表示しますか。"
+
+#. module: hr_timesheet_invoice
+#: report:hr.timesheet.invoice.account.analytic.account.cost_ledger:0
+#: field:report.analytic.account.close,balance:0
+msgid "Balance"
+msgstr "残高"
+
+#. module: hr_timesheet_invoice
+#: constraint:account.move.line:0
+msgid "You can not create journal items on an account of type view."
+msgstr "閲覧タイプのアカウントでは仕訳項目を作ることはできません。"
+
+#. module: hr_timesheet_invoice
+#: field:report.analytic.account.close,quantity:0
+#: view:report.timesheet.line:0
+#: field:report.timesheet.line,quantity:0
+#: field:report_timesheet.account,quantity:0
+#: field:report_timesheet.account.date,quantity:0
+#: field:report_timesheet.invoice,quantity:0
+#: field:report_timesheet.user,quantity:0
+msgid "Quantity"
+msgstr "数量"
+
+#. module: hr_timesheet_invoice
+#: report:hr.timesheet.invoice.account.analytic.account.cost_ledger:0
+msgid "Date/Code"
+msgstr "日付 / コード"
+
+#. module: hr_timesheet_invoice
+#: field:report.timesheet.line,general_account_id:0
+msgid "General Account"
+msgstr "一般アカウント"
+
+#. module: hr_timesheet_invoice
+#: model:ir.model,name:hr_timesheet_invoice.model_hr_timesheet_analytic_profit
+msgid "Print Timesheet Profit"
+msgstr "勤務表プロファイルの印刷"
+
+#. module: hr_timesheet_invoice
+#: report:account.analytic.profit:0
+msgid "Totals:"
+msgstr "合計:"
+
+#. module: hr_timesheet_invoice
+#: view:hr.timesheet.invoice.create:0
+msgid "Do you want to show details of work in invoice ?"
+msgstr "請求書の作業明細を表示しますか？"
+
+#. module: hr_timesheet_invoice
+#: report:hr.timesheet.invoice.account.analytic.account.cost_ledger:0
+msgid "Period from"
+msgstr "期間の開始日"
+
+#. module: hr_timesheet_invoice
+#: field:account.analytic.account,amount_max:0
+msgid "Max. Invoice Price"
+msgstr "最大請求価格"
+
+#. module: hr_timesheet_invoice
+#: selection:report.account.analytic.line.to.invoice,month:0
+#: selection:report.timesheet.line,month:0
+#: selection:report_timesheet.account,month:0
+#: selection:report_timesheet.account.date,month:0
+#: selection:report_timesheet.user,month:0
+msgid "September"
+msgstr "9月"
+
+#. module: hr_timesheet_invoice
+#: constraint:account.analytic.line:0
+msgid "You can not create analytic line on view account."
+msgstr "閲覧アカウントでは分析行を作ることはできません。"
+
+#. module: hr_timesheet_invoice
+#: field:account.analytic.line,invoice_id:0
+#: model:ir.model,name:hr_timesheet_invoice.model_account_invoice
+#: view:report.timesheet.line:0
+msgid "Invoice"
+msgstr "請求書"
+
+#. module: hr_timesheet_invoice
+#: constraint:hr.analytic.timesheet:0
+msgid "You cannot modify an entry in a Confirmed/Done timesheet !."
+msgstr "確認済み/完了した勤務表の記入項目を変更することはできません。"
+
+#. module: hr_timesheet_invoice
+#: view:account.analytic.account:0
+#: view:hr.timesheet.analytic.cost.ledger:0
+#: view:hr.timesheet.analytic.profit:0
+#: view:hr.timesheet.invoice.create:0
+#: view:hr.timesheet.invoice.create.final:0
+msgid "Cancel"
+msgstr "キャンセル"
+
+#. module: hr_timesheet_invoice
+#: view:account.analytic.account:0
+msgid "Close"
+msgstr "閉じる"
+
+#. module: hr_timesheet_invoice
+#: help:hr.timesheet.invoice.create.final,price:0
+msgid "Display cost of the item you reinvoice"
+msgstr "再請求した項目の経費を表示"
+
+#. module: hr_timesheet_invoice
+#: model:ir.actions.act_window,help:hr_timesheet_invoice.action_hr_timesheet_invoice_factor_form
+msgid ""
+"OpenERP allows you to create default invoicing types. You might have to "
+"regularly assign discounts because of a specific contract or agreement with "
+"a customer. From this menu, you can create additional types of invoicing to "
+"speed up your invoicing."
+msgstr ""
+"デフォルトの請求タイプを作ることができます。顧客との契約あるいは取決めに基づいて、割引を定期的に指定する必要があるでしょう。このメニューで追加の請求の定義"
+"を作っておくと請求書作成が簡便になります。"
+
+#. module: hr_timesheet_invoice
+#: model:ir.actions.act_window,name:hr_timesheet_invoice.action_timesheet_line_stat_all
+#: model:ir.model,name:hr_timesheet_invoice.model_hr_analytic_timesheet
+#: model:ir.model,name:hr_timesheet_invoice.model_report_timesheet_line
+#: view:report.timesheet.line:0
+msgid "Timesheet Line"
+msgstr "勤務表の行"
+
+#. module: hr_timesheet_invoice
+#: view:hr.timesheet.invoice.create:0
+msgid "Billing Data"
+msgstr "請求日"
+
+#. module: hr_timesheet_invoice
+#: code:addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create.py:65
+#, python-format
+msgid ""
+"Please fill in the Partner or Customer and Sale Pricelist fields in the "
+"Analytic Account:\n"
+"%s"
+msgstr ""
+"分析アカウントで、パートナあるいは顧客と販売価格を入力してください。\n"
+"%s"
+
+#. module: hr_timesheet_invoice
+#: constraint:account.move.line:0
+msgid "Company must be the same for its related account and period."
+msgstr "会社は関連するアカウントと期間に同じでなければなりません。"
+
+#. module: hr_timesheet_invoice
+#: help:hr_timesheet_invoice.factor,customer_name:0
+msgid "Label for the customer"
+msgstr "顧客のラベル"
+
+#. module: hr_timesheet_invoice
+#: field:hr.timesheet.analytic.profit,date_to:0
+msgid "To"
+msgstr "まで"
+
+#. module: hr_timesheet_invoice
+#: view:hr.timesheet.invoice.create:0
+#: view:hr.timesheet.invoice.create.final:0
+#: model:ir.actions.act_window,name:hr_timesheet_invoice.action_hr_timesheet_invoice_create
+#: model:ir.actions.act_window,name:hr_timesheet_invoice.action_hr_timesheet_invoice_create_final
+msgid "Create Invoice"
+msgstr "請求書作成"
+
+#. module: hr_timesheet_invoice
+#: code:addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create.py:108
+#, python-format
+msgid "At least one line has no product !"
+msgstr "製品が指定されていない行があります。"
+
+#. module: hr_timesheet_invoice
+#: help:hr.timesheet.invoice.create,date:0
+msgid "The real date of each work will be displayed on the invoice"
+msgstr "作業の実日付が請求書に表示されます。"
+
+#. module: hr_timesheet_invoice
+#: field:account.analytic.account,pricelist_id:0
+msgid "Customer Pricelist"
+msgstr "顧客の価格リスト"
+
+#. module: hr_timesheet_invoice
+#: view:report_timesheet.invoice:0
+msgid "Timesheets to invoice"
+msgstr "請求する勤務表"
+
+#. module: hr_timesheet_invoice
+#: field:hr.timesheet.analytic.cost.ledger,date1:0
+msgid "Start of period"
+msgstr "期間の開始"
+
+#. module: hr_timesheet_invoice
+#: model:ir.actions.act_window,name:hr_timesheet_invoice.action_timesheet_account_date_stat_all
+msgid "Daily Timesheet by Account"
+msgstr "アカウントごとの日々の勤務表"
+
+#. module: hr_timesheet_invoice
+#: field:hr.timesheet.invoice.create,product:0
+#: field:hr.timesheet.invoice.create.final,product:0
+#: field:report.account.analytic.line.to.invoice,product_id:0
+#: view:report.timesheet.line:0
+#: field:report.timesheet.line,product_id:0
+msgid "Product"
+msgstr "製品"
+
+#. module: hr_timesheet_invoice
+#: model:ir.actions.act_window,name:hr_timesheet_invoice.action_timesheet_uninvoiced_line
+msgid "Uninvoice lines with billing rate"
+msgstr "請求料率を持つ未請求の行"
+
+#. module: hr_timesheet_invoice
+#: report:account.analytic.profit:0
+msgid "%"
+msgstr "%"
+
+#. module: hr_timesheet_invoice
+#: field:hr_timesheet_invoice.factor,name:0
+msgid "Internal name"
+msgstr "内部の名称"
+
+#. module: hr_timesheet_invoice
+#: selection:report.account.analytic.line.to.invoice,month:0
+#: selection:report.timesheet.line,month:0
+#: selection:report_timesheet.account,month:0
+#: selection:report_timesheet.account.date,month:0
+#: selection:report_timesheet.user,month:0
+msgid "May"
+msgstr "5月"
+
+#. module: hr_timesheet_invoice
+#: field:hr.timesheet.analytic.profit,journal_ids:0
+msgid "Journal"
+msgstr "仕訳"
+
+#. module: hr_timesheet_invoice
+#: help:hr.timesheet.invoice.create.final,product:0
+msgid "The product that will be used to invoice the remaining amount"
+msgstr "残高の請求に使われる製品"
+
+#. module: hr_timesheet_invoice
+#: model:ir.actions.act_window,help:hr_timesheet_invoice.action_hr_analytic_timesheet_open_tree
+msgid ""
+"This list shows you every task you can invoice to the customer. Select the "
+"lines and click the Action button to generate the invoices automatically."
+msgstr "この票は、顧客への請求できる処理を示します。行を指定してアクション・ボタンをクリックすると、請求書は自動的に作成されます。"
+
+#. module: hr_timesheet_invoice
+#: view:report_timesheet.account.date:0
+msgid "Daily Timesheets of this month"
+msgstr "今月の日々の勤務表"
+
+#. module: hr_timesheet_invoice
+#: code:addons/hr_timesheet_invoice/wizard/hr_timesheet_analytic_profit.py:58
+#, python-format
+msgid "No Records Found for Report!"
+msgstr "報告書のためのレコードがありません。"
+
+#. module: hr_timesheet_invoice
+#: help:account.analytic.account,amount_max:0
+msgid "Keep empty if this contract is not limited to a total fixed price."
+msgstr "この契約が合計の固定価格に達していなければ、空白にしておいて下さい。"
+
+#. module: hr_timesheet_invoice
+#: view:report_timesheet.invoice:0
+msgid "Timesheet by invoice"
+msgstr "請求のための勤務表"
+
+#. module: hr_timesheet_invoice
+#: view:report.account.analytic.line.to.invoice:0
+#: view:report.timesheet.line:0
+#: view:report_timesheet.account:0
+#: view:report_timesheet.account.date:0
+#: view:report_timesheet.user:0
+msgid "This Month"
+msgstr "今月"
+
+#. module: hr_timesheet_invoice
+#: view:hr.timesheet.analytic.cost.ledger:0
+msgid "Select Period"
+msgstr "指定した期間"
+
+#. module: hr_timesheet_invoice
+#: report:account.analytic.profit:0
+msgid "Period from startdate"
+msgstr "開始日からの経過期間"
+
+#. module: hr_timesheet_invoice
+#: selection:report.account.analytic.line.to.invoice,month:0
+#: selection:report.timesheet.line,month:0
+#: selection:report_timesheet.account,month:0
+#: selection:report_timesheet.account.date,month:0
+#: selection:report_timesheet.user,month:0
+msgid "February"
+msgstr "2月"
+
+#. module: hr_timesheet_invoice
+#: field:hr_timesheet_invoice.factor,customer_name:0
+msgid "Name"
+msgstr "氏名"
+
+#. module: hr_timesheet_invoice
+#: view:report_timesheet.account.date:0
+msgid "Daily timesheet by account"
+msgstr "アカウントごとの日々の勤務表"
+
+#. module: hr_timesheet_invoice
+#: field:report.account.analytic.line.to.invoice,sale_price:0
+msgid "Sale price"
+msgstr "販売価格"
+
+#. module: hr_timesheet_invoice
+#: model:ir.actions.act_window,name:hr_timesheet_invoice.act_res_users_2_report_timesheet_user
+msgid "Timesheets per day"
+msgstr "日ごとの勤務表"
+
+#. module: hr_timesheet_invoice
+#: selection:report.account.analytic.line.to.invoice,month:0
+#: selection:report.timesheet.line,month:0
+#: selection:report_timesheet.account,month:0
+#: selection:report_timesheet.account.date,month:0
+#: selection:report_timesheet.user,month:0
+msgid "April"
+msgstr "4月"
+
+#. module: hr_timesheet_invoice
+#: view:account.analytic.account:0
+msgid "Invoicing Data"
+msgstr "請求日"
+
+#. module: hr_timesheet_invoice
+#: help:hr_timesheet_invoice.factor,factor:0
+msgid "Discount in percentage"
+msgstr "割引パーセント"
+
+#. module: hr_timesheet_invoice
+#: code:addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create.py:209
+#, python-format
+msgid "Invoice is already linked to some of the analytic line(s)!"
+msgstr "請求は既に分析行に連携されています。"
+
+#. module: hr_timesheet_invoice
+#: view:hr_timesheet_invoice.factor:0
+msgid "Types of invoicing"
+msgstr "請求タイプ"
+
+#. module: hr_timesheet_invoice
+#: model:ir.actions.act_window,name:hr_timesheet_invoice.act_res_users_2_report_timehsheet_account
+msgid "Timesheets per account"
+msgstr "アカウントごとの勤務表"
+
+#. module: hr_timesheet_invoice
+#: field:hr.timesheet.invoice.create,name:0
+msgid "Description"
+msgstr "詳細"
+
+#. module: hr_timesheet_invoice
+#: report:account.analytic.profit:0
+#: field:report.account.analytic.line.to.invoice,unit_amount:0
+msgid "Units"
+msgstr "単位"
+
+#. module: hr_timesheet_invoice
+#: view:report_timesheet.user:0
+msgid "Timesheet by user in this year"
+msgstr "今年度のユーザごとの勤務表"
+
+#. module: hr_timesheet_invoice
+#: field:account.analytic.line,to_invoice:0
+msgid "Type of Invoicing"
+msgstr "請求のタイプ"
+
+#. module: hr_timesheet_invoice
+#: view:report.account.analytic.line.to.invoice:0
+msgid "Analytic Lines to Invoice"
+msgstr "請求すべき分析行"
+
+#. module: hr_timesheet_invoice
+#: view:report.timesheet.line:0
+msgid "Timesheet lines in this month"
+msgstr "今月の勤務表の行"
+
+#. module: hr_timesheet_invoice
+#: view:account.analytic.account:0
+msgid "Invoicing Statistics"
+msgstr "請求の統計"
+
+#. module: hr_timesheet_invoice
+#: field:report_timesheet.invoice,manager_id:0
+msgid "Manager"
+msgstr "マネジャ"
+
+#. module: hr_timesheet_invoice
+#: report:account.analytic.profit:0
+#: field:hr.timesheet.invoice.create,price:0
+#: field:hr.timesheet.invoice.create.final,price:0
+#: view:report.timesheet.line:0
+#: field:report.timesheet.line,cost:0
+#: field:report_timesheet.user,cost:0
+msgid "Cost"
+msgstr "経費"
+
+#. module: hr_timesheet_invoice
+#: field:report.account.analytic.line.to.invoice,name:0
+#: view:report.timesheet.line:0
+#: field:report.timesheet.line,name:0
+#: field:report_timesheet.account,name:0
+#: field:report_timesheet.account.date,name:0
+#: field:report_timesheet.user,name:0
+msgid "Year"
+msgstr "年"
+
+#. module: hr_timesheet_invoice
+#: view:report.timesheet.line:0
+msgid "Timesheet lines during last 7 days"
+msgstr "過去7日間の勤務表の行"
diff --git a/addons/hr_timesheet_sheet/i18n/ja.po b/addons/hr_timesheet_sheet/i18n/ja.po
new file mode 100644
index 00000000000..7e2d71bba64
--- /dev/null
+++ b/addons/hr_timesheet_sheet/i18n/ja.po
@@ -0,0 +1,1042 @@
+# 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-18 01:34+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-Generator: Launchpad (build 15108)\n"
+
+#. module: hr_timesheet_sheet
+#: field:hr.analytic.timesheet,sheet_id:0 field:hr.attendance,sheet_id:0
+#: field:hr_timesheet_sheet.sheet.account,sheet_id:0
+#: field:hr_timesheet_sheet.sheet.day,sheet_id:0
+msgid "Sheet"
+msgstr "表"
+
+#. module: hr_timesheet_sheet
+#: model:process.transition,name:hr_timesheet_sheet.process_transition_timesheetdraft0
+msgid "Service"
+msgstr "サービス"
+
+#. module: hr_timesheet_sheet
+#: code:addons/hr_timesheet_sheet/wizard/hr_timesheet_current.py:38
+#, python-format
+msgid "No employee defined for your user !"
+msgstr "このユーザには従業員が定義されていません。"
+
+#. module: hr_timesheet_sheet
+#: view:hr.timesheet.report:0 view:hr_timesheet_sheet.sheet:0
+#: view:timesheet.report:0
+msgid "Group By..."
+msgstr "グループ化…"
+
+#. module: hr_timesheet_sheet
+#: field:hr_timesheet_sheet.sheet,total_attendance:0
+#: field:hr_timesheet_sheet.sheet,total_attendance_day:0
+msgid "Total Attendance"
+msgstr "出勤日の合計"
+
+#. module: hr_timesheet_sheet
+#: view:hr_timesheet_sheet.sheet:0
+#: field:hr_timesheet_sheet.sheet,department_id:0 view:timesheet.report:0
+#: field:timesheet.report,department_id:0
+msgid "Department"
+msgstr "部門"
+
+#. module: hr_timesheet_sheet
+#: view:hr.timesheet.report:0 view:timesheet.report:0
+msgid "Timesheet in current year"
+msgstr "今年度の勤務表"
+
+#. module: hr_timesheet_sheet
+#: model:process.transition,name:hr_timesheet_sheet.process_transition_tasktimesheet0
+msgid "Task timesheet"
+msgstr "仕事時間表"
+
+#. module: hr_timesheet_sheet
+#: view:hr_timesheet_sheet.sheet:0
+msgid "Today"
+msgstr "今日"
+
+#. module: hr_timesheet_sheet
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:274
+#, python-format
+msgid ""
+"Please verify that the total difference of the sheet is lower than %.2f !"
+msgstr "表の差分は %.2f よりも小さいことを確認してください。"
+
+#. module: hr_timesheet_sheet
+#: selection:hr.timesheet.report,month:0 selection:timesheet.report,month:0
+msgid "March"
+msgstr "3月"
+
+#. module: hr_timesheet_sheet
+#: view:timesheet.report:0 field:timesheet.report,cost:0
+msgid "#Cost"
+msgstr "#経費"
+
+#. module: hr_timesheet_sheet
+#: view:hr.timesheet.report:0 view:timesheet.report:0
+msgid "Timesheet of last month"
+msgstr "先月の勤務表"
+
+#. module: hr_timesheet_sheet
+#: view:hr.timesheet.report:0 field:hr.timesheet.report,company_id:0
+#: field:hr_timesheet_sheet.sheet,company_id:0 view:timesheet.report:0
+#: field:timesheet.report,company_id:0
+msgid "Company"
+msgstr "会社"
+
+#. module: hr_timesheet_sheet
+#: view:hr.timesheet.report:0 view:hr_timesheet_sheet.sheet:0
+#: model:ir.model,name:hr_timesheet_sheet.model_hr_timesheet_report
+#: model:ir.model,name:hr_timesheet_sheet.model_hr_timesheet_sheet_sheet
+#: model:ir.model,name:hr_timesheet_sheet.model_timesheet_report
+#: model:process.node,name:hr_timesheet_sheet.process_node_timesheet0
+#: view:timesheet.report:0
+msgid "Timesheet"
+msgstr "勤務表"
+
+#. module: hr_timesheet_sheet
+#: view:hr_timesheet_sheet.sheet:0
+msgid "Set to Draft"
+msgstr "ドラフトに設定"
+
+#. module: hr_timesheet_sheet
+#: field:hr_timesheet_sheet.sheet,date_to:0 field:timesheet.report,date_to:0
+msgid "Date to"
+msgstr "終了日付"
+
+#. module: hr_timesheet_sheet
+#: model:process.node,note:hr_timesheet_sheet.process_node_invoiceonwork0
+msgid "Based on the timesheet"
+msgstr "勤務表に基づく"
+
+#. module: hr_timesheet_sheet
+#: view:hr.timesheet.report:0 view:timesheet.report:0
+msgid "Group by day of date"
+msgstr "日付の曜日によってグループ化"
+
+#. module: hr_timesheet_sheet
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:615
+#, python-format
+msgid "You cannot modify an entry in a confirmed timesheet!"
+msgstr "確認済みの勤務表の記入項を変更することはできません。"
+
+#. module: hr_timesheet_sheet
+#: model:process.transition.action,name:hr_timesheet_sheet.process_transition_action_validatetimesheet0
+msgid "Validate"
+msgstr "検証する"
+
+#. module: hr_timesheet_sheet
+#: selection:hr_timesheet_sheet.sheet,state:0
+msgid "Approved"
+msgstr "承認済み"
+
+#. module: hr_timesheet_sheet
+#: selection:hr_timesheet_sheet.sheet,state_attendance:0
+msgid "Present"
+msgstr "現在"
+
+#. module: hr_timesheet_sheet
+#: view:hr.timesheet.report:0
+msgid "Total Cost"
+msgstr "合計経費"
+
+#. module: hr_timesheet_sheet
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:263
+#, python-format
+msgid ""
+"In order to create a timesheet for this employee, you must assign the "
+"employee to an analytic journal!"
+msgstr "この従業員の勤務表を作成するには、分析仕訳に従業員を割り当てる必要があります。"
+
+#. module: hr_timesheet_sheet
+#: view:hr_timesheet_sheet.sheet:0
+#: model:process.transition.action,name:hr_timesheet_sheet.process_transition_action_refusetimesheet0
+msgid "Refuse"
+msgstr "拒否"
+
+#. module: hr_timesheet_sheet
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:619
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:639
+#, python-format
+msgid ""
+"You cannot enter an attendance date outside the current timesheet dates!"
+msgstr "勤務表の日付の枠外に出勤日を指定することはできません。"
+
+#. module: hr_timesheet_sheet
+#: model:ir.actions.act_window,help:hr_timesheet_sheet.action_hr_timesheet_current_open
+msgid ""
+"My Timesheet opens your timesheet so that you can book your activities into "
+"the system. From the same form, you can register your attendances (Sign "
+"In/Out) and describe the working hours made on the different projects. At "
+"the end of the period defined in the company, the timesheet is confirmed by "
+"the user and can be validated by his manager. If required, as defined on the "
+"project, you can generate the invoices based on the timesheet."
+msgstr ""
+"私の勤務表からあなたの勤務表を開きましたので、あなたの活動をシステムに登録することができます。あなたは出退勤（サインイン / "
+"アウト）を記録して、プロジェクトごとの勤務時間を記録することができます。　プロジェクト期間の終わりに記録を確認して、マネジャが承認することができます。必要"
+"ならば、プロジェクトで定義されたように、あなたが勤務表に基づいて請求書を作成することができます。"
+
+#. module: hr_timesheet_sheet
+#: view:hr_timesheet_sheet.sheet.day:0
+msgid "Total Difference"
+msgstr "差分の合計"
+
+#. module: hr_timesheet_sheet
+#: view:hr.timesheet.report:0 view:timesheet.report:0
+msgid " Month-1 "
+msgstr " 月次-1 "
+
+#. module: hr_timesheet_sheet
+#: view:hr_timesheet_sheet.sheet:0
+msgid "My Departments Timesheet"
+msgstr "私の部門の勤務表"
+
+#. module: hr_timesheet_sheet
+#: model:ir.actions.act_window,name:hr_timesheet_sheet.act_hr_timesheet_sheet_sheet_by_day
+msgid "Timesheet by Day"
+msgstr "日ごとの勤務表"
+
+#. module: hr_timesheet_sheet
+#: field:hr_timesheet_sheet.sheet.account,name:0
+msgid "Project / Analytic Account"
+msgstr "プロジェクト / 分析アカウント"
+
+#. module: hr_timesheet_sheet
+#: model:process.transition,name:hr_timesheet_sheet.process_transition_validatetimesheet0
+msgid "Validation"
+msgstr "承認"
+
+#. module: hr_timesheet_sheet
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:274
+#, python-format
+msgid "Warning !"
+msgstr "警告"
+
+#. module: hr_timesheet_sheet
+#: model:process.node,note:hr_timesheet_sheet.process_node_attendance0
+msgid "Employee's timesheet entry"
+msgstr "従業員の勤務表記入項目"
+
+#. module: hr_timesheet_sheet
+#: view:hr.timesheet.report:0 field:hr.timesheet.report,account_id:0
+#: view:timesheet.report:0 field:timesheet.report,account_id:0
+msgid "Analytic Account"
+msgstr "分析アカウント"
+
+#. module: hr_timesheet_sheet
+#: field:timesheet.report,nbr:0
+msgid "#Nbr"
+msgstr "#番号"
+
+#. module: hr_timesheet_sheet
+#: field:hr_timesheet_sheet.sheet,date_from:0
+#: field:timesheet.report,date_from:0
+msgid "Date from"
+msgstr "開始日"
+
+#. module: hr_timesheet_sheet
+#: view:timesheet.report:0
+msgid " Month "
+msgstr " 月 "
+
+#. module: hr_timesheet_sheet
+#: view:hr_timesheet_sheet.sheet:0
+#: model:ir.actions.act_window,name:hr_timesheet_sheet.act_hr_employee_2_hr_timesheet
+#: model:ir.actions.act_window,name:hr_timesheet_sheet.act_hr_timesheet_sheet_form
+#: model:ir.actions.act_window,name:hr_timesheet_sheet.action_hr_timesheet_sheet_graph
+#: model:ir.ui.menu,name:hr_timesheet_sheet.menu_act_hr_timesheet_sheet_form
+#: view:res.company:0
+msgid "Timesheets"
+msgstr "勤務表"
+
+#. module: hr_timesheet_sheet
+#: model:process.node,name:hr_timesheet_sheet.process_node_confirmedtimesheet0
+#: view:timesheet.report:0 selection:timesheet.report,state:0
+msgid "Confirmed"
+msgstr "確認済み"
+
+#. module: hr_timesheet_sheet
+#: field:hr_timesheet_sheet.sheet.day,total_attendance:0
+#: model:ir.model,name:hr_timesheet_sheet.model_hr_attendance
+#: model:process.node,name:hr_timesheet_sheet.process_node_attendance0
+msgid "Attendance"
+msgstr "勤怠"
+
+#. module: hr_timesheet_sheet
+#: model:process.transition.action,name:hr_timesheet_sheet.process_transition_action_draftconfirmtimesheet0
+msgid "Confirm"
+msgstr "確認"
+
+#. module: hr_timesheet_sheet
+#: field:hr_timesheet_sheet.sheet,timesheet_ids:0
+msgid "Timesheet lines"
+msgstr "勤務表の行"
+
+#. module: hr_timesheet_sheet
+#: constraint:res.company:0
+msgid "Error! You can not create recursive companies."
+msgstr "エラー。再帰的な会社を作ることはできません。"
+
+#. module: hr_timesheet_sheet
+#: field:hr_timesheet_sheet.sheet,state:0 view:timesheet.report:0
+#: field:timesheet.report,state:0
+msgid "State"
+msgstr "状態"
+
+#. module: hr_timesheet_sheet
+#: model:process.node,note:hr_timesheet_sheet.process_node_confirmedtimesheet0
+msgid "State is 'confirmed'."
+msgstr "状態を確認済み。"
+
+#. module: hr_timesheet_sheet
+#: field:hr_timesheet_sheet.sheet,employee_id:0
+msgid "Employee"
+msgstr "従業員"
+
+#. module: hr_timesheet_sheet
+#: selection:hr_timesheet_sheet.sheet,state:0
+#: selection:timesheet.report,state:0
+msgid "New"
+msgstr "新規"
+
+#. module: hr_timesheet_sheet
+#: model:ir.actions.act_window,name:hr_timesheet_sheet.action_week_attendance_graph
+msgid "My Total Attendances By Week"
+msgstr "週ごとの全ての勤怠"
+
+#. module: hr_timesheet_sheet
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:241
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:246
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:248
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:250
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:257
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:259
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:261
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:263
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:318
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:548
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:615
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:646
+#: code:addons/hr_timesheet_sheet/wizard/hr_timesheet_current.py:38
+#, python-format
+msgid "Error !"
+msgstr "エラー"
+
+#. module: hr_timesheet_sheet
+#: field:hr_timesheet_sheet.sheet.account,total:0
+msgid "Total Time"
+msgstr "合計時間"
+
+#. module: hr_timesheet_sheet
+#: view:hr_timesheet_sheet.sheet:0
+#: model:ir.actions.act_window,name:hr_timesheet_sheet.act_hr_timesheet_sheet_sheet_2_hr_analytic_timesheet
+msgid "Timesheet Lines"
+msgstr "勤務表の行"
+
+#. module: hr_timesheet_sheet
+#: view:hr.timesheet.report:0
+msgid "Hours"
+msgstr "時間"
+
+#. module: hr_timesheet_sheet
+#: view:hr.timesheet.report:0 view:timesheet.report:0
+msgid "Group by month of date"
+msgstr "日付の月でグループ化"
+
+#. module: hr_timesheet_sheet
+#: constraint:hr.attendance:0
+msgid "Error: Sign in (resp. Sign out) must follow Sign out (resp. Sign in)"
+msgstr "エラー：サインイン（サインアウト）はサインアウト（サインイン）の後でなければいけません。"
+
+#. module: hr_timesheet_sheet
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:455
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:457
+#, python-format
+msgid "Invalid action !"
+msgstr "無効なアクションです。"
+
+#. module: hr_timesheet_sheet
+#: model:process.transition,note:hr_timesheet_sheet.process_transition_validatetimesheet0
+msgid "The project manager validates the timesheets."
+msgstr "プロジェクトマネジャが勤務表を承認します。"
+
+#. module: hr_timesheet_sheet
+#: selection:hr.timesheet.report,month:0 selection:timesheet.report,month:0
+msgid "July"
+msgstr "7月"
+
+#. module: hr_timesheet_sheet
+#: view:res.company:0
+msgid "Configuration"
+msgstr "設定"
+
+#. module: hr_timesheet_sheet
+#: model:process.node,name:hr_timesheet_sheet.process_node_workontask0
+msgid "Work on Task"
+msgstr "仕掛中の作業"
+
+#. module: hr_timesheet_sheet
+#: view:hr_timesheet_sheet.sheet:0
+msgid "Daily"
+msgstr "日次"
+
+#. module: hr_timesheet_sheet
+#: view:timesheet.report:0 field:timesheet.report,quantity:0
+msgid "#Quantity"
+msgstr "数量"
+
+#. module: hr_timesheet_sheet
+#: field:hr_timesheet_sheet.sheet,total_timesheet:0
+#: field:hr_timesheet_sheet.sheet,total_timesheet_day:0
+#: view:hr_timesheet_sheet.sheet.day:0
+#: field:hr_timesheet_sheet.sheet.day,total_timesheet:0
+msgid "Total Timesheet"
+msgstr "全ての勤務表"
+
+#. module: hr_timesheet_sheet
+#: view:hr_timesheet_sheet.sheet:0
+msgid "Available Attendance"
+msgstr "可能な出勤"
+
+#. module: hr_timesheet_sheet
+#: view:hr_timesheet_sheet.sheet:0
+msgid "Sign In"
+msgstr "サインイン"
+
+#. module: hr_timesheet_sheet
+#: view:timesheet.report:0 field:timesheet.report,total_timesheet:0
+msgid "#Total Timesheet"
+msgstr "勤務表の合計"
+
+#. module: hr_timesheet_sheet
+#: model:ir.model,name:hr_timesheet_sheet.model_hr_timesheet_current_open
+msgid "hr.timesheet.current.open"
+msgstr "hr.timesheet.current.open"
+
+#. module: hr_timesheet_sheet
+#: view:hr_timesheet_sheet.sheet:0
+msgid "Go to:"
+msgstr "次へ進む："
+
+#. module: hr_timesheet_sheet
+#: selection:hr.timesheet.report,month:0 selection:timesheet.report,month:0
+msgid "September"
+msgstr "9月"
+
+#. module: hr_timesheet_sheet
+#: selection:hr.timesheet.report,month:0 selection:timesheet.report,month:0
+msgid "December"
+msgstr "12月"
+
+#. module: hr_timesheet_sheet
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:248
+#, python-format
+msgid ""
+"In order to create a timesheet for this employee, you must link the employee "
+"to a product, like 'Consultant'!"
+msgstr "この従業員の勤務表を作成するには、従業員を製品（例えば、コンサルタント）に関連付ける必要があります。"
+
+#. module: hr_timesheet_sheet
+#: view:hr.timesheet.current.open:0
+msgid "It will open your current timesheet"
+msgstr "現在の勤務表が表示されます。"
+
+#. module: hr_timesheet_sheet
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:241
+#, python-format
+msgid "You cannot duplicate a timesheet!"
+msgstr "勤務表を重複して作ることはできません。"
+
+#. module: hr_timesheet_sheet
+#: view:hr.timesheet.report:0 field:hr.timesheet.report,month:0
+#: selection:res.company,timesheet_range:0 view:timesheet.report:0
+#: field:timesheet.report,month:0
+msgid "Month"
+msgstr "月"
+
+#. module: hr_timesheet_sheet
+#: view:timesheet.report:0 field:timesheet.report,total_diff:0
+msgid "#Total Diff"
+msgstr "差分の合計"
+
+#. module: hr_timesheet_sheet
+#: view:hr_timesheet_sheet.sheet:0
+msgid "In Draft"
+msgstr "原案中"
+
+#. module: hr_timesheet_sheet
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:261
+#, python-format
+msgid ""
+"In order to create a timesheet for this employee, you must link the employee "
+"to a product!"
+msgstr "この従業員の勤務表を作成するには、従業員を製品に関連付ける必要があります。"
+
+#. module: hr_timesheet_sheet
+#: model:process.transition,name:hr_timesheet_sheet.process_transition_attendancetimesheet0
+msgid "Sign in/out"
+msgstr "サインイン / アウト"
+
+#. module: hr_timesheet_sheet
+#: selection:hr_timesheet_sheet.sheet,state:0
+msgid "Waiting Approval"
+msgstr "承認待ち"
+
+#. module: hr_timesheet_sheet
+#: model:process.transition,name:hr_timesheet_sheet.process_transition_invoiceontimesheet0
+msgid "Billing"
+msgstr "課金"
+
+#. module: hr_timesheet_sheet
+#: model:process.transition,note:hr_timesheet_sheet.process_transition_timesheetdraft0
+msgid ""
+"The timesheet line represents the time spent by the employee on a specific "
+"service provided."
+msgstr "勤務表の行は、従業員が行ったサービスに費やした時間を表します。"
+
+#. module: hr_timesheet_sheet
+#: constraint:hr_timesheet_sheet.sheet:0
+msgid "You must select a Current date which is in the timesheet dates !"
+msgstr "勤務表の日付である現在の日付を選ばなくてはいけません。"
+
+#. module: hr_timesheet_sheet
+#: field:hr_timesheet_sheet.sheet,name:0
+msgid "Note"
+msgstr "注記"
+
+#. module: hr_timesheet_sheet
+#: model:ir.actions.act_window,help:hr_timesheet_sheet.action_hr_timesheet_report_stat_all
+msgid ""
+"This report performs analysis on timesheets created by your human resources "
+"in the system. It allows you to have a full overview of  entries done by "
+"your employees. You can group them by specific selection criteria thanks to "
+"the search tool."
+msgstr ""
+"この報告書は、システムの人材担当者が作成した勤務表について分析するものです。あなたの従業員が記録した記入項目の全体を見ることができます。さらに検索ツールを"
+"使って、特定の基準でグループ化することができます。"
+
+#. module: hr_timesheet_sheet
+#: view:timesheet.report:0 selection:timesheet.report,state:0
+msgid "Draft"
+msgstr "草案"
+
+#. module: hr_timesheet_sheet
+#: field:res.company,timesheet_max_difference:0
+msgid "Timesheet allowed difference(Hours)"
+msgstr "勤務表の差分の許容範囲（時間）"
+
+#. module: hr_timesheet_sheet
+#: model:process.transition,note:hr_timesheet_sheet.process_transition_invoiceontimesheet0
+msgid "The invoice is created based on the timesheet."
+msgstr "勤務表に基づいて請求書を作成します。"
+
+#. module: hr_timesheet_sheet
+#: model:process.node,name:hr_timesheet_sheet.process_node_drafttimesheetsheet0
+msgid "Draft Timesheet"
+msgstr "勤務表の草案"
+
+#. module: hr_timesheet_sheet
+#: selection:res.company,timesheet_range:0
+msgid "Week"
+msgstr "週"
+
+#. module: hr_timesheet_sheet
+#: selection:hr.timesheet.report,month:0 selection:timesheet.report,month:0
+msgid "August"
+msgstr "8月"
+
+#. module: hr_timesheet_sheet
+#: view:hr_timesheet_sheet.sheet:0
+msgid "Approve"
+msgstr "承認"
+
+#. module: hr_timesheet_sheet
+#: selection:hr.timesheet.report,month:0 selection:timesheet.report,month:0
+msgid "June"
+msgstr "6月"
+
+#. module: hr_timesheet_sheet
+#: field:hr_timesheet_sheet.sheet,state_attendance:0
+msgid "Current Status"
+msgstr "現在の状態"
+
+#. module: hr_timesheet_sheet
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:646
+#, python-format
+msgid "You cannot modify an entry in a confirmed timesheet !"
+msgstr "確認済みの勤務表の記入項目を変更することはできません。"
+
+#. module: hr_timesheet_sheet
+#: model:ir.model,name:hr_timesheet_sheet.model_hr_timesheet_sheet_sheet_account
+#: model:ir.model,name:hr_timesheet_sheet.model_hr_timesheet_sheet_sheet_day
+msgid "Timesheets by Period"
+msgstr "期間ごとの勤務表"
+
+#. module: hr_timesheet_sheet
+#: view:hr.timesheet.report:0 field:hr.timesheet.report,user_id:0
+#: field:hr_timesheet_sheet.sheet,user_id:0 view:timesheet.report:0
+#: field:timesheet.report,user_id:0
+msgid "User"
+msgstr "ユーザ"
+
+#. module: hr_timesheet_sheet
+#: model:ir.actions.act_window,name:hr_timesheet_sheet.act_hr_timesheet_sheet_sheet_by_account
+msgid "Timesheet by Account"
+msgstr "アカウントごとの勤務表"
+
+#. module: hr_timesheet_sheet
+#: field:hr.timesheet.report,date:0 field:hr_timesheet_sheet.sheet.day,name:0
+msgid "Date"
+msgstr "日付"
+
+#. module: hr_timesheet_sheet
+#: selection:hr.timesheet.report,month:0 selection:timesheet.report,month:0
+msgid "November"
+msgstr "11月"
+
+#. module: hr_timesheet_sheet
+#: view:hr.timesheet.report:0 view:timesheet.report:0
+msgid "Extended Filters..."
+msgstr "拡張フィルタ…"
+
+#. module: hr_timesheet_sheet
+#: field:res.company,timesheet_range:0
+msgid "Timesheet range"
+msgstr "勤務表の範囲"
+
+#. module: hr_timesheet_sheet
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:548
+#, python-format
+msgid "You can not modify an entry in a confirmed timesheet !"
+msgstr "確認済みの勤務表の記入項目を変更することはできません。"
+
+#. module: hr_timesheet_sheet
+#: view:board.board:0
+msgid "My Total Attendance By Week"
+msgstr "週ごとの私の全ての出勤"
+
+#. module: hr_timesheet_sheet
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:259
+#, python-format
+msgid ""
+"You cannot have 2 timesheets that overlaps!\n"
+"You should use the menu 'My Timesheet' to avoid this problem."
+msgstr ""
+"重複する２つの勤務表を作ることはできません。\n"
+"メニュー「私の勤務表」を使って下さい。"
+
+#. module: hr_timesheet_sheet
+#: selection:hr.timesheet.report,month:0 selection:timesheet.report,month:0
+msgid "October"
+msgstr "10月"
+
+#. module: hr_timesheet_sheet
+#: model:ir.actions.act_window,help:hr_timesheet_sheet.act_hr_timesheet_sheet_form
+msgid ""
+"Check your timesheets for a specific period. You can also encode time spent "
+"on a project (i.e. an analytic account) thus generating costs in the "
+"analytic account concerned."
+msgstr ""
+"指定した期間について勤務表をチェックして下さい。プロジェクトに費やした時間を記録できます。分析アカウントであれば、経費を計上するもができます。"
+
+#. module: hr_timesheet_sheet
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:237
+#, python-format
+msgid ""
+"The timesheet cannot be validated as it does not contain an equal number of "
+"sign ins and sign outs!"
+msgstr "サインインとサインアウトの回数が同じでないと、勤務表を検証することはできません。"
+
+#. module: hr_timesheet_sheet
+#: selection:hr.timesheet.report,month:0 selection:timesheet.report,month:0
+msgid "January"
+msgstr "1月"
+
+#. module: hr_timesheet_sheet
+#: model:process.transition,note:hr_timesheet_sheet.process_transition_attendancetimesheet0
+msgid "The employee signs in and signs out."
+msgstr "従業員のサインインとサインアウト"
+
+#. module: hr_timesheet_sheet
+#: model:ir.model,name:hr_timesheet_sheet.model_res_company
+msgid "Companies"
+msgstr "会社"
+
+#. module: hr_timesheet_sheet
+#: view:hr_timesheet_sheet.sheet:0
+msgid "Summary"
+msgstr "要約"
+
+#. module: hr_timesheet_sheet
+#: constraint:hr_timesheet_sheet.sheet:0
+msgid ""
+"You cannot have 2 timesheets that overlaps !\n"
+"Please use the menu 'My Current Timesheet' to avoid this problem."
+msgstr ""
+"重複する２つの勤務表を作ることはできません。\n"
+"メニュー「私の現在の勤務表」を使ってください。"
+
+#. module: hr_timesheet_sheet
+#: view:hr_timesheet_sheet.sheet:0
+msgid "Unvalidated Timesheets"
+msgstr "勤務表を承認しない。"
+
+#. module: hr_timesheet_sheet
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:457
+#, python-format
+msgid "You cannot delete a timesheet which have attendance entries!"
+msgstr "勤務の記入項目を持った勤務表を削除することはできません。"
+
+#. module: hr_timesheet_sheet
+#: field:hr.timesheet.report,quantity:0
+msgid "Quantity"
+msgstr "数量"
+
+#. module: hr_timesheet_sheet
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:455
+#, python-format
+msgid "You cannot delete a timesheet which is already confirmed!"
+msgstr "既に確認した勤務表を削除することはできません。"
+
+#. module: hr_timesheet_sheet
+#: view:hr.timesheet.report:0 field:hr.timesheet.report,general_account_id:0
+#: view:timesheet.report:0 field:timesheet.report,general_account_id:0
+msgid "General Account"
+msgstr "一般アカウント"
+
+#. module: hr_timesheet_sheet
+#: help:res.company,timesheet_range:0
+msgid "Periodicity on which you validate your timesheets."
+msgstr "あなたが承認した勤務表の周期性"
+
+#. module: hr_timesheet_sheet
+#: view:hr_timesheet_sheet.sheet.account:0
+msgid "Search Account"
+msgstr "アカウントを検索"
+
+#. module: hr_timesheet_sheet
+#: help:res.company,timesheet_max_difference:0
+msgid ""
+"Allowed difference in hours between the sign in/out and the timesheet "
+"computation for one sheet. Set this to 0 if you do not want any control."
+msgstr "サインイン / アウトの間の時間間隔の許容差分。制約を設けないのであれば 0 （ゼロ）を設定してください。"
+
+#. module: hr_timesheet_sheet
+#: view:hr_timesheet_sheet.sheet:0 field:hr_timesheet_sheet.sheet,period_ids:0
+#: view:hr_timesheet_sheet.sheet.day:0
+msgid "Period"
+msgstr "期間"
+
+#. module: hr_timesheet_sheet
+#: view:hr.timesheet.report:0 field:hr.timesheet.report,day:0
+#: selection:res.company,timesheet_range:0 view:timesheet.report:0
+#: field:timesheet.report,day:0
+msgid "Day"
+msgstr "日"
+
+#. module: hr_timesheet_sheet
+#: view:hr.timesheet.current.open:0
+#: model:ir.actions.act_window,name:hr_timesheet_sheet.action_hr_timesheet_current_open
+#: model:ir.actions.server,name:hr_timesheet_sheet.ir_actions_server_timsheet_sheet
+#: model:ir.ui.menu,name:hr_timesheet_sheet.menu_act_hr_timesheet_sheet_form_my_current
+msgid "My Timesheet"
+msgstr "私の勤務表"
+
+#. module: hr_timesheet_sheet
+#: view:timesheet.report:0 selection:timesheet.report,state:0
+msgid "Done"
+msgstr "完了"
+
+#. module: hr_timesheet_sheet
+#: model:process.node,note:hr_timesheet_sheet.process_node_drafttimesheetsheet0
+msgid "State is 'draft'."
+msgstr "「草稿」状態"
+
+#. module: hr_timesheet_sheet
+#: constraint:hr.analytic.timesheet:0
+msgid "You cannot modify an entry in a Confirmed/Done timesheet !."
+msgstr "確認済み/完了した勤務表の記入項目を変更することはできません。"
+
+#. module: hr_timesheet_sheet
+#: view:hr.timesheet.current.open:0
+msgid "Cancel"
+msgstr "キャンセル"
+
+#. module: hr_timesheet_sheet
+#: model:process.node,name:hr_timesheet_sheet.process_node_validatedtimesheet0
+msgid "Validated"
+msgstr "承諾済み"
+
+#. module: hr_timesheet_sheet
+#: model:process.node,name:hr_timesheet_sheet.process_node_invoiceonwork0
+msgid "Invoice on Work"
+msgstr "作業中の請求"
+
+#. module: hr_timesheet_sheet
+#: view:hr.timesheet.report:0 view:timesheet.report:0
+msgid "Timesheet in current month"
+msgstr "今月の勤務表"
+
+#. module: hr_timesheet_sheet
+#: view:hr_timesheet_sheet.sheet.account:0
+msgid "Timesheet by Accounts"
+msgstr "アカウントごとの勤務表"
+
+#. module: hr_timesheet_sheet
+#: code:addons/hr_timesheet_sheet/wizard/hr_timesheet_current.py:51
+#, python-format
+msgid "Open Timesheet"
+msgstr "勤務表を開く"
+
+#. module: hr_timesheet_sheet
+#: view:hr.timesheet.report:0 view:timesheet.report:0
+msgid "Group by year of date"
+msgstr "日付の年度でグループ化"
+
+#. module: hr_timesheet_sheet
+#: model:process.node,note:hr_timesheet_sheet.process_node_validatedtimesheet0
+msgid "State is 'validated'."
+msgstr "承認された状態"
+
+#. module: hr_timesheet_sheet
+#: help:hr_timesheet_sheet.sheet,state:0
+msgid ""
+" * The 'Draft' state is used when a user is encoding a new and unconfirmed "
+"timesheet.                 \n"
+"* The 'Confirmed' state is used for to confirm the timesheet by user.        "
+"         \n"
+"* The 'Done' state is used when users timesheet is accepted by his/her "
+"senior."
+msgstr ""
+" ・「草案」状態とは、ユーザが新しい勤務表を記録中であり未確認であることを示します。\n"
+"・「確認済み」状態とは、ユーザ自身が確認した勤務表であることを示します。\n"
+"・「完了」状態とは、上司が承認した勤務表であることを示します。"
+
+#. module: hr_timesheet_sheet
+#: view:hr.timesheet.report:0
+#: model:ir.actions.act_window,name:hr_timesheet_sheet.action_hr_timesheet_report_stat_all
+#: model:ir.ui.menu,name:hr_timesheet_sheet.menu_hr_timesheet_report_all
+msgid "Timesheet Analysis"
+msgstr "勤務表の分析"
+
+#. module: hr_timesheet_sheet
+#: view:hr_timesheet_sheet.sheet:0
+msgid "Search Timesheet"
+msgstr "勤務表を検索"
+
+#. module: hr_timesheet_sheet
+#: view:hr_timesheet_sheet.sheet:0
+msgid "Confirmed Timesheets"
+msgstr "確認済みの勤務表"
+
+#. module: hr_timesheet_sheet
+#: model:ir.model,name:hr_timesheet_sheet.model_hr_analytic_timesheet
+msgid "Timesheet Line"
+msgstr "勤務表の行"
+
+#. module: hr_timesheet_sheet
+#: view:hr.timesheet.report:0 field:hr.timesheet.report,product_id:0
+#: view:timesheet.report:0 field:timesheet.report,product_id:0
+msgid "Product"
+msgstr "製品"
+
+#. module: hr_timesheet_sheet
+#: view:hr_timesheet_sheet.sheet:0
+#: field:hr_timesheet_sheet.sheet,attendances_ids:0
+#: model:ir.actions.act_window,name:hr_timesheet_sheet.act_hr_timesheet_sheet_sheet_2_hr_attendance
+msgid "Attendances"
+msgstr "勤怠"
+
+#. module: hr_timesheet_sheet
+#: field:hr.timesheet.report,name:0 field:timesheet.report,name:0
+msgid "Description"
+msgstr "詳細"
+
+#. module: hr_timesheet_sheet
+#: model:process.transition,note:hr_timesheet_sheet.process_transition_confirmtimesheet0
+msgid "The employee periodically confirms his own timesheets."
+msgstr "従業員は定期的に自分の勤務表を確認すること。"
+
+#. module: hr_timesheet_sheet
+#: selection:hr.timesheet.report,month:0 selection:timesheet.report,month:0
+msgid "May"
+msgstr "5月"
+
+#. module: hr_timesheet_sheet
+#: model:process.node,note:hr_timesheet_sheet.process_node_workontask0
+msgid "Defines the work summary of task"
+msgstr "仕事の作業要約を定義します。"
+
+#. module: hr_timesheet_sheet
+#: view:hr_timesheet_sheet.sheet:0
+msgid "Sign Out"
+msgstr "ログオフ"
+
+#. module: hr_timesheet_sheet
+#: model:process.transition,note:hr_timesheet_sheet.process_transition_tasktimesheet0
+msgid "Moves task entry into the timesheet line"
+msgstr "作業の記入項目を勤務表に移します。"
+
+#. module: hr_timesheet_sheet
+#: view:hr_timesheet_sheet.sheet.day:0
+msgid "Total Attendances"
+msgstr "出勤日の合計"
+
+#. module: hr_timesheet_sheet
+#: model:ir.actions.act_window,name:hr_timesheet_sheet.action_timesheet_report_stat_all
+#: model:ir.ui.menu,name:hr_timesheet_sheet.menu_timesheet_report_all
+msgid "Timesheet Sheet Analysis"
+msgstr "勤務表の分析"
+
+#. module: hr_timesheet_sheet
+#: field:hr_timesheet_sheet.sheet,total_difference:0
+#: field:hr_timesheet_sheet.sheet,total_difference_day:0
+#: field:hr_timesheet_sheet.sheet.day,total_difference:0
+msgid "Difference"
+msgstr "差分"
+
+#. module: hr_timesheet_sheet
+#: selection:hr_timesheet_sheet.sheet,state_attendance:0
+msgid "Absent"
+msgstr "欠勤"
+
+#. module: hr_timesheet_sheet
+#: selection:hr.timesheet.report,month:0 selection:timesheet.report,month:0
+msgid "February"
+msgstr "2月"
+
+#. module: hr_timesheet_sheet
+#: sql_constraint:res.company:0
+msgid "The company name must be unique !"
+msgstr "会社名は固有でなければいけません。"
+
+#. module: hr_timesheet_sheet
+#: view:hr_timesheet_sheet.sheet:0
+msgid "Employees"
+msgstr "従業員"
+
+#. module: hr_timesheet_sheet
+#: model:process.node,note:hr_timesheet_sheet.process_node_timesheet0
+msgid "Information of time spent on a service"
+msgstr "サービスに費やした時間の情報"
+
+#. module: hr_timesheet_sheet
+#: selection:hr.timesheet.report,month:0 selection:timesheet.report,month:0
+msgid "April"
+msgstr "4月"
+
+#. module: hr_timesheet_sheet
+#: model:process.transition,name:hr_timesheet_sheet.process_transition_confirmtimesheet0
+msgid "Confirmation"
+msgstr "確認"
+
+#. module: hr_timesheet_sheet
+#: field:hr_timesheet_sheet.sheet.account,invoice_rate:0
+msgid "Invoice rate"
+msgstr "請求率"
+
+#. module: hr_timesheet_sheet
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:619
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:639
+#, python-format
+msgid "UserError"
+msgstr "ユーザエラー"
+
+#. module: hr_timesheet_sheet
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:250
+#, python-format
+msgid ""
+"In order to create a timesheet for this employee, you must assign the "
+"employee to an analytic journal, like 'Timesheet'!"
+msgstr "この従業員の勤務表を作成するには、従業員に分析項目（例えば、勤務表）を割り当ててください。"
+
+#. module: hr_timesheet_sheet
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:318
+#, python-format
+msgid "You cannot sign in/sign out from an other date than today"
+msgstr "今日とは別の日付でサインイン / サインアウトすることはできません。"
+
+#. module: hr_timesheet_sheet
+#: view:hr_timesheet_sheet.sheet:0
+msgid "Submited to Manager"
+msgstr "マネジャに提出済み"
+
+#. module: hr_timesheet_sheet
+#: field:hr_timesheet_sheet.sheet,account_ids:0
+msgid "Analytic accounts"
+msgstr "分析アカウント"
+
+#. module: hr_timesheet_sheet
+#: view:timesheet.report:0 field:timesheet.report,to_invoice:0
+msgid "Type of Invoicing"
+msgstr "請求のタイプ"
+
+#. module: hr_timesheet_sheet
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:246
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:257
+#, python-format
+msgid ""
+"In order to create a timesheet for this employee, you must assign it to a "
+"user!"
+msgstr "この従業員の勤務表を作成するには、それをユーザに割り当てなければいけません。"
+
+#. module: hr_timesheet_sheet
+#: view:timesheet.report:0 field:timesheet.report,total_attendance:0
+msgid "#Total Attendance"
+msgstr "出勤日の合計日数"
+
+#. module: hr_timesheet_sheet
+#: field:hr.timesheet.report,cost:0
+msgid "Cost"
+msgstr "経費"
+
+#. module: hr_timesheet_sheet
+#: field:hr_timesheet_sheet.sheet,date_current:0
+#: field:timesheet.report,date_current:0
+msgid "Current date"
+msgstr "今日"
+
+#. module: hr_timesheet_sheet
+#: model:process.process,name:hr_timesheet_sheet.process_process_hrtimesheetprocess0
+msgid "Hr Timesheet"
+msgstr "人材　勤務表"
+
+#. module: hr_timesheet_sheet
+#: view:hr.timesheet.report:0 field:hr.timesheet.report,year:0
+#: view:timesheet.report:0 field:timesheet.report,year:0
+msgid "Year"
+msgstr "年"
+
+#. module: hr_timesheet_sheet
+#: view:hr.timesheet.current.open:0 selection:hr_timesheet_sheet.sheet,state:0
+msgid "Open"
+msgstr "オープン"
+
+#. module: hr_timesheet_sheet
+#: view:hr_timesheet_sheet.sheet:0
+msgid "To Approve"
+msgstr "承認する"
+
+#. module: hr_timesheet_sheet
+#: view:hr_timesheet_sheet.sheet.account:0
+msgid "Total"
+msgstr "合計"
+
+#. module: hr_timesheet_sheet
+#: field:hr.timesheet.report,journal_id:0
+msgid "Journal"
+msgstr "仕訳"
diff --git a/addons/html_view/i18n/ja.po b/addons/html_view/i18n/ja.po
new file mode 100644
index 00000000000..8820fdd9f33
--- /dev/null
+++ b/addons/html_view/i18n/ja.po
@@ -0,0 +1,49 @@
+# 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 01:30+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-Generator: Launchpad (build 15108)\n"
+
+#. module: html_view
+#: field:html.view,name:0
+msgid "Name"
+msgstr "氏名"
+
+#. module: html_view
+#: field:html.view,comp_id:0
+msgid "Company"
+msgstr "会社"
+
+#. module: html_view
+#: model:ir.actions.act_window,name:html_view.action_html_view_form
+#: model:ir.ui.menu,name:html_view.html_form
+msgid "Html Test"
+msgstr "HTMLテスト"
+
+#. module: html_view
+#: view:html.view:0
+msgid "Html Example"
+msgstr "HTML例"
+
+#. module: html_view
+#: field:html.view,bank_ids:0
+msgid "Banks"
+msgstr "銀行"
+
+#. module: html_view
+#: model:ir.model,name:html_view.model_html_view
+msgid "html.view"
+msgstr "HTMLビュー"
diff --git a/addons/import_sugarcrm/i18n/fr.po b/addons/import_sugarcrm/i18n/fr.po
new file mode 100644
index 00000000000..cbbe4c99743
--- /dev/null
+++ b/addons/import_sugarcrm/i18n/fr.po
@@ -0,0 +1,404 @@
+# French 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-17 13:55+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: French <fr@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-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 ""
+
+#. 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 ""
+
+#. 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 ""
+
+#. module: import_sugarcrm
+#: view:import.sugarcrm:0
+msgid "Import Data From SugarCRM"
+msgstr ""
+
+#. module: import_sugarcrm
+#: view:import.sugarcrm:0
+msgid "CRM"
+msgstr ""
+
+#. 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 ""
+
+#. 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 ""
+
+#. module: import_sugarcrm
+#: view:import.sugarcrm:0
+msgid "_Import"
+msgstr ""
+
+#. 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 ""
+
+#. 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 ""
+
+#. 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 ""
+
+#. module: import_sugarcrm
+#: model:ir.model,name:import_sugarcrm.model_import_sugarcrm
+msgid "Import SugarCRM DATA"
+msgstr ""
+
+#. module: import_sugarcrm
+#: view:import.sugarcrm:0
+msgid "Email Address to Notify"
+msgstr ""
diff --git a/addons/web_dashboard/i18n/sv.po b/addons/web_dashboard/i18n/sv.po
new file mode 100644
index 00000000000..dd70f52088c
--- /dev/null
+++ b/addons/web_dashboard/i18n/sv.po
@@ -0,0 +1,112 @@
+# Swedish translation for openerp-web
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openerp-web package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openerp-web\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-02-14 15:27+0100\n"
+"PO-Revision-Date: 2012-04-17 09:21+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Swedish <sv@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:57+0000\n"
+"X-Generator: Launchpad (build 15108)\n"
+
+#. openerp-web
+#: addons/web_dashboard/static/src/js/dashboard.js:63
+msgid "Edit Layout"
+msgstr "Ändra layout"
+
+#. openerp-web
+#: addons/web_dashboard/static/src/js/dashboard.js:109
+msgid "Are you sure you want to remove this item ?"
+msgstr "Är du säker på att du vill radera?"
+
+#. openerp-web
+#: addons/web_dashboard/static/src/js/dashboard.js:316
+msgid "Uncategorized"
+msgstr "Okategoriserad"
+
+#. openerp-web
+#: addons/web_dashboard/static/src/js/dashboard.js:324
+#, python-format
+msgid "Execute task \"%s\""
+msgstr "Utför åtgärd \"%s\""
+
+#. openerp-web
+#: addons/web_dashboard/static/src/js/dashboard.js:325
+msgid "Mark this task as done"
+msgstr "Markera denna uppgift som färdig"
+
+#. openerp-web
+#: addons/web_dashboard/static/src/xml/web_dashboard.xml:4
+msgid "Reset Layout.."
+msgstr "Återställ layouten"
+
+#. openerp-web
+#: addons/web_dashboard/static/src/xml/web_dashboard.xml:6
+msgid "Reset"
+msgstr "Nollställ"
+
+#. openerp-web
+#: addons/web_dashboard/static/src/xml/web_dashboard.xml:8
+msgid "Change Layout.."
+msgstr "Ändra layout..."
+
+#. openerp-web
+#: addons/web_dashboard/static/src/xml/web_dashboard.xml:10
+msgid "Change Layout"
+msgstr "Ändra layout"
+
+#. openerp-web
+#: addons/web_dashboard/static/src/xml/web_dashboard.xml:27
+msgid "&nbsp;"
+msgstr ""
+
+#. openerp-web
+#: addons/web_dashboard/static/src/xml/web_dashboard.xml:28
+msgid "Create"
+msgstr "Skapa"
+
+#. openerp-web
+#: addons/web_dashboard/static/src/xml/web_dashboard.xml:39
+msgid "Choose dashboard layout"
+msgstr "Välj infopanellayout"
+
+#. openerp-web
+#: addons/web_dashboard/static/src/xml/web_dashboard.xml:62
+msgid "progress:"
+msgstr "framsteg:"
+
+#. openerp-web
+#: addons/web_dashboard/static/src/xml/web_dashboard.xml:67
+msgid ""
+"Click on the functionalites listed below to launch them and configure your "
+"system"
+msgstr ""
+"Välj bland funktionerna nedan för att starta och konfigurera ditt system"
+
+#. openerp-web
+#: addons/web_dashboard/static/src/xml/web_dashboard.xml:110
+msgid "Welcome to OpenERP"
+msgstr "Välkommen till OpenERP"
+
+#. openerp-web
+#: addons/web_dashboard/static/src/xml/web_dashboard.xml:118
+msgid "Remember to bookmark"
+msgstr "Kom ihåg att spara ett bokmärke till"
+
+#. openerp-web
+#: addons/web_dashboard/static/src/xml/web_dashboard.xml:119
+msgid "This url"
+msgstr "denna url"
+
+#. openerp-web
+#: addons/web_dashboard/static/src/xml/web_dashboard.xml:121
+msgid "Your login:"
+msgstr "Din inloggning:"
diff --git a/addons/web_diagram/i18n/sv.po b/addons/web_diagram/i18n/sv.po
new file mode 100644
index 00000000000..da5bb3fbcdd
--- /dev/null
+++ b/addons/web_diagram/i18n/sv.po
@@ -0,0 +1,57 @@
+# Swedish translation for openerp-web
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openerp-web package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openerp-web\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-02-06 17:33+0100\n"
+"PO-Revision-Date: 2012-04-17 13:23+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Swedish <sv@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:57+0000\n"
+"X-Generator: Launchpad (build 15108)\n"
+
+#. openerp-web
+#: addons/web_diagram/static/src/js/diagram.js:11
+msgid "Diagram"
+msgstr "Diagram"
+
+#. openerp-web
+#: addons/web_diagram/static/src/js/diagram.js:208
+#: addons/web_diagram/static/src/js/diagram.js:224
+#: addons/web_diagram/static/src/js/diagram.js:257
+msgid "Activity"
+msgstr "Aktivitet"
+
+#. openerp-web
+#: addons/web_diagram/static/src/js/diagram.js:208
+#: addons/web_diagram/static/src/js/diagram.js:289
+#: addons/web_diagram/static/src/js/diagram.js:308
+msgid "Transition"
+msgstr "Övergång"
+
+#. openerp-web
+#: addons/web_diagram/static/src/js/diagram.js:214
+#: addons/web_diagram/static/src/js/diagram.js:262
+#: addons/web_diagram/static/src/js/diagram.js:314
+msgid "Create:"
+msgstr "Skapa:"
+
+#. openerp-web
+#: addons/web_diagram/static/src/js/diagram.js:231
+#: addons/web_diagram/static/src/js/diagram.js:232
+#: addons/web_diagram/static/src/js/diagram.js:296
+msgid "Open: "
+msgstr "Öppna: "
+
+#. openerp-web
+#: addons/web_diagram/static/src/xml/base_diagram.xml:5
+#: addons/web_diagram/static/src/xml/base_diagram.xml:6
+msgid "New Node"
+msgstr "Ny nod"
diff --git a/addons/web_graph/i18n/sv.po b/addons/web_graph/i18n/sv.po
new file mode 100644
index 00000000000..98335a89577
--- /dev/null
+++ b/addons/web_graph/i18n/sv.po
@@ -0,0 +1,23 @@
+# Swedish translation for openerp-web
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openerp-web package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openerp-web\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-02-06 17:33+0100\n"
+"PO-Revision-Date: 2012-04-17 13:21+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Swedish <sv@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:57+0000\n"
+"X-Generator: Launchpad (build 15108)\n"
+
+#. openerp-web
+#: addons/web_graph/static/src/js/graph.js:19
+msgid "Graph"
+msgstr "Diagram"
diff --git a/addons/web_kanban/i18n/sv.po b/addons/web_kanban/i18n/sv.po
new file mode 100644
index 00000000000..ad96ac598d2
--- /dev/null
+++ b/addons/web_kanban/i18n/sv.po
@@ -0,0 +1,55 @@
+# Swedish translation for openerp-web
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openerp-web package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openerp-web\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-02-14 15:27+0100\n"
+"PO-Revision-Date: 2012-04-17 12:50+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Swedish <sv@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:57+0000\n"
+"X-Generator: Launchpad (build 15108)\n"
+
+#. openerp-web
+#: addons/web_kanban/static/src/js/kanban.js:10
+msgid "Kanban"
+msgstr "Kanban"
+
+#. openerp-web
+#: addons/web_kanban/static/src/js/kanban.js:294
+#: addons/web_kanban/static/src/js/kanban.js:295
+msgid "Undefined"
+msgstr "Odefinierad"
+
+#. openerp-web
+#: addons/web_kanban/static/src/js/kanban.js:469
+#: addons/web_kanban/static/src/js/kanban.js:470
+msgid "Are you sure you want to delete this record ?"
+msgstr "Är du säker på att du vill radera denna post?"
+
+#. openerp-web
+#: addons/web_kanban/static/src/xml/web_kanban.xml:5
+msgid "Create"
+msgstr "Skapa"
+
+#. openerp-web
+#: addons/web_kanban/static/src/xml/web_kanban.xml:41
+msgid "Show more... ("
+msgstr "Visa mer... ("
+
+#. openerp-web
+#: addons/web_kanban/static/src/xml/web_kanban.xml:41
+msgid "remaining)"
+msgstr "återstående)"
+
+#. openerp-web
+#: addons/web_kanban/static/src/xml/web_kanban.xml:59
+msgid "</tr><tr>"
+msgstr "</tr><tr>"
diff --git a/addons/web_mobile/i18n/sv.po b/addons/web_mobile/i18n/sv.po
new file mode 100644
index 00000000000..d0dc990c7c8
--- /dev/null
+++ b/addons/web_mobile/i18n/sv.po
@@ -0,0 +1,106 @@
+# Swedish translation for openerp-web
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openerp-web package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openerp-web\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-02-07 10:13+0100\n"
+"PO-Revision-Date: 2012-04-17 12:46+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Swedish <sv@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:57+0000\n"
+"X-Generator: Launchpad (build 15108)\n"
+
+#. openerp-web
+#: addons/web_mobile/static/src/xml/web_mobile.xml:17
+msgid "OpenERP"
+msgstr "OpenERP"
+
+#. openerp-web
+#: addons/web_mobile/static/src/xml/web_mobile.xml:22
+msgid "Database:"
+msgstr "Databas:"
+
+#. openerp-web
+#: addons/web_mobile/static/src/xml/web_mobile.xml:30
+msgid "Login:"
+msgstr "Användarnamn:"
+
+#. openerp-web
+#: addons/web_mobile/static/src/xml/web_mobile.xml:32
+msgid "Password:"
+msgstr "Lösenord:"
+
+#. openerp-web
+#: addons/web_mobile/static/src/xml/web_mobile.xml:34
+msgid "Login"
+msgstr "Logga in"
+
+#. openerp-web
+#: addons/web_mobile/static/src/xml/web_mobile.xml:36
+msgid "Bad username or password"
+msgstr "Fel användanamn eller lösenord"
+
+#. openerp-web
+#: addons/web_mobile/static/src/xml/web_mobile.xml:42
+msgid "Powered by openerp.com"
+msgstr "Baserad på openerp.com"
+
+#. openerp-web
+#: addons/web_mobile/static/src/xml/web_mobile.xml:49
+msgid "Home"
+msgstr "Hem"
+
+#. openerp-web
+#: addons/web_mobile/static/src/xml/web_mobile.xml:57
+msgid "Favourite"
+msgstr "Favorit"
+
+#. openerp-web
+#: addons/web_mobile/static/src/xml/web_mobile.xml:58
+msgid "Preference"
+msgstr "Inställning"
+
+#. openerp-web
+#: addons/web_mobile/static/src/xml/web_mobile.xml:123
+msgid "Logout"
+msgstr "Logga ut"
+
+#. openerp-web
+#: addons/web_mobile/static/src/xml/web_mobile.xml:132
+msgid "There are no records to show."
+msgstr "Det finns inte några poster att visa."
+
+#. openerp-web
+#: addons/web_mobile/static/src/xml/web_mobile.xml:183
+msgid "Open this resource"
+msgstr "Öppna denna resurs"
+
+#. openerp-web
+#: addons/web_mobile/static/src/xml/web_mobile.xml:223
+#: addons/web_mobile/static/src/xml/web_mobile.xml:226
+msgid "Percent of tasks closed according to total of tasks to do..."
+msgstr "Andel avslutade uppgifter i jämförelse med alla..."
+
+#. openerp-web
+#: addons/web_mobile/static/src/xml/web_mobile.xml:264
+#: addons/web_mobile/static/src/xml/web_mobile.xml:268
+msgid "On"
+msgstr "På"
+
+#. openerp-web
+#: addons/web_mobile/static/src/xml/web_mobile.xml:265
+#: addons/web_mobile/static/src/xml/web_mobile.xml:269
+msgid "Off"
+msgstr "Av"
+
+#. openerp-web
+#: addons/web_mobile/static/src/xml/web_mobile.xml:294
+msgid "Form View"
+msgstr "Formulär"
diff --git a/addons/web_process/i18n/bs.po b/addons/web_process/i18n/bs.po
new file mode 100644
index 00000000000..7685aeea7ff
--- /dev/null
+++ b/addons/web_process/i18n/bs.po
@@ -0,0 +1,118 @@
+# Bosnian translation for openerp-web
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openerp-web package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openerp-web\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-02-07 19:19+0100\n"
+"PO-Revision-Date: 2012-04-17 17:00+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Bosnian <bs@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:57+0000\n"
+"X-Generator: Launchpad (build 15108)\n"
+
+#. openerp-web
+#: addons/web_process/static/src/js/process.js:261
+msgid "Cancel"
+msgstr "Otkaži"
+
+#. openerp-web
+#: addons/web_process/static/src/js/process.js:262
+msgid "Save"
+msgstr "Spasi"
+
+#. openerp-web
+#: addons/web_process/static/src/xml/web_process.xml:6
+msgid "Process View"
+msgstr "Pregled Procesa"
+
+#. openerp-web
+#: addons/web_process/static/src/xml/web_process.xml:19
+msgid "Documentation"
+msgstr "Dokumentacija"
+
+#. openerp-web
+#: addons/web_process/static/src/xml/web_process.xml:19
+msgid "Read Documentation Online"
+msgstr "Čitaj Dokumentaciju Online"
+
+#. openerp-web
+#: addons/web_process/static/src/xml/web_process.xml:25
+msgid "Forum"
+msgstr "Forum"
+
+#. openerp-web
+#: addons/web_process/static/src/xml/web_process.xml:25
+msgid "Community Discussion"
+msgstr "Zajednička Diskusija"
+
+#. openerp-web
+#: addons/web_process/static/src/xml/web_process.xml:31
+msgid "Books"
+msgstr "Knjige"
+
+#. openerp-web
+#: addons/web_process/static/src/xml/web_process.xml:31
+msgid "Get the books"
+msgstr "Nabavite knjige"
+
+#. openerp-web
+#: addons/web_process/static/src/xml/web_process.xml:37
+msgid "OpenERP Enterprise"
+msgstr "Pokreni OpenERP"
+
+#. openerp-web
+#: addons/web_process/static/src/xml/web_process.xml:37
+msgid "Purchase OpenERP Enterprise"
+msgstr "Kupi OpenERP Enterprise"
+
+#. openerp-web
+#: addons/web_process/static/src/xml/web_process.xml:52
+msgid "Process"
+msgstr "Proces"
+
+#. openerp-web
+#: addons/web_process/static/src/xml/web_process.xml:56
+msgid "Notes:"
+msgstr "Bilješke:"
+
+#. openerp-web
+#: addons/web_process/static/src/xml/web_process.xml:59
+msgid "Last modified by:"
+msgstr "Posljednje modifikovano od:"
+
+#. openerp-web
+#: addons/web_process/static/src/xml/web_process.xml:59
+msgid "N/A"
+msgstr "N/A"
+
+#. openerp-web
+#: addons/web_process/static/src/xml/web_process.xml:62
+msgid "Subflows:"
+msgstr ""
+
+#. openerp-web
+#: addons/web_process/static/src/xml/web_process.xml:75
+msgid "Related:"
+msgstr "Srodnost:"
+
+#. openerp-web
+#: addons/web_process/static/src/xml/web_process.xml:88
+msgid "Select Process"
+msgstr "Odabrani Proces"
+
+#. openerp-web
+#: addons/web_process/static/src/xml/web_process.xml:98
+msgid "Select"
+msgstr "Izaberi"
+
+#. openerp-web
+#: addons/web_process/static/src/xml/web_process.xml:109
+msgid "Edit Process"
+msgstr "Edituj proces"
diff --git a/addons/web_process/i18n/sv.po b/addons/web_process/i18n/sv.po
new file mode 100644
index 00000000000..f054ab1ce45
--- /dev/null
+++ b/addons/web_process/i18n/sv.po
@@ -0,0 +1,118 @@
+# Swedish translation for openerp-web
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openerp-web package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openerp-web\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-02-07 19:19+0100\n"
+"PO-Revision-Date: 2012-04-17 12:42+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Swedish <sv@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:57+0000\n"
+"X-Generator: Launchpad (build 15108)\n"
+
+#. openerp-web
+#: addons/web_process/static/src/js/process.js:261
+msgid "Cancel"
+msgstr "Avbryt"
+
+#. openerp-web
+#: addons/web_process/static/src/js/process.js:262
+msgid "Save"
+msgstr "Spara"
+
+#. openerp-web
+#: addons/web_process/static/src/xml/web_process.xml:6
+msgid "Process View"
+msgstr "Processvy"
+
+#. openerp-web
+#: addons/web_process/static/src/xml/web_process.xml:19
+msgid "Documentation"
+msgstr "Dokumentation"
+
+#. openerp-web
+#: addons/web_process/static/src/xml/web_process.xml:19
+msgid "Read Documentation Online"
+msgstr "Läs online-dokumentationen"
+
+#. openerp-web
+#: addons/web_process/static/src/xml/web_process.xml:25
+msgid "Forum"
+msgstr "Forum"
+
+#. openerp-web
+#: addons/web_process/static/src/xml/web_process.xml:25
+msgid "Community Discussion"
+msgstr "Diskussion i användarföreningen"
+
+#. openerp-web
+#: addons/web_process/static/src/xml/web_process.xml:31
+msgid "Books"
+msgstr "Böcker"
+
+#. openerp-web
+#: addons/web_process/static/src/xml/web_process.xml:31
+msgid "Get the books"
+msgstr "Komma över böckerna"
+
+#. openerp-web
+#: addons/web_process/static/src/xml/web_process.xml:37
+msgid "OpenERP Enterprise"
+msgstr "OpenERP Enterprise"
+
+#. openerp-web
+#: addons/web_process/static/src/xml/web_process.xml:37
+msgid "Purchase OpenERP Enterprise"
+msgstr "Köp OpenERP Enterprise"
+
+#. openerp-web
+#: addons/web_process/static/src/xml/web_process.xml:52
+msgid "Process"
+msgstr "Process"
+
+#. openerp-web
+#: addons/web_process/static/src/xml/web_process.xml:56
+msgid "Notes:"
+msgstr "Anteckningar:"
+
+#. openerp-web
+#: addons/web_process/static/src/xml/web_process.xml:59
+msgid "Last modified by:"
+msgstr "Senast ändrad av:"
+
+#. openerp-web
+#: addons/web_process/static/src/xml/web_process.xml:59
+msgid "N/A"
+msgstr "Ej tillgänglig"
+
+#. openerp-web
+#: addons/web_process/static/src/xml/web_process.xml:62
+msgid "Subflows:"
+msgstr "Underflöde"
+
+#. openerp-web
+#: addons/web_process/static/src/xml/web_process.xml:75
+msgid "Related:"
+msgstr "Relaterad:"
+
+#. openerp-web
+#: addons/web_process/static/src/xml/web_process.xml:88
+msgid "Select Process"
+msgstr "Välj process"
+
+#. openerp-web
+#: addons/web_process/static/src/xml/web_process.xml:98
+msgid "Select"
+msgstr "Välj"
+
+#. openerp-web
+#: addons/web_process/static/src/xml/web_process.xml:109
+msgid "Edit Process"
+msgstr "Ändra processen"

From 0b3956e2b4fd4512b4952dd6286b756da190e1b5 Mon Sep 17 00:00:00 2001
From: "Turkesh Patel (Open ERP)" <tpa@tinyerp.com>
Date: Wed, 18 Apr 2012 10:56:25 +0530
Subject: [PATCH 143/238] [IMP] crm: Improved code to make pending state
 records bold

bzr revid: tpa@tinyerp.com-20120418052625-i56b39c38pdd5gfh
---
 addons/crm/crm_lead_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/crm/crm_lead_view.xml b/addons/crm/crm_lead_view.xml
index 7a985c94b71..655fdeba793 100644
--- a/addons/crm/crm_lead_view.xml
+++ b/addons/crm/crm_lead_view.xml
@@ -169,7 +169,7 @@
         <field name="model">crm.lead</field>
         <field name="type">tree</field>
         <field name="arch" type="xml">
-            <tree string="Leads"  colors="blue:state=='pending';grey:state in ('cancel', 'done')">
+            <tree string="Leads" fonts="bold:state=='pending'" colors="blue:state=='pending';grey:state in ('cancel', 'done')">
                 <field name="date_deadline" invisible="1"/>
                 <field name="create_date" groups="base.group_no_one"/>
                 <field name="name" string="Subject"/>

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 144/238] [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 145/238] [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 146/238] [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 147/238] [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 148/238] [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 149/238] [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 150/238] [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 151/238] [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 aca7ed80a5a00f6034fa774b63d83c51f17a34a5 Mon Sep 17 00:00:00 2001
From: "Turkesh Patel (Open ERP)" <tpa@tinyerp.com>
Date: Wed, 18 Apr 2012 14:52:54 +0530
Subject: [PATCH 152/238] [IMP] Improved code.

bzr revid: tpa@tinyerp.com-20120418092254-2htqligvh8ov0qkr
---
 addons/web/static/src/js/view_list.js | 21 ++++++++++++++-------
 1 file changed, 14 insertions(+), 7 deletions(-)

diff --git a/addons/web/static/src/js/view_list.js b/addons/web/static/src/js/view_list.js
index de8b25fafe8..57268cb947c 100644
--- a/addons/web/static/src/js/view_list.js
+++ b/addons/web/static/src/js/view_list.js
@@ -148,9 +148,9 @@ instance.web.ListView = instance.web.View.extend( /** @lends instance.web.ListVi
      * @returns {String} CSS color declaration
      */
     color_for: function (record) {
-       var style= '';
+        var style= '';
 
-       var context = _.extend({}, record.attributes, {
+        var context = _.extend({}, record.attributes, {
             uid: this.session.uid,
             current_date: new Date().toString('yyyy-MM-dd')
             // TODO: time, datetime, relativedelta
@@ -162,9 +162,17 @@ instance.web.ListView = instance.web.View.extend( /** @lends instance.web.ListVi
                     font = pair[0],
                     expression = pair[1];
                 if (py.evaluate(expression, context).toJSON()) {
-                    if (font == 'bold'){style = 'font-weight: bold;';}
-                    if (font == 'italic'){style = 'font-style: italic;';}
-                    if (font == 'underline'){style = 'text-decoration: underline;';}
+                    switch(font) {
+                    case 'bold':
+                        style += 'font-weight: bold;';
+                        break;
+                    case 'italic':
+                        style += 'font-style: italic;';
+                        break;
+                    case 'underline':
+                        style += 'text-decoration: underline;';
+                        break;
+                    }
                 }
 	        }
 	    }
@@ -175,8 +183,7 @@ instance.web.ListView = instance.web.View.extend( /** @lends instance.web.ListVi
                 color = pair[0],
                 expression = pair[1];
             if (py.evaluate(expression, context).toJSON()) {
-                style += 'color: ' + color + ';'
-                return style;
+                return style += 'color: ' + color + ';';
             }
             // TODO: handle evaluation errors
         }

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 153/238] [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 154/238] [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 a133899580a090e2e5b782bb5c0e4338301409a2 Mon Sep 17 00:00:00 2001
From: "Turkesh Patel (Open ERP)" <tpa@tinyerp.com>
Date: Wed, 18 Apr 2012 15:12:25 +0530
Subject: [PATCH 155/238] [IMP] Improved code

bzr revid: tpa@tinyerp.com-20120418094225-slnzultyxctu5n4r
---
 addons/web/static/src/js/view_list.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/web/static/src/js/view_list.js b/addons/web/static/src/js/view_list.js
index 57268cb947c..0b9792e2760 100644
--- a/addons/web/static/src/js/view_list.js
+++ b/addons/web/static/src/js/view_list.js
@@ -229,7 +229,7 @@ instance.web.ListView = instance.web.View.extend( /** @lends instance.web.ListVi
         }
 
         if (this.fields_view.arch.attrs.fonts) {
-            this.fonts = _(this.fields_view.arch.attrs.fonts.split(',')).chain().compact()
+            this.fonts = _(this.fields_view.arch.attrs.fonts.split(';')).chain().compact()
                 .map(function(font_pair) {
                     var pair = font_pair.split(':'),
                         font = pair[0],

From 9fdb49c897e73428573198cd01949b833646dc66 Mon Sep 17 00:00:00 2001
From: "Turkesh Patel (Open ERP)" <tpa@tinyerp.com>
Date: Wed, 18 Apr 2012 15:15:24 +0530
Subject: [PATCH 156/238] [IMP] set indentation

bzr revid: tpa@tinyerp.com-20120418094524-l2nqten0ngq78957
---
 addons/web/static/src/js/view_list.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/web/static/src/js/view_list.js b/addons/web/static/src/js/view_list.js
index 0b9792e2760..ea8898f8751 100644
--- a/addons/web/static/src/js/view_list.js
+++ b/addons/web/static/src/js/view_list.js
@@ -174,8 +174,8 @@ instance.web.ListView = instance.web.View.extend( /** @lends instance.web.ListVi
                         break;
                     }
                 }
-	        }
-	    }
+            }
+        }
 
         if (!this.colors) { return style; }
         for(var i=0, len=this.colors.length; i<len; ++i) {

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 157/238] [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 158/238] [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 159/238] [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 160/238] [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 161/238] [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 162/238] [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 163/238] [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 48a29b04ebea28175681723287f61eee45bdd5f2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Wed, 18 Apr 2012 13:34:55 +0200
Subject: [PATCH 164/238] [FIX] Made mail_group_data noupdate.

bzr revid: tde@openerp.com-20120418113455-kgbespexp5q2re7y
---
 addons/mail/mail_group_data.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/mail/mail_group_data.xml b/addons/mail/mail_group_data.xml
index bbaa7748f16..c2d1762d6ae 100644
--- a/addons/mail/mail_group_data.xml
+++ b/addons/mail/mail_group_data.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
-    <data>
+    <data noupdate="1">
 
         <record model="mail.group" id="group_all_company">
             <field name="name">All Company</field>

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 165/238] [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 166/238] [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 167/238] [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 168/238] [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 a2422471599e1f5e6ae15c7ec15a24c410ad3215 Mon Sep 17 00:00:00 2001
From: "Turkesh Patel (Open ERP)" <tpa@tinyerp.com>
Date: Wed, 18 Apr 2012 17:23:16 +0530
Subject: [PATCH 169/238] [IMP] Improved name of function and comment

bzr revid: tpa@tinyerp.com-20120418115316-bndil056lk25ni3g
---
 addons/web/static/src/js/view_list.js | 8 ++++----
 addons/web/static/src/xml/base.xml    | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/addons/web/static/src/js/view_list.js b/addons/web/static/src/js/view_list.js
index ea8898f8751..b1e8fe3a958 100644
--- a/addons/web/static/src/js/view_list.js
+++ b/addons/web/static/src/js/view_list.js
@@ -141,13 +141,13 @@ instance.web.ListView = instance.web.View.extend( /** @lends instance.web.ListVi
         return this.reload_view(null, null, true);
     },
     /**
-     * Returns the color for the provided record in the current view (from the
-     * ``@colors`` attribute)
+     * Returns the style for the provided record in the current view (from the
+     * ``@colors`` attribute and ``@fonts`` attribute)
      *
      * @param {Record} record record for the current row
-     * @returns {String} CSS color declaration
+     * @returns {String} CSS style declaration
      */
-    color_for: function (record) {
+    style_for: function (record) {
         var style= '';
 
         var context = _.extend({}, record.attributes, {
diff --git a/addons/web/static/src/xml/base.xml b/addons/web/static/src/xml/base.xml
index f365abf8856..3291aef0398 100644
--- a/addons/web/static/src/xml/base.xml
+++ b/addons/web/static/src/xml/base.xml
@@ -670,7 +670,7 @@
 </t>
 <tr t-name="ListView.row" t-att-class="row_parity"
         t-att-data-id="record.get('id')"
-        t-att-style="view.color_for(record)">
+        t-att-style="view.style_for(record)">
     <t t-foreach="columns" t-as="column">
         <td t-if="column.meta">
 

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 170/238] [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 171/238] [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 1aa720a73d1423c50a6acdb8b99b1245af286b70 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Wed, 18 Apr 2012 14:31:50 +0200
Subject: [PATCH 172/238] [FIX] Fixed date formatting in several messages. It
 now adds the user timezone to add coherence.

bzr revid: tde@openerp.com-20120418123150-dtw13rhrrhqibo1e
---
 addons/crm/crm_meeting.py   | 7 ++++++-
 addons/crm/crm_phonecall.py | 6 +++++-
 addons/mrp/mrp.py           | 6 +++++-
 addons/purchase/purchase.py | 7 +++++--
 addons/sale/sale.py         | 7 +++++--
 5 files changed, 26 insertions(+), 7 deletions(-)

diff --git a/addons/crm/crm_meeting.py b/addons/crm/crm_meeting.py
index d3b427246e3..70f1d7bff1e 100644
--- a/addons/crm/crm_meeting.py
+++ b/addons/crm/crm_meeting.py
@@ -22,6 +22,7 @@
 from base_calendar import base_calendar
 from crm import crm_base, crm_case
 from osv import fields, osv
+import tools
 from tools.translate import _
 import logging
 
@@ -99,7 +100,11 @@ class crm_meeting(crm_base, osv.osv):
         # update context: if come from phonecall, default state values can make the message_append_note crash
         context.pop('default_state', False)
         for meeting in self.browse(cr, uid, ids, context=context):
-            message = _("A meeting has been <b>scheduled</b> on <em>%s</em>.") % (meeting.date)
+            # convert datetime field to a datetime, using server format, then
+            # convert it to the user TZ and re-render it with %Z to add the timezone
+            meeting_datetime = fields.DT.datetime.strptime(meeting.date, tools.DEFAULT_SERVER_DATETIME_FORMAT)
+            meeting_date_str = fields.datetime.context_timestamp(cr, uid, meeting_datetime, context=context).strftime(tools.DATETIME_FORMATS_MAP['%+'] + " (%Z)")
+            message = _("A meeting has been <b>scheduled</b> on <em>%s</em>.") % (meeting_date_str)
             if meeting.opportunity_id: # meeting can be create from phonecalls or opportunities, therefore checking for the parent
                 lead = meeting.opportunity_id
                 parent_message = _("Meeting linked to the opportunity <em>%s</em> has been <b>created</b> and <b>cscheduled</b> on <em>%s</em>.") % (lead.name, meeting.date)
diff --git a/addons/crm/crm_phonecall.py b/addons/crm/crm_phonecall.py
index 4fad3ad30ff..bf3439d4461 100644
--- a/addons/crm/crm_phonecall.py
+++ b/addons/crm/crm_phonecall.py
@@ -323,7 +323,11 @@ class crm_phonecall(crm_base, osv.osv):
             phonecall.message_subscribe([phonecall.user_id.id], context=context)
             if phonecall.opportunity_id:
                 lead = phonecall.opportunity_id
-                message = _("Phonecall linked to the opportunity <em>%s</em> has been <b>created</b> and <b>scheduled</b> on <em>%s</em>.") % (lead.name, phonecall.date)
+                # convert datetime field to a datetime, using server format, then
+                # convert it to the user TZ and re-render it with %Z to add the timezone
+                phonecall_datetime = fields.DT.datetime.strptime(phonecall.date, tools.DEFAULT_SERVER_DATETIME_FORMAT)
+                phonecall_date_str = fields.datetime.context_timestamp(cr, uid, phonecall_datetime, context=context).strftime(tools.DATETIME_FORMATS_MAP['%+'] + " (%Z)")
+                message = _("Phonecall linked to the opportunity <em>%s</em> has been <b>created</b> and <b>scheduled</b> on <em>%s</em>.") % (lead.name, phonecall_date_str)
             else:
                 message = _("Phonecall has been <b>created and opened</b>.")
             phonecall.message_append_note(body=message)
diff --git a/addons/mrp/mrp.py b/addons/mrp/mrp.py
index 9ff3a648af9..22328be87e7 100644
--- a/addons/mrp/mrp.py
+++ b/addons/mrp/mrp.py
@@ -1073,7 +1073,11 @@ class mrp_production(osv.osv):
 
     def action_confirm_send_note(self, cr, uid, ids, context=None):
         for obj in self.browse(cr, uid, ids, context=context):
-            message = _("Manufacturing order has been <b>confirmed</b> and is <b>scheduled</b> for the <em>%s</em>.") % (obj.date_planned)
+            # convert datetime field to a datetime, using server format, then
+            # convert it to the user TZ and re-render it with %Z to add the timezone
+            obj_datetime = fields.DT.datetime.strptime(obj.date_planned, tools.DEFAULT_SERVER_DATETIME_FORMAT)
+            obj_date_str = fields.datetime.context_timestamp(cr, uid, obj_datetime, context=context).strftime(tools.DATETIME_FORMATS_MAP['%+'] + " (%Z)")
+            message = _("Manufacturing order has been <b>confirmed</b> and is <b>scheduled</b> for the <em>%s</em>.") % (obj_date_str)
             self.message_append_note(cr, uid, [obj.id], body=message, context=context)
         return True
 
diff --git a/addons/purchase/purchase.py b/addons/purchase/purchase.py
index e0c64b5d2a1..09321ebd7eb 100644
--- a/addons/purchase/purchase.py
+++ b/addons/purchase/purchase.py
@@ -672,8 +672,11 @@ class purchase_order(osv.osv):
     def shipment_send_note(self, cr, uid, ids, picking_id, context=None):
         for order in self.browse(cr, uid, ids, context=context):
             for picking in (pck for pck in order.picking_ids if pck.id == picking_id):
-                pck_date =  datetime.strptime(picking.min_date, '%Y-%m-%d %H:%M:%S').strftime('%m/%d/%Y')
-                self.message_append_note(cr, uid, [order.id], body=_("Shipment <em>%s</em> <b>scheduled</b> for %s.") % (picking.name, pck_date), context=context)
+                # convert datetime field to a datetime, using server format, then
+                # convert it to the user TZ and re-render it with %Z to add the timezone
+                picking_datetime = fields.DT.datetime.strptime(picking.min_date, tools.DEFAULT_SERVER_DATETIME_FORMAT)
+                picking_date_str = fields.datetime.context_timestamp(cr, uid, meeting_datetime, context=context).strftime(tools.DATETIME_FORMATS_MAP['%+'] + " (%Z)")
+                self.message_append_note(cr, uid, [order.id], body=_("Shipment <em>%s</em> <b>scheduled</b> for %s.") % (picking.name, picking_date_str), context=context)
     
     def invoice_send_note(self, cr, uid, ids, invoice_id, context=None):
         for order in self.browse(cr, uid, ids, context=context):
diff --git a/addons/sale/sale.py b/addons/sale/sale.py
index 5ba6824fe19..cb351311a68 100644
--- a/addons/sale/sale.py
+++ b/addons/sale/sale.py
@@ -940,8 +940,11 @@ class sale_order(osv.osv):
     def delivery_send_note(self, cr, uid, ids, picking_id, context=None):
         for order in self.browse(cr, uid, ids, context=context):
             for picking in (pck for pck in order.picking_ids if pck.id == picking_id):
-                pck_date =  datetime.strptime(picking.min_date, '%Y-%m-%d %H:%M:%S').strftime('%m/%d/%Y')
-                self.message_append_note(cr, uid, [order.id], body=_("Delivery Order <em>%s</em> <b>scheduled</b> for %s.") % (picking.name, pck_date), context=context)
+                # convert datetime field to a datetime, using server format, then
+                # convert it to the user TZ and re-render it with %Z to add the timezone
+                picking_datetime = fields.DT.datetime.strptime(picking.min_date, tools.DEFAULT_SERVER_DATETIME_FORMAT)
+                picking_date_str = fields.datetime.context_timestamp(cr, uid, meeting_datetime, context=context).strftime(tools.DATETIME_FORMATS_MAP['%+'] + " (%Z)")
+                self.message_append_note(cr, uid, [order.id], body=_("Delivery Order <em>%s</em> <b>scheduled</b> for %s.") % (picking.name, picking_date_str), context=context)
     
     def delivery_end_send_note(self, cr, uid, ids, context=None):
         self.message_append_note(cr, uid, ids, body=_("Order <b>delivered</b>."), context=context)

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 173/238] [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 174/238] [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 4ab750b80d3f168801972a5b826ea7560552c4ce Mon Sep 17 00:00:00 2001
From: "Turkesh Patel (Open ERP)" <tpa@tinyerp.com>
Date: Wed, 18 Apr 2012 18:21:24 +0530
Subject: [PATCH 175/238] [IMP] added example for fonts attribute

bzr revid: tpa@tinyerp.com-20120418125124-syv5no1dsv98e1h4
---
 addons/crm/crm_lead_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/crm/crm_lead_view.xml b/addons/crm/crm_lead_view.xml
index 655fdeba793..9a94144823b 100644
--- a/addons/crm/crm_lead_view.xml
+++ b/addons/crm/crm_lead_view.xml
@@ -169,7 +169,7 @@
         <field name="model">crm.lead</field>
         <field name="type">tree</field>
         <field name="arch" type="xml">
-            <tree string="Leads" fonts="bold:state=='pending'" colors="blue:state=='pending';grey:state in ('cancel', 'done')">
+            <tree string="Leads" fonts="bold:state=='pending';underline:state=='cancel';italic:state=='done'" colors="blue:state=='pending';grey:state in ('cancel', 'done')">
                 <field name="date_deadline" invisible="1"/>
                 <field name="create_date" groups="base.group_no_one"/>
                 <field name="name" string="Subject"/>

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 176/238] [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 177/238] [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 178/238] [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 5b89f73e3ed25e881c5635916c41f00e2a4d8031 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Wed, 18 Apr 2012 15:41:43 +0200
Subject: [PATCH 179/238] [FIX] Fixed missing imports.

bzr revid: tde@openerp.com-20120418134143-fb9c3sf7oudju7ey
---
 addons/crm/crm_phonecall.py | 5 +++--
 addons/mrp/mrp.py           | 5 +++--
 addons/purchase/purchase.py | 6 +++---
 addons/sale/sale.py         | 6 +++---
 4 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/addons/crm/crm_phonecall.py b/addons/crm/crm_phonecall.py
index bf3439d4461..e869c2a890a 100644
--- a/addons/crm/crm_phonecall.py
+++ b/addons/crm/crm_phonecall.py
@@ -24,6 +24,7 @@ from osv import fields, osv
 from tools.translate import _
 import crm
 import time
+from tools import DEFAULT_SERVER_DATE_FORMAT, DEFAULT_SERVER_DATETIME_FORMAT, DATETIME_FORMATS_MAP
 from datetime import datetime
 
 class crm_phonecall(crm_base, osv.osv):
@@ -325,8 +326,8 @@ class crm_phonecall(crm_base, osv.osv):
                 lead = phonecall.opportunity_id
                 # convert datetime field to a datetime, using server format, then
                 # convert it to the user TZ and re-render it with %Z to add the timezone
-                phonecall_datetime = fields.DT.datetime.strptime(phonecall.date, tools.DEFAULT_SERVER_DATETIME_FORMAT)
-                phonecall_date_str = fields.datetime.context_timestamp(cr, uid, phonecall_datetime, context=context).strftime(tools.DATETIME_FORMATS_MAP['%+'] + " (%Z)")
+                phonecall_datetime = fields.DT.datetime.strptime(phonecall.date, DEFAULT_SERVER_DATETIME_FORMAT)
+                phonecall_date_str = fields.datetime.context_timestamp(cr, uid, phonecall_datetime, context=context).strftime(DATETIME_FORMATS_MAP['%+'] + " (%Z)")
                 message = _("Phonecall linked to the opportunity <em>%s</em> has been <b>created</b> and <b>scheduled</b> on <em>%s</em>.") % (lead.name, phonecall_date_str)
             else:
                 message = _("Phonecall has been <b>created and opened</b>.")
diff --git a/addons/mrp/mrp.py b/addons/mrp/mrp.py
index 22328be87e7..88908884b26 100644
--- a/addons/mrp/mrp.py
+++ b/addons/mrp/mrp.py
@@ -22,6 +22,7 @@
 from datetime import datetime
 from osv import osv, fields
 import decimal_precision as dp
+from tools import DEFAULT_SERVER_DATE_FORMAT, DEFAULT_SERVER_DATETIME_FORMAT, DATETIME_FORMATS_MAP
 from tools.translate import _
 import netsvc
 import time
@@ -1075,8 +1076,8 @@ class mrp_production(osv.osv):
         for obj in self.browse(cr, uid, ids, context=context):
             # convert datetime field to a datetime, using server format, then
             # convert it to the user TZ and re-render it with %Z to add the timezone
-            obj_datetime = fields.DT.datetime.strptime(obj.date_planned, tools.DEFAULT_SERVER_DATETIME_FORMAT)
-            obj_date_str = fields.datetime.context_timestamp(cr, uid, obj_datetime, context=context).strftime(tools.DATETIME_FORMATS_MAP['%+'] + " (%Z)")
+            obj_datetime = fields.DT.datetime.strptime(obj.date_planned, DEFAULT_SERVER_DATETIME_FORMAT)
+            obj_date_str = fields.datetime.context_timestamp(cr, uid, obj_datetime, context=context).strftime(DATETIME_FORMATS_MAP['%+'] + " (%Z)")
             message = _("Manufacturing order has been <b>confirmed</b> and is <b>scheduled</b> for the <em>%s</em>.") % (obj_date_str)
             self.message_append_note(cr, uid, [obj.id], body=message, context=context)
         return True
diff --git a/addons/purchase/purchase.py b/addons/purchase/purchase.py
index 09321ebd7eb..4ca0521177c 100644
--- a/addons/purchase/purchase.py
+++ b/addons/purchase/purchase.py
@@ -29,7 +29,7 @@ import pooler
 from tools.translate import _
 import decimal_precision as dp
 from osv.orm import browse_record, browse_null
-from tools import DEFAULT_SERVER_DATE_FORMAT, DEFAULT_SERVER_DATETIME_FORMAT
+from tools import DEFAULT_SERVER_DATE_FORMAT, DEFAULT_SERVER_DATETIME_FORMAT, DATETIME_FORMATS_MAP
 
 #
 # Model definition
@@ -674,8 +674,8 @@ class purchase_order(osv.osv):
             for picking in (pck for pck in order.picking_ids if pck.id == picking_id):
                 # convert datetime field to a datetime, using server format, then
                 # convert it to the user TZ and re-render it with %Z to add the timezone
-                picking_datetime = fields.DT.datetime.strptime(picking.min_date, tools.DEFAULT_SERVER_DATETIME_FORMAT)
-                picking_date_str = fields.datetime.context_timestamp(cr, uid, meeting_datetime, context=context).strftime(tools.DATETIME_FORMATS_MAP['%+'] + " (%Z)")
+                picking_datetime = fields.DT.datetime.strptime(picking.min_date, DEFAULT_SERVER_DATETIME_FORMAT)
+                picking_date_str = fields.datetime.context_timestamp(cr, uid, meeting_datetime, context=context).strftime(DATETIME_FORMATS_MAP['%+'] + " (%Z)")
                 self.message_append_note(cr, uid, [order.id], body=_("Shipment <em>%s</em> <b>scheduled</b> for %s.") % (picking.name, picking_date_str), context=context)
     
     def invoice_send_note(self, cr, uid, ids, invoice_id, context=None):
diff --git a/addons/sale/sale.py b/addons/sale/sale.py
index cb351311a68..17ad7eb19a0 100644
--- a/addons/sale/sale.py
+++ b/addons/sale/sale.py
@@ -25,7 +25,7 @@ import time
 import pooler
 from osv import fields, osv
 from tools.translate import _
-from tools import DEFAULT_SERVER_DATE_FORMAT, DEFAULT_SERVER_DATETIME_FORMAT, float_compare
+from tools import DEFAULT_SERVER_DATE_FORMAT, DEFAULT_SERVER_DATETIME_FORMAT, DATETIME_FORMATS_MAP, float_compare
 import decimal_precision as dp
 import netsvc
 
@@ -942,8 +942,8 @@ class sale_order(osv.osv):
             for picking in (pck for pck in order.picking_ids if pck.id == picking_id):
                 # convert datetime field to a datetime, using server format, then
                 # convert it to the user TZ and re-render it with %Z to add the timezone
-                picking_datetime = fields.DT.datetime.strptime(picking.min_date, tools.DEFAULT_SERVER_DATETIME_FORMAT)
-                picking_date_str = fields.datetime.context_timestamp(cr, uid, meeting_datetime, context=context).strftime(tools.DATETIME_FORMATS_MAP['%+'] + " (%Z)")
+                picking_datetime = fields.DT.datetime.strptime(picking.min_date, DEFAULT_SERVER_DATETIME_FORMAT)
+                picking_date_str = fields.datetime.context_timestamp(cr, uid, meeting_datetime, context=context).strftime(DATETIME_FORMATS_MAP['%+'] + " (%Z)")
                 self.message_append_note(cr, uid, [order.id], body=_("Delivery Order <em>%s</em> <b>scheduled</b> for %s.") % (picking.name, picking_date_str), context=context)
     
     def delivery_end_send_note(self, cr, uid, ids, context=None):

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 180/238] [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 181/238] [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 182/238] [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 fab959eda86ac5a3d40f48be8e6a4400ad34ca00 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Wed, 18 Apr 2012 17:00:26 +0200
Subject: [PATCH 183/238] [FIX] Fixed wrong var name due to copy and paste.

bzr revid: tde@openerp.com-20120418150026-mxct64r1cuoq5131
---
 addons/sale/sale.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/sale/sale.py b/addons/sale/sale.py
index 17ad7eb19a0..9caaa86878c 100644
--- a/addons/sale/sale.py
+++ b/addons/sale/sale.py
@@ -943,7 +943,7 @@ class sale_order(osv.osv):
                 # convert datetime field to a datetime, using server format, then
                 # convert it to the user TZ and re-render it with %Z to add the timezone
                 picking_datetime = fields.DT.datetime.strptime(picking.min_date, DEFAULT_SERVER_DATETIME_FORMAT)
-                picking_date_str = fields.datetime.context_timestamp(cr, uid, meeting_datetime, context=context).strftime(DATETIME_FORMATS_MAP['%+'] + " (%Z)")
+                picking_date_str = fields.datetime.context_timestamp(cr, uid, picking_datetime, context=context).strftime(DATETIME_FORMATS_MAP['%+'] + " (%Z)")
                 self.message_append_note(cr, uid, [order.id], body=_("Delivery Order <em>%s</em> <b>scheduled</b> for %s.") % (picking.name, picking_date_str), context=context)
     
     def delivery_end_send_note(self, cr, uid, ids, context=None):

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 184/238] [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 185/238] [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 186/238] [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 187/238] [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 188/238] [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 189/238] [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 190/238] [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 191/238] [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 192/238] [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 193/238] [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 194/238] [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 195/238] [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 196/238] [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 197/238] [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 198/238] 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 199/238] 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 8f5521955c0c6f08127661b231fe373cb17bdb97 Mon Sep 17 00:00:00 2001
From: "Sbh (Openerp)" <sbh@tinyerp.com>
Date: Thu, 19 Apr 2012 10:36:14 +0530
Subject: [PATCH 200/238] [ADD] Add the rst file for fontstyle feature

bzr revid: sbh@tinyerp.com-20120419050614-i1y33qfnkyoicngc
---
 doc/font_style.rst | 22 ++++++++++++++++++++++
 doc/index.rst      |  1 +
 2 files changed, 23 insertions(+)
 create mode 100644 doc/font_style.rst

diff --git a/doc/font_style.rst b/doc/font_style.rst
new file mode 100644
index 00000000000..f0261e9d144
--- /dev/null
+++ b/doc/font_style.rst
@@ -0,0 +1,22 @@
+Font style Feature
+=====================
+
+
+This revision adds font style feature in List view.
+
+Font style feature can be used by List view able to define the style of fonts based on the state of records.
+we can set the style of fonts bold , italic and underline by defining in the view.
+
+Rng modification
++++++++++++++++++
+
+This revision adds attribute fonts in view.rng
+
+Addon implementation example
+++++++++++++++++++++++++++++
+
+In your ``foo`` module, you want to specify that when it is in state ``pending`` then fons of the record should bold in list view
+
+::
+
+<tree string="XYZ"  fonts="bold:state=='pending'">
diff --git a/doc/index.rst b/doc/index.rst
index 815633aed54..187dd5ad009 100644
--- a/doc/index.rst
+++ b/doc/index.rst
@@ -19,6 +19,7 @@ Contents:
    addons
    development
    project
+   font_style
    old-version
 
 Indices and tables

From 7636eb0254395f0b22214e06c2a5a14564b3d2f7 Mon Sep 17 00:00:00 2001
From: "Turkesh Patel (Open ERP)" <tpa@tinyerp.com>
Date: Thu, 19 Apr 2012 10:47:56 +0530
Subject: [PATCH 201/238] [IMP] remove rst file

bzr revid: tpa@tinyerp.com-20120419051756-1pwvzli1yi3jgzi8
---
 doc/font_style.rst | 22 ----------------------
 doc/index.rst      |  1 -
 2 files changed, 23 deletions(-)
 delete mode 100644 doc/font_style.rst

diff --git a/doc/font_style.rst b/doc/font_style.rst
deleted file mode 100644
index f0261e9d144..00000000000
--- a/doc/font_style.rst
+++ /dev/null
@@ -1,22 +0,0 @@
-Font style Feature
-=====================
-
-
-This revision adds font style feature in List view.
-
-Font style feature can be used by List view able to define the style of fonts based on the state of records.
-we can set the style of fonts bold , italic and underline by defining in the view.
-
-Rng modification
-+++++++++++++++++
-
-This revision adds attribute fonts in view.rng
-
-Addon implementation example
-++++++++++++++++++++++++++++
-
-In your ``foo`` module, you want to specify that when it is in state ``pending`` then fons of the record should bold in list view
-
-::
-
-<tree string="XYZ"  fonts="bold:state=='pending'">
diff --git a/doc/index.rst b/doc/index.rst
index 187dd5ad009..815633aed54 100644
--- a/doc/index.rst
+++ b/doc/index.rst
@@ -19,7 +19,6 @@ Contents:
    addons
    development
    project
-   font_style
    old-version
 
 Indices and tables

From 303a168a3afa34816f6c2245373b44148e040c39 Mon Sep 17 00:00:00 2001
From: "Sbh (Openerp)" <sbh@tinyerp.com>
Date: Thu, 19 Apr 2012 10:56:44 +0530
Subject: [PATCH 202/238] [ADD] add the rst file for font feature

bzr revid: sbh@tinyerp.com-20120419052644-nkczuqh4zfzftcee
---
 doc/api/font_style.rst | 22 ++++++++++++++++++++++
 doc/index.rst.inc      |  1 +
 2 files changed, 23 insertions(+)
 create mode 100644 doc/api/font_style.rst

diff --git a/doc/api/font_style.rst b/doc/api/font_style.rst
new file mode 100644
index 00000000000..f0261e9d144
--- /dev/null
+++ b/doc/api/font_style.rst
@@ -0,0 +1,22 @@
+Font style Feature
+=====================
+
+
+This revision adds font style feature in List view.
+
+Font style feature can be used by List view able to define the style of fonts based on the state of records.
+we can set the style of fonts bold , italic and underline by defining in the view.
+
+Rng modification
++++++++++++++++++
+
+This revision adds attribute fonts in view.rng
+
+Addon implementation example
+++++++++++++++++++++++++++++
+
+In your ``foo`` module, you want to specify that when it is in state ``pending`` then fons of the record should bold in list view
+
+::
+
+<tree string="XYZ"  fonts="bold:state=='pending'">
diff --git a/doc/index.rst.inc b/doc/index.rst.inc
index 80873a696ec..98c01c8354e 100644
--- a/doc/index.rst.inc
+++ b/doc/index.rst.inc
@@ -15,3 +15,4 @@ New feature merges
 
    api/user_img_specs
    api/need_action_specs
+   api/font_style

From 4b9dfed78670d3630f09b238c2ef5548a405476e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Thu, 19 Apr 2012 09:53:54 +0200
Subject: [PATCH 203/238] [FIX] Wrong var name due to copy and paste.

bzr revid: tde@openerp.com-20120419075354-ympww3kc0xw35vpb
---
 addons/purchase/purchase.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/purchase/purchase.py b/addons/purchase/purchase.py
index 4ca0521177c..687221f371b 100644
--- a/addons/purchase/purchase.py
+++ b/addons/purchase/purchase.py
@@ -675,7 +675,7 @@ class purchase_order(osv.osv):
                 # convert datetime field to a datetime, using server format, then
                 # convert it to the user TZ and re-render it with %Z to add the timezone
                 picking_datetime = fields.DT.datetime.strptime(picking.min_date, DEFAULT_SERVER_DATETIME_FORMAT)
-                picking_date_str = fields.datetime.context_timestamp(cr, uid, meeting_datetime, context=context).strftime(DATETIME_FORMATS_MAP['%+'] + " (%Z)")
+                picking_date_str = fields.datetime.context_timestamp(cr, uid, picking_datetime, context=context).strftime(DATETIME_FORMATS_MAP['%+'] + " (%Z)")
                 self.message_append_note(cr, uid, [order.id], body=_("Shipment <em>%s</em> <b>scheduled</b> for %s.") % (picking.name, picking_date_str), context=context)
     
     def invoice_send_note(self, cr, uid, ids, invoice_id, context=None):

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 204/238] [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 205/238] [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 });
         });
     }
 });

From 8ef72c59e67d811119030b4c13afc92a2b09ee54 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Thu, 19 Apr 2012 10:58:38 +0200
Subject: [PATCH 206/238] [FIX] Dates on message are now displayed according to
 the user timezone.

bzr revid: tde@openerp.com-20120419085838-awmxdqjbsb8qyi38
---
 addons/mail/static/src/js/mail.js | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/addons/mail/static/src/js/mail.js b/addons/mail/static/src/js/mail.js
index 8e507416a37..d99674f98a7 100644
--- a/addons/mail/static/src/js/mail.js
+++ b/addons/mail/static/src/js/mail.js
@@ -275,6 +275,8 @@ openerp.mail = function(session) {
             record.tr_body = this.do_truncate_string(record.body, this.params.msg_more_limit);
             record.body = this.do_replace_internal_links(record.body);
             if (record.tr_body) record.tr_body = this.do_replace_internal_links(record.tr_body);
+            // format date according to the user timezone
+            record.date = session.web.format_value(record.date, {type:"datetime"});
             // render
             $(session.web.qweb.render('ThreadMsg', {'record': record, 'thread': this, 'params': this.params, 'display': this.display})
                     ).appendTo(this.$element.children('div.oe_mail_thread_display:first'));

From 8c6ad14da90c2bd0facda087bd956010253e043c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Thu, 19 Apr 2012 11:14:04 +0200
Subject: [PATCH 207/238] [DOC] Slightly improved documentation.

bzr revid: tde@openerp.com-20120419091404-1sskcrfiql1v7fe7
---
 doc/api/font_style.rst | 26 ++++++++++++++++----------
 1 file changed, 16 insertions(+), 10 deletions(-)

diff --git a/doc/api/font_style.rst b/doc/api/font_style.rst
index f0261e9d144..f47a654aa34 100644
--- a/doc/api/font_style.rst
+++ b/doc/api/font_style.rst
@@ -1,22 +1,28 @@
-Font style Feature
-=====================
+Font style in list views
+========================
 
+.. versionadded:: 7.0
 
-This revision adds font style feature in List view.
-
-Font style feature can be used by List view able to define the style of fonts based on the state of records.
-we can set the style of fonts bold , italic and underline by defining in the view.
+This revision adds font styles in list views. Before this revision it was
+possible to define some colors in list view. This revision allows to define 
+the a font style, based on an evaluated Python expression. The definition syntax is 
+the same than the colors feature. Supported styles are bold, italic and 
+underline.
 
 Rng modification
 +++++++++++++++++
 
-This revision adds attribute fonts in view.rng
+This revision adds the ``fonts`` optional attribute in ``view.rng``.
 
 Addon implementation example
 ++++++++++++++++++++++++++++
 
-In your ``foo`` module, you want to specify that when it is in state ``pending`` then fons of the record should bold in list view
+In your ``foo`` module, you want to specify that when any record is in ``pending`` 
+state then it should be displayed in bold in the list view. Edit your foo_view.xml
+file that define the views, and add the fonts attribute to the tree tag.
 
-::
+.. code-block:: xml
 
-<tree string="XYZ"  fonts="bold:state=='pending'">
+  <tree string="Foo List View" fonts="bold:state=='pending'">
+    [...]
+  </tree>

From a8e48a28174e2ad20f2158a214d8ff4853ff8953 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Thu, 19 Apr 2012 11:15:52 +0200
Subject: [PATCH 208/238] [FIX] forgotten root rename

bzr revid: xmo@openerp.com-20120419091552-8jqbyhwk6c9rqi0e
---
 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 7e5b173fd37..47cee79ffcb 100644
--- a/addons/web/static/src/js/view_form.js
+++ b/addons/web/static/src/js/view_form.js
@@ -2291,7 +2291,7 @@ instance.web.form.FieldMany2One = instance.web.form.AbstractField.extend(_.exten
         this.last_search = [];
         this.floating = false;
         this.inhibit_on_change = false;
-        this.orderer = new openerp.web.DropMisordered();
+        this.orderer = new instance.web.DropMisordered();
     },
     start: function() {
         this._super();

From b55d7abf1c9eb387722e6f62e729276fba2a07a1 Mon Sep 17 00:00:00 2001
From: "Kuldeep Joshi (OpenERP)" <kjo@tinyerp.com>
Date: Thu, 19 Apr 2012 15:18:52 +0530
Subject: [PATCH 209/238] [IMP]project,project_issue: add listview bold feature

bzr revid: kjo@tinyerp.com-20120419094852-w5s0evbdt2z4nf8x
---
 addons/project/project_view.xml             | 6 ++++--
 addons/project_issue/project_issue_view.xml | 3 ++-
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml
index c48b075721a..63898cb518d 100644
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -140,8 +140,9 @@
             <field name="type">tree</field>
             <field name="field_parent">child_ids</field>
             <field name="arch" type="xml">
-                <tree colors="red:date and (date&lt;current_date) and (state == 'open');blue:state in ('draft','pending');grey: state in ('close','cancelled')" string="Projects">
+                <tree fonts="bold:needaction_pending==True" colors="red:date and (date&lt;current_date) and (state == 'open');blue:state in ('draft','pending');grey: state in ('close','cancelled')" string="Projects">
                     <field name="sequence" invisible="1"/>
+                    <field name="needaction_pending" invisible="1"/>
                     <field name="date" invisible="1"/>
                     <field name="name" string="Project Name"/>
                     <field name="user_id" string="Project Manager"/>
@@ -414,7 +415,8 @@
             <field name="type">tree</field>
             <field eval="2" name="priority"/>
             <field name="arch" type="xml">
-                <tree colors="grey:state in ('cancelled','done');blue:state == 'pending';red:date_deadline and (date_deadline&lt;current_date) and (state in ('draft','pending','open'))" string="Tasks">
+                <tree fonts="bold:needaction_pending==True" colors="grey:state in ('cancelled','done');blue:state == 'pending';red:date_deadline and (date_deadline&lt;current_date) and (state in ('draft','pending','open'))" string="Tasks">
+                    <field name="needaction_pending" invisible="1"/>
                     <field name="sequence" invisible="not context.get('seq_visible', False)"/>
                     <field name="name"/>
                     <field name="project_id" icon="gtk-indent" invisible="context.get('user_invisible', False)"/>
diff --git a/addons/project_issue/project_issue_view.xml b/addons/project_issue/project_issue_view.xml
index cb532f4af38..50c79346127 100644
--- a/addons/project_issue/project_issue_view.xml
+++ b/addons/project_issue/project_issue_view.xml
@@ -123,7 +123,8 @@
             <field name="model">project.issue</field>
             <field name="type">tree</field>
             <field name="arch" type="xml">
-                <tree string="Issue Tracker Tree" colors="black:state=='open';blue:state=='pending';grey:state in ('cancel', 'done')">
+                <tree fonts="bold:needaction_pending==True" string="Issue Tracker Tree" colors="black:state=='open';blue:state=='pending';grey:state in ('cancel', 'done')">
+                    <field name="needaction_pending" invisible="1"/>
                     <field name="id"/>
                     <field name="create_date" groups="base.group_no_one"/>
                     <field name="name"/>

From ac8646d3223bfa052cbb81d94fe1076f58b50f8c Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Thu, 19 Apr 2012 11:51:04 +0200
Subject: [PATCH 210/238] [FIX] typos in rpc doc

bzr revid: xmo@openerp.com-20120419095104-30wwmeh1mj1w0rxy
---
 doc/rpc.rst | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/doc/rpc.rst b/doc/rpc.rst
index 9f8f4424ce6..5c5ca11b07d 100644
--- a/doc/rpc.rst
+++ b/doc/rpc.rst
@@ -22,7 +22,7 @@ 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,
+class maps onto the OpenERP server objects via two primary methods,
 :js:func:`~openerp.web.Model.call` and
 :js:func:`~openerp.web.Model.query`.
 
@@ -52,7 +52,7 @@ similar to that of the OpenERP Model API, with three differences:
     });
 
 :js:func:`~openerp.web.Model.query` is a shortcut for a builder-style
-iterface to searches (``search`` + ``read`` in OpenERP RPC terms). It
+interface 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:
@@ -69,7 +69,7 @@ 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.
+RPC call 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.
@@ -314,15 +314,15 @@ 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.
+OpenERP Web.
 
-For this. a lower-level API is available on
-:js:class:`openerp.web.Connection` objects (usually available through
+For this, a lower-level API exists on 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
+method you 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.
 

From 217cf2e14bdb78f77138872b8f9ea0ba0baff050 Mon Sep 17 00:00:00 2001
From: "Turkesh Patel (Open ERP)" <tpa@tinyerp.com>
Date: Thu, 19 Apr 2012 15:26:46 +0530
Subject: [PATCH 211/238] [IMP] set proper indentation

bzr revid: tpa@tinyerp.com-20120419095646-p1q0u7jny2740ms3
---
 addons/web/static/src/js/view_list.js | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/addons/web/static/src/js/view_list.js b/addons/web/static/src/js/view_list.js
index b1e8fe3a958..9e749009ebc 100644
--- a/addons/web/static/src/js/view_list.js
+++ b/addons/web/static/src/js/view_list.js
@@ -157,10 +157,10 @@ instance.web.ListView = instance.web.View.extend( /** @lends instance.web.ListVi
         });
 
         if (this.fonts) {
-	        for(var i=0, len=this.fonts.length; i<len; ++i) {
-	            var pair = this.fonts[i],
-                    font = pair[0],
-                    expression = pair[1];
+            for(var i=0, len=this.fonts.length; i<len; ++i) {
+                var pair = this.fonts[i],
+                font = pair[0],
+                expression = pair[1];
                 if (py.evaluate(expression, context).toJSON()) {
                     switch(font) {
                     case 'bold':

From 055de194f172c03061962583f19ca2a2d4a34df0 Mon Sep 17 00:00:00 2001
From: "Turkesh Patel (Open ERP)" <tpa@tinyerp.com>
Date: Thu, 19 Apr 2012 15:29:54 +0530
Subject: [PATCH 212/238] [IMP] crm,sale:improved code for tree view

bzr revid: tpa@tinyerp.com-20120419095954-dx9quzex5k1d2ylb
---
 addons/crm/crm_lead_view.xml      | 6 ++++--
 addons/crm/crm_meeting_view.xml   | 3 ++-
 addons/crm/crm_phonecall_view.xml | 6 ++++--
 addons/sale/sale_view.xml         | 3 ++-
 4 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/addons/crm/crm_lead_view.xml b/addons/crm/crm_lead_view.xml
index 9a94144823b..7de9858713a 100644
--- a/addons/crm/crm_lead_view.xml
+++ b/addons/crm/crm_lead_view.xml
@@ -169,7 +169,8 @@
         <field name="model">crm.lead</field>
         <field name="type">tree</field>
         <field name="arch" type="xml">
-            <tree string="Leads" fonts="bold:state=='pending';underline:state=='cancel';italic:state=='done'" colors="blue:state=='pending';grey:state in ('cancel', 'done')">
+            <tree string="Leads" fonts="bold:needaction_pending==True" colors="blue:state=='pending';grey:state in ('cancel', 'done')">
+                <field name="needaction_pending" invisible="1"/>
                 <field name="date_deadline" invisible="1"/>
                 <field name="create_date" groups="base.group_no_one"/>
                 <field name="name" string="Subject"/>
@@ -536,7 +537,8 @@
         <field name="model">crm.lead</field>
         <field name="type">tree</field>
         <field name="arch" type="xml">
-            <tree string="Opportunities" colors="blue:state=='pending' and not(date_deadline and (date_deadline &lt; current_date));gray:state in ('cancel', 'done');red:date_deadline and (date_deadline &lt; current_date)">
+            <tree string="Opportunities" fonts="bold:needaction_pending==True" colors="blue:state=='pending' and not(date_deadline and (date_deadline &lt; current_date));gray:state in ('cancel', 'done');red:date_deadline and (date_deadline &lt; current_date)">
+                <field name="needaction_pending" invisible="1"/>
                 <field name="date_deadline" invisible="1"/>
                 <field name="create_date" groups="base.group_no_one"/>
                 <field name="name" string="Opportunity"/>
diff --git a/addons/crm/crm_meeting_view.xml b/addons/crm/crm_meeting_view.xml
index a82a34d80ce..d740a00cf02 100644
--- a/addons/crm/crm_meeting_view.xml
+++ b/addons/crm/crm_meeting_view.xml
@@ -224,8 +224,9 @@
         <field name="model">crm.meeting</field>
         <field name="type">tree</field>
         <field name="arch" type="xml">
-            <tree string="Meetings"
+            <tree string="Meetings" fonts="bold:needaction_pending==True"
                 colors="red:state=='open';black:state in ('draft', 'cancel','done','pending')">
+                <field name="needaction_pending" invisible="1"/>
                 <field name="name" string="Subject" />
                 <field name="user_id"/>
                 <field name="date"/>
diff --git a/addons/crm/crm_phonecall_view.xml b/addons/crm/crm_phonecall_view.xml
index ae0e0ce7f3c..eb836428b6e 100644
--- a/addons/crm/crm_phonecall_view.xml
+++ b/addons/crm/crm_phonecall_view.xml
@@ -24,7 +24,8 @@
         <field name="model">crm.phonecall</field>
         <field name="type">tree</field>
         <field name="arch" type="xml">
-            <tree colors="gray:state in ('cancel','done');blue:state in ('pending',)" string="Phone Calls">
+            <tree fonts="bold:needaction_pending==True" colors="gray:state in ('cancel','done');blue:state in ('pending',)" string="Phone Calls">
+                <field name="needaction_pending" invisible="1"/>
                 <field name="date"/>
                 <field name="name"/>
                 <field name="partner_id"/>
@@ -132,7 +133,8 @@
         <field name="model">crm.phonecall</field>
         <field name="type">tree</field>
         <field name="arch" type="xml">
-            <tree string="Phone Calls" editable="top">
+            <tree string="Phone Calls" fonts="bold:needaction_pending==True" editable="top">
+                <field name="needaction_pending" invisible="1"/>
                 <field name="date"/>
                 <field name="name"/>
                 <field name="partner_id"
diff --git a/addons/sale/sale_view.xml b/addons/sale/sale_view.xml
index 8d1fedd8574..6bdbc9ac135 100644
--- a/addons/sale/sale_view.xml
+++ b/addons/sale/sale_view.xml
@@ -77,7 +77,8 @@
             <field name="type">tree</field>
             <field name="priority">2</field>
             <field name="arch" type="xml">
-                <tree string="Sales Orders" colors="grey:state=='cancel';blue:state in ('waiting_date','manual');red:state in ('invoice_except','shipping_except')">
+                <tree string="Sales Orders" fonts="bold:needaction_pending==True" colors="grey:state=='cancel';blue:state in ('waiting_date','manual');red:state in ('invoice_except','shipping_except')">
+                    <field name="needaction_pending" invisible="1"/>
                     <field name="name"/>
                     <field name="date_order"/>
                     <field name="partner_id"/>

From a326d17fabca540761957be708231feb24e626fe Mon Sep 17 00:00:00 2001
From: "Turkesh Patel (Open ERP)" <tpa@tinyerp.com>
Date: Thu, 19 Apr 2012 15:36:53 +0530
Subject: [PATCH 213/238] [IMP] purchase:improved code for tree view

bzr revid: tpa@tinyerp.com-20120419100653-1mwb6lao6oz0kf9p
---
 addons/purchase/purchase_view.xml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/addons/purchase/purchase_view.xml b/addons/purchase/purchase_view.xml
index b1511139102..45e0882edc8 100644
--- a/addons/purchase/purchase_view.xml
+++ b/addons/purchase/purchase_view.xml
@@ -286,7 +286,8 @@
             <field name="model">purchase.order</field>
             <field name="type">tree</field>
             <field name="arch" type="xml">
-                <tree colors="grey:state=='cancel';blue:state in ('wait','confirmed');red:state in ('except_invoice','except_picking')" string="Purchase Order">
+                <tree fonts="bold:needaction_pending==True" colors="grey:state=='cancel';blue:state in ('wait','confirmed');red:state in ('except_invoice','except_picking')" string="Purchase Order">
+                    <field name="needaction_pending" invisible="1"/>
                     <field name="name" string="Reference"/>
                     <field name="date_order" />
                     <field name="partner_id"/>

From b657cdb9671908351310cf4ceed9916f95dcc038 Mon Sep 17 00:00:00 2001
From: "Kuldeep Joshi (OpenERP)" <kjo@tinyerp.com>
Date: Thu, 19 Apr 2012 15:38:55 +0530
Subject: [PATCH 214/238] [IMP]hr_recruitment, hr_holidays: add treeview fonts
 bold

bzr revid: kjo@tinyerp.com-20120419100855-7tomt33drutwkpvy
---
 addons/hr_holidays/hr_holidays_view.xml       | 9 ++++++---
 addons/hr_recruitment/hr_recruitment_view.xml | 3 ++-
 addons/project_issue/project_issue_view.xml   | 5 +++--
 3 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/addons/hr_holidays/hr_holidays_view.xml b/addons/hr_holidays/hr_holidays_view.xml
index d6ee7ed869c..066ac29c6e3 100644
--- a/addons/hr_holidays/hr_holidays_view.xml
+++ b/addons/hr_holidays/hr_holidays_view.xml
@@ -150,7 +150,8 @@
             <field name="model">hr.holidays</field>
             <field name="type">tree</field>
             <field name="arch" type="xml">
-                <tree colors="red:state == 'refuse';blue:state == 'draft';black:state in ('confirm','validate','validate1')" string="Allocation Requests">
+                <tree fonts="bold:needaction_pending==True" colors="red:state == 'refuse';blue:state == 'draft';black:state in ('confirm','validate','validate1')" string="Allocation Requests">
+                    <field name="needaction_pending" invisible="1"/>
                     <field name="holiday_type"/>
                     <field name="employee_id"/>
                     <field name="category_id"/>
@@ -205,7 +206,8 @@
             <field name="type">tree</field>
             <field name="priority">20</field>
             <field name="arch" type="xml">
-                <tree colors="red:state == 'refuse';blue:state == ' draft';black:state in ('confirm','validate','validate1')" string="Leaves Summary">
+                <tree fonts="bold:needaction_pending==True" colors="red:state == 'refuse';blue:state == ' draft';black:state in ('confirm','validate','validate1')" string="Leaves Summary">
+                    <field name="needaction_pending" invisible="1"/>
                     <field name="employee_id"/>
                     <field name="category_id" invisible="1"/>
                     <field name="department_id" invisible="1"/>
@@ -231,7 +233,8 @@
             <field name="model">hr.holidays</field>
             <field name="type">tree</field>
             <field name="arch" type="xml">
-                <tree colors="red:state == 'refuse';blue:state == ' draft';black:state in ('confirm','validate','validate1')" string="Leave Requests">
+                <tree fonts="bold:needaction_pending==True" colors="red:state == 'refuse';blue:state == ' draft';black:state in ('confirm','validate','validate1')" string="Leave Requests">
+                    <field name="needaction_pending" invisible="1"/>
                     <field name="holiday_type"/>
                     <field name="employee_id"/>
                     <field name="category_id"/>
diff --git a/addons/hr_recruitment/hr_recruitment_view.xml b/addons/hr_recruitment/hr_recruitment_view.xml
index 1f7d916c6f3..9e4948eebc6 100644
--- a/addons/hr_recruitment/hr_recruitment_view.xml
+++ b/addons/hr_recruitment/hr_recruitment_view.xml
@@ -41,7 +41,8 @@
         <field name="model">hr.applicant</field>
         <field name="type">tree</field>
         <field name="arch" type="xml">
-            <tree string="Applicants" colors="grey:state in ('cancel','done');blue:state=='pending'">
+            <tree string="Applicants" fonts="bold:needaction_pending==True" colors="grey:state in ('cancel','done');blue:state=='pending'">
+                <field name="needaction_pending" invisible="1"/>
                 <field name="create_date" groups="base.group_no_one"/>
                 <field name="name" string="Subject"/>
                 <field name="partner_name"/>
diff --git a/addons/project_issue/project_issue_view.xml b/addons/project_issue/project_issue_view.xml
index 50c79346127..3b47965306c 100644
--- a/addons/project_issue/project_issue_view.xml
+++ b/addons/project_issue/project_issue_view.xml
@@ -123,7 +123,7 @@
             <field name="model">project.issue</field>
             <field name="type">tree</field>
             <field name="arch" type="xml">
-                <tree fonts="bold:needaction_pending==True" string="Issue Tracker Tree" colors="black:state=='open';blue:state=='pending';grey:state in ('cancel', 'done')">
+                <tree string="Issue Tracker Tree" fonts="bold:needaction_pending==True" colors="black:state=='open';blue:state=='pending';grey:state in ('cancel', 'done')">
                     <field name="needaction_pending" invisible="1"/>
                     <field name="id"/>
                     <field name="create_date" groups="base.group_no_one"/>
@@ -291,8 +291,9 @@
             <field name="model">project.issue</field>
             <field name="type">tree</field>
             <field name="arch" type="xml">
-                <tree string="Feature Tracker Tree"  colors="red:state=='open';black:state in ('draft', 'cancel','done','pending')">
+                <tree string="Feature Tracker Tree" fonts="bold:needaction_pending==True" colors="red:state=='open';black:state in ('draft', 'cancel','done','pending')">
                     <field name="id"/>
+                    <field name="needaction_pending" invisible="1"/>
                     <field name="name" string="Feature description"/>
                     <field name="partner_id" groups="base.group_extended"/>
                     <field name="priority" string="Priority"/>

From 3ebc3652ffb8378da145fc89b82e647b11bfde30 Mon Sep 17 00:00:00 2001
From: "Turkesh Patel (Open ERP)" <tpa@tinyerp.com>
Date: Thu, 19 Apr 2012 15:46:38 +0530
Subject: [PATCH 215/238] [IMP] mrp:improved code for tree view

bzr revid: tpa@tinyerp.com-20120419101638-ltl5621fdkyyv8yr
---
 addons/mrp/mrp_view.xml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/addons/mrp/mrp_view.xml b/addons/mrp/mrp_view.xml
index 986e1b2f754..76062249d7d 100644
--- a/addons/mrp/mrp_view.xml
+++ b/addons/mrp/mrp_view.xml
@@ -573,7 +573,8 @@
             <field name="model">mrp.production</field>
             <field name="type">tree</field>
             <field name="arch" type="xml">
-                <tree colors="blue:state in ('draft','confirmed');red:date_planned&lt;current_date and state not in ('done','cancel');black:date_planned&gt;=current_date;gray:state in ('done','cancel') " string="Manufacturing Orders">
+                <tree fonts="bold:needaction_pending==True" colors="blue:state in ('draft','confirmed');red:date_planned&lt;current_date and state not in ('done','cancel');black:date_planned&gt;=current_date;gray:state in ('done','cancel') " string="Manufacturing Orders">
+                    <field name="needaction_pending" invisible="1"/>
                     <field name="name"/>
                     <field name="date_planned"/>
                     <field name="product_id"/>

From d39f8a63bafead27e26c16d7a3acf321532fd569 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Thu, 19 Apr 2012 13:52:03 +0200
Subject: [PATCH 216/238] [FIX] project_planning: correctly forward count
 parameter for search override

bzr revid: xmo@openerp.com-20120419115203-okiu2buyc9ci1bl4
---
 addons/project_planning/project_planning.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/addons/project_planning/project_planning.py b/addons/project_planning/project_planning.py
index fafaf85ac4f..4787aa2603b 100644
--- a/addons/project_planning/project_planning.py
+++ b/addons/project_planning/project_planning.py
@@ -233,7 +233,8 @@ class project_task(osv.osv):
         if context is None:
             context = {}
         if not context.get('planning', False):
-            return super(project_task,self).search(cr, user, args, offset, limit, order, context)
+            return super(project_task,self).search(cr, user, args,
+                offset=offset, limit=limit, order=order, context=context, count=count)
         cr.execute(" SELECT t.id, t.name \
                         from project_task t \
                         join report_account_analytic_planning_line l on (l.id = t.planning_line_id )\

From 8f5c30c7e987ae78d0be834499eb7f0978d96d01 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Thu, 19 Apr 2012 13:55:04 +0200
Subject: [PATCH 217/238] [FIX] really convert to float when trying to convert
 to float

might work better than converting to a float field

bzr revid: xmo@openerp.com-20120419115504-2tic6l0qjb8zlhuh
---
 openerp/osv/fields.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/openerp/osv/fields.py b/openerp/osv/fields.py
index e228ac32c41..95aecf18ec6 100644
--- a/openerp/osv/fields.py
+++ b/openerp/osv/fields.py
@@ -1057,7 +1057,7 @@ class function(_column):
             # This is not needed for stored fields and non-functional integer
             # fields, as their values are constrained by the database backend
             # to the same 32bits signed int limit.
-            result = float(value)
+            result = __builtins__.float(value)
         return result
 
     def get(self, cr, obj, ids, name, uid=False, context=None, values=None):

From 931c2376862f1064aafaecd044712465e394bb9e Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Thu, 19 Apr 2012 15:02:45 +0200
Subject: [PATCH 218/238] [FIX] previous fix: actual module should be
 __builtin__

apparently we do weird things with __builtins__, on my machine it's consistently an alias to the __builtin__ importable module, but in the server it's a dict

bzr revid: xmo@openerp.com-20120419130245-ael83wc5h310m38s
---
 openerp/osv/fields.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/openerp/osv/fields.py b/openerp/osv/fields.py
index 95aecf18ec6..4364c0f985e 100644
--- a/openerp/osv/fields.py
+++ b/openerp/osv/fields.py
@@ -1057,7 +1057,7 @@ class function(_column):
             # This is not needed for stored fields and non-functional integer
             # fields, as their values are constrained by the database backend
             # to the same 32bits signed int limit.
-            result = __builtins__.float(value)
+            result = __builtin__.float(value)
         return result
 
     def get(self, cr, obj, ids, name, uid=False, context=None, values=None):

From 9ca448c1e868b6acf6581d32a85c226b7e396e98 Mon Sep 17 00:00:00 2001
From: niv-openerp <nicolas.vanhoren@openerp.com>
Date: Thu, 19 Apr 2012 15:43:41 +0200
Subject: [PATCH 219/238] [imp] Changed some names to improve framework
 comprehension

bzr revid: nicolas.vanhoren@openerp.com-20120419134341-b6rcx58lghgvayia
---
 addons/web/static/src/js/corelib.js   | 18 ++++++++----------
 addons/web/static/src/js/view_form.js |  6 +++---
 2 files changed, 11 insertions(+), 13 deletions(-)

diff --git a/addons/web/static/src/js/corelib.js b/addons/web/static/src/js/corelib.js
index cbd28aca8a3..32e35575933 100644
--- a/addons/web/static/src/js/corelib.js
+++ b/addons/web/static/src/js/corelib.js
@@ -239,9 +239,7 @@ instance.web.ParentedMixin = {
 };
 
 /**
- * TODO al: move into the the mixin
- *
- * Backbone's events
+ * Backbone's events. Do not ever use it directly, use EventDispatcherMixin instead.
  *
  * (c) 2010-2012 Jeremy Ashkenas, DocumentCloud Inc.
  * Backbone may be freely distributed under the MIT license.
@@ -253,8 +251,7 @@ instance.web.ParentedMixin = {
  * events is done in EventDispatcherMixin.
  *
  */
-instance.web.Events = instance.web.Class.extend({
-
+var Events = instance.web.Class.extend({
     on : function(events, callback, context) {
         var ev;
         events = events.split(/\s+/);
@@ -323,12 +320,13 @@ instance.web.Events = instance.web.Class.extend({
         return this;
     }
 });
+// end of Jeremy Ashkenas' code
 
 instance.web.EventDispatcherMixin = _.extend({}, instance.web.ParentedMixin, {
     __eventDispatcherMixin: true,
     init: function() {
         instance.web.ParentedMixin.init.call(this);
-        this.__edispatcherEvents = new instance.web.Events();
+        this.__edispatcherEvents = new Events();
         this.__edispatcherRegisteredEvents = [];
     },
     on: function(events, dest, func) {
@@ -373,7 +371,7 @@ instance.web.EventDispatcherMixin = _.extend({}, instance.web.ParentedMixin, {
     }
 });
 
-instance.web.GetterSetterMixin = _.extend({}, instance.web.EventDispatcherMixin, {
+instance.web.PropertiesMixin = _.extend({}, instance.web.EventDispatcherMixin, {
     init: function() {
         instance.web.EventDispatcherMixin.init.call(this);
         this.__getterSetterInternalMap = {};
@@ -400,9 +398,9 @@ instance.web.GetterSetterMixin = _.extend({}, instance.web.EventDispatcherMixin,
     }
 });
 
-instance.web.CallbackEnabledMixin = _.extend({}, instance.web.GetterSetterMixin, {
+instance.web.CallbackEnabledMixin = _.extend({}, instance.web.PropertiesMixin, {
     init: function() {
-        instance.web.GetterSetterMixin.init.call(this);
+        instance.web.PropertiesMixin.init.call(this);
         var self = this;
         var callback_maker = function(obj, name, method) {
             var callback = function() {
@@ -535,7 +533,7 @@ instance.web.WidgetMixin = _.extend({},instance.web.CallbackEnabledMixin, {
         if(this.$element != null) {
             this.$element.remove();
         }
-        instance.web.GetterSetterMixin.destroy.call(this);
+        instance.web.PropertiesMixin.destroy.call(this);
     },
     /**
      * Renders the current widget and appends it to the given jQuery object or Widget.
diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js
index 47cee79ffcb..a87982fdabd 100644
--- a/addons/web/static/src/js/view_form.js
+++ b/addons/web/static/src/js/view_form.js
@@ -1307,7 +1307,7 @@ instance.web.form.compute_domain = function(expr, fields) {
 };
 
 /**
- * Must be applied over an class already possessing the GetterSetterMixin.
+ * Must be applied over an class already possessing the PropertiesMixin.
  *
  * Apply the result of the "invisible" domain to this.$element.
  */
@@ -1335,10 +1335,10 @@ instance.web.form.InvisibilityChangerMixin = {
     },
 };
 
-instance.web.form.InvisibilityChanger = instance.web.Class.extend(_.extend({}, instance.web.GetterSetterMixin, instance.web.form.InvisibilityChangerMixin, {
+instance.web.form.InvisibilityChanger = instance.web.Class.extend(_.extend({}, instance.web.PropertiesMixin, instance.web.form.InvisibilityChangerMixin, {
     init: function(parent, field_manager, invisible_domain, $element) {
         this.setParent(parent);
-        instance.web.GetterSetterMixin.init.call(this);
+        instance.web.PropertiesMixin.init.call(this);
         instance.web.form.InvisibilityChangerMixin.init.call(this, field_manager, invisible_domain);
         this.$element = $element;
         this.start();

From 869407033ef430be11bbec8663b1d88dfcf9d0fd Mon Sep 17 00:00:00 2001
From: niv-openerp <nicolas.vanhoren@openerp.com>
Date: Thu, 19 Apr 2012 16:28:14 +0200
Subject: [PATCH 220/238] [fix] problem with sidebar showing in popups

bzr revid: nicolas.vanhoren@openerp.com-20120419142814-7hp51n8lp7iwlucc
---
 addons/web/static/src/js/views.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/web/static/src/js/views.js b/addons/web/static/src/js/views.js
index 36e3c2b802b..9625e074e83 100644
--- a/addons/web/static/src/js/views.js
+++ b/addons/web/static/src/js/views.js
@@ -245,7 +245,7 @@ instance.web.ViewManager =  instance.web.Widget.extend({
                 controller : null,
                 options : _.extend({
                     $buttons : self.$element.find('.oe_view_manager_buttons'),
-                    $sidebar : self.$element.find('.oe_view_manager_sidebar'),
+                    $sidebar : self.flags.sidebar ? self.$element.find('.oe_view_manager_sidebar') : undefined,
                     $pager : self.$element.find('.oe_view_manager_pager'),
                     action : self.action,
                     action_views_ids : views_ids

From 3da11976a455a0ad55fcf8ecaee534fd61ff7ed1 Mon Sep 17 00:00:00 2001
From: niv-openerp <nicolas.vanhoren@openerp.com>
Date: Thu, 19 Apr 2012 16:50:51 +0200
Subject: [PATCH 221/238] [fix] problem with editable lists & buttons

bzr revid: nicolas.vanhoren@openerp.com-20120419145051-41ywt5u35z04m8wm
---
 addons/web/static/src/js/view_list_editable.js | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/addons/web/static/src/js/view_list_editable.js b/addons/web/static/src/js/view_list_editable.js
index ac19e3f341d..2015232349a 100644
--- a/addons/web/static/src/js/view_list_editable.js
+++ b/addons/web/static/src/js/view_list_editable.js
@@ -406,14 +406,17 @@ openerp.web.list_editable = function (instance) {
                 if (modifiers.tree_invisible === true)
                     $td.hide();
                 var tag_name = el.tagName.toLowerCase();
-                var key = tag_name;
+                var w;
                 if (tag_name === "field") {
                     var name = $(el).attr("name");
-                    key = $(el).attr('widget') || self.fvg.fields[name].type;
+                    var key = $(el).attr('widget') || self.fvg.fields[name].type;
+                    var obj = self.view.fields_registry.get_object(key);
+                    w = new (obj)(self.view, instance.web.xml_to_json(el));
+                    self.view.register_field(w, $(el).attr("name"));
+                } else {
+                    var obj = self.tags_registry.get_object(tag_name);
+                    w = new (obj)(self.view, instance.web.xml_to_json(el));
                 }
-                var obj = self.view.fields_registry.get_object(key);
-                var w = new (obj)(self.view, instance.web.xml_to_json(el));
-                self.view.register_field(w, $(el).attr("name"));
                 w.appendTo($td);
                 $td.appendTo($element);
             });

From a6bc55c95ca613c288df7213448bc623558828a4 Mon Sep 17 00:00:00 2001
From: niv-openerp <nicolas.vanhoren@openerp.com>
Date: Thu, 19 Apr 2012 17:11:39 +0200
Subject: [PATCH 222/238] [fix] problem in calendar view

bzr revid: nicolas.vanhoren@openerp.com-20120419151139-92ujq4get9gxbkl3
---
 addons/web_calendar/static/src/js/calendar.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/web_calendar/static/src/js/calendar.js b/addons/web_calendar/static/src/js/calendar.js
index 8bd83c0bb30..b4c43fbba98 100644
--- a/addons/web_calendar/static/src/js/calendar.js
+++ b/addons/web_calendar/static/src/js/calendar.js
@@ -289,9 +289,9 @@ instance.web_calendar.CalendarView = instance.web.View.extend({
                 var field_name = self[field];
                 if (field_name && form.fields[field_name]) {
                     var ffield = form.fields[field_name];
-                    ffield.reset();
+                    ffield._dirty_flag = false;
                     $.when(ffield.set_value(data[field_name])).then(function() {
-                        ffield.dirty = true;
+                        ffield._dirty_flag = true;
                         form.do_onchange(ffield);
                     });
                 }

From 5afd20a530f53a8da14778673468980312333518 Mon Sep 17 00:00:00 2001
From: Fabien Meghazi <fme@openerp.com>
Date: Thu, 19 Apr 2012 17:33:41 +0200
Subject: [PATCH 223/238] [IMP] Improved rendering engine group cells width
 computing

bzr revid: fme@openerp.com-20120419153341-gequ3826z6fd44x6
---
 addons/web/static/src/css/base.css    |  5 ++++-
 addons/web/static/src/css/base.sass   |  4 +++-
 addons/web/static/src/js/view_form.js | 15 ++++++++++++++-
 3 files changed, 21 insertions(+), 3 deletions(-)

diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css
index 854946cdf97..2b90d47c002 100644
--- a/addons/web/static/src/css/base.css
+++ b/addons/web/static/src/css/base.css
@@ -1783,11 +1783,14 @@
   font-weight: bold;
 }
 .openerp .oe_layout_debugging .oe_form_group {
-  outline: 2px dashed red;
+  outline: 2px dashed green;
 }
 .openerp .oe_layout_debugging .oe_form_group_cell {
   outline: 1px solid blue;
 }
+.openerp .oe_layout_debugging .oe_form_group:hover, .openerp .oe_layout_debugging .oe_form_group_cell:hover {
+  outline-color: red;
+}
 .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 98caeafbb29..fc645a92e44 100644
--- a/addons/web/static/src/css/base.sass
+++ b/addons/web/static/src/css/base.sass
@@ -1490,9 +1490,11 @@ $colour4: #8a89ba
     // Debugging stuff {{{
     .oe_layout_debugging
         .oe_form_group
-            outline: 2px dashed red
+            outline: 2px dashed green
         .oe_form_group_cell
             outline: 1px solid blue
+        .oe_form_group:hover, .oe_form_group_cell:hover
+            outline-color: red
 
     .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 a87982fdabd..c13e283354c 100644
--- a/addons/web/static/src/js/view_form.js
+++ b/addons/web/static/src/js/view_form.js
@@ -1119,7 +1119,20 @@ instance.web.form.FormRenderingEngine = instance.web.Class.extend({
                         }
                         break;
                     default:
-                        to_compute.push($td);
+                        var width = _.str.trim($child.attr('width') || ''),
+                            iwidth = parseInt(width, 10);
+                        if (iwidth) {
+                            if (width.substr(-1) === '%') {
+                                total -= iwidth;
+                                width = iwidth + '%';
+                            }
+                            $td.attr('width', width);
+                            $child.removeAttr('width');
+                            row_cols--;
+                        } else {
+                            to_compute.push($td);
+                        }
+
                 }
             });
             var unit = Math.floor(total / row_cols);

From 630eabbbb221cdf2ca0bece16f09c858efcbde9a Mon Sep 17 00:00:00 2001
From: niv-openerp <nicolas.vanhoren@openerp.com>
Date: Thu, 19 Apr 2012 17:38:57 +0200
Subject: [PATCH 224/238] [fix] some problem in editable list, still not solved
 but made more usable until we find a real fix

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

diff --git a/addons/web/static/src/js/view_list_editable.js b/addons/web/static/src/js/view_list_editable.js
index 2015232349a..ca6dcc7c1c8 100644
--- a/addons/web/static/src/js/view_list_editable.js
+++ b/addons/web/static/src/js/view_list_editable.js
@@ -420,7 +420,7 @@ openerp.web.list_editable = function (instance) {
                 w.appendTo($td);
                 $td.appendTo($element);
             });
-            $("<td><button class='oe-edit-row-save' type='button'></button></td>").appendTo($element);
+            $("<td><button class='oe-edit-row-save' type='button'>Save</button></td>").appendTo($element);
         },
     });
 };

From 8a66f58d52dc556737029a90b95fa33ac0a5135c Mon Sep 17 00:00:00 2001
From: niv-openerp <nicolas.vanhoren@openerp.com>
Date: Thu, 19 Apr 2012 17:55:14 +0200
Subject: [PATCH 225/238] [fix] problem in editable lists: could not edit an
 existing row

bzr revid: nicolas.vanhoren@openerp.com-20120419155514-j8bslmn6z7z1dh8h
---
 addons/web/static/src/js/view_form.js          | 5 +----
 addons/web/static/src/js/view_list_editable.js | 1 +
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js
index c13e283354c..1d17e1acab0 100644
--- a/addons/web/static/src/js/view_form.js
+++ b/addons/web/static/src/js/view_form.js
@@ -52,7 +52,6 @@ instance.web.FormView = instance.web.View.extend({
         this.mutating_mutex = new $.Mutex();
         this.on_change_mutex = new $.Mutex();
         this.reload_mutex = new $.Mutex();
-        this.mode = null;
         this.rendering_engine = new instance.web.form.FormRenderingEngineReadonly(this);
         this.qweb = null; // A QWeb instance will be created if the view is a QWeb template
     },
@@ -499,9 +498,8 @@ instance.web.FormView = instance.web.View.extend({
         }
     },
     switch_mode: function() {
-        var mode = this.get("mode");
         var self = this;
-        if(mode=="view") {
+        if(this.get("mode") == "view") {
             self.$buttons.find('.oe_form_buttons_edit').hide();
             self.$buttons.find('.oe_form_buttons_view').show();
             _.each(this.fields,function(field){
@@ -514,7 +512,6 @@ instance.web.FormView = instance.web.View.extend({
                 field.set({"force_readonly": false});
             });
         }
-        self.mode = mode;
     },
     on_button_save: function() {
         var self = this;
diff --git a/addons/web/static/src/js/view_list_editable.js b/addons/web/static/src/js/view_list_editable.js
index ca6dcc7c1c8..816143afa5d 100644
--- a/addons/web/static/src/js/view_list_editable.js
+++ b/addons/web/static/src/js/view_list_editable.js
@@ -372,6 +372,7 @@ openerp.web.list_editable = function (instance) {
         init: function() {
             this._super.apply(this, arguments);
             this.rendering_engine = new instance.web.ListEditableRenderingEngine(this);
+            this.options.initial_mode = "edit";
         },
         renderElement: function() {}
     });

From 58483fcd65cc0515afa343876a94e0a9d17c64a2 Mon Sep 17 00:00:00 2001
From: Antony Lesuisse <al@openerp.com>
Date: Thu, 19 Apr 2012 22:44:18 +0200
Subject: [PATCH 226/238] [IMP] form change cancel button into discard link

bzr revid: al@openerp.com-20120419204418-mn8r1w624j4ba46o
---
 addons/web/static/src/js/view_form.js | 16 ++++++++--------
 addons/web/static/src/xml/base.xml    |  4 ++--
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js
index 1d17e1acab0..c457554e44b 100644
--- a/addons/web/static/src/js/view_form.js
+++ b/addons/web/static/src/js/view_form.js
@@ -88,13 +88,12 @@ instance.web.FormView = instance.web.View.extend({
         } else {
             this.$element.find('.oe_form_buttons').replaceWith(this.$buttons);
         }
-        this.$buttons
-            .on('click','button.oe_form_button_save',this.on_button_save)
-            .on('click','button.oe_form_button_cancel',this.on_button_cancel)
-            .on('click','button.oe_form_button_edit',this.on_button_edit)
-            .on('click','button.oe_form_button_create',this.on_button_create)
-            .on('click','button.oe_form_button_duplicate',this.on_button_duplicate)
-            .on('click','button.oe_form_button_delete',this.on_button_delete);
+        this.$buttons.on('click','.oe_form_button_create',this.on_button_create);
+        this.$buttons.on('click','.oe_form_button_edit',this.on_button_edit);
+        this.$buttons.on('click','.oe_form_button_duplicate',this.on_button_duplicate);
+        this.$buttons.on('click','.oe_form_button_delete',this.on_button_delete);
+        this.$buttons.on('click','.oe_form_button_save',this.on_button_save);
+        this.$buttons.on('click','.oe_form_button_cancel',this.on_button_cancel);
 
         this.$pager = $(QWeb.render("FormView.pager", {'widget':self}));
         if (this.options.$pager) {
@@ -519,10 +518,11 @@ instance.web.FormView = instance.web.View.extend({
             self.set({mode: "view"});
         });
     },
-    on_button_cancel: function() {
+    on_button_cancel: function(event) {
         if (this.can_be_discarded()) {
             this.set({mode: "view"});
         }
+        return false;
     },
     on_button_new: function() {
         var self = this;
diff --git a/addons/web/static/src/xml/base.xml b/addons/web/static/src/xml/base.xml
index b47c8d01684..b11eadde42d 100644
--- a/addons/web/static/src/xml/base.xml
+++ b/addons/web/static/src/xml/base.xml
@@ -715,8 +715,8 @@
             <button type="button" class="oe_button oe_form_button_delete">Delete</button>
         </span>
         <span class="oe_form_buttons_edit">
-            <button type="button" class="oe_button oe_form_button_save">Save</button>
-            <button type="button" class="oe_button oe_form_button_cancel">Cancel</button>
+            <button type="button" class="oe_button oe_form_button_save">Save</button> or
+            <a href="#" class="oe_form_button_cancel">Discard</a>
         </span>
     </t>
 </div>

From af1eeca0c3ad29643eb4d838d490a16e80c2d0e5 Mon Sep 17 00:00:00 2001
From: Antony Lesuisse <al@openerp.com>
Date: Thu, 19 Apr 2012 22:52:52 +0200
Subject: [PATCH 227/238] [FIX] restore default user menu avatar

bzr revid: al@openerp.com-20120419205252-jsbldr26uc7ioi35
---
 addons/web/static/src/img/user_menu_avatar.png | Bin 0 -> 846 bytes
 addons/web/static/src/xml/base.xml             |   2 +-
 2 files changed, 1 insertion(+), 1 deletion(-)
 create mode 100644 addons/web/static/src/img/user_menu_avatar.png

diff --git a/addons/web/static/src/img/user_menu_avatar.png b/addons/web/static/src/img/user_menu_avatar.png
new file mode 100644
index 0000000000000000000000000000000000000000..a2c70ea7d498e746904ee270cffe6fcb45f7c6b6
GIT binary patch
literal 846
zcmex=<NpH&0WUXCHwH#V1_nkTWcdG&!P+^<)iK0B$VwqSMK`M;HC>_1P|rX?qqI0P
zFI~aY%U!`Mz|~!$%*;qrN1?DZF(<R6Qo&Zi(tzv#Z3brsW+o;O0s<BwV&!0EWnp3E
zVrOUL;Njxo;pXDz=H(L-;N=tK<K`9+6A%;@5fv5X;TM+>6Oj-S5fuR$!pIEN!@|nR
z%E~Fi%grl7GWdUhL6Cz%j6sZ<QHg;`kdaxC@&6G9d7vj*8Nq-73K*GyZe(NU;N;>4
zD%dK(z{JSR%*4VBay3wOEl{3;MUYiU(a@1iI53f2sZhkIapFP_Wv7h?MT0JWP%%y_
zYU1P)6PJ*bQdLve(9|+9H8Z!cv~qTFb#wRd^a>6M4GWKmj7m;PO-s+n%qlJ^Ei136
ztZHs)ZENr7?3y%r%G7DoXUv?nXz`Mz%a*TLxoXqqEnBy3-?4Mop~FXx9y@;G<f%)S
zuUx%${l?8(4<9{#^7PsB7cXCZ{Pg+D*Kgl{{QL#-7b62R#9KfT;xROT2?G7a#KOYN
z!VdBmBU3pLGYhh?DjKp0IR>&P778mFHFAhJO<cI~Ag8i%&<D|^qKjN&DkcwAKZ3jl
z_8D;=Ya+{MaE~GUb&G+AnGqOy%z_N|48Q&}_-~jUvbXKhUGuZXEP?N1*De3h_3gNC
z^^APwU9(K@T+k9dXZ6<d`6tnH6?)z~_V_02PTja`ro5WzW9=SuTXvRD*>|>fcdxG1
zdgg7NTwEgXvoM9P{?`@8&+{}EUR_+~9<**bYeYh`D?`=wgKzCLzI5-t!)!9SGJ3D5
sgT<edf3+_ZyNWPAmKXi<W6d5v)ehF*KHA!if8R{-f1$Cci{bxG0B52iPXGV_

literal 0
HcmV?d00001

diff --git a/addons/web/static/src/xml/base.xml b/addons/web/static/src/xml/base.xml
index b11eadde42d..322d06fd6ae 100644
--- a/addons/web/static/src/xml/base.xml
+++ b/addons/web/static/src/xml/base.xml
@@ -342,7 +342,7 @@
     <ul class="oe_user_menu oe_topbar_item">
         <li class="oe_dropdown">
             <a href="#" class="oe_dropdown_toggle">
-                <img class="oe_topbar_avatar" t-att-data-default-src="_s + '/web/static/src/img/topbar-avatar.png'"/>
+                <img class="oe_topbar_avatar" t-att-data-default-src="_s + '/web/static/src/img/user_menu_avatar.png'"/>
                 <span class="oe_topbar_name"/>
             </a>
             <ul class="oe_dropdown_options">

From fc585722019735e0b2ac441f54b774901f1d7a98 Mon Sep 17 00:00:00 2001
From: Antony Lesuisse <al@openerp.com>
Date: Thu, 19 Apr 2012 23:47:19 +0200
Subject: [PATCH 228/238] [REM] default homepage

bzr revid: al@openerp.com-20120419214719-pj23mry2gs0fi44y
---
 addons/board/board_data_admin.xml |  3 +--
 addons/board/board_data_home.xml  | 31 -------------------------------
 addons/board/board_demo.xml       |  4 ----
 3 files changed, 1 insertion(+), 37 deletions(-)

diff --git a/addons/board/board_data_admin.xml b/addons/board/board_data_admin.xml
index 1942aa7c066..dfe4134be99 100644
--- a/addons/board/board_data_admin.xml
+++ b/addons/board/board_data_admin.xml
@@ -35,10 +35,9 @@
                 <form string="Administration Dashboard" layout="manual">
                     <board style="2-1">
                         <column>
-                            <action name="%(board_config_overview)d" string="Configuration Overview"/>
+                            <action name="%(action_user_connection_tree)d" string="Users" />
                         </column>
                         <column>
-                            <action name="%(action_user_connection_tree)d" string="Users" />
                         </column>
                     </board>
                 </form>
diff --git a/addons/board/board_data_home.xml b/addons/board/board_data_home.xml
index 8794173810a..f1e90ace7ad 100644
--- a/addons/board/board_data_home.xml
+++ b/addons/board/board_data_home.xml
@@ -37,36 +37,5 @@
       <field name="params" eval="{'widget_id': ref('base.currency_converter_widget')}"/>
     </record>
 
-    <!-- default homepage definition -->
-    <record id="board_homepage_view" model="ir.ui.view">
-      <field name="name">Homepage Board</field>
-      <field name="model">board.board</field>
-      <field name="type">form</field>
-      <field name="arch" type="xml">
-        <form string="" layout="manual">
-          <board style="1">
-            <column>
-              <action name="%(action_application_tiles)d"/>
-            </column>
-          </board>
-        </form>
-      </field>
-    </record>
-    <record id="board_homepage_action" model="ir.actions.act_window">
-      <field name="name">Home Page</field>
-      <field name="res_model">board.board</field>
-      <field name="view_type">form</field>
-      <field name="view_mode">form</field>
-      <field name="view_id" ref="board_homepage_view"/>
-    </record>
-
-    <!-- set the default homepage of admin -->
-    <record id="base.user_root" model="res.users">
-        <field name="action_id" ref="board_homepage_action"/>
-    </record>
-
-    <!-- and of every new users -->
-    <function eval="('default',False,'action_id', [('res.users', False)], board_homepage_action, True, False, False, False, True)" id="ir_default_home" model="ir.values" name="set"/>
-
 </data>
 </openerp>
diff --git a/addons/board/board_demo.xml b/addons/board/board_demo.xml
index 384e29abdf2..d36ec6161fe 100644
--- a/addons/board/board_demo.xml
+++ b/addons/board/board_demo.xml
@@ -1,9 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
 <data>
-    <!-- set the default homepage of demo -->
-    <record id="base.user_demo" model="res.users">
-        <field name="action_id" ref="board_homepage_action"/>
-    </record>
 </data>
 </openerp>

From 5522c5e10022fa2d049ab83a21741a6fb5b70906 Mon Sep 17 00:00:00 2001
From: Antony Lesuisse <al@openerp.com>
Date: Thu, 19 Apr 2012 23:53:44 +0200
Subject: [PATCH 229/238] [REM] homepage support, trigger first menu item
 instead

bzr revid: al@openerp.com-20120419215344-vn1yyk70oztpn2mw
---
 addons/web/static/src/js/chrome.js            |   8 +-
 .../web_dashboard/static/src/js/dashboard.js  | 155 ------------------
 .../static/src/xml/web_dashboard.xml          |  62 -------
 3 files changed, 7 insertions(+), 218 deletions(-)

diff --git a/addons/web/static/src/js/chrome.js b/addons/web/static/src/js/chrome.js
index f1d3faef367..f43da0431ff 100644
--- a/addons/web/static/src/js/chrome.js
+++ b/addons/web/static/src/js/chrome.js
@@ -638,6 +638,7 @@ instance.web.Menu =  instance.web.Widget.extend({
         }
     },
     on_menu_click: function(ev, id) {
+        // TODO If first level menu doesnt have action trigger first leaf
         this.do_hide_more();
         id = id || 0;
         var $clicked_menu, manual = false;
@@ -984,13 +985,18 @@ instance.web.WebClient = instance.web.Widget.extend({
         });
     },
     bind_hashchange: function() {
+        var self = this;
         $(window).bind('hashchange', this.on_hashchange);
 
         var state = $.bbq.getState(true);
         if (! _.isEmpty(state)) {
             $(window).trigger('hashchange');
         } else {
-            this.action_manager.do_action({type: 'ir.actions.client', tag: 'default_home'});
+            self.menu.has_been_loaded.then(function() {
+                var first_menu_id = self.menu.$element.find("a:first").data("menu");
+                if(first_menu_id)
+                    self.menu.on_menu_click(null,first_menu_id);
+            });
         }
     },
     on_hashchange: function(event) {
diff --git a/addons/web_dashboard/static/src/js/dashboard.js b/addons/web_dashboard/static/src/js/dashboard.js
index f0c04d6d270..d9f4443ac24 100644
--- a/addons/web_dashboard/static/src/js/dashboard.js
+++ b/addons/web_dashboard/static/src/js/dashboard.js
@@ -277,87 +277,6 @@ instance.web.form.tags.add('hpaned', 'instance.web.form.DashBoardLegacy');
 instance.web.form.tags.add('vpaned', 'instance.web.form.DashBoardLegacy');
 instance.web.form.tags.add('board', 'instance.web.form.DashBoard');
 
-/*
- * ConfigOverview
- * This client action designed to be used as a dashboard widget display
- * ir.actions.todo in a fancy way
- */
-instance.web.client_actions.add( 'board.config.overview', 'instance.web_dashboard.ConfigOverview');
-instance.web_dashboard.ConfigOverview = instance.web.View.extend({
-    template: 'ConfigOverview',
-    init: function (parent) {
-        this._super(parent);
-        this.user = _.extend(new instance.web.DataSet(this, 'res.users'), {
-            index: 0,
-            ids: [this.session.uid]
-        });
-        this.dataset = new instance.web.DataSetSearch(this, 'ir.actions.todo');
-    },
-    start: function () {
-        var self = this;
-        return this.user.read_index(['groups_id']).pipe(function(record) {
-            var todos_filter = [
-                ['type', '!=', 'automatic'],
-                '|', ['groups_id', '=', false],
-                     ['groups_id', 'in', record['groups_id']]];
-            return $.when(
-                self.dataset.read_slice(
-                    ['state', 'action_id', 'category_id'],
-                    { domain: todos_filter }
-                ),
-                self.dataset.call('progress').pipe(
-                        function (arg) { return arg; }, null))
-        }, null).then(this.on_records_loaded);
-
-    },
-    on_records_loaded: function (records, progress) {
-        var grouped_todos = _(records).chain()
-            .map(function (record) {
-                return {
-                    id: record.id,
-                    name: record.action_id[1],
-                    done: record.state !== 'open',
-                    to_do: record.state === 'open',
-                    category: record['category_id'][1] || _t("Uncategorized")
-                }
-            })
-            .groupBy(function (record) {return record.category})
-            .value();
-        this.$element.html(QWeb.render('ConfigOverview.content', {
-            completion: 100 * progress.done / progress.total,
-            groups: grouped_todos,
-            task_title: _t("Execute task \"%s\""),
-            checkbox_title: _t("Mark this task as done"),
-            _: _
-        }));
-        var $progress = this.$element.find('div.oe-config-progress-bar');
-        $progress.progressbar({value: $progress.data('completion')});
-
-        var self = this;
-        this.$element.find('dl')
-            .delegate('input', 'click', function (e) {
-                // switch todo status
-                e.stopImmediatePropagation();
-                var new_state = this.checked ? 'done' : 'open',
-                      todo_id = parseInt($(this).val(), 10);
-                self.dataset.write(todo_id, {state: new_state}, {}, function () {
-                    self.start();
-                });
-            })
-            .delegate('li:not(.oe-done)', 'click', function () {
-                self.getParent().getParent().getParent().do_execute_action({
-                        type: 'object',
-                        name: 'action_launch'
-                    }, self.dataset,
-                    $(this).data('id'), function () {
-                        // after action popup closed, refresh configuration
-                        // thingie
-                        self.start();
-                    });
-            });
-    }
-});
-
 /*
  * Widgets
  * This client action designed to be used as a dashboard widget display
@@ -397,79 +316,5 @@ instance.web_dashboard.Widget = instance.web.View.extend(/** @lends instance.web
     }
 });
 
-/*
- * HomeTiles this client action display either the list of application to
- * install (if none is installed yet) or a list of root menu items
- */
-instance.web.client_actions.add('default_home', 'session.web_dashboard.ApplicationTiles');
-instance.web_dashboard.ApplicationTiles = instance.web.OldWidget.extend({
-    template: 'web_dashboard.ApplicationTiles',
-    init: function(parent) {
-        this._super(parent);
-    },
-    start: function() {
-        var self = this;
-        var domain = [['application','=',true], ['state','=','installed'], ['name', '!=', 'base']];
-        var ds = new instance.web.DataSetSearch(this, 'ir.module.module',{},domain);
-        ds.read_slice(['id']).then(function(result) {
-            if(result.length) {
-                self.on_installed_database();
-            } else {
-                self.on_uninstalled_database();
-            }
-        });
-    },
-    on_uninstalled_database: function() {
-        installer = new instance.web_dashboard.ApplicationInstaller(this);
-        installer.appendTo(this.$element);
-    },
-    on_installed_database: function() {
-        var self = this;
-        self.rpc('/web/menu/get_user_roots', {}).then(function (menu_ids) {
-            var menuds = new instance.web.DataSet(this, 'ir.ui.menu',{})
-                .read_ids(menu_ids, ['name', 'web_icon_data', 'web_icon_hover_data', 'module']).then(function (applications) {
-                    var tiles = QWeb.render('ApplicationTiles.content', {applications: applications});
-                    $(tiles).appendTo(self.$element).find('.oe_install-module-link').click(function () {
-                        instance.webclient.menu.on_menu_click(null, $(this).data('menu'))
-                    });
-                });
-        });
-    }
-});
-
-/**
- * ApplicationInstaller
- * This client action  display a list of applications to install.
- */
-instance.web.client_actions.add( 'board.application.installer', 'instance.web_dashboard.ApplicationInstaller');
-instance.web_dashboard.ApplicationInstaller = instance.web.OldWidget.extend({
-    template: 'web_dashboard.ApplicationInstaller',
-    start: function () {
-        // TODO menu hide
-        var r = this._super();
-        this.action_manager = new instance.web.ActionManager(this);
-        this.action_manager.appendTo(this.$element.find('.oe_installer'));
-        this.action_manager.do_action({
-            type: 'ir.actions.act_window',
-            res_model: 'ir.module.module',
-            domain: [['application','=',true]],
-            views: [[false, 'kanban']],
-            flags: {
-                display_title:false,
-                search_view: false,
-                views_switcher: false,
-                action_buttons: false,
-                sidebar: false,
-                pager: false
-            }
-        });
-        return r;
-    },
-    destroy: function() {
-        this.action_manager.destroy();
-        return this._super();
-    }
-});
-
 
 };
diff --git a/addons/web_dashboard/static/src/xml/web_dashboard.xml b/addons/web_dashboard/static/src/xml/web_dashboard.xml
index 9a9c0486400..c182d8b58a7 100644
--- a/addons/web_dashboard/static/src/xml/web_dashboard.xml
+++ b/addons/web_dashboard/static/src/xml/web_dashboard.xml
@@ -56,71 +56,9 @@
         </board>
     </form>
 </t>
-<div t-name="ConfigOverview" class="oe-dashboard-config-overview"/>
-<t t-name="ConfigOverview.content">
-    <div class="oe-config-progress">
-        <h6 class="oe-config-progress-title">
-            progress: <t t-esc="Math.round(completion)"/>%
-        </h6>
-        <div class="oe-config-progress-bar" t-att-data-completion="completion"/>
-    </div>
-    <p class="oe-config-tip">Click on the functionalites listed below to launch them and configure your system</p>
-    <dl>
-        <t t-foreach="groups" t-as="category">
-            <dt><t t-esc="category"/></dt>
-            <dd><ul>
-                <li t-foreach="category_value" t-as="todo"
-                    t-att-class="todo.done ? 'oe-done' : undefined"
-                    t-att-data-id="todo.id"
-                    t-att-title="!todo.done ? _.str.sprintf(task_title, todo.name) : undefined">
-                    <span  style="text-decoration: underline;"><t t-esc="todo.name"/></span>
-                    <input type="checkbox" t-att-value="todo.id"
-                       t-att-title="!todo.done ? checkbox_title : undefined"
-                       t-att-checked="todo.done ? 'checked' : undefined"/>
-                </li>
-            </ul></dd>
-        </t>
-
-    </dl>
-</t>
-
 <div t-name="HomeWidget" class="oe-dashboard-home-widget"/>
 <t t-name="HomeWidget.content">
     <h3><t t-esc="widget.title"/></h3>
     <iframe width="100%" frameborder="0" t-att-src="url"/>
 </t>
-
-<t t-name="ApplicationTiles.content">
-    <ul class="oe_app_tiles">
-        <t t-foreach="applications" t-as="application" >
-        <li>
-            <a href="#" class="oe_install-module-link" t-att-data-module="application.module" t-att-data-menu="application.id" >
-                <img t-if="application.web_icon_data" t-att-src="'data:image/png;base64,' + application.web_icon_data" 
-                /><img t-if="application.web_icon_hover_data" class="hover" t-att-src="'data:image/png;base64,' + application.web_icon_hover_data"/>
-                <span><t t-esc="application.name"/></span>
-            </a>
-        </li>
-        </t>
-    </ul>
-</t>
-
-<t t-name="web_dashboard.ApplicationTiles">
-    <div>
-        <div class="oe_applications_tiles">
-        <h1 class="oe_welcome_message">Welcome to OpenERP</h1>
-        </div>
-    </div>
-</t>
-
-<div t-name="web_dashboard.ApplicationInstaller">
-    <div class="oe_initial_welcome_message">
-        <ul>
-            <li>Remember to bookmark 
-                <a class="oe_welcome_url" t-att-href="widget.session.origin">This url</a>
-            </li>
-            <li>Your login: <t t-esc="widget.session.username"/></li>
-        </ul>
-    </div>
-    <div class="oe_installer" />
-</div>
 </template>

From f0b5466bcad14a04986433dfc9c5ab5dc1969e26 Mon Sep 17 00:00:00 2001
From: Launchpad Translations on behalf of openerp <>
Date: Fri, 20 Apr 2012 04:43:25 +0000
Subject: [PATCH 230/238] Launchpad automatic translations update.

bzr revid: launchpad_translations_on_behalf_of_openerp-20120420044325-kyb2a8gptkwbales
---
 addons/account/i18n/ja.po       |  350 +--
 addons/association/i18n/gu.po   |  137 ++
 addons/base_crypt/i18n/gu.po    |   45 +
 addons/crm/i18n/gu.po           | 3592 +++++++++++++++++++++++++++++++
 addons/crm_todo/i18n/ja.po      |   95 +
 addons/edi/i18n/pt.po           |  413 ++++
 addons/event/i18n/ja.po         | 1265 +++++++++++
 addons/fetchmail/i18n/ja.po     |  322 +++
 addons/hr_evaluation/i18n/ja.po |  243 ++-
 addons/hr_expense/i18n/ja.po    |  876 ++++++++
 addons/hr_holidays/i18n/ja.po   |    4 +-
 addons/sale_margin/i18n/ja.po   |   51 +
 12 files changed, 7113 insertions(+), 280 deletions(-)
 create mode 100644 addons/association/i18n/gu.po
 create mode 100644 addons/base_crypt/i18n/gu.po
 create mode 100644 addons/crm/i18n/gu.po
 create mode 100644 addons/crm_todo/i18n/ja.po
 create mode 100644 addons/edi/i18n/pt.po
 create mode 100644 addons/event/i18n/ja.po
 create mode 100644 addons/fetchmail/i18n/ja.po
 create mode 100644 addons/hr_expense/i18n/ja.po
 create mode 100644 addons/sale_margin/i18n/ja.po

diff --git a/addons/account/i18n/ja.po b/addons/account/i18n/ja.po
index 4147fc86b2c..3b9b403f58d 100644
--- a/addons/account/i18n/ja.po
+++ b/addons/account/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-19 03:58+0000\n"
+"PO-Revision-Date: 2012-04-20 04:08+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-19 04:37+0000\n"
-"X-Generator: Launchpad (build 15108)\n"
+"X-Launchpad-Export-Date: 2012-04-20 04:43+0000\n"
+"X-Generator: Launchpad (build 15120)\n"
 
 #. module: account
 #: view:account.invoice.report:0
@@ -226,7 +226,7 @@ msgstr "調整選択行の移動"
 msgid ""
 "Check this box if you don't want any VAT related to this Tax Code to appear "
 "on invoices"
-msgstr "この税金コードに関連するどんなVATも請求書上に現れるのを望まない場合は、このボックスをチェックして下さい。"
+msgstr "この税金コードに関連するどんな消費税項目も請求書上に表示されることを望まない場合は、このボックスをチェックして下さい。"
 
 #. module: account
 #: code:addons/account/account_invoice.py:1241
@@ -689,7 +689,7 @@ msgstr "エントリーを調整するために、会社は全てのエントリ
 #: model:ir.actions.act_window,name:account.action_aged_receivable
 #, python-format
 msgid "Receivable Accounts"
-msgstr "売掛金アカウント"
+msgstr "売掛金"
 
 #. module: account
 #: constraint:account.move.line:0
@@ -1175,7 +1175,7 @@ msgstr "税金の置き換え"
 #. module: account
 #: selection:account.move.line,centralisation:0
 msgid "Credit Centralisation"
-msgstr "クレジットの集中化"
+msgstr "貸方の一元化"
 
 #. module: account
 #: view:report.account_type.sales:0
@@ -1505,7 +1505,7 @@ msgstr "エントリー番号 "
 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
@@ -1537,7 +1537,7 @@ 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
@@ -1557,39 +1557,39 @@ msgstr ""
 #. module: account
 #: view:account.analytic.cost.ledger.journal.report:0
 msgid "and Journals"
-msgstr ""
+msgstr "と仕訳帳"
 
 #. module: account
 #: field:account.journal,groups_id:0
 msgid "Groups"
-msgstr ""
+msgstr "グループ"
 
 #. module: account
 #: field:account.invoice,amount_untaxed:0
 #: field:report.invoice.created,amount_untaxed:0
 msgid "Untaxed"
-msgstr ""
+msgstr "非課税"
 
 #. module: account
 #: view:account.partner.reconcile.process:0
 msgid "Go to next partner"
-msgstr ""
+msgstr "次のパートナへ"
 
 #. module: account
 #: view:account.bank.statement:0
 msgid "Search Bank Statements"
-msgstr ""
+msgstr "銀行明細の検索"
 
 #. module: account
 #: view:account.move.line:0
 msgid "Unposted Journal Items"
-msgstr ""
+msgstr "未転記仕訳帳項目"
 
 #. module: account
 #: view:account.chart.template:0
 #: field:account.chart.template,property_account_payable:0
 msgid "Payable Account"
-msgstr ""
+msgstr "買掛金アカウント"
 
 #. module: account
 #: field:account.tax,account_paid_id:0
@@ -1601,7 +1601,7 @@ msgstr "返金税金アカウント"
 #: view:account.bank.statement:0
 #: field:account.bank.statement,line_ids:0
 msgid "Statement lines"
-msgstr ""
+msgstr "取引明細書行"
 
 #. module: account
 #: model:ir.actions.act_window,help:account.action_bank_statement_tree
@@ -1613,23 +1613,25 @@ msgid ""
 "the Payment column of a line, you can press F1 to open the reconciliation "
 "form."
 msgstr ""
+"銀行取引明細書は預金口座、クレジットカードまたは金融口座の任意の口座タイプ上で、所定の期間に発生した全ての金融取引を要約したものです。開始残高は自動的に繰"
+"り越され、期末残高は取引明細書に示されています。行の支払いカラムで F1 を押すと照合フォームが開きます。"
 
 #. module: account
 #: report:account.analytic.account.cost_ledger:0
 msgid "Date/Code"
-msgstr ""
+msgstr "日付 / コード"
 
 #. module: account
 #: field:account.analytic.line,general_account_id:0
 #: view:analytic.entries.report:0
 #: field:analytic.entries.report,general_account_id:0
 msgid "General Account"
-msgstr ""
+msgstr "一般アカウント"
 
 #. module: account
 #: field:res.partner,debit_limit:0
 msgid "Payable Limit"
-msgstr ""
+msgstr "買掛金上限"
 
 #. module: account
 #: report:account.invoice:0
@@ -1639,33 +1641,33 @@ msgstr ""
 #: model:ir.model,name:account.model_account_invoice
 #: model:res.request.link,name:account.req_link_invoice
 msgid "Invoice"
-msgstr ""
+msgstr "請求書"
 
 #. module: account
 #: model:process.node,note:account.process_node_analytic0
 #: model:process.node,note:account.process_node_analyticcost0
 msgid "Analytic costs to invoice"
-msgstr ""
+msgstr "請求書のための分析コスト"
 
 #. module: account
 #: view:ir.sequence:0
 msgid "Fiscal Year Sequence"
-msgstr ""
+msgstr "会計年度の順序"
 
 #. module: account
 #: field:wizard.multi.charts.accounts,seq_journal:0
 msgid "Separated Journal Sequences"
-msgstr ""
+msgstr "切り離された仕訳帳順序"
 
 #. module: account
 #: view:account.invoice:0
 msgid "Responsible"
-msgstr ""
+msgstr "責任担当"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_report_account_type_sales_tree_all
 msgid "Sales by Account Type"
-msgstr ""
+msgstr "アカウントタイプ別売上"
 
 #. module: account
 #: view:account.invoice.refund:0
@@ -1677,30 +1679,30 @@ msgstr "請求書のキャンセル：現在の請求書をキャンセルする
 #. module: account
 #: model:ir.ui.menu,name:account.periodical_processing_invoicing
 msgid "Invoicing"
-msgstr ""
+msgstr "請求"
 
 #. module: account
 #: code:addons/account/report/account_partner_balance.py:115
 #, python-format
 msgid "Unknown Partner"
-msgstr ""
+msgstr "未知のパートナ"
 
 #. module: account
 #: field:account.tax.code,sum:0
 msgid "Year Sum"
-msgstr ""
+msgstr "年間合計"
 
 #. module: account
 #: code:addons/account/account_invoice.py:1429
 #, python-format
 msgid ""
 "You selected an Unit of Measure which is not compatible with the product."
-msgstr ""
+msgstr "あなたが選択した測定単位は製品との互換性がありません。"
 
 #. module: account
 #: view:account.change.currency:0
 msgid "This wizard will change the currency of the invoice"
-msgstr ""
+msgstr "このウィザードは請求書の通貨を変更します。"
 
 #. module: account
 #: model:ir.actions.act_window,help:account.action_account_chart
@@ -1709,11 +1711,13 @@ msgid ""
 "Have a complete tree view of all journal items per account code by clicking "
 "on an account."
 msgstr ""
+"会計年度ごとの会社の勘定科目表を表示し、期間によりフィルタを行います。アカウントをクリックすることによって、アカウントコードごとの全ての仕訳帳項目の完全な"
+"ツリービューを持ちます。"
 
 #. module: account
 #: view:account.analytic.account:0
 msgid "Pending Accounts"
-msgstr ""
+msgstr "保留中のアカウント"
 
 #. module: account
 #: view:account.tax.template:0
@@ -1725,69 +1729,69 @@ msgstr ""
 msgid ""
 "If the active field is set to False, it will allow you to hide the journal "
 "period without removing it."
-msgstr ""
+msgstr "アクティブ項目をFalseにセットした場合、それを削除することなく仕訳帳期間を非表示にすることができます。"
 
 #. module: account
 #: view:res.partner:0
 msgid "Supplier Debit"
-msgstr ""
+msgstr "仕入先債務"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.act_account_partner_account_move_all
 msgid "Receivables & Payables"
-msgstr ""
+msgstr "売掛金と買掛金"
 
 #. module: account
 #: model:ir.model,name:account.model_account_common_journal_report
 msgid "Account Common Journal Report"
-msgstr ""
+msgstr "アカウント共通の仕訳帳レポート"
 
 #. module: account
 #: selection:account.partner.balance,display_partner:0
 msgid "All Partners"
-msgstr ""
+msgstr "全パートナ"
 
 #. module: account
 #: view:account.analytic.chart:0
 msgid "Analytic Account Charts"
-msgstr ""
+msgstr "分析会計表"
 
 #. module: account
 #: view:account.analytic.line:0
 #: view:analytic.entries.report:0
 msgid "My Entries"
-msgstr ""
+msgstr "私のエントリー"
 
 #. module: account
 #: report:account.overdue:0
 msgid "Customer Ref:"
-msgstr ""
+msgstr "顧客の参照："
 
 #. module: account
 #: code:addons/account/account_cash_statement.py:292
 #, python-format
 msgid "User %s does not have rights to access %s journal !"
-msgstr ""
+msgstr "ユーザ %s は仕訳帳 %s にアクセスする権限を持っていません。"
 
 #. module: account
 #: help:account.period,special:0
 msgid "These periods can overlap."
-msgstr ""
+msgstr "これらの期間は重なることができます。"
 
 #. module: account
 #: model:process.node,name:account.process_node_draftstatement0
 msgid "Draft statement"
-msgstr ""
+msgstr "ドラフト取引明細書"
 
 #. module: account
 #: view:account.tax:0
 msgid "Tax Declaration: Credit Notes"
-msgstr ""
+msgstr "税金申告：クレジットノート"
 
 #. module: account
 #: field:account.move.line.reconcile,credit:0
 msgid "Credit amount"
-msgstr ""
+msgstr "貸方金額"
 
 #. module: account
 #: code:addons/account/account.py:407
@@ -1795,55 +1799,55 @@ msgstr ""
 #: code:addons/account/account.py:429
 #, python-format
 msgid "Error!"
-msgstr ""
+msgstr "エラー"
 
 #. module: account
 #: sql_constraint:account.move.line:0
 msgid "Wrong credit or debit value in accounting entry !"
-msgstr ""
+msgstr "会計エントリーにおいて貸方または借方の値が誤っています。"
 
 #. module: account
 #: view:account.invoice.report:0
 #: model:ir.actions.act_window,name:account.action_account_invoice_report_all
 #: model:ir.ui.menu,name:account.menu_action_account_invoice_report_all
 msgid "Invoices Analysis"
-msgstr ""
+msgstr "請求書分析"
 
 #. module: account
 #: model:ir.model,name:account.model_account_period_close
 msgid "period close"
-msgstr ""
+msgstr "期間終了"
 
 #. module: account
 #: view:account.installer:0
 msgid "Configure Fiscal Year"
-msgstr ""
+msgstr "会計年度の設定"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_project_account_analytic_line_form
 msgid "Entries By Line"
-msgstr ""
+msgstr "行によるエントリー"
 
 #. module: account
 #: field:account.vat.declaration,based_on:0
 msgid "Based on"
-msgstr ""
+msgstr "基準"
 
 #. module: account
 #: field:account.invoice,move_id:0
 #: field:account.invoice,move_name:0
 msgid "Journal Entry"
-msgstr ""
+msgstr "仕訳帳入力"
 
 #. module: account
 #: view:account.tax:0
 msgid "Tax Declaration: Invoices"
-msgstr ""
+msgstr "税金申請：請求書"
 
 #. module: account
 #: field:account.cashbox.line,subtotal:0
 msgid "Sub Total"
-msgstr ""
+msgstr "小計"
 
 #. module: account
 #: view:account.account:0
@@ -1852,45 +1856,45 @@ msgstr ""
 #: model:ir.model,name:account.model_account_treasury_report
 #: model:ir.ui.menu,name:account.menu_action_account_treasury_report_all
 msgid "Treasury Analysis"
-msgstr ""
+msgstr "財務分析"
 
 #. module: account
 #: constraint:res.company:0
 msgid "Error! You can not create recursive companies."
-msgstr ""
+msgstr "エラー。再帰的な関係となる会社を作ることはできません。"
 
 #. module: account
 #: model:ir.actions.report.xml,name:account.account_journal_sale_purchase
 msgid "Sale/Purchase Journal"
-msgstr ""
+msgstr "受注 / 発注仕訳帳"
 
 #. module: account
 #: view:account.analytic.account:0
 msgid "Analytic account"
-msgstr ""
+msgstr "分析アカウント"
 
 #. module: account
 #: code:addons/account/account_bank_statement.py:339
 #, python-format
 msgid "Please verify that an account is defined in the journal."
-msgstr ""
+msgstr "アカウントが仕訳帳に定義されていることを確認して下さい。"
 
 #. module: account
 #: selection:account.entries.report,move_line_state:0
 #: selection:account.move.line,state:0
 msgid "Valid"
-msgstr ""
+msgstr "有効"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_print_journal
 #: model:ir.model,name:account.model_account_print_journal
 msgid "Account Print Journal"
-msgstr ""
+msgstr "アカウント印刷ジャーナル"
 
 #. module: account
 #: model:ir.model,name:account.model_product_category
 msgid "Product Category"
-msgstr ""
+msgstr "製品分類"
 
 #. module: account
 #: selection:account.account.type,report_type:0
@@ -1903,19 +1907,19 @@ msgid ""
 "This account is used for transferring Profit/Loss (If It is Profit: Amount "
 "will be added, Loss : Amount will be deducted.), as calculated in Profit & "
 "Loss Report"
-msgstr ""
+msgstr "このアカウントは損益計算書で計算されたように、損益（利益の場合金額は加えされ、損失の場合金額は減じられます）を移すために使われます。"
 
 #. module: account
 #: model:process.node,note:account.process_node_reconciliation0
 #: model:process.node,note:account.process_node_supplierreconciliation0
 msgid "Comparison between accounting and payment entries"
-msgstr ""
+msgstr "会計と支払いエントリー間の比較"
 
 #. module: account
 #: view:account.tax:0
 #: view:account.tax.template:0
 msgid "Tax Definition"
-msgstr ""
+msgstr "税金の定義"
 
 #. module: account
 #: help:wizard.multi.charts.accounts,seq_journal:0
@@ -1923,6 +1927,7 @@ msgid ""
 "Check this box if you want to use a different sequence for each created "
 "journal. Otherwise, all will use the same sequence."
 msgstr ""
+"それぞれに作成された仕訳帳のために異なった順序を使いたい場合はこのボックスをチェックして下さい。それ以外の場合は全て同じ順序を使用します。"
 
 #. module: account
 #: help:account.partner.ledger,amount_currency:0
@@ -1930,26 +1935,26 @@ msgstr ""
 msgid ""
 "It adds the currency column if the currency is different then the company "
 "currency"
-msgstr ""
+msgstr "会社の通貨と異なる通貨の場合は、通貨カラムを追加します。"
 
 #. module: account
 #: help:account.journal,allow_date:0
 msgid ""
 "If set to True then do not accept the entry if the entry date is not into "
 "the period dates"
-msgstr ""
+msgstr "Trueにセットした場合、エントリー日付が期間内にない場合には、エントリーは受付られません。"
 
 #. module: account
 #: code:addons/account/account_invoice.py:73
 #, python-format
 msgid "You must define an analytic journal of type '%s'!"
-msgstr ""
+msgstr "分析仕訳帳のタイプ %s を定義しなければなりません。"
 
 #. module: account
 #: field:account.installer,config_logo:0
 #: field:wizard.multi.charts.accounts,config_logo:0
 msgid "Image"
-msgstr ""
+msgstr "画像"
 
 #. module: account
 #: constraint:account.move.line:0
@@ -1957,35 +1962,35 @@ 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 ""
+msgstr "選択した仕訳のアカウントは第２の通貨の入力を要求しています。アカウントの第２通貨を削除するか、仕訳で多国通貨ビューを選択して下さい。"
 
 #. module: account
 #: model:ir.actions.act_window,help:account.action_account_financial_report_tree
 msgid "Makes a generic system to draw financial reports easily."
-msgstr ""
+msgstr "財務レポートを簡単に作成するために一般的なシステムを作ります。"
 
 #. module: account
 #: view:account.invoice:0
 #: view:report.invoice.created:0
 msgid "Untaxed Amount"
-msgstr ""
+msgstr "非課税金額"
 
 #. module: account
 #: help:account.tax,active:0
 msgid ""
 "If the active field is set to False, it will allow you to hide the tax "
 "without removing it."
-msgstr ""
+msgstr "アクティブ項目にFalseが設定されている場合、それを削除することなく税金を非表示にすることができます。"
 
 #. module: account
 #: view:account.analytic.line:0
 msgid "Analytic Journal Items related to a sale journal."
-msgstr ""
+msgstr "受注仕訳帳に関連した分析仕訳帳項目"
 
 #. module: account
 #: selection:account.financial.report,style_overwrite:0
 msgid "Italic Text (smaller)"
-msgstr ""
+msgstr "斜体テキスト（小）"
 
 #. module: account
 #: view:account.bank.statement:0
@@ -1998,44 +2003,44 @@ msgstr ""
 #: selection:account.subscription,state:0
 #: selection:report.invoice.created,state:0
 msgid "Draft"
-msgstr ""
+msgstr "ドラフト"
 
 #. module: account
 #: report:account.journal.period.print.sale.purchase:0
 msgid "VAT Declaration"
-msgstr ""
+msgstr "消費税申告"
 
 #. module: account
 #: field:account.move.reconcile,line_partial_ids:0
 msgid "Partial Entry lines"
-msgstr ""
+msgstr "部分エントリー行"
 
 #. module: account
 #: view:account.fiscalyear:0
 #: field:account.treasury.report,fiscalyear_id:0
 msgid "Fiscalyear"
-msgstr ""
+msgstr "会計年度"
 
 #. module: account
 #: view:account.journal.select:0
 #: view:project.account.analytic.line:0
 msgid "Open Entries"
-msgstr ""
+msgstr "エントリーを開く"
 
 #. module: account
 #: field:account.automatic.reconcile,account_ids:0
 msgid "Accounts to Reconcile"
-msgstr ""
+msgstr "調整用のアカウント"
 
 #. module: account
 #: model:process.transition,note:account.process_transition_filestatement0
 msgid "Import of the statement in the system from an electronic file"
-msgstr ""
+msgstr "電子ファイルからシステムの中に取引明細書のインポート"
 
 #. module: account
 #: model:process.node,name:account.process_node_importinvoice0
 msgid "Import from invoice"
-msgstr ""
+msgstr "請求書からインポート"
 
 #. module: account
 #: selection:account.entries.report,month:0
@@ -2044,35 +2049,35 @@ msgstr ""
 #: selection:report.account.sales,month:0
 #: selection:report.account_type.sales,month:0
 msgid "January"
-msgstr ""
+msgstr "1月"
 
 #. module: account
 #: view:account.journal:0
 msgid "Validations"
-msgstr ""
+msgstr "検証"
 
 #. module: account
 #: view:account.entries.report:0
 msgid "This F.Year"
-msgstr ""
+msgstr "今会計年度"
 
 #. module: account
 #: view:account.tax.chart:0
 msgid "Account tax charts"
-msgstr ""
+msgstr "アカウント税金チャート"
 
 #. module: account
 #: constraint:account.period:0
 msgid ""
 "Invalid period ! Some periods overlap or the date period is not in the scope "
 "of the fiscal year. "
-msgstr ""
+msgstr "期間が無効です。幾つかの期間が重なっているか、会計年度の範囲の中にない期間です。 "
 
 #. module: account
 #: code:addons/account/account_bank_statement.py:357
 #, python-format
 msgid "You have to assign an analytic journal on the '%s' journal!"
-msgstr ""
+msgstr "%s 仕訳帳に分析仕訳帳を割り当てる必要があります。"
 
 #. module: account
 #: selection:account.invoice,state:0
@@ -2080,7 +2085,7 @@ msgstr ""
 #: selection:account.invoice.report,state:0
 #: selection:report.invoice.created,state:0
 msgid "Pro-forma"
-msgstr ""
+msgstr "プロフォーマ"
 
 #. module: account
 #: code:addons/account/account.py:1461
@@ -2088,7 +2093,7 @@ msgstr ""
 msgid ""
 "There is no default default debit account defined \n"
 "on journal \"%s\""
-msgstr ""
+msgstr "仕訳帳 %s にはデフォルト売掛金が定義されていません。"
 
 #. module: account
 #: help:account.account.template,type:0
@@ -2100,11 +2105,13 @@ msgid ""
 "partners accounts (for debit/credit computations), closed for depreciated "
 "accounts."
 msgstr ""
+"このタイプはOpenERPの特殊効果とタイプを区別するために使われます：ビューはエントリーを持つことはできません。合併は複数会社の合併のために子アカウント"
+"を持つことができるアカウントです。売掛金 / 買掛金はパートナのためのアカウント（借方 / 貸方計算のため）です。減価償却アカウントのために閉じられます。"
 
 #. module: account
 #: view:account.chart.template:0
 msgid "Search Chart of Account Templates"
-msgstr ""
+msgstr "勘定科目表テンプレートの検索"
 
 #. module: account
 #: code:addons/account/account_move_line.py:1277
@@ -2114,6 +2121,8 @@ msgid ""
 "Put a sequence in the journal definition for automatic numbering or create a "
 "sequence manually for this piece."
 msgstr ""
+"この部分には自動的な順序を作成することはできません。\n"
+"自動ナンバリングで仕訳帳を定義して順序を得るか、あるいは手動で順序を作成して下さい。"
 
 #. module: account
 #: code:addons/account/account.py:787
@@ -2121,12 +2130,12 @@ msgstr ""
 msgid ""
 "You can not modify the company of this journal as its related record exist "
 "in journal items"
-msgstr ""
+msgstr "仕訳帳項目に存在する関連したレコードであるため、その仕訳帳項目の会社を変更できません。"
 
 #. module: account
 #: report:account.invoice:0
 msgid "Customer Code"
-msgstr ""
+msgstr "顧客コード"
 
 #. module: account
 #: view:account.installer:0
@@ -2135,6 +2144,8 @@ msgid ""
 "certified Chart of Accounts exists for your specified country, a generic one "
 "can be installed and will be selected by default."
 msgstr ""
+"このデフォルト勘定科目表はあなたの国の選択と一致しています。あなたが指定した国に公認の勘定科目表が存在しない場合、一般的なものをインストールすることができ"
+"、デフォルトでそれが選択されます。"
 
 #. module: account
 #: view:account.account.type:0
@@ -2153,7 +2164,7 @@ msgstr ""
 #: field:analytic.entries.report,name:0
 #: field:report.invoice.created,name:0
 msgid "Description"
-msgstr ""
+msgstr "詳細"
 
 #. module: account
 #: code:addons/account/account.py:3119
@@ -2165,52 +2176,52 @@ msgstr ""
 #: view:account.subscription:0
 #: selection:account.subscription,state:0
 msgid "Running"
-msgstr ""
+msgstr "動作中"
 
 #. module: account
 #: view:account.chart.template:0
 #: field:product.category,property_account_income_categ:0
 #: field:product.template,property_account_income:0
 msgid "Income Account"
-msgstr ""
+msgstr "収益アカウント"
 
 #. module: account
 #: code:addons/account/account_invoice.py:370
 #, python-format
 msgid "There is no Accounting Journal of type Sale/Purchase defined!"
-msgstr ""
+msgstr "会計仕訳帳で受注 / 発注タイプの定義がないことはありません。"
 
 #. module: account
 #: constraint:res.partner.bank:0
 msgid "The RIB and/or IBAN is not valid"
-msgstr ""
+msgstr "銀行情報のRIBまたはIBANが正しくありません。"
 
 #. module: account
 #: view:product.category:0
 msgid "Accounting Properties"
-msgstr ""
+msgstr "会計属性"
 
 #. module: account
 #: report:account.general.ledger_landscape:0
 #: report:account.journal.period.print:0
 #: report:account.journal.period.print.sale.purchase:0
 msgid "Entries Sorted By"
-msgstr ""
+msgstr "エントリーのソート順"
 
 #. module: account
 #: field:account.change.currency,currency_id:0
 msgid "Change to"
-msgstr ""
+msgstr "変更"
 
 #. module: account
 #: view:account.entries.report:0
 msgid "# of Products Qty "
-msgstr ""
+msgstr "製品数量 "
 
 #. module: account
 #: model:ir.model,name:account.model_product_template
 msgid "Product Template"
-msgstr ""
+msgstr "製品テンプレート"
 
 #. module: account
 #: report:account.account.balance:0
@@ -2247,7 +2258,7 @@ msgstr ""
 #: field:accounting.report,fiscalyear_id_cmp:0
 #: model:ir.model,name:account.model_account_fiscalyear
 msgid "Fiscal Year"
-msgstr ""
+msgstr "会計年度"
 
 #. module: account
 #: help:account.aged.trial.balance,fiscalyear_id:0
@@ -2266,12 +2277,12 @@ msgstr ""
 #: help:accounting.report,fiscalyear_id:0
 #: help:accounting.report,fiscalyear_id_cmp:0
 msgid "Keep empty for all open fiscal year"
-msgstr ""
+msgstr "全ての開いている会計年度を空に保ちます。"
 
 #. module: account
 #: field:account.invoice.report,account_line_id:0
 msgid "Account Line"
-msgstr ""
+msgstr "アカウント行"
 
 #. module: account
 #: code:addons/account/account.py:1468
@@ -2279,7 +2290,7 @@ msgstr ""
 msgid ""
 "There is no default default credit account defined \n"
 "on journal \"%s\""
-msgstr ""
+msgstr "仕訳帳 %s にはデフォルト買掛金が定義されていません。"
 
 #. module: account
 #: model:ir.actions.act_window,help:account.action_review_financial_journals_installer
@@ -2288,21 +2299,22 @@ msgid ""
 "'Setup Your Bank Accounts' tool that will automatically create the accounts "
 "and journals for you."
 msgstr ""
+"会計仕訳帳を設定します。銀行口座のためには\"銀行口座のセットアップ\"ツールを使うことをお勧めします。これはアカウントと仕訳帳を自動的に作成します。"
 
 #. module: account
 #: model:ir.model,name:account.model_account_move
 msgid "Account Entry"
-msgstr ""
+msgstr "アカウントエントリー"
 
 #. module: account
 #: constraint:res.partner:0
 msgid "Error ! You cannot create recursive associated members."
-msgstr ""
+msgstr "エラー。再帰的な関係となる会員を作ることはできません。"
 
 #. module: account
 #: field:account.sequence.fiscalyear,sequence_main_id:0
 msgid "Main Sequence"
-msgstr ""
+msgstr "主順序"
 
 #. module: account
 #: code:addons/account/account_bank_statement.py:402
@@ -2310,7 +2322,7 @@ msgstr ""
 msgid ""
 "In order to delete a bank statement, you must first cancel it to delete "
 "related journal items."
-msgstr ""
+msgstr "銀行口座明細書を削除するには、関連する仕訳帳項目を削除するために最初にそれをキャンセルする必要があります。"
 
 #. module: account
 #: field:account.invoice,payment_term:0
@@ -2322,29 +2334,29 @@ msgstr ""
 #: model:ir.model,name:account.model_account_payment_term
 #: field:res.partner,property_payment_term:0
 msgid "Payment Term"
-msgstr ""
+msgstr "支払期間"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_fiscal_position_form
 #: model:ir.ui.menu,name:account.menu_action_account_fiscal_position_form
 msgid "Fiscal Positions"
-msgstr ""
+msgstr "会計ポジション"
 
 #. module: account
 #: constraint:account.account:0
 #: constraint:account.tax.code:0
 msgid "Error ! You can not create recursive accounts."
-msgstr ""
+msgstr "エラー。再帰的な関係となるアカウントの作成はできません。"
 
 #. module: account
 #: field:account.period.close,sure:0
 msgid "Check this box"
-msgstr ""
+msgstr "このボックスをチェック"
 
 #. module: account
 #: view:account.common.report:0
 msgid "Filters"
-msgstr ""
+msgstr "フィルタ"
 
 #. module: account
 #: view:account.bank.statement:0
@@ -2359,24 +2371,24 @@ msgstr ""
 #: selection:report.invoice.created,state:0
 #, python-format
 msgid "Open"
-msgstr ""
+msgstr "開く"
 
 #. module: account
 #: model:process.node,note:account.process_node_draftinvoices0
 #: model:process.node,note:account.process_node_supplierdraftinvoices0
 msgid "Draft state of an invoice"
-msgstr ""
+msgstr "請求書のドラフト状態"
 
 #. module: account
 #: view:account.partner.reconcile.process:0
 msgid "Partner Reconciliation"
-msgstr ""
+msgstr "パートナ照合"
 
 #. module: account
 #: field:account.tax,tax_code_id:0
 #: view:account.tax.code:0
 msgid "Account Tax Code"
-msgstr ""
+msgstr "税金コードアカウント"
 
 #. module: account
 #: code:addons/account/account_invoice.py:572
@@ -2387,28 +2399,32 @@ msgid ""
 "You can create one in the menu: \n"
 "Configuration\\Financial Accounting\\Accounts\\Journals."
 msgstr ""
+"会社のための %s タイプの仕訳帳アカウントを見つけることができません。\n"
+"\n"
+"メニューの中にそれを作成することができます： \n"
+"設定 \\ 財務会計 \\ アカウント \\ 仕訳帳"
 
 #. module: account
 #: model:account.payment.term,name:account.account_payment_term_advance
 #: model:account.payment.term,note:account.account_payment_term_advance
 msgid "30% Advance End 30 Days"
-msgstr ""
+msgstr "30%の前払い30日期限"
 
 #. module: account
 #: view:account.entries.report:0
 msgid "Unreconciled entries"
-msgstr ""
+msgstr "未照合のエントリー"
 
 #. module: account
 #: field:account.invoice.tax,base_code_id:0
 #: field:account.tax.template,base_code_id:0
 msgid "Base Code"
-msgstr ""
+msgstr "基本コード"
 
 #. module: account
 #: help:account.invoice.tax,sequence:0
 msgid "Gives the sequence order when displaying a list of invoice tax."
-msgstr ""
+msgstr "請求書の税金のリストを表示する時に、並べ順を指定して下さい。"
 
 #. module: account
 #: field:account.tax,base_sign:0
@@ -2428,17 +2444,20 @@ msgid ""
 "useful because it enables you to preview at any time the tax that you owe at "
 "the start and end of the month or quarter."
 msgstr ""
+"このメニューは請求書または支払いに基づく消費税申告を印刷します。ひとつあるいは複数の会計年度を選択して下さい。税金申請のために要求される情報は請求書（また"
+"は支払い、幾つかの国の）からOpenERPによって自動的に生成されます。このデータはリアルタイムで更新されます。月あるいは四半期の開始と終了において、支払"
+"うべき税金をいつでもレビューできるため非常に便利です。"
 
 #. module: account
 #: selection:account.move.line,centralisation:0
 msgid "Debit Centralisation"
-msgstr ""
+msgstr "借方の一元化"
 
 #. module: account
 #: view:account.invoice.confirm:0
 #: model:ir.actions.act_window,name:account.action_account_invoice_confirm
 msgid "Confirm Draft Invoices"
-msgstr ""
+msgstr "ドラフト請求書確認"
 
 #. module: account
 #: field:account.entries.report,day:0
@@ -2447,17 +2466,17 @@ msgstr ""
 #: view:analytic.entries.report:0
 #: field:analytic.entries.report,day:0
 msgid "Day"
-msgstr ""
+msgstr "日"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.act_account_renew_view
 msgid "Accounts to Renew"
-msgstr ""
+msgstr "アカウント更新"
 
 #. module: account
 #: model:ir.model,name:account.model_account_model_line
 msgid "Account Model Entries"
-msgstr ""
+msgstr "アカウントモデルエントリー"
 
 #. module: account
 #: code:addons/account/account.py:3117
@@ -2468,12 +2487,12 @@ msgstr ""
 #. module: account
 #: field:product.template,supplier_taxes_id:0
 msgid "Supplier Taxes"
-msgstr ""
+msgstr "仕入先税金"
 
 #. module: account
 #: view:account.entries.report:0
 msgid "entries"
-msgstr ""
+msgstr "エントリー"
 
 #. module: account
 #: help:account.invoice,date_due:0
@@ -2505,7 +2524,7 @@ msgstr ""
 msgid ""
 "The fiscal position will determine taxes and the accounts used for the "
 "partner."
-msgstr ""
+msgstr "会計ポジションは税金やパートナのために使われるアカウントを決定します。"
 
 #. module: account
 #: view:account.print.journal:0
@@ -2744,7 +2763,7 @@ msgstr ""
 msgid ""
 "You need an Opening journal with centralisation checked to set the initial "
 "balance!"
-msgstr ""
+msgstr "初期残高を設定するために一元的にチェック済みの開始仕訳帳が必要です。"
 
 #. module: account
 #: view:account.invoice.tax:0
@@ -2827,7 +2846,7 @@ msgstr ""
 #: help:account.bank.statement,account_id:0
 msgid ""
 "used in statement reconciliation domain, but shouldn't be used elswhere."
-msgstr ""
+msgstr "取引明細書の照合領域で使用されます。その他の場所では使うべきではありません。"
 
 #. module: account
 #: field:account.invoice.tax,base_amount:0
@@ -2883,7 +2902,7 @@ msgstr ""
 #: model:ir.model,name:account.model_account_fiscal_position
 #: field:res.partner,property_account_position:0
 msgid "Fiscal Position"
-msgstr ""
+msgstr "会計ポジション"
 
 #. module: account
 #: code:addons/account/account_invoice.py:735
@@ -3245,7 +3264,7 @@ msgstr ""
 #. module: account
 #: report:account.overdue:0
 msgid "VAT:"
-msgstr ""
+msgstr "消費税："
 
 #. module: account
 #: constraint:account.invoice:0
@@ -3418,7 +3437,7 @@ msgstr ""
 #. module: account
 #: report:account.invoice:0
 msgid "VAT :"
-msgstr ""
+msgstr "消費税："
 
 #. module: account
 #: report:account.central.journal:0
@@ -4128,7 +4147,7 @@ msgstr ""
 #: code:addons/account/account_bank_statement.py:367
 #, python-format
 msgid "Statement %s is confirmed, journal items are created."
-msgstr ""
+msgstr "取引明細書 %s は確認され、仕訳帳項目が作成されました。"
 
 #. module: account
 #: field:report.aged.receivable,name:0
@@ -4181,7 +4200,7 @@ msgstr ""
 #. module: account
 #: model:process.node,note:account.process_node_importinvoice0
 msgid "Statement from invoice or payment"
-msgstr ""
+msgstr "請求書または支払いからの取引明細書"
 
 #. module: account
 #: model:ir.model,name:account.model_account_chart
@@ -4596,7 +4615,7 @@ msgstr ""
 #. module: account
 #: help:account.move.line,statement_id:0
 msgid "The bank statement used for bank reconciliation"
-msgstr ""
+msgstr "銀行照合のために使用される銀行取引明細書"
 
 #. module: account
 #: model:process.transition,note:account.process_transition_suppliercustomerinvoice0
@@ -4763,7 +4782,7 @@ msgstr ""
 #: model:ir.actions.act_window,name:account.action_account_vat_declaration
 #: model:ir.model,name:account.model_account_vat_declaration
 msgid "Account Vat Declaration"
-msgstr ""
+msgstr "消費税申告アカウント"
 
 #. module: account
 #: report:account.invoice:0
@@ -5075,7 +5094,7 @@ msgstr ""
 #. module: account
 #: model:ir.model,name:account.model_account_fiscal_position_tax_template
 msgid "Template Tax Fiscal Position"
-msgstr ""
+msgstr "税金会計ポジションテンプレート"
 
 #. module: account
 #: field:account.journal,update_posted:0
@@ -5112,7 +5131,7 @@ msgstr ""
 #: help:account.tax.template,ref_tax_code_id:0
 #: help:account.tax.template,tax_code_id:0
 msgid "Use this code for the VAT declaration."
-msgstr ""
+msgstr "消費税申請にこのコードを使って下さい。"
 
 #. module: account
 #: field:account.partner.reconcile.process,progress:0
@@ -5383,7 +5402,7 @@ msgstr ""
 #: view:account.fiscal.position.template:0
 #: field:account.fiscal.position.template,name:0
 msgid "Fiscal Position Template"
-msgstr ""
+msgstr "会計ポジションテンプレート"
 
 #. module: account
 #: view:account.analytic.chart:0
@@ -5555,7 +5574,7 @@ msgstr ""
 #. module: account
 #: report:account.journal.period.print.sale.purchase:0
 msgid "VAT"
-msgstr ""
+msgstr "消費税"
 
 #. module: account
 #: report:account.analytic.account.journal:0
@@ -5816,7 +5835,7 @@ msgstr ""
 #. module: account
 #: report:account.invoice:0
 msgid "Fiscal Position Remark :"
-msgstr ""
+msgstr "会計ポジション注釈："
 
 #. module: account
 #: view:analytic.entries.report:0
@@ -6241,7 +6260,7 @@ msgstr ""
 #. module: account
 #: field:account.move.line,centralisation:0
 msgid "Centralisation"
-msgstr ""
+msgstr "一元化"
 
 #. module: account
 #: view:account.account:0
@@ -6419,7 +6438,7 @@ msgid ""
 "Bank Reconciliation consists of verifying that your bank statement "
 "corresponds with the entries (or records) of that account in your accounting "
 "system."
-msgstr ""
+msgstr "銀行照合は、銀行取引明細書が会計システムのそのアカウントのエントリー（またはレコード）と対応することを検証することから構成されます。"
 
 #. module: account
 #: model:process.node,note:account.process_node_draftstatement0
@@ -6689,7 +6708,7 @@ msgstr ""
 #. module: account
 #: model:ir.model,name:account.model_account_fiscal_position_tax
 msgid "Taxes Fiscal Position"
-msgstr ""
+msgstr "税金会計ポジション"
 
 #. module: account
 #: report:account.general.ledger:0
@@ -6842,7 +6861,7 @@ msgstr ""
 #. module: account
 #: model:process.transition,note:account.process_transition_invoicemanually0
 msgid "A statement with manual entries becomes a draft statement."
-msgstr ""
+msgstr "手動入力の取引明細書はドラフト取引明細書になります。"
 
 #. module: account
 #: view:account.aged.trial.balance:0
@@ -7079,7 +7098,7 @@ msgstr ""
 #. module: account
 #: model:ir.model,name:account.model_account_bank_statement_line
 msgid "Bank Statement Line"
-msgstr ""
+msgstr "銀行取引明細書行"
 
 #. module: account
 #: field:account.automatic.reconcile,date2:0
@@ -7768,6 +7787,8 @@ msgid ""
 "The statement balance is incorrect !\n"
 "The expected balance (%.2f) is different than the computed one. (%.2f)"
 msgstr ""
+"取引明細書の残高が正しくありません。\n"
+"予想される残高（%.2f）は計算されたもの（%.2f）と異なっています。"
 
 #. module: account
 #: code:addons/account/account_bank_statement.py:353
@@ -7897,7 +7918,7 @@ msgid ""
 "The chart of taxes is used to generate your periodical tax statement. You "
 "will see the taxes with codes related to your legal statement according to "
 "your country."
-msgstr ""
+msgstr "税金のチャートは定期的な税金計算書を生成するために使用されます。国に応じた法律上の計算書に関連したコードとともに税金が表示されます。"
 
 #. module: account
 #: code:addons/account/account_invoice.py:428
@@ -8030,7 +8051,7 @@ msgstr ""
 #: model:ir.actions.act_window,name:account.action_account_fiscal_position_template_form
 #: model:ir.ui.menu,name:account.menu_action_account_fiscal_position_form_template
 msgid "Fiscal Position Templates"
-msgstr ""
+msgstr "会計ポジションテンプレート"
 
 #. module: account
 #: view:account.entries.report:0
@@ -8068,6 +8089,9 @@ msgid ""
 "useful because it enables you to preview at any time the tax that you owe at "
 "the start and end of the month or quarter."
 msgstr ""
+"このメニューは請求書または支払いに基づく消費税申告を印刷します。ひとつあるいは複数の会計年度を選択することができます。税金申請のために要求される情報は請求"
+"書（または支払い、幾つかの国の）からOpenERPによって自動的に生成されます。このデータはリアルタイムで更新されます。月あるいは四半期の開始と終了におい"
+"て、支払うべき税金をいつでもレビューできるため非常に便利です。"
 
 #. module: account
 #: report:account.invoice:0
@@ -8454,7 +8478,7 @@ msgstr ""
 msgid ""
 "The amount of the voucher must be the same amount as the one on the "
 "statement line"
-msgstr ""
+msgstr "バウチャーの金額は明細行のひとつの金額と同じでなければなりません。"
 
 #. module: account
 #: model:account.account.type,name:account.data_account_type_expense
@@ -8471,7 +8495,7 @@ msgstr ""
 #: code:addons/account/account_move_line.py:1105
 #, python-format
 msgid "The account move (%s) for centralisation has been confirmed!"
-msgstr ""
+msgstr "一元化のためのアカウントの移動（%s）が確認されました。"
 
 #. module: account
 #: help:account.move.line,amount_currency:0
@@ -8523,7 +8547,7 @@ msgstr ""
 #: help:account.bank.statement.line,sequence:0
 msgid ""
 "Gives the sequence order when displaying a list of bank statement lines."
-msgstr ""
+msgstr "銀行取引明細書のリストを表示する時には、並び順を与えて下さい。"
 
 #. module: account
 #: model:process.transition,note:account.process_transition_validentries0
@@ -9541,6 +9565,8 @@ msgid ""
 "When new statement is created the state will be 'Draft'.\n"
 "And after getting confirmation from the bank it will be in 'Confirmed' state."
 msgstr ""
+"新しい取引明細書が作成された時には、状態はドラフトとなります。\n"
+"銀行から確認を受け取った後に、その状態は確認済みとなります。"
 
 #. module: account
 #: model:ir.model,name:account.model_account_period
@@ -9875,7 +9901,7 @@ msgstr ""
 #. module: account
 #: model:ir.model,name:account.model_account_fiscal_position_account
 msgid "Accounts Fiscal Position"
-msgstr ""
+msgstr "アカウント会計ポジション"
 
 #. module: account
 #: report:account.invoice:0
@@ -10053,7 +10079,7 @@ msgstr ""
 #: model:process.transition,note:account.process_transition_invoiceimport0
 msgid ""
 "Import of the statement in the system from a supplier or customer invoice"
-msgstr ""
+msgstr "仕入先や顧客の請求書からシステム内に取引明細書のインポート"
 
 #. module: account
 #: model:ir.ui.menu,name:account.menu_finance_periodical_processing_billing
@@ -10365,6 +10391,9 @@ msgid ""
 "be with same name as statement name. This allows the statement entries to "
 "have the same references than the statement itself"
 msgstr ""
+"名前として / "
+"以外を与えた場合は、作成された会計エントリーの移動は取引明細書の名前として同じ名前になります。これによって取引明細書のエントリーはそれ自身の取引明細書と同"
+"じ参照を持つことができます。"
 
 #. module: account
 #: field:account.bank.accounts.wizard,bank_account_id:0
@@ -10444,6 +10473,9 @@ msgid ""
 "certain amount of information. They have to be certified by an external "
 "auditor annually."
 msgstr ""
+"仕訳帳エントリーを記録する必要があるアカウントを作成し管理します。アカウントはあなたの会社が借方と貸方取引の全ての種類を登録するための総勘定元帳の一部です"
+"。会社は２つの主な要素で年度会計を表します：貸借対照表と損益計算書。会社の年度会計は情報の一定量を開示することが法によって要求されます。それは毎年外部の監"
+"査人によって証明されなければなりません。"
 
 #. module: account
 #: help:account.move.line,amount_residual_currency:0
diff --git a/addons/association/i18n/gu.po b/addons/association/i18n/gu.po
new file mode 100644
index 00000000000..c9f6ff87d9b
--- /dev/null
+++ b/addons/association/i18n/gu.po
@@ -0,0 +1,137 @@
+# 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-19 08: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-20 04:43+0000\n"
+"X-Generator: Launchpad (build 15120)\n"
+
+#. module: association
+#: field:profile.association.config.install_modules_wizard,wiki:0
+msgid "Wiki"
+msgstr ""
+
+#. module: association
+#: view:profile.association.config.install_modules_wizard:0
+msgid "Event Management"
+msgstr "પ્રસંગ સંચાલન"
+
+#. module: association
+#: field:profile.association.config.install_modules_wizard,project_gtd:0
+msgid "Getting Things Done"
+msgstr ""
+
+#. module: association
+#: model:ir.module.module,description:association.module_meta_information
+msgid "This module is to create Profile for Associates"
+msgstr ""
+
+#. module: association
+#: field:profile.association.config.install_modules_wizard,progress:0
+msgid "Configuration Progress"
+msgstr ""
+
+#. module: association
+#: view:profile.association.config.install_modules_wizard:0
+msgid ""
+"Here are specific applications related to the Association Profile you "
+"selected."
+msgstr ""
+
+#. module: association
+#: view:profile.association.config.install_modules_wizard:0
+msgid "title"
+msgstr "શીર્ષક"
+
+#. module: association
+#: help:profile.association.config.install_modules_wizard,event_project:0
+msgid "Helps you to manage and organize your events."
+msgstr ""
+
+#. module: association
+#: field:profile.association.config.install_modules_wizard,config_logo:0
+msgid "Image"
+msgstr "ચિત્ર"
+
+#. module: association
+#: help:profile.association.config.install_modules_wizard,hr_expense:0
+msgid ""
+"Tracks and manages employee expenses, and can automatically re-invoice "
+"clients if the expenses are project-related."
+msgstr ""
+
+#. module: association
+#: help:profile.association.config.install_modules_wizard,project_gtd:0
+msgid ""
+"GTD is a methodology to efficiently organise yourself and your tasks. This "
+"module fully integrates GTD principle with OpenERP's project management."
+msgstr ""
+
+#. module: association
+#: view:profile.association.config.install_modules_wizard:0
+msgid "Resources Management"
+msgstr "સંપત્તિ સંચાલન"
+
+#. module: association
+#: model:ir.module.module,shortdesc:association.module_meta_information
+msgid "Association profile"
+msgstr "એસોસિયેશન રૂપરેખા"
+
+#. module: association
+#: field:profile.association.config.install_modules_wizard,hr_expense:0
+msgid "Expenses Tracking"
+msgstr ""
+
+#. module: association
+#: model:ir.actions.act_window,name:association.action_config_install_module
+#: view:profile.association.config.install_modules_wizard:0
+msgid "Association Application Configuration"
+msgstr ""
+
+#. module: association
+#: help:profile.association.config.install_modules_wizard,wiki:0
+msgid ""
+"Lets you create wiki pages and page groups in order to keep track of "
+"business knowledge and share it with and  between your employees."
+msgstr ""
+
+#. module: association
+#: help:profile.association.config.install_modules_wizard,project:0
+msgid ""
+"Helps you manage your projects and tasks by tracking them, generating "
+"plannings, etc..."
+msgstr ""
+"તમને તમારા પ્રોજેક્ટ અને ટાસ્ક નુ સંચાલન કરવા મા મદદ કરે છે જેમકે, નિરીક્ષણ "
+"કરવામા, યોજનાઓ ઘડવામા વિગેરે ..."
+
+#. module: association
+#: model:ir.model,name:association.model_profile_association_config_install_modules_wizard
+msgid "profile.association.config.install_modules_wizard"
+msgstr ""
+
+#. module: association
+#: field:profile.association.config.install_modules_wizard,event_project:0
+msgid "Events"
+msgstr "ઘટનાઓ"
+
+#. module: association
+#: view:profile.association.config.install_modules_wizard:0
+#: field:profile.association.config.install_modules_wizard,project:0
+msgid "Project Management"
+msgstr "પ્રોજેક્ટ સંચાલન"
+
+#. module: association
+#: view:profile.association.config.install_modules_wizard:0
+msgid "Configure"
+msgstr "રૂપરેખાંકન"
diff --git a/addons/base_crypt/i18n/gu.po b/addons/base_crypt/i18n/gu.po
new file mode 100644
index 00000000000..873be861b37
--- /dev/null
+++ b/addons/base_crypt/i18n/gu.po
@@ -0,0 +1,45 @@
+# 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-19 08:51+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-20 04:43+0000\n"
+"X-Generator: Launchpad (build 15120)\n"
+
+#. module: base_crypt
+#: model:ir.model,name:base_crypt.model_res_users
+msgid "res.users"
+msgstr ""
+
+#. module: base_crypt
+#: sql_constraint:res.users:0
+msgid "You can not have two users with the same login !"
+msgstr "તમે બે વપરાશકર્તાઓને એક જ લોગીન ન કરી શકો!"
+
+#. module: base_crypt
+#: constraint:res.users:0
+msgid "The chosen company is not in the allowed companies for this user"
+msgstr "પસંદ કરેલ કંપની માન્ય કંપનીઓમાં આ વપરાશકર્તા માટે નથી"
+
+#. module: base_crypt
+#: code:addons/base_crypt/crypt.py:140
+#, python-format
+msgid "Please specify the password !"
+msgstr "પાસવર્ડ સ્પષ્ટ કરો!"
+
+#. module: base_crypt
+#: code:addons/base_crypt/crypt.py:140
+#, python-format
+msgid "Error"
+msgstr "ભૂલ"
diff --git a/addons/crm/i18n/gu.po b/addons/crm/i18n/gu.po
new file mode 100644
index 00000000000..6905c965164
--- /dev/null
+++ b/addons/crm/i18n/gu.po
@@ -0,0 +1,3592 @@
+# 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 01:37+0100\n"
+"PO-Revision-Date: 2012-04-19 12:55+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-20 04:43+0000\n"
+"X-Generator: Launchpad (build 15120)\n"
+
+#. module: crm
+#: view:crm.lead.report:0
+msgid "# Leads"
+msgstr ""
+
+#. module: crm
+#: view:crm.lead:0 selection:crm.lead,type:0 view:crm.lead.report:0
+#: selection:crm.lead.report,type:0
+msgid "Lead"
+msgstr ""
+
+#. module: crm
+#: model:crm.case.categ,name:crm.categ_oppor3
+msgid "Need Services"
+msgstr ""
+
+#. module: crm
+#: selection:crm.meeting,rrule_type:0
+msgid "Monthly"
+msgstr "માસીક"
+
+#. module: crm
+#: model:ir.model,name:crm.model_crm_case_stage
+msgid "Stage of case"
+msgstr ""
+
+#. module: crm
+#: view:crm.meeting:0
+msgid "Visibility"
+msgstr "દૃશ્યતા"
+
+#. module: crm
+#: field:crm.lead,title:0
+msgid "Title"
+msgstr "શીર્ષક"
+
+#. module: crm
+#: field:crm.meeting,show_as:0
+msgid "Show as"
+msgstr ""
+
+#. module: crm
+#: field:crm.meeting,day:0 selection:crm.meeting,select1:0
+msgid "Date of month"
+msgstr "મહિના ની તારીખ"
+
+#. module: crm
+#: view:crm.lead:0 view:crm.phonecall:0
+msgid "Today"
+msgstr "આજે"
+
+#. module: crm
+#: view:crm.lead2opportunity.partner:0 view:crm.merge.opportunity:0
+msgid "Select Opportunities"
+msgstr ""
+
+#. module: crm
+#: view:crm.meeting:0 view:crm.phonecall2opportunity:0
+#: view:crm.phonecall2phonecall:0
+msgid " "
+msgstr " "
+
+#. module: crm
+#: view:crm.lead.report:0 field:crm.phonecall.report,delay_close:0
+msgid "Delay to close"
+msgstr ""
+
+#. module: crm
+#: view:crm.lead:0
+msgid "Previous Stage"
+msgstr ""
+
+#. module: crm
+#: code:addons/crm/wizard/crm_add_note.py:28
+#, python-format
+msgid "Can not add note!"
+msgstr ""
+
+#. module: crm
+#: field:crm.case.stage,name:0
+msgid "Stage Name"
+msgstr ""
+
+#. module: crm
+#: model:ir.model,name:crm.model_crm_lead_report
+msgid "CRM Lead Analysis"
+msgstr ""
+
+#. module: crm
+#: view:crm.lead.report:0 view:crm.phonecall.report:0
+#: field:crm.phonecall.report,day:0
+msgid "Day"
+msgstr "દિવસ"
+
+#. module: crm
+#: sql_constraint:crm.case.section:0
+msgid "The code of the sales team must be unique !"
+msgstr ""
+
+#. module: crm
+#: code:addons/crm/crm_lead.py:553
+#, python-format
+msgid "Lead '%s' has been converted to an opportunity."
+msgstr ""
+
+#. module: crm
+#: code:addons/crm/crm_lead.py:294
+#, python-format
+msgid "The lead '%s' has been closed."
+msgstr ""
+
+#. module: crm
+#: view:crm.lead.report:0
+msgid "Exp. Closing"
+msgstr ""
+
+#. module: crm
+#: selection:crm.meeting,rrule_type:0
+msgid "Yearly"
+msgstr ""
+
+#. module: crm
+#: help:crm.lead.report,creation_day:0
+msgid "Creation day"
+msgstr ""
+
+#. module: crm
+#: field:crm.segmentation.line,name:0
+msgid "Rule Name"
+msgstr ""
+
+#. module: crm
+#: view:crm.case.section:0
+msgid "Configuration"
+msgstr ""
+
+#. module: crm
+#: view:crm.case.resource.type:0 view:crm.lead:0 field:crm.lead,type_id:0
+#: view:crm.lead.report:0 field:crm.lead.report,type_id:0
+#: model:ir.model,name:crm.model_crm_case_resource_type
+msgid "Campaign"
+msgstr ""
+
+#. module: crm
+#: view:crm.lead:0
+msgid "Search Opportunities"
+msgstr ""
+
+#. module: crm
+#: help:crm.lead.report,deadline_month:0
+msgid "Expected closing month"
+msgstr ""
+
+#. module: crm
+#: view:crm.lead2opportunity.partner.mass:0
+msgid "Assigned opportunities to"
+msgstr ""
+
+#. module: crm
+#: view:crm.lead:0 field:crm.lead,partner_id:0 view:crm.lead.report:0
+#: field:crm.lead.report,partner_id:0
+#: field:crm.lead2opportunity.partner,partner_id:0
+#: field:crm.lead2opportunity.partner.mass,partner_id:0
+#: field:crm.lead2partner,partner_id:0 view:crm.meeting:0
+#: field:crm.meeting,partner_id:0 field:crm.opportunity2phonecall,partner_id:0
+#: field:crm.partner2opportunity,partner_id:0 view:crm.phonecall:0
+#: field:crm.phonecall,partner_id:0 view:crm.phonecall.report:0
+#: field:crm.phonecall.report,partner_id:0
+#: field:crm.phonecall2opportunity,partner_id:0
+#: field:crm.phonecall2partner,partner_id:0
+#: field:crm.phonecall2phonecall,partner_id:0
+#: model:ir.model,name:crm.model_res_partner
+#: model:process.node,name:crm.process_node_partner0
+msgid "Partner"
+msgstr ""
+
+#. module: crm
+#: field:crm.meeting,organizer:0 field:crm.meeting,organizer_id:0
+msgid "Organizer"
+msgstr ""
+
+#. module: crm
+#: view:crm.phonecall:0
+#: model:ir.actions.act_window,name:crm.phonecall_to_phonecall_act
+msgid "Schedule Other Call"
+msgstr ""
+
+#. module: crm
+#: code:addons/crm/crm_phonecall.py:216
+#: model:crm.case.categ,name:crm.categ_meet3 view:crm.phonecall:0
+#, python-format
+msgid "Phone Call"
+msgstr ""
+
+#. module: crm
+#: field:crm.lead,optout:0
+msgid "Opt-Out"
+msgstr ""
+
+#. module: crm
+#: field:crm.meeting,end_type:0
+msgid "Recurrence termination"
+msgstr ""
+
+#. module: crm
+#: code:addons/crm/crm_lead.py:323
+#, python-format
+msgid "The opportunity '%s' has been marked as lost."
+msgstr ""
+
+#. module: crm
+#: model:ir.actions.act_window,help:crm.action_report_crm_lead
+msgid ""
+"Leads Analysis allows you to check different CRM related information. Check "
+"for treatment delays, number of responses given and emails sent. You can "
+"sort out your leads analysis by different groups to get accurate grained "
+"analysis."
+msgstr ""
+
+#. module: crm
+#: view:crm.lead:0
+msgid "Send New Email"
+msgstr ""
+
+#. module: crm
+#: field:crm.segmentation,segmentation_line:0
+msgid "Criteria"
+msgstr ""
+
+#. module: crm
+#: view:crm.segmentation:0
+msgid "Excluded Answers :"
+msgstr ""
+
+#. module: crm
+#: field:crm.case.stage,section_ids:0
+msgid "Sections"
+msgstr ""
+
+#. module: crm
+#: view:crm.merge.opportunity:0
+msgid "_Merge"
+msgstr ""
+
+#. module: crm
+#: view:crm.lead.report:0
+#: model:ir.actions.act_window,name:crm.action_report_crm_lead
+#: model:ir.ui.menu,name:crm.menu_report_crm_leads_tree
+msgid "Leads Analysis"
+msgstr ""
+
+#. module: crm
+#: selection:crm.meeting,class:0
+msgid "Public"
+msgstr ""
+
+#. module: crm
+#: model:ir.actions.act_window,name:crm.crm_case_resource_type_act
+#: model:ir.ui.menu,name:crm.menu_crm_case_resource_type_act
+msgid "Campaigns"
+msgstr ""
+
+#. module: crm
+#: view:crm.lead:0 field:crm.lead,state:0 view:crm.lead.report:0
+#: field:crm.lead.report,state:0 field:crm.meeting,state:0
+#: field:crm.phonecall,state:0 view:crm.phonecall.report:0
+#: field:crm.phonecall.report,state:0
+msgid "State"
+msgstr ""
+
+#. module: crm
+#: model:ir.actions.act_window,name:crm.crm_lead_categ_action
+#: model:ir.ui.menu,name:crm.menu_crm_case_phonecall-act
+#: model:ir.ui.menu,name:crm.menu_crm_lead_categ
+msgid "Categories"
+msgstr ""
+
+#. module: crm
+#: view:crm.lead:0
+msgid "Dates"
+msgstr ""
+
+#. module: crm
+#: help:crm.lead,optout:0
+msgid ""
+"If opt-out is checked, this contact has refused to receive emails or "
+"unsubscribed to a campaign."
+msgstr ""
+
+#. module: crm
+#: model:process.transition,name:crm.process_transition_leadpartner0
+msgid "Prospect Partner"
+msgstr ""
+
+#. module: crm
+#: code:addons/crm/crm_lead.py:735
+#, python-format
+msgid "No Subject"
+msgstr ""
+
+#. module: crm
+#: model:crm.case.resource.type,name:crm.type_lead6
+msgid "Google Adwords 2"
+msgstr ""
+
+#. module: crm
+#: selection:crm.lead2opportunity.partner,action:0
+#: selection:crm.lead2opportunity.partner.mass,action:0
+#: selection:crm.lead2partner,action:0
+#: selection:crm.phonecall2partner,action:0
+msgid "Link to an existing partner"
+msgstr ""
+
+#. module: crm
+#: view:crm.lead:0 field:crm.lead,contact_id:0 view:crm.meeting:0
+#: field:crm.opportunity2phonecall,contact_name:0
+#: field:crm.phonecall,partner_contact:0
+#: field:crm.phonecall2phonecall,contact_name:0
+msgid "Contact"
+msgstr ""
+
+#. module: crm
+#: view:crm.meeting:0
+msgid "Delegate"
+msgstr ""
+
+#. module: crm
+#: selection:crm.segmentation.line,expr_operator:0
+msgid "="
+msgstr ""
+
+#. module: crm
+#: field:base.action.rule,regex_history:0
+msgid "Regular Expression on Case History"
+msgstr ""
+
+#. module: crm
+#: code:addons/crm/crm_lead.py:274
+#, python-format
+msgid "The lead '%s' has been opened."
+msgstr ""
+
+#. module: crm
+#: model:process.transition,name:crm.process_transition_opportunitymeeting0
+msgid "Opportunity Meeting"
+msgstr ""
+
+#. module: crm
+#: help:crm.lead.report,delay_close:0 help:crm.phonecall.report,delay_close:0
+msgid "Number of Days to close the case"
+msgstr ""
+
+#. module: crm
+#: model:process.node,note:crm.process_node_opportunities0
+msgid "When a real project/opportunity is detected"
+msgstr ""
+
+#. module: crm
+#: view:res.partner:0 field:res.partner,opportunity_ids:0
+msgid "Leads and Opportunities"
+msgstr ""
+
+#. module: crm
+#: view:crm.lead:0
+msgid "Communication"
+msgstr ""
+
+#. module: crm
+#: selection:crm.meeting,week_list:0
+msgid "Tuesday"
+msgstr ""
+
+#. module: crm
+#: field:crm.lead,write_date:0
+msgid "Update Date"
+msgstr ""
+
+#. module: crm
+#: field:crm.case.section,user_id:0
+msgid "Team Leader"
+msgstr ""
+
+#. module: crm
+#: field:crm.lead2opportunity.partner,name:0
+#: field:crm.lead2opportunity.partner.mass,name:0
+msgid "Select Action"
+msgstr ""
+
+#. module: crm
+#: help:crm.case.stage,probability:0
+msgid ""
+"This percentage depicts the default/average probability of the Case for this "
+"stage to be a success"
+msgstr ""
+
+#. module: crm
+#: field:base.action.rule,trg_categ_id:0 view:crm.lead:0
+#: field:crm.lead,categ_id:0 view:crm.lead.report:0
+#: field:crm.lead.report,categ_id:0 field:crm.opportunity2phonecall,categ_id:0
+#: field:crm.phonecall,categ_id:0 view:crm.phonecall.report:0
+#: field:crm.phonecall.report,categ_id:0
+#: field:crm.phonecall2phonecall,categ_id:0
+msgid "Category"
+msgstr ""
+
+#. module: crm
+#: view:crm.lead:0
+msgid "Opportunity / Customer"
+msgstr ""
+
+#. module: crm
+#: view:crm.lead.report:0
+msgid "#Opportunities"
+msgstr ""
+
+#. module: crm
+#: view:crm.meeting:0
+msgid "Privacy"
+msgstr ""
+
+#. module: crm
+#: model:ir.actions.act_window,help:crm.crm_case_stage_form_installer
+msgid ""
+"Stages will allow salesmen to easily track how a specific opportunity is "
+"positioned in the sales cycle. In order to efficiently manage your sales "
+"pipeline, it's important to define conditions to go to the next step. "
+"Example: to set an opportunity as 'Qualified', you must set the \"Expected "
+"Revenue\" and the \"Expected Closing Date.\" You should also have a look at "
+"the tooltip of the field \"Change Probability Automatically\"."
+msgstr ""
+
+#. module: crm
+#: view:crm.lead.report:0
+msgid "Opportunity Analysis"
+msgstr ""
+
+#. module: crm
+#: help:crm.meeting,location:0
+msgid "Location of Event"
+msgstr ""
+
+#. module: crm
+#: field:crm.meeting,rrule:0
+msgid "Recurrent Rule"
+msgstr ""
+
+#. module: crm
+#: model:process.transition,note:crm.process_transition_opportunitymeeting0
+msgid "Normal or phone meeting for opportunity"
+msgstr ""
+
+#. module: crm
+#: view:crm.case.section:0
+msgid "Mail Gateway"
+msgstr ""
+
+#. module: crm
+#: model:process.node,note:crm.process_node_leads0
+msgid "Very first contact with new prospect"
+msgstr ""
+
+#. module: crm
+#: view:crm.lead2opportunity.partner:0 view:crm.partner2opportunity:0
+#: model:ir.actions.act_window,name:crm.action_view_crm_partner2opportunity
+#: model:ir.actions.act_window,name:crm.crm_partner2opportunity
+msgid "Create Opportunity"
+msgstr ""
+
+#. module: crm
+#: selection:crm.lead.report,creation_month:0
+#: selection:crm.lead.report,deadline_month:0
+#: selection:crm.meeting,month_list:0 selection:crm.phonecall.report,month:0
+msgid "August"
+msgstr ""
+
+#. module: crm
+#: code:addons/crm/crm.py:433 view:crm.lead:0 view:res.partner:0
+#, python-format
+msgid "Escalate"
+msgstr ""
+
+#. module: crm
+#: view:crm.lead:0
+msgid "Mailings"
+msgstr ""
+
+#. module: crm
+#: view:crm.phonecall:0
+msgid "To Do"
+msgstr ""
+
+#. module: crm
+#: selection:crm.lead.report,creation_month:0
+#: selection:crm.lead.report,deadline_month:0
+#: selection:crm.meeting,month_list:0 selection:crm.phonecall.report,month:0
+msgid "June"
+msgstr ""
+
+#. module: crm
+#: selection:crm.segmentation,state:0
+msgid "Not Running"
+msgstr ""
+
+#. module: crm
+#: field:crm.lead,email:0
+msgid "E-Mail"
+msgstr ""
+
+#. module: crm
+#: view:crm.phonecall:0
+msgid "Phonecalls during last 7 days"
+msgstr ""
+
+#. module: crm
+#: selection:crm.lead.report,creation_month:0
+#: selection:crm.lead.report,deadline_month:0
+#: selection:crm.meeting,month_list:0 selection:crm.phonecall.report,month:0
+msgid "October"
+msgstr ""
+
+#. module: crm
+#: view:crm.segmentation:0
+msgid "Included Answers :"
+msgstr ""
+
+#. module: crm
+#: help:crm.meeting,email_from:0 help:crm.phonecall,email_from:0
+msgid "These people will receive email."
+msgstr ""
+
+#. module: crm
+#: view:crm.meeting:0 field:crm.meeting,name:0
+msgid "Summary"
+msgstr ""
+
+#. module: crm
+#: view:crm.segmentation:0
+msgid "State of Mind Computation"
+msgstr ""
+
+#. module: crm
+#: view:crm.case.categ:0
+msgid "Case Category"
+msgstr ""
+
+#. module: crm
+#: help:crm.segmentation,som_interval_default:0
+msgid ""
+"Default state of mind for period preceeding the 'Max Interval' computation. "
+"This is the starting state of mind by default if the partner has no event."
+msgstr ""
+
+#. module: crm
+#: field:crm.lead,partner_address_name:0
+msgid "Partner Contact Name"
+msgstr ""
+
+#. module: crm
+#: selection:crm.meeting,end_type:0
+msgid "End date"
+msgstr ""
+
+#. module: crm
+#: view:crm.opportunity2phonecall:0 view:crm.phonecall2phonecall:0
+msgid "Schedule/Log a call"
+msgstr ""
+
+#. module: crm
+#: constraint:base.action.rule:0
+msgid "Error: The mail is not well formated"
+msgstr ""
+
+#. module: crm
+#: view:crm.segmentation:0
+msgid "Profiling Options"
+msgstr ""
+
+#. module: crm
+#: view:crm.phonecall.report:0
+msgid "#Phone calls"
+msgstr ""
+
+#. module: crm
+#: help:crm.segmentation,categ_id:0
+msgid ""
+"The partner category that will be added to partners that match the "
+"segmentation criterions after computation."
+msgstr ""
+
+#. module: crm
+#: code:addons/crm/crm_meeting.py:93
+#, python-format
+msgid "The meeting '%s' has been confirmed."
+msgstr ""
+
+#. module: crm
+#: selection:crm.add.note,state:0 selection:crm.lead,state:0
+msgid "In Progress"
+msgstr ""
+
+#. module: crm
+#: help:crm.case.section,reply_to:0
+msgid ""
+"The email address put in the 'Reply-To' of all emails sent by OpenERP about "
+"cases in this sales team"
+msgstr ""
+
+#. module: crm
+#: field:crm.lead.report,creation_month:0
+msgid "Creation Month"
+msgstr ""
+
+#. module: crm
+#: field:crm.case.section,resource_calendar_id:0
+#: model:ir.ui.menu,name:crm.menu_action_resource_calendar_form
+msgid "Working Time"
+msgstr ""
+
+#. module: crm
+#: view:crm.segmentation.line:0
+msgid "Partner Segmentation Lines"
+msgstr ""
+
+#. module: crm
+#: view:crm.lead:0 view:crm.meeting:0
+msgid "Details"
+msgstr ""
+
+#. module: crm
+#: help:crm.meeting,exrule:0
+msgid ""
+"Defines a rule or repeating pattern of time to exclude from the recurring "
+"rule."
+msgstr ""
+
+#. module: crm
+#: view:crm.lead:0
+msgid "Leads Form"
+msgstr ""
+
+#. module: crm
+#: view:crm.segmentation:0 model:ir.model,name:crm.model_crm_segmentation
+msgid "Partner Segmentation"
+msgstr ""
+
+#. module: crm
+#: model:ir.actions.act_window,help:crm.crm_case_categ_meet
+msgid ""
+"The meeting calendar is shared between the sales teams and fully integrated "
+"with other applications such as the employee holidays or the business "
+"opportunities. You can also synchronize meetings with your mobile phone "
+"using the caldav interface.\n"
+"        "
+msgstr ""
+
+#. module: crm
+#: field:crm.lead2opportunity.partner.mass,user_ids:0
+msgid "Salesmans"
+msgstr ""
+
+#. module: crm
+#: field:crm.lead.report,probable_revenue:0
+msgid "Probable Revenue"
+msgstr ""
+
+#. module: crm
+#: help:crm.lead.report,creation_month:0
+msgid "Creation month"
+msgstr ""
+
+#. module: crm
+#: help:crm.segmentation,name:0
+msgid "The name of the segmentation."
+msgstr ""
+
+#. module: crm
+#: field:crm.case.stage,probability:0 field:crm.lead,probability:0
+msgid "Probability (%)"
+msgstr ""
+
+#. module: crm
+#: field:crm.lead,company_currency:0
+msgid "Company Currency"
+msgstr ""
+
+#. module: crm
+#: view:crm.lead:0
+msgid "Leads Generation"
+msgstr ""
+
+#. module: crm
+#: model:ir.actions.act_window,help:crm.crm_case_section_view_form_installer
+msgid ""
+"Define sales teams to structure your sales organization and assign users to "
+"each team. You should also define the sales stage to each team. As an "
+"example, if you use Solutions Selling techniques to track your "
+"opportunities, you can assign the following stage to the team: Territory, "
+"Qualified, Qualified Sponsors, Proposition, Negociaton, Won/Lost."
+msgstr ""
+
+#. module: crm
+#: code:addons/crm/crm_lead.py:718 view:crm.lead:0 selection:crm.lead,type:0
+#: view:crm.lead.report:0 selection:crm.lead.report,type:0
+#: field:crm.meeting,opportunity_id:0
+#, python-format
+msgid "Opportunity"
+msgstr ""
+
+#. module: crm
+#: view:crm.lead.report:0
+msgid "Leads/Opportunities created in last month"
+msgstr ""
+
+#. module: crm
+#: model:crm.case.resource.type,name:crm.type_lead7
+msgid "Television"
+msgstr ""
+
+#. module: crm
+#: view:crm.segmentation:0
+msgid "Stop Process"
+msgstr ""
+
+#. module: crm
+#: view:crm.lead.report:0 view:crm.phonecall.report:0
+msgid "Month-1"
+msgstr ""
+
+#. module: crm
+#: view:crm.phonecall:0
+msgid "Search Phonecalls"
+msgstr ""
+
+#. module: crm
+#: view:crm.lead2partner:0 view:crm.phonecall2partner:0
+msgid "Continue"
+msgstr ""
+
+#. module: crm
+#: field:crm.segmentation,som_interval:0
+msgid "Days per Periode"
+msgstr ""
+
+#. module: crm
+#: field:crm.meeting,byday:0
+msgid "By day"
+msgstr ""
+
+#. module: crm
+#: field:base.action.rule,act_section_id:0
+msgid "Set Team to"
+msgstr ""
+
+#. module: crm
+#: view:calendar.attendee:0 field:calendar.attendee,categ_id:0
+msgid "Event Type"
+msgstr ""
+
+#. module: crm
+#: field:crm.segmentation,exclusif:0
+msgid "Exclusive"
+msgstr ""
+
+#. module: crm
+#: code:addons/crm/crm_lead.py:832
+#, python-format
+msgid ""
+"You cannot delete lead '%s'; it must be in state 'Draft' to be deleted. You "
+"should better cancel it, instead of deleting it."
+msgstr ""
+
+#. module: crm
+#: code:addons/crm/crm_lead.py:451
+#, python-format
+msgid "From %s : %s"
+msgstr ""
+
+#. module: crm
+#: field:crm.lead.report,creation_year:0
+msgid "Creation Year"
+msgstr ""
+
+#. module: crm
+#: field:crm.lead.report,create_date:0
+#: field:crm.phonecall.report,create_date:0
+msgid "Create Date"
+msgstr ""
+
+#. module: crm
+#: field:crm.lead,ref2:0
+msgid "Reference 2"
+msgstr ""
+
+#. module: crm
+#: view:crm.segmentation:0
+msgid "Sales Purchase"
+msgstr ""
+
+#. module: crm
+#: help:crm.case.section,resource_calendar_id:0
+msgid "Used to compute open days"
+msgstr ""
+
+#. module: crm
+#: view:crm.lead:0
+msgid "Schedule Meeting"
+msgstr ""
+
+#. module: crm
+#: view:crm.case.stage:0 field:crm.case.stage,requirements:0
+msgid "Requirements"
+msgstr ""
+
+#. module: crm
+#: help:crm.meeting,exdate:0
+msgid ""
+"This property defines the list of date/time exceptions for a recurring "
+"calendar component."
+msgstr ""
+
+#. module: crm
+#: view:crm.phonecall2opportunity:0
+msgid "Convert To Opportunity "
+msgstr ""
+
+#. module: crm
+#: help:crm.meeting,recurrency:0
+msgid "Recurrent Meeting"
+msgstr ""
+
+#. module: crm
+#: view:crm.phonecall:0
+msgid "Unassigned Phonecalls"
+msgstr ""
+
+#. module: crm
+#: view:crm.lead:0 field:crm.lead2opportunity.partner,opportunity_ids:0
+#: field:crm.lead2opportunity.partner.mass,opportunity_ids:0
+#: field:crm.merge.opportunity,opportunity_ids:0
+#: model:ir.actions.act_window,name:crm.crm_case_category_act_oppor11
+#: model:ir.ui.menu,name:crm.menu_crm_case_opp
+#: model:process.node,name:crm.process_node_opportunities0
+msgid "Opportunities"
+msgstr ""
+
+#. module: crm
+#: field:crm.segmentation,categ_id:0
+msgid "Partner Category"
+msgstr ""
+
+#. module: crm
+#: view:crm.add.note:0
+#: model:ir.actions.act_window,name:crm.action_crm_add_note
+msgid "Add Note"
+msgstr ""
+
+#. module: crm
+#: field:crm.lead,is_supplier_add:0
+msgid "Supplier"
+msgstr ""
+
+#. module: crm
+#: view:crm.lead:0
+msgid "Mark Won"
+msgstr ""
+
+#. module: crm
+#: selection:crm.segmentation.line,expr_name:0
+msgid "Purchase Amount"
+msgstr ""
+
+#. module: crm
+#: view:crm.lead:0
+msgid "Mark Lost"
+msgstr ""
+
+#. module: crm
+#: selection:crm.lead.report,creation_month:0
+#: selection:crm.lead.report,deadline_month:0
+#: selection:crm.meeting,month_list:0 selection:crm.phonecall.report,month:0
+msgid "March"
+msgstr ""
+
+#. module: crm
+#: code:addons/crm/crm_lead.py:491
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:104
+#: code:addons/crm/wizard/crm_lead_to_partner.py:47
+#, python-format
+msgid "Warning !"
+msgstr ""
+
+#. module: crm
+#: view:crm.phonecall.report:0
+msgid "Phone calls made in current year"
+msgstr ""
+
+#. module: crm
+#: field:crm.lead,day_open:0
+msgid "Days to Open"
+msgstr ""
+
+#. module: crm
+#: view:crm.meeting:0
+msgid "Show time as"
+msgstr ""
+
+#. module: crm
+#: view:crm.phonecall2partner:0
+msgid "Create Partner"
+msgstr ""
+
+#. module: crm
+#: selection:crm.segmentation.line,expr_operator:0
+msgid "<"
+msgstr ""
+
+#. module: crm
+#: field:crm.lead,mobile:0 field:crm.phonecall,partner_mobile:0
+msgid "Mobile"
+msgstr ""
+
+#. module: crm
+#: view:crm.lead:0
+msgid "Next Stage"
+msgstr ""
+
+#. module: crm
+#: view:crm.meeting:0
+msgid "My Meetings"
+msgstr ""
+
+#. module: crm
+#: view:crm.phonecall:0
+msgid "Todays's Phonecalls"
+msgstr ""
+
+#. module: crm
+#: view:board.board:0
+msgid "Statistics Dashboard"
+msgstr ""
+
+#. module: crm
+#: field:crm.lead,ref:0
+msgid "Reference"
+msgstr ""
+
+#. module: crm
+#: field:crm.lead,optin:0
+msgid "Opt-In"
+msgstr ""
+
+#. module: crm
+#: code:addons/crm/crm_lead.py:814 code:addons/crm/crm_phonecall.py:296
+#: code:addons/crm/wizard/crm_phonecall_to_meeting.py:83 view:crm.meeting:0
+#: model:ir.actions.act_window,name:crm.act_crm_opportunity_crm_meeting_new
+#: model:ir.actions.act_window,name:crm.crm_case_categ_meet
+#: model:ir.ui.menu,name:crm.menu_crm_case_categ_meet
+#: model:ir.ui.menu,name:crm.menu_meeting_sale view:res.partner:0
+#: field:res.partner,meeting_ids:0
+#, python-format
+msgid "Meetings"
+msgstr ""
+
+#. module: crm
+#: field:crm.lead,date_action_next:0 field:crm.lead,title_action:0
+#: field:crm.meeting,date_action_next:0 field:crm.phonecall,date_action_next:0
+msgid "Next Action"
+msgstr ""
+
+#. module: crm
+#: field:crm.meeting,end_date:0
+msgid "Repeat Until"
+msgstr ""
+
+#. module: crm
+#: field:crm.meeting,date_deadline:0
+msgid "Deadline"
+msgstr ""
+
+#. module: crm
+#: help:crm.meeting,active:0
+msgid ""
+"If the active field is set to          true, it will allow you to hide the "
+"event alarm information without removing it."
+msgstr ""
+
+#. module: crm
+#: view:crm.lead:0
+msgid "Change Color"
+msgstr ""
+
+#. module: crm
+#: view:crm.segmentation:0
+msgid "Partner Segmentations"
+msgstr ""
+
+#. module: crm
+#: field:crm.meeting,user_id:0 view:crm.phonecall:0
+#: field:crm.phonecall,user_id:0 view:res.partner:0
+msgid "Responsible"
+msgstr ""
+
+#. module: crm
+#: view:crm.lead.report:0
+msgid "Show only opportunity"
+msgstr ""
+
+#. module: crm
+#: view:res.partner:0
+msgid "Previous"
+msgstr ""
+
+#. module: crm
+#: view:crm.lead:0
+msgid "New Leads"
+msgstr ""
+
+#. module: crm
+#: view:crm.lead:0
+msgid "Statistics"
+msgstr ""
+
+#. module: crm
+#: view:crm.meeting:0
+msgid "From"
+msgstr ""
+
+#. module: crm
+#: view:crm.lead2opportunity.partner.mass:0
+msgid "Convert into Opportunities"
+msgstr ""
+
+#. module: crm
+#: view:crm.lead:0
+msgid "Show Sales Team"
+msgstr ""
+
+#. module: crm
+#: view:res.partner:0
+msgid "Next"
+msgstr ""
+
+#. module: crm
+#: view:crm.lead:0
+msgid "Stage:"
+msgstr ""
+
+#. module: crm
+#: model:crm.case.stage,name:crm.stage_lead5 view:crm.lead:0
+msgid "Won"
+msgstr ""
+
+#. module: crm
+#: field:crm.lead.report,delay_expected:0
+msgid "Overpassed Deadline"
+msgstr ""
+
+#. module: crm
+#: model:crm.case.section,name:crm.section_sales_department
+msgid "Sales Department"
+msgstr ""
+
+#. module: crm
+#: selection:crm.segmentation.line,expr_name:0
+msgid "State of Mind"
+msgstr ""
+
+#. module: crm
+#: field:crm.lead,type:0 field:crm.lead.report,type:0
+#: view:crm.opportunity2phonecall:0 view:crm.phonecall2phonecall:0
+msgid "Type"
+msgstr ""
+
+#. module: crm
+#: view:crm.segmentation:0
+msgid "Compute Segmentation"
+msgstr ""
+
+#. module: crm
+#: field:crm.case.stage,on_change:0
+msgid "Change Probability Automatically"
+msgstr ""
+
+#. module: crm
+#: field:crm.lead,create_date:0 field:crm.meeting,create_date:0
+#: view:crm.phonecall:0 field:crm.phonecall,create_date:0
+#: field:crm.phonecall.report,creation_date:0
+msgid "Creation Date"
+msgstr ""
+
+#. module: crm
+#: view:board.board:0
+msgid "My Opportunities"
+msgstr ""
+
+#. module: crm
+#: model:crm.case.categ,name:crm.categ_oppor5
+msgid "Need a Website Design"
+msgstr ""
+
+#. module: crm
+#: view:crm.phonecall.report:0
+msgid "Year of call"
+msgstr ""
+
+#. module: crm
+#: field:crm.meeting,recurrent_uid:0
+msgid "Recurrent ID"
+msgstr ""
+
+#. module: crm
+#: view:crm.lead:0 view:crm.meeting:0 view:res.partner:0
+msgid "Subject"
+msgstr ""
+
+#. module: crm
+#: field:crm.meeting,tu:0
+msgid "Tue"
+msgstr ""
+
+#. module: crm
+#: view:crm.case.stage:0 view:crm.lead:0 field:crm.lead,stage_id:0
+#: view:crm.lead.report:0 field:crm.lead.report,stage_id:0
+msgid "Stage"
+msgstr ""
+
+#. module: crm
+#: view:crm.lead:0
+msgid "History Information"
+msgstr ""
+
+#. module: crm
+#: field:base.action.rule,act_mail_to_partner:0
+msgid "Mail to Partner"
+msgstr ""
+
+#. module: crm
+#: view:crm.opportunity2phonecall:0 view:crm.phonecall2phonecall:0
+msgid "Call Details"
+msgstr ""
+
+#. module: crm
+#: field:crm.meeting,class:0
+msgid "Mark as"
+msgstr ""
+
+#. module: crm
+#: view:crm.opportunity2phonecall:0 view:crm.phonecall2phonecall:0
+msgid "Log call"
+msgstr ""
+
+#. module: crm
+#: help:crm.meeting,rrule_type:0
+msgid "Let the event automatically repeat at that interval"
+msgstr ""
+
+#. module: crm
+#: view:base.action.rule:0
+msgid "Condition Case Fields"
+msgstr ""
+
+#. module: crm
+#: view:crm.phonecall.report:0
+msgid "Phone calls which are in pending state"
+msgstr ""
+
+#. module: crm
+#: view:crm.case.section:0 field:crm.case.section,stage_ids:0
+#: view:crm.case.stage:0
+#: model:ir.actions.act_window,name:crm.crm_case_stage_act
+#: model:ir.actions.act_window,name:crm.crm_lead_stage_act
+#: model:ir.ui.menu,name:crm.menu_crm_lead_stage_act
+msgid "Stages"
+msgstr ""
+
+#. module: crm
+#: field:crm.lead,planned_revenue:0
+#: field:crm.partner2opportunity,planned_revenue:0
+#: field:crm.phonecall2opportunity,planned_revenue:0
+msgid "Expected Revenue"
+msgstr ""
+
+#. module: crm
+#: model:ir.actions.act_window,help:crm.crm_phonecall_categ_action
+msgid ""
+"Create specific phone call categories to better define the type of calls "
+"tracked in the system."
+msgstr ""
+
+#. module: crm
+#: selection:crm.lead.report,creation_month:0
+#: selection:crm.lead.report,deadline_month:0
+#: selection:crm.meeting,month_list:0 selection:crm.phonecall.report,month:0
+msgid "September"
+msgstr ""
+
+#. module: crm
+#: field:crm.segmentation,partner_id:0
+msgid "Max Partner ID processed"
+msgstr ""
+
+#. module: crm
+#: help:crm.case.stage,on_change:0
+msgid ""
+"Setting this stage will change the probability automatically on the "
+"opportunity."
+msgstr ""
+
+#. module: crm
+#: model:ir.actions.act_window,name:crm.action_report_crm_phonecall
+#: model:ir.ui.menu,name:crm.menu_report_crm_phonecalls_tree
+msgid "Phone Calls Analysis"
+msgstr ""
+
+#. module: crm
+#: field:crm.lead.report,opening_date:0
+#: field:crm.phonecall.report,opening_date:0
+msgid "Opening Date"
+msgstr ""
+
+#. module: crm
+#: help:crm.phonecall,duration:0
+msgid "Duration in Minutes"
+msgstr ""
+
+#. module: crm
+#: field:crm.case.channel,name:0
+msgid "Channel Name"
+msgstr ""
+
+#. module: crm
+#: field:crm.partner2opportunity,name:0 field:crm.phonecall2opportunity,name:0
+msgid "Opportunity Name"
+msgstr ""
+
+#. module: crm
+#: help:crm.lead.report,deadline_day:0
+msgid "Expected closing day"
+msgstr ""
+
+#. module: crm
+#: help:crm.case.section,active:0
+msgid ""
+"If the active field is set to true, it will allow you to hide the sales team "
+"without removing it."
+msgstr ""
+
+#. module: crm
+#: field:crm.lead,street2:0
+msgid "Street2"
+msgstr ""
+
+#. module: crm
+#: help:crm.case.stage,case_default:0
+msgid ""
+"If you check this field, this stage will be proposed by default on each "
+"sales team. It will not assign this stage to existing teams."
+msgstr ""
+
+#. module: crm
+#: field:crm.meeting,fr:0
+msgid "Fri"
+msgstr ""
+
+#. module: crm
+#: model:ir.model,name:crm.model_crm_lead
+msgid "crm.lead"
+msgstr ""
+
+#. module: crm
+#: field:crm.meeting,write_date:0
+msgid "Write Date"
+msgstr ""
+
+#. module: crm
+#: view:crm.meeting:0
+msgid "End of recurrency"
+msgstr ""
+
+#. module: crm
+#: view:crm.meeting:0
+msgid "Reminder"
+msgstr ""
+
+#. module: crm
+#: help:crm.segmentation,sales_purchase_active:0
+msgid ""
+"Check if you want to use this tab as part of the segmentation rule. If not "
+"checked, the criteria beneath will be ignored"
+msgstr ""
+
+#. module: crm
+#: help:crm.meeting,alarm_id:0
+msgid "Set an alarm at this time, before the event occurs"
+msgstr ""
+
+#. module: crm
+#: model:ir.actions.act_window,name:crm.crm_case_categ_phone_create_partner
+msgid "Schedule a Call"
+msgstr ""
+
+#. module: crm
+#: view:crm.lead2partner:0 view:crm.phonecall:0 view:crm.phonecall2partner:0
+#: model:ir.actions.act_window,name:crm.action_crm_lead2opportunity_partner
+#: model:ir.actions.act_window,name:crm.action_crm_lead2partner
+#: model:ir.actions.act_window,name:crm.action_crm_phonecall2partner
+msgid "Create a Partner"
+msgstr ""
+
+#. module: crm
+#: field:crm.segmentation,state:0
+msgid "Execution Status"
+msgstr ""
+
+#. module: crm
+#: help:crm.phonecall,state:0
+msgid ""
+"The state is set to 'Todo', when a case is created.                          "
+"        \n"
+"If the case is in progress the state is set to 'Open'.                       "
+"           \n"
+"When the call is over, the state is set to 'Held'.                           "
+"       \n"
+"If the call needs to be done then the state is set to 'Not Held'."
+msgstr ""
+
+#. module: crm
+#: selection:crm.meeting,week_list:0
+msgid "Monday"
+msgstr ""
+
+#. module: crm
+#: field:crm.lead,day_close:0
+msgid "Days to Close"
+msgstr ""
+
+#. module: crm
+#: field:crm.case.section,complete_name:0
+msgid "unknown"
+msgstr ""
+
+#. module: crm
+#: code:addons/crm/crm_lead.py:296
+#, python-format
+msgid "The case '%s' has been closed."
+msgstr ""
+
+#. module: crm
+#: model:ir.model,name:crm.model_crm_partner2opportunity
+msgid "Partner To Opportunity"
+msgstr ""
+
+#. module: crm
+#: field:crm.meeting,date:0 field:crm.opportunity2phonecall,date:0
+#: view:crm.phonecall:0 field:crm.phonecall,date:0
+#: field:crm.phonecall2phonecall,date:0 view:res.partner:0
+msgid "Date"
+msgstr ""
+
+#. module: crm
+#: view:crm.lead.report:0 view:crm.phonecall.report:0
+msgid "Extended Filters..."
+msgstr ""
+
+#. module: crm
+#: view:crm.phonecall.report:0
+msgid "Phone calls which are in closed state"
+msgstr ""
+
+#. module: crm
+#: view:crm.phonecall.report:0
+msgid "Search"
+msgstr ""
+
+#. module: crm
+#: view:board.board:0
+msgid "Opportunities by Categories"
+msgstr ""
+
+#. module: crm
+#: model:crm.case.section,name:crm.section_sales_marketing_department
+msgid "Sales Marketing Department"
+msgstr ""
+
+#. module: crm
+#: view:crm.phonecall.report:0
+msgid "Date of call"
+msgstr ""
+
+#. module: crm
+#: help:crm.lead,section_id:0
+msgid ""
+"When sending mails, the default email address is taken from the sales team."
+msgstr ""
+
+#. module: crm
+#: view:crm.meeting:0
+msgid "Choose day in the month where repeat the meeting"
+msgstr ""
+
+#. module: crm
+#: view:crm.segmentation:0
+msgid "Segmentation Description"
+msgstr ""
+
+#. module: crm
+#: view:crm.phonecall:0
+#: model:ir.actions.act_window,name:crm.crm_case_categ_meet_create_partner
+msgid "Schedule a Meeting"
+msgstr ""
+
+#. module: crm
+#: code:addons/crm/crm_lead.py:431
+#, python-format
+msgid "Merged opportunities"
+msgstr ""
+
+#. module: crm
+#: model:ir.actions.act_window,name:crm.crm_case_section_view_form_installer
+msgid "Define Sales Team"
+msgstr ""
+
+#. module: crm
+#: model:ir.actions.act_window,help:crm.crm_segmentation_tree-act
+msgid ""
+"Create specific partner categories which you can assign to your partners to "
+"better manage your interactions with them. The segmentation tool is able to "
+"assign categories to partners according to criteria you set."
+msgstr ""
+
+#. module: crm
+#: field:crm.case.section,code:0
+msgid "Code"
+msgstr ""
+
+#. module: crm
+#: field:crm.case.section,child_ids:0
+msgid "Child Teams"
+msgstr ""
+
+#. module: crm
+#: view:crm.phonecall.report:0
+msgid "Phone calls which are in draft and open state"
+msgstr ""
+
+#. module: crm
+#: model:crm.case.resource.type,name:crm.type_lead1
+msgid "Telesales"
+msgstr ""
+
+#. module: crm
+#: view:crm.lead:0
+msgid "References"
+msgstr ""
+
+#. module: crm
+#: code:addons/crm/crm.py:441 view:crm.lead:0
+#: view:crm.lead2opportunity.partner:0
+#: view:crm.lead2opportunity.partner.mass:0 view:crm.lead2partner:0
+#: view:crm.partner2opportunity:0 view:crm.phonecall:0
+#: view:crm.phonecall2partner:0 view:res.partner:0
+#, python-format
+msgid "Cancel"
+msgstr ""
+
+#. module: crm
+#: model:ir.model,name:crm.model_res_users
+msgid "res.users"
+msgstr ""
+
+#. module: crm
+#: view:crm.lead.report:0
+msgid "Leads/Opportunities which are in pending state"
+msgstr ""
+
+#. module: crm
+#: model:ir.model,name:crm.model_crm_merge_opportunity
+msgid "Merge two Opportunities"
+msgstr ""
+
+#. module: crm
+#: field:crm.meeting,exrule:0
+msgid "Exception Rule"
+msgstr ""
+
+#. module: crm
+#: help:base.action.rule,act_mail_to_partner:0
+msgid "Check this if you want the rule to send an email to the partner."
+msgstr ""
+
+#. module: crm
+#: field:crm.phonecall,opportunity_id:0
+msgid "Lead/Opportunity"
+msgstr ""
+
+#. module: crm
+#: view:crm.lead:0
+msgid "Mail"
+msgstr ""
+
+#. module: crm
+#: model:ir.actions.act_window,name:crm.crm_phonecall_categ_action
+msgid "Phonecall Categories"
+msgstr ""
+
+#. module: crm
+#: view:crm.lead.report:0
+msgid "Leads/Opportunities which are in open state"
+msgstr ""
+
+#. module: crm
+#: model:ir.actions.act_window,name:crm.act_oppor_categ
+msgid "Opportunities By Categories"
+msgstr ""
+
+#. module: crm
+#: help:crm.lead,partner_name:0
+msgid ""
+"The name of the future partner that will be created while converting the "
+"lead into opportunity"
+msgstr ""
+
+#. module: crm
+#: constraint:crm.case.section:0
+msgid "Error ! You cannot create recursive Sales team."
+msgstr ""
+
+#. module: crm
+#: selection:crm.opportunity2phonecall,action:0
+#: selection:crm.phonecall2phonecall,action:0
+msgid "Log a call"
+msgstr ""
+
+#. module: crm
+#: selection:crm.lead2opportunity.partner,action:0
+#: selection:crm.lead2opportunity.partner.mass,action:0
+msgid "Do not link to a partner"
+msgstr ""
+
+#. module: crm
+#: view:crm.meeting:0
+msgid "Search Meetings"
+msgstr ""
+
+#. module: crm
+#: selection:crm.segmentation.line,expr_name:0
+msgid "Sale Amount"
+msgstr ""
+
+#. module: crm
+#: view:crm.meeting:0
+msgid "Choose day where repeat the meeting"
+msgstr ""
+
+#. module: crm
+#: selection:crm.meeting,state:0
+msgid "Unconfirmed"
+msgstr ""
+
+#. module: crm
+#: model:ir.actions.act_window,help:crm.action_report_crm_opportunity
+msgid ""
+"Opportunities Analysis gives you an instant access to your opportunities "
+"with information such as the expected revenue, planned cost, missed "
+"deadlines or the number of interactions per opportunity. This report is "
+"mainly used by the sales manager in order to do the periodic review with the "
+"teams of the sales pipeline."
+msgstr ""
+
+#. module: crm
+#: field:crm.case.categ,name:0 field:crm.lead,name:0
+#: field:crm.segmentation,name:0
+msgid "Name"
+msgstr ""
+
+#. module: crm
+#: field:crm.meeting,alarm_id:0 field:crm.meeting,base_calendar_alarm_id:0
+msgid "Alarm"
+msgstr ""
+
+#. module: crm
+#: model:ir.actions.act_window,help:crm.crm_lead_stage_act
+msgid ""
+"Add specific stages to leads and opportunities allowing your sales to better "
+"organise their sales pipeline. Stages will allow them to easily track how a "
+"specific lead or opportunity is positioned in the sales cycle."
+msgstr ""
+
+#. module: crm
+#: model:ir.actions.act_window,name:crm.action_crm_send_mass_convert
+msgid "Convert opportunities"
+msgstr ""
+
+#. module: crm
+#: view:crm.lead.report:0 view:crm.phonecall.report:0
+msgid "My Case(s)"
+msgstr ""
+
+#. module: crm
+#: field:crm.lead,birthdate:0
+msgid "Birthdate"
+msgstr ""
+
+#. module: crm
+#: view:crm.meeting:0
+msgid "The"
+msgstr ""
+
+#. module: crm
+#: view:crm.lead:0 view:crm.phonecall:0
+msgid "Creation"
+msgstr ""
+
+#. module: crm
+#: selection:crm.lead,priority:0 selection:crm.lead.report,priority:0
+#: selection:crm.phonecall,priority:0
+#: selection:crm.phonecall.report,priority:0
+msgid "High"
+msgstr ""
+
+#. module: crm
+#: model:process.node,note:crm.process_node_partner0
+msgid "Convert to prospect to business partner"
+msgstr ""
+
+#. module: crm
+#: view:crm.meeting:0
+msgid "Meeting / Partner"
+msgstr ""
+
+#. module: crm
+#: view:crm.phonecall2opportunity:0
+msgid "_Convert"
+msgstr ""
+
+#. module: crm
+#: model:ir.actions.act_window,help:crm.action_view_attendee_form
+msgid ""
+"With Meeting Invitations you can create and manage the meeting invitations "
+"sent/to be sent to your colleagues/partners. You can not only invite OpenERP "
+"users, but also external parties, such as a customer."
+msgstr ""
+
+#. module: crm
+#: selection:crm.meeting,week_list:0
+msgid "Saturday"
+msgstr ""
+
+#. module: crm
+#: selection:crm.meeting,byday:0
+msgid "Fifth"
+msgstr ""
+
+#. module: crm
+#: view:crm.lead.report:0
+msgid "Leads/Opportunities which are in done state"
+msgstr ""
+
+#. module: crm
+#: field:crm.lead.report,delay_close:0
+msgid "Delay to Close"
+msgstr ""
+
+#. module: crm
+#: field:crm.meeting,we:0
+msgid "Wed"
+msgstr ""
+
+#. module: crm
+#: model:crm.case.categ,name:crm.categ_oppor6
+msgid "Potential Reseller"
+msgstr ""
+
+#. module: crm
+#: help:crm.case.section,change_responsible:0
+msgid ""
+"When escalating to this team override the saleman with the team leader."
+msgstr ""
+
+#. module: crm
+#: field:crm.lead.report,planned_revenue:0
+msgid "Planned Revenue"
+msgstr ""
+
+#. module: crm
+#: view:crm.lead:0 view:crm.lead.report:0 view:crm.phonecall:0
+#: view:crm.phonecall.report:0
+msgid "Group By..."
+msgstr ""
+
+#. module: crm
+#: help:crm.lead,partner_id:0
+msgid "Optional linked partner, usually after conversion of the lead"
+msgstr ""
+
+#. module: crm
+#: view:crm.meeting:0
+msgid "Invitation details"
+msgstr ""
+
+#. module: crm
+#: field:crm.case.section,parent_id:0
+msgid "Parent Team"
+msgstr ""
+
+#. module: crm
+#: field:crm.lead,date_action:0
+msgid "Next Action Date"
+msgstr ""
+
+#. module: crm
+#: selection:crm.segmentation,state:0
+msgid "Running"
+msgstr ""
+
+#. module: crm
+#: field:crm.lead,zip:0
+msgid "Zip"
+msgstr ""
+
+#. module: crm
+#: code:addons/crm/crm_lead.py:278
+#, python-format
+msgid "The case '%s' has been opened."
+msgstr ""
+
+#. module: crm
+#: model:crm.case.categ,name:crm.categ_phone1
+msgid "Inbound"
+msgstr ""
+
+#. module: crm
+#: view:crm.phonecall.report:0
+msgid "Month of call"
+msgstr ""
+
+#. module: crm
+#: view:crm.phonecall.report:0
+#: model:ir.actions.act_window,name:crm.act_crm_opportunity_crm_phonecall_new
+msgid "Phone calls"
+msgstr ""
+
+#. module: crm
+#: selection:crm.meeting,show_as:0
+msgid "Free"
+msgstr ""
+
+#. module: crm
+#: field:crm.case.section,allow_unlink:0
+msgid "Allow Delete"
+msgstr ""
+
+#. module: crm
+#: field:crm.meeting,mo:0
+msgid "Mon"
+msgstr ""
+
+#. module: crm
+#: selection:crm.lead,priority:0 selection:crm.lead.report,priority:0
+#: selection:crm.phonecall,priority:0
+#: selection:crm.phonecall.report,priority:0
+msgid "Highest"
+msgstr ""
+
+#. module: crm
+#: help:crm.lead.report,creation_year:0
+msgid "Creation year"
+msgstr ""
+
+#. module: crm
+#: view:crm.case.section:0 view:crm.lead:0 field:crm.lead,description:0
+#: view:crm.opportunity2phonecall:0
+msgid "Notes"
+msgstr ""
+
+#. module: crm
+#: field:crm.segmentation.line,expr_value:0
+msgid "Value"
+msgstr ""
+
+#. module: crm
+#: help:crm.lead,type:0 help:crm.lead.report,type:0
+msgid "Type is used to separate Leads and Opportunities"
+msgstr ""
+
+#. module: crm
+#: view:crm.lead:0 view:crm.lead.report:0
+msgid "Opportunity by Categories"
+msgstr ""
+
+#. module: crm
+#: view:crm.lead:0 field:crm.lead,partner_name:0
+msgid "Customer Name"
+msgstr ""
+
+#. module: crm
+#: model:ir.model,name:crm.model_crm_phonecall2opportunity
+msgid "Phonecall To Opportunity"
+msgstr ""
+
+#. module: crm
+#: field:crm.case.section,reply_to:0
+msgid "Reply-To"
+msgstr ""
+
+#. module: crm
+#: view:crm.case.section:0
+msgid "Select stages for this Sales Team"
+msgstr ""
+
+#. module: crm
+#: view:board.board:0
+msgid "Opportunities by Stage"
+msgstr ""
+
+#. module: crm
+#: view:crm.meeting:0
+msgid "Recurrency Option"
+msgstr ""
+
+#. module: crm
+#: view:crm.lead:0
+msgid "Lead / Customer"
+msgstr ""
+
+#. module: crm
+#: model:process.transition,note:crm.process_transition_leadpartner0
+msgid "Prospect is converting to business partner"
+msgstr ""
+
+#. module: crm
+#: model:ir.actions.act_window,name:crm.phonecall2opportunity_act
+msgid "Convert To Opportunity"
+msgstr ""
+
+#. module: crm
+#: view:crm.case.channel:0
+#: model:ir.actions.act_window,name:crm.crm_case_channel_action
+#: model:ir.model,name:crm.model_crm_case_channel
+#: model:ir.ui.menu,name:crm.menu_crm_case_channel
+msgid "Channels"
+msgstr ""
+
+#. module: crm
+#: view:crm.phonecall:0 selection:crm.phonecall,state:0
+#: view:crm.phonecall.report:0 selection:crm.phonecall.report,state:0
+#: view:res.partner:0
+msgid "Held"
+msgstr ""
+
+#. module: crm
+#: view:crm.lead:0
+msgid "Reset to Draft"
+msgstr ""
+
+#. module: crm
+#: view:crm.lead:0
+msgid "Extra Info"
+msgstr ""
+
+#. module: crm
+#: view:crm.merge.opportunity:0
+#: model:ir.actions.act_window,name:crm.action_merge_opportunities
+#: model:ir.actions.act_window,name:crm.merge_opportunity_act
+msgid "Merge Opportunities"
+msgstr ""
+
+#. module: crm
+#: model:crm.case.resource.type,name:crm.type_lead5
+msgid "Google Adwords"
+msgstr ""
+
+#. module: crm
+#: model:ir.model,name:crm.model_crm_phonecall
+msgid "crm.phonecall"
+msgstr ""
+
+#. module: crm
+#: model:crm.case.resource.type,name:crm.type_lead3
+msgid "Mail Campaign 2"
+msgstr ""
+
+#. module: crm
+#: model:crm.case.resource.type,name:crm.type_lead2
+msgid "Mail Campaign 1"
+msgstr ""
+
+#. module: crm
+#: view:crm.lead:0
+msgid "Create"
+msgstr ""
+
+#. module: crm
+#: code:addons/crm/crm_lead.py:849
+#, python-format
+msgid "Changed Stage to: %s"
+msgstr ""
+
+#. module: crm
+#: view:crm.lead:0 field:crm.lead,priority:0 view:crm.lead.report:0
+#: field:crm.lead.report,priority:0 field:crm.phonecall,priority:0
+#: view:crm.phonecall.report:0 field:crm.phonecall.report,priority:0
+msgid "Priority"
+msgstr ""
+
+#. module: crm
+#: field:crm.segmentation,sales_purchase_active:0
+msgid "Use The Sales Purchase Rules"
+msgstr ""
+
+#. module: crm
+#: model:ir.model,name:crm.model_crm_lead2opportunity_partner
+msgid "Lead To Opportunity Partner"
+msgstr ""
+
+#. module: crm
+#: field:crm.lead,location_id:0 field:crm.meeting,location:0
+msgid "Location"
+msgstr ""
+
+#. module: crm
+#: model:ir.model,name:crm.model_crm_lead2opportunity_partner_mass
+msgid "Mass Lead To Opportunity Partner"
+msgstr ""
+
+#. module: crm
+#: view:crm.lead:0
+msgid "Reply"
+msgstr ""
+
+#. module: crm
+#: model:process.node,note:crm.process_node_meeting0
+msgid "Schedule a normal or phone meeting"
+msgstr ""
+
+#. module: crm
+#: code:addons/crm/crm.py:430
+#, python-format
+msgid "Error !"
+msgstr ""
+
+#. module: crm
+#: model:ir.actions.act_window,help:crm.crm_meeting_categ_action
+msgid ""
+"Create different meeting categories to better organize and classify your "
+"meetings."
+msgstr ""
+
+#. module: crm
+#: model:ir.model,name:crm.model_crm_segmentation_line
+msgid "Segmentation line"
+msgstr ""
+
+#. module: crm
+#: view:crm.opportunity2phonecall:0 view:crm.phonecall2phonecall:0
+msgid "Planned Date"
+msgstr ""
+
+#. module: crm
+#: field:crm.meeting,base_calendar_url:0
+msgid "Caldav URL"
+msgstr ""
+
+#. module: crm
+#: view:crm.lead:0
+msgid "Expected Revenues"
+msgstr ""
+
+#. module: crm
+#: field:crm.lead,contact_name:0
+msgid "Contact Name"
+msgstr ""
+
+#. module: crm
+#: view:crm.lead:0
+msgid "Leads creating during last 7 days"
+msgstr ""
+
+#. module: crm
+#: view:crm.phonecall2partner:0
+msgid "Are you sure you want to create a partner based on this Phonecall ?"
+msgstr ""
+
+#. module: crm
+#: selection:crm.lead.report,creation_month:0
+#: selection:crm.lead.report,deadline_month:0
+#: selection:crm.meeting,month_list:0 selection:crm.phonecall.report,month:0
+msgid "July"
+msgstr ""
+
+#. module: crm
+#: model:ir.actions.act_window,help:crm.crm_case_section_act
+msgid ""
+"Define a Sales Team to organize your different salesmen or sales departments "
+"into separate teams. Each team will work in its own list of opportunities, "
+"sales orders, etc. Each user can set a default team in his user preferences. "
+"The opportunities and sales order displayed, will automatically be filtered "
+"according to his team."
+msgstr ""
+
+#. module: crm
+#: view:crm.lead.report:0
+msgid "Show only lead"
+msgstr ""
+
+#. module: crm
+#: help:crm.meeting,count:0
+msgid "Repeat x times"
+msgstr ""
+
+#. module: crm
+#: model:ir.actions.act_window,name:crm.crm_case_section_act
+#: model:ir.model,name:crm.model_crm_case_section
+#: model:ir.ui.menu,name:crm.menu_crm_case_section_act
+msgid "Sales Teams"
+msgstr ""
+
+#. module: crm
+#: model:ir.model,name:crm.model_crm_lead2partner
+msgid "Lead to Partner"
+msgstr ""
+
+#. module: crm
+#: view:crm.segmentation:0 field:crm.segmentation.line,segmentation_id:0
+#: model:ir.actions.act_window,name:crm.crm_segmentation-act
+msgid "Segmentation"
+msgstr ""
+
+#. module: crm
+#: view:crm.lead:0
+msgid "Team"
+msgstr ""
+
+#. module: crm
+#: view:crm.lead.report:0
+msgid "Leads/Opportunities which are in New state"
+msgstr ""
+
+#. module: crm
+#: view:crm.phonecall:0 selection:crm.phonecall,state:0
+#: view:crm.phonecall.report:0 view:res.partner:0
+msgid "Not Held"
+msgstr ""
+
+#. module: crm
+#: field:crm.lead.report,probability:0
+msgid "Probability"
+msgstr ""
+
+#. module: crm
+#: view:crm.lead:0
+msgid "Pending Opportunities"
+msgstr ""
+
+#. module: crm
+#: code:addons/crm/crm_lead.py:491
+#, python-format
+msgid "Please select more than one opportunity from the list view."
+msgstr ""
+
+#. module: crm
+#: view:crm.lead.report:0 field:crm.meeting,month_list:0
+#: view:crm.phonecall.report:0 field:crm.phonecall.report,month:0
+msgid "Month"
+msgstr ""
+
+#. module: crm
+#: view:crm.lead:0
+#: model:ir.actions.act_window,name:crm.crm_case_category_act_leads_all
+#: model:ir.ui.menu,name:crm.menu_crm_case_categ0_act_leads
+#: model:process.node,name:crm.process_node_leads0
+msgid "Leads"
+msgstr ""
+
+#. module: crm
+#: model:ir.actions.act_window,help:crm.crm_case_category_act_leads_all
+msgid ""
+"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."
+msgstr ""
+
+#. module: crm
+#: selection:crm.lead2opportunity.partner,action:0
+#: selection:crm.lead2opportunity.partner.mass,action:0
+#: selection:crm.lead2partner,action:0
+#: selection:crm.phonecall2partner,action:0
+msgid "Create a new partner"
+msgstr ""
+
+#. module: crm
+#: model:ir.actions.act_window,name:crm.crm_case_categ_phone_outgoing0
+#: model:ir.ui.menu,name:crm.menu_crm_case_phone_outbound
+msgid "Scheduled Calls"
+msgstr ""
+
+#. module: crm
+#: view:crm.meeting:0 view:res.partner:0
+msgid "Start Date"
+msgstr ""
+
+#. module: crm
+#: view:crm.phonecall:0
+msgid "Scheduled Phonecalls"
+msgstr ""
+
+#. module: crm
+#: view:crm.meeting:0
+msgid "Decline"
+msgstr ""
+
+#. module: crm
+#: field:crm.lead,user_email:0
+msgid "User Email"
+msgstr ""
+
+#. module: crm
+#: help:crm.lead,optin:0
+msgid "If opt-in is checked, this contact has accepted to receive emails."
+msgstr ""
+
+#. module: crm
+#: view:crm.meeting:0
+msgid "Reset to Unconfirmed"
+msgstr ""
+
+#. module: crm
+#: field:crm.opportunity2phonecall,note:0 field:crm.phonecall2phonecall,note:0
+msgid "Note"
+msgstr ""
+
+#. module: crm
+#: constraint:res.users:0
+msgid "The chosen company is not in the allowed companies for this user"
+msgstr ""
+
+#. module: crm
+#: selection:crm.lead,priority:0 selection:crm.lead.report,priority:0
+#: selection:crm.phonecall,priority:0
+#: selection:crm.phonecall.report,priority:0
+msgid "Low"
+msgstr ""
+
+#. module: crm
+#: selection:crm.add.note,state:0 field:crm.lead,date_closed:0
+#: selection:crm.lead,state:0 view:crm.lead.report:0
+#: selection:crm.lead.report,state:0 field:crm.meeting,date_closed:0
+#: field:crm.phonecall,date_closed:0
+msgid "Closed"
+msgstr ""
+
+#. module: crm
+#: view:crm.lead:0
+msgid "Total of Planned Revenue"
+msgstr ""
+
+#. module: crm
+#: view:crm.lead:0
+msgid "Open Opportunities"
+msgstr ""
+
+#. module: crm
+#: model:crm.case.categ,name:crm.categ_meet2
+msgid "Internal Meeting"
+msgstr ""
+
+#. module: crm
+#: code:addons/crm/crm.py:454 selection:crm.add.note,state:0 view:crm.lead:0
+#: selection:crm.lead,state:0 view:crm.lead.report:0
+#: selection:crm.lead.report,state:0 selection:crm.phonecall.report,state:0
+#, python-format
+msgid "Pending"
+msgstr ""
+
+#. module: crm
+#: model:crm.case.categ,name:crm.categ_meet1
+msgid "Customer Meeting"
+msgstr ""
+
+#. module: crm
+#: field:crm.lead,email_cc:0
+msgid "Global CC"
+msgstr ""
+
+#. module: crm
+#: view:crm.phonecall:0
+#: model:ir.actions.act_window,name:crm.crm_case_categ_phone0
+#: model:ir.ui.menu,name:crm.menu_crm_case_phone
+#: model:ir.ui.menu,name:crm.menu_crm_config_phonecall view:res.partner:0
+msgid "Phone Calls"
+msgstr ""
+
+#. module: crm
+#: view:crm.case.stage:0
+msgid "Stage Search"
+msgstr ""
+
+#. module: crm
+#: help:crm.lead.report,delay_open:0 help:crm.phonecall.report,delay_open:0
+msgid "Number of Days to open the case"
+msgstr ""
+
+#. module: crm
+#: selection:crm.meeting,end_type:0
+msgid "Number of repetitions"
+msgstr ""
+
+#. module: crm
+#: field:crm.lead,phone:0 field:crm.opportunity2phonecall,phone:0
+#: field:crm.phonecall,partner_phone:0 field:crm.phonecall2phonecall,phone:0
+msgid "Phone"
+msgstr ""
+
+#. module: crm
+#: field:crm.case.channel,active:0 field:crm.case.section,active:0
+#: field:crm.lead,active:0 field:crm.meeting,active:0
+#: field:crm.phonecall,active:0
+msgid "Active"
+msgstr ""
+
+#. module: crm
+#: code:addons/crm/crm_lead.py:856
+#, python-format
+msgid "The stage of opportunity '%s' has been changed to '%s'."
+msgstr ""
+
+#. module: crm
+#: selection:crm.segmentation.line,operator:0
+msgid "Mandatory Expression"
+msgstr ""
+
+#. module: crm
+#: selection:crm.segmentation.line,expr_operator:0
+msgid ">"
+msgstr ""
+
+#. module: crm
+#: view:crm.opportunity2phonecall:0 view:crm.phonecall2phonecall:0
+msgid "Schedule call"
+msgstr ""
+
+#. module: crm
+#: view:crm.meeting:0
+msgid "Uncertain"
+msgstr ""
+
+#. module: crm
+#: help:crm.case.stage,sequence:0
+msgid "Used to order stages."
+msgstr ""
+
+#. module: crm
+#: code:addons/crm/crm_lead.py:276
+#, python-format
+msgid "The opportunity '%s' has been opened."
+msgstr ""
+
+#. module: crm
+#: field:crm.lead2opportunity.partner,action:0
+#: field:crm.lead2opportunity.partner.mass,action:0
+#: field:crm.lead2partner,action:0 field:crm.opportunity2phonecall,action:0
+#: field:crm.phonecall2partner,action:0 field:crm.phonecall2phonecall,action:0
+msgid "Action"
+msgstr ""
+
+#. module: crm
+#: field:crm.segmentation,som_interval_decrease:0
+msgid "Decrease (0>1)"
+msgstr ""
+
+#. module: crm
+#: field:crm.lead.report,deadline_day:0
+msgid "Exp. Closing Day"
+msgstr ""
+
+#. module: crm
+#: field:crm.case.section,change_responsible:0
+msgid "Reassign Escalated"
+msgstr ""
+
+#. module: crm
+#: selection:crm.meeting,rrule_type:0
+msgid "Weekly"
+msgstr ""
+
+#. module: crm
+#: view:crm.lead.report:0
+#: model:ir.actions.act_window,name:crm.action_report_crm_opportunity
+#: model:ir.ui.menu,name:crm.menu_report_crm_opportunities_tree
+msgid "Opportunities Analysis"
+msgstr ""
+
+#. module: crm
+#: view:crm.lead:0
+msgid "Misc"
+msgstr ""
+
+#. module: crm
+#: model:ir.actions.act_window,name:crm.open_board_crm
+msgid "Sales"
+msgstr ""
+
+#. module: crm
+#: code:addons/crm/crm.py:430
+#, python-format
+msgid ""
+"You can not escalate, you are already at the top level regarding your sales-"
+"team category."
+msgstr ""
+
+#. module: crm
+#: model:crm.case.categ,name:crm.categ_oppor8 view:crm.meeting:0
+msgid "Other"
+msgstr ""
+
+#. module: crm
+#: view:crm.meeting:0 selection:crm.meeting,state:0
+msgid "Done"
+msgstr ""
+
+#. module: crm
+#: help:crm.meeting,interval:0
+msgid "Repeat every (Days/Week/Month/Year)"
+msgstr ""
+
+#. module: crm
+#: field:crm.segmentation,som_interval_max:0
+msgid "Max Interval"
+msgstr ""
+
+#. module: crm
+#: code:addons/crm/crm.py:396 view:crm.lead:0 view:crm.lead.report:0
+#: selection:crm.lead.report,state:0 view:res.partner:0
+#, python-format
+msgid "Open"
+msgstr ""
+
+#. module: crm
+#: field:crm.lead,city:0
+msgid "City"
+msgstr ""
+
+#. module: crm
+#: view:crm.lead:0 view:res.partner:0
+msgid "History"
+msgstr ""
+
+#. module: crm
+#: selection:crm.meeting,show_as:0
+msgid "Busy"
+msgstr ""
+
+#. module: crm
+#: field:crm.lead.report,creation_day:0
+msgid "Creation Day"
+msgstr ""
+
+#. module: crm
+#: field:crm.meeting,interval:0
+msgid "Repeat every"
+msgstr ""
+
+#. module: crm
+#: field:crm.meeting,recurrency:0
+msgid "Recurrent"
+msgstr ""
+
+#. module: crm
+#: view:crm.phonecall.report:0
+msgid "Phone calls made in last month"
+msgstr ""
+
+#. module: crm
+#: model:ir.actions.act_window,name:crm.act_my_oppor
+msgid "My Open Opportunities"
+msgstr ""
+
+#. module: crm
+#: field:base.action.rule,trg_max_history:0
+msgid "Maximum Communication History"
+msgstr ""
+
+#. module: crm
+#: view:crm.meeting:0
+msgid "Invite People"
+msgstr ""
+
+#. module: crm
+#: view:crm.meeting:0 field:crm.meeting,categ_id:0
+msgid "Meeting Type"
+msgstr ""
+
+#. module: crm
+#: help:crm.lead,state:0
+msgid ""
+"The state is set to 'Draft', when a case is created.                         "
+"         \n"
+"If the case is in progress the state is set to 'Open'.                       "
+"           \n"
+"When the case is over, the state is set to 'Done'.                           "
+"       \n"
+"If the case needs to be reviewed then the state is set to 'Pending'."
+msgstr ""
+
+#. module: crm
+#: view:crm.meeting:0 view:res.partner:0
+msgid "End Date"
+msgstr ""
+
+#. module: crm
+#: selection:crm.meeting,byday:0
+msgid "Third"
+msgstr ""
+
+#. module: crm
+#: help:crm.segmentation,som_interval_max:0
+msgid ""
+"The computation is made on all events that occured during this interval, the "
+"past X periods."
+msgstr ""
+
+#. module: crm
+#: view:crm.lead:0
+msgid "Unassigned Opportunities"
+msgstr ""
+
+#. module: crm
+#: view:crm.lead.report:0
+msgid "# of Emails"
+msgstr ""
+
+#. module: crm
+#: view:crm.lead:0
+msgid "Search Leads"
+msgstr ""
+
+#. module: crm
+#: view:crm.lead.report:0 view:crm.phonecall.report:0
+#: field:crm.phonecall.report,delay_open:0
+msgid "Delay to open"
+msgstr ""
+
+#. module: crm
+#: view:crm.meeting:0
+msgid "Recurrency period"
+msgstr ""
+
+#. module: crm
+#: field:crm.meeting,week_list:0
+msgid "Weekday"
+msgstr ""
+
+#. module: crm
+#: view:crm.lead:0
+msgid "Referrer"
+msgstr ""
+
+#. module: crm
+#: field:crm.lead,id:0 field:crm.meeting,id:0 field:crm.phonecall,id:0
+msgid "ID"
+msgstr ""
+
+#. module: crm
+#: help:crm.lead,type_id:0
+msgid ""
+"From which campaign (seminar, marketing campaign, mass mailing, ...) did "
+"this contact come from?"
+msgstr ""
+
+#. module: crm
+#: model:ir.model,name:crm.model_calendar_attendee
+msgid "Attendee information"
+msgstr ""
+
+#. module: crm
+#: view:crm.segmentation:0
+msgid "Segmentation Test"
+msgstr ""
+
+#. module: crm
+#: field:crm.lead,user_login:0
+msgid "User Login"
+msgstr ""
+
+#. module: crm
+#: view:crm.segmentation:0
+msgid "Continue Process"
+msgstr ""
+
+#. module: crm
+#: view:crm.lead.report:0
+msgid "Leads/Opportunities created in current year"
+msgstr ""
+
+#. module: crm
+#: model:ir.model,name:crm.model_crm_phonecall2partner
+msgid "Phonecall to Partner"
+msgstr ""
+
+#. module: crm
+#: field:crm.opportunity2phonecall,user_id:0
+#: field:crm.phonecall2phonecall,user_id:0
+msgid "Assign To"
+msgstr ""
+
+#. module: crm
+#: field:crm.add.note,state:0
+msgid "Set New State To"
+msgstr ""
+
+#. module: crm
+#: field:crm.lead,date_action_last:0 field:crm.meeting,date_action_last:0
+#: field:crm.phonecall,date_action_last:0
+msgid "Last Action"
+msgstr ""
+
+#. module: crm
+#: field:crm.meeting,duration:0 field:crm.phonecall,duration:0
+#: field:crm.phonecall.report,duration:0
+msgid "Duration"
+msgstr ""
+
+#. module: crm
+#: view:crm.lead:0
+msgid "Show countries"
+msgstr ""
+
+#. module: crm
+#: view:crm.lead2opportunity.partner.mass:0
+msgid "Select Salesman"
+msgstr ""
+
+#. module: crm
+#: view:board.board:0
+msgid "Sales Dashboard"
+msgstr ""
+
+#. module: crm
+#: field:crm.lead.report,nbr:0 field:crm.phonecall.report,nbr:0
+msgid "# of Cases"
+msgstr ""
+
+#. module: crm
+#: help:crm.meeting,section_id:0 help:crm.phonecall,section_id:0
+msgid "Sales team to which Case belongs to."
+msgstr ""
+
+#. module: crm
+#: selection:crm.meeting,week_list:0
+msgid "Sunday"
+msgstr ""
+
+#. module: crm
+#: selection:crm.meeting,byday:0
+msgid "Fourth"
+msgstr ""
+
+#. module: crm
+#: selection:crm.add.note,state:0
+msgid "Unchanged"
+msgstr ""
+
+#. module: crm
+#: model:ir.actions.act_window,name:crm.crm_segmentation_tree-act
+#: model:ir.ui.menu,name:crm.menu_crm_segmentation-act
+msgid "Partners Segmentation"
+msgstr ""
+
+#. module: crm
+#: field:crm.lead,fax:0
+msgid "Fax"
+msgstr ""
+
+#. module: crm
+#: view:crm.lead.report:0
+msgid "Leads/Opportunities created in current month"
+msgstr ""
+
+#. module: crm
+#: view:crm.meeting:0
+msgid "Assignment"
+msgstr ""
+
+#. module: crm
+#: field:crm.lead,company_id:0 view:crm.lead.report:0
+#: field:crm.lead.report,company_id:0 field:crm.phonecall,company_id:0
+#: view:crm.phonecall.report:0 field:crm.phonecall.report,company_id:0
+msgid "Company"
+msgstr ""
+
+#. module: crm
+#: selection:crm.meeting,week_list:0
+msgid "Friday"
+msgstr ""
+
+#. module: crm
+#: field:crm.meeting,allday:0
+msgid "All Day"
+msgstr ""
+
+#. module: crm
+#: field:crm.segmentation.line,operator:0
+msgid "Mandatory / Optional"
+msgstr ""
+
+#. module: crm
+#: view:crm.lead:0
+msgid "Unassigned Leads"
+msgstr ""
+
+#. module: crm
+#: field:crm.lead,subjects:0
+msgid "Subject of Email"
+msgstr ""
+
+#. module: crm
+#: model:ir.actions.act_window,name:crm.action_view_attendee_form
+#: model:ir.ui.menu,name:crm.menu_attendee_invitations
+msgid "Meeting Invitations"
+msgstr ""
+
+#. module: crm
+#: view:crm.phonecall:0 selection:crm.phonecall,state:0
+#: view:crm.phonecall.report:0 selection:crm.phonecall.report,state:0
+#: view:res.partner:0
+msgid "Todo"
+msgstr ""
+
+#. module: crm
+#: field:crm.case.categ,object_id:0
+msgid "Object Name"
+msgstr ""
+
+#. module: crm
+#: help:crm.lead,email_from:0
+msgid "E-mail address of the contact"
+msgstr ""
+
+#. module: crm
+#: field:crm.lead,referred:0
+msgid "Referred By"
+msgstr ""
+
+#. module: crm
+#: view:crm.lead:0 model:ir.model,name:crm.model_crm_add_note
+msgid "Add Internal Note"
+msgstr ""
+
+#. module: crm
+#: code:addons/crm/crm_lead.py:853
+#, python-format
+msgid "The stage of lead '%s' has been changed to '%s'."
+msgstr ""
+
+#. module: crm
+#: selection:crm.meeting,byday:0
+msgid "Last"
+msgstr ""
+
+#. module: crm
+#: field:crm.lead,message_ids:0 field:crm.meeting,message_ids:0
+#: field:crm.phonecall,message_ids:0
+msgid "Messages"
+msgstr ""
+
+#. module: crm
+#: help:crm.lead,channel_id:0
+msgid "Communication channel (mail, direct, phone, ...)"
+msgstr ""
+
+#. module: crm
+#: code:addons/crm/crm_action_rule.py:61
+#, python-format
+msgid "Error!"
+msgstr ""
+
+#. module: crm
+#: field:crm.opportunity2phonecall,name:0 field:crm.phonecall2phonecall,name:0
+msgid "Call summary"
+msgstr ""
+
+#. module: crm
+#: selection:crm.add.note,state:0 selection:crm.lead,state:0
+#: selection:crm.lead.report,state:0 selection:crm.meeting,state:0
+#: selection:crm.phonecall,state:0 selection:crm.phonecall.report,state:0
+msgid "Cancelled"
+msgstr ""
+
+#. module: crm
+#: field:crm.add.note,body:0
+msgid "Note Body"
+msgstr ""
+
+#. module: crm
+#: view:board.board:0
+msgid "My Planned Revenues by Stage"
+msgstr ""
+
+#. module: crm
+#: model:ir.actions.act_window,help:crm.crm_case_category_act_oppor11
+msgid ""
+"With opportunities you can manage and keep track of your sales pipeline by "
+"creating specific customer- or prospect-related sales documents to follow up "
+"potential sales. Information such as expected revenue, opportunity stage, "
+"expected closing date, communication history and much more can be stored. "
+"Opportunities can be connected to the email gateway: new emails may create "
+"opportunities, each of them automatically gets the history of the "
+"conversation with the customer.\n"
+"\n"
+"You and your team(s) will be able to plan meetings and phone calls from "
+"opportunities, convert them into quotations, manage related documents, track "
+"all customer related activities, and much more."
+msgstr ""
+
+#. module: crm
+#: field:crm.lead,color:0
+msgid "Color Index"
+msgstr ""
+
+#. module: crm
+#: view:crm.lead:0
+msgid "Links"
+msgstr ""
+
+#. module: crm
+#: model:ir.actions.act_window,help:crm.crm_lead_categ_action
+msgid ""
+"Create specific categories that fit your company's activities to better "
+"classify and analyse your leads and opportunities. Such categories could for "
+"instance reflect your product structure or the different types of sales you "
+"do."
+msgstr ""
+
+#. module: crm
+#: help:crm.segmentation,som_interval_decrease:0
+msgid ""
+"If the partner has not purchased (or bought) during a period, decrease the "
+"state of mind by this factor. It's a multiplication"
+msgstr ""
+
+#. module: crm
+#: model:ir.actions.act_window,help:crm.action_report_crm_phonecall
+msgid ""
+"From this report, you can analyse the performance of your sales team, based "
+"on their phone calls. You can group or filter the information according to "
+"several criteria and drill down the information, by adding more groups in "
+"the report."
+msgstr ""
+
+#. module: crm
+#: view:crm.lead.report:0
+msgid "# Mails"
+msgstr ""
+
+#. module: crm
+#: field:crm.phonecall,name:0 view:res.partner:0
+msgid "Call Summary"
+msgstr ""
+
+#. module: crm
+#: view:crm.lead:0
+msgid "Todays' Leads"
+msgstr ""
+
+#. module: crm
+#: model:ir.actions.act_window,help:crm.crm_case_categ_phone_outgoing0
+msgid ""
+"Scheduled calls list all the calls to be done by your sales team. A salesman "
+"can record the information about the call in the form view. This information "
+"will be stored in the partner form to trace every contact you have with a "
+"customer. You can also import a .CSV file with a list of calls to be done by "
+"your sales team."
+msgstr ""
+
+#. module: crm
+#: field:crm.segmentation.line,expr_operator:0
+msgid "Operator"
+msgstr ""
+
+#. module: crm
+#: model:ir.model,name:crm.model_crm_phonecall2phonecall
+msgid "Phonecall To Phonecall"
+msgstr ""
+
+#. module: crm
+#: view:crm.lead:0
+#: model:ir.actions.act_window,name:crm.opportunity2phonecall_act
+msgid "Schedule/Log Call"
+msgstr ""
+
+#. module: crm
+#: selection:crm.meeting,state:0
+msgid "Confirmed"
+msgstr ""
+
+#. module: crm
+#: model:ir.actions.act_window,name:crm.act_oppor_stage_user
+msgid "Planned Revenue By User and Stage"
+msgstr ""
+
+#. module: crm
+#: view:crm.meeting:0
+msgid "Confirm"
+msgstr ""
+
+#. module: crm
+#: field:crm.meeting,su:0
+msgid "Sun"
+msgstr ""
+
+#. module: crm
+#: field:crm.phonecall.report,section_id:0
+msgid "Section"
+msgstr ""
+
+#. module: crm
+#: selection:crm.segmentation.line,operator:0
+msgid "Optional Expression"
+msgstr ""
+
+#. module: crm
+#: selection:crm.meeting,select1:0
+msgid "Day of month"
+msgstr ""
+
+#. module: crm
+#: model:ir.actions.act_window,name:crm.act_my_oppor_stage
+msgid "Planned Revenue By Stage"
+msgstr ""
+
+#. module: crm
+#: selection:crm.add.note,state:0 model:crm.case.stage,name:crm.stage_lead1
+#: view:crm.lead:0 selection:crm.lead,state:0 view:crm.lead.report:0
+msgid "New"
+msgstr ""
+
+#. module: crm
+#: view:crm.lead:0 field:crm.lead,email_from:0 field:crm.meeting,email_from:0
+#: field:crm.phonecall,email_from:0
+msgid "Email"
+msgstr ""
+
+#. module: crm
+#: view:crm.case.channel:0 view:crm.lead:0 field:crm.lead,channel_id:0
+#: view:crm.lead.report:0 field:crm.lead.report,channel_id:0
+msgid "Channel"
+msgstr ""
+
+#. module: crm
+#: view:crm.lead:0 view:crm.lead.report:0 view:crm.meeting:0
+#: view:crm.phonecall:0 view:crm.phonecall.report:0
+msgid "My Sales Team(s)"
+msgstr ""
+
+#. module: crm
+#: help:crm.segmentation,exclusif:0
+msgid ""
+"Check if the category is limited to partners that match the segmentation "
+"criterions.                        \n"
+"If checked, remove the category from partners that doesn't match "
+"segmentation criterions"
+msgstr ""
+
+#. module: crm
+#: field:crm.meeting,exdate:0
+msgid "Exception Date/Times"
+msgstr ""
+
+#. module: crm
+#: help:crm.meeting,date_deadline:0
+msgid ""
+"Deadline Date is automatically                         computed from Start "
+"Date + Duration"
+msgstr ""
+
+#. module: crm
+#: field:crm.lead,state_id:0
+msgid "Fed. State"
+msgstr ""
+
+#. module: crm
+#: model:process.transition,note:crm.process_transition_leadopportunity0
+msgid "Creating business opportunities from Leads"
+msgstr ""
+
+#. module: crm
+#: model:ir.actions.act_window,name:crm.open_board_statistical_dash
+#: model:ir.ui.menu,name:crm.menu_board_statistics_dash
+msgid "CRM Dashboard"
+msgstr ""
+
+#. module: crm
+#: model:crm.case.categ,name:crm.categ_oppor4
+msgid "Need Information"
+msgstr ""
+
+#. module: crm
+#: model:process.transition,name:crm.process_transition_leadopportunity0
+msgid "Prospect Opportunity"
+msgstr ""
+
+#. module: crm
+#: field:base.action.rule,act_categ_id:0
+msgid "Set Category to"
+msgstr ""
+
+#. module: crm
+#: view:crm.meeting:0
+msgid "Mail To"
+msgstr ""
+
+#. module: crm
+#: field:crm.meeting,th:0
+msgid "Thu"
+msgstr ""
+
+#. module: crm
+#: view:crm.add.note:0 view:crm.merge.opportunity:0
+#: view:crm.opportunity2phonecall:0 view:crm.phonecall2opportunity:0
+#: view:crm.phonecall2phonecall:0
+msgid "_Cancel"
+msgstr ""
+
+#. module: crm
+#: selection:crm.meeting,rrule_type:0
+msgid "Daily"
+msgstr ""
+
+#. module: crm
+#: model:ir.actions.act_window,name:crm.crm_case_stage_form_installer
+msgid "Review Sales Stages"
+msgstr ""
+
+#. module: crm
+#: model:crm.case.stage,name:crm.stage_lead2
+msgid "Qualification"
+msgstr ""
+
+#. module: crm
+#: field:crm.lead,partner_address_email:0
+msgid "Partner Contact Email"
+msgstr ""
+
+#. module: crm
+#: code:addons/crm/wizard/crm_lead_to_partner.py:48
+#, python-format
+msgid "A partner is already defined."
+msgstr ""
+
+#. module: crm
+#: selection:crm.meeting,byday:0
+msgid "First"
+msgstr ""
+
+#. module: crm
+#: field:crm.lead.report,deadline_month:0
+msgid "Exp. Closing Month"
+msgstr ""
+
+#. module: crm
+#: selection:crm.lead.report,creation_month:0
+#: selection:crm.lead.report,deadline_month:0
+#: selection:crm.meeting,month_list:0 selection:crm.phonecall.report,month:0
+msgid "December"
+msgstr ""
+
+#. module: crm
+#: view:base.action.rule:0
+msgid "Condition on Communication History"
+msgstr ""
+
+#. module: crm
+#: view:crm.phonecall:0
+msgid "Date of Call"
+msgstr ""
+
+#. module: crm
+#: help:crm.segmentation,som_interval:0
+msgid ""
+"A period is the average number of days between two cycle of sale or purchase "
+"for this segmentation.                 \n"
+"It's mainly used to detect if a partner has not purchased or buy for a too "
+"long time,                  \n"
+"so we suppose that his state of mind has decreased because he probably "
+"bought goods to another supplier.                  \n"
+"Use this functionality for recurring businesses."
+msgstr ""
+
+#. module: crm
+#: field:crm.meeting,vtimezone:0
+msgid "Timezone"
+msgstr ""
+
+#. module: crm
+#: field:crm.meeting,sa:0
+msgid "Sat"
+msgstr ""
+
+#. module: crm
+#: view:crm.lead:0 field:crm.lead,user_id:0 view:crm.lead.report:0
+#: view:crm.phonecall.report:0
+msgid "Salesman"
+msgstr ""
+
+#. module: crm
+#: view:crm.lead:0 field:crm.lead,date_deadline:0
+msgid "Expected Closing"
+msgstr ""
+
+#. module: crm
+#: model:ir.model,name:crm.model_crm_opportunity2phonecall
+msgid "Opportunity to Phonecall"
+msgstr ""
+
+#. module: crm
+#: help:crm.case.section,allow_unlink:0
+msgid "Allows to delete non draft cases"
+msgstr ""
+
+#. module: crm
+#: field:crm.meeting,count:0
+msgid "Repeat"
+msgstr ""
+
+#. module: crm
+#: field:crm.lead.report,deadline_year:0
+msgid "Ex. Closing Year"
+msgstr ""
+
+#. module: crm
+#: view:crm.lead:0
+msgid "Partner Name"
+msgstr ""
+
+#. module: crm
+#: model:crm.case.categ,name:crm.categ_phone2
+msgid "Outbound"
+msgstr ""
+
+#. module: crm
+#: field:crm.lead,date_open:0 field:crm.phonecall,date_open:0
+msgid "Opened"
+msgstr ""
+
+#. module: crm
+#: view:crm.case.section:0 field:crm.case.section,member_ids:0
+msgid "Team Members"
+msgstr ""
+
+#. module: crm
+#: view:crm.lead:0 view:crm.meeting:0 view:crm.phonecall:0
+msgid "Contacts"
+msgstr ""
+
+#. module: crm
+#: model:crm.case.categ,name:crm.categ_oppor1
+msgid "Interest in Computer"
+msgstr ""
+
+#. module: crm
+#: view:crm.meeting:0
+msgid "Invitation Detail"
+msgstr ""
+
+#. module: crm
+#: field:crm.segmentation,som_interval_default:0
+msgid "Default (0=None)"
+msgstr ""
+
+#. module: crm
+#: help:crm.lead,email_cc:0
+msgid ""
+"These email addresses will be added to the CC field of all inbound and "
+"outbound emails for this record before being sent. Separate multiple email "
+"addresses with a comma"
+msgstr ""
+
+#. module: crm
+#: model:ir.actions.act_window,name:crm.crm_case_categ_phone_incoming0
+#: model:ir.ui.menu,name:crm.menu_crm_case_phone_inbound
+msgid "Logged Calls"
+msgstr ""
+
+#. module: crm
+#: field:crm.partner2opportunity,probability:0
+#: field:crm.phonecall2opportunity,probability:0
+msgid "Success Probability"
+msgstr ""
+
+#. module: crm
+#: code:addons/crm/crm.py:466 selection:crm.lead.report,state:0
+#: selection:crm.phonecall,state:0 selection:crm.phonecall.report,state:0
+#, python-format
+msgid "Draft"
+msgstr ""
+
+#. module: crm
+#: model:ir.actions.act_window,name:crm.crm_case_section_act_tree
+msgid "Cases by Sales Team"
+msgstr ""
+
+#. module: crm
+#: field:crm.meeting,attendee_ids:0
+msgid "Attendees"
+msgstr ""
+
+#. module: crm
+#: view:crm.meeting:0 view:crm.phonecall:0
+#: model:ir.model,name:crm.model_crm_meeting
+#: model:process.node,name:crm.process_node_meeting0
+#: model:res.request.link,name:crm.request_link_meeting
+msgid "Meeting"
+msgstr ""
+
+#. module: crm
+#: model:ir.model,name:crm.model_crm_case_categ
+msgid "Category of Case"
+msgstr ""
+
+#. module: crm
+#: view:crm.lead:0 view:crm.phonecall:0
+msgid "7 Days"
+msgstr ""
+
+#. module: crm
+#: view:board.board:0
+msgid "Planned Revenue by Stage and User"
+msgstr ""
+
+#. module: crm
+#: view:crm.lead:0
+msgid "Communication & History"
+msgstr ""
+
+#. module: crm
+#: selection:crm.lead,priority:0 selection:crm.lead.report,priority:0
+#: selection:crm.phonecall,priority:0
+#: selection:crm.phonecall.report,priority:0
+msgid "Normal"
+msgstr ""
+
+#. module: crm
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:104
+#, python-format
+msgid "Closed/Cancelled Leads can not be converted into Opportunity"
+msgstr ""
+
+#. module: crm
+#: model:ir.actions.act_window,name:crm.crm_meeting_categ_action
+#: model:ir.ui.menu,name:crm.menu_crm_case_meeting-act
+msgid "Meeting Categories"
+msgstr ""
+
+#. module: crm
+#: view:crm.phonecall2partner:0
+msgid "You may have to verify that this partner does not exist already."
+msgstr ""
+
+#. module: crm
+#: field:crm.lead.report,delay_open:0
+msgid "Delay to Open"
+msgstr ""
+
+#. module: crm
+#: field:crm.lead.report,user_id:0 field:crm.phonecall.report,user_id:0
+msgid "User"
+msgstr ""
+
+#. module: crm
+#: code:addons/crm/crm.py:446
+#, python-format
+msgid "The case '%s' has been cancelled."
+msgstr ""
+
+#. module: crm
+#: selection:crm.lead.report,creation_month:0
+#: selection:crm.lead.report,deadline_month:0
+#: selection:crm.meeting,month_list:0 selection:crm.phonecall.report,month:0
+msgid "November"
+msgstr ""
+
+#. module: crm
+#: view:crm.lead.report:0
+#: model:ir.actions.act_window,name:crm.act_opportunity_stage
+msgid "Opportunities By Stage"
+msgstr ""
+
+#. module: crm
+#: selection:crm.lead.report,creation_month:0
+#: selection:crm.lead.report,deadline_month:0
+#: selection:crm.meeting,month_list:0 selection:crm.phonecall.report,month:0
+msgid "January"
+msgstr ""
+
+#. module: crm
+#: model:process.process,name:crm.process_process_contractprocess0
+msgid "Contract"
+msgstr ""
+
+#. module: crm
+#: model:crm.case.resource.type,name:crm.type_lead4
+msgid "Twitter Ads"
+msgstr ""
+
+#. module: crm
+#: code:addons/crm/crm_lead.py:336
+#, python-format
+msgid "The opportunity '%s' has been been won."
+msgstr ""
+
+#. module: crm
+#: field:crm.case.stage,case_default:0
+msgid "Common to All Teams"
+msgstr ""
+
+#. module: crm
+#: code:addons/crm/crm_lead.py:831 code:addons/crm/wizard/crm_add_note.py:28
+#, python-format
+msgid "Error"
+msgstr ""
+
+#. module: crm
+#: view:crm.lead.report:0
+msgid "Planned Revenues"
+msgstr ""
+
+#. module: crm
+#: model:crm.case.categ,name:crm.categ_oppor7
+msgid "Need Consulting"
+msgstr ""
+
+#. module: crm
+#: constraint:crm.segmentation:0
+msgid "Error ! You can not create recursive profiles."
+msgstr ""
+
+#. module: crm
+#: help:crm.lead.report,deadline_year:0
+msgid "Expected closing year"
+msgstr ""
+
+#. module: crm
+#: field:crm.lead,partner_address_id:0 field:crm.meeting,partner_address_id:0
+#: field:crm.phonecall,partner_address_id:0
+msgid "Partner Contact"
+msgstr ""
+
+#. module: crm
+#: field:crm.meeting,recurrent_id:0
+msgid "Recurrent ID date"
+msgstr ""
+
+#. module: crm
+#: sql_constraint:res.users:0
+msgid "You can not have two users with the same login !"
+msgstr ""
+
+#. module: crm
+#: code:addons/crm/crm.py:409 view:crm.lead:0 view:res.partner:0
+#, python-format
+msgid "Close"
+msgstr ""
+
+#. module: crm
+#: selection:crm.opportunity2phonecall,action:0
+#: selection:crm.phonecall2phonecall,action:0
+msgid "Schedule a call"
+msgstr ""
+
+#. module: crm
+#: view:crm.lead:0 view:crm.phonecall:0
+msgid "Categorization"
+msgstr ""
+
+#. module: crm
+#: view:crm.lead:0
+msgid "Log Call"
+msgstr ""
+
+#. module: crm
+#: model:ir.model,name:crm.model_base_action_rule
+msgid "Action Rules"
+msgstr ""
+
+#. module: crm
+#: field:crm.meeting,rrule_type:0
+msgid "Recurrency"
+msgstr ""
+
+#. module: crm
+#: field:crm.meeting,phonecall_id:0
+msgid "Phonecall"
+msgstr ""
+
+#. module: crm
+#: selection:crm.meeting,week_list:0
+msgid "Thursday"
+msgstr ""
+
+#. module: crm
+#: view:crm.meeting:0
+msgid "To"
+msgstr ""
+
+#. module: crm
+#: view:crm.lead:0
+msgid "Create date"
+msgstr ""
+
+#. module: crm
+#: selection:crm.meeting,class:0
+msgid "Private"
+msgstr ""
+
+#. module: crm
+#: selection:crm.meeting,class:0
+msgid "Public for Employees"
+msgstr ""
+
+#. module: crm
+#: field:crm.lead,function:0
+msgid "Function"
+msgstr ""
+
+#. module: crm
+#: view:crm.add.note:0
+msgid "_Add"
+msgstr ""
+
+#. module: crm
+#: field:crm.case.section,note:0 view:crm.meeting:0
+#: field:crm.meeting,description:0 view:crm.phonecall:0
+#: field:crm.phonecall,description:0 field:crm.segmentation,description:0
+msgid "Description"
+msgstr ""
+
+#. module: crm
+#: view:crm.phonecall.report:0
+msgid "Phone calls made in current month"
+msgstr ""
+
+#. module: crm
+#: selection:crm.lead.report,creation_month:0
+#: selection:crm.lead.report,deadline_month:0
+#: selection:crm.meeting,month_list:0 selection:crm.phonecall.report,month:0
+msgid "May"
+msgstr ""
+
+#. module: crm
+#: model:crm.case.categ,name:crm.categ_oppor2
+msgid "Interest in Accessories"
+msgstr ""
+
+#. module: crm
+#: view:crm.lead:0
+msgid "New Opportunities"
+msgstr ""
+
+#. module: crm
+#: code:addons/crm/crm_action_rule.py:61
+#, python-format
+msgid "No E-Mail Found for your Company address!"
+msgstr ""
+
+#. module: crm
+#: field:crm.lead.report,email:0
+msgid "# Emails"
+msgstr ""
+
+#. module: crm
+#: field:crm.lead,street:0
+msgid "Street"
+msgstr ""
+
+#. module: crm
+#: view:crm.lead.report:0
+msgid "Opportunities by User and Team"
+msgstr ""
+
+#. module: crm
+#: view:crm.phonecall:0
+msgid "Reset to Todo"
+msgstr ""
+
+#. module: crm
+#: field:crm.case.section,working_hours:0
+msgid "Working Hours"
+msgstr ""
+
+#. module: crm
+#: field:res.partner,phonecall_ids:0
+msgid "Phonecalls"
+msgstr ""
+
+#. module: crm
+#: view:crm.lead:0 field:crm.lead,is_customer_add:0
+msgid "Customer"
+msgstr ""
+
+#. module: crm
+#: selection:crm.lead,priority:0 selection:crm.lead.report,priority:0
+#: selection:crm.phonecall,priority:0
+#: selection:crm.phonecall.report,priority:0
+msgid "Lowest"
+msgstr ""
+
+#. module: crm
+#: selection:crm.lead.report,creation_month:0
+#: selection:crm.lead.report,deadline_month:0
+#: selection:crm.meeting,month_list:0 selection:crm.phonecall.report,month:0
+msgid "February"
+msgstr ""
+
+#. module: crm
+#: field:base.action.rule,trg_section_id:0 field:crm.case.categ,section_id:0
+#: field:crm.case.resource.type,section_id:0 view:crm.case.section:0
+#: field:crm.case.section,name:0 view:crm.lead:0 field:crm.lead,section_id:0
+#: view:crm.lead.report:0 field:crm.lead.report,section_id:0
+#: field:crm.lead2opportunity.partner.mass,section_id:0
+#: field:crm.meeting,section_id:0 field:crm.opportunity2phonecall,section_id:0
+#: view:crm.phonecall:0 field:crm.phonecall,section_id:0
+#: view:crm.phonecall.report:0 field:crm.phonecall2phonecall,section_id:0
+#: field:res.partner,section_id:0 field:res.users,context_section_id:0
+msgid "Sales Team"
+msgstr ""
+
+#. module: crm
+#: model:crm.case.stage,name:crm.stage_lead6 view:crm.lead:0
+msgid "Lost"
+msgstr ""
+
+#. module: crm
+#: view:crm.lead:0
+msgid "Edit"
+msgstr ""
+
+#. module: crm
+#: field:crm.lead,country_id:0 view:crm.lead.report:0
+#: field:crm.lead.report,country_id:0
+msgid "Country"
+msgstr ""
+
+#. module: crm
+#: view:crm.lead:0 view:crm.lead2opportunity.partner:0
+#: selection:crm.lead2opportunity.partner,name:0
+#: view:crm.lead2opportunity.partner.mass:0
+#: selection:crm.lead2opportunity.partner.mass,name:0 view:crm.phonecall:0
+#: view:res.partner:0
+msgid "Convert to Opportunity"
+msgstr ""
+
+#. module: crm
+#: selection:crm.meeting,week_list:0
+msgid "Wednesday"
+msgstr ""
+
+#. module: crm
+#: model:ir.actions.act_window,help:crm.crm_case_categ_phone_incoming0
+msgid ""
+"This tool allows you to log your inbound calls on the fly. Each call you get "
+"will appear on the partner form to trace every contact you have with a "
+"partner. From the phone call form, you can trigger a request for another "
+"call, a meeting or an opportunity."
+msgstr ""
+
+#. module: crm
+#: selection:crm.lead.report,creation_month:0
+#: selection:crm.lead.report,deadline_month:0
+#: selection:crm.meeting,month_list:0 selection:crm.phonecall.report,month:0
+msgid "April"
+msgstr ""
+
+#. module: crm
+#: field:crm.case.resource.type,name:0
+msgid "Campaign Name"
+msgstr ""
+
+#. module: crm
+#: view:crm.segmentation:0
+msgid "Profiling"
+msgstr ""
+
+#. module: crm
+#: model:ir.model,name:crm.model_crm_phonecall_report
+msgid "Phone calls by user and section"
+msgstr ""
+
+#. module: crm
+#: model:ir.actions.act_window,help:crm.crm_case_channel_action
+msgid ""
+"Track from where is coming your leads and opportunities by creating specific "
+"channels that will be maintained at the creation of a document in the "
+"system. Some examples of channels can be: Website, Phone Call, Reseller, etc."
+msgstr ""
+
+#. module: crm
+#: selection:crm.lead2opportunity.partner,name:0
+#: selection:crm.lead2opportunity.partner.mass,name:0
+msgid "Merge with existing Opportunity"
+msgstr ""
+
+#. module: crm
+#: field:crm.meeting,select1:0
+msgid "Option"
+msgstr ""
+
+#. module: crm
+#: model:crm.case.stage,name:crm.stage_lead4
+msgid "Negotiation"
+msgstr ""
+
+#. module: crm
+#: view:crm.lead:0
+msgid "Exp.Closing"
+msgstr ""
+
+#. module: crm
+#: field:crm.case.stage,sequence:0 field:crm.meeting,sequence:0
+msgid "Sequence"
+msgstr ""
+
+#. module: crm
+#: model:ir.model,name:crm.model_mail_compose_message
+msgid "E-mail composition wizard"
+msgstr ""
+
+#. module: crm
+#: view:crm.meeting:0
+msgid "Accept"
+msgstr ""
+
+#. module: crm
+#: field:crm.segmentation.line,expr_name:0
+msgid "Control Variable"
+msgstr ""
+
+#. module: crm
+#: selection:crm.meeting,byday:0
+msgid "Second"
+msgstr ""
+
+#. module: crm
+#: model:crm.case.stage,name:crm.stage_lead3
+msgid "Proposition"
+msgstr ""
+
+#. module: crm
+#: field:crm.lead.report,date_closed:0
+#: field:crm.phonecall.report,date_closed:0
+msgid "Close Date"
+msgstr ""
+
+#. module: crm
+#: view:crm.lead.report:0 view:crm.phonecall.report:0
+#: field:crm.phonecall.report,name:0
+msgid "Year"
+msgstr ""
+
+#. module: crm
+#: constraint:res.partner:0
+msgid "Error ! You cannot create recursive associated members."
+msgstr ""
+
+#. module: crm
+#: model:crm.case.resource.type,name:crm.type_lead8
+msgid "Newsletter"
+msgstr ""
diff --git a/addons/crm_todo/i18n/ja.po b/addons/crm_todo/i18n/ja.po
new file mode 100644
index 00000000000..4923f2b9395
--- /dev/null
+++ b/addons/crm_todo/i18n/ja.po
@@ -0,0 +1,95 @@
+# 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-20 03:47+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-20 04:43+0000\n"
+"X-Generator: Launchpad (build 15120)\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 "crm.lead"
+
+#. 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/edi/i18n/pt.po b/addons/edi/i18n/pt.po
new file mode 100644
index 00000000000..3dad52e29b0
--- /dev/null
+++ b/addons/edi/i18n/pt.po
@@ -0,0 +1,413 @@
+# Portuguese 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 11:47+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Portuguese <pt@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-20 04:43+0000\n"
+"X-Generator: Launchpad (build 15120)\n"
+
+#. module: edi
+#: sql_constraint:res.currency:0
+msgid "The currency code must be unique per company!"
+msgstr "O código da moeda deve ser único por empresa!"
+
+#. module: edi
+#: model:ir.model,name:edi.model_res_partner_address
+msgid "Partner Addresses"
+msgstr "Endereços de parceiros"
+
+#. module: edi
+#: sql_constraint:res.company:0
+msgid "The company name must be unique !"
+msgstr "O nome da empresa deve ser único!"
+
+#. module: edi
+#: constraint:res.partner:0
+msgid "Error ! You cannot create recursive associated members."
+msgstr "Erro! Não pode criar membros recursivos."
+
+#. module: edi
+#: field:edi.document,name:0
+msgid "EDI token"
+msgstr "EDI token"
+
+#. module: edi
+#: help:edi.document,name:0
+msgid "Unique identifier for retrieving an EDI document."
+msgstr "Identificador único para a recuperação de um documento EDI."
+
+#. module: edi
+#: constraint:res.company:0
+msgid "Error! You can not create recursive companies."
+msgstr "Erro! Não pode criar empresas recursivas."
+
+#. module: edi
+#: model:ir.model,name:edi.model_res_company
+msgid "Companies"
+msgstr "Empresas"
+
+#. module: edi
+#: sql_constraint:edi.document:0
+msgid "EDI Tokens must be unique!"
+msgstr "EDI Tokens devem ser únicas!"
+
+#. module: edi
+#: model:ir.model,name:edi.model_res_currency
+msgid "Currency"
+msgstr "Moeda"
+
+#. module: edi
+#: code:addons/edi/models/edi.py:153
+#, python-format
+msgid ""
+"The document you are trying to import requires the OpenERP `%s` application. "
+"You can install it by connecting as the administrator and opening the "
+"configuration assistant."
+msgstr ""
+"O documento que está a tentar importar exige a aplicação `%s` do OpenERP. "
+"Pode instalá-la, ligando-se como administrador e abrindo o assistente de "
+"configuração."
+
+#. module: edi
+#: help:edi.document,document:0
+msgid "EDI document content"
+msgstr "Conteúdo do documento EDI"
+
+#. module: edi
+#: model:ir.model,name:edi.model_edi_document
+msgid "EDI Document"
+msgstr "Documento EDI"
+
+#. module: edi
+#: code:addons/edi/models/edi.py:48
+#, python-format
+msgid "'%s' is an invalid external ID"
+msgstr "'%s' é um ID externo inválido"
+
+#. module: edi
+#: model:ir.model,name:edi.model_res_partner
+msgid "Partner"
+msgstr "Parceiro"
+
+#. module: edi
+#: code:addons/edi/models/edi.py:152
+#, python-format
+msgid "Missing Application"
+msgstr "Aplicação em falta"
+
+#. module: edi
+#: field:edi.document,document:0
+msgid "Document"
+msgstr "Documento"
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi.xml:23
+msgid "View/Print"
+msgstr "Ver/Imprimir"
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi.xml:28
+msgid "Import this document"
+msgstr "Importar este documento"
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi.xml:33
+msgid "Import it into an existing OpenERP instance"
+msgstr "Importar-lo para uma instância OpenERP existente"
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi.xml:36
+msgid "OpenERP instance address:"
+msgstr "Endereço da instância OpenERP"
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi.xml:39
+msgid "Import"
+msgstr "Importar"
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi.xml:44
+msgid "Import it into a new OpenERP Online instance"
+msgstr "Importar-lo para uma nova instância OpenERP Online"
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi.xml:47
+msgid "Create my new OpenERP instance"
+msgstr "Criar a minha nova instância OpenERP"
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi.xml:52
+msgid "Import into another application"
+msgstr "Importar para outra aplicação"
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi.xml:54
+msgid ""
+"OpenERP's Electronic Data Interchange documents are based on a generic and "
+"language\n"
+"                            independent"
+msgstr ""
+"Documentos OpenERP de intercâmbio electrónico de dados são baseados numa "
+"linguagem genérica e\n"
+"                            independente"
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi.xml:56
+msgid "JSON"
+msgstr "JSON"
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi.xml:56
+msgid ""
+"serialization of the document's attribute.\n"
+"                            It is usually very quick and straightforward to "
+"create a small plug-in for your preferred\n"
+"                            application that will be capable of importing "
+"any OpenERP EDI document.\n"
+"                            You can find out more details about how to do "
+"this and what the content of OpenERP EDI documents\n"
+"                            is like in the"
+msgstr ""
+"serialização do atributo do documento.\n"
+"                            É geralmente muito simples e rápido para criar "
+"um pequeno plug-in para o seu preferido\n"
+"                            aplicação que será capaz de importar qualquer "
+"documento EDI do OpenERP.\n"
+"                            Pode descobrir mais detalhes sobre como fazer "
+"isso e qual é o conteúdo dos documentos EDI do OpenERP\n"
+"                            é como no"
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi.xml:60
+msgid "OpenERP documentation"
+msgstr "Documentação OpenERP"
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi.xml:61
+msgid "To get started immediately,"
+msgstr "Para começar imediatamente,"
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi.xml:62
+msgid "see is all it takes to use this EDI document in Python"
+msgstr ""
+"Veja, isto é tudo o que é preciso para usar este documento EDI em Python"
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi.xml:70
+msgid "You can download the raw EDI document here:"
+msgstr "Pode fazer o download do documento EDI em bruto aqui:"
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi.xml:73
+msgid "Download"
+msgstr "Download"
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi.xml:87
+msgid "Powered by"
+msgstr "Desenvolvido por"
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi.xml:87
+msgid "OpenERP"
+msgstr "OpenERP"
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_account.xml:34
+msgid "Invoice"
+msgstr "Fatura"
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_account.xml:37
+msgid "Description"
+msgstr "Descrição"
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_account.xml:38
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_sale_purchase.xml:41
+msgid "Date"
+msgstr "Data"
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_account.xml:39
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_sale_purchase.xml:40
+msgid "Your Reference"
+msgstr "A sua referência"
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_account.xml:50
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_sale_purchase.xml:57
+msgid "Product Description"
+msgstr "Descrição do Artigo"
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_account.xml:51
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_sale_purchase.xml:58
+msgid "Quantity"
+msgstr "Montante"
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_account.xml:52
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_sale_purchase.xml:59
+msgid "Unit Price"
+msgstr "Preço únitário"
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_account.xml:53
+msgid "Discount"
+msgstr "Desconto"
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_account.xml:54
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_sale_purchase.xml:61
+msgid "Price"
+msgstr "Preço"
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_account.xml:72
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_sale_purchase.xml:81
+msgid "Net Total:"
+msgstr "Total Líquido:"
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_account.xml:83
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_sale_purchase.xml:92
+msgid "Taxes:"
+msgstr "Impostos:"
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_account.xml:94
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_sale_purchase.xml:103
+msgid "Total:"
+msgstr "Total:"
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_account.xml:106
+msgid "Tax"
+msgstr "Imposto"
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_account.xml:107
+msgid "Base Amount"
+msgstr "Montante base"
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_account.xml:108
+msgid "Amount"
+msgstr "Montante"
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_account.xml:121
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_sale_purchase.xml:113
+msgid "Notes:"
+msgstr "Observações:"
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_account.xml:129
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_sale_purchase.xml:121
+msgid "Pay Online"
+msgstr "Pagar Online"
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_account.xml:133
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_sale_purchase.xml:125
+msgid "Paypal"
+msgstr "Paypal"
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_account.xml:135
+msgid ""
+"You may directly pay this invoice online via Paypal's secure payment gateway:"
+msgstr ""
+"Pode pagar directamente esta fatura Online através de pagamento seguro via "
+"Paypal:"
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_account.xml:145
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_sale_purchase.xml:137
+msgid "Bank Wire Transfer"
+msgstr "Transferência Bancária"
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_account.xml:147
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_sale_purchase.xml:139
+msgid "Please transfer"
+msgstr "Por favor transfira"
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_account.xml:148
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_sale_purchase.xml:140
+msgid "to"
+msgstr "para"
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_account.xml:149
+msgid ""
+"(postal address on the invoice header)\n"
+"                     using one of the following bank accounts. Be sure to "
+"mention the invoice\n"
+"                     reference"
+msgstr ""
+"(endereço postal no cabeçalho da fatura)\n"
+"                      usando uma das seguintes contas bancárias. Certifique-"
+"se que menciona a referência\n"
+"                      da fatura"
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_account.xml:151
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_sale_purchase.xml:143
+msgid "on the transfer:"
+msgstr "sobre a transferência:"
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_sale_purchase.xml:36
+msgid "Order"
+msgstr "Ordem"
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_sale_purchase.xml:42
+msgid "Salesman"
+msgstr "Vendedor"
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_sale_purchase.xml:43
+msgid "Payment terms"
+msgstr "Termos de pagamento"
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_sale_purchase.xml:60
+msgid "Discount(%)"
+msgstr "Desconto(%)"
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_sale_purchase.xml:127
+msgid ""
+"You may directly pay this order online via Paypal's secure payment gateway:"
+msgstr ""
+"Pode pagar directamente este pedido Online através de pagamento seguro via "
+"Paypal:"
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_sale_purchase.xml:141
+msgid ""
+"(postal address on the order header)\n"
+"                     using one of the following bank accounts. Be sure to "
+"mention the document\n"
+"                     reference"
+msgstr ""
+"(endereço postal no cabeçalho da ordem)\n"
+"                      usando uma das seguintes contas bancárias. Certifique-"
+"se que menciona a referência \n"
+"                      do documento"
diff --git a/addons/event/i18n/ja.po b/addons/event/i18n/ja.po
new file mode 100644
index 00000000000..a3465f34415
--- /dev/null
+++ b/addons/event/i18n/ja.po
@@ -0,0 +1,1265 @@
+# 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-20 01:25+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-20 04:43+0000\n"
+"X-Generator: Launchpad (build 15120)\n"
+
+#. module: event
+#: view:event.event:0
+msgid "Invoice Information"
+msgstr "請求書情報"
+
+#. module: event
+#: view:partner.event.registration:0
+msgid "Event Details"
+msgstr "イベントの詳細"
+
+#. module: event
+#: field:event.event,main_speaker_id:0
+msgid "Main Speaker"
+msgstr "主講演者"
+
+#. module: event
+#: view:event.event:0
+#: view:event.registration:0
+#: view:report.event.registration:0
+msgid "Group By..."
+msgstr "グループ化…"
+
+#. module: event
+#: field:event.event,register_min:0
+msgid "Minimum Registrations"
+msgstr "登録者の最少数"
+
+#. module: event
+#: model:ir.model,name:event.model_event_confirm_registration
+msgid "Confirmation for Event Registration"
+msgstr "イベント登録者の確認"
+
+#. module: event
+#: field:event.registration.badge,title:0
+msgid "Title"
+msgstr "役職"
+
+#. module: event
+#: field:event.event,mail_registr:0
+msgid "Registration Email"
+msgstr "登録者のEメール"
+
+#. module: event
+#: model:ir.actions.act_window,name:event.action_event_confirm_registration
+msgid "Make Invoices"
+msgstr "請求書作成"
+
+#. module: event
+#: view:event.event:0
+#: view:event.registration:0
+msgid "Registration Date"
+msgstr "登録日"
+
+#. module: event
+#: view:partner.event.registration:0
+msgid "_Close"
+msgstr "閉じる"
+
+#. module: event
+#: model:event.event,name:event.event_0
+msgid "Concert of Bon Jovi"
+msgstr "Bon Jovi コンサート"
+
+#. module: event
+#: view:report.event.registration:0
+msgid "Invoiced Registrations only"
+msgstr "請求済み登録者のみ"
+
+#. module: event
+#: selection:report.event.registration,month:0
+msgid "March"
+msgstr "3月"
+
+#. module: event
+#: field:event.event,mail_confirm:0
+msgid "Confirmation Email"
+msgstr "確認Eメール"
+
+#. module: event
+#: field:event.registration,nb_register:0
+msgid "Quantity"
+msgstr "数量"
+
+#. module: event
+#: code:addons/event/wizard/event_make_invoice.py:63
+#, python-format
+msgid "Registration doesn't have any partner to invoice."
+msgstr "この登録は請求すべき取引先がいません。"
+
+#. module: event
+#: field:event.event,company_id:0
+#: field:event.registration,company_id:0
+#: view:report.event.registration:0
+#: field:report.event.registration,company_id:0
+msgid "Company"
+msgstr "会社"
+
+#. module: event
+#: field:event.make.invoice,invoice_date:0
+msgid "Invoice Date"
+msgstr "請求日"
+
+#. module: event
+#: help:event.event,pricelist_id:0
+msgid "Pricelist version for current event."
+msgstr "このイベントの価格表のバージョン"
+
+#. module: event
+#: code:addons/event/wizard/partner_event_registration.py:88
+#: view:event.registration:0
+#: model:ir.actions.act_window,name:event.action_partner_event_registration
+#: model:ir.model,name:event.model_event_registration
+#: view:partner.event.registration:0
+#, python-format
+msgid "Event Registration"
+msgstr "イベント登録"
+
+#. module: event
+#: field:event.event,parent_id:0
+msgid "Parent Event"
+msgstr "上位のイベント"
+
+#. module: event
+#: model:ir.actions.act_window,name:event.action_make_invoices
+msgid "Make Invoice"
+msgstr "請求書作成"
+
+#. module: event
+#: field:event.registration,price_subtotal:0
+msgid "Subtotal"
+msgstr "小計"
+
+#. module: event
+#: view:report.event.registration:0
+msgid "Event on Registration"
+msgstr "登録のイベント"
+
+#. module: event
+#: help:event.event,reply_to:0
+msgid "The email address put in the 'Reply-To' of all emails sent by OpenERP"
+msgstr "送信したEメールの返信先に指定したEメールアドレス"
+
+#. module: event
+#: view:event.registration:0
+msgid "Add Internal Note"
+msgstr "内部注記を追加"
+
+#. module: event
+#: view:event.event:0
+msgid "Confirmed events"
+msgstr "確認済みのイベント"
+
+#. module: event
+#: view:report.event.registration:0
+msgid "Event Beginning Date"
+msgstr "イベントの開始日"
+
+#. module: event
+#: model:ir.actions.act_window,name:event.action_report_event_registration
+#: model:ir.model,name:event.model_report_event_registration
+#: model:ir.ui.menu,name:event.menu_report_event_registration
+#: view:report.event.registration:0
+msgid "Events Analysis"
+msgstr "イベント分析"
+
+#. module: event
+#: field:event.registration,message_ids:0
+msgid "Messages"
+msgstr ""
+
+#. module: event
+#: model:ir.model,name:event.model_event_registration_badge
+msgid "event.registration.badge"
+msgstr "event.registration.badge"
+
+#. module: event
+#: field:event.event,mail_auto_confirm:0
+msgid "Mail Auto Confirm"
+msgstr "Eメールの自動確認"
+
+#. module: event
+#: model:product.template,name:event.event_product_1_product_template
+msgid "Ticket for Opera"
+msgstr "オペラの切符"
+
+#. module: event
+#: code:addons/event/event.py:125
+#: view:event.event:0
+#, python-format
+msgid "Confirm Event"
+msgstr "イベントを確認"
+
+#. module: event
+#: selection:event.event,state:0
+#: selection:event.registration,state:0
+#: selection:report.event.registration,state:0
+msgid "Cancelled"
+msgstr "キャンセルされました"
+
+#. module: event
+#: field:event.event,reply_to:0
+msgid "Reply-To"
+msgstr "返信先"
+
+#. module: event
+#: model:ir.actions.act_window,name:event.open_board_associations_manager
+#: model:ir.ui.menu,name:event.menu_board_associations_manager
+msgid "Event Dashboard"
+msgstr "イベントダッシュボード"
+
+#. module: event
+#: model:event.event,name:event.event_1
+msgid "Opera of Verdi"
+msgstr "Verdiのオペラ"
+
+#. module: event
+#: selection:report.event.registration,month:0
+msgid "July"
+msgstr "7月"
+
+#. module: event
+#: help:event.event,register_prospect:0
+msgid "Total of Prospect Registrations"
+msgstr "登録見込み数"
+
+#. module: event
+#: help:event.event,mail_auto_confirm:0
+msgid ""
+"Check this box if you want to use automatic confirmation emailing or "
+"reminder."
+msgstr "確認Eメールあるいは催促Eメールを自動的に送るのであれば、ここをチェックして下さい。"
+
+#. module: event
+#: field:event.registration,ref:0
+msgid "Reference"
+msgstr "参照"
+
+#. module: event
+#: help:event.event,date_end:0
+#: help:partner.event.registration,end_date:0
+msgid "Closing Date of Event"
+msgstr "イベントの締切日"
+
+#. module: event
+#: view:event.registration:0
+msgid "Emails"
+msgstr "Eメール"
+
+#. module: event
+#: view:event.registration:0
+msgid "Extra Info"
+msgstr "追加情報"
+
+#. module: event
+#: code:addons/event/wizard/event_make_invoice.py:83
+#, python-format
+msgid "Customer Invoices"
+msgstr "顧客請求書"
+
+#. module: event
+#: selection:event.event,state:0
+#: selection:report.event.registration,state:0
+msgid "Draft"
+msgstr "草案"
+
+#. module: event
+#: field:event.type,name:0
+msgid "Event type"
+msgstr "イベントタイプ"
+
+#. module: event
+#: model:ir.model,name:event.model_event_type
+msgid " Event Type "
+msgstr " イベントタイプ "
+
+#. module: event
+#: view:event.event:0
+#: view:event.registration:0
+#: field:event.registration,event_id:0
+#: model:ir.model,name:event.model_event_event
+#: field:partner.event.registration,event_id:0
+#: view:report.event.registration:0
+#: field:report.event.registration,event_id:0
+#: view:res.partner:0
+msgid "Event"
+msgstr "イベント"
+
+#. module: event
+#: view:event.registration:0
+#: field:event.registration,badge_ids:0
+msgid "Badges"
+msgstr "名札"
+
+#. module: event
+#: view:event.event:0
+#: selection:event.event,state:0
+#: view:event.registration:0
+#: selection:event.registration,state:0
+#: selection:report.event.registration,state:0
+msgid "Confirmed"
+msgstr "確認済み"
+
+#. module: event
+#: view:event.confirm.registration:0
+msgid "Registration Confirmation"
+msgstr "登録確認"
+
+#. module: event
+#: view:event.event:0
+msgid "Events in New state"
+msgstr "新しいイベント"
+
+#. module: event
+#: view:report.event.registration:0
+msgid "Confirm"
+msgstr "確認"
+
+#. module: event
+#: view:event.event:0
+#: field:event.event,speaker_ids:0
+msgid "Other Speakers"
+msgstr "他の講演者"
+
+#. module: event
+#: model:ir.model,name:event.model_event_make_invoice
+msgid "Event Make Invoice"
+msgstr "イベントは請求書を作成"
+
+#. module: event
+#: help:event.registration,nb_register:0
+msgid "Number of Registrations or Tickets"
+msgstr "登録者あるいは切符の数"
+
+#. module: event
+#: code:addons/event/wizard/event_make_invoice.py:50
+#: code:addons/event/wizard/event_make_invoice.py:54
+#: code:addons/event/wizard/event_make_invoice.py:58
+#: code:addons/event/wizard/event_make_invoice.py:62
+#, python-format
+msgid "Warning !"
+msgstr "警告"
+
+#. module: event
+#: view:event.registration:0
+msgid "Send New Email"
+msgstr "新しいEメールを送る"
+
+#. module: event
+#: help:event.event,register_min:0
+msgid "Provide Minimum Number of Registrations"
+msgstr "登録者の最少数を指定する"
+
+#. module: event
+#: view:event.event:0
+msgid "Location"
+msgstr "会場"
+
+#. module: event
+#: view:event.event:0
+#: view:event.registration:0
+#: view:report.event.registration:0
+msgid "New"
+msgstr "新規"
+
+#. module: event
+#: field:event.event,register_current:0
+#: view:report.event.registration:0
+msgid "Confirmed Registrations"
+msgstr "確認済みの登録者"
+
+#. module: event
+#: field:event.event,mail_auto_registr:0
+msgid "Mail Auto Register"
+msgstr "自動登録をEメールする"
+
+#. module: event
+#: field:event.event,type:0
+#: field:partner.event.registration,event_type:0
+msgid "Type"
+msgstr "タイプ"
+
+#. module: event
+#: field:event.registration,email_from:0
+msgid "Email"
+msgstr "Eメール"
+
+#. module: event
+#: help:event.event,mail_confirm:0
+msgid ""
+"This email will be sent when the event gets confirmed or when someone "
+"subscribes to a confirmed event. This is also the email sent to remind "
+"someone about the event."
+msgstr ""
+"このEメールは、イベントの開催が確認されるか、誰かが確認済みのイベントについて問い合わせるかすると、このEメールが送られます。また、イベントを気づかせるた"
+"めのEメールも送られます。"
+
+#. module: event
+#: field:event.registration,tobe_invoiced:0
+msgid "To be Invoiced"
+msgstr "請求書を発行する"
+
+#. module: event
+#: view:event.event:0
+msgid "My Sales Team(s)"
+msgstr "私のセールスチーム"
+
+#. module: event
+#: code:addons/event/event.py:398
+#, python-format
+msgid "Error !"
+msgstr "エラー"
+
+#. module: event
+#: field:event.event,name:0
+#: field:event.registration,name:0
+msgid "Summary"
+msgstr "要約"
+
+#. module: event
+#: field:event.registration,create_date:0
+msgid "Creation Date"
+msgstr "作成日"
+
+#. module: event
+#: view:event.event:0
+#: view:event.registration:0
+#: view:res.partner:0
+msgid "Cancel Registration"
+msgstr "登録をキャンセル"
+
+#. module: event
+#: code:addons/event/event.py:399
+#, python-format
+msgid "Registered partner doesn't have an address to make the invoice."
+msgstr "登録者の請求先の住所がありません。"
+
+#. module: event
+#: view:report.event.registration:0
+msgid "Events created in last month"
+msgstr "先月、作成したイベント"
+
+#. module: event
+#: view:report.event.registration:0
+msgid "Events created in current year"
+msgstr "今年度に作成したイベント"
+
+#. module: event
+#: help:event.event,type:0
+msgid "Type of Event like Seminar, Exhibition, Conference, Training."
+msgstr "イベントのタイプ。例えば、セミナー、展示会、カンファレンス、研修など"
+
+#. module: event
+#: view:event.registration:0
+msgid "Confirmed registrations"
+msgstr "確認済み登録者"
+
+#. module: event
+#: view:event.event:0
+msgid "Event Organization"
+msgstr "イベントの組織"
+
+#. module: event
+#: view:event.registration:0
+msgid "History Information"
+msgstr "履歴情報"
+
+#. module: event
+#: view:event.registration:0
+msgid "Dates"
+msgstr "日付"
+
+#. module: event
+#: view:event.confirm:0
+#: view:event.confirm.registration:0
+msgid "Confirm Anyway"
+msgstr "とにかく確認する"
+
+#. module: event
+#: code:addons/event/wizard/event_confirm_registration.py:54
+#, python-format
+msgid "Warning: The Event '%s' has reached its Maximum Limit (%s)."
+msgstr "警告：イベント '%s' は，上限 (%s) に達しました。"
+
+#. module: event
+#: view:report.event.registration:0
+msgid "    Month-1    "
+msgstr "    月-1    "
+
+#. module: event
+#: view:event.event:0
+#: view:event.registration:0
+#: field:event.registration.badge,registration_id:0
+#: model:ir.actions.act_window,name:event.act_event_list_register_event
+msgid "Registration"
+msgstr "登録"
+
+#. module: event
+#: field:report.event.registration,nbevent:0
+msgid "Number Of Events"
+msgstr "イベントの数"
+
+#. module: event
+#: help:event.event,main_speaker_id:0
+msgid "Speaker who will be giving speech at the event."
+msgstr "イベントで講演する講演者"
+
+#. module: event
+#: help:event.event,state:0
+msgid ""
+"If event is created, the state is 'Draft'.If event is confirmed for the "
+"particular dates the state is set to 'Confirmed'. If the event is over, the "
+"state is set to 'Done'.If event is cancelled the state is set to 'Cancelled'."
+msgstr ""
+
+#. module: event
+#: view:event.event:0
+msgid "Cancel Event"
+msgstr "イベントをキャンセルする"
+
+#. module: event
+#: view:event.event:0
+#: view:event.registration:0
+msgid "Contact"
+msgstr "連絡先"
+
+#. module: event
+#: view:event.event:0
+#: view:event.registration:0
+#: field:event.registration,partner_id:0
+#: model:ir.model,name:event.model_res_partner
+msgid "Partner"
+msgstr "取引先"
+
+#. module: event
+#: view:board.board:0
+#: model:ir.actions.act_window,name:event.act_event_reg
+#: view:report.event.registration:0
+msgid "Events Filling Status"
+msgstr "イベントの状態"
+
+#. module: event
+#: field:event.make.invoice,grouped:0
+msgid "Group the invoices"
+msgstr "請求書をグループ化する"
+
+#. module: event
+#: view:event.event:0
+msgid "Mailing"
+msgstr "Eメール"
+
+#. module: event
+#: view:report.event.registration:0
+msgid "Events States"
+msgstr "イベントの状態"
+
+#. module: event
+#: view:board.board:0
+#: field:event.event,register_prospect:0
+msgid "Unconfirmed Registrations"
+msgstr "未確認の登録"
+
+#. module: event
+#: field:event.registration,partner_invoice_id:0
+msgid "Partner Invoiced"
+msgstr "請求済みの取引先"
+
+#. module: event
+#: help:event.event,register_max:0
+msgid "Provide Maximum Number of Registrations"
+msgstr "登録の最大数を指定して下さい。"
+
+#. module: event
+#: field:event.registration,log_ids:0
+msgid "Logs"
+msgstr "ログ"
+
+#. module: event
+#: view:event.event:0
+#: field:event.event,state:0
+#: view:event.registration:0
+#: field:event.registration,state:0
+#: view:report.event.registration:0
+#: field:report.event.registration,state:0
+msgid "State"
+msgstr "状態"
+
+#. module: event
+#: selection:report.event.registration,month:0
+msgid "September"
+msgstr "9月"
+
+#. module: event
+#: selection:report.event.registration,month:0
+msgid "December"
+msgstr "12月"
+
+#. module: event
+#: field:event.registration,event_product:0
+msgid "Invoice Name"
+msgstr "請求名"
+
+#. module: event
+#: field:report.event.registration,draft_state:0
+msgid " # No of Draft Registrations"
+msgstr " 登録の草案の数"
+
+#. module: event
+#: view:report.event.registration:0
+#: field:report.event.registration,month:0
+msgid "Month"
+msgstr "月"
+
+#. module: event
+#: view:event.event:0
+msgid "Event Done"
+msgstr "終了したイベント"
+
+#. module: event
+#: view:event.registration:0
+msgid "Registrations in unconfirmed state"
+msgstr "未確認状態の登録"
+
+#. module: event
+#: help:event.event,register_current:0
+msgid "Total of Open and Done Registrations"
+msgstr "受付中と終了した登録の合計"
+
+#. module: event
+#: field:event.confirm.registration,msg:0
+msgid "Message"
+msgstr "メッセージ"
+
+#. module: event
+#: constraint:event.event:0
+msgid "Error ! You cannot create recursive event."
+msgstr "エラー：イベントを重複して作成することはできません。"
+
+#. module: event
+#: field:event.registration,ref2:0
+msgid "Reference 2"
+msgstr "参照2"
+
+#. module: event
+#: code:addons/event/event.py:361
+#: view:report.event.registration:0
+#, python-format
+msgid "Invoiced"
+msgstr "請求済み"
+
+#. module: event
+#: view:event.event:0
+#: view:report.event.registration:0
+msgid "My Events"
+msgstr "私のイベント"
+
+#. module: event
+#: view:event.event:0
+msgid "Speakers"
+msgstr "講演者"
+
+#. module: event
+#: view:event.make.invoice:0
+msgid "Create invoices"
+msgstr "請求書を作成"
+
+#. module: event
+#: help:event.registration,email_cc:0
+msgid ""
+"These email addresses will be added to the CC field of all inbound and "
+"outbound emails for this record before being sent. Separate multiple email "
+"addresses with a comma"
+msgstr "これらのEメールアドレスは送受信するEメールの CC 欄に追加されます。複数のEメールアドレスの間にはコンマを入れてください。"
+
+#. module: event
+#: view:event.make.invoice:0
+msgid "Do you really want to create the invoice(s) ?"
+msgstr "請求書を作成しますか。"
+
+#. module: event
+#: view:event.event:0
+msgid "Beginning Date"
+msgstr "開始日"
+
+#. module: event
+#: field:event.registration,date_closed:0
+msgid "Closed"
+msgstr "終了"
+
+#. module: event
+#: view:report.event.registration:0
+msgid "Events which are in New state"
+msgstr "新規状態のイベント"
+
+#. module: event
+#: view:event.event:0
+#: model:ir.actions.act_window,name:event.action_event_view
+#: model:ir.ui.menu,name:event.menu_event_event
+#: model:ir.ui.menu,name:event.menu_event_event_assiciation
+#: view:res.partner:0
+msgid "Events"
+msgstr "イベント"
+
+#. module: event
+#: field:partner.event.registration,nb_register:0
+msgid "Number of Registration"
+msgstr "登録者数"
+
+#. module: event
+#: field:event.event,child_ids:0
+msgid "Child Events"
+msgstr "下位のイベント"
+
+#. module: event
+#: selection:report.event.registration,month:0
+msgid "August"
+msgstr "8月"
+
+#. module: event
+#: field:res.partner,event_ids:0
+#: field:res.partner,event_registration_ids:0
+msgid "unknown"
+msgstr "不明"
+
+#. module: event
+#: help:event.event,product_id:0
+msgid ""
+"The invoices of this event registration will be created with this Product. "
+"Thus it allows you to set the default label and the accounting info you want "
+"by default on these invoices."
+msgstr ""
+
+#. module: event
+#: selection:report.event.registration,month:0
+msgid "June"
+msgstr "6月"
+
+#. module: event
+#: model:product.template,name:event.event_product_0_product_template
+msgid "Ticket for Concert"
+msgstr "コンサートの切符"
+
+#. module: event
+#: field:event.registration,write_date:0
+msgid "Write Date"
+msgstr "日付を入れて下さい。"
+
+#. module: event
+#: view:event.registration:0
+msgid "My Registrations"
+msgstr "私の登録"
+
+#. module: event
+#: view:event.confirm:0
+msgid ""
+"Warning: This Event has not reached its Minimum Registration Limit. Are you "
+"sure you want to confirm it?"
+msgstr ""
+
+#. module: event
+#: field:event.registration,active:0
+msgid "Active"
+msgstr "受付け中"
+
+#. module: event
+#: field:event.registration,date:0
+msgid "Start Date"
+msgstr "開始日"
+
+#. module: event
+#: selection:report.event.registration,month:0
+msgid "November"
+msgstr "11月"
+
+#. module: event
+#: view:report.event.registration:0
+msgid "Extended Filters..."
+msgstr "拡張フィルタ…"
+
+#. module: event
+#: field:partner.event.registration,start_date:0
+msgid "Start date"
+msgstr "開始日"
+
+#. module: event
+#: selection:report.event.registration,month:0
+msgid "October"
+msgstr "10月"
+
+#. module: event
+#: field:event.event,language:0
+msgid "Language"
+msgstr "言語"
+
+#. module: event
+#: view:event.registration:0
+#: field:event.registration,email_cc:0
+msgid "CC"
+msgstr ""
+
+#. module: event
+#: selection:report.event.registration,month:0
+msgid "January"
+msgstr ""
+
+#. module: event
+#: help:event.registration,email_from:0
+msgid "These people will receive email."
+msgstr ""
+
+#. module: event
+#: view:event.event:0
+msgid "Set To Draft"
+msgstr ""
+
+#. module: event
+#: code:addons/event/event.py:499
+#: view:event.event:0
+#: view:event.registration:0
+#: view:res.partner:0
+#, python-format
+msgid "Confirm Registration"
+msgstr ""
+
+#. module: event
+#: view:event.event:0
+#: view:report.event.registration:0
+#: view:res.partner:0
+msgid "Date"
+msgstr ""
+
+#. module: event
+#: view:event.event:0
+msgid "Registration Email Body"
+msgstr ""
+
+#. module: event
+#: view:event.event:0
+msgid "Confirmation Email Body"
+msgstr ""
+
+#. module: event
+#: view:report.event.registration:0
+msgid "Registrations in confirmed or done state"
+msgstr ""
+
+#. module: event
+#: view:event.registration:0
+#: view:res.partner:0
+msgid "History"
+msgstr ""
+
+#. module: event
+#: field:event.event,address_id:0
+msgid "Location Address"
+msgstr ""
+
+#. module: event
+#: model:ir.actions.act_window,name:event.action_event_type
+#: model:ir.ui.menu,name:event.menu_event_type
+msgid "Types of Events"
+msgstr ""
+
+#. module: event
+#: field:event.registration,contact_id:0
+msgid "Partner Contact"
+msgstr ""
+
+#. module: event
+#: field:event.event,pricelist_id:0
+msgid "Pricelist"
+msgstr ""
+
+#. module: event
+#: code:addons/event/wizard/event_make_invoice.py:59
+#, python-format
+msgid "Event related doesn't have any product defined"
+msgstr ""
+
+#. module: event
+#: view:event.event:0
+msgid "Auto Confirmation Email"
+msgstr ""
+
+#. module: event
+#: view:event.registration:0
+msgid "Misc"
+msgstr ""
+
+#. module: event
+#: constraint:event.event:0
+msgid "Error ! Closing Date cannot be set before Beginning Date."
+msgstr ""
+
+#. module: event
+#: code:addons/event/event.py:446
+#: selection:event.event,state:0
+#: view:event.make.invoice:0
+#: selection:event.registration,state:0
+#: selection:report.event.registration,state:0
+#, python-format
+msgid "Done"
+msgstr ""
+
+#. module: event
+#: field:event.event,date_begin:0
+msgid "Beginning date"
+msgstr ""
+
+#. module: event
+#: view:event.registration:0
+#: field:event.registration,invoice_id:0
+msgid "Invoice"
+msgstr ""
+
+#. module: event
+#: view:report.event.registration:0
+#: field:report.event.registration,year:0
+msgid "Year"
+msgstr ""
+
+#. module: event
+#: code:addons/event/event.py:465
+#, python-format
+msgid "Cancel"
+msgstr ""
+
+#. module: event
+#: view:event.confirm:0
+#: view:event.confirm.registration:0
+#: view:event.make.invoice:0
+msgid "Close"
+msgstr ""
+
+#. module: event
+#: view:event.event:0
+msgid "Event by Registration"
+msgstr ""
+
+#. module: event
+#: code:addons/event/event.py:436
+#, python-format
+msgid "Open"
+msgstr ""
+
+#. module: event
+#: field:event.event,user_id:0
+msgid "Responsible User"
+msgstr ""
+
+#. module: event
+#: code:addons/event/event.py:561
+#: code:addons/event/event.py:568
+#, python-format
+msgid "Auto Confirmation: [%s] %s"
+msgstr ""
+
+#. module: event
+#: view:event.event:0
+#: view:event.registration:0
+#: field:event.registration,user_id:0
+#: view:report.event.registration:0
+#: field:report.event.registration,user_id:0
+msgid "Responsible"
+msgstr ""
+
+#. module: event
+#: field:event.event,unit_price:0
+#: view:event.registration:0
+#: field:partner.event.registration,unit_price:0
+msgid "Registration Cost"
+msgstr ""
+
+#. module: event
+#: field:event.registration,unit_price:0
+msgid "Unit Price"
+msgstr ""
+
+#. module: event
+#: view:report.event.registration:0
+#: field:report.event.registration,speaker_id:0
+#: field:res.partner,speaker:0
+msgid "Speaker"
+msgstr ""
+
+#. module: event
+#: model:event.event,name:event.event_2
+msgid "Conference on ERP Buisness"
+msgstr ""
+
+#. module: event
+#: view:event.registration:0
+msgid "Reply"
+msgstr ""
+
+#. module: event
+#: view:report.event.registration:0
+msgid "Events created in current month"
+msgstr ""
+
+#. module: event
+#: help:event.event,mail_auto_registr:0
+msgid ""
+"Check this box if you want to use automatic emailing for new registration."
+msgstr ""
+
+#. module: event
+#: field:event.event,date_end:0
+#: field:partner.event.registration,end_date:0
+msgid "Closing date"
+msgstr ""
+
+#. module: event
+#: field:event.event,product_id:0
+#: view:report.event.registration:0
+#: field:report.event.registration,product_id:0
+msgid "Product"
+msgstr ""
+
+#. module: event
+#: view:event.event:0
+#: field:event.event,note:0
+#: view:event.registration:0
+#: field:event.registration,description:0
+msgid "Description"
+msgstr ""
+
+#. module: event
+#: field:report.event.registration,confirm_state:0
+msgid " # No of Confirmed Registrations"
+msgstr ""
+
+#. module: event
+#: model:ir.actions.act_window,name:event.act_register_event_partner
+msgid "Subscribe"
+msgstr ""
+
+#. module: event
+#: selection:report.event.registration,month:0
+msgid "May"
+msgstr ""
+
+#. module: event
+#: view:res.partner:0
+msgid "Events Registration"
+msgstr ""
+
+#. module: event
+#: help:event.event,mail_registr:0
+msgid "This email will be sent when someone subscribes to the event."
+msgstr ""
+
+#. module: event
+#: model:product.template,name:event.event_product_2_product_template
+msgid "Ticket for Conference"
+msgstr ""
+
+#. module: event
+#: model:ir.ui.menu,name:event.menu_event_type_association
+msgid "Events Type"
+msgstr ""
+
+#. module: event
+#: field:event.registration.badge,address_id:0
+msgid "Address"
+msgstr ""
+
+#. module: event
+#: view:board.board:0
+#: model:ir.actions.act_window,name:event.act_event_view
+msgid "Next Events"
+msgstr ""
+
+#. module: event
+#: view:partner.event.registration:0
+msgid "_Subcribe"
+msgstr ""
+
+#. module: event
+#: model:ir.model,name:event.model_partner_event_registration
+msgid "  event Registration "
+msgstr ""
+
+#. module: event
+#: help:event.event,date_begin:0
+#: help:partner.event.registration,start_date:0
+msgid "Beginning Date of Event"
+msgstr ""
+
+#. module: event
+#: selection:event.registration,state:0
+msgid "Unconfirmed"
+msgstr ""
+
+#. module: event
+#: code:addons/event/event.py:565
+#, python-format
+msgid "Auto Registration: [%s] %s"
+msgstr ""
+
+#. module: event
+#: field:event.registration,date_deadline:0
+msgid "End Date"
+msgstr ""
+
+#. module: event
+#: selection:report.event.registration,month:0
+msgid "February"
+msgstr ""
+
+#. module: event
+#: view:board.board:0
+msgid "Association Dashboard"
+msgstr ""
+
+#. module: event
+#: view:event.event:0
+#: field:event.registration.badge,name:0
+msgid "Name"
+msgstr ""
+
+#. module: event
+#: field:event.event,section_id:0
+#: field:event.registration,section_id:0
+#: view:report.event.registration:0
+#: field:report.event.registration,section_id:0
+msgid "Sale Team"
+msgstr ""
+
+#. module: event
+#: field:event.event,country_id:0
+msgid "Country"
+msgstr ""
+
+#. module: event
+#: code:addons/event/wizard/event_make_invoice.py:55
+#, python-format
+msgid "Registration is set as Cannot be invoiced"
+msgstr ""
+
+#. module: event
+#: code:addons/event/event.py:527
+#: view:event.event:0
+#: view:event.registration:0
+#: view:res.partner:0
+#, python-format
+msgid "Close Registration"
+msgstr ""
+
+#. module: event
+#: selection:report.event.registration,month:0
+msgid "April"
+msgstr ""
+
+#. module: event
+#: help:event.event,unit_price:0
+msgid ""
+"This will be the default price used as registration cost when invoicing this "
+"event. Note that you can specify a specific amount for each registration."
+msgstr ""
+
+#. module: event
+#: view:report.event.registration:0
+msgid "Events which are in confirm state"
+msgstr ""
+
+#. module: event
+#: view:event.event:0
+#: view:event.type:0
+#: view:report.event.registration:0
+#: field:report.event.registration,type:0
+msgid "Event Type"
+msgstr ""
+
+#. module: event
+#: view:event.event:0
+#: field:event.event,registration_ids:0
+#: model:ir.actions.act_window,name:event.action_registration
+#: model:ir.ui.menu,name:event.menu_action_registration
+#: model:ir.ui.menu,name:event.menu_action_registration_association
+msgid "Registrations"
+msgstr ""
+
+#. module: event
+#: field:event.registration,id:0
+msgid "ID"
+msgstr ""
+
+#. module: event
+#: field:event.event,register_max:0
+#: field:report.event.registration,register_max:0
+msgid "Maximum Registrations"
+msgstr ""
+
+#. module: event
+#: constraint:res.partner:0
+msgid "Error ! You cannot create recursive associated members."
+msgstr ""
+
+#. module: event
+#: field:report.event.registration,date:0
+msgid "Event Start Date"
+msgstr ""
+
+#. module: event
+#: view:partner.event.registration:0
+msgid "Event For Registration"
+msgstr ""
+
+#. module: event
+#: code:addons/event/wizard/event_make_invoice.py:51
+#, python-format
+msgid "Invoice cannot be created if the registration is in %s state."
+msgstr ""
+
+#. module: event
+#: view:event.confirm:0
+#: model:ir.actions.act_window,name:event.action_event_confirm
+#: model:ir.model,name:event.model_event_confirm
+msgid "Event Confirmation"
+msgstr ""
+
+#. module: event
+#: view:event.event:0
+msgid "Auto Registration Email"
+msgstr ""
+
+#. module: event
+#: view:event.registration:0
+#: view:report.event.registration:0
+#: field:report.event.registration,total:0
+msgid "Total"
+msgstr ""
+
+#. module: event
+#: field:event.event,speaker_confirmed:0
+msgid "Speaker Confirmed"
+msgstr ""
+
+#. module: event
+#: model:ir.actions.act_window,help:event.action_event_view
+msgid ""
+"Event is the low level object used by meeting and others documents that "
+"should be synchronized with mobile devices or calendar applications through "
+"caldav. Most of the users should work in the Calendar menu, and not in the "
+"list of events."
+msgstr ""
diff --git a/addons/fetchmail/i18n/ja.po b/addons/fetchmail/i18n/ja.po
new file mode 100644
index 00000000000..0594d8f7327
--- /dev/null
+++ b/addons/fetchmail/i18n/ja.po
@@ -0,0 +1,322 @@
+# 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-19 22: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-20 04:43+0000\n"
+"X-Generator: Launchpad (build 15120)\n"
+
+#. module: fetchmail
+#: selection:fetchmail.server,state:0
+msgid "Confirmed"
+msgstr "確認済み"
+
+#. module: fetchmail
+#: field:fetchmail.server,server:0
+msgid "Server Name"
+msgstr "サーバ名"
+
+#. module: fetchmail
+#: field:fetchmail.server,script:0
+msgid "Script"
+msgstr "スクリプト"
+
+#. module: fetchmail
+#: help:fetchmail.server,priority:0
+msgid "Defines the order of processing, lower values mean higher priority"
+msgstr "処理の順序を定義します。値が小さいほど優先度が高い。"
+
+#. module: fetchmail
+#: help:fetchmail.server,is_ssl:0
+msgid ""
+"Connections are encrypted with SSL/TLS through a dedicated port (default: "
+"IMAPS=993, POP3S=995)"
+msgstr "専用ポートを使った接続によって SSL/TLS で暗号化されます (デフォルト：IMAPS=993, POP3S=995)。"
+
+#. module: fetchmail
+#: field:fetchmail.server,attach:0
+msgid "Keep Attachments"
+msgstr "添付を保持する。"
+
+#. module: fetchmail
+#: help:fetchmail.server,original:0
+msgid ""
+"Whether a full original copy of each email should be kept for referenceand "
+"attached to each processed message. This will usually double the size of "
+"your message database."
+msgstr "Eメールの原本を保存して、処理済みメッセージを添付するかどうかの指定。これを指定すると、メッセージ・データベースのサイズが倍になります。"
+
+#. module: fetchmail
+#: field:fetchmail.server,priority:0
+msgid "Server Priority"
+msgstr "サーバの優先度"
+
+#. module: fetchmail
+#: field:fetchmail.server,state:0
+msgid "State"
+msgstr "状態"
+
+#. module: fetchmail
+#: view:fetchmail.server:0
+msgid "POP"
+msgstr "POP"
+
+#. module: fetchmail
+#: view:fetchmail.server:0
+msgid "Fetch Now"
+msgstr "いま読み取る。"
+
+#. module: fetchmail
+#: model:ir.actions.act_window,name:fetchmail.action_email_server_tree
+#: model:ir.ui.menu,name:fetchmail.menu_action_fetchmail_server_tree
+msgid "Incoming Mail Servers"
+msgstr "Eメールサーバから読取り中"
+
+#. module: fetchmail
+#: field:fetchmail.server,port:0
+msgid "Port"
+msgstr "ポート"
+
+#. module: fetchmail
+#: view:fetchmail.server:0
+msgid "POP/IMAP Servers"
+msgstr "POP/MAPサーバ"
+
+#. module: fetchmail
+#: selection:fetchmail.server,type:0
+msgid "Local Server"
+msgstr "ローカルサーバ"
+
+#. module: fetchmail
+#: field:fetchmail.server,user:0
+msgid "Username"
+msgstr "ユーザ名"
+
+#. module: fetchmail
+#: model:ir.model,name:fetchmail.model_fetchmail_server
+msgid "POP/IMAP Server"
+msgstr "POP/IMAPサーバ"
+
+#. module: fetchmail
+#: view:fetchmail.server:0
+msgid "Reset Confirmation"
+msgstr "確認をリセット"
+
+#. module: fetchmail
+#: view:fetchmail.server:0
+msgid "SSL"
+msgstr "SSL"
+
+#. module: fetchmail
+#: model:ir.model,name:fetchmail.model_mail_message
+msgid "Email Message"
+msgstr "Eメールメッセージ"
+
+#. module: fetchmail
+#: field:fetchmail.server,date:0
+msgid "Last Fetch Date"
+msgstr "前回の読取り日"
+
+#. module: fetchmail
+#: help:fetchmail.server,action_id:0
+msgid ""
+"Optional custom server action to trigger for each incoming mail, on the "
+"record that was created or updated by this mail"
+msgstr "受信するEメールが作成したレコードによって、カスタムサーバの実行を起動するかどうかの選択"
+
+#. module: fetchmail
+#: view:fetchmail.server:0
+msgid "# of emails"
+msgstr "Eメールの数"
+
+#. module: fetchmail
+#: field:fetchmail.server,original:0
+msgid "Keep Original"
+msgstr "原本を保持する"
+
+#. module: fetchmail
+#: code:addons/fetchmail/fetchmail.py:155
+#, python-format
+msgid ""
+"Here is what we got instead:\n"
+" %s"
+msgstr ""
+"代わりにこれを受け取りました：\n"
+"　%s"
+
+#. module: fetchmail
+#: view:fetchmail.server:0
+#: field:fetchmail.server,configuration:0
+msgid "Configuration"
+msgstr "設定"
+
+#. module: fetchmail
+#: view:fetchmail.server:0
+msgid "Incoming Mail Server"
+msgstr "受信Eメールサーバ"
+
+#. module: fetchmail
+#: code:addons/fetchmail/fetchmail.py:155
+#, python-format
+msgid "Connection test failed!"
+msgstr "接続テストに失敗しました"
+
+#. module: fetchmail
+#: help:fetchmail.server,server:0
+msgid "Hostname or IP of the mail server"
+msgstr "ホスト名あるいはEメールサーバのIP"
+
+#. module: fetchmail
+#: view:fetchmail.server:0
+msgid "Server type IMAP."
+msgstr "サーバタイプ IMAP"
+
+#. module: fetchmail
+#: field:fetchmail.server,name:0
+msgid "Name"
+msgstr "名前"
+
+#. module: fetchmail
+#: field:fetchmail.server,is_ssl:0
+msgid "SSL/TLS"
+msgstr "SSL/TLS"
+
+#. module: fetchmail
+#: view:fetchmail.server:0
+msgid "Test & Confirm"
+msgstr "テスト・確認"
+
+#. module: fetchmail
+#: field:fetchmail.server,action_id:0
+msgid "Server Action"
+msgstr "サーバアクション"
+
+#. module: fetchmail
+#: field:mail.message,fetchmail_server_id:0
+msgid "Inbound Mail Server"
+msgstr "受信Eメールサーバ"
+
+#. module: fetchmail
+#: field:fetchmail.server,message_ids:0
+#: model:ir.actions.act_window,name:fetchmail.act_server_history
+msgid "Messages"
+msgstr "メッセージ"
+
+#. module: fetchmail
+#: view:fetchmail.server:0
+msgid "Search Incoming Mail Servers"
+msgstr "受信Eメールサーバを検索する"
+
+#. module: fetchmail
+#: field:fetchmail.server,active:0
+msgid "Active"
+msgstr "活動中"
+
+#. module: fetchmail
+#: help:fetchmail.server,attach:0
+msgid ""
+"Whether attachments should be downloaded. If not enabled, incoming emails "
+"will be stripped of any attachments before being processed"
+msgstr "添付ファイルをダウンロードするかどうか。これを指定しないと，Eメールを受信する前に添付ファイアは外されます。"
+
+#. module: fetchmail
+#: view:fetchmail.server:0
+msgid "Advanced options"
+msgstr "高度なオプション"
+
+#. module: fetchmail
+#: selection:fetchmail.server,type:0
+msgid "IMAP Server"
+msgstr "IMAP サーバー"
+
+#. module: fetchmail
+#: view:fetchmail.server:0
+msgid "IMAP"
+msgstr "IMAP"
+
+#. module: fetchmail
+#: view:fetchmail.server:0
+msgid "Server type POP."
+msgstr "サーバタイプPOP"
+
+#. module: fetchmail
+#: field:fetchmail.server,password:0
+msgid "Password"
+msgstr "パスワード"
+
+#. module: fetchmail
+#: view:fetchmail.server:0
+msgid "Actions to Perform on Incoming Mails"
+msgstr "受信Eメールに対する処理"
+
+#. module: fetchmail
+#: field:fetchmail.server,type:0
+msgid "Server Type"
+msgstr "サーバタイプ"
+
+#. module: fetchmail
+#: view:fetchmail.server:0
+msgid "Login Information"
+msgstr "ログイン情報"
+
+#. module: fetchmail
+#: view:fetchmail.server:0
+msgid "Server Information"
+msgstr "サーバ情報"
+
+#. module: fetchmail
+#: view:fetchmail.server:0
+msgid "If SSL required."
+msgstr "SSLは必要ならば"
+
+#. module: fetchmail
+#: view:fetchmail.server:0
+msgid "Advanced"
+msgstr "高度"
+
+#. module: fetchmail
+#: view:fetchmail.server:0
+msgid "Server & Login"
+msgstr "サーバとログイン"
+
+#. module: fetchmail
+#: help:fetchmail.server,object_id:0
+msgid ""
+"Process each incoming mail as part of a conversation corresponding to this "
+"document type. This will create new documents for new conversations, or "
+"attach follow-up emails to the existing conversations (documents)."
+msgstr ""
+"受信Eメールを、この文書タイプに対応する交信の一部として処理する。\r\n"
+"\r\n"
+"そうすると、新しい交信のための新しい文書を作成するか、既存の交信（文書）への追跡Eメールを添付します。"
+
+#. module: fetchmail
+#: field:fetchmail.server,object_id:0
+msgid "Create a New Record"
+msgstr "新しいレコードを作成する"
+
+#. module: fetchmail
+#: selection:fetchmail.server,state:0
+msgid "Not Confirmed"
+msgstr "未確認"
+
+#. module: fetchmail
+#: selection:fetchmail.server,type:0
+msgid "POP Server"
+msgstr "POPサーバ"
+
+#. module: fetchmail
+#: view:mail.message:0
+msgid "Mail Server"
+msgstr "Eメールサーバ"
diff --git a/addons/hr_evaluation/i18n/ja.po b/addons/hr_evaluation/i18n/ja.po
index f1b5d2989ef..985ede64d91 100644
--- a/addons/hr_evaluation/i18n/ja.po
+++ b/addons/hr_evaluation/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 01:37+0100\n"
-"PO-Revision-Date: 2012-04-19 00:13+0000\n"
+"PO-Revision-Date: 2012-04-19 18:05+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"
+"X-Launchpad-Export-Date: 2012-04-20 04:43+0000\n"
+"X-Generator: Launchpad (build 15120)\n"
 
 #. module: hr_evaluation
 #: help:hr_evaluation.plan.phase,send_anonymous_manager:0
@@ -173,7 +173,7 @@ msgstr "終了日"
 msgid ""
 "If the evaluation does not meet the expectations, you can proposean action "
 "plan"
-msgstr "評価が期待に達しなかった場合には、アクション計画を提案できます。"
+msgstr "評価が期待に達しなかった場合には、活動計画を提案できます。"
 
 #. module: hr_evaluation
 #: view:hr_evaluation.plan.phase:0
@@ -278,137 +278,137 @@ msgstr "従業員"
 #. module: hr_evaluation
 #: selection:hr_evaluation.evaluation,state:0
 msgid "New"
-msgstr ""
+msgstr "新規"
 
 #. module: hr_evaluation
 #: field:hr_evaluation.plan.phase,mail_body:0
 msgid "Email"
-msgstr ""
+msgstr "Eメール"
 
 #. module: hr_evaluation
 #: selection:hr.evaluation.report,rating:0
 #: selection:hr_evaluation.evaluation,rating:0
 msgid "Exceeds expectations"
-msgstr ""
+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 ""
+msgstr "従業員にEメールを送るのであれば，このボックスをチェックして下さい。"
 
 #. module: hr_evaluation
 #: view:hr.evaluation.report:0
 msgid "Evaluation done in last month"
-msgstr ""
+msgstr "評価は先月、終了"
 
 #. module: hr_evaluation
 #: model:ir.model,name:hr_evaluation.model_mail_compose_message
 msgid "E-mail composition wizard"
-msgstr ""
+msgstr "Eメール作成ツール"
 
 #. module: hr_evaluation
 #: view:hr.evaluation.report:0
 msgid "Creation Date"
-msgstr ""
+msgstr "作成日"
 
 #. module: hr_evaluation
 #: help:hr_evaluation.plan.phase,send_answer_manager:0
 msgid "Send all answers to the manager"
-msgstr ""
+msgstr "全ての回答をマネジャに送る。"
 
 #. module: hr_evaluation
 #: selection:hr.evaluation.report,state:0
 #: selection:hr_evaluation.evaluation,state:0
 msgid "Plan In Progress"
-msgstr ""
+msgstr "計画中"
 
 #. module: hr_evaluation
 #: view:hr_evaluation.evaluation:0
 msgid "Public Notes"
-msgstr ""
+msgstr "公開された注記"
 
 #. module: hr_evaluation
 #: view:hr.evaluation.interview:0
 msgid "Send Reminder Email"
-msgstr ""
+msgstr "催促のEメールを送る。"
 
 #. module: hr_evaluation
 #: view:hr.evaluation.report:0 field:hr_evaluation.evaluation,rating:0
 msgid "Appreciation"
-msgstr ""
+msgstr "好意的評価"
 
 #. module: hr_evaluation
 #: view:hr.evaluation.interview:0 view:hr_evaluation.evaluation:0
 msgid "Print Interview"
-msgstr ""
+msgstr "面接結果の印刷"
 
 #. module: hr_evaluation
 #: view:hr_evaluation.evaluation:0
 msgid "Pending"
-msgstr ""
+msgstr "保留"
 
 #. module: hr_evaluation
 #: field:hr.evaluation.report,closed:0
 msgid "closed"
-msgstr ""
+msgstr "済み"
 
 #. module: hr_evaluation
 #: selection:hr.evaluation.report,rating:0
 #: selection:hr_evaluation.evaluation,rating:0
 msgid "Meet expectations"
-msgstr ""
+msgstr "期待を達成"
 
 #. module: hr_evaluation
 #: view:hr.evaluation.report:0 field:hr.evaluation.report,nbr:0
 msgid "# of Requests"
-msgstr ""
+msgstr "予定の数"
 
 #. module: hr_evaluation
 #: selection:hr.evaluation.report,month:0
 msgid "July"
-msgstr ""
+msgstr "7月"
 
 #. module: hr_evaluation
 #: model:ir.actions.act_window,name:hr_evaluation.action_evaluation_plans_installer
 msgid "Review Appraisal Plans"
-msgstr ""
+msgstr "査定計画を見直す。"
 
 #. module: hr_evaluation
 #: view:hr.evaluation.report:0
 msgid "    Month-1    "
-msgstr ""
+msgstr "    月-1    "
 
 #. module: hr_evaluation
 #: view:hr_evaluation.plan.phase:0
 msgid "Action to Perform"
-msgstr ""
+msgstr "実行すべき活動"
 
 #. module: hr_evaluation
 #: field:hr_evaluation.evaluation,note_action:0
 msgid "Action Plan"
-msgstr ""
+msgstr "活動計画"
 
 #. module: hr_evaluation
 #: model:ir.ui.menu,name:hr_evaluation.menu_eval_hr_config
 msgid "Periodic Appraisal"
-msgstr ""
+msgstr "周期的な査定"
 
 #. module: hr_evaluation
 #: view:hr_evaluation.evaluation:0
 msgid "Appraisal to close within the next 7 days"
-msgstr ""
+msgstr "7日間以内に終わらせるべき査定"
 
 #. module: hr_evaluation
 #: view:hr_evaluation.evaluation:0
 msgid "Ending Summary"
-msgstr ""
+msgstr "最終要約"
 
 #. module: hr_evaluation
 #: selection:hr.evaluation.report,rating:0
 #: selection:hr_evaluation.evaluation,rating:0
 msgid "Significantly exceeds expectations"
-msgstr ""
+msgstr "期待を著しく上回った。"
 
 #. module: hr_evaluation
 #: model:ir.actions.act_window,help:hr_evaluation.action_hr_evaluation_interview_tree
@@ -416,237 +416,237 @@ 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 ""
+msgstr "従業員の査定計画に基づいて、面接の予定が自動的に作成されます。自分の同僚を定期的に評価することを要求するEメールを受け取ります。"
 
 #. module: hr_evaluation
 #: view:hr_evaluation.evaluation:0
 msgid "In progress"
-msgstr ""
+msgstr "進行中"
 
 #. module: hr_evaluation
 #: view:hr.evaluation.interview:0
 msgid "Interview Request"
-msgstr ""
+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 ""
+msgstr "全ての回答"
 
 #. module: hr_evaluation
 #: selection:hr.evaluation.report,month:0
 msgid "September"
-msgstr ""
+msgstr "9月"
 
 #. module: hr_evaluation
 #: selection:hr.evaluation.report,month:0
 msgid "December"
-msgstr ""
+msgstr "12月"
 
 #. module: hr_evaluation
 #: view:hr.evaluation.report:0
 msgid "Evaluation done in current year"
-msgstr ""
+msgstr "評価は今年度に評価"
 
 #. module: hr_evaluation
 #: view:hr.evaluation.report:0 field:hr.evaluation.report,month:0
 msgid "Month"
-msgstr ""
+msgstr "月"
 
 #. module: hr_evaluation
 #: view:hr_evaluation.evaluation:0
 msgid "Group by..."
-msgstr ""
+msgstr "グル―化…"
 
 #. module: hr_evaluation
 #: view:hr_evaluation.plan.phase:0
 msgid "Mail Settings"
-msgstr ""
+msgstr "Eメールの設定"
 
 #. module: hr_evaluation
 #: model:ir.actions.act_window,name:hr_evaluation.evaluation_reminders
 msgid "Appraisal Reminders"
-msgstr ""
+msgstr "査定の催促"
 
 #. module: hr_evaluation
 #: view:hr.evaluation.interview:0 view:hr_evaluation.evaluation:0
 msgid "Interview Question"
-msgstr ""
+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 ""
+msgstr "この文章を挿入する前に、上記の文章が終わるまで待つのであれば、このボックスをチェックして下さい。"
 
 #. module: hr_evaluation
 #: view:hr_evaluation.plan.phase:0
 msgid "Legend"
-msgstr ""
+msgstr "凡例"
 
 #. module: hr_evaluation
 #: field:hr_evaluation.plan,month_first:0
 msgid "First Appraisal in (months)"
-msgstr ""
+msgstr "(months) の最初の査定"
 
 #. module: hr_evaluation
 #: selection:hr.evaluation.report,state:0
 msgid "Draft"
-msgstr ""
+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 ""
+msgstr "匿名の要約"
 
 #. module: hr_evaluation
 #: view:hr_evaluation.evaluation:0
 msgid "7 Days"
-msgstr ""
+msgstr "7日間"
 
 #. 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 ""
+msgstr "査定計画"
 
 #. module: hr_evaluation
 #: view:hr.evaluation.interview:0
 msgid "Print Survey"
-msgstr ""
+msgstr "調査票を印刷"
 
 #. module: hr_evaluation
 #: selection:hr.evaluation.report,month:0
 msgid "August"
-msgstr ""
+msgstr "8月"
 
 #. module: hr_evaluation
 #: selection:hr.evaluation.report,month:0
 msgid "June"
-msgstr ""
+msgstr "6月"
 
 #. module: hr_evaluation
 #: selection:hr.evaluation.report,rating:0
 #: selection:hr_evaluation.evaluation,rating:0
 msgid "Significantly bellow expectations"
-msgstr ""
+msgstr "期待を著しく下回った"
 
 #. module: hr_evaluation
 #: view:hr_evaluation.plan.phase:0
 msgid " (employee_name)s: Partner name"
-msgstr ""
+msgstr " (employee_name)s：パートナ名"
 
 #. 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 ""
+msgstr "計画"
 
 #. module: hr_evaluation
 #: field:hr_evaluation.plan,active:0
 msgid "Active"
-msgstr ""
+msgstr "仕掛中"
 
 #. module: hr_evaluation
 #: selection:hr.evaluation.report,month:0
 msgid "November"
-msgstr ""
+msgstr "11月"
 
 #. module: hr_evaluation
 #: view:hr.evaluation.report:0
 msgid "Extended Filters..."
-msgstr ""
+msgstr "拡張フィルタ…"
 
 #. module: hr_evaluation
 #: constraint:hr.employee:0
 msgid "Error ! You cannot create recursive Hierarchy of Employees."
-msgstr ""
+msgstr "エラー：従業員の反復した階層構造を作ることはできません。"
 
 #. module: hr_evaluation
 #: model:ir.model,name:hr_evaluation.model_hr_evaluation_plan_phase
 msgid "Appraisal Plan Phase"
-msgstr ""
+msgstr "査定計画の段階"
 
 #. module: hr_evaluation
 #: selection:hr.evaluation.report,month:0
 msgid "January"
-msgstr ""
+msgstr "1月"
 
 #. module: hr_evaluation
 #: model:ir.actions.act_window,name:hr_evaluation.act_hr_employee_2_hr__evaluation_interview
 msgid "Appraisal Interviews"
-msgstr ""
+msgstr "査定の面接"
 
 #. module: hr_evaluation
 #: view:hr_evaluation.evaluation:0
 msgid "Date"
-msgstr ""
+msgstr "日付"
 
 #. module: hr_evaluation
 #: view:hr.evaluation.interview:0
 msgid "Survey"
-msgstr ""
+msgstr "調査"
 
 #. module: hr_evaluation
 #: help:hr_evaluation.evaluation,rating:0
 msgid "This is the appreciation on that summarize the evaluation"
-msgstr ""
+msgstr "これは評価を要約したことに対する感謝です。"
 
 #. module: hr_evaluation
 #: field:hr_evaluation.plan.phase,action:0
 msgid "Action"
-msgstr ""
+msgstr "活動"
 
 #. module: hr_evaluation
 #: view:hr.evaluation.report:0 selection:hr.evaluation.report,state:0
 msgid "Final Validation"
-msgstr ""
+msgstr "最終検証"
 
 #. module: hr_evaluation
 #: selection:hr_evaluation.evaluation,state:0
 msgid "Waiting Appreciation"
-msgstr ""
+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 ""
+msgstr "査定分析"
 
 #. module: hr_evaluation
 #: field:hr_evaluation.evaluation,date:0
 msgid "Appraisal Deadline"
-msgstr ""
+msgstr "査定の締切"
 
 #. module: hr_evaluation
 #: field:hr.evaluation.report,rating:0
 msgid "Overall Rating"
-msgstr ""
+msgstr "総合評価"
 
 #. module: hr_evaluation
 #: field:hr_evaluation.plan.phase,email_subject:0
 msgid "char"
-msgstr ""
+msgstr "文字"
 
 #. module: hr_evaluation
 #: view:hr.evaluation.interview:0 view:hr_evaluation.evaluation:0
 msgid "Interviewer"
-msgstr ""
+msgstr "面接者"
 
 #. module: hr_evaluation
 #: model:ir.model,name:hr_evaluation.model_hr_evaluation_report
 msgid "Evaluations Statistics"
-msgstr ""
+msgstr "評価統計"
 
 #. module: hr_evaluation
 #: view:hr.evaluation.interview:0
 msgid "Deadline Date"
-msgstr ""
+msgstr "締切日"
 
 #. module: hr_evaluation
 #: code:addons/hr_evaluation/wizard/mail_compose_message.py:45
@@ -658,11 +658,14 @@ msgid ""
 "\n"
 " Thanks,"
 msgstr ""
+"こんにちは %s さん\n"
+"\n"
+"%s さんの面接に対するあなたの返答を提出してください。"
 
 #. module: hr_evaluation
 #: selection:hr_evaluation.plan.phase,action:0
 msgid "Top-Down Appraisal Requests"
-msgstr ""
+msgstr "トップ・ダウン査定の予定"
 
 #. module: hr_evaluation
 #: model:ir.actions.act_window,help:hr_evaluation.action_evaluation_plans_installer
@@ -672,138 +675,140 @@ msgid ""
 "OpenERP can automatically generate interview requests to managers and/or "
 "subordinates."
 msgstr ""
+"査定計画を定義することができます（例えば、最初の面接は6ヶ月後、それ以降は毎年）。そうした後、従業員に査定計画を設定すると、その人のマネジャと同僚に面接予"
+"定が作成されます。"
 
 #. module: hr_evaluation
 #: view:hr_evaluation.plan.phase:0
 msgid "General"
-msgstr ""
+msgstr "一般"
 
 #. module: hr_evaluation
 #: help:hr_evaluation.plan.phase,send_answer_employee:0
 msgid "Send all answers to the employee"
-msgstr ""
+msgstr "全ての回答を従業員に送る。"
 
 #. module: hr_evaluation
 #: view:hr_evaluation.evaluation:0
 msgid "Appraisal Data"
-msgstr ""
+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 ""
+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 ""
+msgstr "査定計画"
 
 #. module: hr_evaluation
 #: model:ir.model,name:hr_evaluation.model_hr_evaluation_interview
 msgid "Appraisal Interview"
-msgstr ""
+msgstr "査定面接"
 
 #. module: hr_evaluation
 #: view:hr_evaluation.evaluation:0
 msgid "Cancel"
-msgstr ""
+msgstr "キャンセル"
 
 #. module: hr_evaluation
 #: code:addons/hr_evaluation/wizard/mail_compose_message.py:49
 #, python-format
 msgid "Reminder to fill up Survey"
-msgstr ""
+msgstr "調査票を記入を催促する。"
 
 #. module: hr_evaluation
 #: view:hr.evaluation.report:0
 msgid "In Progress"
-msgstr ""
+msgstr "進行中"
 
 #. module: hr_evaluation
 #: view:hr.evaluation.interview:0
 msgid "To Do"
-msgstr ""
+msgstr "実行予定"
 
 #. module: hr_evaluation
 #: view:hr.evaluation.report:0
 msgid "Final Validation Evaluations"
-msgstr ""
+msgstr "評価の最終検証"
 
 #. module: hr_evaluation
 #: field:hr_evaluation.plan.phase,mail_feature:0
 msgid "Send mail for this phase"
-msgstr ""
+msgstr "この文章でEメールを送る。"
 
 #. module: hr_evaluation
 #: view:hr.evaluation.interview:0 view:hr_evaluation.evaluation:0
 msgid "Late"
-msgstr ""
+msgstr "遅れ"
 
 #. module: hr_evaluation
 #: selection:hr.evaluation.report,month:0
 msgid "October"
-msgstr ""
+msgstr "10月"
 
 #. 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 ""
+msgstr "次の査定日は、査定計画の日付によって計算されます（最初の査定日＋査定周期）"
 
 #. module: hr_evaluation
 #: field:hr.evaluation.report,overpass_delay:0
 msgid "Overpassed Deadline"
-msgstr ""
+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 ""
+msgstr "月数は、査定計画の周期の間での遅れを表します（最初の査定以降）。"
 
 #. module: hr_evaluation
 #: field:hr_evaluation.plan,month_next:0
 msgid "Periodicity of Appraisal (months)"
-msgstr ""
+msgstr "査定の周期（月）"
 
 #. module: hr_evaluation
 #: selection:hr_evaluation.plan.phase,action:0
 msgid "Self Appraisal Requests"
-msgstr ""
+msgstr "自己査定の予定"
 
 #. module: hr_evaluation
 #: field:hr_evaluation.evaluation,survey_request_ids:0
 msgid "Appraisal Forms"
-msgstr ""
+msgstr "査定票"
 
 #. module: hr_evaluation
 #: selection:hr.evaluation.report,month:0
 msgid "May"
-msgstr ""
+msgstr "5月"
 
 #. module: hr_evaluation
 #: view:hr_evaluation.evaluation:0
 msgid "Internal Notes"
-msgstr ""
+msgstr "内部注記"
 
 #. module: hr_evaluation
 #: selection:hr_evaluation.plan.phase,action:0
 msgid "Final Interview"
-msgstr ""
+msgstr "最終面接"
 
 #. module: hr_evaluation
 #: field:hr_evaluation.plan.phase,name:0
 msgid "Phase"
-msgstr ""
+msgstr "段階"
 
 #. module: hr_evaluation
 #: selection:hr_evaluation.plan.phase,action:0
 msgid "Bottom-Up Appraisal Requests"
-msgstr ""
+msgstr "ボトム・アップ査定予定"
 
 #. module: hr_evaluation
 #: code:addons/hr_evaluation/hr_evaluation.py:244
@@ -811,68 +816,68 @@ msgstr ""
 msgid ""
 "You cannot change state, because some appraisal in waiting answer or draft "
 "state"
-msgstr ""
+msgstr "回答待ちあるいは草案状態の査定があるので、状態を変更することはできません。"
 
 #. module: hr_evaluation
 #: selection:hr.evaluation.report,month:0
 msgid "February"
-msgstr ""
+msgstr "2月"
 
 #. module: hr_evaluation
 #: view:hr.evaluation.interview:0 view:hr_evaluation.evaluation:0
 msgid "Interview Appraisal"
-msgstr ""
+msgstr "面接査定"
 
 #. module: hr_evaluation
 #: field:survey.request,is_evaluation:0
 msgid "Is Appraisal?"
-msgstr ""
+msgstr "査定ですか？"
 
 #. module: hr_evaluation
 #: code:addons/hr_evaluation/hr_evaluation.py:317
 #, python-format
 msgid "You cannot start evaluation without Appraisal."
-msgstr ""
+msgstr "査定なしでは評価を開始できません。"
 
 #. module: hr_evaluation
 #: view:hr.evaluation.report:0
 msgid "Evaluation done in current month"
-msgstr ""
+msgstr "評価は今月、終了"
 
 #. module: hr_evaluation
 #: field:hr.evaluation.interview,user_to_review_id:0
 msgid "Employee to Interview"
-msgstr ""
+msgstr "面接する従業員"
 
 #. module: hr_evaluation
 #: selection:hr.evaluation.report,month:0
 msgid "April"
-msgstr ""
+msgstr "4月"
 
 #. module: hr_evaluation
 #: view:hr_evaluation.plan.phase:0
 msgid "Appraisal Plan Phases"
-msgstr ""
+msgstr "査定計画の段階"
 
 #. module: hr_evaluation
 #: view:hr_evaluation.evaluation:0
 msgid "Validate Appraisal"
-msgstr ""
+msgstr "査定を検証する。"
 
 #. module: hr_evaluation
 #: view:hr.evaluation.interview:0 view:hr_evaluation.evaluation:0
 msgid "Search Appraisal"
-msgstr ""
+msgstr "査定を検索する。"
 
 #. module: hr_evaluation
 #: field:hr_evaluation.plan.phase,sequence:0
 msgid "Sequence"
-msgstr ""
+msgstr "順序"
 
 #. module: hr_evaluation
 #: view:hr_evaluation.plan.phase:0
 msgid "(user_signature)s: User name"
-msgstr ""
+msgstr "(user_signature)s：ユーザ名"
 
 #. module: hr_evaluation
 #: view:board.board:0
@@ -880,24 +885,24 @@ msgstr ""
 #: 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 ""
+msgstr "面接予定"
 
 #. module: hr_evaluation
 #: field:hr.evaluation.report,create_date:0
 msgid "Create Date"
-msgstr ""
+msgstr "作成日"
 
 #. module: hr_evaluation
 #: view:hr.evaluation.report:0 field:hr.evaluation.report,year:0
 msgid "Year"
-msgstr ""
+msgstr "年"
 
 #. module: hr_evaluation
 #: field:hr_evaluation.evaluation,note_summary:0
 msgid "Appraisal Summary"
-msgstr ""
+msgstr "査定要約"
 
 #. module: hr_evaluation
 #: field:hr.employee,evaluation_date:0
 msgid "Next Appraisal Date"
-msgstr ""
+msgstr "次の査定日"
diff --git a/addons/hr_expense/i18n/ja.po b/addons/hr_expense/i18n/ja.po
new file mode 100644
index 00000000000..d7a69b2a02c
--- /dev/null
+++ b/addons/hr_expense/i18n/ja.po
@@ -0,0 +1,876 @@
+# 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 21: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-20 04:43+0000\n"
+"X-Generator: Launchpad (build 15120)\n"
+
+#. module: hr_expense
+#: model:process.node,name:hr_expense.process_node_confirmedexpenses0
+msgid "Confirmed Expenses"
+msgstr ""
+
+#. module: hr_expense
+#: model:ir.model,name:hr_expense.model_hr_expense_line
+msgid "Expense Line"
+msgstr "経費明細"
+
+#. module: hr_expense
+#: model:process.node,note:hr_expense.process_node_reimbursement0
+msgid "The accoutant reimburse the expenses"
+msgstr "会計担当が経費を精算する。"
+
+#. module: hr_expense
+#: field:hr.expense.expense,date_confirm:0
+#: field:hr.expense.report,date_confirm:0
+msgid "Confirmation Date"
+msgstr "確認日"
+
+#. module: hr_expense
+#: view:hr.expense.expense:0 view:hr.expense.report:0
+msgid "Group By..."
+msgstr "グループ化…"
+
+#. module: hr_expense
+#: model:product.template,name:hr_expense.air_ticket_product_template
+msgid "Air Ticket"
+msgstr "航空券"
+
+#. module: hr_expense
+#: report:hr.expense:0
+msgid "Validated By"
+msgstr "検証済み"
+
+#. module: hr_expense
+#: view:hr.expense.expense:0 field:hr.expense.expense,department_id:0
+#: view:hr.expense.report:0 field:hr.expense.report,department_id:0
+msgid "Department"
+msgstr "部門"
+
+#. module: hr_expense
+#: view:hr.expense.expense:0
+msgid "New Expense"
+msgstr "新規経費"
+
+#. module: hr_expense
+#: selection:hr.expense.report,month:0
+msgid "March"
+msgstr "3月"
+
+#. module: hr_expense
+#: field:hr.expense.report,invoiced:0
+msgid "# of Invoiced Lines"
+msgstr "請求の行数"
+
+#. module: hr_expense
+#: field:hr.expense.expense,company_id:0 view:hr.expense.report:0
+#: field:hr.expense.report,company_id:0
+msgid "Company"
+msgstr "会社"
+
+#. module: hr_expense
+#: view:hr.expense.expense:0
+msgid "Set to Draft"
+msgstr "草稿に設定"
+
+#. module: hr_expense
+#: view:hr.expense.expense:0
+msgid "To Pay"
+msgstr "支払い"
+
+#. module: hr_expense
+#: model:ir.model,name:hr_expense.model_hr_expense_report
+msgid "Expenses Statistics"
+msgstr "経費統計"
+
+#. module: hr_expense
+#: view:hr.expense.report:0 field:hr.expense.report,day:0
+msgid "Day"
+msgstr "日"
+
+#. module: hr_expense
+#: field:hr.expense.line,uom_id:0 view:product.product:0
+msgid "UoM"
+msgstr "測定単位"
+
+#. module: hr_expense
+#: help:hr.expense.expense,date_valid:0
+msgid ""
+"Date of the acceptation of the sheet expense. It's filled when the button "
+"Accept is pressed."
+msgstr "経費の承認日。承認ボタンを押すと設定されます。"
+
+#. module: hr_expense
+#: view:hr.expense.report:0
+msgid "Expenses during current month"
+msgstr "今月の経費"
+
+#. module: hr_expense
+#: view:hr.expense.expense:0
+msgid "Notes"
+msgstr "注記"
+
+#. module: hr_expense
+#: field:hr.expense.expense,invoice_id:0
+msgid "Employee's Invoice"
+msgstr "従業員の請求書"
+
+#. module: hr_expense
+#: view:product.product:0
+msgid "Products"
+msgstr "プロダクト"
+
+#. module: hr_expense
+#: view:hr.expense.report:0
+msgid "Confirm Expenses"
+msgstr "経費を確認する。"
+
+#. module: hr_expense
+#: selection:hr.expense.report,state:0
+msgid "Cancelled"
+msgstr "キャンセルされました"
+
+#. module: hr_expense
+#: model:process.node,note:hr_expense.process_node_refused0
+msgid "The direct manager refuses the sheet.Reset as draft."
+msgstr "直属のマネジャがこの帳票を拒否しましたので、草案として再設定しました。"
+
+#. module: hr_expense
+#: view:hr.expense.expense:0
+msgid "Validation"
+msgstr "検証"
+
+#. module: hr_expense
+#: selection:hr.expense.report,state:0
+msgid "Waiting confirmation"
+msgstr "確認待ち"
+
+#. module: hr_expense
+#: selection:hr.expense.report,state:0
+msgid "Accepted"
+msgstr "受理済み"
+
+#. module: hr_expense
+#: report:hr.expense:0 field:hr.expense.expense,ref:0
+#: field:hr.expense.line,ref:0
+msgid "Reference"
+msgstr "参照"
+
+#. module: hr_expense
+#: report:hr.expense:0
+msgid "Certified honest and conform,"
+msgstr "正しいと認定済み"
+
+#. module: hr_expense
+#: help:hr.expense.expense,date_confirm:0
+msgid ""
+"Date of the confirmation of the sheet expense. It's filled when the button "
+"Confirm is pressed."
+msgstr "経費票の確認日。確認ボタンが押されると設定されます。"
+
+#. module: hr_expense
+#: view:hr.expense.report:0 field:hr.expense.report,nbr:0
+msgid "# of Lines"
+msgstr "行数"
+
+#. module: hr_expense
+#: model:process.transition,name:hr_expense.process_transition_refuseexpense0
+msgid "Refuse expense"
+msgstr "経費を拒否"
+
+#. module: hr_expense
+#: field:hr.expense.report,price_average:0
+msgid "Average Price"
+msgstr "平均価格"
+
+#. module: hr_expense
+#: view:hr.expense.report:0
+msgid "Total Invoiced Lines"
+msgstr "請求書の合計行"
+
+#. module: hr_expense
+#: view:hr.expense.expense:0
+#: model:process.transition.action,name:hr_expense.process_transition_action_confirm0
+msgid "Confirm"
+msgstr "確認"
+
+#. module: hr_expense
+#: model:process.node,note:hr_expense.process_node_supplierinvoice0
+msgid "The accoutant validates the sheet"
+msgstr "会計担当が帳票を検証します。"
+
+#. module: hr_expense
+#: code:addons/hr_expense/hr_expense.py:187
+#, python-format
+msgid "The employee's home address must have a partner linked."
+msgstr "従業員の自宅住所は、パートナと連携していなければいなりません。"
+
+#. module: hr_expense
+#: field:hr.expense.report,delay_valid:0
+msgid "Delay to Valid"
+msgstr "有効日までの遅れ"
+
+#. module: hr_expense
+#: help:hr.expense.line,sequence:0
+msgid "Gives the sequence order when displaying a list of expense lines."
+msgstr "経費行のリストを表示する際には、銃所番号を指定して下さい。"
+
+#. module: hr_expense
+#: field:hr.expense.line,analytic_account:0 view:hr.expense.report:0
+#: field:hr.expense.report,analytic_account:0
+msgid "Analytic account"
+msgstr "分析アカウント"
+
+#. module: hr_expense
+#: field:hr.expense.report,date:0
+msgid "Date "
+msgstr "日付 "
+
+#. module: hr_expense
+#: field:hr.expense.expense,state:0 view:hr.expense.report:0
+#: field:hr.expense.report,state:0
+msgid "State"
+msgstr "状態"
+
+#. module: hr_expense
+#: code:addons/hr_expense/hr_expense.py:173
+#, python-format
+msgid ""
+"Please configure Default Expense account for Product purchase, "
+"`property_account_expense_categ`"
+msgstr "製品 `property_account_expense_categ` を購入するのためのデフォルトの経費科目を設定して下さい。"
+
+#. module: hr_expense
+#: view:hr.expense.report:0
+msgid "Expenses during last month"
+msgstr "先月の経費"
+
+#. module: hr_expense
+#: report:hr.expense:0 view:hr.expense.expense:0
+#: field:hr.expense.expense,employee_id:0 view:hr.expense.report:0
+msgid "Employee"
+msgstr "従業員"
+
+#. module: hr_expense
+#: view:hr.expense.expense:0 selection:hr.expense.expense,state:0
+msgid "New"
+msgstr "新規"
+
+#. module: hr_expense
+#: view:hr.expense.expense:0
+msgid "Confirmed Expense"
+msgstr "確認済み経費"
+
+#. module: hr_expense
+#: report:hr.expense:0 field:hr.expense.report,product_qty:0
+msgid "Qty"
+msgstr "数量"
+
+#. module: hr_expense
+#: view:hr.expense.report:0 field:hr.expense.report,price_total:0
+msgid "Total Price"
+msgstr "合計価格"
+
+#. module: hr_expense
+#: model:process.node,note:hr_expense.process_node_reinvoicing0
+msgid "Some costs may be reinvoices to the customer"
+msgstr "顧客にはある程度の経費を追加請求することになるでしょう。"
+
+#. module: hr_expense
+#: code:addons/hr_expense/hr_expense.py:173
+#: code:addons/hr_expense/hr_expense.py:185
+#: code:addons/hr_expense/hr_expense.py:187
+#, python-format
+msgid "Error !"
+msgstr "エラー"
+
+#. module: hr_expense
+#: view:board.board:0
+#: model:ir.actions.act_window,name:hr_expense.action_my_expense
+msgid "My Expenses"
+msgstr "私の経費"
+
+#. module: hr_expense
+#: view:hr.expense.report:0
+msgid "Creation Date"
+msgstr "作成日"
+
+#. module: hr_expense
+#: model:ir.actions.report.xml,name:hr_expense.hr_expenses
+msgid "HR expenses"
+msgstr "人材経費"
+
+#. module: hr_expense
+#: field:hr.expense.expense,id:0
+msgid "Sheet ID"
+msgstr "帳票ID"
+
+#. module: hr_expense
+#: model:process.transition,name:hr_expense.process_transition_reimburseexpense0
+msgid "Reimburse expense"
+msgstr "経費の精算"
+
+#. module: hr_expense
+#: field:hr.expense.expense,journal_id:0 field:hr.expense.report,journal_id:0
+msgid "Force Journal"
+msgstr "記録を要請する。"
+
+#. module: hr_expense
+#: view:hr.expense.report:0 field:hr.expense.report,no_of_products:0
+msgid "# of Products"
+msgstr "プロダクトの数"
+
+#. module: hr_expense
+#: selection:hr.expense.report,month:0
+msgid "July"
+msgstr "7月"
+
+#. module: hr_expense
+#: model:process.transition,note:hr_expense.process_transition_reimburseexpense0
+msgid "After creating invoice, reimburse expenses"
+msgstr "請求書を作成後、経費を精算する。"
+
+#. module: hr_expense
+#: model:process.node,name:hr_expense.process_node_reimbursement0
+msgid "Reimbursement"
+msgstr "精算"
+
+#. module: hr_expense
+#: view:hr.expense.report:0
+msgid "    Month-1    "
+msgstr "    月-1    "
+
+#. module: hr_expense
+#: field:hr.expense.expense,date_valid:0 field:hr.expense.report,date_valid:0
+msgid "Validation Date"
+msgstr "検証日"
+
+#. module: hr_expense
+#: view:hr.expense.expense:0
+msgid "My Department"
+msgstr "私の部門"
+
+#. module: hr_expense
+#: view:hr.expense.report:0
+#: model:ir.actions.act_window,name:hr_expense.action_hr_expense_report_all
+#: model:ir.ui.menu,name:hr_expense.menu_hr_expense_report_all
+msgid "Expenses Analysis"
+msgstr "経費分析"
+
+#. module: hr_expense
+#: view:hr.expense.expense:0 field:hr.expense.line,expense_id:0
+#: model:ir.model,name:hr_expense.model_hr_expense_expense
+#: model:process.process,name:hr_expense.process_process_expenseprocess0
+msgid "Expense"
+msgstr "経費"
+
+#. module: hr_expense
+#: view:hr.expense.expense:0 field:hr.expense.expense,line_ids:0
+#: view:hr.expense.line:0
+msgid "Expense Lines"
+msgstr "経費の行"
+
+#. module: hr_expense
+#: field:hr.expense.report,delay_confirm:0
+msgid "Delay to Confirm"
+msgstr "確認の遅れ"
+
+#. module: hr_expense
+#: selection:hr.expense.report,month:0
+msgid "September"
+msgstr "9月"
+
+#. module: hr_expense
+#: selection:hr.expense.report,month:0
+msgid "December"
+msgstr "12月"
+
+#. module: hr_expense
+#: view:hr.expense.report:0
+msgid "Invoiced Expenses"
+msgstr "請求済み経費"
+
+#. module: hr_expense
+#: view:hr.expense.expense:0 view:hr.expense.report:0
+#: field:hr.expense.report,month:0
+msgid "Month"
+msgstr "月"
+
+#. module: hr_expense
+#: field:hr.expense.expense,currency_id:0
+#: field:hr.expense.report,currency_id:0
+msgid "Currency"
+msgstr "通貨"
+
+#. module: hr_expense
+#: selection:hr.expense.expense,state:0
+msgid "Waiting Approval"
+msgstr "承認待ち"
+
+#. module: hr_expense
+#: model:process.node,note:hr_expense.process_node_draftexpenses0
+msgid "Employee encode all his expenses"
+msgstr "従業員は自分の経費を記録する。"
+
+#. module: hr_expense
+#: selection:hr.expense.expense,state:0 view:hr.expense.report:0
+#: selection:hr.expense.report,state:0
+msgid "Invoiced"
+msgstr "請求済み"
+
+#. module: hr_expense
+#: field:product.product,hr_expense_ok:0
+msgid "Can Constitute an Expense"
+msgstr "経費を申請できる。"
+
+#. module: hr_expense
+#: selection:hr.expense.expense,state:0 selection:hr.expense.report,state:0
+msgid "Reimbursed"
+msgstr "精算済み"
+
+#. module: hr_expense
+#: field:hr.expense.expense,note:0
+msgid "Note"
+msgstr "注記"
+
+#. module: hr_expense
+#: model:process.transition,note:hr_expense.process_transition_reimbursereinvoice0
+msgid "Create Customer invoice"
+msgstr "顧客への請求書を作成する。"
+
+#. module: hr_expense
+#: selection:hr.expense.report,state:0
+msgid "Draft"
+msgstr "草案"
+
+#. module: hr_expense
+#: view:hr.expense.expense:0
+msgid "Accounting data"
+msgstr "会計データ"
+
+#. module: hr_expense
+#: model:process.transition,note:hr_expense.process_transition_approveexpense0
+msgid "Expense is approved."
+msgstr "経費は承認されました。"
+
+#. module: hr_expense
+#: selection:hr.expense.report,month:0
+msgid "August"
+msgstr "8月"
+
+#. module: hr_expense
+#: model:process.node,note:hr_expense.process_node_approved0
+msgid "The direct manager approves the sheet"
+msgstr "直属マネジャが帳票を承認します。"
+
+#. module: hr_expense
+#: field:hr.expense.expense,amount:0
+msgid "Total Amount"
+msgstr "合計金額"
+
+#. module: hr_expense
+#: selection:hr.expense.report,month:0
+msgid "June"
+msgstr "6月"
+
+#. module: hr_expense
+#: model:process.node,name:hr_expense.process_node_draftexpenses0
+msgid "Draft Expenses"
+msgstr "経費の草案"
+
+#. module: hr_expense
+#: view:hr.expense.expense:0
+msgid "Customer Project"
+msgstr "顧客のプロジェクト"
+
+#. module: hr_expense
+#: model:ir.actions.act_window,name:hr_expense.product_normal_form_view_installer
+msgid "Review Your Expenses Products"
+msgstr "あなたが出費したプロダクトを見直す。"
+
+#. module: hr_expense
+#: report:hr.expense:0 field:hr.expense.expense,date:0
+#: field:hr.expense.line,date_value:0
+msgid "Date"
+msgstr "日付"
+
+#. module: hr_expense
+#: selection:hr.expense.report,month:0
+msgid "November"
+msgstr "11月"
+
+#. module: hr_expense
+#: view:hr.expense.report:0
+msgid "Extended Filters..."
+msgstr "拡張フィルタ…"
+
+#. module: hr_expense
+#: view:hr.expense.expense:0 field:hr.expense.expense,user_id:0
+msgid "User"
+msgstr "ユーザ"
+
+#. module: hr_expense
+#: code:addons/hr_expense/hr_expense.py:185
+#, python-format
+msgid "The employee must have a Home address."
+msgstr "従業員には自宅住所を指定しなければいけません。"
+
+#. module: hr_expense
+#: selection:hr.expense.report,month:0
+msgid "October"
+msgstr "10月"
+
+#. module: hr_expense
+#: report:hr.expense:0
+msgid "Total:"
+msgstr "合計:"
+
+#. module: hr_expense
+#: selection:hr.expense.report,month:0
+msgid "January"
+msgstr "1月"
+
+#. module: hr_expense
+#: report:hr.expense:0
+msgid "HR Expenses"
+msgstr "人材経費"
+
+#. module: hr_expense
+#: model:product.template,name:hr_expense.car_travel_product_template
+msgid "Car Travel Expenses"
+msgstr "交通費"
+
+#. module: hr_expense
+#: view:hr.expense.expense:0
+msgid "Submit to Manager"
+msgstr "マネジャに提出する。"
+
+#. module: hr_expense
+#: model:process.node,note:hr_expense.process_node_confirmedexpenses0
+msgid "The employee validates his expense sheet"
+msgstr "従業員が自分の経費を検証する。"
+
+#. module: hr_expense
+#: view:hr.expense.expense:0
+msgid "Expenses to Invoice"
+msgstr "請求する経費"
+
+#. module: hr_expense
+#: model:process.node,name:hr_expense.process_node_supplierinvoice0
+#: model:process.transition,name:hr_expense.process_transition_approveinvoice0
+msgid "Supplier Invoice"
+msgstr "仕入先の請求書"
+
+#. module: hr_expense
+#: view:hr.expense.expense:0
+msgid "Expenses Sheet"
+msgstr "経費票"
+
+#. module: hr_expense
+#: view:hr.expense.report:0
+msgid "Waiting"
+msgstr "待ち"
+
+#. module: hr_expense
+#: view:hr.expense.report:0
+msgid "Approved Expenses"
+msgstr "承認済み経費"
+
+#. module: hr_expense
+#: report:hr.expense:0 field:hr.expense.line,unit_amount:0
+msgid "Unit Price"
+msgstr "単価"
+
+#. module: hr_expense
+#: view:hr.expense.expense:0
+msgid "References"
+msgstr "参照"
+
+#. module: hr_expense
+#: view:hr.expense.expense:0 field:hr.expense.report,invoice_id:0
+#: model:process.transition.action,name:hr_expense.process_transition_action_supplierinvoice0
+msgid "Invoice"
+msgstr "請求書"
+
+#. module: hr_expense
+#: model:process.transition,name:hr_expense.process_transition_reimbursereinvoice0
+msgid "Reinvoice"
+msgstr "再請求"
+
+#. module: hr_expense
+#: view:board.board:0
+#: model:ir.actions.act_window,name:hr_expense.action_employee_expense
+msgid "All Employee Expenses"
+msgstr "従業員の総経費"
+
+#. module: hr_expense
+#: view:hr.expense.expense:0
+msgid "Other Info"
+msgstr "他の情報"
+
+#. module: hr_expense
+#: help:hr.expense.expense,journal_id:0
+msgid "The journal used when the expense is invoiced"
+msgstr "経費を請求する際には、明細記録が使われます。"
+
+#. module: hr_expense
+#: view:hr.expense.expense:0
+#: model:process.transition.action,name:hr_expense.process_transition_action_refuse0
+msgid "Refuse"
+msgstr "拒否"
+
+#. module: hr_expense
+#: model:process.transition,name:hr_expense.process_transition_confirmexpense0
+msgid "Confirm expense"
+msgstr "経費を確認する。"
+
+#. module: hr_expense
+#: model:process.transition,name:hr_expense.process_transition_approveexpense0
+msgid "Approve expense"
+msgstr "経費を承認する。"
+
+#. module: hr_expense
+#: model:process.transition.action,name:hr_expense.process_transition_action_accept0
+msgid "Accept"
+msgstr "受理する。"
+
+#. module: hr_expense
+#: report:hr.expense:0
+msgid "This document must be dated and signed for reimbursement"
+msgstr "精算するには、この帳票に日付と署名が必要です。"
+
+#. module: hr_expense
+#: model:process.transition,note:hr_expense.process_transition_refuseexpense0
+msgid "Expense is refused."
+msgstr "経費は拒否されました。"
+
+#. module: hr_expense
+#: model:ir.actions.act_window,help:hr_expense.product_normal_form_view_installer
+msgid ""
+"Define one product for each expense type allowed for an employee (travel by "
+"car, hostel, restaurant, etc). If you reimburse the employees at a fixed "
+"rate, set a cost and a unit of measure on the product. If you reimburse "
+"based on real costs, set the cost at 0.00. The user will set the real price "
+"when recording his expense sheet."
+msgstr ""
+"従業員が使う経費タイプごとに１つのプロダクトを定義して下さい（交通費，ホテル代、食費など）。精算方式が、固定精算の場合には、金額とそのプロダクトの単位を設"
+"定して下さい。実費精算の場合には，経費を 0 に設定します。ユーザは経費を記録するときに実金額を入力することになります。"
+
+#. module: hr_expense
+#: selection:hr.expense.expense,state:0 view:hr.expense.report:0
+#: model:process.node,name:hr_expense.process_node_approved0
+msgid "Approved"
+msgstr "承認済み"
+
+#. module: hr_expense
+#: code:addons/hr_expense/hr_expense.py:141
+#, python-format
+msgid "Supplier Invoices"
+msgstr "仕入先への請求"
+
+#. module: hr_expense
+#: field:hr.expense.line,product_id:0 view:hr.expense.report:0
+#: field:hr.expense.report,product_id:0
+#: model:ir.model,name:hr_expense.model_product_product
+msgid "Product"
+msgstr "プロダクト"
+
+#. module: hr_expense
+#: view:hr.expense.expense:0
+msgid "Expenses of My Department"
+msgstr "私の部門の経費"
+
+#. module: hr_expense
+#: view:hr.expense.expense:0 field:hr.expense.expense,name:0
+#: field:hr.expense.line,description:0
+msgid "Description"
+msgstr "詳細"
+
+#. module: hr_expense
+#: selection:hr.expense.report,month:0
+msgid "May"
+msgstr "5月"
+
+#. module: hr_expense
+#: field:hr.expense.line,unit_quantity:0
+msgid "Quantities"
+msgstr "数量"
+
+#. module: hr_expense
+#: report:hr.expense:0
+msgid "Price"
+msgstr "価格"
+
+#. module: hr_expense
+#: field:hr.expense.report,no_of_account:0
+msgid "# of Accounts"
+msgstr "アカウントの数"
+
+#. module: hr_expense
+#: selection:hr.expense.expense,state:0
+#: model:process.node,name:hr_expense.process_node_refused0
+msgid "Refused"
+msgstr "拒否"
+
+#. module: hr_expense
+#: report:hr.expense:0
+msgid "Ref."
+msgstr "参照"
+
+#. module: hr_expense
+#: field:hr.expense.report,employee_id:0
+msgid "Employee's Name"
+msgstr "従業員名"
+
+#. module: hr_expense
+#: model:ir.actions.act_window,help:hr_expense.expense_all
+msgid ""
+"The OpenERP expenses management module allows you to track the full flow. "
+"Every month, the employees record their expenses. At the end of the month, "
+"their managers validates the expenses sheets which creates costs on "
+"projects/analytic accounts. The accountant validates the proposed entries "
+"and the employee can be reimbursed. You can also reinvoice the customer at "
+"the end of the flow."
+msgstr ""
+"経費管理モジュールは、処理の全体の流れを管理します。従業員は月ごとに経費を記録します。そのマネジャが月末にプロジェクト/分析アカウントごとの経費票を検証し"
+"、会計担当が記入項目を検証して、従業員へ精算されます。この処理の最後で、顧客に再請求することができます。"
+
+#. module: hr_expense
+#: view:hr.expense.expense:0
+msgid "This Month"
+msgstr "今月"
+
+#. module: hr_expense
+#: field:hr.expense.expense,user_valid:0 view:hr.expense.report:0
+#: field:hr.expense.report,user_id:0
+msgid "Validation User"
+msgstr "検証ユーザ"
+
+#. module: hr_expense
+#: report:hr.expense:0
+msgid "(Date and signature)"
+msgstr "（日付と署名）"
+
+#. module: hr_expense
+#: selection:hr.expense.report,month:0
+msgid "February"
+msgstr "2月"
+
+#. module: hr_expense
+#: report:hr.expense:0
+msgid "Name"
+msgstr "氏名"
+
+#. module: hr_expense
+#: field:hr.expense.expense,account_move_id:0
+msgid "Ledger Posting"
+msgstr "台帳を掲示"
+
+#. module: hr_expense
+#: model:process.transition,note:hr_expense.process_transition_approveinvoice0
+msgid "Creates supplier invoice."
+msgstr "仕入先請求書を作成する。"
+
+#. module: hr_expense
+#: model:product.template,name:hr_expense.hotel_rent_product_template
+msgid "Hotel Accommodation"
+msgstr "ホテル宿泊"
+
+#. module: hr_expense
+#: selection:hr.expense.report,month:0
+msgid "April"
+msgstr "4月"
+
+#. module: hr_expense
+#: field:hr.expense.line,name:0
+msgid "Expense Note"
+msgstr "経費の注記"
+
+#. module: hr_expense
+#: help:hr.expense.expense,state:0
+msgid ""
+"When the expense request is created the state is 'Draft'.\n"
+" It is confirmed by the user and request is sent to admin, the state is "
+"'Waiting Confirmation'.            \n"
+"If the admin accepts it, the state is 'Accepted'.\n"
+" If an invoice is made for the expense request, the state is 'Invoiced'.\n"
+" If the expense is paid to user, the state is 'Reimbursed'."
+msgstr ""
+"経費要求を作成すると，それは草案状態に設定されます。\n"
+"　ユーザがそれを確認すると、アドミンに送られて確認の「待ち」状態になります。　　　　\n"
+"アドミンがそれを受理すると、「受理」になります。\n"
+"　この経費に関連して請求書が作成されると，「請求済み」になります。\n"
+"　経費がユーザに精算されると、「精算済み」になります。"
+
+#. module: hr_expense
+#: view:hr.expense.expense:0
+msgid "Approve"
+msgstr "承認する。"
+
+#. module: hr_expense
+#: view:hr.expense.line:0 field:hr.expense.line,total_amount:0
+msgid "Total"
+msgstr "合計"
+
+#. module: hr_expense
+#: view:hr.expense.report:0
+msgid "Expenses during current year"
+msgstr "今年度の経費"
+
+#. module: hr_expense
+#: field:hr.expense.line,sequence:0
+msgid "Sequence"
+msgstr "順序"
+
+#. module: hr_expense
+#: model:process.transition,note:hr_expense.process_transition_confirmexpense0
+msgid "Expense is confirmed."
+msgstr "経費は確認されました。"
+
+#. module: hr_expense
+#: view:hr.expense.expense:0
+#: model:ir.actions.act_window,name:hr_expense.expense_all
+#: model:ir.ui.menu,name:hr_expense.menu_expense_all
+#: model:ir.ui.menu,name:hr_expense.next_id_49
+#: model:product.category,name:hr_expense.cat_expense
+msgid "Expenses"
+msgstr "経費"
+
+#. module: hr_expense
+#: constraint:product.product:0
+msgid "Error: Invalid ean code"
+msgstr "エラー：無効な欧州統一商品番号です。"
+
+#. module: hr_expense
+#: view:hr.expense.report:0 field:hr.expense.report,year:0
+msgid "Year"
+msgstr "年"
+
+#. module: hr_expense
+#: view:hr.expense.expense:0
+msgid "To Approve"
+msgstr "承認する。"
+
+#. module: hr_expense
+#: help:product.product,hr_expense_ok:0
+msgid ""
+"Determines if the product can be visible in the list of product within a "
+"selection from an HR expense sheet line."
+msgstr "人材経費票から選んだプロダクトリストにこのプロダクトがあるかを決めます。"
+
+#. module: hr_expense
+#: model:process.node,name:hr_expense.process_node_reinvoicing0
+msgid "Reinvoicing"
+msgstr "再請求"
diff --git a/addons/hr_holidays/i18n/ja.po b/addons/hr_holidays/i18n/ja.po
index 7f135b153c5..2877f7d9bb9 100644
--- a/addons/hr_holidays/i18n/ja.po
+++ b/addons/hr_holidays/i18n/ja.po
@@ -14,8 +14,8 @@ 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-19 04:38+0000\n"
-"X-Generator: Launchpad (build 15108)\n"
+"X-Launchpad-Export-Date: 2012-04-20 04:43+0000\n"
+"X-Generator: Launchpad (build 15120)\n"
 
 #. module: hr_holidays
 #: selection:hr.holidays.status,color_name:0
diff --git a/addons/sale_margin/i18n/ja.po b/addons/sale_margin/i18n/ja.po
new file mode 100644
index 00000000000..4bff99d2f5f
--- /dev/null
+++ b/addons/sale_margin/i18n/ja.po
@@ -0,0 +1,51 @@
+# 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:37+0000\n"
+"PO-Revision-Date: 2012-04-20 04:29+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-20 04:43+0000\n"
+"X-Generator: Launchpad (build 15120)\n"
+
+#. module: sale_margin
+#: sql_constraint:sale.order:0
+msgid "Order Reference must be unique per Company!"
+msgstr "発注参照は、会社ごとにユニークでなければなりません。"
+
+#. module: sale_margin
+#: field:sale.order.line,purchase_price:0
+msgid "Cost Price"
+msgstr "原価"
+
+#. module: sale_margin
+#: model:ir.model,name:sale_margin.model_sale_order
+msgid "Sales Order"
+msgstr "受注"
+
+#. module: sale_margin
+#: help:sale.order,margin:0
+msgid ""
+"It gives profitability by calculating the difference between the Unit Price "
+"and Cost Price."
+msgstr "価格と原価の差額を計算することにより利益性がわかります。"
+
+#. module: sale_margin
+#: field:sale.order,margin:0
+#: field:sale.order.line,margin:0
+msgid "Margin"
+msgstr "粗利益"
+
+#. module: sale_margin
+#: model:ir.model,name:sale_margin.model_sale_order_line
+msgid "Sales Order Line"
+msgstr "受注明細"

From 912c7b1c47b606e7074676f45d16b1c4f2327d5b Mon Sep 17 00:00:00 2001
From: niv-openerp <nicolas.vanhoren@openerp.com>
Date: Fri, 20 Apr 2012 11:20:07 +0200
Subject: [PATCH 231/238] [fix] some problems with the reference field

bzr revid: nicolas.vanhoren@openerp.com-20120420092007-mu3fk95ft21ztm78
---
 addons/web/static/src/js/view_form.js | 44 ++++++++++++++-------------
 1 file changed, 23 insertions(+), 21 deletions(-)

diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js
index c457554e44b..0e1777894f0 100644
--- a/addons/web/static/src/js/view_form.js
+++ b/addons/web/static/src/js/view_form.js
@@ -3471,23 +3471,6 @@ instance.web.form.FieldReference = instance.web.form.AbstractField.extend(_.exte
     template: 'FieldReference',
     init: function(field_manager, node) {
         this._super(field_manager, node);
-        this.fields_view = {
-            fields: {
-                selection: {
-                    selection: this.view.fields_view.fields[this.name].selection
-                },
-                m2o: {
-                    relation: null
-                }
-            }
-        };
-        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();
-        this.fields = {};
-        this.fields_order = [];
         this.reference_ready = true;
     },
     on_nop: function() {
@@ -3512,9 +3495,9 @@ instance.web.form.FieldReference = instance.web.form.AbstractField.extend(_.exte
     },
     initialize_content: function() {
         this.selection = new instance.web.form.FieldSelection(this, { attrs: {
-            name: 'selection',
-            widget: 'selection'
+            name: 'selection'
         }});
+        this.selection.view = this.view;
         this.selection.set({readonly: this.get('effective_readonly')});
         this.selection.on("change:value", this, this.on_selection_changed);
         this.selection.$element = $(".oe_form_view_reference_selection", this.$element);
@@ -3522,9 +3505,9 @@ instance.web.form.FieldReference = instance.web.form.AbstractField.extend(_.exte
         this.selection.start();
 
         this.m2o = new instance.web.form.FieldMany2One(this, { attrs: {
-            name: 'm2o',
-            widget: 'many2one'
+            name: 'm2o'
         }});
+        this.m2o.view = this.view;
         this.m2o.set({"readonly": this.get("effective_readonly")});
         this.m2o.on("change:value", this, this.data_changed);
         this.m2o.$element = $(".oe_form_view_reference_m2o", this.$element);
@@ -3538,6 +3521,11 @@ instance.web.form.FieldReference = instance.web.form.AbstractField.extend(_.exte
         this._super(value_);
         this.render_value();
     },
+    get_value: function() {
+        var tmp = this._super();
+        debugger;
+        return tmp;
+    },
     render_value: function() {
         this.reference_ready = false;
         var vals = [], sel_val, m2o_val;
@@ -3563,6 +3551,20 @@ instance.web.form.FieldReference = instance.web.form.AbstractField.extend(_.exte
             this.set({'value': false});
         }
     },
+    get_field: function(name) {
+        if (name === "selection") {
+            return {
+                selection: this.view.fields_view.fields[this.name].selection,
+                type: "selection",
+            };
+        } else if (name === "m2o") {
+            return {
+                relation: null,
+                type: "many2one",
+            };
+        }
+        throw Exception("Should not happen");
+    },
 }));
 
 instance.web.form.FieldBinary = instance.web.form.AbstractField.extend(_.extend({}, instance.web.form.ReinitializeFieldMixin, {

From b8deee7a566d63d760d58b91fd73ceb7d96fc9d7 Mon Sep 17 00:00:00 2001
From: niv-openerp <nicolas.vanhoren@openerp.com>
Date: Fri, 20 Apr 2012 11:40:34 +0200
Subject: [PATCH 232/238] [fix] some other bug in references in read only mode

bzr revid: nicolas.vanhoren@openerp.com-20120420094034-izgqix5kxh54sm45
---
 addons/web/static/src/js/view_form.js | 12 +++---------
 addons/web/static/src/xml/base.xml    | 21 ++++++++-------------
 2 files changed, 11 insertions(+), 22 deletions(-)

diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js
index 0e1777894f0..fbbd5149470 100644
--- a/addons/web/static/src/js/view_form.js
+++ b/addons/web/static/src/js/view_form.js
@@ -3498,7 +3498,7 @@ instance.web.form.FieldReference = instance.web.form.AbstractField.extend(_.exte
             name: 'selection'
         }});
         this.selection.view = this.view;
-        this.selection.set({readonly: this.get('effective_readonly')});
+        this.selection.set({force_readonly: this.get('effective_readonly')});
         this.selection.on("change:value", this, this.on_selection_changed);
         this.selection.$element = $(".oe_form_view_reference_selection", this.$element);
         this.selection.renderElement();
@@ -3508,7 +3508,7 @@ instance.web.form.FieldReference = instance.web.form.AbstractField.extend(_.exte
             name: 'm2o'
         }});
         this.m2o.view = this.view;
-        this.m2o.set({"readonly": this.get("effective_readonly")});
+        this.m2o.set({force_readonly: this.get("effective_readonly")});
         this.m2o.on("change:value", this, this.data_changed);
         this.m2o.$element = $(".oe_form_view_reference_m2o", this.$element);
         this.m2o.renderElement();
@@ -3521,11 +3521,6 @@ instance.web.form.FieldReference = instance.web.form.AbstractField.extend(_.exte
         this._super(value_);
         this.render_value();
     },
-    get_value: function() {
-        var tmp = this._super();
-        debugger;
-        return tmp;
-    },
     render_value: function() {
         this.reference_ready = false;
         var vals = [], sel_val, m2o_val;
@@ -3533,13 +3528,12 @@ instance.web.form.FieldReference = instance.web.form.AbstractField.extend(_.exte
             vals = this.get('value').split(',');
         }
         sel_val = vals[0] || false;
-        m2o_val = vals[1] ? parseInt(vals[1], 10) : false;
+        m2o_val = vals[1] ? parseInt(vals[1], 10) : vals[1];
         if (!this.get("effective_readonly")) {
             this.selection.set_value(sel_val);
         }
         this.m2o.field.relation = sel_val;
         this.m2o.set_value(m2o_val);
-        this.m2o.$element.toggle(sel_val !== false);
         this.reference_ready = true;
     },
     data_changed: function() {
diff --git a/addons/web/static/src/xml/base.xml b/addons/web/static/src/xml/base.xml
index 322d06fd6ae..57970c1486e 100644
--- a/addons/web/static/src/xml/base.xml
+++ b/addons/web/static/src/xml/base.xml
@@ -1040,19 +1040,14 @@
     </t>
 </t>
 <t t-name="FieldReference">
-    <t t-if="!widget.get('effective_readonly')">
-        <table class="oe_form_field_reference oe_frame oe_forms" border="0" cellpadding="0" cellspacing="0">
-        <tr>
-            <td t-attf-class="oe_form_frame_cell oe_form_selection oe_form_view_reference_selection">
-            </td>
-            <td t-attf-class="oe_form_frame_cell oe_form_many2one oe_form_view_reference_m2o" nowrap="true" style="display: none">
-            </td>
-        </tr>
-        </table>
-    </t>
-    <t t-if="widget.get('effective_readonly')">
-        <a href="#" class="oe_form_uri"/>
-    </t>
+    <table class="oe_form_field_reference oe_frame oe_forms" border="0" cellpadding="0" cellspacing="0">
+    <tr>
+        <td t-attf-class="oe_form_frame_cell oe_form_selection oe_form_view_reference_selection">
+        </td>
+        <td t-attf-class="oe_form_frame_cell oe_form_many2one oe_form_view_reference_m2o" nowrap="true" style="display: none">
+        </td>
+    </tr>
+    </table>
 </t>
 <t t-name="FieldBoolean">
     <span class="oe_form_field_boolean">

From 6463e5d9af213f6823a9db204197abb602865d59 Mon Sep 17 00:00:00 2001
From: "Quentin (OpenERP)" <qdp-launchpad@openerp.com>
Date: Fri, 20 Apr 2012 15:31:36 +0200
Subject: [PATCH 233/238] [FIX] sale: put back the Advance payment button that
 was removed by mistake in a previous revision

bzr revid: qdp-launchpad@openerp.com-20120420133136-tgurqmazncm1iwfv
---
 addons/sale/sale_view.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/addons/sale/sale_view.xml b/addons/sale/sale_view.xml
index 6bdbc9ac135..3d597b80dea 100644
--- a/addons/sale/sale_view.xml
+++ b/addons/sale/sale_view.xml
@@ -112,6 +112,7 @@
                     <button name="invoice_cancel" states="invoice_except" string="Cancel Order" icon="gtk-cancel"/>
                     <button name="%(report_sale_order)d" string="Print Quotation" type="action" icon="gtk-print" states="draft"/>
                     <button name="order_confirm" states="draft" string="Confirm Order" icon="gtk-apply"/>
+                    <button name="%(action_view_sale_advance_payment_inv)d" string="Advance Invoice" type="action" icon="gtk-execute" states="draft,manual" groups="base.group_extended"/>
                     <div class="oe_right">
                         <field name="state" nolabel="1" widget="statusbar" statusbar_visible="draft,progress,done" statusbar_colors='{"shipping_except":"red","invoice_except":"red","waiting_date":"blue"}'/>
                     </div>

From fab012db676e7ac38c677f11e2f93c6f4107423b Mon Sep 17 00:00:00 2001
From: Launchpad Translations on behalf of openerp <>
Date: Sat, 21 Apr 2012 05:00:26 +0000
Subject: [PATCH 234/238] Launchpad automatic translations update.

bzr revid: launchpad_translations_on_behalf_of_openerp-20120420044258-fezfbvwzzh6v1fu1
bzr revid: launchpad_translations_on_behalf_of_openerp-20120421050026-7dan23esxze1o5w6
---
 openerp/addons/base/i18n/ja.po |  6 +++---
 openerp/addons/base/i18n/mn.po | 10 +++++-----
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/openerp/addons/base/i18n/ja.po b/openerp/addons/base/i18n/ja.po
index 8fb6a885e43..69ab9feed61 100644
--- a/openerp/addons/base/i18n/ja.po
+++ b/openerp/addons/base/i18n/ja.po
@@ -14,8 +14,8 @@ 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-19 04:37+0000\n"
-"X-Generator: Launchpad (build 15108)\n"
+"X-Launchpad-Export-Date: 2012-04-20 04:42+0000\n"
+"X-Generator: Launchpad (build 15120)\n"
 
 #. module: base
 #: model:res.country,name:base.sh
@@ -3464,7 +3464,7 @@ msgstr "式表現を使う場合は、可変的な'object'によるPython表現
 #. module: base
 #: constraint:res.company:0
 msgid "Error! You can not create recursive companies."
-msgstr "エラー！再帰的な関係となる会社を作ることはできません。"
+msgstr "エラー。再帰的な関係となる会社を作ることはできません。"
 
 #. module: base
 #: model:ir.actions.act_window,name:base.action_res_users
diff --git a/openerp/addons/base/i18n/mn.po b/openerp/addons/base/i18n/mn.po
index 08b4227ff74..6c654eaed39 100644
--- a/openerp/addons/base/i18n/mn.po
+++ b/openerp/addons/base/i18n/mn.po
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2012-02-08 00:44+0000\n"
-"PO-Revision-Date: 2011-09-30 21:29+0000\n"
-"Last-Translator: Antony Lesuisse (OpenERP) <al@openerp.com>\n"
+"PO-Revision-Date: 2012-04-20 10:05+0000\n"
+"Last-Translator: Bayuka <bayuka1988@gmail.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-03-10 04:50+0000\n"
-"X-Generator: Launchpad (build 14914)\n"
+"X-Launchpad-Export-Date: 2012-04-21 05:00+0000\n"
+"X-Generator: Launchpad (build 15120)\n"
 
 #. module: base
 #: model:res.country,name:base.sh
@@ -88,7 +88,7 @@ msgstr "Ажлын урсгал"
 #. module: base
 #: selection:ir.sequence,implementation:0
 msgid "No gap"
-msgstr ""
+msgstr "Зөрүүгүй"
 
 #. module: base
 #: selection:base.language.install,lang:0

From 33345c9e0520d44884766acc852f4359960ca4cf Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Fri, 20 Apr 2012 17:22:20 +0200
Subject: [PATCH 235/238] [REM] idiotic default value for type field in
 ir_actions table

bzr revid: xmo@openerp.com-20120420152220-1yo0rykkj45jfee0
---
 openerp/addons/base/base.sql | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/openerp/addons/base/base.sql b/openerp/addons/base/base.sql
index 409ce81b285..eb9966bddcd 100644
--- a/openerp/addons/base/base.sql
+++ b/openerp/addons/base/base.sql
@@ -59,7 +59,7 @@ ALTER TABLE ir_model_fields ADD column serialization_field_id int references ir_
 CREATE TABLE ir_actions (
     id serial NOT NULL,
     name varchar(64) DEFAULT ''::varchar NOT NULL,
-    "type" varchar(32) DEFAULT 'window'::varchar NOT NULL,
+    "type" varchar(32) NOT NULL,
     usage varchar(32) DEFAULT null,
     primary key(id)
 );

From 869d9375d9fddf09d1a5c63b6951be83ef690be1 Mon Sep 17 00:00:00 2001
From: Launchpad Translations on behalf of openerp <>
Date: Mon, 23 Apr 2012 04:46:29 +0000
Subject: [PATCH 236/238] Launchpad automatic translations update.

bzr revid: launchpad_translations_on_behalf_of_openerp-20120421050113-mihw3po15423nlen
bzr revid: launchpad_translations_on_behalf_of_openerp-20120422044519-ij0it02kxvl7jm52
bzr revid: launchpad_translations_on_behalf_of_openerp-20120423044629-8fb2zo9nmi3e8grt
---
 addons/account/i18n/ja.po            |  530 +++++++-------
 addons/account/i18n/mn.po            |   28 +-
 addons/account_coda/i18n/zh_CN.po    |   18 +-
 addons/base_vat/i18n/ja.po           |   12 +-
 addons/board/i18n/ja.po              |    8 +-
 addons/crm_claim/i18n/gu.po          |  793 ++++++++++++++++++++
 addons/crm_fundraising/i18n/ja.po    |  790 ++++++++++++++++++++
 addons/crm_helpdesk/i18n/ja.po       |  738 +++++++++++++++++++
 addons/crm_partner_assign/i18n/ja.po |  882 ++++++++++++++++++++++
 addons/crm_profiling/i18n/ja.po      |  204 ++++++
 addons/crm_todo/i18n/ja.po           |    2 +-
 addons/delivery/i18n/ja.po           |  644 ++++++++++++++++
 addons/document/i18n/ja.po           | 1014 ++++++++++++++++++++++++++
 addons/document_ftp/i18n/ja.po       |  117 +++
 addons/document_webdav/i18n/ja.po    |  197 +++++
 addons/edi/i18n/ja.po                |  394 ++++++++++
 addons/email_template/i18n/ja.po     |  695 ++++++++++++++++++
 addons/event/i18n/ja.po              |  206 +++---
 addons/event_project/i18n/ja.po      |  108 +++
 addons/hr_expense/i18n/ja.po         |    8 +-
 addons/hr_recruitment/i18n/ja.po     |   31 +-
 addons/sale_margin/i18n/ja.po        |    2 +-
 22 files changed, 7021 insertions(+), 400 deletions(-)
 create mode 100644 addons/crm_claim/i18n/gu.po
 create mode 100644 addons/crm_fundraising/i18n/ja.po
 create mode 100644 addons/crm_helpdesk/i18n/ja.po
 create mode 100644 addons/crm_partner_assign/i18n/ja.po
 create mode 100644 addons/crm_profiling/i18n/ja.po
 create mode 100644 addons/delivery/i18n/ja.po
 create mode 100644 addons/document/i18n/ja.po
 create mode 100644 addons/document_ftp/i18n/ja.po
 create mode 100644 addons/document_webdav/i18n/ja.po
 create mode 100644 addons/edi/i18n/ja.po
 create mode 100644 addons/email_template/i18n/ja.po
 create mode 100644 addons/event_project/i18n/ja.po

diff --git a/addons/account/i18n/ja.po b/addons/account/i18n/ja.po
index 3b9b403f58d..033ca2c4515 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-20 04:08+0000\n"
+"PO-Revision-Date: 2012-04-21 19:11+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-20 04:43+0000\n"
+"X-Launchpad-Export-Date: 2012-04-22 04:44+0000\n"
 "X-Generator: Launchpad (build 15120)\n"
 
 #. module: account
@@ -87,7 +87,7 @@ msgstr "仕訳項目 %s は有効ではありません。"
 #. module: account
 #: model:ir.model,name:account.model_report_aged_receivable
 msgid "Aged Receivable Till Today"
-msgstr "今日までの売掛金の年齢"
+msgstr "今日までの売掛金年齢表"
 
 #. module: account
 #: model:process.transition,name:account.process_transition_invoiceimport0
@@ -398,7 +398,7 @@ msgstr "購入返金"
 #. module: account
 #: selection:account.journal,type:0
 msgid "Opening/Closing Situation"
-msgstr "事態 開く / 閉じる"
+msgstr "状況 開く / 閉じる"
 
 #. module: account
 #: help:account.journal,currency:0
@@ -1230,7 +1230,7 @@ msgstr "仕向為替レート"
 #. module: account
 #: selection:account.analytic.journal,type:0
 msgid "Situation"
-msgstr "事態"
+msgstr "状況"
 
 #. module: account
 #: help:account.move.line,move_id:0
@@ -1962,7 +1962,7 @@ 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 "選択した仕訳のアカウントは第２の通貨の入力を要求しています。アカウントの第２通貨を削除するか、仕訳で多国通貨ビューを選択して下さい。"
+msgstr "選択した仕訳のアカウントは第２の通貨の入力を要求しています。アカウントの第２通貨を削除するか、仕訳で多通貨ビューを選択して下さい。"
 
 #. module: account
 #: model:ir.actions.act_window,help:account.action_account_financial_report_tree
@@ -2309,7 +2309,7 @@ msgstr "アカウントエントリー"
 #. module: account
 #: constraint:res.partner:0
 msgid "Error ! You cannot create recursive associated members."
-msgstr "エラー。再帰的な関係となる会員を作ることはできません。"
+msgstr "エラー：重複した会員を作ることはできません。"
 
 #. module: account
 #: field:account.sequence.fiscalyear,sequence_main_id:0
@@ -2503,21 +2503,23 @@ msgid ""
 "date empty, it means direct payment. The payment term may compute several "
 "due dates, for example 50% now, 50% in one month."
 msgstr ""
+"支払期限を使用する場合、その期日は会計エントリーの世代において自動的に計算されます。支払期限設定を続け、かつ期日が空であれば、それは直接支払いを意味します"
+"。支払期限は例えば、50％を現在、50％を1ヶ月以内にというように幾つかの期日が計算されます。"
 
 #. module: account
 #: view:account.analytic.cost.ledger.journal.report:0
 msgid "Select period"
-msgstr ""
+msgstr "期間選択"
 
 #. module: account
 #: model:ir.ui.menu,name:account.menu_account_pp_statements
 msgid "Statements"
-msgstr ""
+msgstr "取引明細書"
 
 #. module: account
 #: report:account.analytic.account.journal:0
 msgid "Move Name"
-msgstr ""
+msgstr "名前の移動"
 
 #. module: account
 #: help:res.partner,property_account_position:0
@@ -2530,12 +2532,12 @@ msgstr "会計ポジションは税金やパートナのために使われるア
 #: view:account.print.journal:0
 msgid ""
 "This report gives you an overview of the situation of a specific journal"
-msgstr ""
+msgstr "このレポートは特定の仕訳帳の状況の概要を示しています。"
 
 #. module: account
 #: model:ir.model,name:account.model_account_move_line_reconcile_writeoff
 msgid "Account move line reconcile (writeoff)"
-msgstr ""
+msgstr "アカウント移動行の調整（償却）"
 
 #. module: account
 #: model:account.account.type,name:account.account_type_tax
@@ -2543,7 +2545,7 @@ msgstr ""
 #: field:account.invoice,amount_tax:0
 #: field:account.move.line,account_tax_id:0
 msgid "Tax"
-msgstr ""
+msgstr "税金"
 
 #. module: account
 #: view:account.analytic.account:0
@@ -2554,7 +2556,7 @@ msgstr ""
 #: field:account.move.line,analytic_account_id:0
 #: field:account.move.line.reconcile.writeoff,analytic_id:0
 msgid "Analytic Account"
-msgstr ""
+msgstr "分析アカウント"
 
 #. module: account
 #: view:account.account:0
@@ -2567,52 +2569,52 @@ msgstr ""
 #: model:ir.ui.menu,name:account.menu_action_account_form
 #: model:ir.ui.menu,name:account.menu_analytic
 msgid "Accounts"
-msgstr ""
+msgstr "アカウント"
 
 #. module: account
 #: code:addons/account/account_invoice.py:369
 #, python-format
 msgid "Configuration Error!"
-msgstr ""
+msgstr "設定エラー"
 
 #. module: account
 #: field:account.invoice.report,price_average:0
 msgid "Average Price"
-msgstr ""
+msgstr "平均価格"
 
 #. module: account
 #: report:account.overdue:0
 msgid "Date:"
-msgstr ""
+msgstr "日付:"
 
 #. module: account
 #: report:account.journal.period.print:0
 #: report:account.journal.period.print.sale.purchase:0
 msgid "Label"
-msgstr ""
+msgstr "ラベル"
 
 #. module: account
 #: view:account.tax:0
 #: view:res.partner.bank:0
 msgid "Accounting Information"
-msgstr ""
+msgstr "会計情報"
 
 #. module: account
 #: view:account.tax:0
 #: view:account.tax.template:0
 msgid "Special Computation"
-msgstr ""
+msgstr "特殊な計算"
 
 #. module: account
 #: view:account.move.bank.reconcile:0
 #: model:ir.actions.act_window,name:account.action_account_bank_reconcile_tree
 msgid "Bank reconciliation"
-msgstr ""
+msgstr "銀行照合"
 
 #. module: account
 #: report:account.invoice:0
 msgid "Disc.(%)"
-msgstr ""
+msgstr "ディスク（%）"
 
 #. module: account
 #: report:account.general.ledger:0
@@ -2621,33 +2623,33 @@ msgstr ""
 #: report:account.third_party_ledger:0
 #: report:account.third_party_ledger_other:0
 msgid "Ref"
-msgstr ""
+msgstr "参照"
 
 #. module: account
 #: help:account.move.line,tax_code_id:0
 msgid "The Account can either be a base tax code or a tax code account."
-msgstr ""
+msgstr "アカウントは基本税金コードまたは税金コードアカウントの何れかにすることができます。"
 
 #. module: account
 #: sql_constraint:account.model.line:0
 msgid "Wrong credit or debit value in model, they must be positive!"
-msgstr ""
+msgstr "モデルの中で誤った借方または貸方の値があります。それらは正値であるべきです。"
 
 #. module: account
 #: model:ir.ui.menu,name:account.menu_automatic_reconcile
 msgid "Automatic Reconciliation"
-msgstr ""
+msgstr "自動調整"
 
 #. module: account
 #: field:account.invoice,reconciled:0
 msgid "Paid/Reconciled"
-msgstr ""
+msgstr "支払済 / 調整後"
 
 #. module: account
 #: 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
@@ -2661,54 +2663,54 @@ msgstr ""
 #: view:account.move.line:0
 #: view:accounting.report:0
 msgid "Dates"
-msgstr ""
+msgstr "日付"
 
 #. module: account
 #: field:account.chart.template,parent_id:0
 msgid "Parent Chart Template"
-msgstr ""
+msgstr "親チャートテンプレート"
 
 #. module: account
 #: field:account.tax,parent_id:0
 #: field:account.tax.template,parent_id:0
 msgid "Parent Tax Account"
-msgstr ""
+msgstr "親税金アカウント"
 
 #. module: account
 #: code:addons/account/wizard/account_change_currency.py:59
 #, python-format
 msgid "New currency is not configured properly !"
-msgstr ""
+msgstr "新しい通貨が適切に設定されていません。"
 
 #. module: account
 #: view:account.subscription.generate:0
 msgid ""
 "Automatically generate entries based on what has been entered in the  system "
 "before a specific date."
-msgstr ""
+msgstr "所定の日付より前にシステムに入力された内容に基づき、エントリーを自動的に生成します。"
 
 #. module: account
 #: view:account.aged.trial.balance:0
 #: model:ir.actions.act_window,name:account.action_account_aged_balance_view
 #: model:ir.ui.menu,name:account.menu_aged_trial_balance
 msgid "Aged Partner Balance"
-msgstr ""
+msgstr "パートナ残高年齢表"
 
 #. module: account
 #: model:process.transition,name:account.process_transition_entriesreconcile0
 #: model:process.transition,name:account.process_transition_supplierentriesreconcile0
 msgid "Accounting entries"
-msgstr ""
+msgstr "会計エントリー"
 
 #. module: account
 #: field:account.invoice,reference_type:0
 msgid "Communication Type"
-msgstr ""
+msgstr "通信タイプ"
 
 #. module: account
 #: field:account.invoice.line,discount:0
 msgid "Discount (%)"
-msgstr ""
+msgstr "割引（%）"
 
 #. module: account
 #: help:account.journal,entry_posted:0
@@ -2719,35 +2721,38 @@ msgid ""
 "Note that journal entries that are automatically created by the system are "
 "always skipping that state."
 msgstr ""
+"新しい仕訳帳エントリーがドラフト状態を通り抜けて、代わりに手作業での検証を行わず直接記帳状態に行くことを望まない場合は、このボックスをチェックして下さい。"
+"\n"
+"システムにより自動的に作成された仕訳帳エントリーはいつもこの状態をスキップすることに注意して下さい。"
 
 #. module: account
 #: model:ir.actions.server,name:account.ir_actions_server_action_wizard_multi_chart
 #: model:ir.ui.menu,name:account.menu_act_ir_actions_bleble
 msgid "New Company Financial Setting"
-msgstr ""
+msgstr "新会社の財務の設定"
 
 #. module: account
 #: view:account.installer:0
 msgid "Configure Your Chart of Accounts"
-msgstr ""
+msgstr "勘定科目表の設定"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_report_account_sales_tree_all
 #: view:report.account.sales:0
 #: view:report.account_type.sales:0
 msgid "Sales by Account"
-msgstr ""
+msgstr "アカウント別売上"
 
 #. module: account
 #: view:account.use.model:0
 msgid "This wizard will create recurring accounting entries"
-msgstr ""
+msgstr "このウィザードは定期的な会計エントリーを作成します。"
 
 #. module: account
 #: code:addons/account/account.py:1321
 #, python-format
 msgid "No sequence defined on the journal !"
-msgstr ""
+msgstr "この仕訳帳には順序が定義されていません。"
 
 #. module: account
 #: code:addons/account/account.py:2268
@@ -2755,7 +2760,7 @@ msgstr ""
 #: code:addons/account/account_move_line.py:173
 #, python-format
 msgid "You have to define an analytic journal on the '%s' journal!"
-msgstr ""
+msgstr "%s 仕訳帳に分析仕訳を定義しなければなりません。"
 
 #. module: account
 #: code:addons/account/account.py:407
@@ -2770,25 +2775,25 @@ msgstr "初期残高を設定するために一元的にチェック済みの開
 #: model:ir.actions.act_window,name:account.action_tax_code_list
 #: model:ir.ui.menu,name:account.menu_action_tax_code_list
 msgid "Tax codes"
-msgstr ""
+msgstr "税金コード"
 
 #. module: account
 #: view:account.account:0
 msgid "Unrealized Gains and losses"
-msgstr ""
+msgstr "評価損益"
 
 #. module: account
 #: model:ir.ui.menu,name:account.menu_account_customer
 #: model:ir.ui.menu,name:account.menu_finance_receivables
 msgid "Customers"
-msgstr ""
+msgstr "顧客"
 
 #. module: account
 #: report:account.analytic.account.cost_ledger:0
 #: report:account.analytic.account.journal:0
 #: report:account.analytic.account.quantity_cost_ledger:0
 msgid "Period to"
-msgstr ""
+msgstr "期間まで"
 
 #. module: account
 #: selection:account.entries.report,month:0
@@ -2797,12 +2802,12 @@ msgstr ""
 #: selection:report.account.sales,month:0
 #: selection:report.account_type.sales,month:0
 msgid "August"
-msgstr ""
+msgstr "8月"
 
 #. module: account
 #: model:process.transition,note:account.process_transition_paymentreconcile0
 msgid "Payment entries are the second input of the reconciliation."
-msgstr ""
+msgstr "支払いエントリーは調整の第２の入力です。"
 
 #. module: account
 #: selection:account.entries.report,month:0
@@ -2811,7 +2816,7 @@ msgstr ""
 #: selection:report.account.sales,month:0
 #: selection:report.account_type.sales,month:0
 msgid "October"
-msgstr ""
+msgstr "10月"
 
 #. module: account
 #: help:account.move.line,quantity:0
@@ -2819,28 +2824,29 @@ msgid ""
 "The optional quantity expressed by this line, eg: number of product sold. "
 "The quantity is not a legal requirement but is very useful for some reports."
 msgstr ""
+"オプションの数量はこの行で、例えば、販売された製品の数を表します。数量は法的には要求されませんが、幾つかのレポートのためにはとても役立ちます。"
 
 #. module: account
 #: view:account.payment.term.line:0
 msgid "Line 2:"
-msgstr ""
+msgstr "行２："
 
 #. module: account
 #: field:account.journal.column,required:0
 msgid "Required"
-msgstr ""
+msgstr "必須"
 
 #. module: account
 #: view:account.chart.template:0
 #: field:product.category,property_account_expense_categ:0
 #: field:product.template,property_account_expense:0
 msgid "Expense Account"
-msgstr ""
+msgstr "費用アカウント"
 
 #. module: account
 #: help:account.invoice,period_id:0
 msgid "Keep empty to use the period of the validation(invoice) date."
-msgstr ""
+msgstr "検証（請求書）日の期間を使うために空のままにして下さい。"
 
 #. module: account
 #: help:account.bank.statement,account_id:0
@@ -2851,7 +2857,7 @@ msgstr "取引明細書の照合領域で使用されます。その他の場所
 #. module: account
 #: field:account.invoice.tax,base_amount:0
 msgid "Base Code Amount"
-msgstr ""
+msgstr "基本コードの金額"
 
 #. module: account
 #: code:addons/account/account_invoice.py:392
@@ -2859,18 +2865,18 @@ 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
 msgid "Default Sale Tax"
-msgstr ""
+msgstr "デフォルト消費税"
 
 #. module: account
 #: code:addons/account/account_invoice.py:1013
 #, python-format
 msgid "Invoice  '%s' is validated."
-msgstr ""
+msgstr "請求書 %s は検証されます。"
 
 #. module: account
 #: help:account.model.line,date_maturity:0
@@ -2878,17 +2884,17 @@ msgid ""
 "The maturity date of the generated entries for this model. You can choose "
 "between the creation date or the creation date of the entries plus the "
 "partner payment terms."
-msgstr ""
+msgstr "このモデルが生成されたエントリーの満期日。作成日またはエントリーの作成日に加えたパートナの支払期間の何れかを選べます。"
 
 #. module: account
 #: model:ir.ui.menu,name:account.menu_finance_accounting
 msgid "Financial Accounting"
-msgstr ""
+msgstr "財務会計"
 
 #. module: account
 #: model:ir.ui.menu,name:account.menu_account_report_pl
 msgid "Profit And Loss"
-msgstr ""
+msgstr "損益"
 
 #. module: account
 #: view:account.fiscal.position:0
@@ -2911,17 +2917,19 @@ msgid ""
 "Tax base different!\n"
 "Click on compute to update the tax base."
 msgstr ""
+"課税基準が異なります。\n"
+"課税基準を更新するために計算をクリックして下さい。"
 
 #. module: account
 #: field:account.partner.ledger,page_split:0
 msgid "One Partner Per Page"
-msgstr ""
+msgstr "ページ毎に１パートナ"
 
 #. module: account
 #: field:account.account,child_parent_ids:0
 #: field:account.account.template,child_parent_ids:0
 msgid "Children"
-msgstr ""
+msgstr "子"
 
 #. module: account
 #: selection:account.invoice,type:0
@@ -2929,60 +2937,60 @@ msgstr ""
 #: model:process.process,name:account.process_process_invoiceprocess0
 #: selection:report.invoice.created,type:0
 msgid "Customer Invoice"
-msgstr ""
+msgstr "顧客請求書"
 
 #. module: account
 #: help:account.tax.template,include_base_amount:0
 msgid ""
 "Set if the amount of tax must be included in the base amount before "
 "computing the next taxes."
-msgstr ""
+msgstr "次の税金を計算する前に、税金額が基準額に含まれていなければならない時に設定します。"
 
 #. module: account
 #: help:account.journal,user_id:0
 msgid "The user responsible for this journal"
-msgstr ""
+msgstr "この仕訳帳を担当するユーザ"
 
 #. module: account
 #: view:account.period:0
 msgid "Search Period"
-msgstr ""
+msgstr "期間検索"
 
 #. module: account
 #: view:account.change.currency:0
 msgid "Invoice Currency"
-msgstr ""
+msgstr "請求書通貨"
 
 #. module: account
 #: field:accounting.report,account_report_id:0
 #: model:ir.ui.menu,name:account.menu_account_financial_reports_tree
 msgid "Account Reports"
-msgstr ""
+msgstr "アカウントレポート"
 
 #. module: account
 #: field:account.payment.term,line_ids:0
 msgid "Terms"
-msgstr ""
+msgstr "条件"
 
 #. module: account
 #: field:account.bank.statement,total_entry_encoding:0
 msgid "Cash Transaction"
-msgstr ""
+msgstr "現金取引"
 
 #. module: account
 #: view:res.partner:0
 msgid "Bank account"
-msgstr ""
+msgstr "銀行口座"
 
 #. module: account
 #: field:account.chart.template,tax_template_ids:0
 msgid "Tax Template List"
-msgstr ""
+msgstr "税金テンプレートリスト"
 
 #. module: account
 #: model:ir.ui.menu,name:account.menu_account_print_sale_purchase_journal
 msgid "Sale/Purchase Journals"
-msgstr ""
+msgstr "受注 / 発注仕訳帳"
 
 #. module: account
 #: help:account.account,currency_mode:0
@@ -2993,55 +3001,57 @@ msgid ""
 "software system you may have to use the rate at date. Incoming transactions "
 "always use the rate at date."
 msgstr ""
+"これは仕向取引が現在の通貨レートをどのように計算するかを選択します。殆どの国の正式な方法は平均ですが、少数のソフトウェアシステムはこの管理が可能です。他の"
+"ソフトウェアシステムからインポートした場合は、日付レートを使用しなければならないかも知れません。被仕向取引は常に日付レートを使用します。"
 
 #. module: account
 #: help:account.chart.template,code_digits:0
 #: help:wizard.multi.charts.accounts,code_digits:0
 msgid "No. of Digits to use for account code"
-msgstr ""
+msgstr "アカウントコードのために使用される数字の桁数"
 
 #. module: account
 #: field:account.payment.term.line,name:0
 msgid "Line Name"
-msgstr ""
+msgstr "行名称"
 
 #. module: account
 #: view:account.fiscalyear:0
 msgid "Search Fiscalyear"
-msgstr ""
+msgstr "会計年度検索"
 
 #. module: account
 #: selection:account.tax,applicable_type:0
 msgid "Always"
-msgstr ""
+msgstr "常に"
 
 #. module: account
 #: view:account.invoice.report:0
 #: view:analytic.entries.report:0
 msgid "Month-1"
-msgstr ""
+msgstr "月-1"
 
 #. module: account
 #: view:account.analytic.line:0
 msgid "Total Quantity"
-msgstr ""
+msgstr "合計数量"
 
 #. module: account
 #: field:account.move.line.reconcile.writeoff,writeoff_acc_id:0
 msgid "Write-Off account"
-msgstr ""
+msgstr "償却アカウント"
 
 #. module: account
 #: field:account.model.line,model_id:0
 #: view:account.subscription:0
 #: field:account.subscription,model_id:0
 msgid "Model"
-msgstr ""
+msgstr "モデル"
 
 #. module: account
 #: help:account.invoice.tax,base_code_id:0
 msgid "The account basis of the tax declaration."
-msgstr ""
+msgstr "税金申告の会計基準"
 
 #. module: account
 #: selection:account.account,type:0
@@ -3049,94 +3059,94 @@ msgstr ""
 #: selection:account.entries.report,type:0
 #: selection:account.financial.report,type:0
 msgid "View"
-msgstr ""
+msgstr "ビュー"
 
 #. module: account
 #: code:addons/account/account.py:3363
 #: code:addons/account/account_bank.py:90
 #, python-format
 msgid "BNK"
-msgstr ""
+msgstr "銀行"
 
 #. module: account
 #: field:account.move.line,analytic_lines:0
 msgid "Analytic lines"
-msgstr ""
+msgstr "分析行"
 
 #. module: account
 #: view:account.invoice:0
 msgid "Proforma Invoices"
-msgstr ""
+msgstr "プロフォーマ請求書"
 
 #. module: account
 #: model:process.node,name:account.process_node_electronicfile0
 msgid "Electronic File"
-msgstr ""
+msgstr "電子ファイル"
 
 #. module: account
 #: view:res.partner:0
 msgid "Customer Credit"
-msgstr ""
+msgstr "顧客クレジット"
 
 #. module: account
 #: view:account.payment.term.line:0
 msgid "  Day of the Month: 0"
-msgstr ""
+msgstr "  月における通算日：0"
 
 #. module: account
 #: view:account.subscription:0
 msgid "Starts on"
-msgstr ""
+msgstr "開始"
 
 #. module: account
 #: model:ir.model,name:account.model_account_partner_ledger
 msgid "Account Partner Ledger"
-msgstr ""
+msgstr "アカウントパートナ元帳"
 
 #. module: account
 #: help:account.journal.column,sequence:0
 msgid "Gives the sequence order to journal column."
-msgstr ""
+msgstr "仕訳帳カラムに並び順を与えます。"
 
 #. module: account
 #: help:account.account,currency_id:0
 #: help:account.account.template,currency_id:0
 #: help:account.bank.accounts.wizard,currency_id:0
 msgid "Forces all moves for this account to have this secondary currency."
-msgstr ""
+msgstr "この第２通貨を持つこのアカウントのため全ての移動は制限されます。"
 
 #. module: account
 #: model:ir.actions.act_window,help:account.action_validate_account_move_line
 msgid ""
 "This wizard will validate all journal entries of a particular journal and "
 "period. Once journal entries are validated, you can not update them anymore."
-msgstr ""
+msgstr "このウィザードは特定の仕訳帳と期間の全ての仕訳帳エントリーを検証します。ひとたび仕訳帳エントリーが検証された以降は、変更はできません。"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_chart_template_form
 #: model:ir.ui.menu,name:account.menu_action_account_chart_template_form
 msgid "Chart of Accounts Templates"
-msgstr ""
+msgstr "勘定科目表テンプレート"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_wizard_multi_chart
 msgid "Generate Chart of Accounts from a Chart Template"
-msgstr ""
+msgstr "チャートテンプレートから勘定科目表を生成"
 
 #. module: account
 #: view:report.account.sales:0
 msgid "This months' Sales by type"
-msgstr ""
+msgstr "タイプ別今月の販売"
 
 #. module: account
 #: model:ir.model,name:account.model_account_unreconcile_reconcile
 msgid "Account Unreconcile Reconcile"
-msgstr ""
+msgstr "調整 / 未調整アカウント"
 
 #. module: account
 #: sql_constraint:account.tax:0
 msgid "The description must be unique per company!"
-msgstr ""
+msgstr "説明は会社ごとに固有でなければなりません。"
 
 #. module: account
 #: help:account.account.type,close_method:0
@@ -3151,18 +3161,24 @@ msgid ""
 " 'Unreconciled' will copy only the journal items that were unreconciled on "
 "the first day of the new fiscal year."
 msgstr ""
+"このタイプの全てのアカウントの年間の仕訳帳エントリーの終わりを生成するのに使用する方法を、ここで設定して下さい。\n"
+"\n"
+"　\"なし\" は何も行われないことを意味します。\n"
+"　\"残高\"は一般的には現金のアカウントのために使用されます。\n"
+"　\"詳細\"は調整されたものも含む前年のそれぞれの既存仕訳帳項目をコピーします。\n"
+"　\"未調整\"は未調整だった仕訳帳項目のみを新会計年度の初日としてコピーします。"
 
 #. module: account
 #: code:addons/account/wizard/account_open_closed_fiscalyear.py:39
 #, python-format
 msgid "No End of year journal defined for the fiscal year"
-msgstr ""
+msgstr "その会計年度の終わりの仕訳帳が定義されていません。"
 
 #. module: account
 #: view:account.tax:0
 #: view:account.tax.template:0
 msgid "Keep empty to use the expense account"
-msgstr ""
+msgstr "経費アカウントを使うためには空のままとして下さい。"
 
 #. module: account
 #: field:account.aged.trial.balance,journal_ids:0
@@ -3196,18 +3212,18 @@ msgstr ""
 #: model:ir.ui.menu,name:account.menu_journals
 #: model:ir.ui.menu,name:account.menu_journals_report
 msgid "Journals"
-msgstr ""
+msgstr "仕訳帳"
 
 #. module: account
 #: field:account.partner.reconcile.process,to_reconcile:0
 msgid "Remaining Partners"
-msgstr ""
+msgstr "存続パートナ"
 
 #. module: account
 #: view:account.subscription:0
 #: field:account.subscription,lines_id:0
 msgid "Subscription Lines"
-msgstr ""
+msgstr "サブスクリプション行"
 
 #. module: account
 #: selection:account.analytic.journal,type:0
@@ -3218,48 +3234,48 @@ msgstr ""
 #: view:account.tax.template:0
 #: selection:account.tax.template,type_tax_use:0
 msgid "Purchase"
-msgstr ""
+msgstr "発注"
 
 #. module: account
 #: view:account.installer:0
 #: view:wizard.multi.charts.accounts:0
 msgid "Accounting Application Configuration"
-msgstr ""
+msgstr "会計アプリケーションの設定"
 
 #. module: account
 #: view:account.payment.term.line:0
 msgid "  Value amount: 0.02"
-msgstr ""
+msgstr "  値の量：0.02"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.open_board_account
 #: model:ir.ui.menu,name:account.menu_board_account
 msgid "Accounting Dashboard"
-msgstr ""
+msgstr "会計ダッシュボード"
 
 #. module: account
 #: field:account.bank.statement,balance_start:0
 #: field:account.treasury.report,starting_balance:0
 msgid "Starting Balance"
-msgstr ""
+msgstr "開始残高"
 
 #. module: account
 #: code:addons/account/account_invoice.py:1332
 #, python-format
 msgid "No Partner Defined !"
-msgstr ""
+msgstr "パートナが定義されていません。"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_period_close
 #: model:ir.actions.act_window,name:account.action_account_period_tree
 #: model:ir.ui.menu,name:account.menu_action_account_period_close_tree
 msgid "Close a Period"
-msgstr ""
+msgstr "期間を閉じる"
 
 #. module: account
 #: field:account.financial.report,display_detail:0
 msgid "Display details"
-msgstr ""
+msgstr "詳細を表示"
 
 #. module: account
 #: report:account.overdue:0
@@ -3269,100 +3285,100 @@ msgstr "消費税："
 #. module: account
 #: constraint:account.invoice:0
 msgid "Invalid BBA Structured Communication !"
-msgstr ""
+msgstr "無効なBBA構造のコミュニケーション"
 
 #. module: account
 #: help:account.analytic.line,amount_currency:0
 msgid ""
 "The amount expressed in the related account currency if not equal to the "
 "company one."
-msgstr ""
+msgstr "会社の通貨と異なっている場合は、金額は関係するアカウント通貨で表されます。"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_unreconcile
 #: model:ir.actions.act_window,name:account.action_account_unreconcile_reconcile
 #: model:ir.actions.act_window,name:account.action_account_unreconcile_select
 msgid "Unreconcile Entries"
-msgstr ""
+msgstr "未調整エントリー"
 
 #. module: account
 #: field:account.tax.code,notprintable:0
 #: field:account.tax.code.template,notprintable:0
 msgid "Not Printable in Invoice"
-msgstr ""
+msgstr "印刷不可の請求書"
 
 #. module: account
 #: report:account.vat.declaration:0
 #: field:account.vat.declaration,chart_tax_id:0
 msgid "Chart of Tax"
-msgstr ""
+msgstr "税金チャート"
 
 #. module: account
 #: code:addons/account/account_cash_statement.py:314
 #, python-format
 msgid "The closing balance should be the same than the computed balance!"
-msgstr ""
+msgstr "決算残高は計算された残高と等しくなければなりません。"
 
 #. module: account
 #: view:account.journal:0
 msgid "Search Account Journal"
-msgstr ""
+msgstr "アカウント仕訳帳検索"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_invoice_tree_pending_invoice
 msgid "Pending Invoice"
-msgstr ""
+msgstr "保留中請求書"
 
 #. module: account
 #: view:account.invoice.report:0
 #: selection:account.subscription,period_type:0
 #: view:analytic.entries.report:0
 msgid "year"
-msgstr ""
+msgstr "年"
 
 #. module: account
 #: view:product.product:0
 msgid "Purchase Taxes"
-msgstr ""
+msgstr "消費税"
 
 #. module: account
 #: view:validate.account.move.lines:0
 msgid ""
 "All selected journal entries will be validated and posted. It means you "
 "won't be able to modify their accounting fields anymore."
-msgstr ""
+msgstr "全ての選択した仕訳帳エントリーは検証され、元帳に記帳されます。このことは、それらの会計範囲はもう変更ができなくなることを意味します。"
 
 #. module: account
 #: model:ir.actions.report.xml,name:account.account_transfers
 msgid "Transfers"
-msgstr ""
+msgstr "転送"
 
 #. module: account
 #: view:account.chart:0
 msgid "Account charts"
-msgstr ""
+msgstr "会計表"
 
 #. module: account
 #: report:account.vat.declaration:0
 msgid "Tax Amount"
-msgstr ""
+msgstr "税額"
 
 #. module: account
 #: view:account.move:0
 msgid "Search Move"
-msgstr ""
+msgstr "移動の検索"
 
 #. module: account
 #: field:account.tax.code,name:0
 #: field:account.tax.code.template,name:0
 msgid "Tax Case Name"
-msgstr ""
+msgstr "税金名称"
 
 #. module: account
 #: report:account.invoice:0
 #: model:process.node,name:account.process_node_draftinvoices0
 msgid "Draft Invoice"
-msgstr ""
+msgstr "ドラフト請求書"
 
 #. module: account
 #: code:addons/account/wizard/account_invoice_state.py:68
@@ -3370,59 +3386,59 @@ msgstr ""
 msgid ""
 "Selected Invoice(s) cannot be cancelled as they are already in 'Cancelled' "
 "or 'Done' state!"
-msgstr ""
+msgstr "選択した請求書は既にキャンセルあるいは完了状態であるためキャンセルできません。"
 
 #. module: account
 #: view:account.invoice.line:0
 msgid "Quantity :"
-msgstr ""
+msgstr "数量"
 
 #. module: account
 #: field:account.aged.trial.balance,period_length:0
 msgid "Period Length (days)"
-msgstr ""
+msgstr "期間の長さ（日数）"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_print_sale_purchase_journal
 msgid "Print Sale/Purchase Journal"
-msgstr ""
+msgstr "受注 / 発注仕訳帳印刷"
 
 #. module: account
 #: field:account.invoice.report,state:0
 msgid "Invoice State"
-msgstr ""
+msgstr "請求書の状態"
 
 #. module: account
 #: view:account.invoice.report:0
 #: field:account.invoice.report,categ_id:0
 msgid "Category of Product"
-msgstr ""
+msgstr "製品分類"
 
 #. module: account
 #: view:account.addtmpl.wizard:0
 #: model:ir.actions.act_window,name:account.action_account_addtmpl_wizard_form
 msgid "Create Account"
-msgstr ""
+msgstr "アカウント作成"
 
 #. module: account
 #: model:ir.model,name:account.model_report_account_type_sales
 msgid "Report of the Sales by Account Type"
-msgstr ""
+msgstr "アカウントタイプ別販売レポート"
 
 #. module: account
 #: view:account.move.line:0
 msgid "Unreconciled Journal Items"
-msgstr ""
+msgstr "未調整仕訳帳項目"
 
 #. module: account
 #: sql_constraint:res.currency:0
 msgid "The currency code must be unique per company!"
-msgstr ""
+msgstr "通貨コードは会社ごとに固有でなければいけません。"
 
 #. module: account
 #: selection:account.account.type,close_method:0
 msgid "Detail"
-msgstr ""
+msgstr "詳細"
 
 #. module: account
 #: code:addons/account/account_invoice.py:839
@@ -3433,6 +3449,9 @@ msgid ""
 "amount greater than the total invoiced amount. The latest line of your "
 "payment term must be of type 'balance' to avoid rounding issues."
 msgstr ""
+"請求書が作成できません。\n"
+"合計請求額よりも計算された金額が大きいため、関連する支払い期間がおそらく誤った設定となっています。支払い期間の最新行は丸め問題を避けるために\"残高\"タ"
+"イプでなければなりません。"
 
 #. module: account
 #: report:account.invoice:0
@@ -3450,28 +3469,28 @@ msgstr "消費税："
 #: model:ir.actions.act_window,name:account.action_account_tree
 #: model:ir.ui.menu,name:account.menu_action_account_tree2
 msgid "Chart of Accounts"
-msgstr ""
+msgstr "勘定科目表"
 
 #. module: account
 #: view:account.tax.chart:0
 msgid "(If you do not select period it will take all open periods)"
-msgstr ""
+msgstr "（期間を選択しない場合は、全ての開いている期間となります）"
 
 #. module: account
 #: field:account.journal,centralisation:0
 msgid "Centralised counterpart"
-msgstr ""
+msgstr "相手方の一元化"
 
 #. module: account
 #: code:addons/account/account_move_line.py:584
 #, python-format
 msgid "You can not create journal items on a \"view\" account %s %s"
-msgstr ""
+msgstr "ビューアカウントでは仕訳帳項目を作ることはできません %s %s"
 
 #. module: account
 #: model:ir.model,name:account.model_account_partner_reconcile_process
 msgid "Reconcilation Process partner by partner"
-msgstr ""
+msgstr "パートナ毎のパートナ調整プロセス"
 
 #. module: account
 #: selection:account.automatic.reconcile,power:0
@@ -3481,7 +3500,7 @@ msgstr ""
 #. module: account
 #: view:account.chart:0
 msgid "(If you do not select Fiscal year it will take all open fiscal years)"
-msgstr ""
+msgstr "（会計年度を選択しない場合は、全ての開いている会計年度となります）"
 
 #. module: account
 #: selection:account.aged.trial.balance,filter:0
@@ -3520,18 +3539,18 @@ msgstr ""
 #: selection:accounting.report,filter_cmp:0
 #: field:analytic.entries.report,date:0
 msgid "Date"
-msgstr ""
+msgstr "日付"
 
 #. module: account
 #: view:account.move:0
 msgid "Post"
-msgstr ""
+msgstr "記帳"
 
 #. module: account
 #: view:account.unreconcile:0
 #: view:account.unreconcile.reconcile:0
 msgid "Unreconcile"
-msgstr ""
+msgstr "未調整"
 
 #. module: account
 #: view:account.analytic.line:0
@@ -3541,12 +3560,12 @@ msgstr ""
 #: view:analytic.entries.report:0
 #: field:analytic.entries.report,user_id:0
 msgid "User"
-msgstr ""
+msgstr "ユーザ"
 
 #. module: account
 #: view:account.chart.template:0
 msgid "Chart of Accounts Template"
-msgstr ""
+msgstr "勘定科目表テンプレート"
 
 #. module: account
 #: code:addons/account/account.py:2280
@@ -3556,22 +3575,24 @@ msgid ""
 "based on partner payment term!\n"
 "Please define partner on it!"
 msgstr ""
+"エントリー行の満期日はパートナの支払期間を基にしたモデル行 %s モデル %s によって作成されました。\n"
+"その上にパートナを定義して下さい。"
 
 #. module: account
 #: code:addons/account/account_move_line.py:837
 #, python-format
 msgid "Some entries are already reconciled !"
-msgstr ""
+msgstr "幾つかのエントリーは既に調整済みです。"
 
 #. module: account
 #: view:account.tax:0
 msgid "Account Tax"
-msgstr ""
+msgstr "税金アカウント"
 
 #. module: account
 #: model:ir.ui.menu,name:account.menu_finance_reporting_budgets
 msgid "Budgets"
-msgstr ""
+msgstr "予算"
 
 #. module: account
 #: selection:account.aged.trial.balance,filter:0
@@ -3590,17 +3611,17 @@ msgstr ""
 #: selection:accounting.report,filter:0
 #: selection:accounting.report,filter_cmp:0
 msgid "No Filters"
-msgstr ""
+msgstr "フィルタなし"
 
 #. module: account
 #: view:account.invoice.report:0
 msgid "Pro-forma Invoices"
-msgstr ""
+msgstr "プロフォーマ請求書"
 
 #. module: account
 #: view:res.partner:0
 msgid "History"
-msgstr ""
+msgstr "履歴"
 
 #. module: account
 #: help:account.tax,applicable_type:0
@@ -3608,77 +3629,77 @@ msgstr ""
 msgid ""
 "If not applicable (computed through a Python code), the tax won't appear on "
 "the invoice."
-msgstr ""
+msgstr "適用可能（Pythonコードによって計算）でない場合は、税金は請求書に表示されません。"
 
 #. module: account
 #: view:account.tax:0
 #: view:account.tax.template:0
 msgid "Applicable Code (if type=code)"
-msgstr ""
+msgstr "適用可能コード（タイプがコードの時）"
 
 #. module: account
 #: view:account.invoice.report:0
 #: field:account.invoice.report,product_qty:0
 msgid "Qty"
-msgstr ""
+msgstr "数量"
 
 #. module: account
 #: field:account.invoice.report,address_contact_id:0
 msgid "Contact Address Name"
-msgstr ""
+msgstr "連絡先アドレス名"
 
 #. module: account
 #: field:account.move.line,blocked:0
 msgid "Litigation"
-msgstr ""
+msgstr "訴訟"
 
 #. module: account
 #: view:account.analytic.line:0
 msgid "Search Analytic Lines"
-msgstr ""
+msgstr "分析行検索"
 
 #. module: account
 #: field:res.partner,property_account_payable:0
 msgid "Account Payable"
-msgstr ""
+msgstr "買掛金"
 
 #. module: account
 #: model:process.node,name:account.process_node_supplierpaymentorder0
 msgid "Payment Order"
-msgstr ""
+msgstr "支払オーダー"
 
 #. module: account
 #: help:account.account.template,reconcile:0
 msgid ""
 "Check this option if you want the user to reconcile entries in this account."
-msgstr ""
+msgstr "ユーザがこのアカウントのエントリーを調整したい場合はこのオプションをチェックして下さい。"
 
 #. module: account
 #: model:ir.actions.report.xml,name:account.account_account_balance_landscape
 msgid "Account balance"
-msgstr ""
+msgstr "アカウント残高"
 
 #. module: account
 #: report:account.invoice:0
 #: field:account.invoice.line,price_unit:0
 msgid "Unit Price"
-msgstr ""
+msgstr "単価"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_tree1
 msgid "Analytic Items"
-msgstr ""
+msgstr "分析項目"
 
 #. module: account
 #: code:addons/account/account_move_line.py:1153
 #, python-format
 msgid "Unable to change tax !"
-msgstr ""
+msgstr "税金を変更することはできません。"
 
 #. module: account
 #: field:analytic.entries.report,nbr:0
 msgid "#Entries"
-msgstr ""
+msgstr "エントリー番号"
 
 #. module: account
 #: selection:account.invoice.refund,filter_refund:0
@@ -3688,17 +3709,17 @@ msgstr "返金のドラフトを作成"
 #. module: account
 #: view:account.state.open:0
 msgid "Open Invoice"
-msgstr ""
+msgstr "請求書を開く"
 
 #. module: account
 #: field:account.invoice.tax,factor_tax:0
 msgid "Multipication factor Tax code"
-msgstr ""
+msgstr "税金コードの倍率"
 
 #. module: account
 #: view:account.fiscal.position:0
 msgid "Mapping"
-msgstr ""
+msgstr "マッピング"
 
 #. module: account
 #: code:addons/account/account_invoice.py:921
@@ -3707,7 +3728,7 @@ msgid ""
 "You cannot create an invoice on a centralised journal. Uncheck the "
 "centralised counterpart box in the related journal from the configuration "
 "menu."
-msgstr ""
+msgstr "一元化された仕訳帳上で請求書の作成はできません。設定メニューから関連した仕訳帳の中の、相手方の一元化ボックスのチェックを外して下さい。"
 
 #. module: account
 #: field:account.account,name:0
@@ -3720,40 +3741,40 @@ msgstr ""
 #: field:account.move.reconcile,name:0
 #: field:account.subscription,name:0
 msgid "Name"
-msgstr ""
+msgstr "名前"
 
 #. module: account
 #: model:ir.model,name:account.model_account_aged_trial_balance
 msgid "Account Aged Trial balance Report"
-msgstr ""
+msgstr "アカウント年齢試算表レポート"
 
 #. module: account
 #: code:addons/account/account_move_line.py:591
 #, python-format
 msgid "You can not create journal items on a closed account %s %s"
-msgstr ""
+msgstr "閉じられたアカウントで仕訳帳項目の作成はできません %s %s"
 
 #. module: account
 #: field:account.move.line,date:0
 msgid "Effective date"
-msgstr ""
+msgstr "有効日"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_bank_tree
 #: model:ir.ui.menu,name:account.menu_action_bank_tree
 msgid "Setup your Bank Accounts"
-msgstr ""
+msgstr "銀行口座の設定"
 
 #. module: account
 #: code:addons/account/wizard/account_move_bank_reconcile.py:53
 #, python-format
 msgid "Standard Encoding"
-msgstr ""
+msgstr "標準エンコーディング"
 
 #. module: account
 #: help:account.journal,analytic_journal_id:0
 msgid "Journal for analytic entries"
-msgstr ""
+msgstr "分析エントリーの仕訳帳"
 
 #. module: account
 #: constraint:account.aged.trial.balance:0
@@ -3773,7 +3794,7 @@ msgstr ""
 msgid ""
 "The fiscalyear, periods or chart of account chosen have to belong to the "
 "same company."
-msgstr ""
+msgstr "選択された会計年度、期間、または勘定科目表は同じ会社に属している必要があります。"
 
 #. module: account
 #: model:ir.actions.todo.category,name:account.category_accounting_configuration
@@ -3784,12 +3805,12 @@ msgstr ""
 #: view:product.template:0
 #: view:res.partner:0
 msgid "Accounting"
-msgstr ""
+msgstr "会計"
 
 #. module: account
 #: view:account.entries.report:0
 msgid "Journal Entries with period in current year"
-msgstr ""
+msgstr "現在年度の期間の仕訳帳エントリー"
 
 #. module: account
 #: help:account.central.journal,amount_currency:0
@@ -3799,24 +3820,24 @@ msgstr ""
 msgid ""
 "Print Report with the currency column if the currency is different then the "
 "company currency"
-msgstr ""
+msgstr "通貨が会社の通貨と異なる場合、通貨カラムを使用したレポートを印刷します。"
 
 #. module: account
 #: help:account.account,unrealized_gain_loss:0
 msgid ""
 "Value of Loss or Gain due to changes in exchange rate when doing multi-"
 "currency transactions."
-msgstr ""
+msgstr "他通貨取引を行う際の為替レート変動に伴う損益の値"
 
 #. module: account
 #: view:account.analytic.line:0
 msgid "General Accounting"
-msgstr ""
+msgstr "一般会計"
 
 #. module: account
 #: report:account.overdue:0
 msgid "Balance :"
-msgstr ""
+msgstr "残高："
 
 #. module: account
 #: help:account.fiscalyear.close,journal_id:0
@@ -3826,34 +3847,36 @@ msgid ""
 "debit/credit accounts, of type 'situation' and with a centralized "
 "counterpart."
 msgstr ""
+"ここでのベストプラクティスは全ての会計年度の開始エントリーを含むための専用の仕訳帳を使うことです。デフォルトの借方 / "
+"貸方アカウントとともにそれを定義し、タイプは状態、そして相手方の一元化としなければならないことに注意して下さい。"
 
 #. module: account
 #: view:account.installer:0
 #: view:wizard.multi.charts.accounts:0
 msgid "title"
-msgstr ""
+msgstr "タイトル"
 
 #. module: account
 #: view:account.invoice:0
 #: view:account.period:0
 #: view:account.subscription:0
 msgid "Set to Draft"
-msgstr ""
+msgstr "ドラフトに設定"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_subscription_form
 msgid "Recurring Lines"
-msgstr ""
+msgstr "定期的行"
 
 #. module: account
 #: field:account.partner.balance,display_partner:0
 msgid "Display Partners"
-msgstr ""
+msgstr "パートナの表示"
 
 #. module: account
 #: view:account.invoice:0
 msgid "Validate"
-msgstr ""
+msgstr "検証"
 
 #. module: account
 #: report:account.analytic.account.cost_ledger:0
@@ -3861,101 +3884,101 @@ msgstr ""
 #: model:ir.actions.act_window,name:account.action_account_analytic_cost
 #: model:ir.actions.report.xml,name:account.account_analytic_account_cost_ledger
 msgid "Cost Ledger"
-msgstr ""
+msgstr "経費元帳"
 
 #. module: account
 #: model:account.financial.report,name:account.account_financial_report_assets0
 msgid "Assets"
-msgstr ""
+msgstr "資産"
 
 #. module: account
 #: view:account.invoice.confirm:0
 msgid "Confirm Invoices"
-msgstr ""
+msgstr "請求書確認"
 
 #. module: account
 #: selection:account.account,currency_mode:0
 msgid "Average Rate"
-msgstr ""
+msgstr "平均レート"
 
 #. module: account
 #: field:account.balance.report,display_account:0
 #: field:account.common.account.report,display_account:0
 #: field:account.report.general.ledger,display_account:0
 msgid "Display Accounts"
-msgstr ""
+msgstr "アカウントの表示"
 
 #. module: account
 #: view:account.state.open:0
 msgid "(Invoice should be unreconciled if you want to open it)"
-msgstr ""
+msgstr "（請求書を開く場合は、それは未調整でなければなりません）"
 
 #. module: account
 #: field:account.chart,period_from:0
 msgid "Start period"
-msgstr ""
+msgstr "開始期間"
 
 #. module: account
 #: field:account.tax,name:0
 #: field:account.tax.template,name:0
 #: report:account.vat.declaration:0
 msgid "Tax Name"
-msgstr ""
+msgstr "税金名称"
 
 #. module: account
 #: model:account.payment.term,name:account.account_payment_term
 #: model:account.payment.term,note:account.account_payment_term
 msgid "30 Days End of Month"
-msgstr ""
+msgstr "30日月末"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_analytic_balance
 #: model:ir.actions.report.xml,name:account.account_analytic_account_balance
 msgid "Analytic Balance"
-msgstr ""
+msgstr "分析的な残高"
 
 #. module: account
 #: help:account.account,active:0
 msgid ""
 "If the active field is set to False, it will allow you to hide the account "
 "without removing it."
-msgstr ""
+msgstr "アクティブ項目がFalseに設定されている場合、それを削除することなくアカウントを非表示にできます。"
 
 #. module: account
 #: view:account.move.line:0
 msgid "Posted Journal Items"
-msgstr ""
+msgstr "記帳済仕訳帳項目"
 
 #. module: account
 #: view:account.tax.template:0
 msgid "Search Tax Templates"
-msgstr ""
+msgstr "税金テンプレート検索"
 
 #. module: account
 #: model:ir.ui.menu,name:account.periodical_processing_journal_entries_validation
 msgid "Draft Entries"
-msgstr ""
+msgstr "ドラフトエントリー"
 
 #. module: account
 #: view:account.payment.term.line:0
 msgid "  Day of the Month= -1"
-msgstr ""
+msgstr "  月の通算日＝-1"
 
 #. module: account
 #: view:account.payment.term.line:0
 msgid "  Number of Days: 30"
-msgstr ""
+msgstr "  日数：30"
 
 #. module: account
 #: field:account.account,shortcut:0
 #: field:account.account.template,shortcut:0
 msgid "Shortcut"
-msgstr ""
+msgstr "ショートカット"
 
 #. module: account
 #: constraint:account.fiscalyear:0
 msgid "Error! The start date of the fiscal year must be before his end date."
-msgstr ""
+msgstr "エラー。会計年度の開始日はその終了日より前でなければなりません。"
 
 #. module: account
 #: view:account.account:0
@@ -3971,12 +3994,12 @@ msgstr ""
 #: field:report.account.receivable,type:0
 #: field:report.account_type.sales,user_type:0
 msgid "Account Type"
-msgstr ""
+msgstr "アカウントタイプ"
 
 #. module: account
 #: view:res.partner:0
 msgid "Bank Account Owner"
-msgstr ""
+msgstr "銀行口座所有者"
 
 #. module: account
 #: report:account.account.balance:0
@@ -3985,12 +4008,12 @@ msgstr ""
 #: model:ir.actions.report.xml,name:account.account_account_balance
 #: model:ir.ui.menu,name:account.menu_general_Balance_report
 msgid "Trial Balance"
-msgstr ""
+msgstr "試算表"
 
 #. module: account
 #: model:ir.model,name:account.model_account_invoice_cancel
 msgid "Cancel the Selected Invoices"
-msgstr ""
+msgstr "選択した請求書のキャンセル"
 
 #. module: account
 #: help:product.category,property_account_income_categ:0
@@ -3998,7 +4021,7 @@ msgstr ""
 msgid ""
 "This account will be used to value outgoing stock for the current product "
 "category using sale price"
-msgstr ""
+msgstr "このアカウントは現在の製品分類において販売価格を使って出荷される在庫の価値のために使われます。"
 
 #. module: account
 #: selection:account.automatic.reconcile,power:0
@@ -4011,30 +4034,30 @@ msgstr ""
 msgid ""
 "You haven't supplied enough argument to compute the initial balance, please "
 "select a period and journal in the context."
-msgstr ""
+msgstr "初期残高を計算するための十分な引数が提供されていません。適切な期間と仕訳帳を選択して下さい。"
 
 #. module: account
 #: model:process.transition,note:account.process_transition_supplieranalyticcost0
 msgid ""
 "Analytic costs (timesheets, some purchased products, ...) come from analytic "
 "accounts. These generate draft supplier invoices."
-msgstr ""
+msgstr "分析コスト（勤務表、幾つかの発注済製品など）は分析アカウントから来ています。これらはドラフトの仕入先請求書を生成します。"
 
 #. module: account
 #: view:account.bank.statement:0
 msgid "Close CashBox"
-msgstr ""
+msgstr "金庫を閉じる"
 
 #. module: account
 #: view:account.invoice.report:0
 #: field:account.invoice.report,due_delay:0
 msgid "Avg. Due Delay"
-msgstr ""
+msgstr "平均遅延"
 
 #. module: account
 #: view:account.entries.report:0
 msgid "Acc.Type"
-msgstr ""
+msgstr "アカウントタイプ"
 
 #. module: account
 #: field:account.entries.report,month:0
@@ -4045,7 +4068,7 @@ msgstr ""
 #: field:report.account.sales,month:0
 #: field:report.account_type.sales,month:0
 msgid "Month"
-msgstr ""
+msgstr "月"
 
 #. module: account
 #: code:addons/account/account_move_line.py:1216
@@ -4055,70 +4078,72 @@ msgid ""
 "some non legal fields or you must unconfirm the journal entry first! \n"
 "%s"
 msgstr ""
+"確認済エントリーにはこの変更はできません。変更できるのは法的な項目以外のみです。または、最初にその仕訳帳エントリーを未確認にする必要があります。 \n"
+"%s"
 
 #. module: account
 #: field:res.company,paypal_account:0
 msgid "Paypal Account"
-msgstr ""
+msgstr "PayPalアカウント"
 
 #. module: account
 #: field:account.invoice.report,uom_name:0
 msgid "Reference UoM"
-msgstr ""
+msgstr "単位の参照"
 
 #. module: account
 #: field:account.account,note:0
 #: field:account.account.template,note:0
 msgid "Note"
-msgstr ""
+msgstr "注記"
 
 #. module: account
 #: selection:account.financial.report,sign:0
 msgid "Reverse balance sign"
-msgstr ""
+msgstr "残高符号の反転"
 
 #. module: account
 #: view:account.analytic.account:0
 msgid "Overdue Account"
-msgstr ""
+msgstr "期限切れアカウント"
 
 #. module: account
 #: selection:account.account.type,report_type:0
 #: code:addons/account/account.py:184
 #, python-format
 msgid "Balance Sheet (Liability account)"
-msgstr ""
+msgstr "貸借対照表（負債勘定）"
 
 #. module: account
 #: help:account.invoice,date_invoice:0
 msgid "Keep empty to use the current date"
-msgstr ""
+msgstr "現在日付を利用するには空のままとして下さい。"
 
 #. module: account
 #: field:account.invoice,tax_line:0
 msgid "Tax Lines"
-msgstr ""
+msgstr "税金行"
 
 #. module: account
 #: field:account.tax,base_code_id:0
 msgid "Account Base Code"
-msgstr ""
+msgstr "アカウント基本コード"
 
 #. module: account
 #: code:addons/account/account_analytic_line.py:93
 #, python-format
 msgid "There is no expense account defined for this product: \"%s\" (id:%d)"
-msgstr ""
+msgstr "この製品のために定義された費用勘定がありません：%s（ID：%d）"
 
 #. module: account
 #: view:res.partner:0
 msgid "Customer Accounting Properties"
-msgstr ""
+msgstr "顧客会計属性"
 
 #. module: account
 #: help:res.company,paypal_account:0
 msgid "Paypal username (usually email) for receiving online payments."
-msgstr ""
+msgstr "オンライン支払を受けるためのPayPalユーザ名（通常はEメール）"
 
 #. module: account
 #: selection:account.aged.trial.balance,target_move:0
@@ -4996,7 +5021,7 @@ msgstr ""
 #: model:account.financial.report,name:account.account_financial_report_balancesheet0
 #: model:ir.ui.menu,name:account.menu_account_report_bs
 msgid "Balance Sheet"
-msgstr ""
+msgstr "貸借対照表"
 
 #. module: account
 #: view:account.general.journal:0
@@ -5500,7 +5525,7 @@ msgstr ""
 #. module: account
 #: help:account.tax,type:0
 msgid "The computation method for the tax amount."
-msgstr ""
+msgstr "税額のための計算方法"
 
 #. module: account
 #: view:account.payment.term.line:0
@@ -5883,6 +5908,8 @@ msgid ""
 "line of the expense account. OpenERP will propose to you automatically the "
 "Tax related to this account and the counterpart \"Account Payable\"."
 msgstr ""
+"このビューはOpenERPにすばやくエントリーを記録するために会計士によって使われます。仕入先請求書を記録する場合、費用アカウントの行を記録することにより"
+"開始します。OpenERPはこのアカウントと関連する税金と相手方の買掛金を提案します。"
 
 #. module: account
 #: field:account.entries.report,date_created:0
@@ -6424,13 +6451,17 @@ msgid ""
 "account. From this view, you can create and manage the account types you "
 "need for your company."
 msgstr ""
+"アカウントタイプはそれぞれの仕訳帳においてどのようにアカウントが使われるかを決定するために使われます。アカウントタイプの繰越方法は年次決算のプロセスを決定"
+"します。貸借対照表や損益計算書のようなレポートは分類（利益 / "
+"損失または貸借対照表）を使用します。例えば、アカウントタイプ資産勘定や費用勘定または買掛金にリンクすることができます。このビューから会社に必要とするアカウ"
+"ントタイプの作成と管理ができます。"
 
 #. module: account
 #: selection:account.account.type,report_type:0
 #: code:addons/account/account.py:183
 #, python-format
 msgid "Balance Sheet (Asset account)"
-msgstr ""
+msgstr "貸借対照表（資産勘定）"
 
 #. module: account
 #: model:ir.actions.act_window,help:account.action_account_bank_reconcile_tree
@@ -6596,6 +6627,8 @@ msgid ""
 "reconcile in a series of accounts. It finds entries for each partner where "
 "the amounts correspond."
 msgstr ""
+"支払いとみなされる請求書のため、請求書エントリーは通常の支払いでは相手方とともに調整されなければなりません。自動調整機能では、OpenERPは調整のため一"
+"連のアカウントの中を独自の検索を行います。それは金額が対応する各パートナのエントリーを見つけます。"
 
 #. module: account
 #: view:account.move:0
@@ -6732,7 +6765,7 @@ msgid ""
 "This report allows you to print or generate a pdf of your trial balance "
 "allowing you to quickly check the balance of each of your accounts in a "
 "single report"
-msgstr ""
+msgstr "このレポートは１枚のレポートでアカウントのそれぞれの残高をすばやくチェックできる試算表であり、印刷、あるいはPDFの作成ができます。"
 
 #. module: account
 #: help:account.move,to_check:0
@@ -6873,6 +6906,9 @@ msgid ""
 "you request an interval of 30 days OpenERP generates an analysis of "
 "creditors for the past month, past two months, and so on. "
 msgstr ""
+"パートナ残高年齢表は間隔毎の売掛金のより詳細なレポートです。このレポートを開く時に、OpenERPは会社の名前、会計年度、そして分析のための間隔のサイズ（"
+"日数）を尋ねます。OpenERPは次に期間毎の貸方のテーブルを計算します。仮に、30日間の間隔を要求した場合、OpenERPはこれまでの１ヶ月間、過去の２"
+"ヶ月などの貸方の分析を生成します。 "
 
 #. module: account
 #: field:account.invoice,origin:0
@@ -7089,6 +7125,8 @@ msgid ""
 "new counterpart but will share the same counterpart. This is used in fiscal "
 "year closing."
 msgstr ""
+"この仕訳帳の各エントリーは新しい相手方を作成しないが、同じ相手方を共有することを決定するために、このボックスをチェックして下さい。これは会計年度を閉じると"
+"きに使われます。"
 
 #. module: account
 #: field:account.bank.statement,closing_date:0
@@ -7423,7 +7461,7 @@ msgstr ""
 #: help:account.account.type,report_type:0
 msgid ""
 "This field is used to generate legal reports: profit and loss, balance sheet."
-msgstr ""
+msgstr "この項目は一般的な法定レポートに使用されます：損益計算書、貸借対照表"
 
 #. module: account
 #: model:ir.actions.act_window,help:account.action_review_payment_terms_installer
@@ -9120,7 +9158,7 @@ msgstr ""
 msgid ""
 "The journal must have centralised counterpart without the Skipping draft "
 "state option checked!"
-msgstr ""
+msgstr "仕訳帳はドラフト状態オプションの設定をスキップすることなしに、相手方の一元化を持つ必要があります。"
 
 #. module: account
 #: view:account.invoice.report:0
@@ -9703,7 +9741,7 @@ msgstr ""
 #: model:ir.actions.act_window,name:account.action_account_gain_loss
 #: model:ir.ui.menu,name:account.menu_unrealized_gains_losses
 msgid "Unrealized Gain or Loss"
-msgstr ""
+msgstr "評価損益"
 
 #. module: account
 #: view:account.fiscalyear:0
@@ -9823,7 +9861,7 @@ msgstr ""
 #. module: account
 #: model:ir.model,name:account.model_account_balance_report
 msgid "Trial Balance Report"
-msgstr ""
+msgstr "試算表レポート"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_bank_statement_draft_tree
@@ -10057,7 +10095,7 @@ msgstr ""
 #: model:ir.actions.act_window,name:account.action_aged_receivable_graph
 #: view:report.aged.receivable:0
 msgid "Aged Receivable"
-msgstr ""
+msgstr "売掛金年齢表"
 
 #. module: account
 #: field:account.tax,applicable_type:0
diff --git a/addons/account/i18n/mn.po b/addons/account/i18n/mn.po
index f59cd58f8a1..e755f84ce99 100644
--- a/addons/account/i18n/mn.po
+++ b/addons/account/i18n/mn.po
@@ -8,20 +8,20 @@ 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-02-18 07:21+0000\n"
-"Last-Translator: Unurjargal <unuruu25@gmail.com>\n"
+"PO-Revision-Date: 2012-04-20 09:50+0000\n"
+"Last-Translator: gobi <Unknown>\n"
 "Language-Team: Mongolian <mn@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-02-19 05:43+0000\n"
-"X-Generator: Launchpad (build 14814)\n"
+"X-Launchpad-Export-Date: 2012-04-21 05:00+0000\n"
+"X-Generator: Launchpad (build 15120)\n"
 
 #. module: account
 #: view:account.invoice.report:0
 #: view:analytic.entries.report:0
 msgid "last month"
-msgstr ""
+msgstr "сүүлийн сар"
 
 #. module: account
 #: model:process.transition,name:account.process_transition_supplierreconcilepaid0
@@ -39,6 +39,8 @@ msgid ""
 "Determine the display order in the report 'Accounting \\ Reporting \\ "
 "Generic Reporting \\ Taxes \\ Taxes Report'"
 msgstr ""
+"'Санхүү \\ Тайлан \\ Тайлан үүсгэх \\ Татвар \\ Татварын Тайлан' тайланд "
+"дэлгэцийн дарааллыг тодоруул"
 
 #. module: account
 #: view:account.move.reconcile:0
@@ -56,7 +58,7 @@ msgstr "Дансны статистик"
 #. module: account
 #: view:account.invoice:0
 msgid "Proforma/Open/Paid Invoices"
-msgstr ""
+msgstr "Ноорог/Нээлттэй/Төлөгдсөн нэхэмжлэх"
 
 #. module: account
 #: field:report.invoice.created,residual:0
@@ -82,7 +84,7 @@ msgstr "Дэд татвар тодорхойлолт"
 #: code:addons/account/account_bank_statement.py:302
 #, python-format
 msgid "Journal item \"%s\" is not valid."
-msgstr ""
+msgstr "Журналын \"%s\" гэсэн зүйл зөв биү."
 
 #. module: account
 #: model:ir.model,name:account.model_report_aged_receivable
@@ -92,7 +94,7 @@ msgstr "Өнөөдрийг хүртэлх авлагын насжилт"
 #. module: account
 #: model:process.transition,name:account.process_transition_invoiceimport0
 msgid "Import from invoice or payment"
-msgstr ""
+msgstr "Нэхэмжлэх эсвэл төлбөрөөс импортлох"
 
 #. module: account
 #: model:ir.model,name:account.model_wizard_multi_charts_accounts
@@ -119,6 +121,8 @@ msgid ""
 "Configuration error! The currency chosen should be shared by the default "
 "accounts too."
 msgstr ""
+"Тохиргооны алдаа! Сонгосон валют нь анхны дансдад бас хуваалцсан байх "
+"хэрэгтэй"
 
 #. module: account
 #: report:account.invoice:0
@@ -156,18 +160,20 @@ msgid ""
 "If the active field is set to False, it will allow you to hide the payment "
 "term without removing it."
 msgstr ""
+"Хэрэв идэвхтэй талбар Худал гэж тааруулагдсан бол, төлбөрийн хуваарийг "
+"устгалгүйгээр нуух боломжийг олгоно."
 
 #. module: account
 #: code:addons/account/account_invoice.py:1428
 #, python-format
 msgid "Warning!"
-msgstr ""
+msgstr "Анхааруулга!"
 
 #. module: account
 #: code:addons/account/account.py:3112
 #, python-format
 msgid "Miscellaneous Journal"
-msgstr ""
+msgstr "Бусад Журнал"
 
 #. module: account
 #: field:account.fiscal.position.account,account_src_id:0
@@ -188,7 +194,7 @@ msgstr "Сүүлийн 15 өдөрт үүссэн нэхэмжлэлүүд"
 #. module: account
 #: field:accounting.report,label_filter:0
 msgid "Column Label"
-msgstr ""
+msgstr "Баганын Шошго"
 
 #. module: account
 #: code:addons/account/wizard/account_move_journal.py:95
diff --git a/addons/account_coda/i18n/zh_CN.po b/addons/account_coda/i18n/zh_CN.po
index 4324a9ceb30..f6281544100 100644
--- a/addons/account_coda/i18n/zh_CN.po
+++ b/addons/account_coda/i18n/zh_CN.po
@@ -8,19 +8,19 @@ 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: 2011-01-12 12:58+0000\n"
-"Last-Translator: ZhangCheng <skyxxzc@gmail.com>\n"
+"PO-Revision-Date: 2012-04-21 06:27+0000\n"
+"Last-Translator: chiachen <Unknown>\n"
 "Language-Team: Chinese (Simplified) <zh_CN@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-02-09 06:54+0000\n"
-"X-Generator: Launchpad (build 14763)\n"
+"X-Launchpad-Export-Date: 2012-04-22 04:45+0000\n"
+"X-Generator: Launchpad (build 15120)\n"
 
 #. module: account_coda
 #: model:account.coda.trans.code,description:account_coda.actcc_09_21
 msgid "Cash withdrawal on card (PROTON)"
-msgstr ""
+msgstr "信用卡取现"
 
 #. module: account_coda
 #: model:account.coda.trans.category,description:account_coda.actrca_412
@@ -65,12 +65,12 @@ msgstr ""
 #. module: account_coda
 #: model:account.coda.trans.category,description:account_coda.actrca_031
 msgid "Charges foreign cheque"
-msgstr ""
+msgstr "支付外国支票"
 
 #. module: account_coda
 #: model:account.coda.trans.category,description:account_coda.actrca_002
 msgid "Interest paid"
-msgstr ""
+msgstr "已支付的利息"
 
 #. module: account_coda
 #: field:account.coda.trans.type,parent_id:0
@@ -132,7 +132,7 @@ msgstr ""
 #. module: account_coda
 #: model:account.coda.trans.category,description:account_coda.actrca_212
 msgid "Warehousing fee"
-msgstr ""
+msgstr "仓储费用"
 
 #. module: account_coda
 #: code:addons/account_coda/account_coda.py:300
@@ -187,7 +187,7 @@ msgstr ""
 #. module: account_coda
 #: field:coda.bank.statement.line,amount:0
 msgid "Amount"
-msgstr ""
+msgstr "金额"
 
 #. module: account_coda
 #: model:account.coda.trans.code,comment:account_coda.actcc_11_70
diff --git a/addons/base_vat/i18n/ja.po b/addons/base_vat/i18n/ja.po
index aadd1a69597..f71ee044124 100644
--- a/addons/base_vat/i18n/ja.po
+++ b/addons/base_vat/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-01 06:27+0000\n"
+"PO-Revision-Date: 2012-04-20 17:45+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-02 04:37+0000\n"
-"X-Generator: Launchpad (build 15032)\n"
+"X-Launchpad-Export-Date: 2012-04-21 05:00+0000\n"
+"X-Generator: Launchpad (build 15120)\n"
 
 #. module: base_vat
 #: code:addons/base_vat/base_vat.py:141
@@ -35,12 +35,12 @@ msgstr "会社名は固有でなければいけません。"
 #. module: base_vat
 #: constraint:res.partner:0
 msgid "Error ! You cannot create recursive associated members."
-msgstr "エラー！再帰的な関係となる会員を作ることはできません。"
+msgstr "エラー：重複した会員を作ることはできません。"
 
 #. module: base_vat
 #: field:res.company,vat_check_vies:0
 msgid "VIES VAT Check"
-msgstr "VIEAの付加価値税をチェック"
+msgstr "VIES付加価値税のチェック"
 
 #. module: base_vat
 #: model:ir.model,name:base_vat.model_res_company
@@ -50,7 +50,7 @@ msgstr "会社"
 #. module: base_vat
 #: constraint:res.company:0
 msgid "Error! You can not create recursive companies."
-msgstr "エラー！再帰的な関係となる会社を作ることはできません。"
+msgstr "エラー。再帰的な会社を作ることはできません。"
 
 #. module: base_vat
 #: help:res.partner,vat_subjected:0
diff --git a/addons/board/i18n/ja.po b/addons/board/i18n/ja.po
index 1114a624c53..d222850a2bb 100644
--- a/addons/board/i18n/ja.po
+++ b/addons/board/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-04 01:20+0000\n"
+"PO-Revision-Date: 2012-04-21 18: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-05 04:43+0000\n"
-"X-Generator: Launchpad (build 15060)\n"
+"X-Launchpad-Export-Date: 2012-04-22 04:44+0000\n"
+"X-Generator: Launchpad (build 15120)\n"
 
 #. module: board
 #: view:res.log.report:0
@@ -30,7 +30,7 @@ msgstr "メニュー作成"
 #. module: board
 #: view:board.menu.create:0
 msgid "Menu Information"
-msgstr ""
+msgstr "メニュー情報"
 
 #. module: board
 #: view:res.users:0
diff --git a/addons/crm_claim/i18n/gu.po b/addons/crm_claim/i18n/gu.po
new file mode 100644
index 00000000000..f5085e2985b
--- /dev/null
+++ b/addons/crm_claim/i18n/gu.po
@@ -0,0 +1,793 @@
+# 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-20 11:39+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-21 05:01+0000\n"
+"X-Generator: Launchpad (build 15120)\n"
+
+#. module: crm_claim
+#: field:crm.claim.report,nbr:0
+msgid "# of Cases"
+msgstr ""
+
+#. module: crm_claim
+#: view:crm.claim:0
+#: view:crm.claim.report:0
+msgid "Group By..."
+msgstr "ગ્રુપ દ્વારા..."
+
+#. module: crm_claim
+#: view:crm.claim:0
+msgid "Responsibilities"
+msgstr "જવાબદારીઓ"
+
+#. module: crm_claim
+#: field:crm.claim,date_action_next:0
+msgid "Next Action Date"
+msgstr "આગળ ની ક્રિયા તારીખ"
+
+#. module: crm_claim
+#: selection:crm.claim.report,month:0
+msgid "March"
+msgstr "માર્ચ"
+
+#. module: crm_claim
+#: field:crm.claim.report,delay_close:0
+msgid "Delay to close"
+msgstr "બંધ કરવા માં વિલંબ"
+
+#. module: crm_claim
+#: field:crm.claim,resolution:0
+msgid "Resolution"
+msgstr ""
+
+#. module: crm_claim
+#: field:crm.claim,company_id:0
+#: view:crm.claim.report:0
+#: field:crm.claim.report,company_id:0
+msgid "Company"
+msgstr "કંપની"
+
+#. module: crm_claim
+#: field:crm.claim,email_cc:0
+msgid "Watchers Emails"
+msgstr "જોનાર ના ઈમેઈલો"
+
+#. module: crm_claim
+#: view:crm.claim.report:0
+msgid "#Claim"
+msgstr ""
+
+#. module: crm_claim
+#: model:ir.actions.act_window,help:crm_claim.crm_claim_stage_act
+msgid ""
+"You can create claim stages to categorize the status of every claim entered "
+"in the system. The stages define all the steps required for the resolution "
+"of a claim."
+msgstr ""
+
+#. module: crm_claim
+#: code:addons/crm_claim/crm_claim.py:132
+#, python-format
+msgid "The claim '%s' has been opened."
+msgstr ""
+
+#. module: crm_claim
+#: view:crm.claim:0
+msgid "Date Closed"
+msgstr ""
+
+#. module: crm_claim
+#: view:crm.claim.report:0
+#: field:crm.claim.report,day:0
+msgid "Day"
+msgstr "દિવસ"
+
+#. module: crm_claim
+#: view:crm.claim:0
+msgid "Add Internal Note"
+msgstr "આંતરિક નોંધ ઉમેરો"
+
+#. module: crm_claim
+#: help:crm.claim,section_id:0
+msgid ""
+"Sales team to which Case belongs to.Define Responsible user and Email "
+"account for mail gateway."
+msgstr ""
+
+#. module: crm_claim
+#: view:crm.claim:0
+msgid "Claim Description"
+msgstr "દાવા વર્ણન"
+
+#. module: crm_claim
+#: field:crm.claim,message_ids:0
+msgid "Messages"
+msgstr "સંદેશાઓ"
+
+#. module: crm_claim
+#: model:crm.case.categ,name:crm_claim.categ_claim1
+msgid "Factual Claims"
+msgstr ""
+
+#. module: crm_claim
+#: selection:crm.claim,state:0
+#: selection:crm.claim.report,state:0
+msgid "Cancelled"
+msgstr "રદ થયેલ"
+
+#. module: crm_claim
+#: model:crm.case.resource.type,name:crm_claim.type_claim2
+msgid "Preventive"
+msgstr "Preventive"
+
+#. module: crm_claim
+#: field:crm.claim.report,date_closed:0
+msgid "Close Date"
+msgstr "બંધ તારીખ"
+
+#. module: crm_claim
+#: field:crm.claim,ref:0
+msgid "Reference"
+msgstr "સંદર્ભ"
+
+#. module: crm_claim
+#: view:crm.claim.report:0
+msgid "Date of claim"
+msgstr "દાવો ની તારીખ"
+
+#. module: crm_claim
+#: view:crm.claim:0
+msgid "All pending Claims"
+msgstr "બધા બાકી દાવા"
+
+#. module: crm_claim
+#: view:crm.claim.report:0
+msgid "# Mails"
+msgstr "# ઈમેઈલો"
+
+#. module: crm_claim
+#: view:crm.claim:0
+msgid "Reset to Draft"
+msgstr ""
+
+#. module: crm_claim
+#: view:crm.claim:0
+#: field:crm.claim,date_deadline:0
+#: field:crm.claim.report,date_deadline:0
+msgid "Deadline"
+msgstr ""
+
+#. module: crm_claim
+#: view:crm.claim:0
+#: field:crm.claim,partner_id:0
+#: view:crm.claim.report:0
+#: field:crm.claim.report,partner_id:0
+#: model:ir.model,name:crm_claim.model_res_partner
+msgid "Partner"
+msgstr "ભાગીદાર"
+
+#. module: crm_claim
+#: view:crm.claim.report:0
+msgid "Month of claim"
+msgstr "દાવા નો મહિનો"
+
+#. module: crm_claim
+#: selection:crm.claim,type_action:0
+#: selection:crm.claim.report,type_action:0
+msgid "Preventive Action"
+msgstr ""
+
+#. module: crm_claim
+#: field:crm.claim.report,section_id:0
+msgid "Section"
+msgstr "વિભાગ"
+
+#. module: crm_claim
+#: view:crm.claim:0
+msgid "Root Causes"
+msgstr ""
+
+#. module: crm_claim
+#: field:crm.claim,user_fault:0
+msgid "Trouble Responsible"
+msgstr "મુશ્કેલી માટે જવાબદાર"
+
+#. module: crm_claim
+#: field:crm.claim,priority:0
+#: view:crm.claim.report:0
+#: field:crm.claim.report,priority:0
+msgid "Priority"
+msgstr "પ્રાથમિકતા"
+
+#. module: crm_claim
+#: view:crm.claim:0
+msgid "Send New Email"
+msgstr "નવું ઇમેઇલ મોકલો"
+
+#. module: crm_claim
+#: view:crm.claim:0
+#: selection:crm.claim,state:0
+#: view:crm.claim.report:0
+msgid "New"
+msgstr "નવું"
+
+#. module: crm_claim
+#: view:crm.claim:0
+#: view:crm.claim.report:0
+msgid "Type"
+msgstr "પ્રકાર"
+
+#. module: crm_claim
+#: field:crm.claim,email_from:0
+msgid "Email"
+msgstr "ઈ-મેઈલ"
+
+#. module: crm_claim
+#: selection:crm.claim,priority:0
+#: selection:crm.claim.report,priority:0
+msgid "Lowest"
+msgstr "નીચામાં નીચું"
+
+#. module: crm_claim
+#: field:crm.claim,action_next:0
+msgid "Next Action"
+msgstr ""
+
+#. module: crm_claim
+#: view:crm.claim.report:0
+msgid "My Sales Team(s)"
+msgstr ""
+
+#. module: crm_claim
+#: model:crm.case.stage,name:crm_claim.stage_claim3
+msgid "Won't fix"
+msgstr ""
+
+#. module: crm_claim
+#: field:crm.claim,create_date:0
+msgid "Creation Date"
+msgstr "સર્જન તારીખ"
+
+#. module: crm_claim
+#: field:crm.claim,name:0
+msgid "Claim Subject"
+msgstr ""
+
+#. module: crm_claim
+#: model:ir.actions.act_window,help:crm_claim.action_report_crm_claim
+msgid ""
+"Have a general overview of all claims processed in the system by sorting "
+"them with specific criteria."
+msgstr ""
+
+#. module: crm_claim
+#: selection:crm.claim.report,month:0
+msgid "July"
+msgstr ""
+
+#. module: crm_claim
+#: model:ir.actions.act_window,name:crm_claim.crm_claim_stage_act
+msgid "Claim Stages"
+msgstr ""
+
+#. module: crm_claim
+#: model:ir.ui.menu,name:crm_claim.menu_crm_case_claim-act
+msgid "Categories"
+msgstr "વર્ગો"
+
+#. module: crm_claim
+#: view:crm.claim:0
+#: field:crm.claim,stage_id:0
+#: view:crm.claim.report:0
+#: field:crm.claim.report,stage_id:0
+msgid "Stage"
+msgstr ""
+
+#. module: crm_claim
+#: view:crm.claim:0
+msgid "History Information"
+msgstr ""
+
+#. module: crm_claim
+#: view:crm.claim:0
+msgid "Dates"
+msgstr ""
+
+#. module: crm_claim
+#: view:crm.claim:0
+msgid "Contact"
+msgstr ""
+
+#. module: crm_claim
+#: view:crm.claim.report:0
+msgid "Month-1"
+msgstr ""
+
+#. module: crm_claim
+#: model:ir.actions.act_window,name:crm_claim.action_report_crm_claim
+#: model:ir.ui.menu,name:crm_claim.menu_report_crm_claim_tree
+msgid "Claims Analysis"
+msgstr ""
+
+#. module: crm_claim
+#: help:crm.claim.report,delay_close:0
+msgid "Number of Days to close the case"
+msgstr ""
+
+#. module: crm_claim
+#: model:ir.model,name:crm_claim.model_crm_claim_report
+msgid "CRM Claim Report"
+msgstr ""
+
+#. module: crm_claim
+#: model:crm.case.stage,name:crm_claim.stage_claim1
+msgid "Accepted as Claim"
+msgstr ""
+
+#. module: crm_claim
+#: model:crm.case.resource.type,name:crm_claim.type_claim1
+msgid "Corrective"
+msgstr ""
+
+#. module: crm_claim
+#: selection:crm.claim.report,month:0
+msgid "September"
+msgstr ""
+
+#. module: crm_claim
+#: selection:crm.claim.report,month:0
+msgid "December"
+msgstr ""
+
+#. module: crm_claim
+#: view:crm.claim.report:0
+#: field:crm.claim.report,month:0
+msgid "Month"
+msgstr ""
+
+#. module: crm_claim
+#: field:crm.claim,type_action:0
+#: view:crm.claim.report:0
+#: field:crm.claim.report,type_action:0
+msgid "Action Type"
+msgstr ""
+
+#. module: crm_claim
+#: field:crm.claim,write_date:0
+msgid "Update Date"
+msgstr ""
+
+#. module: crm_claim
+#: view:crm.claim.report:0
+msgid "Year of claim"
+msgstr ""
+
+#. module: crm_claim
+#: view:crm.claim.report:0
+msgid "Salesman"
+msgstr ""
+
+#. module: crm_claim
+#: field:crm.claim,categ_id:0
+#: view:crm.claim.report:0
+#: field:crm.claim.report,categ_id:0
+msgid "Category"
+msgstr ""
+
+#. module: crm_claim
+#: model:crm.case.categ,name:crm_claim.categ_claim2
+msgid "Value Claims"
+msgstr ""
+
+#. module: crm_claim
+#: view:crm.claim:0
+msgid "Responsible User"
+msgstr ""
+
+#. module: crm_claim
+#: help:crm.claim,email_cc:0
+msgid ""
+"These email addresses will be added to the CC field of all inbound and "
+"outbound emails for this record before being sent. Separate multiple email "
+"addresses with a comma"
+msgstr ""
+
+#. module: crm_claim
+#: selection:crm.claim.report,state:0
+msgid "Draft"
+msgstr ""
+
+#. module: crm_claim
+#: selection:crm.claim,priority:0
+#: selection:crm.claim.report,priority:0
+msgid "Low"
+msgstr ""
+
+#. module: crm_claim
+#: field:crm.claim,date_closed:0
+#: selection:crm.claim,state:0
+#: selection:crm.claim.report,state:0
+msgid "Closed"
+msgstr ""
+
+#. module: crm_claim
+#: view:crm.claim:0
+msgid "Reply"
+msgstr ""
+
+#. module: crm_claim
+#: view:crm.claim:0
+#: selection:crm.claim,state:0
+#: view:crm.claim.report:0
+#: selection:crm.claim.report,state:0
+msgid "Pending"
+msgstr ""
+
+#. module: crm_claim
+#: view:crm.claim:0
+msgid "Communication & History"
+msgstr ""
+
+#. module: crm_claim
+#: selection:crm.claim.report,month:0
+msgid "August"
+msgstr ""
+
+#. module: crm_claim
+#: selection:crm.claim,priority:0
+#: selection:crm.claim.report,priority:0
+msgid "Normal"
+msgstr ""
+
+#. module: crm_claim
+#: view:crm.claim:0
+msgid "Global CC"
+msgstr ""
+
+#. module: crm_claim
+#: selection:crm.claim.report,month:0
+msgid "June"
+msgstr ""
+
+#. module: crm_claim
+#: view:res.partner:0
+msgid "Partners Claim"
+msgstr ""
+
+#. module: crm_claim
+#: field:crm.claim,partner_phone:0
+msgid "Phone"
+msgstr ""
+
+#. module: crm_claim
+#: field:crm.claim.report,user_id:0
+msgid "User"
+msgstr ""
+
+#. module: crm_claim
+#: field:crm.claim,active:0
+msgid "Active"
+msgstr ""
+
+#. module: crm_claim
+#: selection:crm.claim.report,month:0
+msgid "November"
+msgstr ""
+
+#. module: crm_claim
+#: view:crm.claim.report:0
+msgid "Extended Filters..."
+msgstr ""
+
+#. module: crm_claim
+#: view:crm.claim:0
+msgid "Closure"
+msgstr ""
+
+#. module: crm_claim
+#: view:crm.claim.report:0
+msgid "Search"
+msgstr ""
+
+#. module: crm_claim
+#: selection:crm.claim.report,month:0
+msgid "October"
+msgstr ""
+
+#. module: crm_claim
+#: selection:crm.claim.report,month:0
+msgid "January"
+msgstr ""
+
+#. module: crm_claim
+#: view:crm.claim:0
+#: field:crm.claim,date:0
+msgid "Claim Date"
+msgstr ""
+
+#. module: crm_claim
+#: help:crm.claim,email_from:0
+msgid "These people will receive email."
+msgstr ""
+
+#. module: crm_claim
+#: model:ir.actions.act_window,name:crm_claim.crm_claim_categ_action
+msgid "Claim Categories"
+msgstr ""
+
+#. module: crm_claim
+#: view:crm.claim:0
+#: view:crm.claim.report:0
+#: model:ir.actions.act_window,name:crm_claim.act_claim_partner
+#: model:ir.actions.act_window,name:crm_claim.act_claim_partner_address
+#: model:ir.actions.act_window,name:crm_claim.crm_case_categ_claim0
+#: model:ir.ui.menu,name:crm_claim.menu_crm_case_claims
+#: field:res.partner,claims_ids:0
+msgid "Claims"
+msgstr ""
+
+#. module: crm_claim
+#: selection:crm.claim,type_action:0
+#: selection:crm.claim.report,type_action:0
+msgid "Corrective Action"
+msgstr ""
+
+#. module: crm_claim
+#: model:crm.case.categ,name:crm_claim.categ_claim3
+msgid "Policy Claims"
+msgstr ""
+
+#. module: crm_claim
+#: view:crm.claim:0
+msgid "History"
+msgstr ""
+
+#. module: crm_claim
+#: model:ir.model,name:crm_claim.model_crm_claim
+#: model:ir.ui.menu,name:crm_claim.menu_config_claim
+msgid "Claim"
+msgstr ""
+
+#. module: crm_claim
+#: selection:crm.claim,priority:0
+#: selection:crm.claim.report,priority:0
+msgid "Highest"
+msgstr ""
+
+#. module: crm_claim
+#: field:crm.claim,partner_address_id:0
+msgid "Partner Contact"
+msgstr ""
+
+#. module: crm_claim
+#: view:crm.claim:0
+#: field:crm.claim,state:0
+#: view:crm.claim.report:0
+#: field:crm.claim.report,state:0
+msgid "State"
+msgstr ""
+
+#. module: crm_claim
+#: view:crm.claim:0
+#: view:crm.claim.report:0
+msgid "Done"
+msgstr ""
+
+#. module: crm_claim
+#: view:crm.claim:0
+msgid "Claim Reporter"
+msgstr ""
+
+#. module: crm_claim
+#: view:crm.claim:0
+#: view:crm.claim.report:0
+msgid "Cancel"
+msgstr ""
+
+#. module: crm_claim
+#: view:crm.claim:0
+msgid "Close"
+msgstr ""
+
+#. module: crm_claim
+#: view:crm.claim:0
+#: view:crm.claim.report:0
+#: selection:crm.claim.report,state:0
+msgid "Open"
+msgstr ""
+
+#. module: crm_claim
+#: view:crm.claim:0
+msgid "New Claims"
+msgstr ""
+
+#. module: crm_claim
+#: view:crm.claim:0
+#: selection:crm.claim,state:0
+msgid "In Progress"
+msgstr ""
+
+#. module: crm_claim
+#: view:crm.claim:0
+#: field:crm.claim,user_id:0
+msgid "Responsible"
+msgstr ""
+
+#. module: crm_claim
+#: view:crm.claim.report:0
+msgid "Claims created in current year"
+msgstr ""
+
+#. module: crm_claim
+#: view:crm.claim:0
+msgid "Unassigned Claims"
+msgstr ""
+
+#. module: crm_claim
+#: view:crm.claim.report:0
+msgid "Claims created in current month"
+msgstr ""
+
+#. module: crm_claim
+#: field:crm.claim.report,delay_expected:0
+msgid "Overpassed Deadline"
+msgstr ""
+
+#. module: crm_claim
+#: field:crm.claim,cause:0
+msgid "Root Cause"
+msgstr ""
+
+#. module: crm_claim
+#: view:crm.claim:0
+msgid "Claim/Action Description"
+msgstr ""
+
+#. module: crm_claim
+#: field:crm.claim,description:0
+msgid "Description"
+msgstr ""
+
+#. module: crm_claim
+#: view:crm.claim:0
+msgid "Search Claims"
+msgstr ""
+
+#. module: crm_claim
+#: field:crm.claim,section_id:0
+#: view:crm.claim.report:0
+msgid "Sales Team"
+msgstr ""
+
+#. module: crm_claim
+#: selection:crm.claim.report,month:0
+msgid "May"
+msgstr ""
+
+#. module: crm_claim
+#: view:crm.claim:0
+msgid "Resolution Actions"
+msgstr ""
+
+#. module: crm_claim
+#: model:ir.actions.act_window,help:crm_claim.crm_case_categ_claim0
+msgid ""
+"Record and track your customers' claims. Claims may be linked to a sales "
+"order or a lot. You can send emails with attachments and keep the full "
+"history for a claim (emails sent, intervention type and so on). Claims may "
+"automatically be linked to an email address using the mail gateway module."
+msgstr ""
+
+#. module: crm_claim
+#: field:crm.claim.report,email:0
+msgid "# Emails"
+msgstr ""
+
+#. module: crm_claim
+#: model:crm.case.stage,name:crm_claim.stage_claim2
+msgid "Actions Done"
+msgstr ""
+
+#. module: crm_claim
+#: view:crm.claim.report:0
+msgid "Claims created in last month"
+msgstr ""
+
+#. module: crm_claim
+#: model:crm.case.stage,name:crm_claim.stage_claim5
+msgid "Actions Defined"
+msgstr ""
+
+#. module: crm_claim
+#: view:crm.claim:0
+msgid "Follow Up"
+msgstr ""
+
+#. module: crm_claim
+#: help:crm.claim,state:0
+msgid ""
+"The state is set to 'Draft', when a case is created.                         "
+"         \n"
+"If the case is in progress the state is set to 'Open'.                       "
+"           \n"
+"When the case is over, the state is set to 'Done'.                           "
+"       \n"
+"If the case needs to be reviewed then the state is set to 'Pending'."
+msgstr ""
+
+#. module: crm_claim
+#: selection:crm.claim.report,month:0
+msgid "February"
+msgstr ""
+
+#. module: crm_claim
+#: view:crm.claim.report:0
+#: field:crm.claim.report,name:0
+msgid "Year"
+msgstr ""
+
+#. module: crm_claim
+#: view:crm.claim.report:0
+msgid "My company"
+msgstr ""
+
+#. module: crm_claim
+#: selection:crm.claim.report,month:0
+msgid "April"
+msgstr ""
+
+#. module: crm_claim
+#: view:crm.claim.report:0
+msgid "My Case(s)"
+msgstr ""
+
+#. module: crm_claim
+#: field:crm.claim,id:0
+msgid "ID"
+msgstr ""
+
+#. module: crm_claim
+#: constraint:res.partner:0
+msgid "Error ! You cannot create recursive associated members."
+msgstr ""
+
+#. module: crm_claim
+#: view:crm.claim:0
+msgid "Actions"
+msgstr ""
+
+#. module: crm_claim
+#: selection:crm.claim,priority:0
+#: selection:crm.claim.report,priority:0
+msgid "High"
+msgstr ""
+
+#. module: crm_claim
+#: model:ir.actions.act_window,help:crm_claim.crm_claim_categ_action
+msgid ""
+"Create claim categories to better manage and classify your claims. Some "
+"example of claims can be: preventive action, corrective action."
+msgstr ""
+
+#. module: crm_claim
+#: field:crm.claim.report,create_date:0
+msgid "Create Date"
+msgstr ""
+
+#. module: crm_claim
+#: view:crm.claim:0
+msgid "In Progress Claims"
+msgstr ""
diff --git a/addons/crm_fundraising/i18n/ja.po b/addons/crm_fundraising/i18n/ja.po
new file mode 100644
index 00000000000..e9b65a2a7dc
--- /dev/null
+++ b/addons/crm_fundraising/i18n/ja.po
@@ -0,0 +1,790 @@
+# 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-23 01: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-23 04:46+0000\n"
+"X-Generator: Launchpad (build 15135)\n"
+
+#. module: crm_fundraising
+#: field:crm.fundraising,planned_revenue:0
+msgid "Planned Revenue"
+msgstr "売上予定"
+
+#. module: crm_fundraising
+#: field:crm.fundraising.report,nbr:0
+msgid "# of Cases"
+msgstr "事例の数"
+
+#. module: crm_fundraising
+#: view:crm.fundraising:0
+#: view:crm.fundraising.report:0
+msgid "Group By..."
+msgstr "グループ化…"
+
+#. module: crm_fundraising
+#: field:crm.fundraising.report,probability:0
+msgid "Avg. Probability"
+msgstr "平均確率"
+
+#. module: crm_fundraising
+#: selection:crm.fundraising.report,month:0
+msgid "March"
+msgstr "3月"
+
+#. module: crm_fundraising
+#: field:crm.fundraising.report,delay_close:0
+msgid "Delay to close"
+msgstr "締めを延期する"
+
+#. module: crm_fundraising
+#: field:crm.fundraising,company_id:0
+#: view:crm.fundraising.report:0
+#: field:crm.fundraising.report,company_id:0
+msgid "Company"
+msgstr "会社"
+
+#. module: crm_fundraising
+#: model:ir.actions.act_window,name:crm_fundraising.crm_fund_categ_action
+msgid "Fundraising Categories"
+msgstr "資金集めの区分"
+
+#. module: crm_fundraising
+#: field:crm.fundraising,email_cc:0
+msgid "Watchers Emails"
+msgstr "Eメール担当者"
+
+#. module: crm_fundraising
+#: view:crm.fundraising.report:0
+msgid "Cases"
+msgstr "問合せ"
+
+#. module: crm_fundraising
+#: selection:crm.fundraising,priority:0
+msgid "Highest"
+msgstr "最高"
+
+#. module: crm_fundraising
+#: view:crm.fundraising.report:0
+#: field:crm.fundraising.report,day:0
+msgid "Day"
+msgstr "日"
+
+#. module: crm_fundraising
+#: view:crm.fundraising:0
+msgid "Add Internal Note"
+msgstr "社内注記を追加"
+
+#. module: crm_fundraising
+#: field:crm.fundraising,partner_mobile:0
+msgid "Mobile"
+msgstr "モバイル"
+
+#. module: crm_fundraising
+#: view:crm.fundraising:0
+msgid "Notes"
+msgstr "注記"
+
+#. module: crm_fundraising
+#: field:crm.fundraising,message_ids:0
+msgid "Messages"
+msgstr "メッセージ"
+
+#. module: crm_fundraising
+#: view:crm.fundraising.report:0
+msgid "My company"
+msgstr "私の会社"
+
+#. module: crm_fundraising
+#: view:crm.fundraising:0
+msgid "Amount"
+msgstr "金額"
+
+#. module: crm_fundraising
+#: selection:crm.fundraising,state:0
+#: selection:crm.fundraising.report,state:0
+msgid "Cancelled"
+msgstr "キャンセルされました"
+
+#. module: crm_fundraising
+#: view:crm.fundraising.report:0
+#: field:crm.fundraising.report,amount_revenue:0
+msgid "Est.Revenue"
+msgstr "売上予測"
+
+#. module: crm_fundraising
+#: view:crm.fundraising:0
+msgid "Open Funds"
+msgstr "資金を開く"
+
+#. module: crm_fundraising
+#: field:crm.fundraising,ref:0
+msgid "Reference"
+msgstr "参照"
+
+#. module: crm_fundraising
+#: field:crm.fundraising,type_id:0
+msgid "Campaign"
+msgstr "キャンペーン"
+
+#. module: crm_fundraising
+#: field:crm.fundraising,date_action_next:0
+msgid "Next Action"
+msgstr "次のアクション"
+
+#. module: crm_fundraising
+#: view:crm.fundraising:0
+msgid "Reset to Draft"
+msgstr "予定に再設定する。"
+
+#. module: crm_fundraising
+#: view:crm.fundraising:0
+msgid "Extra Info"
+msgstr "追加情報"
+
+#. module: crm_fundraising
+#: model:ir.model,name:crm_fundraising.model_crm_fundraising
+#: model:ir.ui.menu,name:crm_fundraising.menu_config_fundrising
+#: model:ir.ui.menu,name:crm_fundraising.menu_crm_case_fund_raise
+msgid "Fund Raising"
+msgstr "資金調達"
+
+#. module: crm_fundraising
+#: view:crm.fundraising:0
+#: field:crm.fundraising,partner_id:0
+#: field:crm.fundraising.report,partner_id:0
+msgid "Partner"
+msgstr "パートナー"
+
+#. module: crm_fundraising
+#: view:crm.fundraising.report:0
+msgid "Funds raised in current year"
+msgstr "今年度に調達した資金"
+
+#. module: crm_fundraising
+#: model:ir.actions.act_window,name:crm_fundraising.action_report_crm_fundraising
+#: model:ir.ui.menu,name:crm_fundraising.menu_report_crm_fundraising_tree
+msgid "Fundraising Analysis"
+msgstr "資金調達分析"
+
+#. module: crm_fundraising
+#: view:crm.fundraising:0
+msgid "Misc"
+msgstr "その他"
+
+#. module: crm_fundraising
+#: field:crm.fundraising.report,section_id:0
+msgid "Section"
+msgstr "セクション"
+
+#. module: crm_fundraising
+#: view:crm.fundraising:0
+#: field:crm.fundraising,priority:0
+msgid "Priority"
+msgstr "優先度"
+
+#. module: crm_fundraising
+#: view:crm.fundraising:0
+msgid "Send New Email"
+msgstr "新しいEメールを送る"
+
+#. module: crm_fundraising
+#: model:crm.case.categ,name:crm_fundraising.categ_fund1
+msgid "Social Rehabilitation And Rural Upliftment"
+msgstr "社会復帰と地方活性化"
+
+#. module: crm_fundraising
+#: view:crm.fundraising:0
+msgid "Pending Funds"
+msgstr "保留資金"
+
+#. module: crm_fundraising
+#: view:crm.fundraising:0
+#: view:crm.fundraising.report:0
+msgid "Payment Mode"
+msgstr "支払モード"
+
+#. module: crm_fundraising
+#: view:crm.fundraising:0
+#: selection:crm.fundraising,state:0
+#: view:crm.fundraising.report:0
+msgid "New"
+msgstr "新規"
+
+#. module: crm_fundraising
+#: field:crm.fundraising,email_from:0
+msgid "Email"
+msgstr "Eメール"
+
+#. module: crm_fundraising
+#: selection:crm.fundraising,priority:0
+msgid "Lowest"
+msgstr "最低"
+
+#. module: crm_fundraising
+#: view:crm.fundraising:0
+#: view:crm.fundraising.report:0
+msgid "My Sales Team(s)"
+msgstr "私の販売チーム"
+
+#. module: crm_fundraising
+#: field:crm.fundraising,create_date:0
+msgid "Creation Date"
+msgstr "作成日"
+
+#. module: crm_fundraising
+#: field:crm.fundraising,date_deadline:0
+msgid "Deadline"
+msgstr "締切り期限"
+
+#. module: crm_fundraising
+#: selection:crm.fundraising.report,month:0
+msgid "July"
+msgstr "7月"
+
+#. module: crm_fundraising
+#: model:ir.ui.menu,name:crm_fundraising.menu_crm_case_fundraising-act
+msgid "Categories"
+msgstr "区分"
+
+#. module: crm_fundraising
+#: field:crm.fundraising,stage_id:0
+msgid "Stage"
+msgstr "段階"
+
+#. module: crm_fundraising
+#: view:crm.fundraising:0
+msgid "History Information"
+msgstr "履歴情報"
+
+#. module: crm_fundraising
+#: view:crm.fundraising:0
+msgid "Dates"
+msgstr "日付"
+
+#. module: crm_fundraising
+#: field:crm.fundraising,partner_name2:0
+msgid "Employee Email"
+msgstr "従業員Eメール"
+
+#. module: crm_fundraising
+#: model:crm.case.categ,name:crm_fundraising.categ_fund2
+msgid "Learning And Education"
+msgstr "学習と教育"
+
+#. module: crm_fundraising
+#: view:crm.fundraising:0
+msgid "Contact"
+msgstr "連絡先"
+
+#. module: crm_fundraising
+#: view:crm.fundraising:0
+msgid "Funds Form"
+msgstr "資金形式"
+
+#. module: crm_fundraising
+#: view:crm.fundraising:0
+msgid "Fund Description"
+msgstr "資金詳細"
+
+#. module: crm_fundraising
+#: help:crm.fundraising.report,delay_close:0
+msgid "Number of Days to close the case"
+msgstr "当件を締め切るまでの日数"
+
+#. module: crm_fundraising
+#: view:crm.fundraising.report:0
+msgid "Funds raised in current month"
+msgstr "今月、調達した資金"
+
+#. module: crm_fundraising
+#: view:crm.fundraising:0
+msgid "References"
+msgstr "参照"
+
+#. module: crm_fundraising
+#: view:crm.fundraising.report:0
+msgid "Fundraising"
+msgstr "資金調達"
+
+#. module: crm_fundraising
+#: model:ir.actions.act_window,help:crm_fundraising.action_report_crm_fundraising
+msgid ""
+"Have a general overview of all fund raising activities by sorting them with "
+"specific criteria such as the estimated revenue, average success probability "
+"and delay to close."
+msgstr "予測金額、平均成功確率、締切の延期などの基準で分類して全ての資金調達の一覧を表示する。"
+
+#. module: crm_fundraising
+#: selection:crm.fundraising.report,month:0
+msgid "September"
+msgstr "9月"
+
+#. module: crm_fundraising
+#: view:crm.fundraising:0
+msgid "Communication"
+msgstr "コミュニケーション"
+
+#. module: crm_fundraising
+#: view:crm.fundraising:0
+msgid "Funds Tree"
+msgstr "資金ツリー"
+
+#. module: crm_fundraising
+#: view:crm.fundraising.report:0
+#: field:crm.fundraising.report,month:0
+msgid "Month"
+msgstr "月"
+
+#. module: crm_fundraising
+#: view:crm.fundraising:0
+msgid "Escalate"
+msgstr "エスカレート"
+
+#. module: crm_fundraising
+#: field:crm.fundraising,write_date:0
+msgid "Update Date"
+msgstr "日付を更新する"
+
+#. module: crm_fundraising
+#: model:crm.case.resource.type,name:crm_fundraising.type_fund3
+msgid "Credit Card"
+msgstr "クレジットカード"
+
+#. module: crm_fundraising
+#: model:ir.actions.act_window,name:crm_fundraising.crm_fundraising_stage_act
+msgid "Fundraising Stages"
+msgstr "資金調達の段階"
+
+#. module: crm_fundraising
+#: view:crm.fundraising.report:0
+msgid "Salesman"
+msgstr "販売担当"
+
+#. module: crm_fundraising
+#: field:crm.fundraising,ref2:0
+msgid "Reference 2"
+msgstr "参照2"
+
+#. module: crm_fundraising
+#: view:crm.fundraising.report:0
+msgid "Funds raised in last month"
+msgstr "先月、調達した資金"
+
+#. module: crm_fundraising
+#: view:crm.fundraising:0
+#: field:crm.fundraising,categ_id:0
+#: view:crm.fundraising.report:0
+#: field:crm.fundraising.report,categ_id:0
+msgid "Category"
+msgstr "種類"
+
+#. module: crm_fundraising
+#: model:crm.case.categ,name:crm_fundraising.categ_fund4
+msgid "Arts And Culture"
+msgstr "芸術と文化"
+
+#. module: crm_fundraising
+#: field:crm.fundraising,planned_cost:0
+#: view:crm.fundraising.report:0
+#: field:crm.fundraising.report,planned_cost:0
+msgid "Planned Costs"
+msgstr "予定経費"
+
+#. module: crm_fundraising
+#: help:crm.fundraising,email_cc:0
+msgid ""
+"These email addresses will be added to the CC field of all inbound and "
+"outbound emails for this record before being sent. Separate multiple email "
+"addresses with a comma"
+msgstr "これらのEメールアドレスは送受信するEメールの CC 欄に追加されます。複数のEメールアドレスの間をコンマで区切ってて下さい。"
+
+#. module: crm_fundraising
+#: selection:crm.fundraising.report,state:0
+msgid "Draft"
+msgstr "予定"
+
+#. module: crm_fundraising
+#: selection:crm.fundraising,priority:0
+msgid "Low"
+msgstr "低い"
+
+#. module: crm_fundraising
+#: field:crm.fundraising,date_closed:0
+#: selection:crm.fundraising,state:0
+#: selection:crm.fundraising.report,state:0
+msgid "Closed"
+msgstr "終了"
+
+#. module: crm_fundraising
+#: view:crm.fundraising:0
+#: selection:crm.fundraising,state:0
+#: view:crm.fundraising.report:0
+#: selection:crm.fundraising.report,state:0
+msgid "Pending"
+msgstr "保留"
+
+#. module: crm_fundraising
+#: view:crm.fundraising:0
+msgid "Communication & History"
+msgstr "コミュニケーションと履歴"
+
+#. module: crm_fundraising
+#: selection:crm.fundraising.report,month:0
+msgid "August"
+msgstr "8月"
+
+#. module: crm_fundraising
+#: selection:crm.fundraising,priority:0
+msgid "Normal"
+msgstr "正常"
+
+#. module: crm_fundraising
+#: view:crm.fundraising:0
+msgid "Global CC"
+msgstr "グローバルCC"
+
+#. module: crm_fundraising
+#: view:crm.fundraising:0
+#: model:ir.actions.act_window,name:crm_fundraising.crm_case_category_act_fund_all1
+msgid "Funds"
+msgstr "資金"
+
+#. module: crm_fundraising
+#: selection:crm.fundraising.report,month:0
+msgid "June"
+msgstr "6月"
+
+#. module: crm_fundraising
+#: field:crm.fundraising,partner_phone:0
+msgid "Phone"
+msgstr "電話"
+
+#. module: crm_fundraising
+#: field:crm.fundraising.report,user_id:0
+msgid "User"
+msgstr "ユーザ"
+
+#. module: crm_fundraising
+#: model:crm.case.resource.type,name:crm_fundraising.type_fund2
+msgid "Cheque"
+msgstr "小切手"
+
+#. module: crm_fundraising
+#: field:crm.fundraising,active:0
+msgid "Active"
+msgstr "受付け中"
+
+#. module: crm_fundraising
+#: selection:crm.fundraising.report,month:0
+msgid "November"
+msgstr "11月"
+
+#. module: crm_fundraising
+#: view:crm.fundraising.report:0
+msgid "Extended Filters..."
+msgstr "拡張フィルタ…"
+
+#. module: crm_fundraising
+#: view:crm.fundraising.report:0
+msgid "Search"
+msgstr "検索する"
+
+#. module: crm_fundraising
+#: selection:crm.fundraising.report,month:0
+msgid "October"
+msgstr "10月"
+
+#. module: crm_fundraising
+#: selection:crm.fundraising.report,month:0
+msgid "January"
+msgstr "1月"
+
+#. module: crm_fundraising
+#: view:crm.fundraising.report:0
+msgid "#Fundraising"
+msgstr "資金調達数"
+
+#. module: crm_fundraising
+#: model:ir.actions.act_window,help:crm_fundraising.crm_fund_categ_action
+msgid ""
+"Manage and define the fund raising categories you want to be maintained in "
+"the system."
+msgstr "資金調達の種類を管理して設定ます。"
+
+#. module: crm_fundraising
+#: help:crm.fundraising,email_from:0
+msgid "These people will receive email."
+msgstr "これらの人がEメールを受け取ります。"
+
+#. module: crm_fundraising
+#: view:crm.fundraising:0
+msgid "Fund Category"
+msgstr "資金区分"
+
+#. module: crm_fundraising
+#: field:crm.fundraising,date:0
+msgid "Date"
+msgstr "日付"
+
+#. module: crm_fundraising
+#: model:crm.case.categ,name:crm_fundraising.categ_fund3
+msgid "Healthcare"
+msgstr "医療"
+
+#. module: crm_fundraising
+#: view:crm.fundraising:0
+msgid "History"
+msgstr "履歴"
+
+#. module: crm_fundraising
+#: field:crm.fundraising,partner_address_id:0
+msgid "Partner Contact"
+msgstr "パートナー連絡先"
+
+#. module: crm_fundraising
+#: view:crm.fundraising.report:0
+msgid "Month of fundraising"
+msgstr "資金調達の月"
+
+#. module: crm_fundraising
+#: view:crm.fundraising:0
+msgid "Estimates"
+msgstr "予測"
+
+#. module: crm_fundraising
+#: view:crm.fundraising:0
+#: field:crm.fundraising,state:0
+#: view:crm.fundraising.report:0
+#: field:crm.fundraising.report,state:0
+msgid "State"
+msgstr "状態"
+
+#. module: crm_fundraising
+#: view:crm.fundraising:0
+msgid "Unassigned"
+msgstr "未割当て"
+
+#. module: crm_fundraising
+#: view:crm.fundraising:0
+#: view:crm.fundraising.report:0
+msgid "Done"
+msgstr "終了"
+
+#. module: crm_fundraising
+#: selection:crm.fundraising.report,month:0
+msgid "December"
+msgstr "12月"
+
+#. module: crm_fundraising
+#: view:crm.fundraising:0
+#: view:crm.fundraising.report:0
+msgid "Cancel"
+msgstr "キャンセル"
+
+#. module: crm_fundraising
+#: view:crm.fundraising:0
+#: view:crm.fundraising.report:0
+#: selection:crm.fundraising.report,state:0
+msgid "Open"
+msgstr "受付中"
+
+#. module: crm_fundraising
+#: selection:crm.fundraising,state:0
+msgid "In Progress"
+msgstr "進行中"
+
+#. module: crm_fundraising
+#: model:ir.actions.act_window,help:crm_fundraising.crm_case_category_act_fund_all1
+msgid ""
+"If you need to collect money for your organization or a campaign, Fund "
+"Raising allows you to track all your fund raising activities. In the search "
+"list, filter by funds description, email, history and probability of success."
+msgstr ""
+"あなたの会社あるいはキャンペーンのために資金集めをするのであれば、資金調達のための全ての活動を記録することができます。検索一覧では、資金の詳細、Eメール、"
+"履歴、成功確率について表示することができます。"
+
+#. module: crm_fundraising
+#: view:crm.fundraising:0
+#: field:crm.fundraising,user_id:0
+msgid "Responsible"
+msgstr "責任者"
+
+#. module: crm_fundraising
+#: help:crm.fundraising,section_id:0
+msgid ""
+"Sales team to which Case belongs to. Define Responsible user and Email "
+"account for mail gateway."
+msgstr "案件が割当てられた販売チーム。担当ユーザとEメール・アカウントを指定します。"
+
+#. module: crm_fundraising
+#: model:ir.model,name:crm_fundraising.model_crm_fundraising_report
+msgid "CRM Fundraising Report"
+msgstr "CRM資金調達の報告"
+
+#. module: crm_fundraising
+#: view:crm.fundraising:0
+msgid "Reply"
+msgstr "返信"
+
+#. module: crm_fundraising
+#: view:crm.fundraising.report:0
+msgid "Date of fundraising"
+msgstr "資金調達の日付"
+
+#. module: crm_fundraising
+#: view:crm.fundraising.report:0
+#: field:crm.fundraising.report,amount_revenue_prob:0
+msgid "Est. Rev*Prob."
+msgstr "売上予測×確率"
+
+#. module: crm_fundraising
+#: field:crm.fundraising.report,type_id:0
+msgid "Fundraising Type"
+msgstr "資金調達のタイプ"
+
+#. module: crm_fundraising
+#: view:crm.fundraising:0
+msgid "New Funds"
+msgstr "新しい資金"
+
+#. module: crm_fundraising
+#: model:ir.actions.act_window,help:crm_fundraising.crm_fundraising_stage_act
+msgid ""
+"Create and manage fund raising activity categories you want to be maintained "
+"in the system."
+msgstr "資金調達のための活動の種類を作成して管理します。"
+
+#. module: crm_fundraising
+#: field:crm.fundraising,description:0
+msgid "Description"
+msgstr "詳細"
+
+#. module: crm_fundraising
+#: selection:crm.fundraising.report,month:0
+msgid "May"
+msgstr "5月"
+
+#. module: crm_fundraising
+#: field:crm.fundraising,probability:0
+msgid "Probability (%)"
+msgstr "確率 (%)"
+
+#. module: crm_fundraising
+#: field:crm.fundraising,partner_name:0
+msgid "Employee's Name"
+msgstr "従業員名"
+
+#. module: crm_fundraising
+#: help:crm.fundraising,state:0
+msgid ""
+"The state is set to 'Draft', when a case is created.                         "
+"         \n"
+"If the case is in progress the state is set to 'Open'.                       "
+"           \n"
+"When the case is over, the state is set to 'Done'.                           "
+"       \n"
+"If the case needs to be reviewed then the state is set to 'Pending'."
+msgstr ""
+"案件を作ると「予定」状態に設定されます。　　　\n"
+"\n"
+"案件が進行中になると、「受付中」に設定されます。　　\n"
+"\n"
+"案件が終了すると、「終了」に設定されます。　\n"
+"\n"
+"案件が再検討することになると、「保留」に設定されます。"
+
+#. module: crm_fundraising
+#: selection:crm.fundraising.report,month:0
+msgid "February"
+msgstr "2月"
+
+#. module: crm_fundraising
+#: view:crm.fundraising:0
+#: field:crm.fundraising,name:0
+msgid "Name"
+msgstr "氏名"
+
+#. module: crm_fundraising
+#: model:crm.case.resource.type,name:crm_fundraising.type_fund1
+msgid "Cash"
+msgstr "現金"
+
+#. module: crm_fundraising
+#: view:crm.fundraising:0
+msgid "Funds by Categories"
+msgstr "種類別資金"
+
+#. module: crm_fundraising
+#: view:crm.fundraising.report:0
+msgid "Month-1"
+msgstr "月-1"
+
+#. module: crm_fundraising
+#: selection:crm.fundraising.report,month:0
+msgid "April"
+msgstr "4月"
+
+#. module: crm_fundraising
+#: view:crm.fundraising.report:0
+msgid "My Case(s)"
+msgstr "私の案件"
+
+#. module: crm_fundraising
+#: model:crm.case.resource.type,name:crm_fundraising.type_fund4
+msgid "Demand Draft"
+msgstr "原案を促す"
+
+#. module: crm_fundraising
+#: field:crm.fundraising,id:0
+msgid "ID"
+msgstr "ID"
+
+#. module: crm_fundraising
+#: view:crm.fundraising:0
+msgid "Search Funds"
+msgstr "資金を検索する"
+
+#. module: crm_fundraising
+#: selection:crm.fundraising,priority:0
+msgid "High"
+msgstr "高い"
+
+#. module: crm_fundraising
+#: view:crm.fundraising:0
+#: field:crm.fundraising,section_id:0
+#: view:crm.fundraising.report:0
+msgid "Sales Team"
+msgstr "販売チーム"
+
+#. module: crm_fundraising
+#: field:crm.fundraising.report,create_date:0
+msgid "Create Date"
+msgstr "作成日"
+
+#. module: crm_fundraising
+#: field:crm.fundraising,date_action_last:0
+msgid "Last Action"
+msgstr "前回の活動"
+
+#. module: crm_fundraising
+#: view:crm.fundraising.report:0
+#: field:crm.fundraising.report,name:0
+msgid "Year"
+msgstr "年"
+
+#. module: crm_fundraising
+#: field:crm.fundraising,duration:0
+msgid "Duration"
+msgstr "期間"
diff --git a/addons/crm_helpdesk/i18n/ja.po b/addons/crm_helpdesk/i18n/ja.po
new file mode 100644
index 00000000000..806ff2e5303
--- /dev/null
+++ b/addons/crm_helpdesk/i18n/ja.po
@@ -0,0 +1,738 @@
+# 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-22 04:45+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-23 04:46+0000\n"
+"X-Generator: Launchpad (build 15135)\n"
+
+#. module: crm_helpdesk
+#: field:crm.helpdesk.report,delay_close:0
+msgid "Delay to Close"
+msgstr "締めを延期する"
+
+#. module: crm_helpdesk
+#: field:crm.helpdesk.report,nbr:0
+msgid "# of Cases"
+msgstr "事例の数"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+#: view:crm.helpdesk.report:0
+msgid "Group By..."
+msgstr "グループ化…"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+msgid "Today"
+msgstr "今日"
+
+#. module: crm_helpdesk
+#: selection:crm.helpdesk.report,month:0
+msgid "March"
+msgstr "3月"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk.report:0
+msgid "Helpdesk requests occurred in current year"
+msgstr "今年度のヘルプデスクへの問合せ"
+
+#. module: crm_helpdesk
+#: field:crm.helpdesk,company_id:0
+#: view:crm.helpdesk.report:0
+#: field:crm.helpdesk.report,company_id:0
+msgid "Company"
+msgstr "会社"
+
+#. module: crm_helpdesk
+#: field:crm.helpdesk,email_cc:0
+msgid "Watchers Emails"
+msgstr "担当者のEメール"
+
+#. module: crm_helpdesk
+#: selection:crm.helpdesk,priority:0
+#: selection:crm.helpdesk.report,priority:0
+msgid "Highest"
+msgstr "最高"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk.report:0
+#: field:crm.helpdesk.report,day:0
+msgid "Day"
+msgstr "日"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+msgid "Add Internal Note"
+msgstr "内部注記を追加"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk.report:0
+msgid "Date of helpdesk requests"
+msgstr "ヘルプデスクへの問合せの日付"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+msgid "Notes"
+msgstr "注記"
+
+#. module: crm_helpdesk
+#: field:crm.helpdesk,message_ids:0
+msgid "Messages"
+msgstr "メッセージ"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk.report:0
+msgid "My company"
+msgstr "私の会社"
+
+#. module: crm_helpdesk
+#: selection:crm.helpdesk,state:0
+#: selection:crm.helpdesk.report,state:0
+msgid "Cancelled"
+msgstr "キャンセルされました"
+
+#. module: crm_helpdesk
+#: model:ir.actions.act_window,name:crm_helpdesk.action_report_crm_helpdesk
+#: model:ir.ui.menu,name:crm_helpdesk.menu_report_crm_helpdesks_tree
+msgid "Helpdesk Analysis"
+msgstr "ヘルプデスク分析"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk.report:0
+#: field:crm.helpdesk.report,date_closed:0
+msgid "Close Date"
+msgstr "締切り日"
+
+#. module: crm_helpdesk
+#: field:crm.helpdesk,ref:0
+msgid "Reference"
+msgstr "参照"
+
+#. module: crm_helpdesk
+#: field:crm.helpdesk,date_action_next:0
+msgid "Next Action"
+msgstr "次の作業"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+msgid "Helpdesk Supports"
+msgstr "ヘルプデスク・サポート"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+msgid "Extra Info"
+msgstr "追加情報"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+#: field:crm.helpdesk,partner_id:0
+#: view:crm.helpdesk.report:0
+#: field:crm.helpdesk.report,partner_id:0
+msgid "Partner"
+msgstr "パートナ"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+msgid "Estimates"
+msgstr "予測"
+
+#. module: crm_helpdesk
+#: field:crm.helpdesk.report,section_id:0
+msgid "Section"
+msgstr "セクション"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk.report:0
+msgid "Helpdesk requests occurred in last month"
+msgstr "先月のヘルプデスクへの問合せ件数"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+msgid "Send New Email"
+msgstr "新しいEメールを送る"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+msgid "Helpdesk requests during last 7 days"
+msgstr "過去７日間のヘルプデスクへの問合せ件数"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+#: selection:crm.helpdesk,state:0
+#: view:crm.helpdesk.report:0
+msgid "New"
+msgstr "新規"
+
+#. module: crm_helpdesk
+#: model:ir.model,name:crm_helpdesk.model_crm_helpdesk_report
+msgid "Helpdesk report after Sales Services"
+msgstr "セールスサービスの後のヘルプデスク報告"
+
+#. module: crm_helpdesk
+#: field:crm.helpdesk,email_from:0
+msgid "Email"
+msgstr "Eメール"
+
+#. module: crm_helpdesk
+#: field:crm.helpdesk,channel_id:0
+#: view:crm.helpdesk.report:0
+#: field:crm.helpdesk.report,channel_id:0
+msgid "Channel"
+msgstr "チャネル"
+
+#. module: crm_helpdesk
+#: selection:crm.helpdesk,priority:0
+#: selection:crm.helpdesk.report,priority:0
+msgid "Lowest"
+msgstr "最低"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk.report:0
+msgid "# Mails"
+msgstr "Eメールの数"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+#: view:crm.helpdesk.report:0
+msgid "My Sales Team(s)"
+msgstr "私の販売チーム"
+
+#. module: crm_helpdesk
+#: field:crm.helpdesk,create_date:0
+#: field:crm.helpdesk.report,create_date:0
+msgid "Creation Date"
+msgstr "作成日"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+msgid "Reset to Draft"
+msgstr "予定に再設定する。"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+#: selection:crm.helpdesk,state:0
+#: selection:crm.helpdesk.report,state:0
+msgid "Pending"
+msgstr "保留"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+#: field:crm.helpdesk,date_deadline:0
+#: field:crm.helpdesk.report,date_deadline:0
+msgid "Deadline"
+msgstr "締切り期限"
+
+#. module: crm_helpdesk
+#: selection:crm.helpdesk.report,month:0
+msgid "July"
+msgstr "7月"
+
+#. module: crm_helpdesk
+#: model:ir.actions.act_window,name:crm_helpdesk.crm_helpdesk_categ_action
+msgid "Helpdesk Categories"
+msgstr "ヘルプデスクの分類"
+
+#. module: crm_helpdesk
+#: model:ir.ui.menu,name:crm_helpdesk.menu_crm_case_helpdesk-act
+msgid "Categories"
+msgstr "分類"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+msgid "New Helpdesk Request"
+msgstr "新しいヘルプデスク問合せ"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+msgid "History Information"
+msgstr "履歴情報"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+msgid "Dates"
+msgstr "日付"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk.report:0
+msgid "Month of helpdesk requests"
+msgstr "ヘルプデスク問合せの月"
+
+#. module: crm_helpdesk
+#: code:addons/crm_helpdesk/crm_helpdesk.py:101
+#, python-format
+msgid "No Subject"
+msgstr "件名なし"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk.report:0
+msgid "#Helpdesk"
+msgstr "ヘルプデスクの数"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+msgid "All pending Helpdesk Request"
+msgstr "ヘルプデスクの保留中の問合せの合計"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk.report:0
+msgid "Year of helpdesk requests"
+msgstr "ヘルプデスク問合せの年"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+msgid "References"
+msgstr "参照"
+
+#. module: crm_helpdesk
+#: selection:crm.helpdesk.report,month:0
+msgid "September"
+msgstr "9月"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+msgid "Communication"
+msgstr "コミュニケーション"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk.report:0
+#: field:crm.helpdesk.report,month:0
+msgid "Month"
+msgstr "月"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+msgid "Escalate"
+msgstr "エスカレート"
+
+#. module: crm_helpdesk
+#: field:crm.helpdesk,write_date:0
+msgid "Update Date"
+msgstr "日を更新する"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk.report:0
+msgid "Helpdesk requests occurred in current month"
+msgstr "今月のヘルプデスク問合せ数"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk.report:0
+msgid "Salesman"
+msgstr "販売担当"
+
+#. module: crm_helpdesk
+#: field:crm.helpdesk,ref2:0
+msgid "Reference 2"
+msgstr "参照2"
+
+#. module: crm_helpdesk
+#: field:crm.helpdesk,categ_id:0
+#: field:crm.helpdesk.report,categ_id:0
+msgid "Category"
+msgstr "分類"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+msgid "Responsible User"
+msgstr "ユーザ責任者"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+msgid "Helpdesk Support"
+msgstr "ヘルプデスク・サポート"
+
+#. module: crm_helpdesk
+#: field:crm.helpdesk,planned_cost:0
+#: field:crm.helpdesk.report,planned_cost:0
+msgid "Planned Costs"
+msgstr "予定経費"
+
+#. module: crm_helpdesk
+#: help:crm.helpdesk,channel_id:0
+msgid "Communication channel."
+msgstr "コミュニケーション・チャネル"
+
+#. module: crm_helpdesk
+#: help:crm.helpdesk,email_cc:0
+msgid ""
+"These email addresses will be added to the CC field of all inbound and "
+"outbound emails for this record before being sent. Separate multiple email "
+"addresses with a comma"
+msgstr "これらのEメールアドレスは送受信するEメールの CC 欄に追加されます。複数のEメールアドレスの間にはコンマを入れてください。"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+msgid "Search Helpdesk"
+msgstr "ヘルプデスクを検索"
+
+#. module: crm_helpdesk
+#: selection:crm.helpdesk.report,state:0
+msgid "Draft"
+msgstr "予定"
+
+#. module: crm_helpdesk
+#: selection:crm.helpdesk,priority:0
+#: selection:crm.helpdesk.report,priority:0
+msgid "Low"
+msgstr "低い"
+
+#. module: crm_helpdesk
+#: field:crm.helpdesk,date_closed:0
+#: selection:crm.helpdesk,state:0
+#: view:crm.helpdesk.report:0
+#: selection:crm.helpdesk.report,state:0
+msgid "Closed"
+msgstr "終了"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+msgid "Reply"
+msgstr "返信"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+msgid "7 Days"
+msgstr "7日間"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+msgid "Communication & History"
+msgstr "コミュニケーションと履歴"
+
+#. module: crm_helpdesk
+#: selection:crm.helpdesk.report,month:0
+msgid "August"
+msgstr "8月"
+
+#. module: crm_helpdesk
+#: selection:crm.helpdesk,priority:0
+#: selection:crm.helpdesk.report,priority:0
+msgid "Normal"
+msgstr "正常"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+msgid "Global CC"
+msgstr "グローバルCC"
+
+#. module: crm_helpdesk
+#: selection:crm.helpdesk.report,month:0
+msgid "June"
+msgstr "6月"
+
+#. module: crm_helpdesk
+#: field:crm.helpdesk,planned_revenue:0
+msgid "Planned Revenue"
+msgstr "売上予定"
+
+#. module: crm_helpdesk
+#: field:crm.helpdesk.report,user_id:0
+msgid "User"
+msgstr "ユーザ"
+
+#. module: crm_helpdesk
+#: field:crm.helpdesk,active:0
+msgid "Active"
+msgstr "仕掛り中"
+
+#. module: crm_helpdesk
+#: selection:crm.helpdesk.report,month:0
+msgid "November"
+msgstr "11月"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk.report:0
+msgid "Extended Filters..."
+msgstr "拡張フィルタ…"
+
+#. module: crm_helpdesk
+#: model:ir.actions.act_window,name:crm_helpdesk.crm_case_helpdesk_act111
+msgid "Helpdesk Requests"
+msgstr "ヘルプデスクへの問合せ"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk.report:0
+msgid "Search"
+msgstr "検索"
+
+#. module: crm_helpdesk
+#: selection:crm.helpdesk.report,month:0
+msgid "October"
+msgstr "10月"
+
+#. module: crm_helpdesk
+#: selection:crm.helpdesk.report,month:0
+msgid "January"
+msgstr "1月"
+
+#. module: crm_helpdesk
+#: help:crm.helpdesk,email_from:0
+msgid "These people will receive email."
+msgstr "これらの人がEメールを受け取ります。"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+#: field:crm.helpdesk,date:0
+msgid "Date"
+msgstr "日付"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+msgid "History"
+msgstr "履歴"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+#: field:crm.helpdesk,priority:0
+#: view:crm.helpdesk.report:0
+#: field:crm.helpdesk.report,priority:0
+msgid "Priority"
+msgstr "優先度"
+
+#. module: crm_helpdesk
+#: field:crm.helpdesk,partner_address_id:0
+msgid "Partner Contact"
+msgstr "パートナー連絡先"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+msgid "Misc"
+msgstr "その他"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+#: field:crm.helpdesk,state:0
+#: view:crm.helpdesk.report:0
+#: field:crm.helpdesk.report,state:0
+msgid "State"
+msgstr "状態"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+msgid "General"
+msgstr "一般"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+msgid "Send Reminder"
+msgstr "催促を送る"
+
+#. module: crm_helpdesk
+#: help:crm.helpdesk,section_id:0
+msgid ""
+"Sales team to which Case belongs to.                                 Define "
+"Responsible user and Email account for mail gateway."
+msgstr "事象を割り当てる販売チーム。メールゲートウェイにと担当ユーザとEメールアカウントを作って下さい。"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+msgid "Done"
+msgstr "終了"
+
+#. module: crm_helpdesk
+#: selection:crm.helpdesk.report,month:0
+msgid "December"
+msgstr "12月"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+msgid "Cancel"
+msgstr "キャンセル"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+msgid "Close"
+msgstr "締める"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+#: view:crm.helpdesk.report:0
+#: selection:crm.helpdesk.report,state:0
+msgid "Open"
+msgstr "未割当て"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+msgid "Helpdesk Support Tree"
+msgstr "ヘルプデスク・サポート・ツリー"
+
+#. module: crm_helpdesk
+#: selection:crm.helpdesk,state:0
+msgid "In Progress"
+msgstr "進行中"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+msgid "Categorization"
+msgstr "分類"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk.report:0
+#: model:ir.model,name:crm_helpdesk.model_crm_helpdesk
+#: model:ir.ui.menu,name:crm_helpdesk.menu_config_helpdesk
+msgid "Helpdesk"
+msgstr "ヘルプデスク"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+#: field:crm.helpdesk,user_id:0
+msgid "Responsible"
+msgstr "責任者"
+
+#. module: crm_helpdesk
+#: field:crm.helpdesk.report,delay_expected:0
+msgid "Overpassed Deadline"
+msgstr "締切日を経過"
+
+#. module: crm_helpdesk
+#: field:crm.helpdesk,description:0
+msgid "Description"
+msgstr "詳細"
+
+#. module: crm_helpdesk
+#: selection:crm.helpdesk.report,month:0
+msgid "May"
+msgstr "5月"
+
+#. module: crm_helpdesk
+#: field:crm.helpdesk,probability:0
+msgid "Probability (%)"
+msgstr "確率 (%)"
+
+#. module: crm_helpdesk
+#: field:crm.helpdesk.report,email:0
+msgid "# Emails"
+msgstr "Eメールの数"
+
+#. module: crm_helpdesk
+#: model:ir.actions.act_window,help:crm_helpdesk.action_report_crm_helpdesk
+msgid ""
+"Have a general overview of all support requests by sorting them with "
+"specific criteria such as the processing time, number of requests answered, "
+"emails sent and costs."
+msgstr "処理時間、回答済みと言わせ件数，送信済みEメール、経費などの基準で分類して全てのサポート問合せの全体表示を見ると良いでしょう。"
+
+#. module: crm_helpdesk
+#: help:crm.helpdesk,state:0
+msgid ""
+"The state is set to 'Draft', when a case is created.                         "
+"         \n"
+"If the case is in progress the state is set to 'Open'.                       "
+"           \n"
+"When the case is over, the state is set to 'Done'.                           "
+"       \n"
+"If the case needs to be reviewed then the state is set to 'Pending'."
+msgstr ""
+
+#. module: crm_helpdesk
+#: selection:crm.helpdesk.report,month:0
+msgid "February"
+msgstr "2月"
+
+#. module: crm_helpdesk
+#: field:crm.helpdesk,name:0
+msgid "Name"
+msgstr "氏名"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk.report:0
+msgid "Month-1"
+msgstr "月-1"
+
+#. module: crm_helpdesk
+#: model:ir.ui.menu,name:crm_helpdesk.menu_help_support_main
+msgid "Helpdesk and Support"
+msgstr "ヘルプデスクとサポート"
+
+#. module: crm_helpdesk
+#: selection:crm.helpdesk.report,month:0
+msgid "April"
+msgstr "4月"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk.report:0
+msgid "My Case(s)"
+msgstr "私の事象"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+msgid "Query"
+msgstr "クエリ"
+
+#. module: crm_helpdesk
+#: field:crm.helpdesk,id:0
+msgid "ID"
+msgstr "ID"
+
+#. module: crm_helpdesk
+#: model:ir.actions.act_window,help:crm_helpdesk.crm_helpdesk_categ_action
+msgid ""
+"Create and manage helpdesk categories to better manage and classify your "
+"support requests."
+msgstr "サポート問合せを管理するためにヘルプデスクの区分を作成する。"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+msgid "Todays's Helpdesk Requests"
+msgstr "今日のヘルプデスクへの問合せ件数"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+msgid "Request Date"
+msgstr "問合せ日"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+msgid "Open Helpdesk Request"
+msgstr "ヘルプデスク問合せを開く"
+
+#. module: crm_helpdesk
+#: selection:crm.helpdesk,priority:0
+#: selection:crm.helpdesk.report,priority:0
+msgid "High"
+msgstr "高い"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+#: field:crm.helpdesk,section_id:0
+#: view:crm.helpdesk.report:0
+msgid "Sales Team"
+msgstr "販売チーム"
+
+#. module: crm_helpdesk
+#: field:crm.helpdesk,date_action_last:0
+msgid "Last Action"
+msgstr "前回の活動"
+
+#. module: crm_helpdesk
+#: model:ir.actions.act_window,help:crm_helpdesk.crm_case_helpdesk_act111
+msgid ""
+"Helpdesk and Support allow you to track your interventions. Select a "
+"customer, add notes and categorize interventions with partners if necessary. "
+"You can also assign a priority level. Use the OpenERP Issues system to "
+"manage your support activities. Issues can be connected to the email "
+"gateway: new emails may create issues, each of them automatically gets the "
+"history of the conversation with the customer."
+msgstr ""
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk.report:0
+#: field:crm.helpdesk.report,name:0
+msgid "Year"
+msgstr "年"
+
+#. module: crm_helpdesk
+#: field:crm.helpdesk,duration:0
+msgid "Duration"
+msgstr "期間"
diff --git a/addons/crm_partner_assign/i18n/ja.po b/addons/crm_partner_assign/i18n/ja.po
new file mode 100644
index 00000000000..c2ab27be520
--- /dev/null
+++ b/addons/crm_partner_assign/i18n/ja.po
@@ -0,0 +1,882 @@
+# 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-22 04:23+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-23 04:46+0000\n"
+"X-Generator: Launchpad (build 15135)\n"
+
+#. module: crm_partner_assign
+#: field:crm.lead.forward.to.partner,send_to:0
+msgid "Send to"
+msgstr "送信する"
+
+#. module: crm_partner_assign
+#: field:crm.lead.forward.to.partner,subtype:0
+msgid "Message type"
+msgstr "メッセージタイプ"
+
+#. module: crm_partner_assign
+#: help:crm.lead.forward.to.partner,auto_delete:0
+msgid "Permanently delete emails after sending"
+msgstr "送信後、Eメールを削除する"
+
+#. module: crm_partner_assign
+#: field:crm.lead.report.assign,delay_close:0
+msgid "Delay to Close"
+msgstr "締めを延期する"
+
+#. module: crm_partner_assign
+#: help:crm.lead.forward.to.partner,email_to:0
+msgid "Message recipients"
+msgstr "メッセージの受取人"
+
+#. module: crm_partner_assign
+#: field:crm.lead.report.assign,planned_revenue:0
+msgid "Planned Revenue"
+msgstr "売上予定"
+
+#. module: crm_partner_assign
+#: field:crm.lead.report.assign,nbr:0
+msgid "# of Cases"
+msgstr "事例の数"
+
+#. module: crm_partner_assign
+#: view:crm.lead.report.assign:0
+#: view:crm.partner.report.assign:0
+msgid "Group By..."
+msgstr "グループ化…"
+
+#. module: crm_partner_assign
+#: field:crm.lead.forward.to.partner,template_id:0
+msgid "Template"
+msgstr "テンプレート"
+
+#. module: crm_partner_assign
+#: view:crm.lead:0
+msgid "Forward"
+msgstr "転送"
+
+#. module: crm_partner_assign
+#: view:res.partner:0
+msgid "Geo Localize"
+msgstr "ジオロカライゼーション"
+
+#. module: crm_partner_assign
+#: help:crm.lead.forward.to.partner,body_text:0
+msgid "Plain-text version of the message"
+msgstr "メッセージのテキスト版"
+
+#. module: crm_partner_assign
+#: view:crm.lead.forward.to.partner:0
+msgid "Body"
+msgstr "本文"
+
+#. module: crm_partner_assign
+#: selection:crm.lead.report.assign,month:0
+msgid "March"
+msgstr "3月"
+
+#. module: crm_partner_assign
+#: selection:crm.lead.report.assign,type:0
+msgid "Lead"
+msgstr "リード"
+
+#. module: crm_partner_assign
+#: view:crm.lead.report.assign:0
+msgid "Delay to close"
+msgstr "締めを延期する"
+
+#. module: crm_partner_assign
+#: view:crm.partner.report.assign:0
+msgid "#Partner"
+msgstr "パートナ数"
+
+#. module: crm_partner_assign
+#: selection:crm.lead.forward.to.partner,history:0
+msgid "Whole Story"
+msgstr "全ストーリー"
+
+#. module: crm_partner_assign
+#: view:crm.lead.report.assign:0
+#: field:crm.lead.report.assign,company_id:0
+msgid "Company"
+msgstr "会社"
+
+#. module: crm_partner_assign
+#: code:addons/crm_partner_assign/partner_geo_assign.py:37
+#, python-format
+msgid ""
+"Could not contact geolocation servers, please make sure you have a working "
+"internet connection (%s)"
+msgstr "ジオロケーションサーバが見つかりません。インターネット接続 (%s) を確認して下さい。"
+
+#. module: crm_partner_assign
+#: field:crm.lead.report.assign,date_assign:0
+msgid "Partner Date"
+msgstr "パートナ日付"
+
+#. module: crm_partner_assign
+#: selection:crm.lead.report.assign,priority:0
+msgid "Highest"
+msgstr "最高"
+
+#. module: crm_partner_assign
+#: field:crm.lead.forward.to.partner,body_text:0
+msgid "Text contents"
+msgstr "テキストの内容"
+
+#. module: crm_partner_assign
+#: view:crm.lead.report.assign:0
+#: field:crm.lead.report.assign,day:0
+msgid "Day"
+msgstr "日"
+
+#. module: crm_partner_assign
+#: help:crm.lead.forward.to.partner,message_id:0
+msgid "Message unique identifier"
+msgstr "メッセージ識別番号"
+
+#. module: crm_partner_assign
+#: selection:crm.lead.forward.to.partner,history:0
+msgid "Latest email"
+msgstr "前回のEメール"
+
+#. module: crm_partner_assign
+#: field:crm.lead,partner_latitude:0
+#: field:res.partner,partner_latitude:0
+msgid "Geo Latitude"
+msgstr "ジオ緯度"
+
+#. module: crm_partner_assign
+#: view:crm.lead.forward.to.partner:0
+msgid ""
+"Add here all attachments of the current document you want to include in the "
+"Email."
+msgstr "Eメールに添付する文書をここに追加します。"
+
+#. module: crm_partner_assign
+#: selection:crm.lead.report.assign,state:0
+msgid "Cancelled"
+msgstr "キャンセルされました"
+
+#. module: crm_partner_assign
+#: view:crm.lead:0
+msgid "Geo Assignation"
+msgstr "ジオ割当て"
+
+#. module: crm_partner_assign
+#: field:crm.lead.report.assign,date_closed:0
+msgid "Close Date"
+msgstr "締切り日"
+
+#. module: crm_partner_assign
+#: help:res.partner,partner_weight:0
+msgid ""
+"Gives the probability to assign a lead to this partner. (0 means no "
+"assignation.)"
+msgstr "リードをこのパートナに割当てる確率を指定します（0 は割当て無しを意味します）"
+
+#. module: crm_partner_assign
+#: help:crm.lead.forward.to.partner,body_html:0
+msgid "Rich-text/HTML version of the message"
+msgstr "メッセージのリッチテキスト / HTML版"
+
+#. module: crm_partner_assign
+#: field:crm.lead.forward.to.partner,auto_delete:0
+msgid "Auto Delete"
+msgstr "自動削除"
+
+#. module: crm_partner_assign
+#: help:crm.lead.forward.to.partner,email_bcc:0
+msgid "Blind carbon copy message recipients"
+msgstr "BCCの受取人"
+
+#. module: crm_partner_assign
+#: field:crm.lead.forward.to.partner,partner_id:0
+#: selection:crm.lead.forward.to.partner,send_to:0
+#: view:crm.lead.report.assign:0
+#: field:crm.lead.report.assign,partner_assigned_id:0
+#: model:ir.model,name:crm_partner_assign.model_res_partner
+msgid "Partner"
+msgstr "パートナ"
+
+#. module: crm_partner_assign
+#: field:crm.lead.report.assign,probability:0
+msgid "Avg Probability"
+msgstr "平均確率"
+
+#. module: crm_partner_assign
+#: view:res.partner:0
+msgid "Previous"
+msgstr "前へ"
+
+#. module: crm_partner_assign
+#: code:addons/crm_partner_assign/partner_geo_assign.py:36
+#, python-format
+msgid "Network error"
+msgstr "ネットワークエラー"
+
+#. module: crm_partner_assign
+#: field:crm.lead.forward.to.partner,email_from:0
+msgid "From"
+msgstr "差出人"
+
+#. module: crm_partner_assign
+#: model:ir.actions.act_window,name:crm_partner_assign.res_partner_grade_action
+#: model:ir.ui.menu,name:crm_partner_assign.menu_res_partner_grade_action
+#: field:res.partner,grade_id:0
+#: view:res.partner.grade:0
+msgid "Partner Grade"
+msgstr "パートナー等級"
+
+#. module: crm_partner_assign
+#: view:crm.lead.report.assign:0
+#: view:crm.partner.report.assign:0
+msgid "Section"
+msgstr "セクション"
+
+#. module: crm_partner_assign
+#: view:crm.lead.forward.to.partner:0
+msgid "Send"
+msgstr "送信する"
+
+#. module: crm_partner_assign
+#: view:res.partner:0
+msgid "Next"
+msgstr "次へ"
+
+#. module: crm_partner_assign
+#: view:crm.lead.report.assign:0
+#: field:crm.lead.report.assign,priority:0
+msgid "Priority"
+msgstr "優先度"
+
+#. module: crm_partner_assign
+#: view:crm.lead.report.assign:0
+#: field:crm.lead.report.assign,state:0
+msgid "State"
+msgstr "状態"
+
+#. module: crm_partner_assign
+#: field:crm.lead.report.assign,delay_expected:0
+msgid "Overpassed Deadline"
+msgstr "締切日を経過"
+
+#. module: crm_partner_assign
+#: field:crm.lead.report.assign,type:0
+msgid "Type"
+msgstr "タイプ"
+
+#. module: crm_partner_assign
+#: view:crm.partner.report.assign:0
+msgid "Name"
+msgstr "氏名"
+
+#. module: crm_partner_assign
+#: selection:crm.lead.report.assign,priority:0
+msgid "Lowest"
+msgstr "最低"
+
+#. module: crm_partner_assign
+#: help:crm.lead.forward.to.partner,subtype:0
+msgid ""
+"Type of message, usually 'html' or 'plain', used to select plaintext or rich "
+"text contents accordingly"
+msgstr "メッセージのタイプ。通常はテキストあるいはリッチテキストを指定するための 「テキスト」あるいは「HTML」"
+
+#. module: crm_partner_assign
+#: view:crm.lead.report.assign:0
+msgid "Assign Date"
+msgstr "割当て日"
+
+#. module: crm_partner_assign
+#: view:crm.lead.report.assign:0
+msgid "Leads Analysis"
+msgstr "リード分析"
+
+#. module: crm_partner_assign
+#: field:crm.lead.report.assign,creation_date:0
+msgid "Creation Date"
+msgstr "作成日"
+
+#. module: crm_partner_assign
+#: field:crm.lead.forward.to.partner,res_id:0
+msgid "Related Document ID"
+msgstr "関連する文書ID"
+
+#. module: crm_partner_assign
+#: view:crm.lead.report.assign:0
+msgid "7 Days"
+msgstr "7日間"
+
+#. module: crm_partner_assign
+#: view:crm.lead:0
+msgid "Partner Assignation"
+msgstr "パートナの割当て"
+
+#. module: crm_partner_assign
+#: help:crm.lead.report.assign,type:0
+msgid "Type is used to separate Leads and Opportunities"
+msgstr "リードと機会を区別するためにタイプを使います。"
+
+#. module: crm_partner_assign
+#: selection:crm.lead.report.assign,month:0
+msgid "July"
+msgstr "7月"
+
+#. module: crm_partner_assign
+#: view:crm.lead.report.assign:0
+#: field:crm.lead.report.assign,stage_id:0
+msgid "Stage"
+msgstr "段階"
+
+#. module: crm_partner_assign
+#: field:crm.lead.forward.to.partner,model:0
+msgid "Related Document model"
+msgstr "関連する文書モデル"
+
+#. module: crm_partner_assign
+#: code:addons/crm_partner_assign/wizard/crm_forward_to_partner.py:192
+#, python-format
+msgid "Fwd"
+msgstr "転送"
+
+#. module: crm_partner_assign
+#: view:res.partner:0
+msgid "Geo Localization"
+msgstr "ジオロケーション"
+
+#. module: crm_partner_assign
+#: view:crm.lead.report.assign:0
+#: view:crm.partner.report.assign:0
+msgid "Opportunities Assignment Analysis"
+msgstr "好機割当て分析"
+
+#. module: crm_partner_assign
+#: view:res.partner:0
+msgid "Cancel"
+msgstr "キャンセル"
+
+#. module: crm_partner_assign
+#: field:crm.lead.forward.to.partner,history:0
+msgid "Send history"
+msgstr "履歴を送る"
+
+#. module: crm_partner_assign
+#: view:crm.lead.forward.to.partner:0
+msgid "Contact"
+msgstr "連絡先"
+
+#. module: crm_partner_assign
+#: view:crm.lead.forward.to.partner:0
+#: view:res.partner:0
+msgid "Close"
+msgstr "締める"
+
+#. module: crm_partner_assign
+#: field:crm.lead.forward.to.partner,use_template:0
+msgid "Use Template"
+msgstr "テンプレートを使う"
+
+#. module: crm_partner_assign
+#: model:ir.actions.act_window,name:crm_partner_assign.action_report_crm_opportunity_assign
+#: model:ir.ui.menu,name:crm_partner_assign.menu_report_crm_opportunities_assign_tree
+msgid "Opp. Assignment Analysis"
+msgstr "好機割当て分析"
+
+#. module: crm_partner_assign
+#: help:crm.lead.report.assign,delay_close:0
+msgid "Number of Days to close the case"
+msgstr "当件を締めるまでの日数"
+
+#. module: crm_partner_assign
+#: field:res.partner,partner_weight:0
+msgid "Weight"
+msgstr "重量"
+
+#. module: crm_partner_assign
+#: view:crm.lead.report.assign:0
+msgid "Delay to open"
+msgstr "開始をを延期する"
+
+#. module: crm_partner_assign
+#: view:crm.lead.report.assign:0
+#: field:crm.lead.report.assign,grade_id:0
+#: view:crm.partner.report.assign:0
+#: field:crm.partner.report.assign,grade_id:0
+msgid "Grade"
+msgstr "等級"
+
+#. module: crm_partner_assign
+#: selection:crm.lead.report.assign,month:0
+msgid "December"
+msgstr "12月"
+
+#. module: crm_partner_assign
+#: view:crm.lead.report.assign:0
+#: field:crm.lead.report.assign,month:0
+msgid "Month"
+msgstr "月"
+
+#. module: crm_partner_assign
+#: field:crm.lead.report.assign,opening_date:0
+msgid "Opening Date"
+msgstr "開始日"
+
+#. module: crm_partner_assign
+#: field:crm.lead.forward.to.partner,subject:0
+msgid "Subject"
+msgstr "件名"
+
+#. module: crm_partner_assign
+#: view:crm.lead.report.assign:0
+#: view:crm.partner.report.assign:0
+msgid "Salesman"
+msgstr "販売担当"
+
+#. module: crm_partner_assign
+#: view:crm.lead.report.assign:0
+#: field:crm.lead.report.assign,categ_id:0
+msgid "Category"
+msgstr "分類"
+
+#. module: crm_partner_assign
+#: view:crm.lead.report.assign:0
+msgid "#Opportunities"
+msgstr "好機の数"
+
+#. module: crm_partner_assign
+#: view:crm.lead:0
+msgid "Team"
+msgstr "チーム"
+
+#. module: crm_partner_assign
+#: view:crm.lead:0
+msgid "Referred Partner"
+msgstr "推奨パートナ"
+
+#. module: crm_partner_assign
+#: selection:crm.lead.report.assign,state:0
+msgid "Draft"
+msgstr "予定"
+
+#. module: crm_partner_assign
+#: selection:crm.lead.report.assign,priority:0
+msgid "Low"
+msgstr "低い"
+
+#. module: crm_partner_assign
+#: view:crm.lead.report.assign:0
+#: selection:crm.lead.report.assign,state:0
+msgid "Closed"
+msgstr "終了"
+
+#. module: crm_partner_assign
+#: model:ir.actions.act_window,name:crm_partner_assign.action_crm_send_mass_forward
+msgid "Mass forward to partner"
+msgstr "パートナに大量に転送"
+
+#. module: crm_partner_assign
+#: view:res.partner:0
+#: field:res.partner,opportunity_assigned_ids:0
+msgid "Assigned Opportunities"
+msgstr "割り当てられた好機"
+
+#. module: crm_partner_assign
+#: field:crm.lead,date_assign:0
+msgid "Assignation Date"
+msgstr "割当て日"
+
+#. module: crm_partner_assign
+#: field:crm.lead.report.assign,probability_max:0
+msgid "Max Probability"
+msgstr "最大確率"
+
+#. module: crm_partner_assign
+#: selection:crm.lead.report.assign,month:0
+msgid "August"
+msgstr "8月"
+
+#. module: crm_partner_assign
+#: selection:crm.lead.report.assign,priority:0
+msgid "Normal"
+msgstr "正常"
+
+#. module: crm_partner_assign
+#: view:res.partner:0
+msgid "Escalate"
+msgstr "エスカレート"
+
+#. module: crm_partner_assign
+#: selection:crm.lead.report.assign,month:0
+msgid "June"
+msgstr "6月"
+
+#. module: crm_partner_assign
+#: help:crm.lead.report.assign,delay_open:0
+msgid "Number of Days to open the case"
+msgstr "当件を開くまでの日数"
+
+#. module: crm_partner_assign
+#: field:crm.lead.report.assign,delay_open:0
+msgid "Delay to Open"
+msgstr "開始をを延期する"
+
+#. module: crm_partner_assign
+#: selection:crm.lead.forward.to.partner,send_to:0
+#: field:crm.lead.forward.to.partner,user_id:0
+#: field:crm.lead.report.assign,user_id:0
+#: field:crm.partner.report.assign,user_id:0
+msgid "User"
+msgstr "ユーザ"
+
+#. module: crm_partner_assign
+#: field:res.partner.grade,active:0
+msgid "Active"
+msgstr "仕掛り中"
+
+#. module: crm_partner_assign
+#: selection:crm.lead.report.assign,month:0
+msgid "November"
+msgstr "11月"
+
+#. module: crm_partner_assign
+#: view:crm.lead.report.assign:0
+msgid "Extended Filters..."
+msgstr "拡張フィルタ…"
+
+#. module: crm_partner_assign
+#: field:crm.lead,partner_longitude:0
+#: field:res.partner,partner_longitude:0
+msgid "Geo Longitude"
+msgstr "ジオ緯度"
+
+#. module: crm_partner_assign
+#: field:crm.partner.report.assign,opp:0
+msgid "# of Opportunity"
+msgstr "好機の数"
+
+#. module: crm_partner_assign
+#: view:crm.lead.report.assign:0
+msgid "Lead Assign"
+msgstr "リードの割当て"
+
+#. module: crm_partner_assign
+#: selection:crm.lead.report.assign,month:0
+msgid "October"
+msgstr "10月"
+
+#. module: crm_partner_assign
+#: view:crm.lead:0
+msgid "Assignation"
+msgstr "割当て"
+
+#. module: crm_partner_assign
+#: selection:crm.lead.report.assign,month:0
+msgid "January"
+msgstr "1月"
+
+#. module: crm_partner_assign
+#: help:crm.lead,partner_assigned_id:0
+msgid "Partner this case has been forwarded/assigned to."
+msgstr "当件を転送 / 割当てたパートナ"
+
+#. module: crm_partner_assign
+#: field:crm.lead.forward.to.partner,date:0
+msgid "Date"
+msgstr "日付"
+
+#. module: crm_partner_assign
+#: field:crm.lead.forward.to.partner,body_html:0
+msgid "Rich-text contents"
+msgstr "リッチテキストの内容"
+
+#. module: crm_partner_assign
+#: view:crm.lead.report.assign:0
+msgid "Planned Revenues"
+msgstr "予定売上"
+
+#. module: crm_partner_assign
+#: model:ir.model,name:crm_partner_assign.model_res_partner_grade
+msgid "res.partner.grade"
+msgstr "res.partner.grade"
+
+#. module: crm_partner_assign
+#: field:crm.lead.forward.to.partner,message_id:0
+msgid "Message-Id"
+msgstr "メッセージID"
+
+#. module: crm_partner_assign
+#: view:crm.lead.forward.to.partner:0
+#: field:crm.lead.forward.to.partner,attachment_ids:0
+msgid "Attachments"
+msgstr "添付"
+
+#. module: crm_partner_assign
+#: field:crm.lead.forward.to.partner,email_cc:0
+msgid "Cc"
+msgstr "写し(CC)"
+
+#. module: crm_partner_assign
+#: selection:crm.lead.report.assign,month:0
+msgid "September"
+msgstr "9月"
+
+#. module: crm_partner_assign
+#: field:crm.lead.forward.to.partner,references:0
+msgid "References"
+msgstr "参照"
+
+#. module: crm_partner_assign
+#: view:crm.lead.report.assign:0
+msgid "Last 30 Days"
+msgstr "最後の30日間"
+
+#. module: crm_partner_assign
+#: field:res.partner.grade,name:0
+msgid "Grade Name"
+msgstr "等級名"
+
+#. module: crm_partner_assign
+#: help:crm.lead,date_assign:0
+msgid "Last date this case was forwarded/assigned to a partner"
+msgstr "当件がパートナに転送/割当てられて最後の日付"
+
+#. module: crm_partner_assign
+#: selection:crm.lead.report.assign,state:0
+#: view:res.partner:0
+msgid "Open"
+msgstr "未割当て"
+
+#. module: crm_partner_assign
+#: help:crm.lead.forward.to.partner,email_cc:0
+msgid "Carbon copy message recipients"
+msgstr "CCメッセージの宛先"
+
+#. module: crm_partner_assign
+#: help:crm.lead.forward.to.partner,headers:0
+msgid ""
+"Full message headers, e.g. SMTP session headers (usually available on "
+"inbound messages only)"
+msgstr "メッセージの見出し。例えばSMTPセッションの見出し（通常、受信メッセージのみ）。"
+
+#. module: crm_partner_assign
+#: field:res.partner,date_localization:0
+msgid "Geo Localization Date"
+msgstr "ジオローカル化の日付"
+
+#. module: crm_partner_assign
+#: view:crm.lead.report.assign:0
+msgid "Current"
+msgstr "現在"
+
+#. module: crm_partner_assign
+#: field:crm.lead.forward.to.partner,email_to:0
+msgid "To"
+msgstr "宛先"
+
+#. module: crm_partner_assign
+#: help:crm.lead.forward.to.partner,email_from:0
+msgid ""
+"Message sender, taken from user preferences. If empty, this is not a mail "
+"but a message."
+msgstr "メッセージの差出人。ユーザの優先設定から持って来られます。空白にすると、Eメールではなく、メッセージになります。"
+
+#. module: crm_partner_assign
+#: field:crm.partner.report.assign,nbr:0
+msgid "# of Partner"
+msgstr "パートナの数"
+
+#. module: crm_partner_assign
+#: view:crm.lead.forward.to.partner:0
+#: model:ir.actions.act_window,name:crm_partner_assign.crm_lead_forward_to_partner_act
+msgid "Forward to Partner"
+msgstr "パートナへ転送する"
+
+#. module: crm_partner_assign
+#: field:crm.partner.report.assign,name:0
+msgid "Partner name"
+msgstr "パートナ名"
+
+#. module: crm_partner_assign
+#: selection:crm.lead.report.assign,month:0
+msgid "May"
+msgstr "5月"
+
+#. module: crm_partner_assign
+#: field:crm.lead.report.assign,probable_revenue:0
+msgid "Probable Revenue"
+msgstr "見込み売上"
+
+#. module: crm_partner_assign
+#: field:crm.lead.forward.to.partner,reply_to:0
+msgid "Reply-To"
+msgstr "返信先"
+
+#. module: crm_partner_assign
+#: field:crm.lead,partner_assigned_id:0
+msgid "Assigned Partner"
+msgstr "割当てたパートナ"
+
+#. module: crm_partner_assign
+#: field:crm.lead.forward.to.partner,address_id:0
+msgid "Address"
+msgstr "住所"
+
+#. module: crm_partner_assign
+#: selection:crm.lead.report.assign,type:0
+msgid "Opportunity"
+msgstr "好機"
+
+#. module: crm_partner_assign
+#: view:crm.lead.forward.to.partner:0
+msgid "Send Mail"
+msgstr "Eメールを送信"
+
+#. module: crm_partner_assign
+#: field:crm.lead.report.assign,partner_id:0
+msgid "Customer"
+msgstr "顧客"
+
+#. module: crm_partner_assign
+#: selection:crm.lead.report.assign,month:0
+msgid "February"
+msgstr "2月"
+
+#. module: crm_partner_assign
+#: selection:crm.lead.forward.to.partner,send_to:0
+msgid "Email Address"
+msgstr "Eメールアドレス"
+
+#. module: crm_partner_assign
+#: view:crm.lead.report.assign:0
+#: field:crm.lead.report.assign,country_id:0
+#: view:crm.partner.report.assign:0
+#: field:crm.partner.report.assign,country_id:0
+msgid "Country"
+msgstr "国"
+
+#. module: crm_partner_assign
+#: field:crm.lead.forward.to.partner,headers:0
+msgid "Message headers"
+msgstr "メッセージの見出し"
+
+#. module: crm_partner_assign
+#: view:res.partner:0
+msgid "Convert to Opportunity"
+msgstr "好機に転換する"
+
+#. module: crm_partner_assign
+#: field:crm.lead.forward.to.partner,email_bcc:0
+msgid "Bcc"
+msgstr "BCC"
+
+#. module: crm_partner_assign
+#: view:crm.lead:0
+msgid "Geo Assign"
+msgstr "ジオ割当て"
+
+#. module: crm_partner_assign
+#: selection:crm.lead.report.assign,month:0
+msgid "April"
+msgstr "4月"
+
+#. module: crm_partner_assign
+#: model:ir.actions.act_window,name:crm_partner_assign.action_report_crm_partner_assign
+#: model:ir.ui.menu,name:crm_partner_assign.menu_report_crm_partner_assign_tree
+msgid "Partnership Analysis"
+msgstr "パートナ分析"
+
+#. module: crm_partner_assign
+#: model:ir.model,name:crm_partner_assign.model_crm_lead
+msgid "crm.lead"
+msgstr "crm.lead"
+
+#. module: crm_partner_assign
+#: selection:crm.lead.report.assign,state:0
+msgid "Pending"
+msgstr "保留"
+
+#. module: crm_partner_assign
+#: view:crm.partner.report.assign:0
+msgid "Partner assigned Analysis"
+msgstr "割当てパートナの分析"
+
+#. module: crm_partner_assign
+#: model:ir.model,name:crm_partner_assign.model_crm_lead_report_assign
+msgid "CRM Lead Report"
+msgstr "CRMリード報告書"
+
+#. module: crm_partner_assign
+#: help:crm.lead.forward.to.partner,references:0
+msgid "Message references, such as identifiers of previous messages"
+msgstr "メッセージの参照。前のメッセージの識別番号など"
+
+#. module: crm_partner_assign
+#: constraint:res.partner:0
+msgid "Error ! You cannot create recursive associated members."
+msgstr "エラー：重複したメンバーを作ることはできません。"
+
+#. module: crm_partner_assign
+#: selection:crm.lead.forward.to.partner,history:0
+msgid "Case Information"
+msgstr "事象情報"
+
+#. module: crm_partner_assign
+#: field:res.partner.grade,sequence:0
+msgid "Sequence"
+msgstr "順序"
+
+#. module: crm_partner_assign
+#: model:ir.model,name:crm_partner_assign.model_crm_partner_report_assign
+msgid "CRM Partner Report"
+msgstr "CRMパートナ報告書"
+
+#. module: crm_partner_assign
+#: model:ir.model,name:crm_partner_assign.model_crm_lead_forward_to_partner
+msgid "E-mail composition wizard"
+msgstr "Eメール作成ツール"
+
+#. module: crm_partner_assign
+#: selection:crm.lead.report.assign,priority:0
+msgid "High"
+msgstr "高"
+
+#. module: crm_partner_assign
+#: field:crm.lead.report.assign,section_id:0
+#: field:crm.partner.report.assign,section_id:0
+msgid "Sales Team"
+msgstr "販売チーム"
+
+#. module: crm_partner_assign
+#: field:crm.lead.report.assign,create_date:0
+msgid "Create Date"
+msgstr "作成日"
+
+#. module: crm_partner_assign
+#: field:crm.lead.forward.to.partner,filter_id:0
+msgid "Filters"
+msgstr "フィルタ"
+
+#. module: crm_partner_assign
+#: view:crm.lead.report.assign:0
+#: field:crm.lead.report.assign,year:0
+msgid "Year"
+msgstr "年"
+
+#. module: crm_partner_assign
+#: help:crm.lead.forward.to.partner,reply_to:0
+msgid "Preferred response address for the message"
+msgstr "メッセージの優先返信アドレス"
diff --git a/addons/crm_profiling/i18n/ja.po b/addons/crm_profiling/i18n/ja.po
new file mode 100644
index 00000000000..b3eb70b3a1a
--- /dev/null
+++ b/addons/crm_profiling/i18n/ja.po
@@ -0,0 +1,204 @@
+# 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-21 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-22 04:44+0000\n"
+"X-Generator: Launchpad (build 15120)\n"
+
+#. module: crm_profiling
+#: view:crm_profiling.questionnaire:0
+msgid "Questions List"
+msgstr "質問一覧"
+
+#. module: crm_profiling
+#: model:ir.actions.act_window,help:crm_profiling.open_questionnaires
+msgid ""
+"You can create specific topic-related questionnaires to guide your team(s) "
+"in the sales cycle by helping them to ask the right questions. The "
+"segmentation tool allows you to automatically assign a partner to a category "
+"according to his answers to the different questionnaires."
+msgstr ""
+"特定のトピックに関連した質問票を作成して、それを使って販売チームが適切な質問をするように指導できます。区分ツールを使って、質問に対する回答に応じて、パート"
+"ナを自動的に区分することができます。"
+
+#. module: crm_profiling
+#: field:crm_profiling.answer,question_id:0
+#: field:crm_profiling.question,name:0
+#: model:ir.model,name:crm_profiling.model_crm_profiling_question
+#: field:open.questionnaire.line,question_id:0
+msgid "Question"
+msgstr "質問"
+
+#. module: crm_profiling
+#: model:ir.actions.act_window,name:crm_profiling.action_open_questionnaire
+#: view:open.questionnaire:0
+msgid "Open Questionnaire"
+msgstr "質問票を開く"
+
+#. module: crm_profiling
+#: field:crm.segmentation,child_ids:0
+msgid "Child Profiles"
+msgstr "子のプロファイル"
+
+#. module: crm_profiling
+#: view:crm.segmentation:0
+msgid "Partner Segmentations"
+msgstr "パートナの分類"
+
+#. module: crm_profiling
+#: field:crm_profiling.answer,name:0
+#: model:ir.model,name:crm_profiling.model_crm_profiling_answer
+#: field:open.questionnaire.line,answer_id:0
+msgid "Answer"
+msgstr "回答"
+
+#. module: crm_profiling
+#: model:ir.model,name:crm_profiling.model_open_questionnaire_line
+msgid "open.questionnaire.line"
+msgstr "open.questionnaire.line"
+
+#. module: crm_profiling
+#: model:ir.model,name:crm_profiling.model_crm_segmentation
+msgid "Partner Segmentation"
+msgstr "パートナの分類"
+
+#. module: crm_profiling
+#: view:res.partner:0
+msgid "Profiling"
+msgstr "プロファイリング"
+
+#. module: crm_profiling
+#: view:crm_profiling.questionnaire:0
+#: field:crm_profiling.questionnaire,description:0
+msgid "Description"
+msgstr "詳細"
+
+#. module: crm_profiling
+#: field:crm.segmentation,answer_no:0
+msgid "Excluded Answers"
+msgstr "除外した回答"
+
+#. module: crm_profiling
+#: view:crm_profiling.answer:0
+#: view:crm_profiling.question:0
+#: field:res.partner,answers_ids:0
+msgid "Answers"
+msgstr "回答"
+
+#. module: crm_profiling
+#: model:ir.model,name:crm_profiling.model_open_questionnaire
+msgid "open.questionnaire"
+msgstr "open.questionnaire"
+
+#. module: crm_profiling
+#: field:open.questionnaire,questionnaire_id:0
+msgid "Questionnaire name"
+msgstr "質問票の名称"
+
+#. module: crm_profiling
+#: view:res.partner:0
+msgid "Use a questionnaire"
+msgstr "質問票を使う"
+
+#. module: crm_profiling
+#: view:open.questionnaire:0
+msgid "_Cancel"
+msgstr "キャンセル(_C)"
+
+#. module: crm_profiling
+#: field:open.questionnaire,question_ans_ids:0
+msgid "Question / Answers"
+msgstr "質問 / 回答"
+
+#. module: crm_profiling
+#: view:crm_profiling.questionnaire:0
+#: model:ir.actions.act_window,name:crm_profiling.open_questionnaires
+#: model:ir.ui.menu,name:crm_profiling.menu_segm_questionnaire
+#: view:open.questionnaire:0
+msgid "Questionnaires"
+msgstr "質問票"
+
+#. module: crm_profiling
+#: help:crm.segmentation,profiling_active:0
+msgid ""
+"Check                             this box if you want to use this tab as "
+"part of the                              segmentation rule. If not checked, "
+"the criteria beneath will be ignored"
+msgstr "区分の規則としてこのタブを使うのであれば、これをチェックして下さい。チェックしないと下記の基準は無視されます。"
+
+#. module: crm_profiling
+#: constraint:crm.segmentation:0
+msgid "Error ! You can not create recursive profiles."
+msgstr "エラー：重複したプロファイルを作ることはできません。"
+
+#. module: crm_profiling
+#: field:crm.segmentation,profiling_active:0
+msgid "Use The Profiling Rules"
+msgstr "プロファイル規則を使って下さい。"
+
+#. module: crm_profiling
+#: constraint:res.partner:0
+msgid "Error ! You cannot create recursive associated members."
+msgstr "エラー：再帰的なメンバーを作ることはできません。"
+
+#. module: crm_profiling
+#: view:crm_profiling.question:0
+#: field:crm_profiling.question,answers_ids:0
+msgid "Avalaible answers"
+msgstr "有効な回答"
+
+#. module: crm_profiling
+#: field:crm.segmentation,answer_yes:0
+msgid "Included Answers"
+msgstr "含まれた回答"
+
+#. module: crm_profiling
+#: view:crm_profiling.question:0
+#: field:crm_profiling.questionnaire,questions_ids:0
+#: model:ir.actions.act_window,name:crm_profiling.open_questions
+#: model:ir.ui.menu,name:crm_profiling.menu_segm_answer
+msgid "Questions"
+msgstr "質問"
+
+#. module: crm_profiling
+#: field:crm.segmentation,parent_id:0
+msgid "Parent Profile"
+msgstr "親プロファイル"
+
+#. module: crm_profiling
+#: view:open.questionnaire:0
+msgid "Cancel"
+msgstr "キャンセル"
+
+#. module: crm_profiling
+#: model:ir.model,name:crm_profiling.model_res_partner
+msgid "Partner"
+msgstr "パートナ"
+
+#. module: crm_profiling
+#: code:addons/crm_profiling/wizard/open_questionnaire.py:77
+#: field:crm_profiling.questionnaire,name:0
+#: model:ir.model,name:crm_profiling.model_crm_profiling_questionnaire
+#: view:open.questionnaire:0
+#: view:open.questionnaire.line:0
+#: field:open.questionnaire.line,wizard_id:0
+#, python-format
+msgid "Questionnaire"
+msgstr "質問票"
+
+#. module: crm_profiling
+#: view:open.questionnaire:0
+msgid "Save Data"
+msgstr "データを保存する"
diff --git a/addons/crm_todo/i18n/ja.po b/addons/crm_todo/i18n/ja.po
index 4923f2b9395..ffa0a726173 100644
--- a/addons/crm_todo/i18n/ja.po
+++ b/addons/crm_todo/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-20 04:43+0000\n"
+"X-Launchpad-Export-Date: 2012-04-21 05:01+0000\n"
 "X-Generator: Launchpad (build 15120)\n"
 
 #. module: crm_todo
diff --git a/addons/delivery/i18n/ja.po b/addons/delivery/i18n/ja.po
new file mode 100644
index 00000000000..1ed299dc900
--- /dev/null
+++ b/addons/delivery/i18n/ja.po
@@ -0,0 +1,644 @@
+# 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-21 18:47+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-22 04:44+0000\n"
+"X-Generator: Launchpad (build 15120)\n"
+
+#. module: delivery
+#: report:sale.shipping:0
+msgid "Order Ref."
+msgstr "受注"
+
+#. module: delivery
+#: model:product.template,name:delivery.delivery_product_product_template
+msgid "Delivery by Poste"
+msgstr "郵送配達"
+
+#. module: delivery
+#: view:delivery.carrier:0
+#: view:delivery.grid:0
+msgid "Destination"
+msgstr "宛先"
+
+#. module: delivery
+#: field:stock.move,weight_net:0
+msgid "Net weight"
+msgstr "正味重量"
+
+#. module: delivery
+#: view:stock.picking:0
+msgid "Delivery Order"
+msgstr "配送発注"
+
+#. module: delivery
+#: model:ir.model,name:delivery.model_delivery_grid_line
+msgid "Delivery Grid Line"
+msgstr "配送グリッド線"
+
+#. module: delivery
+#: view:delivery.carrier:0
+#: view:delivery.grid:0
+msgid "Delivery grids"
+msgstr "配送グリッド"
+
+#. module: delivery
+#: selection:delivery.grid.line,type:0
+#: selection:delivery.grid.line,variable_factor:0
+#: field:stock.picking,volume:0
+msgid "Volume"
+msgstr "容積"
+
+#. module: delivery
+#: field:delivery.grid,line_ids:0
+msgid "Grid Line"
+msgstr "グリッド線"
+
+#. module: delivery
+#: help:delivery.carrier,partner_id:0
+msgid "The partner that is doing the delivery service."
+msgstr "配送サービス・パートナ"
+
+#. module: delivery
+#: model:ir.actions.report.xml,name:delivery.report_shipping
+msgid "Delivery order"
+msgstr "配送の注文"
+
+#. module: delivery
+#: view:res.partner:0
+msgid "Deliveries Properties"
+msgstr "配送の特性"
+
+#. module: delivery
+#: model:ir.actions.act_window,name:delivery.action_picking_tree4
+msgid "Picking to be invoiced"
+msgstr "請求のための出庫"
+
+#. module: delivery
+#: field:delivery.carrier,pricelist_ids:0
+msgid "Advanced Pricing"
+msgstr "事前確認価格"
+
+#. module: delivery
+#: help:delivery.grid,sequence:0
+msgid "Gives the sequence order when displaying a list of delivery grid."
+msgstr "配送グリッド一覧の順序番号を指定します。"
+
+#. module: delivery
+#: view:delivery.carrier:0
+#: view:delivery.grid:0
+#: field:delivery.grid,country_ids:0
+msgid "Countries"
+msgstr "国"
+
+#. module: delivery
+#: report:sale.shipping:0
+msgid "Delivery Order :"
+msgstr "配送発注"
+
+#. module: delivery
+#: field:delivery.grid.line,variable_factor:0
+msgid "Variable Factor"
+msgstr "可変の要素"
+
+#. module: delivery
+#: model:ir.actions.act_window,help:delivery.action_delivery_grid_form
+msgid ""
+"The delivery price list allows you to compute the cost and sales price of "
+"the delivery according to the weight of the products and other criteria. You "
+"can define several price lists for one delivery method, per country or a "
+"zone in a specific country defined by a postal code range."
+msgstr ""
+"製品の重量などの基準に基づいて配送の原価と請求額を計算するために配送料一覧を使います。１つの配送方式について、国別、郵便番号に応じた地域別といった複数の価"
+"格リストを定義することができます。"
+
+#. module: delivery
+#: field:delivery.carrier,amount:0
+msgid "Amount"
+msgstr "金額"
+
+#. module: delivery
+#: selection:delivery.grid.line,price_type:0
+msgid "Fixed"
+msgstr "固定"
+
+#. module: delivery
+#: field:delivery.carrier,name:0
+#: view:delivery.sale.order:0
+#: field:delivery.sale.order,carrier_id:0
+#: model:ir.actions.act_window,name:delivery.action_delivery_carrier_form
+#: model:ir.ui.menu,name:delivery.menu_action_delivery_carrier_form
+#: field:res.partner,property_delivery_carrier:0
+#: field:sale.order,carrier_id:0
+msgid "Delivery Method"
+msgstr "配送方式"
+
+#. module: delivery
+#: code:addons/delivery/delivery.py:213
+#, python-format
+msgid "No price available!"
+msgstr "価格未定"
+
+#. module: delivery
+#: model:ir.model,name:delivery.model_stock_move
+msgid "Stock Move"
+msgstr "ストック移動"
+
+#. module: delivery
+#: field:stock.picking,carrier_tracking_ref:0
+msgid "Carrier Tracking Ref"
+msgstr "配送記録"
+
+#. module: delivery
+#: field:stock.picking,weight_net:0
+msgid "Net Weight"
+msgstr "正味重量"
+
+#. module: delivery
+#: view:delivery.grid.line:0
+msgid "Grid Lines"
+msgstr "グリッド線"
+
+#. module: delivery
+#: view:delivery.carrier:0
+#: view:delivery.grid:0
+msgid "Grid definition"
+msgstr "グリッドの定義"
+
+#. module: delivery
+#: view:delivery.sale.order:0
+msgid "_Cancel"
+msgstr "キャンセル(_C)"
+
+#. module: delivery
+#: field:delivery.grid.line,operator:0
+msgid "Operator"
+msgstr "操作員"
+
+#. module: delivery
+#: model:ir.model,name:delivery.model_res_partner
+msgid "Partner"
+msgstr "取引先"
+
+#. module: delivery
+#: model:ir.model,name:delivery.model_sale_order
+msgid "Sales Order"
+msgstr "受注"
+
+#. module: delivery
+#: model:ir.actions.act_window,help:delivery.action_delivery_carrier_form1
+msgid ""
+"Define your delivery methods and their pricing. The delivery costs can be "
+"added on the sale order form or in the invoice, based on the delivery orders."
+msgstr "配送方式とその価格を定義して下さい。配送注文に応じて、配送料を受注伝票あるいは請求書の中に追加することができます。"
+
+#. module: delivery
+#: report:sale.shipping:0
+msgid "Lot"
+msgstr "ロット"
+
+#. module: delivery
+#: field:delivery.carrier,partner_id:0
+msgid "Transport Company"
+msgstr "配送会社"
+
+#. module: delivery
+#: model:ir.model,name:delivery.model_delivery_grid
+msgid "Delivery Grid"
+msgstr "配送グリッド"
+
+#. module: delivery
+#: code:addons/delivery/delivery.py:213
+#, python-format
+msgid "No line matched this product or order in the choosed delivery grid."
+msgstr "指定した配送グリッドの中に、このプロダクトあるいは発注に合致した線がありません。"
+
+#. module: delivery
+#: report:sale.shipping:0
+msgid "Invoiced to"
+msgstr "請求先"
+
+#. module: delivery
+#: model:ir.model,name:delivery.model_stock_picking
+msgid "Picking List"
+msgstr "出庫票"
+
+#. module: delivery
+#: field:delivery.carrier,grids_id:0
+msgid "Delivery Grids"
+msgstr "配送グリッド"
+
+#. module: delivery
+#: model:ir.model,name:delivery.model_delivery_sale_order
+msgid "Make Delievery"
+msgstr "配送する"
+
+#. module: delivery
+#: field:delivery.grid.line,name:0
+msgid "Name"
+msgstr "氏名"
+
+#. module: delivery
+#: field:delivery.grid,zip_from:0
+msgid "Start Zip"
+msgstr "出発点の郵便番号"
+
+#. module: delivery
+#: help:delivery.carrier,amount:0
+msgid ""
+"Amount of the order to benefit from a free shipping, expressed in the "
+"company currency"
+msgstr "配達無料、会社通貨による速達を適用する配送の金額"
+
+#. module: delivery
+#: code:addons/delivery/stock.py:89
+#, python-format
+msgid "Warning"
+msgstr "警告"
+
+#. module: delivery
+#: field:delivery.grid.line,grid_id:0
+msgid "Grid"
+msgstr "グリッド"
+
+#. module: delivery
+#: help:delivery.grid,active:0
+msgid ""
+"If the active field is set to False, it will allow you to hide the delivery "
+"grid without removing it."
+msgstr "この項目を無しに設定すると、配送グリッドを消さずに、隠すことができます。"
+
+#. module: delivery
+#: field:delivery.grid,zip_to:0
+msgid "To Zip"
+msgstr "配達先郵便番号"
+
+#. module: delivery
+#: code:addons/delivery/delivery.py:141
+#, python-format
+msgid "Default price"
+msgstr "デフォルト価格"
+
+#. module: delivery
+#: model:ir.model,name:delivery.model_delivery_define_delivery_steps_wizard
+msgid "delivery.define.delivery.steps.wizard"
+msgstr "delivery.define.delivery.steps.wizard"
+
+#. module: delivery
+#: field:delivery.carrier,normal_price:0
+msgid "Normal Price"
+msgstr "標準価格"
+
+#. module: delivery
+#: report:sale.shipping:0
+msgid "Order Date"
+msgstr "発注日"
+
+#. module: delivery
+#: field:delivery.grid,name:0
+msgid "Grid Name"
+msgstr "グリッド名"
+
+#. module: delivery
+#: view:stock.move:0
+msgid "Weights"
+msgstr "重量"
+
+#. module: delivery
+#: field:stock.picking,number_of_packages:0
+msgid "Number of Packages"
+msgstr "パッケージの数"
+
+#. module: delivery
+#: selection:delivery.grid.line,type:0
+#: selection:delivery.grid.line,variable_factor:0
+#: report:sale.shipping:0
+#: field:stock.move,weight:0
+#: field:stock.picking,weight:0
+msgid "Weight"
+msgstr "重量"
+
+#. module: delivery
+#: help:delivery.carrier,use_detailed_pricelist:0
+msgid ""
+"Check this box if you want to manage delivery prices that depends on the "
+"destination, the weight, the total of the order, etc."
+msgstr "目的地、重量、受注金額などに応じて配送料を決めるのであれば、このボックスをチェックします。"
+
+#. module: delivery
+#: help:delivery.carrier,normal_price:0
+msgid ""
+"Keep empty if the pricing depends on the advanced pricing per destination"
+msgstr "目的地ごとに事前確認価格が決まっているのであれば、空白にします。"
+
+#. module: delivery
+#: constraint:stock.move:0
+msgid "You can not move products from or to a location of the type view."
+msgstr "タイプ表示では、プロダクトを動かすことはできません。"
+
+#. module: delivery
+#: code:addons/delivery/wizard/delivery_sale_order.py:70
+#, python-format
+msgid "No grid available !"
+msgstr "グリッドがありません。"
+
+#. module: delivery
+#: selection:delivery.grid.line,operator:0
+msgid ">="
+msgstr ">="
+
+#. module: delivery
+#: code:addons/delivery/wizard/delivery_sale_order.py:53
+#: code:addons/delivery/wizard/delivery_sale_order.py:73
+#, python-format
+msgid "Order not in draft state !"
+msgstr "発注が予定状態ではありません。"
+
+#. module: delivery
+#: view:delivery.define.delivery.steps.wizard:0
+msgid "Choose Your Default Picking Policy"
+msgstr "デフォルトの出庫方策を選んで下さい。"
+
+#. module: delivery
+#: constraint:stock.move:0
+msgid "You try to assign a lot which is not from the same product"
+msgstr "違う製品のロットを割り当てることはできません。"
+
+#. module: delivery
+#: field:delivery.carrier,active:0
+#: field:delivery.grid,active:0
+msgid "Active"
+msgstr "仕掛り中"
+
+#. module: delivery
+#: report:sale.shipping:0
+msgid "Shipping Date"
+msgstr "出荷日"
+
+#. module: delivery
+#: field:delivery.carrier,product_id:0
+msgid "Delivery Product"
+msgstr "配送製品"
+
+#. module: delivery
+#: view:delivery.grid.line:0
+msgid "Condition"
+msgstr "条件"
+
+#. module: delivery
+#: field:delivery.grid.line,standard_price:0
+msgid "Cost Price"
+msgstr "原価"
+
+#. module: delivery
+#: field:delivery.define.delivery.steps.wizard,picking_policy:0
+msgid "Picking Policy"
+msgstr "出庫方策"
+
+#. module: delivery
+#: selection:delivery.grid.line,price_type:0
+#: field:delivery.grid.line,type:0
+msgid "Variable"
+msgstr "変数"
+
+#. module: delivery
+#: help:res.partner,property_delivery_carrier:0
+msgid "This delivery method will be used when invoicing from picking."
+msgstr "出庫の請求をするときに、この配送方式が使われます。"
+
+#. module: delivery
+#: sql_constraint:stock.picking:0
+msgid "Reference must be unique per Company!"
+msgstr "参照は会社内で固有でなければいけません"
+
+#. module: delivery
+#: field:delivery.grid.line,max_value:0
+msgid "Maximum Value"
+msgstr "最大値"
+
+#. module: delivery
+#: report:sale.shipping:0
+msgid "Quantity"
+msgstr "数量"
+
+#. module: delivery
+#: view:delivery.define.delivery.steps.wizard:0
+#: model:ir.actions.act_window,name:delivery.action_define_delivery_steps
+msgid "Setup Your Picking Policy"
+msgstr "出庫方策を定義します。"
+
+#. module: delivery
+#: model:ir.actions.act_window,name:delivery.action_delivery_carrier_form1
+msgid "Define Delivery Methods"
+msgstr "配送方式を定義します。"
+
+#. module: delivery
+#: help:delivery.carrier,free_if_more_than:0
+msgid ""
+"If the order is more expensive than a certain amount, the customer can "
+"benefit from a free shipping"
+msgstr "受注額が特定の金額以上の場合には、顧客は配送無料の特典を受けることができます。"
+
+#. module: delivery
+#: help:sale.order,carrier_id:0
+msgid ""
+"Complete this field if you plan to invoice the shipping based on picking."
+msgstr "出庫量に応じて配送料を請求するのであれば、この項目を指定して下さい。"
+
+#. module: delivery
+#: view:delivery.define.delivery.steps.wizard:0
+msgid "Cancel"
+msgstr "キャンセル"
+
+#. module: delivery
+#: code:addons/delivery/delivery.py:130
+#, python-format
+msgid "Free if more than %.2f"
+msgstr "%.2f 以上であれば無料"
+
+#. module: delivery
+#: sql_constraint:sale.order:0
+msgid "Order Reference must be unique per Company!"
+msgstr "発注参照は、会社内で固有でなければなりません。"
+
+#. module: delivery
+#: model:ir.actions.act_window,help:delivery.action_delivery_carrier_form
+msgid ""
+"Define the delivery methods you are using and their pricing in order to "
+"reinvoice the delivery costs when you are doing invoicing based on delivery "
+"orders"
+msgstr "配送方式と注文に応じて請求する配送料を定義します。"
+
+#. module: delivery
+#: view:res.partner:0
+msgid "Sales & Purchases"
+msgstr "受注と発注"
+
+#. module: delivery
+#: selection:delivery.grid.line,operator:0
+msgid "<="
+msgstr "<="
+
+#. module: delivery
+#: constraint:stock.move:0
+msgid "You must assign a production lot for this product"
+msgstr "この製品に生産ロットを割り当てて下さい。"
+
+#. module: delivery
+#: field:delivery.carrier,free_if_more_than:0
+msgid "Free If More Than"
+msgstr "これ以上であれば無料"
+
+#. module: delivery
+#: view:delivery.sale.order:0
+msgid "Create Deliveries"
+msgstr "配送を手配する"
+
+#. module: delivery
+#: view:delivery.carrier:0
+#: view:delivery.grid:0
+#: field:delivery.grid,state_ids:0
+msgid "States"
+msgstr "状態"
+
+#. module: delivery
+#: report:sale.shipping:0
+msgid "Description"
+msgstr "詳細"
+
+#. module: delivery
+#: help:delivery.carrier,active:0
+msgid ""
+"If the active field is set to False, it will allow you to hide the delivery "
+"carrier without removing it."
+msgstr "この項目を無しに設定すると、配送会社を取り除くことなく、隠すことができます。"
+
+#. module: delivery
+#: model:ir.actions.act_window,name:delivery.action_delivery_grid_form
+#: model:ir.ui.menu,name:delivery.menu_action_delivery_grid_form
+msgid "Delivery Pricelist"
+msgstr "配送価格表"
+
+#. module: delivery
+#: field:delivery.carrier,price:0
+#: selection:delivery.grid.line,type:0
+#: selection:delivery.grid.line,variable_factor:0
+msgid "Price"
+msgstr "価格"
+
+#. module: delivery
+#: code:addons/delivery/wizard/delivery_sale_order.py:70
+#, python-format
+msgid "No grid matching for this carrier !"
+msgstr "この配送会社の合致するグリッドがありません。"
+
+#. module: delivery
+#: model:ir.ui.menu,name:delivery.menu_delivery
+msgid "Delivery"
+msgstr "配送"
+
+#. module: delivery
+#: selection:delivery.grid.line,type:0
+#: selection:delivery.grid.line,variable_factor:0
+msgid "Weight * Volume"
+msgstr "重量×数量"
+
+#. module: delivery
+#: selection:delivery.grid.line,operator:0
+msgid "="
+msgstr "="
+
+#. module: delivery
+#: code:addons/delivery/stock.py:90
+#, python-format
+msgid "The carrier %s (id: %d) has no delivery grid!"
+msgstr "配送会社 %s (ID: %d) の配送グリッドはありません。"
+
+#. module: delivery
+#: view:delivery.carrier:0
+msgid "Pricing Information"
+msgstr "価格情報"
+
+#. module: delivery
+#: selection:delivery.define.delivery.steps.wizard,picking_policy:0
+msgid "Deliver all products at once"
+msgstr "全ての製品を一緒に配送"
+
+#. module: delivery
+#: field:delivery.carrier,use_detailed_pricelist:0
+msgid "Advanced Pricing per Destination"
+msgstr "目的地ごとの事前確認価格"
+
+#. module: delivery
+#: view:delivery.carrier:0
+#: field:delivery.grid,carrier_id:0
+#: model:ir.model,name:delivery.model_delivery_carrier
+#: report:sale.shipping:0
+#: field:stock.picking,carrier_id:0
+msgid "Carrier"
+msgstr "配送会社"
+
+#. module: delivery
+#: view:delivery.sale.order:0
+msgid "_Apply"
+msgstr "適用する(_A)"
+
+#. module: delivery
+#: field:sale.order,id:0
+msgid "ID"
+msgstr "ID"
+
+#. module: delivery
+#: code:addons/delivery/wizard/delivery_sale_order.py:53
+#: code:addons/delivery/wizard/delivery_sale_order.py:73
+#, python-format
+msgid "The order state have to be draft to add delivery lines."
+msgstr "配送行が決まるまでは、発注状態は「予定」でなければいけません。"
+
+#. module: delivery
+#: constraint:res.partner:0
+msgid "Error ! You cannot create recursive associated members."
+msgstr "エラー：重複したメンバーを作ることはできません。"
+
+#. module: delivery
+#: field:delivery.grid,sequence:0
+msgid "Sequence"
+msgstr "順序"
+
+#. module: delivery
+#: field:delivery.grid.line,list_price:0
+msgid "Sale Price"
+msgstr "販売価格"
+
+#. module: delivery
+#: model:ir.actions.act_window,name:delivery.action_delivery_cost
+#: view:sale.order:0
+msgid "Delivery Costs"
+msgstr "配送コスト"
+
+#. module: delivery
+#: selection:delivery.define.delivery.steps.wizard,picking_policy:0
+msgid "Deliver each product when available"
+msgstr "ある製品ごとに配送する。"
+
+#. module: delivery
+#: view:delivery.define.delivery.steps.wizard:0
+msgid "Apply"
+msgstr "適用する"
+
+#. module: delivery
+#: field:delivery.grid.line,price_type:0
+msgid "Price Type"
+msgstr "価格タイプ"
diff --git a/addons/document/i18n/ja.po b/addons/document/i18n/ja.po
new file mode 100644
index 00000000000..e1517513841
--- /dev/null
+++ b/addons/document/i18n/ja.po
@@ -0,0 +1,1014 @@
+# 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-21 16:49+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-22 04:45+0000\n"
+"X-Generator: Launchpad (build 15120)\n"
+
+#. module: document
+#: field:document.directory,parent_id:0
+msgid "Parent Directory"
+msgstr "親ディレクトリ"
+
+#. module: document
+#: code:addons/document/document_directory.py:276
+#, python-format
+msgid "Directory name contains special characters!"
+msgstr "ディレクトリ名に特殊文字が含まれています。"
+
+#. module: document
+#: field:document.directory,resource_field:0
+msgid "Name field"
+msgstr "名前項目"
+
+#. module: document
+#: view:board.board:0
+msgid "Document board"
+msgstr "ドキュメントボード"
+
+#. module: document
+#: model:ir.model,name:document.model_process_node
+msgid "Process Node"
+msgstr "処理ノード"
+
+#. module: document
+#: view:document.directory:0
+msgid "Search Document Directory"
+msgstr "文書ディレクトリを検索する"
+
+#. module: document
+#: help:document.directory,resource_field:0
+msgid ""
+"Field to be used as name on resource directories. If empty, the \"name\" "
+"will be used."
+msgstr "リソースディレクトリの名称として使う項目。空白にすると、\"名前\" が使われます。"
+
+#. module: document
+#: view:document.directory:0
+#: view:document.storage:0
+msgid "Group By..."
+msgstr "グループ化…"
+
+#. module: document
+#: model:ir.model,name:document.model_document_directory_content_type
+msgid "Directory Content Type"
+msgstr "内容のタイプのディレクトリ"
+
+#. module: document
+#: view:document.directory:0
+msgid "Resources"
+msgstr "リソース"
+
+#. module: document
+#: field:document.directory,file_ids:0
+#: view:report.document.user:0
+msgid "Files"
+msgstr "ファイル"
+
+#. module: document
+#: view:report.files.partner:0
+msgid "Files per Month"
+msgstr "月別のファイル"
+
+#. module: document
+#: selection:report.document.user,month:0
+#: selection:report.files.partner,month:0
+msgid "March"
+msgstr "3月"
+
+#. module: document
+#: view:document.configuration:0
+msgid "title"
+msgstr "タイトル"
+
+#. module: document
+#: field:document.directory.dctx,expr:0
+msgid "Expression"
+msgstr "表現"
+
+#. module: document
+#: view:document.directory:0
+#: field:document.directory,company_id:0
+msgid "Company"
+msgstr "会社"
+
+#. module: document
+#: model:ir.model,name:document.model_document_directory_content
+msgid "Directory Content"
+msgstr "ディレクトリの内容"
+
+#. module: document
+#: view:document.directory:0
+msgid "Dynamic context"
+msgstr "ダイナミックな文脈"
+
+#. module: document
+#: model:ir.ui.menu,name:document.menu_document_management_configuration
+msgid "Document Management"
+msgstr "文書管理"
+
+#. module: document
+#: help:document.directory.dctx,expr:0
+msgid ""
+"A python expression used to evaluate the field.\n"
+"You can use 'dir_id' for current dir, 'res_id', 'res_model' as a reference "
+"to the current record, in dynamic folders"
+msgstr ""
+"項目を評価するためのPython表記\n"
+"ダイナミックフォルダの中の現在ディレクトには 'dir_id' を、現在レコードを参照するには 'res_id'、 'res_model' "
+"を使うことができます。"
+
+#. module: document
+#: view:report.document.user:0
+msgid "This Year"
+msgstr "今年度"
+
+#. module: document
+#: field:document.storage,path:0
+msgid "Path"
+msgstr "パス"
+
+#. module: document
+#: code:addons/document/document_directory.py:266
+#: code:addons/document/document_directory.py:271
+#, python-format
+msgid "Directory name must be unique!"
+msgstr "ディレクトリ名は固有でなければいけません。"
+
+#. module: document
+#: view:ir.attachment:0
+msgid "Filter on my documents"
+msgstr "ドキュメントのフィルタ"
+
+#. module: document
+#: field:ir.attachment,index_content:0
+msgid "Indexed Content"
+msgstr "索引付き内容"
+
+#. module: document
+#: help:document.directory,resource_find_all:0
+msgid ""
+"If true, all attachments that match this resource will  be located. If "
+"false, only ones that have this as parent."
+msgstr "そうであれば，このリソースに合致する全ての添付を探します。そうでなければ、これを親とするものだけを探します。"
+
+#. module: document
+#: model:ir.actions.todo.category,name:document.category_knowledge_mgmt_config
+msgid "Knowledge Management"
+msgstr "知識管理"
+
+#. module: document
+#: view:document.directory:0
+#: field:document.storage,dir_ids:0
+#: model:ir.ui.menu,name:document.menu_document_directories
+msgid "Directories"
+msgstr "ディレクトリ"
+
+#. module: document
+#: model:ir.model,name:document.model_report_document_user
+msgid "Files details by Users"
+msgstr "ユーザごとのファイルの詳細"
+
+#. module: document
+#: code:addons/document/document_storage.py:573
+#: code:addons/document/document_storage.py:601
+#, python-format
+msgid "Error!"
+msgstr "エラー"
+
+#. module: document
+#: field:document.directory,resource_find_all:0
+msgid "Find all resources"
+msgstr "全てのリソースを探す"
+
+#. module: document
+#: selection:document.directory,type:0
+msgid "Folders per resource"
+msgstr "リソース別のフォルダ"
+
+#. module: document
+#: field:document.directory.content,suffix:0
+msgid "Suffix"
+msgstr "接尾語"
+
+#. module: document
+#: field:report.document.user,change_date:0
+msgid "Modified Date"
+msgstr "変更日"
+
+#. module: document
+#: view:document.configuration:0
+msgid "Knowledge Application Configuration"
+msgstr "知識アプリケーションの設定"
+
+#. module: document
+#: view:ir.attachment:0
+#: field:ir.attachment,partner_id:0
+#: field:report.files.partner,partner:0
+msgid "Partner"
+msgstr "パートナ"
+
+#. module: document
+#: view:board.board:0
+msgid "Files by Users"
+msgstr "ユーザ別のファイル"
+
+#. module: document
+#: field:process.node,directory_id:0
+msgid "Document directory"
+msgstr "文書ディレクトリ"
+
+#. module: document
+#: code:addons/document/document.py:220
+#: code:addons/document/document.py:299
+#: code:addons/document/document_directory.py:266
+#: code:addons/document/document_directory.py:271
+#: code:addons/document/document_directory.py:276
+#, python-format
+msgid "ValidateError"
+msgstr "検証エラー"
+
+#. module: document
+#: model:ir.model,name:document.model_ir_actions_report_xml
+msgid "ir.actions.report.xml"
+msgstr "ir.actions.report.xml"
+
+#. module: document
+#: model:ir.actions.act_window,name:document.action_document_file_form
+#: view:ir.attachment:0
+#: model:ir.ui.menu,name:document.menu_document_doc
+#: model:ir.ui.menu,name:document.menu_document_files
+msgid "Documents"
+msgstr "文書"
+
+#. module: document
+#: constraint:document.directory:0
+msgid "Error! You can not create recursive Directories."
+msgstr "エラー：ディレクトリを重複して作ることはできません。"
+
+#. module: document
+#: view:document.directory:0
+#: field:document.directory,storage_id:0
+msgid "Storage"
+msgstr "ストレージ"
+
+#. module: document
+#: field:document.directory,ressource_type_id:0
+msgid "Resource model"
+msgstr "リソースモデル"
+
+#. module: document
+#: field:ir.attachment,file_size:0
+#: field:report.document.file,file_size:0
+#: field:report.document.user,file_size:0
+#: field:report.files.partner,file_size:0
+msgid "File Size"
+msgstr "ファイルサイズ"
+
+#. module: document
+#: field:document.directory.content.type,name:0
+#: field:ir.attachment,file_type:0
+msgid "Content Type"
+msgstr "内容タイプ"
+
+#. module: document
+#: view:document.directory:0
+#: field:document.directory,type:0
+#: view:document.storage:0
+#: field:document.storage,type:0
+msgid "Type"
+msgstr "タイプ"
+
+#. module: document
+#: help:document.directory,ressource_type_id:0
+msgid ""
+"Select an object here and there will be one folder per record of that "
+"resource."
+msgstr "あれこれオブジェクトを選択すると、そのリソースのレコードごとに１つのフォルダが作られます。"
+
+#. module: document
+#: help:document.directory,domain:0
+msgid ""
+"Use a domain if you want to apply an automatic filter on visible resources."
+msgstr "リソースに対して自動フィルタを適用するのであれば、ドメインを使って下さい。"
+
+#. module: document
+#: model:ir.actions.act_window,name:document.action_view_files_by_partner
+msgid "Files Per Partner"
+msgstr "パートナ別のファイル"
+
+#. module: document
+#: field:document.directory,dctx_ids:0
+msgid "Context fields"
+msgstr "文脈項目"
+
+#. module: document
+#: field:ir.attachment,store_fname:0
+msgid "Stored Filename"
+msgstr "記憶されたファイル名"
+
+#. module: document
+#: view:document.directory:0
+#: field:report.document.user,type:0
+msgid "Directory Type"
+msgstr "ディレクトリタイプ"
+
+#. module: document
+#: field:document.directory.content,report_id:0
+msgid "Report"
+msgstr "報告"
+
+#. module: document
+#: selection:report.document.user,month:0
+#: selection:report.files.partner,month:0
+msgid "July"
+msgstr "7月"
+
+#. module: document
+#: model:ir.actions.act_window,name:document.open_board_document_manager
+#: model:ir.ui.menu,name:document.menu_reports_document_manager
+msgid "Document Dashboard"
+msgstr "文書ダッシュボード"
+
+#. module: document
+#: field:document.directory.content.type,code:0
+msgid "Extension"
+msgstr "拡張子"
+
+#. module: document
+#: view:ir.attachment:0
+msgid "Created"
+msgstr "作成済み"
+
+#. module: document
+#: field:document.directory,content_ids:0
+msgid "Virtual Files"
+msgstr "仮想ファイル"
+
+#. module: document
+#: view:ir.attachment:0
+msgid "Modified"
+msgstr "変更済み"
+
+#. module: document
+#: code:addons/document/document_storage.py:639
+#, python-format
+msgid "Error at doc write!"
+msgstr "文書の書込みエラー"
+
+#. module: document
+#: view:document.directory:0
+msgid "Generated Files"
+msgstr "生成されたファイル"
+
+#. module: document
+#: view:document.configuration:0
+msgid ""
+"When executing this wizard, it will configure your directories automatically "
+"according to modules installed."
+msgstr "これを実行すると、インストールされているモジュールがディレクトリを自動的に作成します。"
+
+#. module: document
+#: field:document.directory.content,directory_id:0
+#: field:document.directory.dctx,dir_id:0
+#: model:ir.actions.act_window,name:document.action_document_file_directory_form
+#: view:ir.attachment:0
+#: field:ir.attachment,parent_id:0
+#: model:ir.model,name:document.model_document_directory
+#: field:report.document.user,directory:0
+msgid "Directory"
+msgstr "ディレクトリ"
+
+#. module: document
+#: view:document.directory:0
+msgid "Security"
+msgstr "セキュリティ"
+
+#. module: document
+#: field:document.directory,write_uid:0
+#: field:document.storage,write_uid:0
+#: field:ir.attachment,write_uid:0
+msgid "Last Modification User"
+msgstr "前回，修正したユーザ"
+
+#. module: document
+#: model:ir.actions.act_window,name:document.act_res_partner_document
+#: model:ir.actions.act_window,name:document.zoom_directory
+msgid "Related Documents"
+msgstr "関連した文書"
+
+#. module: document
+#: field:document.directory,domain:0
+msgid "Domain"
+msgstr "ドメイン"
+
+#. module: document
+#: field:document.directory,write_date:0
+#: field:document.storage,write_date:0
+#: field:ir.attachment,write_date:0
+msgid "Date Modified"
+msgstr "変更日"
+
+#. module: document
+#: model:ir.model,name:document.model_report_document_file
+msgid "Files details by Directory"
+msgstr "ディレクト別ファイルの詳細"
+
+#. module: document
+#: view:report.document.user:0
+msgid "All users files"
+msgstr "全てのユーザのファイル"
+
+#. module: document
+#: view:board.board:0
+#: model:ir.actions.act_window,name:document.action_view_size_month
+#: view:report.document.file:0
+msgid "File Size by Month"
+msgstr "月別のファイルサイズ"
+
+#. module: document
+#: selection:report.document.user,month:0
+#: selection:report.files.partner,month:0
+msgid "December"
+msgstr "12月"
+
+#. module: document
+#: field:document.configuration,config_logo:0
+msgid "Image"
+msgstr "画像"
+
+#. module: document
+#: selection:document.directory,type:0
+msgid "Static Directory"
+msgstr "静的ディレクトリ"
+
+#. module: document
+#: field:document.directory,child_ids:0
+msgid "Children"
+msgstr "子"
+
+#. module: document
+#: view:document.directory:0
+msgid "Define words in the context, for all child directories and files"
+msgstr "全ての子ディレクトリとファイルのために、文脈の単語を定義して下さい。"
+
+#. module: document
+#: help:document.storage,online:0
+msgid ""
+"If not checked, media is currently offline and its contents not available"
+msgstr "これをチェックしないと、メディアはオフラインになってその内容は参照できません。"
+
+#. module: document
+#: view:document.directory:0
+#: field:document.directory,user_id:0
+#: field:document.storage,user_id:0
+#: view:ir.attachment:0
+#: field:ir.attachment,user_id:0
+#: field:report.document.user,user_id:0
+#: field:report.document.wall,user_id:0
+msgid "Owner"
+msgstr "所有者"
+
+#. module: document
+#: view:document.directory:0
+msgid "PDF Report"
+msgstr "PDF形式の報告書"
+
+#. module: document
+#: view:document.directory:0
+msgid "Contents"
+msgstr "内容"
+
+#. module: document
+#: field:document.directory,create_date:0
+#: field:document.storage,create_date:0
+#: field:report.document.user,create_date:0
+msgid "Date Created"
+msgstr "作成日"
+
+#. module: document
+#: help:document.directory.content,include_name:0
+msgid ""
+"Check this field if you want that the name of the file to contain the record "
+"name.\n"
+"If set, the directory will have to be a resource one."
+msgstr ""
+"ファイル名にレコード名を含めるのであれば、これをチェックして下さい。\n"
+"そうすると、ディレクトリはリソースディレクトリになります。"
+
+#. module: document
+#: view:document.configuration:0
+#: model:ir.actions.act_window,name:document.action_config_auto_directory
+msgid "Configure Directories"
+msgstr "ディレクトリを設定する"
+
+#. module: document
+#: field:document.directory.content,include_name:0
+msgid "Include Record Name"
+msgstr "レコード名を含める"
+
+#. module: document
+#: view:ir.attachment:0
+msgid "Attachment"
+msgstr "添付"
+
+#. module: document
+#: field:ir.actions.report.xml,model_id:0
+msgid "Model Id"
+msgstr "モデルID"
+
+#. module: document
+#: field:document.storage,online:0
+msgid "Online"
+msgstr "オンライン"
+
+#. module: document
+#: help:document.directory,ressource_tree:0
+msgid ""
+"Check this if you want to use the same tree structure as the object selected "
+"in the system."
+msgstr "選択したオブジェクトと同じようなツリー構造を使うのであれば、これをチェックして下さい。"
+
+#. module: document
+#: help:document.directory,ressource_id:0
+msgid ""
+"Along with Parent Model, this ID attaches this folder to a specific record "
+"of Parent Model."
+msgstr "このIDは、親モデルの特定のレコードにこのフォルダを関連付けるます。"
+
+#. module: document
+#: selection:report.document.user,month:0
+#: selection:report.files.partner,month:0
+msgid "August"
+msgstr "8月"
+
+#. module: document
+#: sql_constraint:document.directory:0
+msgid "Directory cannot be parent of itself!"
+msgstr "ディレクトリはそれ自身の親になれません。"
+
+#. module: document
+#: selection:report.document.user,month:0
+#: selection:report.files.partner,month:0
+msgid "June"
+msgstr "6月"
+
+#. module: document
+#: field:report.document.user,user:0
+#: field:report.document.wall,user:0
+msgid "User"
+msgstr "ユーザ"
+
+#. module: document
+#: field:document.directory,group_ids:0
+#: field:document.storage,group_ids:0
+msgid "Groups"
+msgstr "グループ"
+
+#. module: document
+#: field:document.directory.content.type,active:0
+msgid "Active"
+msgstr "活動中"
+
+#. module: document
+#: selection:report.document.user,month:0
+#: selection:report.files.partner,month:0
+msgid "November"
+msgstr "11月"
+
+#. module: document
+#: view:ir.attachment:0
+#: field:ir.attachment,db_datas:0
+msgid "Data"
+msgstr "データ"
+
+#. module: document
+#: help:document.directory,ressource_parent_type_id:0
+msgid ""
+"If you put an object here, this directory template will appear bellow all of "
+"these objects. Such directories are \"attached\" to the specific model or "
+"record, just like attachments. Don't put a parent directory if you select a "
+"parent model."
+msgstr ""
+"オブジェクトをここに置くと、これら全てのオブジェクトの下にディレクトリテンプレートが表示されます。そのディレクトリは特定のモデルあるいはレコードに添付され"
+"ます。親ディレクトを選んだ場合には、親ディレクトリを指定してはいけません。"
+
+#. module: document
+#: view:document.directory:0
+msgid "Definition"
+msgstr "定義"
+
+#. module: document
+#: selection:report.document.user,month:0
+#: selection:report.files.partner,month:0
+msgid "October"
+msgstr "10月"
+
+#. module: document
+#: view:document.directory:0
+msgid "Seq."
+msgstr "順序"
+
+#. module: document
+#: selection:document.storage,type:0
+msgid "Database"
+msgstr "データベース"
+
+#. module: document
+#: selection:report.document.user,month:0
+#: selection:report.files.partner,month:0
+msgid "January"
+msgstr "1月"
+
+#. module: document
+#: view:ir.attachment:0
+msgid "Related to"
+msgstr "次に関連"
+
+#. module: document
+#: view:ir.attachment:0
+msgid "Attached To"
+msgstr "次に添付"
+
+#. module: document
+#: model:ir.ui.menu,name:document.menu_reports_document
+msgid "Dashboard"
+msgstr "ダッシュボード"
+
+#. module: document
+#: model:ir.actions.act_window,name:document.action_view_user_graph
+msgid "Files By Users"
+msgstr "ユーザ別のファイル"
+
+#. module: document
+#: field:document.storage,readonly:0
+msgid "Read Only"
+msgstr "読取り専用"
+
+#. module: document
+#: model:ir.actions.act_window,name:document.action_document_directory_form
+msgid "Document Directory"
+msgstr "文書ディレクトリ"
+
+#. module: document
+#: sql_constraint:document.directory:0
+msgid "The directory name must be unique !"
+msgstr "ディレクトリ名は固有でなければいけません。"
+
+#. module: document
+#: field:document.directory,create_uid:0
+#: field:document.storage,create_uid:0
+msgid "Creator"
+msgstr "作成者"
+
+#. module: document
+#: field:document.directory.content,sequence:0
+msgid "Sequence"
+msgstr "順序"
+
+#. module: document
+#: view:document.configuration:0
+msgid ""
+"OpenERP's Document Management System supports mapping virtual folders with "
+"documents. The virtual folder of a document can be used to manage the files "
+"attached to the document, or to print and download any report. This tool "
+"will create directories automatically according to modules installed."
+msgstr ""
+"OpenERPの文書管理システムは、仮想フォルダを文書でマッピングする機能を持っています。文書の仮想フォルダは、文書に添付されたファイルを管理したり、報告"
+"書を印刷したりダウンロードしたりするのに使うことができます。このツールは、インストールされたモデルによってディレクトリを自動的に作成します。"
+
+#. module: document
+#: view:board.board:0
+#: model:ir.actions.act_window,name:document.action_view_files_by_month_graph
+#: view:report.document.user:0
+msgid "Files by Month"
+msgstr "月別のファイル"
+
+#. module: document
+#: selection:report.document.user,month:0
+#: selection:report.files.partner,month:0
+msgid "September"
+msgstr "9月"
+
+#. module: document
+#: field:document.directory.content,prefix:0
+msgid "Prefix"
+msgstr "接頭語"
+
+#. module: document
+#: field:report.document.wall,last:0
+msgid "Last Posted Time"
+msgstr "前回、掲示された時間"
+
+#. module: document
+#: field:report.document.user,datas_fname:0
+msgid "File Name"
+msgstr "ファイル名"
+
+#. module: document
+#: view:document.configuration:0
+msgid "res_config_contents"
+msgstr "res_config_contents"
+
+#. module: document
+#: field:document.directory,ressource_id:0
+msgid "Resource ID"
+msgstr "リソースID"
+
+#. module: document
+#: selection:document.storage,type:0
+msgid "External file storage"
+msgstr "外部ファイルストレージ"
+
+#. module: document
+#: view:board.board:0
+#: model:ir.actions.act_window,name:document.action_view_wall
+#: view:report.document.wall:0
+msgid "Wall of Shame"
+msgstr "恥の壁"
+
+#. module: document
+#: help:document.storage,path:0
+msgid "For file storage, the root path of the storage"
+msgstr "ファイルストレージのルートパス"
+
+#. module: document
+#: model:ir.model,name:document.model_report_files_partner
+msgid "Files details by Partners"
+msgstr "パートナ別のファイルの詳細"
+
+#. module: document
+#: field:document.directory.dctx,field:0
+msgid "Field"
+msgstr "項目"
+
+#. module: document
+#: model:ir.model,name:document.model_document_directory_dctx
+msgid "Directory Dynamic Context"
+msgstr "ディレクトリのダイナミック文脈"
+
+#. module: document
+#: field:document.directory,ressource_parent_type_id:0
+msgid "Parent Model"
+msgstr "親モデル"
+
+#. module: document
+#: view:report.document.user:0
+msgid "Files by users"
+msgstr "ユーザ別のファイル"
+
+#. module: document
+#: field:report.document.file,month:0
+#: field:report.document.user,month:0
+#: field:report.document.wall,month:0
+#: field:report.document.wall,name:0
+#: field:report.files.partner,month:0
+msgid "Month"
+msgstr "月"
+
+#. module: document
+#: view:report.document.user:0
+msgid "This Months Files"
+msgstr "今月のファイル"
+
+#. module: document
+#: model:ir.ui.menu,name:document.menu_reporting
+msgid "Reporting"
+msgstr "報告"
+
+#. module: document
+#: field:document.directory,ressource_tree:0
+msgid "Tree Structure"
+msgstr "ツリー構造"
+
+#. module: document
+#: selection:report.document.user,month:0
+#: selection:report.files.partner,month:0
+msgid "May"
+msgstr "5月"
+
+#. module: document
+#: model:ir.actions.act_window,name:document.action_view_all_document_tree1
+msgid "All Users files"
+msgstr "全てのユーザのファイル"
+
+#. module: document
+#: model:ir.model,name:document.model_report_document_wall
+msgid "Users that did not inserted documents since one month"
+msgstr "過去１ヶ月で文書を追加しなかったユーザ"
+
+#. module: document
+#: model:ir.actions.act_window,help:document.action_document_file_form
+msgid ""
+"The Documents repository gives you access to all attachments, such as mails, "
+"project documents, invoices etc."
+msgstr "文書リポジトリでは、Eメール、プロジェクト文書、請求書などの全ての添付をあなたはアクセスできます。"
+
+#. module: document
+#: view:document.directory:0
+msgid "For each entry here, virtual files will appear in this folder."
+msgstr "個々の記入項目について、このフォルダの中の仮想ファイルが表示されます。"
+
+#. module: document
+#: model:ir.model,name:document.model_ir_attachment
+msgid "ir.attachment"
+msgstr "ir.attachment"
+
+#. module: document
+#: view:board.board:0
+msgid "New Files"
+msgstr "新しいファイル"
+
+#. module: document
+#: view:document.directory:0
+msgid "Static"
+msgstr "静的"
+
+#. module: document
+#: view:report.files.partner:0
+msgid "Files By Partner"
+msgstr "パートナ別のファイル"
+
+#. module: document
+#: view:ir.attachment:0
+msgid "Indexed Content - experimental"
+msgstr "索引付き内容 - 実験"
+
+#. module: document
+#: view:report.document.user:0
+msgid "This Month"
+msgstr "今月"
+
+#. module: document
+#: view:ir.attachment:0
+msgid "Notes"
+msgstr "注記"
+
+#. module: document
+#: model:ir.model,name:document.model_document_configuration
+msgid "Directory Configuration"
+msgstr "ディレクトリ設定"
+
+#. module: document
+#: help:document.directory,type:0
+msgid ""
+"Each directory can either have the type Static or be linked to another "
+"resource. A static directory, as with Operating Systems, is the classic "
+"directory that can contain a set of files. The directories linked to systems "
+"resources automatically possess sub-directories for each of resource types "
+"defined in the parent directory."
+msgstr ""
+"各ディレクトリは静的タイプを持つか、他のリソースに連係することができます。静的ディレクトリは，オペレーティングシステムのものと同じように、ファイル群のディ"
+"レクトリです。システムリソースに連係されたディレクトリは、親ディレクトリで定義されたリソースタイプのサブディレクトリを持ちます。"
+
+#. module: document
+#: selection:report.document.user,month:0
+#: selection:report.files.partner,month:0
+msgid "February"
+msgstr "2月"
+
+#. module: document
+#: model:ir.actions.act_window,name:document.open_board_document_manager1
+#: model:ir.ui.menu,name:document.menu_reports_document_manager1
+msgid "Statistics by User"
+msgstr "ユーザ別の統計"
+
+#. module: document
+#: help:document.directory.dctx,field:0
+msgid ""
+"The name of the field. Note that the prefix \"dctx_\" will be prepended to "
+"what is typed here."
+msgstr "項目名。ここで指定したものの前に接頭語\"dctx_\"が追加されます。"
+
+#. module: document
+#: field:document.directory,name:0
+#: field:document.storage,name:0
+msgid "Name"
+msgstr "名前"
+
+#. module: document
+#: sql_constraint:document.storage:0
+msgid "The storage path must be unique!"
+msgstr "ストレージパスは固有でなければいけません。"
+
+#. module: document
+#: view:document.directory:0
+msgid "Fields"
+msgstr "項目"
+
+#. module: document
+#: help:document.storage,readonly:0
+msgid "If set, media is for reading only"
+msgstr "これを指定すると、メディアは読取りのみに設定されます。"
+
+#. module: document
+#: selection:report.document.user,month:0
+#: selection:report.files.partner,month:0
+msgid "April"
+msgstr "4月"
+
+#. module: document
+#: field:report.document.file,nbr:0
+#: field:report.document.user,nbr:0
+#: field:report.files.partner,nbr:0
+msgid "# of Files"
+msgstr "ファイル数"
+
+#. module: document
+#: code:addons/document/document.py:209
+#, python-format
+msgid "(copy)"
+msgstr "(コピー)"
+
+#. module: document
+#: view:document.directory:0
+msgid ""
+"Only members of these groups will have access to this directory and its "
+"files."
+msgstr "これらのグループのメンバーだけがこのディレクトリとそのファイルをアクセスできます。"
+
+#. module: document
+#: view:document.directory:0
+msgid ""
+"These groups, however, do NOT apply to children directories, which must "
+"define their own groups."
+msgstr "これらのグループには、子ディレクトリを適用できません。独自のグループを定義しなければいけません。"
+
+#. module: document
+#: field:document.directory.content.type,mimetype:0
+msgid "Mime Type"
+msgstr "MIME タイプ"
+
+#. module: document
+#: view:report.document.user:0
+msgid "All Months Files"
+msgstr "全ての月のファイル"
+
+#. module: document
+#: field:document.directory.content,name:0
+msgid "Content Name"
+msgstr "内容ファイル"
+
+#. module: document
+#: code:addons/document/document.py:220
+#: code:addons/document/document.py:299
+#, python-format
+msgid "File name must be unique!"
+msgstr "ファイル名は固有でなければいけません。"
+
+#. module: document
+#: selection:document.storage,type:0
+msgid "Internal File storage"
+msgstr "内部ファイルストレージ"
+
+#. module: document
+#: sql_constraint:document.directory:0
+msgid "Directory must have a parent or a storage"
+msgstr "ディレクトリは親あるいはストレージを持っていなければなりません。"
+
+#. module: document
+#: model:ir.actions.act_window,name:document.action_document_directory_tree
+#: model:ir.ui.menu,name:document.menu_document_directories_tree
+msgid "Directories' Structure"
+msgstr "ディレクトリの構造"
+
+#. module: document
+#: view:report.document.user:0
+msgid "Files by Resource Type"
+msgstr "リソースタイプ別ファイル"
+
+#. module: document
+#: field:report.document.user,name:0
+#: field:report.files.partner,name:0
+msgid "Year"
+msgstr "年"
+
+#. module: document
+#: view:document.storage:0
+#: model:ir.actions.act_window,name:document.action_document_storage_form
+#: model:ir.model,name:document.model_document_storage
+#: model:ir.ui.menu,name:document.menu_document_storage_media
+msgid "Storage Media"
+msgstr "ストレージメディア"
+
+#. module: document
+#: view:document.storage:0
+msgid "Search Document storage"
+msgstr "ディレクトリストレージを検索する"
+
+#. module: document
+#: field:document.directory.content,extension:0
+msgid "Document Type"
+msgstr "文書タイプ"
diff --git a/addons/document_ftp/i18n/ja.po b/addons/document_ftp/i18n/ja.po
new file mode 100644
index 00000000000..8d6ece1a81c
--- /dev/null
+++ b/addons/document_ftp/i18n/ja.po
@@ -0,0 +1,117 @@
+# 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-21 16:39+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-22 04:45+0000\n"
+"X-Generator: Launchpad (build 15120)\n"
+
+#. module: document_ftp
+#: model:ir.model,name:document_ftp.model_document_ftp_configuration
+msgid "Auto Directory Configuration"
+msgstr "自動ディレクトの設定"
+
+#. module: document_ftp
+#: view:document.ftp.configuration:0
+msgid ""
+"Indicate the network address on which your OpenERP server should be "
+"reachable for end-users. This depends on your network topology and "
+"configuration, and will only affect the links displayed to the users. The "
+"format is HOST:PORT and the default host (localhost) is only suitable for "
+"access from the server machine itself.."
+msgstr ""
+"ユーザがアクセスするOpenERPサーバのネットワークアドレスを指定して下さい。それはネットワークトポロジとその設定によって決まり、ユーザに表示されるリン"
+"クになります。\r\n"
+"指定の形式は HOST:PORT であり、デフォルトのホスト（ローカルホスト）がサーバからのアクセスに最も適しています。"
+
+#. module: document_ftp
+#: model:ir.actions.url,name:document_ftp.action_document_browse
+msgid "Browse Files"
+msgstr "ファイルをブラウズする"
+
+#. module: document_ftp
+#: field:document.ftp.configuration,config_logo:0
+msgid "Image"
+msgstr "画像"
+
+#. module: document_ftp
+#: field:document.ftp.configuration,host:0
+msgid "Address"
+msgstr "住所"
+
+#. module: document_ftp
+#: field:document.ftp.browse,url:0
+msgid "FTP Server"
+msgstr "FTPサーバ"
+
+#. module: document_ftp
+#: model:ir.actions.act_window,name:document_ftp.action_config_auto_directory
+msgid "FTP Server Configuration"
+msgstr "FTPサーバの設定"
+
+#. module: document_ftp
+#: view:document.ftp.browse:0
+msgid "_Browse"
+msgstr "_ブラウズ(_B)"
+
+#. module: document_ftp
+#: help:document.ftp.configuration,host:0
+msgid ""
+"Server address or IP and port to which users should connect to for DMS access"
+msgstr "サーバアドレスあるいはDMSアクセスのために接続するIPとポート"
+
+#. module: document_ftp
+#: model:ir.ui.menu,name:document_ftp.menu_document_browse
+msgid "Shared Repository (FTP)"
+msgstr "共有リプジトリ（FTP)"
+
+#. module: document_ftp
+#: view:document.ftp.browse:0
+msgid "_Cancel"
+msgstr "キャンセル(_C)"
+
+#. module: document_ftp
+#: view:document.ftp.configuration:0
+msgid "Configure FTP Server"
+msgstr "FTPサーバを設定する"
+
+#. module: document_ftp
+#: view:document.ftp.configuration:0
+msgid "title"
+msgstr "タイトル"
+
+#. module: document_ftp
+#: model:ir.model,name:document_ftp.model_document_ftp_browse
+msgid "Document FTP Browse"
+msgstr "FTP文書をブラウズする"
+
+#. module: document_ftp
+#: view:document.ftp.configuration:0
+msgid "Knowledge Application Configuration"
+msgstr "知識アプリケーションの設定"
+
+#. module: document_ftp
+#: model:ir.actions.act_window,name:document_ftp.action_ftp_browse
+msgid "Document Browse"
+msgstr "文書をブラウズする"
+
+#. module: document_ftp
+#: view:document.ftp.browse:0
+msgid "Browse Document"
+msgstr "文書をブラウズする"
+
+#. module: document_ftp
+#: view:document.ftp.configuration:0
+msgid "res_config_contents"
+msgstr "res_config_contents"
diff --git a/addons/document_webdav/i18n/ja.po b/addons/document_webdav/i18n/ja.po
new file mode 100644
index 00000000000..1e403002f69
--- /dev/null
+++ b/addons/document_webdav/i18n/ja.po
@@ -0,0 +1,197 @@
+# 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-21 00:03+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-22 04:45+0000\n"
+"X-Generator: Launchpad (build 15120)\n"
+
+#. module: document_webdav
+#: field:document.webdav.dir.property,create_date:0
+#: field:document.webdav.file.property,create_date:0
+msgid "Date Created"
+msgstr "作成日"
+
+#. module: document_webdav
+#: model:ir.ui.menu,name:document_webdav.menu_document_props
+msgid "Documents"
+msgstr "文書"
+
+#. module: document_webdav
+#: constraint:document.directory:0
+msgid "Error! You can not create recursive Directories."
+msgstr "エラー：ディレクトリを重複して作ることはできません。"
+
+#. module: document_webdav
+#: view:document.webdav.dir.property:0
+#: view:document.webdav.file.property:0
+msgid "Search Document properties"
+msgstr "文書の特性を検索する"
+
+#. module: document_webdav
+#: view:document.webdav.dir.property:0
+#: field:document.webdav.dir.property,namespace:0
+#: view:document.webdav.file.property:0
+#: field:document.webdav.file.property,namespace:0
+msgid "Namespace"
+msgstr "ネームスペース"
+
+#. module: document_webdav
+#: field:document.directory,dav_prop_ids:0
+msgid "DAV properties"
+msgstr "DAV特性"
+
+#. module: document_webdav
+#: model:ir.model,name:document_webdav.model_document_webdav_file_property
+msgid "document.webdav.file.property"
+msgstr "document.webdav.file.property"
+
+#. module: document_webdav
+#: view:document.webdav.dir.property:0
+#: view:document.webdav.file.property:0
+msgid "Group By..."
+msgstr "グループ化…"
+
+#. module: document_webdav
+#: view:document.directory:0
+msgid "These properties will be added to WebDAV requests"
+msgstr "これらの特性はWebDAV要求に追加されます。"
+
+#. module: document_webdav
+#: model:ir.actions.act_window,name:document_webdav.action_file_props_form
+msgid "DAV Properties for Documents"
+msgstr "文書のDAV特性"
+
+#. module: document_webdav
+#: code:addons/document_webdav/webdav.py:37
+#, python-format
+msgid "PyWebDAV Import Error!"
+msgstr "PyWebDAVの取込みエラー"
+
+#. module: document_webdav
+#: view:document.webdav.file.property:0
+#: field:document.webdav.file.property,file_id:0
+msgid "Document"
+msgstr "文書"
+
+#. module: document_webdav
+#: model:ir.ui.menu,name:document_webdav.menu_folder_props
+msgid "Folders"
+msgstr "フォルダ"
+
+#. module: document_webdav
+#: sql_constraint:document.directory:0
+msgid "Directory cannot be parent of itself!"
+msgstr "ディレクトリはそれ自身の親レベルになれません。"
+
+#. module: document_webdav
+#: view:document.directory:0
+msgid "Dynamic context"
+msgstr "ダイナミックな文脈"
+
+#. module: document_webdav
+#: view:document.directory:0
+msgid "WebDAV properties"
+msgstr "WebDAV特性"
+
+#. module: document_webdav
+#: sql_constraint:document.directory:0
+msgid "The directory name must be unique !"
+msgstr "ディレクトリ名は固有でなければいけません。"
+
+#. module: document_webdav
+#: code:addons/document_webdav/webdav.py:37
+#, python-format
+msgid ""
+"Please install PyWebDAV from "
+"http://code.google.com/p/pywebdav/downloads/detail?name=PyWebDAV-"
+"0.9.4.tar.gz&can=2&q=/"
+msgstr ""
+"下記のサイトから PyWebDAV をインストールしてください。 "
+"http://code.google.com/p/pywebdav/downloads/detail?name=PyWebDAV-"
+"0.9.4.tar.gz&can=2&q=/"
+
+#. module: document_webdav
+#: model:ir.actions.act_window,name:document_webdav.action_dir_props_form
+msgid "DAV Properties for Folders"
+msgstr "フォルダのDAV特性"
+
+#. module: document_webdav
+#: view:document.directory:0
+#: view:document.webdav.dir.property:0
+#: view:document.webdav.file.property:0
+msgid "Properties"
+msgstr "特性"
+
+#. module: document_webdav
+#: field:document.webdav.dir.property,name:0
+#: field:document.webdav.file.property,name:0
+msgid "Name"
+msgstr "名前"
+
+#. module: document_webdav
+#: model:ir.model,name:document_webdav.model_document_webdav_dir_property
+msgid "document.webdav.dir.property"
+msgstr "document.webdav.dir.property"
+
+#. module: document_webdav
+#: field:document.webdav.dir.property,value:0
+#: field:document.webdav.file.property,value:0
+msgid "Value"
+msgstr "値"
+
+#. module: document_webdav
+#: field:document.webdav.dir.property,dir_id:0
+#: model:ir.model,name:document_webdav.model_document_directory
+msgid "Directory"
+msgstr "ディレクトリ"
+
+#. module: document_webdav
+#: field:document.webdav.dir.property,write_uid:0
+#: field:document.webdav.file.property,write_uid:0
+msgid "Last Modification User"
+msgstr "前回、修正したユーザ"
+
+#. module: document_webdav
+#: view:document.webdav.dir.property:0
+msgid "Dir"
+msgstr "ディレクトリ"
+
+#. module: document_webdav
+#: field:document.webdav.dir.property,write_date:0
+#: field:document.webdav.file.property,write_date:0
+msgid "Date Modified"
+msgstr "変更日"
+
+#. module: document_webdav
+#: field:document.webdav.dir.property,create_uid:0
+#: field:document.webdav.file.property,create_uid:0
+msgid "Creator"
+msgstr "作成者"
+
+#. module: document_webdav
+#: model:ir.ui.menu,name:document_webdav.menu_properties
+msgid "DAV Properties"
+msgstr "DAV特性"
+
+#. module: document_webdav
+#: sql_constraint:document.directory:0
+msgid "Directory must have a parent or a storage"
+msgstr "ディレクトリは親あるいはストレージを持っていなければいけません。"
+
+#. module: document_webdav
+#: field:document.webdav.dir.property,do_subst:0
+#: field:document.webdav.file.property,do_subst:0
+msgid "Substitute"
+msgstr "代替"
diff --git a/addons/edi/i18n/ja.po b/addons/edi/i18n/ja.po
new file mode 100644
index 00000000000..3cd2a677e10
--- /dev/null
+++ b/addons/edi/i18n/ja.po
@@ -0,0 +1,394 @@
+# 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-20 23:50+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-22 04:45+0000\n"
+"X-Generator: Launchpad (build 15120)\n"
+
+#. module: edi
+#: sql_constraint:res.currency:0
+msgid "The currency code must be unique per company!"
+msgstr "通貨コードは会社ごとに固有でなければいけません。"
+
+#. module: edi
+#: model:ir.model,name:edi.model_res_partner_address
+msgid "Partner Addresses"
+msgstr "取引先住所"
+
+#. module: edi
+#: sql_constraint:res.company:0
+msgid "The company name must be unique !"
+msgstr "会社名は固有でなければいけません。"
+
+#. module: edi
+#: constraint:res.partner:0
+msgid "Error ! You cannot create recursive associated members."
+msgstr "エラー：重複したメンバーを作ることはできません。"
+
+#. module: edi
+#: field:edi.document,name:0
+msgid "EDI token"
+msgstr "EDIトークン"
+
+#. module: edi
+#: help:edi.document,name:0
+msgid "Unique identifier for retrieving an EDI document."
+msgstr "EDI文書を検索するための固有の識別番号"
+
+#. module: edi
+#: constraint:res.company:0
+msgid "Error! You can not create recursive companies."
+msgstr "エラー：会社を重複して作ることはできません。"
+
+#. module: edi
+#: model:ir.model,name:edi.model_res_company
+msgid "Companies"
+msgstr "会社"
+
+#. module: edi
+#: sql_constraint:edi.document:0
+msgid "EDI Tokens must be unique!"
+msgstr "EDIトークンは固有でなければいけません。"
+
+#. module: edi
+#: model:ir.model,name:edi.model_res_currency
+msgid "Currency"
+msgstr "通貨"
+
+#. module: edi
+#: code:addons/edi/models/edi.py:153
+#, python-format
+msgid ""
+"The document you are trying to import requires the OpenERP `%s` application. "
+"You can install it by connecting as the administrator and opening the "
+"configuration assistant."
+msgstr ""
+"この文書を取り込むにはOpenERP `%s` "
+"アプリケーションが必要です。それをインストールしてから、アドミニストレータとして接続して、設定アシスタントを開いてください。"
+
+#. module: edi
+#: help:edi.document,document:0
+msgid "EDI document content"
+msgstr "EDI文書の内容"
+
+#. module: edi
+#: model:ir.model,name:edi.model_edi_document
+msgid "EDI Document"
+msgstr "EDI文書"
+
+#. module: edi
+#: code:addons/edi/models/edi.py:48
+#, python-format
+msgid "'%s' is an invalid external ID"
+msgstr "'%s' は、無効な外部IDです。"
+
+#. module: edi
+#: model:ir.model,name:edi.model_res_partner
+msgid "Partner"
+msgstr "パートナ"
+
+#. module: edi
+#: code:addons/edi/models/edi.py:152
+#, python-format
+msgid "Missing Application"
+msgstr "アプリケーションがありません。"
+
+#. module: edi
+#: field:edi.document,document:0
+msgid "Document"
+msgstr "文書"
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi.xml:23
+msgid "View/Print"
+msgstr "表示 / 印刷"
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi.xml:28
+msgid "Import this document"
+msgstr "この文書を取り込む"
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi.xml:33
+msgid "Import it into an existing OpenERP instance"
+msgstr "それを既存のOpenERPインスタンスとして取り込む"
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi.xml:36
+msgid "OpenERP instance address:"
+msgstr "OpenERPインスタンスのアドレス"
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi.xml:39
+msgid "Import"
+msgstr "取り込む"
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi.xml:44
+msgid "Import it into a new OpenERP Online instance"
+msgstr "新しいOpernERPのオンラインインスタンスとして取り込む"
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi.xml:47
+msgid "Create my new OpenERP instance"
+msgstr "新しいOpenERPインスタンスとして作る"
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi.xml:52
+msgid "Import into another application"
+msgstr "他のアプリケーションへ取り込む"
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi.xml:54
+msgid ""
+"OpenERP's Electronic Data Interchange documents are based on a generic and "
+"language\n"
+"                            independent"
+msgstr "OpenERPの電子データ交換の文書は、汎用的であり言語に依存していません。"
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi.xml:56
+msgid "JSON"
+msgstr "JSON"
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi.xml:56
+msgid ""
+"serialization of the document's attribute.\n"
+"                            It is usually very quick and straightforward to "
+"create a small plug-in for your preferred\n"
+"                            application that will be capable of importing "
+"any OpenERP EDI document.\n"
+"                            You can find out more details about how to do "
+"this and what the content of OpenERP EDI documents\n"
+"                            is like in the"
+msgstr ""
+"OpenERPの文書を取り込むアプリケーションのための小さなプラグインを作るのは簡単です。その作り方とOpenERP文書の内容の詳細は、マニュアルを参照し"
+"てください。"
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi.xml:60
+msgid "OpenERP documentation"
+msgstr "OpenERPの解説書"
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi.xml:61
+msgid "To get started immediately,"
+msgstr "直ぐに始めるには、"
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi.xml:62
+msgid "see is all it takes to use this EDI document in Python"
+msgstr "このEDI文書をPythinで　（原文がおかしい！）"
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi.xml:70
+msgid "You can download the raw EDI document here:"
+msgstr "ここでEDIの原文書をダウンロードすることができます。"
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi.xml:73
+msgid "Download"
+msgstr "ダウンロードする"
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi.xml:87
+msgid "Powered by"
+msgstr "Powered by"
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi.xml:87
+msgid "OpenERP"
+msgstr "OpenERP"
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_account.xml:34
+msgid "Invoice"
+msgstr "請求書"
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_account.xml:37
+msgid "Description"
+msgstr "詳細"
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_account.xml:38
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_sale_purchase.xml:41
+msgid "Date"
+msgstr "日付"
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_account.xml:39
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_sale_purchase.xml:40
+msgid "Your Reference"
+msgstr "参照"
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_account.xml:50
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_sale_purchase.xml:57
+msgid "Product Description"
+msgstr "製品の詳細"
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_account.xml:51
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_sale_purchase.xml:58
+msgid "Quantity"
+msgstr "数量"
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_account.xml:52
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_sale_purchase.xml:59
+msgid "Unit Price"
+msgstr "単価"
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_account.xml:53
+msgid "Discount"
+msgstr "割引き"
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_account.xml:54
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_sale_purchase.xml:61
+msgid "Price"
+msgstr "価格"
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_account.xml:72
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_sale_purchase.xml:81
+msgid "Net Total:"
+msgstr "合計："
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_account.xml:83
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_sale_purchase.xml:92
+msgid "Taxes:"
+msgstr "税"
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_account.xml:94
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_sale_purchase.xml:103
+msgid "Total:"
+msgstr "合計:"
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_account.xml:106
+msgid "Tax"
+msgstr "税金"
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_account.xml:107
+msgid "Base Amount"
+msgstr "基本金額"
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_account.xml:108
+msgid "Amount"
+msgstr "金額"
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_account.xml:121
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_sale_purchase.xml:113
+msgid "Notes:"
+msgstr "注記："
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_account.xml:129
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_sale_purchase.xml:121
+msgid "Pay Online"
+msgstr "オンライン支払"
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_account.xml:133
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_sale_purchase.xml:125
+msgid "Paypal"
+msgstr "PayPal"
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_account.xml:135
+msgid ""
+"You may directly pay this invoice online via Paypal's secure payment gateway:"
+msgstr "PayPalの安全な支払いゲートウェイを使って、この請求を直接支払うことができます。"
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_account.xml:145
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_sale_purchase.xml:137
+msgid "Bank Wire Transfer"
+msgstr "銀行送金"
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_account.xml:147
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_sale_purchase.xml:139
+msgid "Please transfer"
+msgstr "送金願います"
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_account.xml:148
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_sale_purchase.xml:140
+msgid "to"
+msgstr "宛先"
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_account.xml:149
+msgid ""
+"(postal address on the invoice header)\n"
+"                     using one of the following bank accounts. Be sure to "
+"mention the invoice\n"
+"                     reference"
+msgstr ""
+"（請求書の見出しの住所）\n"
+"　　　　　　下記の未払い勘定の請求書を参照して明記すると良いでしょう。"
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_account.xml:151
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_sale_purchase.xml:143
+msgid "on the transfer:"
+msgstr "送金中"
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_sale_purchase.xml:36
+msgid "Order"
+msgstr "順序"
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_sale_purchase.xml:42
+msgid "Salesman"
+msgstr "販売担当"
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_sale_purchase.xml:43
+msgid "Payment terms"
+msgstr "支払い期限"
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_sale_purchase.xml:60
+msgid "Discount(%)"
+msgstr "割引率 (%)"
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_sale_purchase.xml:127
+msgid ""
+"You may directly pay this order online via Paypal's secure payment gateway:"
+msgstr "PayPalの安全な支払ゲートウェイを使って、この注文をオンラインで直接支払うことができます。"
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_sale_purchase.xml:141
+msgid ""
+"(postal address on the order header)\n"
+"                     using one of the following bank accounts. Be sure to "
+"mention the document\n"
+"                     reference"
+msgstr ""
+"（受注の見出しの住所）\n"
+"　　　　下記の未払い勘定を指定して、文書を参照すること。"
diff --git a/addons/email_template/i18n/ja.po b/addons/email_template/i18n/ja.po
new file mode 100644
index 00000000000..483f64ba9e0
--- /dev/null
+++ b/addons/email_template/i18n/ja.po
@@ -0,0 +1,695 @@
+# 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-21 21:27+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-22 04:45+0000\n"
+"X-Generator: Launchpad (build 15120)\n"
+
+#. module: email_template
+#: field:email.template,subtype:0
+#: field:email_template.preview,subtype:0
+msgid "Message type"
+msgstr "メッセージタイプ"
+
+#. module: email_template
+#: field:email.template,report_name:0
+#: field:email_template.preview,report_name:0
+msgid "Report Filename"
+msgstr "報告書ファイル名"
+
+#. module: email_template
+#: view:email.template:0
+msgid "SMTP Server"
+msgstr "SMTP サーバ"
+
+#. module: email_template
+#: view:email.template:0
+msgid "Remove the sidebar button currently displayed on related documents"
+msgstr "文書について表示されているサイドバーボタンを消す。"
+
+#. module: email_template
+#: field:email.template,ref_ir_act_window:0
+#: field:email_template.preview,ref_ir_act_window:0
+msgid "Sidebar action"
+msgstr "サイドバーのアクション"
+
+#. module: email_template
+#: view:mail.compose.message:0
+msgid "Save as a new template"
+msgstr "新しいテンプレートとして保存する。"
+
+#. module: email_template
+#: help:email.template,subject:0
+#: help:email_template.preview,subject:0
+msgid "Subject (placeholders may be used here)"
+msgstr "件名"
+
+#. module: email_template
+#: help:email.template,email_cc:0
+#: help:email_template.preview,email_cc:0
+msgid "Carbon copy recipients (placeholders may be used here)"
+msgstr "写しの宛先名"
+
+#. module: email_template
+#: selection:email.template,state:0
+#: selection:email_template.preview,state:0
+msgid "Received"
+msgstr "受信済み"
+
+#. module: email_template
+#: view:email.template:0
+#: field:email.template,ref_ir_value:0
+#: field:email_template.preview,ref_ir_value:0
+msgid "Sidebar button"
+msgstr "サイドバーボタン"
+
+#. module: email_template
+#: help:email.template,report_name:0
+#: help:email_template.preview,report_name:0
+msgid ""
+"Name to use for the generated report file (may contain placeholders)\n"
+"The extension can be omitted and will then come from the report type."
+msgstr ""
+"作成した報告書ファイルの名称\n"
+"拡張子を省略すると報告書のタイプが使われます。"
+
+#. module: email_template
+#: view:email.template:0
+msgid "Attach existing files"
+msgstr "ファイルを添付"
+
+#. module: email_template
+#: view:email.template:0
+msgid "Email Content"
+msgstr "Eメールの内容"
+
+#. module: email_template
+#: selection:email.template,state:0
+#: selection:email_template.preview,state:0
+msgid "Cancelled"
+msgstr "キャンセルされました"
+
+#. module: email_template
+#: field:email.template,reply_to:0
+#: field:email_template.preview,reply_to:0
+msgid "Reply-To"
+msgstr "返信先"
+
+#. module: email_template
+#: field:email.template,auto_delete:0
+#: field:email_template.preview,auto_delete:0
+msgid "Auto Delete"
+msgstr "自動削除"
+
+#. module: email_template
+#: code:addons/email_template/email_template.py:218
+#, python-format
+msgid "Warning"
+msgstr "警告"
+
+#. module: email_template
+#: model:ir.model,name:email_template.model_res_partner
+msgid "Partner"
+msgstr "取引先"
+
+#. module: email_template
+#: field:email.template,subject:0
+#: field:email_template.preview,subject:0
+msgid "Subject"
+msgstr "件名"
+
+#. module: email_template
+#: field:email.template,email_from:0
+#: field:email_template.preview,email_from:0
+msgid "From"
+msgstr "差出人"
+
+#. module: email_template
+#: field:mail.compose.message,template_id:0
+msgid "Template"
+msgstr "テンプレート"
+
+#. module: email_template
+#: field:email.template,partner_id:0
+#: field:email_template.preview,partner_id:0
+msgid "Related partner"
+msgstr "関係する取引先"
+
+#. module: email_template
+#: field:email.template,sub_model_object_field:0
+#: field:email_template.preview,sub_model_object_field:0
+msgid "Sub-field"
+msgstr "小項目"
+
+#. module: email_template
+#: view:email.template:0
+msgid ""
+"Display a button in the sidebar of related documents to open a composition "
+"wizard with this template"
+msgstr "このテンプレートを使って作文する関連文書のサイドバーのボタンを表示する。"
+
+#. module: email_template
+#: field:email.template,state:0
+#: field:email_template.preview,state:0
+msgid "State"
+msgstr "状態"
+
+#. module: email_template
+#: selection:email.template,state:0
+#: selection:email_template.preview,state:0
+msgid "Sent"
+msgstr "送信しました"
+
+#. module: email_template
+#: help:email.template,subtype:0
+#: help:email_template.preview,subtype:0
+msgid ""
+"Type of message, usually 'html' or 'plain', used to select plaintext or rich "
+"text contents accordingly"
+msgstr "メッセージのタイプ。通常はテキストあるいはリッチテキストを指定するための 「テキスト」あるいは「HTML」"
+
+#. module: email_template
+#: model:ir.model,name:email_template.model_mail_compose_message
+msgid "E-mail composition wizard"
+msgstr "Eメール作成ツール"
+
+#. module: email_template
+#: view:email.template:0
+msgid "Dynamic Values Builder"
+msgstr "ダイナミックに値を生成"
+
+#. module: email_template
+#: field:email.template,res_id:0
+msgid "Related Document ID"
+msgstr "関係する文書ID"
+
+#. module: email_template
+#: field:email.template,lang:0
+#: field:email_template.preview,lang:0
+msgid "Language Selection"
+msgstr "言語選択"
+
+#. module: email_template
+#: view:email.template:0
+msgid "Advanced"
+msgstr "高度"
+
+#. module: email_template
+#: field:email.template,email_to:0
+#: field:email_template.preview,email_to:0
+msgid "To"
+msgstr "宛先"
+
+#. module: email_template
+#: field:email.template,model:0
+#: field:email_template.preview,model:0
+msgid "Related Document model"
+msgstr "関連する文書モデル"
+
+#. module: email_template
+#: help:email.template,model_object_field:0
+#: help:email_template.preview,model_object_field:0
+msgid ""
+"Select target field from the related document model.\n"
+"If it is a relationship field you will be able to select a target field at "
+"the destination of the relationship."
+msgstr ""
+"関連する文書モデルから項目を選んでください。\n"
+"それが関連項目である場合は、関係の目的として項目を選ぶことができます。"
+
+#. module: email_template
+#: view:email.template:0
+msgid "Preview Template"
+msgstr "テンプレートを表示する"
+
+#. module: email_template
+#: field:email.template,null_value:0
+#: field:email_template.preview,null_value:0
+msgid "Null value"
+msgstr "値ゼロ"
+
+#. module: email_template
+#: field:email.template,sub_object:0
+#: field:email_template.preview,sub_object:0
+msgid "Sub-model"
+msgstr "サブモデル"
+
+#. module: email_template
+#: help:email.template,track_campaign_item:0
+#: help:email_template.preview,track_campaign_item:0
+msgid ""
+"Enable this is you wish to include a special tracking marker in outgoing "
+"emails so you can identify replies and link them back to the corresponding "
+"resource record. This is useful for CRM leads for example"
+msgstr ""
+"送信Eメールに特別な追跡マークを付けるのであれば、これを有効にして下さい。そうすると、これに対する返信があると、　そに関連する原レコードに連係付けられます"
+"。\r\n"
+"顧客のリードを把握する場合などに役に立ちます。"
+
+#. module: email_template
+#: field:mail.compose.message,use_template:0
+msgid "Use Template"
+msgstr "テンプレートを使う"
+
+#. module: email_template
+#: field:email.template,attachment_ids:0
+#: field:email_template.preview,attachment_ids:0
+msgid "Files to attach"
+msgstr "添付するファイル"
+
+#. module: email_template
+#: view:email.template:0
+msgid "Options"
+msgstr "オプション"
+
+#. module: email_template
+#: field:email.template,model_id:0
+#: field:email_template.preview,model_id:0
+msgid "Related document model"
+msgstr "関連する文書モデル"
+
+#. module: email_template
+#: help:email.template,email_from:0
+#: help:email_template.preview,email_from:0
+msgid "Sender address (placeholders may be used here)"
+msgstr "送信者アドレス"
+
+#. module: email_template
+#: help:res.partner,opt_out:0
+msgid ""
+"If checked, this partner will not receive any automated email notifications, "
+"such as the availability of invoices."
+msgstr "これをチェックすると、この相手には請求書などに関するEメールの通知は自動的に送られません。"
+
+#. module: email_template
+#: view:email.template:0
+msgid "Note: This is Raw HTML."
+msgstr "注意：これは HTML 形式です。"
+
+#. module: email_template
+#: view:email.template:0
+msgid "Group by..."
+msgstr "グル―化…"
+
+#. module: email_template
+#: field:email.template,user_signature:0
+#: field:email_template.preview,user_signature:0
+msgid "Add Signature"
+msgstr "署名を追加する"
+
+#. module: email_template
+#: help:email.template,body_text:0
+#: help:email_template.preview,body_text:0
+msgid "Plaintext version of the message (placeholders may be used here)"
+msgstr "このメッセージのテキスト"
+
+#. module: email_template
+#: help:email.template,original:0
+#: help:email_template.preview,original:0
+msgid "Original version of the message, as it was sent on the network"
+msgstr "ネットワークで送信された場合のメッセージの原型"
+
+#. module: email_template
+#: code:addons/email_template/email_template.py:230
+#, python-format
+msgid "(copy)"
+msgstr "(コピー)"
+
+#. module: email_template
+#: selection:email.template,state:0
+#: selection:email_template.preview,state:0
+msgid "Outgoing"
+msgstr "送信"
+
+#. module: email_template
+#: view:mail.compose.message:0
+msgid "Use a message template"
+msgstr "メッセージテンプレートを使う"
+
+#. module: email_template
+#: help:email.template,user_signature:0
+#: help:email_template.preview,user_signature:0
+msgid ""
+"If checked, the user's signature will be appended to the text version of the "
+"message"
+msgstr "これをチェックすると、メッセージのテキストにユーザの署名が添付されます。"
+
+#. module: email_template
+#: view:email.template:0
+#: view:email_template.preview:0
+msgid "Body (Rich/HTML)"
+msgstr "本文 (リッチテキスト / HTML)"
+
+#. module: email_template
+#: help:email.template,sub_object:0
+#: help:email_template.preview,sub_object:0
+msgid ""
+"When a relationship field is selected as first field, this field shows the "
+"document model the relationship goes to."
+msgstr "関係項目を最初の項目として指定すると、この項目は関係の文書モデルを表します。"
+
+#. module: email_template
+#: model:ir.model,name:email_template.model_email_template
+msgid "Email Templates"
+msgstr "Eメールテンプレート"
+
+#. module: email_template
+#: field:email.template,date:0
+#: field:email_template.preview,date:0
+msgid "Date"
+msgstr "日付"
+
+#. module: email_template
+#: model:ir.actions.act_window,name:email_template.wizard_email_template_preview
+msgid "Template Preview"
+msgstr "テンプレートを表示"
+
+#. module: email_template
+#: field:email.template,message_id:0
+#: field:email_template.preview,message_id:0
+msgid "Message-Id"
+msgstr "メッセージID"
+
+#. module: email_template
+#: view:email.template:0
+msgid "Add sidebar button"
+msgstr "サイドバーボタンを追加する"
+
+#. module: email_template
+#: view:email.template:0
+#: view:email_template.preview:0
+msgid "Body (Text)"
+msgstr "本文（テキスト）"
+
+#. module: email_template
+#: view:email.template:0
+msgid "Advanced Options"
+msgstr "高度なオプション"
+
+#. module: email_template
+#: code:addons/email_template/email_template.py:183
+#, python-format
+msgid "Send Mail (%s)"
+msgstr "Eメールを送信する (%s)"
+
+#. module: email_template
+#: field:email.template,body_html:0
+#: field:email_template.preview,body_html:0
+msgid "Rich-text contents"
+msgstr "リッチテキストの内容"
+
+#. module: email_template
+#: field:email.template,copyvalue:0
+#: field:email_template.preview,copyvalue:0
+msgid "Expression"
+msgstr "表現"
+
+#. module: email_template
+#: field:email.template,original:0
+#: field:email_template.preview,original:0
+msgid "Original"
+msgstr "原文"
+
+#. module: email_template
+#: view:email.template:0
+msgid "Addresses"
+msgstr "アドレス"
+
+#. module: email_template
+#: help:email.template,copyvalue:0
+#: help:email_template.preview,copyvalue:0
+msgid ""
+"Final placeholder expression, to be copy-pasted in the desired template "
+"field."
+msgstr "最終表見。これが、コピーされてテンプレートの項目にペーストされます。"
+
+#. module: email_template
+#: view:email.template:0
+msgid "Attachments"
+msgstr "添付"
+
+#. module: email_template
+#: view:email.template:0
+msgid "Email Details"
+msgstr "Eメールの詳細"
+
+#. module: email_template
+#: field:email.template,email_cc:0
+#: field:email_template.preview,email_cc:0
+msgid "Cc"
+msgstr "写し(CC)"
+
+#. module: email_template
+#: field:email.template,body_text:0
+#: field:email_template.preview,body_text:0
+msgid "Text contents"
+msgstr "テキストの内容"
+
+#. module: email_template
+#: help:email.template,auto_delete:0
+#: help:email_template.preview,auto_delete:0
+msgid "Permanently delete this email after sending it, to save space"
+msgstr "送信後、このEメールを削除する（そうすればスペースが節約できます）"
+
+#. module: email_template
+#: field:email.template,references:0
+#: field:email_template.preview,references:0
+msgid "References"
+msgstr "参照"
+
+#. module: email_template
+#: field:email.template,display_text:0
+#: field:email_template.preview,display_text:0
+msgid "Display Text"
+msgstr "テキストを表示する"
+
+#. module: email_template
+#: view:email_template.preview:0
+msgid "Close"
+msgstr "閉じる"
+
+#. module: email_template
+#: help:email.template,attachment_ids:0
+#: help:email_template.preview,attachment_ids:0
+msgid ""
+"You may attach files to this template, to be added to all emails created "
+"from this template"
+msgstr "このテンプレートにファイルを添付できます。（このテンプレートを使って作られた全てのEメールに添付）"
+
+#. module: email_template
+#: help:email.template,headers:0
+#: help:email_template.preview,headers:0
+msgid ""
+"Full message headers, e.g. SMTP session headers (usually available on "
+"inbound messages only)"
+msgstr "メッセージの見出し。例えばSMTPセッションの見出し（通常、受信メッセージのみ）。"
+
+#. module: email_template
+#: field:email.template,mail_server_id:0
+#: field:email_template.preview,mail_server_id:0
+msgid "Outgoing Mail Server"
+msgstr "送信メールサーバ"
+
+#. module: email_template
+#: help:email.template,ref_ir_act_window:0
+#: help:email_template.preview,ref_ir_act_window:0
+msgid ""
+"Sidebar action to make this template available on records of the related "
+"document model"
+msgstr "このテンプレートを関連する文書モデルのレコードに対して適用するサイドバーの機能"
+
+#. module: email_template
+#: field:email.template,model_object_field:0
+#: field:email_template.preview,model_object_field:0
+msgid "Field"
+msgstr "項目"
+
+#. module: email_template
+#: field:email.template,user_id:0
+#: field:email_template.preview,user_id:0
+msgid "Related user"
+msgstr "関連するユーザ"
+
+#. module: email_template
+#: view:email.template:0
+#: model:ir.actions.act_window,name:email_template.action_email_template_tree_all
+#: model:ir.ui.menu,name:email_template.menu_email_templates
+msgid "Templates"
+msgstr "テンプレート"
+
+#. module: email_template
+#: field:res.partner,opt_out:0
+msgid "Opt-out"
+msgstr "オプトアウト"
+
+#. module: email_template
+#: help:email.template,email_bcc:0
+#: help:email_template.preview,email_bcc:0
+msgid "Blind carbon copy recipients (placeholders may be used here)"
+msgstr "BCCの宛先"
+
+#. module: email_template
+#: help:email.template,lang:0
+#: help:email_template.preview,lang:0
+msgid ""
+"Optional translation language (ISO code) to select when sending out an "
+"email. If not set, the english version will be used. This should usually be "
+"a placeholder expression that provides the appropriate language code, e.g. "
+"${object.partner_id.lang.code}."
+msgstr ""
+"Eメールを送信するときに選択できる翻訳言語（ISOコード）。これを設定しないと、英語版が使われます。これは通常、言語コードを設定するためのものです。例えば"
+"、${object.partner_id.lang.code} など。"
+
+#. module: email_template
+#: field:email_template.preview,res_id:0
+msgid "Sample Document"
+msgstr "文書のサンプル"
+
+#. module: email_template
+#: help:email.template,email_to:0
+#: help:email_template.preview,email_to:0
+msgid "Comma-separated recipient addresses (placeholders may be used here)"
+msgstr "コンマで区切られた受取人アドレス"
+
+#. module: email_template
+#: field:email.template,name:0
+#: field:email_template.preview,name:0
+msgid "Name"
+msgstr "氏名"
+
+#. module: email_template
+#: field:email.template,track_campaign_item:0
+#: field:email_template.preview,track_campaign_item:0
+msgid "Resource Tracking"
+msgstr "リソースの記録"
+
+#. module: email_template
+#: model:ir.model,name:email_template.model_email_template_preview
+msgid "Email Template Preview"
+msgstr "Eメールテンプレートの表示"
+
+#. module: email_template
+#: view:email_template.preview:0
+msgid "Email Preview"
+msgstr "Eメールの表示"
+
+#. module: email_template
+#: help:email.template,message_id:0
+#: help:email_template.preview,message_id:0
+msgid ""
+"Message-ID SMTP header to use in outgoing messages based on this template. "
+"Please note that this overrides the 'Resource Tracking' option, so if you "
+"simply need to track replies to outgoing emails, enable that option "
+"instead.\n"
+"Placeholders must be used here, as this value always needs to be unique!"
+msgstr ""
+"メッセージID：このテンプレートで送信するメッセージに使うSMTPの見出し。これはリソース追跡オプションを上書きしますのでご注意。この送信メールに対する回"
+"答を追跡するのであれば、このオプションを有効にして下さい。"
+
+#. module: email_template
+#: field:email.template,headers:0
+#: field:email_template.preview,headers:0
+msgid "Message headers"
+msgstr "メッセージの見出し"
+
+#. module: email_template
+#: field:email.template,email_bcc:0
+#: field:email_template.preview,email_bcc:0
+msgid "Bcc"
+msgstr "BCC"
+
+#. module: email_template
+#: help:email.template,reply_to:0
+#: help:email_template.preview,reply_to:0
+msgid "Preferred response address (placeholders may be used here)"
+msgstr "好ましい応答アドレス"
+
+#. module: email_template
+#: view:email.template:0
+msgid "Remove sidebar button"
+msgstr "サイドバーボタンを消去する"
+
+#. module: email_template
+#: help:email.template,null_value:0
+#: help:email_template.preview,null_value:0
+msgid "Optional value to use if the target field is empty"
+msgstr "目標項目が空白の場合に使う値"
+
+#. module: email_template
+#: view:email.template:0
+msgid "Model"
+msgstr "モデル"
+
+#. module: email_template
+#: help:email.template,references:0
+#: help:email_template.preview,references:0
+msgid "Message references, such as identifiers of previous messages"
+msgstr "メッセージの参照。前のメッセージの識別番号など"
+
+#. module: email_template
+#: help:email.template,ref_ir_value:0
+#: help:email_template.preview,ref_ir_value:0
+msgid "Sidebar button to open the sidebar action"
+msgstr "サイドバーの機能を開くためのサイドバーボタン"
+
+#. module: email_template
+#: constraint:res.partner:0
+msgid "Error ! You cannot create recursive associated members."
+msgstr "エラー：重複した会員を作ることはできません。"
+
+#. module: email_template
+#: code:addons/email_template/email_template.py:218
+#, python-format
+msgid "Deletion of the action record failed."
+msgstr "活動レコードを削除できません。"
+
+#. module: email_template
+#: help:email.template,mail_server_id:0
+#: help:email_template.preview,mail_server_id:0
+msgid ""
+"Optional preferred server for outgoing mails. If not set, the highest "
+"priority one will be used."
+msgstr "送信メールの優先サーバ。これを設定しないと、最も優先度が高いものが使われます。"
+
+#. module: email_template
+#: selection:email.template,state:0
+#: selection:email_template.preview,state:0
+msgid "Delivery Failed"
+msgstr "配信に失敗しました。"
+
+#. module: email_template
+#: help:email.template,sub_model_object_field:0
+#: help:email_template.preview,sub_model_object_field:0
+msgid ""
+"When a relationship field is selected as first field, this field lets you "
+"select the target field within the destination document model (sub-model)."
+msgstr "最初の項目として関係項目を選ぶと、送り先の文書モデル（サブモデル）の中から目標項目を指定することができます。"
+
+#. module: email_template
+#: view:email.template:0
+msgid "Attach Report"
+msgstr "報告書を添付する"
+
+#. module: email_template
+#: field:email.template,report_template:0
+#: field:email_template.preview,report_template:0
+msgid "Optional report to print and attach"
+msgstr "印刷して添付する報告書"
+
+#. module: email_template
+#: help:email.template,body_html:0
+#: help:email_template.preview,body_html:0
+msgid "Rich-text/HTML version of the message (placeholders may be used here)"
+msgstr "メッセージのリッチテキスト / HTML 版"
diff --git a/addons/event/i18n/ja.po b/addons/event/i18n/ja.po
index a3465f34415..e4546ae7900 100644
--- a/addons/event/i18n/ja.po
+++ b/addons/event/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-20 01:25+0000\n"
+"PO-Revision-Date: 2012-04-20 18:20+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-20 04:43+0000\n"
+"X-Launchpad-Export-Date: 2012-04-21 05:00+0000\n"
 "X-Generator: Launchpad (build 15120)\n"
 
 #. module: event
@@ -47,7 +47,7 @@ msgstr "登録者の最少数"
 #. module: event
 #: model:ir.model,name:event.model_event_confirm_registration
 msgid "Confirmation for Event Registration"
-msgstr "イベント登録者の確認"
+msgstr "イベント参加者の確定"
 
 #. module: event
 #: field:event.registration.badge,title:0
@@ -93,7 +93,7 @@ msgstr "3月"
 #. module: event
 #: field:event.event,mail_confirm:0
 msgid "Confirmation Email"
-msgstr "確認Eメール"
+msgstr "確定Eメール"
 
 #. module: event
 #: field:event.registration,nb_register:0
@@ -167,7 +167,7 @@ msgstr "内部注記を追加"
 #. module: event
 #: view:event.event:0
 msgid "Confirmed events"
-msgstr "確認済みのイベント"
+msgstr "確定済みのイベント"
 
 #. module: event
 #: view:report.event.registration:0
@@ -185,7 +185,7 @@ msgstr "イベント分析"
 #. module: event
 #: field:event.registration,message_ids:0
 msgid "Messages"
-msgstr ""
+msgstr "メッセージ"
 
 #. module: event
 #: model:ir.model,name:event.model_event_registration_badge
@@ -200,14 +200,14 @@ msgstr "Eメールの自動確認"
 #. module: event
 #: model:product.template,name:event.event_product_1_product_template
 msgid "Ticket for Opera"
-msgstr "オペラの切符"
+msgstr "オペラの入場券"
 
 #. module: event
 #: code:addons/event/event.py:125
 #: view:event.event:0
 #, python-format
 msgid "Confirm Event"
-msgstr "イベントを確認"
+msgstr "イベントを確定"
 
 #. module: event
 #: selection:event.event,state:0
@@ -247,7 +247,7 @@ msgstr "登録見込み数"
 msgid ""
 "Check this box if you want to use automatic confirmation emailing or "
 "reminder."
-msgstr "確認Eメールあるいは催促Eメールを自動的に送るのであれば、ここをチェックして下さい。"
+msgstr "確定Eメールあるいは催促Eメールを自動的に送るのであれば、ここをチェックして下さい。"
 
 #. module: event
 #: field:event.registration,ref:0
@@ -280,7 +280,7 @@ msgstr "顧客請求書"
 #: selection:event.event,state:0
 #: selection:report.event.registration,state:0
 msgid "Draft"
-msgstr "草案"
+msgstr "予定"
 
 #. module: event
 #: field:event.type,name:0
@@ -317,12 +317,12 @@ msgstr "名札"
 #: selection:event.registration,state:0
 #: selection:report.event.registration,state:0
 msgid "Confirmed"
-msgstr "確認済み"
+msgstr "確定済み"
 
 #. module: event
 #: view:event.confirm.registration:0
 msgid "Registration Confirmation"
-msgstr "登録確認"
+msgstr "参加確定"
 
 #. module: event
 #: view:event.event:0
@@ -332,7 +332,7 @@ msgstr "新しいイベント"
 #. module: event
 #: view:report.event.registration:0
 msgid "Confirm"
-msgstr "確認"
+msgstr "確定"
 
 #. module: event
 #: view:event.event:0
@@ -348,7 +348,7 @@ msgstr "イベントは請求書を作成"
 #. module: event
 #: help:event.registration,nb_register:0
 msgid "Number of Registrations or Tickets"
-msgstr "登録者あるいは切符の数"
+msgstr "参加者あるいは入場券の数"
 
 #. module: event
 #: code:addons/event/wizard/event_make_invoice.py:50
@@ -385,7 +385,7 @@ msgstr "新規"
 #: field:event.event,register_current:0
 #: view:report.event.registration:0
 msgid "Confirmed Registrations"
-msgstr "確認済みの登録者"
+msgstr "確定済みの参加者"
 
 #. module: event
 #: field:event.event,mail_auto_registr:0
@@ -410,7 +410,7 @@ msgid ""
 "subscribes to a confirmed event. This is also the email sent to remind "
 "someone about the event."
 msgstr ""
-"このEメールは、イベントの開催が確認されるか、誰かが確認済みのイベントについて問い合わせるかすると、このEメールが送られます。また、イベントを気づかせるた"
+"このEメールは、イベントの開催が確定されるか、誰かが確定済みのイベントについて問い合わせるかすると、このEメールが送られます。また、イベントを気づかせるた"
 "めのEメールも送られます。"
 
 #. module: event
@@ -471,7 +471,7 @@ msgstr "イベントのタイプ。例えば、セミナー、展示会、カン
 #. module: event
 #: view:event.registration:0
 msgid "Confirmed registrations"
-msgstr "確認済み登録者"
+msgstr "確定済み参加者"
 
 #. module: event
 #: view:event.event:0
@@ -492,7 +492,7 @@ msgstr "日付"
 #: view:event.confirm:0
 #: view:event.confirm.registration:0
 msgid "Confirm Anyway"
-msgstr "とにかく確認する"
+msgstr "とにかく確定する"
 
 #. module: event
 #: code:addons/event/wizard/event_confirm_registration.py:54
@@ -529,7 +529,7 @@ msgid ""
 "If event is created, the state is 'Draft'.If event is confirmed for the "
 "particular dates the state is set to 'Confirmed'. If the event is over, the "
 "state is set to 'Done'.If event is cancelled the state is set to 'Cancelled'."
-msgstr ""
+msgstr "イベントの状態は、作成されると「予定」、日にちが確定すると[確定」、終了すると「終了」、キャンセルされると「キャンセル」に設定されます。"
 
 #. module: event
 #: view:event.event:0
@@ -576,7 +576,7 @@ msgstr "イベントの状態"
 #: view:board.board:0
 #: field:event.event,register_prospect:0
 msgid "Unconfirmed Registrations"
-msgstr "未確認の登録"
+msgstr "未確定の参加者"
 
 #. module: event
 #: field:event.registration,partner_invoice_id:0
@@ -621,7 +621,7 @@ msgstr "請求名"
 #. module: event
 #: field:report.event.registration,draft_state:0
 msgid " # No of Draft Registrations"
-msgstr " 登録の草案の数"
+msgstr " 予定している参加者の数"
 
 #. module: event
 #: view:report.event.registration:0
@@ -637,7 +637,7 @@ msgstr "終了したイベント"
 #. module: event
 #: view:event.registration:0
 msgid "Registrations in unconfirmed state"
-msgstr "未確認状態の登録"
+msgstr "未確定の参加者"
 
 #. module: event
 #: help:event.event,register_current:0
@@ -708,7 +708,7 @@ msgstr "終了"
 #. module: event
 #: view:report.event.registration:0
 msgid "Events which are in New state"
-msgstr "新規状態のイベント"
+msgstr "新規のイベント"
 
 #. module: event
 #: view:event.event:0
@@ -746,7 +746,7 @@ msgid ""
 "The invoices of this event registration will be created with this Product. "
 "Thus it allows you to set the default label and the accounting info you want "
 "by default on these invoices."
-msgstr ""
+msgstr "このイベント参加登録の請求書はこのプロダクトとして作成されます。そして、デフォルトのラベルと会計情報が設定されます。"
 
 #. module: event
 #: selection:report.event.registration,month:0
@@ -756,7 +756,7 @@ msgstr "6月"
 #. module: event
 #: model:product.template,name:event.event_product_0_product_template
 msgid "Ticket for Concert"
-msgstr "コンサートの切符"
+msgstr "コンサートの入場券"
 
 #. module: event
 #: field:event.registration,write_date:0
@@ -773,7 +773,7 @@ msgstr "私の登録"
 msgid ""
 "Warning: This Event has not reached its Minimum Registration Limit. Are you "
 "sure you want to confirm it?"
-msgstr ""
+msgstr "警告：このイベントは最少催行人数に達していません。それでも確定にしますか？"
 
 #. module: event
 #: field:event.registration,active:0
@@ -814,22 +814,22 @@ msgstr "言語"
 #: view:event.registration:0
 #: field:event.registration,email_cc:0
 msgid "CC"
-msgstr ""
+msgstr "CC"
 
 #. module: event
 #: selection:report.event.registration,month:0
 msgid "January"
-msgstr ""
+msgstr "1月"
 
 #. module: event
 #: help:event.registration,email_from:0
 msgid "These people will receive email."
-msgstr ""
+msgstr "これらの人がEメールを受け取ります。"
 
 #. module: event
 #: view:event.event:0
 msgid "Set To Draft"
-msgstr ""
+msgstr "予定に設定"
 
 #. module: event
 #: code:addons/event/event.py:499
@@ -838,77 +838,77 @@ msgstr ""
 #: view:res.partner:0
 #, python-format
 msgid "Confirm Registration"
-msgstr ""
+msgstr "登録を確定する"
 
 #. module: event
 #: view:event.event:0
 #: view:report.event.registration:0
 #: view:res.partner:0
 msgid "Date"
-msgstr ""
+msgstr "日付"
 
 #. module: event
 #: view:event.event:0
 msgid "Registration Email Body"
-msgstr ""
+msgstr "登録Eメールの本文"
 
 #. module: event
 #: view:event.event:0
 msgid "Confirmation Email Body"
-msgstr ""
+msgstr "確定Eメールの本文"
 
 #. module: event
 #: view:report.event.registration:0
 msgid "Registrations in confirmed or done state"
-msgstr ""
+msgstr "確定あるいは終了したイベントの参加者"
 
 #. module: event
 #: view:event.registration:0
 #: view:res.partner:0
 msgid "History"
-msgstr ""
+msgstr "履歴"
 
 #. module: event
 #: field:event.event,address_id:0
 msgid "Location Address"
-msgstr ""
+msgstr "会場の住所"
 
 #. module: event
 #: model:ir.actions.act_window,name:event.action_event_type
 #: model:ir.ui.menu,name:event.menu_event_type
 msgid "Types of Events"
-msgstr ""
+msgstr "イベントのタイプ"
 
 #. module: event
 #: field:event.registration,contact_id:0
 msgid "Partner Contact"
-msgstr ""
+msgstr "取引先の連絡先"
 
 #. module: event
 #: field:event.event,pricelist_id:0
 msgid "Pricelist"
-msgstr ""
+msgstr "価格リスト"
 
 #. module: event
 #: code:addons/event/wizard/event_make_invoice.py:59
 #, python-format
 msgid "Event related doesn't have any product defined"
-msgstr ""
+msgstr "関連するイベントはプロダクトが定義されていません。"
 
 #. module: event
 #: view:event.event:0
 msgid "Auto Confirmation Email"
-msgstr ""
+msgstr "自動確定Eメール"
 
 #. module: event
 #: view:event.registration:0
 msgid "Misc"
-msgstr ""
+msgstr "その他"
 
 #. module: event
 #: constraint:event.event:0
 msgid "Error ! Closing Date cannot be set before Beginning Date."
-msgstr ""
+msgstr "エラー：終了日を開始日の前に指定することはできません。"
 
 #. module: event
 #: code:addons/event/event.py:446
@@ -918,60 +918,60 @@ msgstr ""
 #: selection:report.event.registration,state:0
 #, python-format
 msgid "Done"
-msgstr ""
+msgstr "終了"
 
 #. module: event
 #: field:event.event,date_begin:0
 msgid "Beginning date"
-msgstr ""
+msgstr "開始日"
 
 #. module: event
 #: view:event.registration:0
 #: field:event.registration,invoice_id:0
 msgid "Invoice"
-msgstr ""
+msgstr "請求書"
 
 #. module: event
 #: view:report.event.registration:0
 #: field:report.event.registration,year:0
 msgid "Year"
-msgstr ""
+msgstr "年"
 
 #. module: event
 #: code:addons/event/event.py:465
 #, python-format
 msgid "Cancel"
-msgstr ""
+msgstr "キャンセル"
 
 #. module: event
 #: view:event.confirm:0
 #: view:event.confirm.registration:0
 #: view:event.make.invoice:0
 msgid "Close"
-msgstr ""
+msgstr "締める"
 
 #. module: event
 #: view:event.event:0
 msgid "Event by Registration"
-msgstr ""
+msgstr "参加登録ごとのイベント"
 
 #. module: event
 #: code:addons/event/event.py:436
 #, python-format
 msgid "Open"
-msgstr ""
+msgstr "オープン"
 
 #. module: event
 #: field:event.event,user_id:0
 msgid "Responsible User"
-msgstr ""
+msgstr "ユーザ責任者"
 
 #. module: event
 #: code:addons/event/event.py:561
 #: code:addons/event/event.py:568
 #, python-format
 msgid "Auto Confirmation: [%s] %s"
-msgstr ""
+msgstr "自動確定：[%s] %s"
 
 #. module: event
 #: view:event.event:0
@@ -980,60 +980,60 @@ msgstr ""
 #: view:report.event.registration:0
 #: field:report.event.registration,user_id:0
 msgid "Responsible"
-msgstr ""
+msgstr "責任者"
 
 #. module: event
 #: field:event.event,unit_price:0
 #: view:event.registration:0
 #: field:partner.event.registration,unit_price:0
 msgid "Registration Cost"
-msgstr ""
+msgstr "参加料"
 
 #. module: event
 #: field:event.registration,unit_price:0
 msgid "Unit Price"
-msgstr ""
+msgstr "単価"
 
 #. module: event
 #: view:report.event.registration:0
 #: field:report.event.registration,speaker_id:0
 #: field:res.partner,speaker:0
 msgid "Speaker"
-msgstr ""
+msgstr "講演者"
 
 #. module: event
 #: model:event.event,name:event.event_2
 msgid "Conference on ERP Buisness"
-msgstr ""
+msgstr "ERPビジネスのカンファレンス"
 
 #. module: event
 #: view:event.registration:0
 msgid "Reply"
-msgstr ""
+msgstr "返信"
 
 #. module: event
 #: view:report.event.registration:0
 msgid "Events created in current month"
-msgstr ""
+msgstr "今月，企画したイベント"
 
 #. module: event
 #: help:event.event,mail_auto_registr:0
 msgid ""
 "Check this box if you want to use automatic emailing for new registration."
-msgstr ""
+msgstr "新しい登録者に自動的にEメールを送るのであれば、このボックスをチェックして下さい。"
 
 #. module: event
 #: field:event.event,date_end:0
 #: field:partner.event.registration,end_date:0
 msgid "Closing date"
-msgstr ""
+msgstr "終了日"
 
 #. module: event
 #: field:event.event,product_id:0
 #: view:report.event.registration:0
 #: field:report.event.registration,product_id:0
 msgid "Product"
-msgstr ""
+msgstr "プロダクト"
 
 #. module: event
 #: view:event.event:0
@@ -1041,101 +1041,101 @@ msgstr ""
 #: view:event.registration:0
 #: field:event.registration,description:0
 msgid "Description"
-msgstr ""
+msgstr "詳細"
 
 #. module: event
 #: field:report.event.registration,confirm_state:0
 msgid " # No of Confirmed Registrations"
-msgstr ""
+msgstr " 確定した参加者の数"
 
 #. module: event
 #: model:ir.actions.act_window,name:event.act_register_event_partner
 msgid "Subscribe"
-msgstr ""
+msgstr "予約購読する"
 
 #. module: event
 #: selection:report.event.registration,month:0
 msgid "May"
-msgstr ""
+msgstr "5月"
 
 #. module: event
 #: view:res.partner:0
 msgid "Events Registration"
-msgstr ""
+msgstr "イベント参加者"
 
 #. module: event
 #: help:event.event,mail_registr:0
 msgid "This email will be sent when someone subscribes to the event."
-msgstr ""
+msgstr "誰かがこのイベントを予約すると、このEメールが送られます。"
 
 #. module: event
 #: model:product.template,name:event.event_product_2_product_template
 msgid "Ticket for Conference"
-msgstr ""
+msgstr "カンファレンスの入場券"
 
 #. module: event
 #: model:ir.ui.menu,name:event.menu_event_type_association
 msgid "Events Type"
-msgstr ""
+msgstr "イベントのタイプ"
 
 #. module: event
 #: field:event.registration.badge,address_id:0
 msgid "Address"
-msgstr ""
+msgstr "住所"
 
 #. module: event
 #: view:board.board:0
 #: model:ir.actions.act_window,name:event.act_event_view
 msgid "Next Events"
-msgstr ""
+msgstr "次のイベント"
 
 #. module: event
 #: view:partner.event.registration:0
 msgid "_Subcribe"
-msgstr ""
+msgstr "_予約購読"
 
 #. module: event
 #: model:ir.model,name:event.model_partner_event_registration
 msgid "  event Registration "
-msgstr ""
+msgstr "  イベント登録 "
 
 #. module: event
 #: help:event.event,date_begin:0
 #: help:partner.event.registration,start_date:0
 msgid "Beginning Date of Event"
-msgstr ""
+msgstr "イベントの開始日"
 
 #. module: event
 #: selection:event.registration,state:0
 msgid "Unconfirmed"
-msgstr ""
+msgstr "未確定"
 
 #. module: event
 #: code:addons/event/event.py:565
 #, python-format
 msgid "Auto Registration: [%s] %s"
-msgstr ""
+msgstr "自動登録： [%s] %s"
 
 #. module: event
 #: field:event.registration,date_deadline:0
 msgid "End Date"
-msgstr ""
+msgstr "終了日"
 
 #. module: event
 #: selection:report.event.registration,month:0
 msgid "February"
-msgstr ""
+msgstr "2月"
 
 #. module: event
 #: view:board.board:0
 msgid "Association Dashboard"
-msgstr ""
+msgstr "関係ダッシュボード"
 
 #. module: event
 #: view:event.event:0
 #: field:event.registration.badge,name:0
 msgid "Name"
-msgstr ""
+msgstr "氏名"
 
 #. module: event
 #: field:event.event,section_id:0
@@ -1143,18 +1143,18 @@ msgstr ""
 #: view:report.event.registration:0
 #: field:report.event.registration,section_id:0
 msgid "Sale Team"
-msgstr ""
+msgstr "セールスチーム"
 
 #. module: event
 #: field:event.event,country_id:0
 msgid "Country"
-msgstr ""
+msgstr "国名"
 
 #. module: event
 #: code:addons/event/wizard/event_make_invoice.py:55
 #, python-format
 msgid "Registration is set as Cannot be invoiced"
-msgstr ""
+msgstr "参加者には請求しないように設定されました。"
 
 #. module: event
 #: code:addons/event/event.py:527
@@ -1163,24 +1163,24 @@ msgstr ""
 #: view:res.partner:0
 #, python-format
 msgid "Close Registration"
-msgstr ""
+msgstr "登録締切り"
 
 #. module: event
 #: selection:report.event.registration,month:0
 msgid "April"
-msgstr ""
+msgstr "4月"
 
 #. module: event
 #: help:event.event,unit_price:0
 msgid ""
 "This will be the default price used as registration cost when invoicing this "
 "event. Note that you can specify a specific amount for each registration."
-msgstr ""
+msgstr "請求書では、デフォルトの参加料が適用されます。ただし、個々の参加者に特定の金額を設定できます。"
 
 #. module: event
 #: view:report.event.registration:0
 msgid "Events which are in confirm state"
-msgstr ""
+msgstr "確定しているイベント"
 
 #. module: event
 #: view:event.event:0
@@ -1188,7 +1188,7 @@ msgstr ""
 #: view:report.event.registration:0
 #: field:report.event.registration,type:0
 msgid "Event Type"
-msgstr ""
+msgstr "イベントタイプ"
 
 #. module: event
 #: view:event.event:0
@@ -1197,63 +1197,63 @@ msgstr ""
 #: model:ir.ui.menu,name:event.menu_action_registration
 #: model:ir.ui.menu,name:event.menu_action_registration_association
 msgid "Registrations"
-msgstr ""
+msgstr "参加者"
 
 #. module: event
 #: field:event.registration,id:0
 msgid "ID"
-msgstr ""
+msgstr "ID"
 
 #. module: event
 #: field:event.event,register_max:0
 #: field:report.event.registration,register_max:0
 msgid "Maximum Registrations"
-msgstr ""
+msgstr "最大参加者数"
 
 #. module: event
 #: constraint:res.partner:0
 msgid "Error ! You cannot create recursive associated members."
-msgstr ""
+msgstr "エラー：重複した会員を作ることはできません。"
 
 #. module: event
 #: field:report.event.registration,date:0
 msgid "Event Start Date"
-msgstr ""
+msgstr "イベント開始日"
 
 #. module: event
 #: view:partner.event.registration:0
 msgid "Event For Registration"
-msgstr ""
+msgstr "参加者のイベント"
 
 #. module: event
 #: code:addons/event/wizard/event_make_invoice.py:51
 #, python-format
 msgid "Invoice cannot be created if the registration is in %s state."
-msgstr ""
+msgstr "参加者が %s 状態の場合には，請求書を作成できません。"
 
 #. module: event
 #: view:event.confirm:0
 #: model:ir.actions.act_window,name:event.action_event_confirm
 #: model:ir.model,name:event.model_event_confirm
 msgid "Event Confirmation"
-msgstr ""
+msgstr "イベント確定"
 
 #. module: event
 #: view:event.event:0
 msgid "Auto Registration Email"
-msgstr ""
+msgstr "自動参加Eメール"
 
 #. module: event
 #: view:event.registration:0
 #: view:report.event.registration:0
 #: field:report.event.registration,total:0
 msgid "Total"
-msgstr ""
+msgstr "合計"
 
 #. module: event
 #: field:event.event,speaker_confirmed:0
 msgid "Speaker Confirmed"
-msgstr ""
+msgstr "確定した講演者"
 
 #. module: event
 #: model:ir.actions.act_window,help:event.action_event_view
@@ -1263,3 +1263,5 @@ msgid ""
 "caldav. Most of the users should work in the Calendar menu, and not in the "
 "list of events."
 msgstr ""
+"イベントはミーティングなどの低レベルのオブジェクトなので、モバイルデバイスあるいはカレンダアプリケーションと同期するべきです。ユーザの多くは、イベントのリ"
+"ストではなく、カレンダ機能を使うのがよいでしょう。"
diff --git a/addons/event_project/i18n/ja.po b/addons/event_project/i18n/ja.po
new file mode 100644
index 00000000000..03cec80ead2
--- /dev/null
+++ b/addons/event_project/i18n/ja.po
@@ -0,0 +1,108 @@
+# 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-20 18:31+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-21 05:00+0000\n"
+"X-Generator: Launchpad (build 15120)\n"
+
+#. module: event_project
+#: model:ir.model,name:event_project.model_event_project
+msgid "Event Project"
+msgstr "イベントのプロジェクト"
+
+#. module: event_project
+#: field:event.project,date:0
+msgid "Date End"
+msgstr "終了日"
+
+#. module: event_project
+#: view:event.project:0
+msgid "Ok"
+msgstr "OK"
+
+#. module: event_project
+#: help:event.project,project_id:0
+msgid ""
+"This is Template Project. Project of event is a duplicate of this Template. "
+"After click on  'Create Retro-planning', New Project will be duplicated from "
+"this template project."
+msgstr "これはプロジェクトのテンプレートです。「計画を複成」をクリックすると、このテンプレートから新しいプロジェクトが複成されます。"
+
+#. module: event_project
+#: view:event.project:0
+#: model:ir.actions.act_window,name:event_project.action_event_project
+msgid "Retro-Planning"
+msgstr "計画の複成"
+
+#. module: event_project
+#: constraint:event.event:0
+msgid "Error ! Closing Date cannot be set before Beginning Date."
+msgstr "エラー：終了日を開始日の前に指定することはできません。"
+
+#. module: event_project
+#: field:event.event,project_id:0
+msgid "Project"
+msgstr "プロジェクト"
+
+#. module: event_project
+#: field:event.project,project_id:0
+msgid "Template of Project"
+msgstr "プロジェクトのテンプレート"
+
+#. module: event_project
+#: view:event.event:0
+msgid "All tasks"
+msgstr "すべての作業"
+
+#. module: event_project
+#: view:event.event:0
+#: model:ir.actions.act_window,name:event_project.act_event_task
+msgid "Tasks"
+msgstr "作業"
+
+#. module: event_project
+#: constraint:event.event:0
+msgid "Error ! You cannot create recursive event."
+msgstr "エラー：イベントを重複して作成することはできません。"
+
+#. module: event_project
+#: field:event.event,task_ids:0
+msgid "Project tasks"
+msgstr "プロジェクトの作業"
+
+#. module: event_project
+#: view:event.project:0
+msgid "Close"
+msgstr "締める"
+
+#. module: event_project
+#: field:event.project,date_start:0
+msgid "Date Start"
+msgstr "開始日"
+
+#. module: event_project
+#: view:event.event:0
+msgid "Create Retro-Planning"
+msgstr "複成計画を作成"
+
+#. module: event_project
+#: model:ir.model,name:event_project.model_event_event
+msgid "Event"
+msgstr "イベント"
+
+#. module: event_project
+#: view:event.event:0
+msgid "Tasks management"
+msgstr "作業管理"
diff --git a/addons/hr_expense/i18n/ja.po b/addons/hr_expense/i18n/ja.po
index d7a69b2a02c..97158058d53 100644
--- a/addons/hr_expense/i18n/ja.po
+++ b/addons/hr_expense/i18n/ja.po
@@ -8,19 +8,19 @@ 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 21:13+0000\n"
+"PO-Revision-Date: 2012-04-22 03: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-20 04:43+0000\n"
-"X-Generator: Launchpad (build 15120)\n"
+"X-Launchpad-Export-Date: 2012-04-23 04:46+0000\n"
+"X-Generator: Launchpad (build 15135)\n"
 
 #. module: hr_expense
 #: model:process.node,name:hr_expense.process_node_confirmedexpenses0
 msgid "Confirmed Expenses"
-msgstr ""
+msgstr "承認された経費"
 
 #. module: hr_expense
 #: model:ir.model,name:hr_expense.model_hr_expense_line
diff --git a/addons/hr_recruitment/i18n/ja.po b/addons/hr_recruitment/i18n/ja.po
index 9c1494d91fb..5951b968ec9 100644
--- a/addons/hr_recruitment/i18n/ja.po
+++ b/addons/hr_recruitment/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 01:37+0100\n"
-"PO-Revision-Date: 2012-04-17 18:35+0000\n"
+"PO-Revision-Date: 2012-04-22 03:20+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-Generator: Launchpad (build 15108)\n"
+"X-Launchpad-Export-Date: 2012-04-23 04:46+0000\n"
+"X-Generator: Launchpad (build 15135)\n"
 
 #. module: hr_recruitment
 #: help:hr.applicant,active:0
@@ -326,7 +326,7 @@ msgstr "ソース"
 #. module: hr_recruitment
 #: view:hr.applicant:0
 msgid "Send New Email"
-msgstr "新しいEメールを送る。"
+msgstr "新しいEメールを送る"
 
 #. module: hr_recruitment
 #: code:addons/hr_recruitment/wizard/hr_recruitment_create_partner_job.py:39
@@ -401,7 +401,7 @@ msgstr "予定日"
 #: view:hr.applicant:0 field:hr.applicant,priority:0
 #: field:hr.recruitment.report,priority:0
 msgid "Appreciation"
-msgstr "好意的評価"
+msgstr "好意的な評価"
 
 #. module: hr_recruitment
 #: model:hr.recruitment.stage,name:hr_recruitment.stage_job1
@@ -418,7 +418,7 @@ msgstr "面接結果の印刷"
 #: view:hr.recruitment.report:0 field:hr.recruitment.report,stage_id:0
 #: view:hr.recruitment.stage:0
 msgid "Stage"
-msgstr "ステージ"
+msgstr "段階"
 
 #. module: hr_recruitment
 #: view:hr.applicant:0 selection:hr.applicant,state:0
@@ -429,7 +429,7 @@ msgstr "保留"
 #. module: hr_recruitment
 #: model:ir.actions.act_window,name:hr_recruitment.hr_job_stage_act
 msgid "Recruitment / Applicants Stages"
-msgstr "採用 / 応募者のステージ"
+msgstr "採用 / 応募者の段階"
 
 #. module: hr_recruitment
 #: model:hr.recruitment.degree,name:hr_recruitment.degree_bac5
@@ -474,7 +474,7 @@ msgid ""
 " Check if the following stages are matching your recruitment process. Don't "
 "forget to specify the department if your recruitment process is different "
 "according to the job position."
-msgstr " 次のステージが採用プロセスに合致していればクリックしてください。職種によって採用プロセスが異なる場合には部署名を指定してください。"
+msgstr " 次の段階が採用プロセスに合致していればクリックしてください。職種によって採用プロセスが異なる場合には部門名を指定してください。"
 
 #. module: hr_recruitment
 #: view:hr.recruitment.report:0
@@ -494,7 +494,7 @@ msgstr "応募者"
 #. module: hr_recruitment
 #: help:hr.recruitment.stage,sequence:0
 msgid "Gives the sequence order when displaying a list of stages."
-msgstr "ステージの一覧が表示されていたら順序を指定してください。"
+msgstr "段階の一覧が表示されていたら順序を指定してください。"
 
 #. module: hr_recruitment
 #: view:hr.applicant:0
@@ -525,14 +525,14 @@ msgstr "3月"
 #. module: hr_recruitment
 #: model:ir.model,name:hr_recruitment.model_hr_recruitment_stage
 msgid "Stage of Recruitment"
-msgstr "採用のステージ"
+msgstr "採用の段階"
 
 #. module: hr_recruitment
 #: view:hr.recruitment.stage:0
 #: model:ir.actions.act_window,name:hr_recruitment.hr_recruitment_stage_act
 #: model:ir.ui.menu,name:hr_recruitment.menu_hr_recruitment_stage
 msgid "Stages"
-msgstr "ステージ"
+msgstr "段階"
 
 #. module: hr_recruitment
 #: view:hr.recruitment.report:0
@@ -552,7 +552,7 @@ msgstr "進行中"
 #. module: hr_recruitment
 #: model:ir.actions.act_window,name:hr_recruitment.hr_recruitment_stage_form_installer
 msgid "Review Recruitment Stages"
-msgstr "採用ステージのレビュー"
+msgstr "採用段階のレビュー"
 
 #. module: hr_recruitment
 #: view:hr.applicant:0
@@ -701,7 +701,7 @@ msgstr "既決"
 #. module: hr_recruitment
 #: view:hr.recruitment.stage:0
 msgid "Stage Definition"
-msgstr "ステージの定義"
+msgstr "段階の定義"
 
 #. module: hr_recruitment
 #: view:hr.applicant:0
@@ -892,8 +892,7 @@ msgid ""
 "Check if the following stages are matching your recruitment process. Don't "
 "forget to specify the department if your recruitment process is different "
 "according to the job position."
-msgstr ""
-"次のステージが採用プロセスに合致するのであれば、チェックしてください。もし職種によって採用プロセスがkとなる場合には、部署を指定してください。"
+msgstr "次の段階が採用プロセスに合致するのであれば、チェックしてください。もし職種によって採用プロセスが異なる場合には、部門を指定してください。"
 
 #. module: hr_recruitment
 #: field:hr.applicant,partner_address_id:0
@@ -989,7 +988,7 @@ msgstr "10月"
 #. module: hr_recruitment
 #: view:hr.applicant:0
 msgid "Cases By Stage and Estimates"
-msgstr "ステージと見積りの事例"
+msgstr "段階と見積りの事例"
 
 #. module: hr_recruitment
 #: view:hr.applicant:0
diff --git a/addons/sale_margin/i18n/ja.po b/addons/sale_margin/i18n/ja.po
index 4bff99d2f5f..926954e2b62 100644
--- a/addons/sale_margin/i18n/ja.po
+++ b/addons/sale_margin/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-20 04:43+0000\n"
+"X-Launchpad-Export-Date: 2012-04-21 05:01+0000\n"
 "X-Generator: Launchpad (build 15120)\n"
 
 #. module: sale_margin

From d5af81aa0c8398d2959837f1f7570dcb3f0003ce Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Mon, 23 Apr 2012 11:02:32 +0200
Subject: [PATCH 237/238] [FIX] dataset internal context, domain state on
 search event, broken by model-based datasets

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

diff --git a/addons/web/static/src/js/views.js b/addons/web/static/src/js/views.js
index 9625e074e83..7579de3dc36 100644
--- a/addons/web/static/src/js/views.js
+++ b/addons/web/static/src/js/views.js
@@ -391,8 +391,8 @@ instance.web.ViewManager =  instance.web.Widget.extend({
             contexts: [action_context].concat(contexts || []),
             group_by_seq: groupbys || []
         }, function (results) {
-            self.dataset.context = results.context;
-            self.dataset.domain = results.domain;
+            self.dataset._model = new instance.web.Model(
+                self.dataset.model, results.context, results.domain);
             var groupby = results.group_by.length
                         ? results.group_by
                         : action_context.group_by;

From b3d0828564370a97f340b567131425fc8ba9e8c8 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Mon, 23 Apr 2012 11:50:57 +0200
Subject: [PATCH 238/238] [FIX] bloody logo link

bzr revid: xmo@openerp.com-20120423095057-gytshtkft5002693
---
 addons/web/static/src/xml/base.xml | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/addons/web/static/src/xml/base.xml b/addons/web/static/src/xml/base.xml
index 57970c1486e..65c084731bc 100644
--- a/addons/web/static/src/xml/base.xml
+++ b/addons/web/static/src/xml/base.xml
@@ -275,7 +275,10 @@
         </tr>
         <tr>
             <td class="oe_leftbar" valign="top">
-                <a href="#" class="oe_logo"><img t-att-src='_s + "/web/static/src/img/logo.png"'/></a>
+                <t t-js="d">
+                    d.url = '/' + (window.location.search || '');
+                </t>
+                <a t-att-href="url" class="oe_logo"><img t-att-src='_s + "/web/static/src/img/logo.png"'/></a>
                 <div class="oe_secondary_menus_container"/>
                 <div class="oe_footer">
                     Powered by <a href="http://www.openerp.com"><span>Open</span>ERP</a>