From 5cb1835e26a3868df3a0a71b3329bea17f455327 Mon Sep 17 00:00:00 2001
From: Yannick Vaucher <yannick.vaucher@camptocamp.com>
Date: Fri, 15 Mar 2013 15:24:03 +0100
Subject: [PATCH 001/121] [FIX] add missing context on compute call in
 pricelist price_get_multi context

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

bzr revid: yannick.vaucher@camptocamp.com-20130315142403-gz7fy7etwzls96rt
---
 addons/product/pricelist.py | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/addons/product/pricelist.py b/addons/product/pricelist.py
index 73707e39807..3a466191795 100644
--- a/addons/product/pricelist.py
+++ b/addons/product/pricelist.py
@@ -236,7 +236,10 @@ class product_pricelist(osv.osv):
                                         qty, context=context)[res['base_pricelist_id']]
                                 ptype_src = self.browse(cr, uid, res['base_pricelist_id']).currency_id.id
                                 uom_price_already_computed = True
-                                price = currency_obj.compute(cr, uid, ptype_src, res['currency_id'], price_tmp, round=False)
+                                price = currency_obj.compute(cr, uid,
+                                        ptype_src, res['currency_id'],
+                                        price_tmp, round=False,
+                                        context=context)
                         elif res['base'] == -2:
                             # this section could be improved by moving the queries outside the loop:
                             where = []

From 30073a2e8ff9fdda3e2f4d68bbbe2bd78b427170 Mon Sep 17 00:00:00 2001
From: Alexandre Fayolle <alexandre.fayolle@camptocamp.com>
Date: Tue, 19 Mar 2013 11:20:08 +0100
Subject: [PATCH 002/121] [FIX] race condition in session directory creation

try to create the directory and handle the possible exception instead of doing
an unsafe 2 step check and creation.

The issues related to the naming of the directory mentionned in the bug report
are not handled.

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

bzr revid: alexandre.fayolle@camptocamp.com-20130319102008-omtaka8dtq9v7m1l
---
 addons/web/http.py | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/addons/web/http.py b/addons/web/http.py
index e05d74e0873..d12cdfb13a1 100644
--- a/addons/web/http.py
+++ b/addons/web/http.py
@@ -20,6 +20,7 @@ import traceback
 import urlparse
 import uuid
 import xmlrpclib
+import errno
 
 import babel.core
 import simplejson
@@ -477,8 +478,15 @@ def session_path():
     except Exception:
         username = "unknown"
     path = os.path.join(tempfile.gettempdir(), "oe-sessions-" + username)
-    if not os.path.exists(path):
+    try:
         os.mkdir(path, 0700)
+    except OSError as exc:
+        if exc.errno == errno.EEXIST:
+            # directory exists: ensure it has the correct permissions
+            # this will fail if the directory is not owned by the current user
+            os.chmod(path, 0700)
+        else:
+            raise
     return path
 
 class Root(object):

From 8548a69f73c03fdbfeb7fdb722b95ae38363b5b5 Mon Sep 17 00:00:00 2001
From: Josse Colpaert <jco@openerp.com>
Date: Wed, 27 Mar 2013 11:38:33 +0100
Subject: [PATCH 003/121] [FIX] Timesheets invoiced as expenses are and
 correction removed in invoiced calculation

bzr revid: jco@openerp.com-20130327103833-ekjzi3e0alkpod35
---
 .../account_analytic_analysis.py              | 23 +++++++++++++++----
 .../account_analytic_analysis_view.xml        |  4 ++--
 .../analytic_contract_hr_expense.py           |  2 --
 3 files changed, 21 insertions(+), 8 deletions(-)

diff --git a/addons/account_analytic_analysis/account_analytic_analysis.py b/addons/account_analytic_analysis/account_analytic_analysis.py
index a187f9452f5..17988294861 100644
--- a/addons/account_analytic_analysis/account_analytic_analysis.py
+++ b/addons/account_analytic_analysis/account_analytic_analysis.py
@@ -211,12 +211,10 @@ class account_analytic_account(osv.osv):
                     JOIN account_analytic_journal \
                         ON account_analytic_line.journal_id = account_analytic_journal.id  \
                     WHERE account_analytic_line.account_id IN %s \
-                        AND account_analytic_journal.type = 'sale' \
-                    GROUP BY account_analytic_line.account_id", (child_ids,))
+                    AND account_analytic_journal.type = 'sale' \
+                    GROUP BY account_analytic_line.account_id", (child_ids,)) 
             for account_id, sum in cr.fetchall():
                 res[account_id] = round(sum,2)
-        for acc in self.browse(cr, uid, res.keys(), context=context):
-            res[acc.id] = res[acc.id] - (acc.timesheet_ca_invoiced or 0.0)
         res_final = res
         return res_final
 
@@ -543,6 +541,23 @@ class account_analytic_account(osv.osv):
             pass
         return result
 
+
+    def hr_to_invoice_timesheets(self, cr, uid, ids, context=None):
+        domain = [('invoice_id','=',False),('to_invoice','!=',False), ('journal_id.type', '=', 'general'), ('account_id', 'in', ids)]
+        names = [record.name for record in self.browse(cr, uid, ids, context=context)]
+        name = _('Timesheets to Invoice of %s') % ','.join(names)
+        return {
+            'type': 'ir.actions.act_window',
+            'name': name,
+            'view_type': 'form',
+            'view_mode': 'tree,form',
+            'domain' : domain,
+            'res_model': 'account.analytic.line',
+            'nodestroy': True,
+        }
+
+
+
 class account_analytic_account_summary_user(osv.osv):
     _name = "account_analytic_analysis.summary.user"
     _description = "Hours Summary by User"
diff --git a/addons/account_analytic_analysis/account_analytic_analysis_view.xml b/addons/account_analytic_analysis/account_analytic_analysis_view.xml
index a9437267611..d82a1789b2b 100644
--- a/addons/account_analytic_analysis/account_analytic_analysis_view.xml
+++ b/addons/account_analytic_analysis/account_analytic_analysis_view.xml
@@ -98,8 +98,8 @@
                                 <field class="oe_inline" name="ca_to_invoice" attrs="{'invisible': [('invoice_on_timesheets','=',False)]}"/>
                             </td><td class="oe_timesheet_action" attrs="{'invisible': ['|',('invoice_on_timesheets','=',False),('type','=','template')]}">
                                 <span attrs="{'invisible': [('ca_to_invoice','=',0.0)]}" class="oe_grey">
-                                    <button name="%(hr_timesheet_invoice.action_hr_timesheet_invoice_create_final)d"
-                                        type="action"
+                                    <button name="hr_to_invoice_timesheets"
+                                        type="object"
                                         class="oe_link"
                                         string="⇒ Invoice"/>
                                     or view 
diff --git a/addons/analytic_contract_hr_expense/analytic_contract_hr_expense.py b/addons/analytic_contract_hr_expense/analytic_contract_hr_expense.py
index 8b10381434d..99b4246d1ea 100644
--- a/addons/analytic_contract_hr_expense/analytic_contract_hr_expense.py
+++ b/addons/analytic_contract_hr_expense/analytic_contract_hr_expense.py
@@ -100,8 +100,6 @@ class account_analytic_account(osv.osv):
 
     def _ca_invoiced_calc(self, cr, uid, ids, name, arg, context=None):
         result = super(account_analytic_account, self)._ca_invoiced_calc(cr, uid, ids, name, arg, context=context)
-        for acc in self.browse(cr, uid, result.keys(), context=context):
-            result[acc.id] = result[acc.id] - (acc.expense_invoiced or 0.0)
         return result
 
     _columns = {

From 7bf78a7097f724258060badf28a97311f4cc19b2 Mon Sep 17 00:00:00 2001
From: Josse Colpaert <jco@openerp.com>
Date: Wed, 27 Mar 2013 14:36:45 +0100
Subject: [PATCH 004/121] [FIX] Clean up: wipe of timeinvoicecreateviewfinal
 wizard

bzr revid: jco@openerp.com-20130327133645-ax49xrxvt5svh4b1
---
 addons/hr_timesheet_invoice/__openerp__.py    |  1 -
 .../test/test_hr_timesheet_invoice.yml        | 17 +----
 .../test_hr_timesheet_invoice_no_prod_tax.yml | 17 +----
 .../hr_timesheet_final_invoice_create.py      | 63 -------------------
 ...hr_timesheet_invoice_create_final_view.xml | 52 ---------------
 5 files changed, 2 insertions(+), 148 deletions(-)
 delete mode 100644 addons/hr_timesheet_invoice/wizard/hr_timesheet_final_invoice_create.py
 delete mode 100644 addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create_final_view.xml

diff --git a/addons/hr_timesheet_invoice/__openerp__.py b/addons/hr_timesheet_invoice/__openerp__.py
index d15dd3b0e3b..888902e1484 100644
--- a/addons/hr_timesheet_invoice/__openerp__.py
+++ b/addons/hr_timesheet_invoice/__openerp__.py
@@ -46,7 +46,6 @@ reports.""",
         'report/hr_timesheet_invoice_report_view.xml',
         'wizard/hr_timesheet_analytic_profit_view.xml',
         'wizard/hr_timesheet_invoice_create_view.xml',
-        'wizard/hr_timesheet_invoice_create_final_view.xml',
     ],
     'demo': ['hr_timesheet_invoice_demo.xml'],
     'test': ['test/test_hr_timesheet_invoice.yml',
diff --git a/addons/hr_timesheet_invoice/test/test_hr_timesheet_invoice.yml b/addons/hr_timesheet_invoice/test/test_hr_timesheet_invoice.yml
index de19ea8fb3a..05326bb19c1 100644
--- a/addons/hr_timesheet_invoice/test/test_hr_timesheet_invoice.yml
+++ b/addons/hr_timesheet_invoice/test/test_hr_timesheet_invoice.yml
@@ -102,19 +102,4 @@
     assert aline.invoice_id, "Invoice created, but analytic line wasn't updated."
     assert aline.invoice_id == invoice_id, "Invoice doesn't match the one at analytic line"
     assert invoice_id.amount_untaxed == 187.5, "Invoice amount mismatch: %s" % invoice_id.amount_untaxed
-    assert invoice_id.amount_tax == 50, "Invoice tax mismatch: %s" %  invoice_id.amount_tax
--
-  I create final invoice for this analytic account.
--
-  !record {model: hr.timesheet.invoice.create.final, id: hr_timesheet_invoice_create_final_0}:
-    date: 1
-    name: 1
-    price: 1
-    time: 1
--
-  I click on "Create Invoice" button to create Invoice and validate the invoice.
--
-  !python {model: hr.timesheet.invoice.create.final}: |
-    import netsvc
-    wkf_service = netsvc.LocalService("workflow")
-    res = self.do_create(cr, uid, [ref("hr_timesheet_invoice_create_final_0")], {"active_ids": [ref("account.analytic_agrolait")]})
+    assert invoice_id.amount_tax == 50, "Invoice tax mismatch: %s" %  invoice_id.amount_tax
\ No newline at end of file
diff --git a/addons/hr_timesheet_invoice/test/test_hr_timesheet_invoice_no_prod_tax.yml b/addons/hr_timesheet_invoice/test/test_hr_timesheet_invoice_no_prod_tax.yml
index 68e827e79f1..88675f3042f 100644
--- a/addons/hr_timesheet_invoice/test/test_hr_timesheet_invoice_no_prod_tax.yml
+++ b/addons/hr_timesheet_invoice/test/test_hr_timesheet_invoice_no_prod_tax.yml
@@ -101,19 +101,4 @@
     assert aline.invoice_id, "Invoice created, but analytic line wasn't updated."
     assert aline.invoice_id == invoice_id, "Invoice doesn't match the one at analytic line"
     assert invoice_id.amount_untaxed == 187.5, "Invoice amount mismatch: %s" % invoice_id.amount_untaxed
-    assert invoice_id.amount_tax == 40, "Invoice tax mismatch: %s" %  invoice_id.amount_tax
--
-  I create final invoice for this analytic account.
--
-  !record {model: hr.timesheet.invoice.create.final, id: hr_timesheet_invoice_create_final_0}:
-    date: 1
-    name: 1
-    price: 1
-    time: 1
--
-  I click on "Create Invoice" button to create Invoice and validate the invoice.
--
-  !python {model: hr.timesheet.invoice.create.final}: |
-    import netsvc
-    wkf_service = netsvc.LocalService("workflow")
-    res = self.do_create(cr, uid, [ref("hr_timesheet_invoice_create_final_0")], {"active_ids": [ref("account.analytic_agrolait")]})
+    assert invoice_id.amount_tax == 40, "Invoice tax mismatch: %s" %  invoice_id.amount_tax
\ No newline at end of file
diff --git a/addons/hr_timesheet_invoice/wizard/hr_timesheet_final_invoice_create.py b/addons/hr_timesheet_invoice/wizard/hr_timesheet_final_invoice_create.py
deleted file mode 100644
index 1977d6cccc5..00000000000
--- a/addons/hr_timesheet_invoice/wizard/hr_timesheet_final_invoice_create.py
+++ /dev/null
@@ -1,63 +0,0 @@
-# -*- coding: utf-8 -*-
-##############################################################################
-#
-#    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU Affero General Public License as
-#    published by the Free Software Foundation, either version 3 of the
-#    License, or (at your option) any later version.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU Affero General Public License for more details.
-#
-#    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-##############################################################################
-
-import time
-
-from openerp.osv import fields, osv
-from openerp.tools.translate import _
-
-#
-# Create an final invoice based on selected timesheet lines
-#
-
-#
-# TODO: check unit of measure !!!
-#
-class final_invoice_create(osv.osv_memory):
-    _name = 'hr.timesheet.invoice.create.final'
-    _description = 'Create invoice from timesheet final'
-    _columns = {
-        'date': fields.boolean('Date', help='Display date in the history of works'),
-        'time': fields.boolean('Time Spent', help='Display time in the history of works'),
-        'name': fields.boolean('Log of Activity', help='Display detail of work in the invoice line.'),
-        'price': fields.boolean('Cost', help='Display cost of the item you reinvoice'),
-        'product': fields.many2one('product.product', 'Product', help='The product that will be used to invoice the remaining amount'),
-    }
-
-    def do_create(self, cr, uid, ids, context=None):
-        data = self.read(cr, uid, ids, [], context=context)[0]
-        # hack for fixing small issue (context should not propagate implicitly between actions)
-        if 'default_type' in context:
-            del context['default_type']
-        ids = self.pool.get('account.analytic.line').search(cr, uid, [('invoice_id','=',False),('to_invoice','<>', False), ('account_id', 'in', context['active_ids'])], context=context)
-        invs = self.pool.get('account.analytic.line').invoice_cost_create(cr, uid, ids, data, context=context)
-        mod_obj = self.pool.get('ir.model.data')
-        act_obj = self.pool.get('ir.actions.act_window')
-        mod_ids = mod_obj.search(cr, uid, [('name', '=', 'action_invoice_tree1')], context=context)[0]
-        res_id = mod_obj.read(cr, uid, mod_ids, ['res_id'], context=context)['res_id']
-        act_win = act_obj.read(cr, uid, res_id, [], context=context)
-        act_win['domain'] = [('id','in',invs),('type','=','out_invoice')]
-        act_win['name'] = _('Invoices')
-        return act_win
-
-final_invoice_create()
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create_final_view.xml b/addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create_final_view.xml
deleted file mode 100644
index d1c95212139..00000000000
--- a/addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create_final_view.xml
+++ /dev/null
@@ -1,52 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<openerp>
-    <data>
-        <record id="action_hr_timesheet_invoice_create_final" model="ir.actions.act_window">
-            <field name="name">Create Invoice</field>
-            <field name="type">ir.actions.act_window</field>
-            <field name="res_model">hr.timesheet.invoice.create.final</field>
-            <field name="view_type">form</field>
-            <field name="view_mode">form</field>
-            <field name="target">new</field>
-            <field name="multi" eval="1"/>
-        </record>
-
-        <record model="ir.values" id="hr_timesheet_invoice_create_final_values">
-            <field name="model_id" ref="model_account_analytic_account" />
-            <field name="name">Invoice</field>
-            <field name="key2">client_action_multi</field>
-            <field name="value" eval="'ir.actions.act_window,' + str(ref('action_hr_timesheet_invoice_create_final'))" />
-            <field name="key">action</field>
-            <field name="model">account.analytic.account</field>
-        </record>
-
-
-        <record id="view_hr_timesheet_invoice_create_final" model="ir.ui.view">
-            <field name="name">hr.timesheet.invoice.create.final.form</field>
-            <field name="model">hr.timesheet.invoice.create.final</field>
-            <field name="arch" type="xml">
-            <form string="Invoice contract" version="7.0">
-                    <p>Do you want to show details of each activity to your customer?</p>
-                    <group>
-                        <group>
-                            <field name="date"/>
-                            <field name="time"/>
-                        </group><group>
-                            <field name="name"/>
-                            <field name="price"/>
-                        </group>
-                    </group>
-                    <group string="Force to use a special product" groups="base.group_no_one">
-                        <field name="product"/>
-                    </group>
-                <footer>
-                    <button name="do_create" string="Create Invoice" type="object" class="oe_highlight"/>
-                    or
-                    <button string="Cancel" class="oe_link" special="cancel" />
-                </footer>
-            </form>
-            </field>
-        </record>
-
-    </data>
-</openerp>

From 23d2c6d634d3be353856a479be807f0067a65263 Mon Sep 17 00:00:00 2001
From: Josse Colpaert <jco@openerp.com>
Date: Wed, 27 Mar 2013 18:12:43 +0100
Subject: [PATCH 005/121] [FIX] Remove also import and correct total invoiced
 on so by calculation of invoice lines

bzr revid: jco@openerp.com-20130327171243-zzagfabhf5i0bb90
---
 .../account_analytic_analysis.py                | 17 ++++++++---------
 .../analytic_contract_hr_expense.py             |  2 ++
 addons/hr_timesheet_invoice/wizard/__init__.py  |  1 -
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/addons/account_analytic_analysis/account_analytic_analysis.py b/addons/account_analytic_analysis/account_analytic_analysis.py
index 17988294861..89e39c71660 100644
--- a/addons/account_analytic_analysis/account_analytic_analysis.py
+++ b/addons/account_analytic_analysis/account_analytic_analysis.py
@@ -206,15 +206,14 @@ class account_analytic_account(osv.osv):
             return res
 
         if child_ids:
-            cr.execute("SELECT account_analytic_line.account_id, COALESCE(SUM(amount), 0.0) \
-                    FROM account_analytic_line \
-                    JOIN account_analytic_journal \
-                        ON account_analytic_line.journal_id = account_analytic_journal.id  \
-                    WHERE account_analytic_line.account_id IN %s \
-                    AND account_analytic_journal.type = 'sale' \
-                    GROUP BY account_analytic_line.account_id", (child_ids,)) 
-            for account_id, sum in cr.fetchall():
-                res[account_id] = round(sum,2)
+            #Search all invoice lines not in cancelled state that refer to this analytic account
+            inv_line_obj = self.pool.get("account.invoice.line")
+            inv_lines = inv_line_obj.search(cr, uid, ['&', ('account_analytic_id', 'in', child_ids), ('invoice_id.state', '!=', 'cancel')], context=context)
+            for line in inv_line_obj.browse(cr, uid, inv_lines, context=context):
+                res[line.account_analytic_id.id] += line.price_subtotal
+        for acc in self.browse(cr, uid, res.keys(), context=context):
+            res[acc.id] = res[acc.id] - (acc.timesheet_ca_invoiced or 0.0)
+
         res_final = res
         return res_final
 
diff --git a/addons/analytic_contract_hr_expense/analytic_contract_hr_expense.py b/addons/analytic_contract_hr_expense/analytic_contract_hr_expense.py
index 99b4246d1ea..8b10381434d 100644
--- a/addons/analytic_contract_hr_expense/analytic_contract_hr_expense.py
+++ b/addons/analytic_contract_hr_expense/analytic_contract_hr_expense.py
@@ -100,6 +100,8 @@ class account_analytic_account(osv.osv):
 
     def _ca_invoiced_calc(self, cr, uid, ids, name, arg, context=None):
         result = super(account_analytic_account, self)._ca_invoiced_calc(cr, uid, ids, name, arg, context=context)
+        for acc in self.browse(cr, uid, result.keys(), context=context):
+            result[acc.id] = result[acc.id] - (acc.expense_invoiced or 0.0)
         return result
 
     _columns = {
diff --git a/addons/hr_timesheet_invoice/wizard/__init__.py b/addons/hr_timesheet_invoice/wizard/__init__.py
index b718be1acbb..092ea8bbd7b 100644
--- a/addons/hr_timesheet_invoice/wizard/__init__.py
+++ b/addons/hr_timesheet_invoice/wizard/__init__.py
@@ -21,7 +21,6 @@
 
 import hr_timesheet_invoice_create
 import hr_timesheet_analytic_profit
-import hr_timesheet_final_invoice_create
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 

From 300d5be0e6af4d24d09419e0be6807b265da3cd8 Mon Sep 17 00:00:00 2001
From: Olivier Dony <odo@openerp.com>
Date: Thu, 28 Mar 2013 13:03:37 +0100
Subject: [PATCH 006/121] [FIX] web: int/float fields were not offering
 auto-completion in search views, making them un-searchable except via
 advanced search

Added the missing complete() function and removed the incorrect
value_from() override that seemed to be a leftover remnant
of the 6.1 search field implementation of get_value(), wrongly
renamed for 7.0.

bzr revid: odo@openerp.com-20130328120337-lao4o9i0owsbpysi
---
 addons/web/static/src/js/search.js | 30 ++++++++++++++++--------------
 1 file changed, 16 insertions(+), 14 deletions(-)

diff --git a/addons/web/static/src/js/search.js b/addons/web/static/src/js/search.js
index c1ace6b57f3..50576687808 100644
--- a/addons/web/static/src/js/search.js
+++ b/addons/web/static/src/js/search.js
@@ -1346,20 +1346,22 @@ instance.web.search.CharField = instance.web.search.Field.extend( /** @lends ins
     }
 });
 instance.web.search.NumberField = instance.web.search.Field.extend(/** @lends instance.web.search.NumberField# */{
-    value_from: function () {
-        if (!this.$el.val()) {
-            return null;
-        }
-        var val = this.parse(this.$el.val()),
-          check = Number(this.$el.val());
-        if (isNaN(val) || val !== check) {
-            this.$el.addClass('error');
-            throw new instance.web.search.Invalid(
-                this.attrs.name, this.$el.val(), this.error_message);
-        }
-        this.$el.removeClass('error');
-        return val;
-    }
+    complete: function (value) {
+        var val = this.parse(value);
+        if (!val || isNaN(val)) { return $.when(); }
+        var label = _.str.sprintf(_.str.escapeHTML(
+            _t("Search %(field)s for: %(value)s")), {
+                field: '<em>' + this.attrs.string + '</em>',
+                value: '<strong>' + _.str.escapeHTML(value) + '</strong>'});
+        return $.when([{
+            label: label,
+            facet: {
+                category: this.attrs.string,
+                field: this,
+                values: [{label: value, value: val}]
+            }
+        }]);
+    },
 });
 /**
  * @class

From 35d61bbd8bbfd034b3d9e01347f0f13ee0ef17ac Mon Sep 17 00:00:00 2001
From: Olivier Dony <odo@openerp.com>
Date: Thu, 28 Mar 2013 16:35:02 +0100
Subject: [PATCH 007/121] [FIX] web search: correct previous fix to properly
 handle searching for 0 on number fields

Also removed useless HTML escaping and added basic tests.

bzr revid: odo@openerp.com-20130328153502-v71q2m60wh37ganq
---
 addons/web/static/src/js/search.js |  6 ++--
 addons/web/static/test/search.js   | 53 ++++++++++++++++++++++++++++++
 2 files changed, 56 insertions(+), 3 deletions(-)

diff --git a/addons/web/static/src/js/search.js b/addons/web/static/src/js/search.js
index 50576687808..37f8bd8b3f2 100644
--- a/addons/web/static/src/js/search.js
+++ b/addons/web/static/src/js/search.js
@@ -1348,9 +1348,9 @@ instance.web.search.CharField = instance.web.search.Field.extend( /** @lends ins
 instance.web.search.NumberField = instance.web.search.Field.extend(/** @lends instance.web.search.NumberField# */{
     complete: function (value) {
         var val = this.parse(value);
-        if (!val || isNaN(val)) { return $.when(); }
-        var label = _.str.sprintf(_.str.escapeHTML(
-            _t("Search %(field)s for: %(value)s")), {
+        if (isNaN(val)) { return $.when(); }
+        var label = _.str.sprintf(
+            _t("Search %(field)s for: %(value)s"), {
                 field: '<em>' + this.attrs.string + '</em>',
                 value: '<strong>' + _.str.escapeHTML(value) + '</strong>'});
         return $.when([{
diff --git a/addons/web/static/test/search.js b/addons/web/static/test/search.js
index 6c4b6d61d3c..73d984506b2 100644
--- a/addons/web/static/test/search.js
+++ b/addons/web/static/test/search.js
@@ -614,6 +614,59 @@ openerp.testing.section('search.completions', {
             {relation: 'dummy.model'}, view);
         return f.complete("bob");
     });
+    test('Integer: invalid', {asserts: 1}, function (instance) {
+        var view = {inputs: []};
+        var f = new instance.web.search.IntegerField(
+            {attrs: {string: "Dummy"}}, {}, view);
+        return f.complete("qux")
+            .done(function (completions) {
+                ok(!completions, "non-number => no completion");
+            });
+    });
+    test('Integer: non-zero', {asserts: 5}, function (instance) {
+        var view = {inputs: []};
+        var f = new instance.web.search.IntegerField(
+            {attrs: {string: "Dummy"}}, {}, view);
+        return f.complete("-2")
+            .done(function (completions) {
+                equal(completions.length, 1, "number fields provide 1 completion only");
+                var facet = new instance.web.search.Facet(completions[0].facet);
+                equal(facet.get('category'), f.attrs.string);
+                equal(facet.get('field'), f);
+                var value = facet.values.at(0);
+                equal(value.get('label'), "-2");
+                equal(value.get('value'), -2);
+            });
+    });
+    test('Integer: zero', {asserts: 3}, function (instance) {
+        var view = {inputs: []};
+        var f = new instance.web.search.IntegerField(
+            {attrs: {string: "Dummy"}}, {}, view);
+        return f.complete("0")
+            .done(function (completions) {
+                equal(completions.length, 1, "number fields provide 1 completion only");
+                var facet = new instance.web.search.Facet(completions[0].facet);
+                var value = facet.values.at(0);
+                equal(value.get('label'), "0");
+                equal(value.get('value'), 0);
+            });
+    });
+    test('Float: non-zero', {asserts: 5}, function (instance) {
+        var view = {inputs: []};
+        var f = new instance.web.search.FloatField(
+            {attrs: {string: "Dummy"}}, {}, view);
+        return f.complete("42.37")
+            .done(function (completions) {
+                equal(completions.length, 1, "float fields provide 1 completion only");
+                var facet = new instance.web.search.Facet(completions[0].facet);
+                equal(facet.get('category'), f.attrs.string);
+                equal(facet.get('field'), f);
+                var value = facet.values.at(0);
+                equal(value.get('label'), "42.37");
+                equal(value.get('value'), 42.37);
+            });
+    });
+    
 });
 openerp.testing.section('search.serialization', {
     dependencies: ['web.search'],

From 17eaf9e92a44db7238f9ca3a53041bc94314322e Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Fri, 29 Mar 2013 15:03:29 +0100
Subject: [PATCH 008/121] [TESTS] add dispatcher tests

bzr revid: xmo@openerp.com-20130329140329-a78lqt87str80v99
---
 addons/web/tests/__init__.py      |   3 +-
 addons/web/tests/test_dispatch.py | 181 ++++++++++++++++++++++++++++++
 2 files changed, 183 insertions(+), 1 deletion(-)
 create mode 100644 addons/web/tests/test_dispatch.py

diff --git a/addons/web/tests/__init__.py b/addons/web/tests/__init__.py
index d7abb8e5a8c..2734bd45ddb 100644
--- a/addons/web/tests/__init__.py
+++ b/addons/web/tests/__init__.py
@@ -1,9 +1,10 @@
 # -*- coding: utf-8 -*-
-from . import test_dataset, test_menu, test_serving_base, test_js
+from . import test_dataset, test_menu, test_serving_base, test_js, test_dispatch
 
 fast_suite = []
 checks = [
     test_dataset,
     test_menu,
     test_serving_base,
+    test_dispatch,
 ]
diff --git a/addons/web/tests/test_dispatch.py b/addons/web/tests/test_dispatch.py
new file mode 100644
index 00000000000..df142043de5
--- /dev/null
+++ b/addons/web/tests/test_dispatch.py
@@ -0,0 +1,181 @@
+# -*- coding: utf-8 -*-
+import json
+import unittest2
+
+from .. import http
+import werkzeug.test
+
+
+def setUpModule():
+    """
+    Force load_addons once to import all the crap we don't care for as this
+    thing is full of side-effects
+    """
+    http.Root().load_addons()
+
+class DispatchCleanup(unittest2.TestCase):
+    """
+    Cleans up controllers registries in the web client so it's possible to
+    test controllers registration and dispatching in isolation.
+    """
+    def setUp(self):
+        self.classes = http.controllers_class
+        self.objects = http.controllers_object
+        self.paths = http.controllers_path
+
+        http.controllers_class = []
+        http.controllers_object = {}
+        http.controllers_path = {}
+
+    def tearDown(self):
+        http.controllers_path = self.paths
+        http.controllers_object = self.objects
+        http.controllers_class = self.classes
+
+
+def jsonrpc_body(params=None):
+    """
+    Builds and dumps the body of a JSONRPC request with params ``params``
+    """
+    return json.dumps({
+        'jsonrpc': '2.0',
+        'method': 'call',
+        'id': None,
+        'params': params or {},
+    })
+
+
+def jsonrpc_response(result=None):
+    """
+    Builds a JSONRPC response (as a Python dict) with result ``result``
+    """
+    return {
+        u'jsonrpc': u'2.0',
+        u'id': None,
+        u'result': result,
+    }
+
+
+class TestDispatching(DispatchCleanup):
+    def setUp(self):
+        super(TestDispatching, self).setUp()
+        self.app = http.Root()
+        self.client = werkzeug.test.Client(self.app)
+
+    def test_not_exposed(self):
+        class CatController(http.Controller):
+            _cp_path = '/cat'
+
+            def index(self):
+                return 'Blessid iz da feline'
+
+        self.app.load_addons()
+
+        body, status, headers = self.client.get('/cat')
+        self.assertEqual('404 NOT FOUND', status)
+
+    def test_basic_http(self):
+        class CatController(http.Controller):
+            _cp_path = '/cat'
+
+            @http.httprequest
+            def index(self, req):
+                return 'no walk in counsil of wickid,'
+
+        self.app.load_addons()
+
+        body, status, headers = self.client.get('/cat')
+        self.assertEqual('200 OK', status)
+        self.assertEqual('no walk in counsil of wickid,', ''.join(body))
+
+    def test_basic_jsonrpc(self):
+        class CatController(http.Controller):
+            _cp_path = '/cat'
+
+            @http.jsonrequest
+            def index(self, req):
+                return 'no place paws in path of da sinnerz,'
+        self.app.load_addons()
+
+        body, status, headers = self.client.post('/cat', data=jsonrpc_body())
+
+        self.assertEqual('200 OK', status)
+        self.assertEqual(
+            jsonrpc_response('no place paws in path of da sinnerz,'),
+            json.loads(''.join(body)))
+
+    def test_add_method(self):
+        class CatController(http.Controller):
+            _cp_path = '/cat'
+
+            @http.httprequest
+            def index(self, req):
+                return 'no sit and purr with da mockerz.'
+
+        class CeilingController(CatController):
+            @http.httprequest
+            def lol(self, req):
+                return 'But der delightz in lawz of Ceiling Cat,'
+
+        self.app.load_addons()
+
+        body, status, headers = self.client.get('/cat')
+        self.assertEqual('200 OK', status)
+        self.assertEqual('no sit and purr with da mockerz.', ''.join(body))
+        body, status, headers = self.client.get('/cat/lol')
+        self.assertEqual('200 OK', status)
+        self.assertEqual('But der delightz in lawz of Ceiling Cat,',
+                         ''.join(body))
+
+    def test_override_method(self):
+        class CatController(http.Controller):
+            _cp_path = '/cat'
+
+            @http.httprequest
+            def index(self, req):
+                return 'an ponderz'
+
+        class CeilingController(CatController):
+            @http.httprequest
+            def index(self, req):
+                return '%s much.' % super(CeilingController, self).index(req)
+
+        self.app.load_addons()
+
+        body, status, headers = self.client.get('/cat')
+        self.assertEqual('200 OK', status)
+        self.assertEqual('an ponderz much.', ''.join(body))
+
+    def test_make_invisible(self):
+        class CatController(http.Controller):
+            _cp_path = '/cat'
+
+            @http.httprequest
+            def index(self, req):
+                return 'Tehy liek treez bai teh waterz,'
+
+        class CeilingController(CatController):
+            def index(self, req):
+                return super(CeilingController, self).index(req)
+
+        self.app.load_addons()
+
+        body, status, headers = self.client.get('/cat')
+        self.assertEqual('404 NOT FOUND', status)
+
+    def test_make_json_invisible(self):
+        class CatController(http.Controller):
+            _cp_path = '/cat'
+
+            @http.jsonrequest
+            def index(self, req):
+                return 'Tehy liek treez bai teh waterz,'
+
+        class CeilingController(CatController):
+            def index(self, req):
+                return super(CeilingController, self).index(req)
+
+        self.app.load_addons()
+
+        body, status, headers = self.client.post('/cat')
+        self.assertEqual('404 NOT FOUND', status)

From 23904b523af532aa87341b681e298b7ae2fcec01 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Fri, 29 Mar 2013 15:16:45 +0100
Subject: [PATCH 009/121] [TEST] test normal inheritance of controllers

bzr revid: xmo@openerp.com-20130329141645-m70aitx3kv74yo97
---
 addons/web/tests/test_dispatch.py | 27 +++++++++++++++++++++++++++
 1 file changed, 27 insertions(+)

diff --git a/addons/web/tests/test_dispatch.py b/addons/web/tests/test_dispatch.py
index df142043de5..54b987cf555 100644
--- a/addons/web/tests/test_dispatch.py
+++ b/addons/web/tests/test_dispatch.py
@@ -179,3 +179,30 @@ class TestDispatching(DispatchCleanup):
 
         body, status, headers = self.client.post('/cat')
         self.assertEqual('404 NOT FOUND', status)
+
+    def test_extend(self):
+        class CatController(http.Controller):
+            _cp_path = '/cat'
+
+            @http.httprequest
+            def index(self, req):
+                return '[%s]' % self.speak()
+
+            def speak(self):
+                return 'Yu ordered cheezburgerz,'
+
+        class DogController(CatController):
+            _cp_path = '/dog'
+
+            def speak(self):
+                return 'Woof woof woof woof'
+
+        self.app.load_addons()
+
+        body, status, headers = self.client.get('/cat')
+        self.assertEqual('200 OK', status)
+        self.assertEqual('[Yu ordered cheezburgerz,]', ''.join(body))
+
+        body, status, headers = self.client.get('/dog')
+        self.assertEqual('200 OK', status)
+        self.assertEqual('[Woof woof woof woof]', ''.join(body))

From 1f421e7928f5295a21e87f43a94faded5a72bc13 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Tue, 2 Apr 2013 16:32:17 +0200
Subject: [PATCH 010/121] [FIX] redefinition and in-place extension scenarios
 for controllers

bzr revid: xmo@openerp.com-20130402143217-pfe2288iodw9r81g
---
 addons/web/http.py                |  54 ++++++++--
 addons/web/tests/test_dispatch.py | 165 +++++++++++++++++++++++++++---
 2 files changed, 197 insertions(+), 22 deletions(-)

diff --git a/addons/web/http.py b/addons/web/http.py
index e05d74e0873..f08d7c64c4d 100644
--- a/addons/web/http.py
+++ b/addons/web/http.py
@@ -354,18 +354,58 @@ def httprequest(f):
 #----------------------------------------------------------
 addons_module = {}
 addons_manifest = {}
-controllers_class = []
-controllers_object = {}
+controllers_class = {}
 controllers_path = {}
 
 class ControllerType(type):
     def __init__(cls, name, bases, attrs):
         super(ControllerType, cls).__init__(name, bases, attrs)
-        controllers_class.append(("%s.%s" % (cls.__module__, cls.__name__), cls))
+        # Only for root "Controller"
+        if bases == (object,):
+            assert name == 'Controller'
+            return
+
+        path = attrs.get('_cp_path')
+        if Controller in bases:
+            assert path, "Controller subclass %s missing a _cp_path" % cls
+        else:
+            parent_paths = set(base._cp_path for base in bases
+                               if issubclass(base, Controller))
+            assert len(parent_paths) == 1,\
+                "%s inheriting from multiple controllers is not supported" % (
+                    name)
+            [parent_path] = parent_paths
+            [parent] = [
+                controller for controller in controllers_class.itervalues()
+                if controller._cp_path == parent_path]
+
+            # inherit from a Controller subclass
+            if path:
+                _logger.warn("Re-exposing %s at %s.\n"
+                             "\tThis usage is unsupported.",
+                             parent.__name__,
+                             attrs['_cp_path'])
+
+        if path:
+            assert path not in controllers_class,\
+                "Trying to expose %s at the same URL as %s" % (
+                    cls, controllers_class[path])
+            controllers_class[path] = cls
+
 
 class Controller(object):
     __metaclass__ = ControllerType
 
+    def __new__(cls, *args, **kwargs):
+        subclasses = [c for c in cls.__subclasses__()
+                      if c._cp_path is cls._cp_path]
+        if subclasses:
+            name = "%s (+%s)" % (
+                cls.__name__,
+                '+'.join(sub.__name__ for sub in subclasses))
+            cls = type(name, tuple(reversed(subclasses)), {})
+        return object.__new__(cls)
+
 #----------------------------------------------------------
 # Session context manager
 #----------------------------------------------------------
@@ -558,12 +598,8 @@ class Root(object):
                         addons_manifest[module] = manifest
                         self.statics['/%s/static' % module] = path_static
 
-        for k, v in controllers_class:
-            if k not in controllers_object:
-                o = v()
-                controllers_object[k] = o
-                if hasattr(o, '_cp_path'):
-                    controllers_path[o._cp_path] = o
+        for c in controllers_class.itervalues():
+            controllers_path[c._cp_path] = c()
 
         app = werkzeug.wsgi.SharedDataMiddleware(self.dispatch, self.statics)
         self.dispatch = DisableCacheMiddleware(app)
diff --git a/addons/web/tests/test_dispatch.py b/addons/web/tests/test_dispatch.py
index 54b987cf555..516345bfa13 100644
--- a/addons/web/tests/test_dispatch.py
+++ b/addons/web/tests/test_dispatch.py
@@ -1,5 +1,9 @@
 # -*- coding: utf-8 -*-
+import contextlib
 import json
+import logging
+import logging.handlers
+import types
 import unittest2
 
 from .. import http
@@ -20,16 +24,13 @@ class DispatchCleanup(unittest2.TestCase):
     """
     def setUp(self):
         self.classes = http.controllers_class
-        self.objects = http.controllers_object
         self.paths = http.controllers_path
 
-        http.controllers_class = []
-        http.controllers_object = {}
+        http.controllers_class = {}
         http.controllers_path = {}
 
     def tearDown(self):
         http.controllers_path = self.paths
-        http.controllers_object = self.objects
         http.controllers_class = self.classes
 
 
@@ -56,6 +57,30 @@ def jsonrpc_response(result=None):
     }
 
 
+class TestHandler(logging.handlers.BufferingHandler):
+    def __init__(self):
+        logging.handlers.BufferingHandler.__init__(self, 0)
+
+    def shouldFlush(self, record):
+        return False
+
+@contextlib.contextmanager
+def capture_logging(level=logging.DEBUG):
+    logger = logging.getLogger('openerp')
+    old_level = logger.level
+    old_handlers = logger.handlers
+
+    test_handler = TestHandler()
+    logger.handlers = [test_handler]
+    logger.setLevel(level)
+
+    try:
+        yield test_handler
+    finally:
+        logger.setLevel(old_level)
+        logger.handlers = old_handlers
+
+
 class TestDispatching(DispatchCleanup):
     def setUp(self):
         super(TestDispatching, self).setUp()
@@ -104,6 +129,13 @@ class TestDispatching(DispatchCleanup):
             jsonrpc_response('no place paws in path of da sinnerz,'),
             json.loads(''.join(body)))
 
+
+class TestSubclassing(DispatchCleanup):
+    def setUp(self):
+        super(TestSubclassing, self).setUp()
+        self.app = http.Root()
+        self.client = werkzeug.test.Client(self.app)
+
     def test_add_method(self):
         class CatController(http.Controller):
             _cp_path = '/cat'
@@ -180,7 +212,38 @@ class TestDispatching(DispatchCleanup):
         body, status, headers = self.client.post('/cat')
         self.assertEqual('404 NOT FOUND', status)
 
-    def test_extend(self):
+    def test_extends(self):
+        """
+        When subclassing an existing Controller new classes are "merged" into
+        the base one
+        """
+        class A(http.Controller):
+            _cp_path = '/foo'
+            @http.httprequest
+            def index(self, req):
+                return '1'
+
+        class B(A):
+            @http.httprequest
+            def index(self, req):
+                return "%s 2" % super(B, self).index(req)
+
+        class C(A):
+            @http.httprequest
+            def index(self, req):
+                return "%s 3" % super(C, self).index(req)
+
+        self.app.load_addons()
+
+        body, status, headers = self.client.get('/foo')
+        self.assertEqual('200 OK', status)
+        self.assertEqual('1 2 3', ''.join(body))
+
+    def test_re_expose(self):
+        """
+        An existing Controller should not be extended with a new cp_path
+        (re-exposing somewhere else)
+        """
         class CatController(http.Controller):
             _cp_path = '/cat'
 
@@ -191,18 +254,94 @@ class TestDispatching(DispatchCleanup):
             def speak(self):
                 return 'Yu ordered cheezburgerz,'
 
-        class DogController(CatController):
-            _cp_path = '/dog'
+        with capture_logging() as handler:
+            class DogController(CatController):
+                _cp_path = '/dog'
 
-            def speak(self):
-                return 'Woof woof woof woof'
+                def speak(self):
+                    return 'Woof woof woof woof'
+
+            [record] = handler.buffer
+            self.assertEqual(logging.WARN, record.levelno)
+            self.assertEqual("Re-exposing CatController at /dog.\n"
+                             "\tThis usage is unsupported.",
+                             record.getMessage())
+
+    def test_fail_redefine(self):
+        """
+        An existing Controller can't be overwritten by a new one on the same
+        path (? or should this generate a warning and still work as if it was
+        an extend?)
+        """
+        class FooController(http.Controller):
+            _cp_path = '/foo'
+
+        with self.assertRaises(AssertionError):
+            class BarController(http.Controller):
+                _cp_path = '/foo'
+
+    def test_fail_no_path(self):
+        """
+        A Controller must have a path (and thus be exposed)
+        """
+        with self.assertRaises(AssertionError):
+            class FooController(http.Controller):
+                pass
+
+    def test_mixin(self):
+        """
+        Can mix "normal" python classes into a controller directly
+        """
+        class Mixin(object):
+            @http.httprequest
+            def index(self, req):
+                return 'ok'
+
+        class FooController(http.Controller, Mixin):
+            _cp_path = '/foo'
+
+        class BarContoller(Mixin, http.Controller):
+            _cp_path = '/bar'
 
         self.app.load_addons()
 
-        body, status, headers = self.client.get('/cat')
+        body, status, headers = self.client.get('/foo')
         self.assertEqual('200 OK', status)
-        self.assertEqual('[Yu ordered cheezburgerz,]', ''.join(body))
+        self.assertEqual('ok', ''.join(body))
 
-        body, status, headers = self.client.get('/dog')
+        body, status, headers = self.client.get('/bar')
         self.assertEqual('200 OK', status)
-        self.assertEqual('[Woof woof woof woof]', ''.join(body))
+        self.assertEqual('ok', ''.join(body))
+
+    def test_mixin_extend(self):
+        """
+        Can mix "normal" python class into a controller by extension
+        """
+        class FooController(http.Controller):
+            _cp_path = '/foo'
+
+        class M1(object):
+            @http.httprequest
+            def m1(self, req):
+                return 'ok 1'
+
+        class M2(object):
+            @http.httprequest
+            def m2(self, req):
+                return 'ok 2'
+
+        class AddM1(FooController, M1):
+            pass
+
+        class AddM2(M2, FooController):
+            pass
+
+        self.app.load_addons()
+
+        body, status, headers = self.client.get('/foo/m1')
+        self.assertEqual('200 OK', status)
+        self.assertEqual('ok 1', ''.join(body))
+
+        body, status, headers = self.client.get('/foo/m2')
+        self.assertEqual('200 OK', status)
+        self.assertEqual('ok 2', ''.join(body))

From 41784d0aec09c4fdda793fee7587c9fd8fedec52 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Wed, 3 Apr 2013 10:26:35 +0200
Subject: [PATCH 011/121] [FIX] Export and Reports controllers have no need to
 extend View

bzr revid: xmo@openerp.com-20130403082635-9dmdi4cco3kawiib
---
 addons/web/controllers/main.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/web/controllers/main.py b/addons/web/controllers/main.py
index a199cba7854..890fa6fa466 100644
--- a/addons/web/controllers/main.py
+++ b/addons/web/controllers/main.py
@@ -1428,7 +1428,7 @@ class Action(openerpweb.Controller):
         else:
             return False
 
-class Export(View):
+class Export(openerpweb.Controller):
     _cp_path = "/web/export"
 
     @openerpweb.jsonrequest
@@ -1691,7 +1691,7 @@ class ExcelExport(Export):
         fp.close()
         return data
 
-class Reports(View):
+class Reports(openerpweb.Controller):
     _cp_path = "/web/report"
     POLLING_DELAY = 0.25
     TYPES_MAPPING = {

From bc07cab28cb1d21cbbada118423adf57cf011518 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Wed, 3 Apr 2013 11:10:25 +0200
Subject: [PATCH 012/121] [IMP] export formats have no need to inherit from the
 export controller

bzr revid: xmo@openerp.com-20130403091025-wjb23mzbmdyjnahm
---
 addons/web/controllers/main.py | 20 +++++++++++++-------
 1 file changed, 13 insertions(+), 7 deletions(-)

diff --git a/addons/web/controllers/main.py b/addons/web/controllers/main.py
index 890fa6fa466..4fdadc65c7a 100644
--- a/addons/web/controllers/main.py
+++ b/addons/web/controllers/main.py
@@ -1,11 +1,9 @@
 # -*- coding: utf-8 -*-
-
 import ast
 import base64
 import csv
 import glob
 import itertools
-import logging
 import operator
 import datetime
 import hashlib
@@ -30,7 +28,6 @@ except ImportError:
     xlwt = None
 
 import openerp
-import openerp.modules.registry
 from openerp.tools.translate import _
 
 from .. import http
@@ -1428,6 +1425,7 @@ class Action(openerpweb.Controller):
         else:
             return False
 
+
 class Export(openerpweb.Controller):
     _cp_path = "/web/export"
 
@@ -1569,7 +1567,13 @@ class Export(openerpweb.Controller):
             (prefix + '/' + k, prefix_string + '/' + v)
             for k, v in self.fields_info(req, model, export_fields).iteritems())
 
-    #noinspection PyPropertyDefinition
+
+class ExportFormat(object):
+    """
+    Superclass for export formats, should probably be an abc and have a way to
+    generate _cp_path from fmt but it's a pain to deal with conflicts with
+    ControllerType
+    """
     @property
     def content_type(self):
         """ Provides the format's content type """
@@ -1610,14 +1614,14 @@ class Export(openerpweb.Controller):
         else:
             columns_headers = [val['label'].strip() for val in fields]
 
-
         return req.make_response(self.from_data(columns_headers, import_data),
             headers=[('Content-Disposition',
                             content_disposition(self.filename(model), req)),
                      ('Content-Type', self.content_type)],
             cookies={'fileToken': int(token)})
 
-class CSVExport(Export):
+
+class CSVExport(ExportFormat, http.Controller):
     _cp_path = '/web/export/csv'
     fmt = {'tag': 'csv', 'label': 'CSV'}
 
@@ -1652,7 +1656,8 @@ class CSVExport(Export):
         fp.close()
         return data
 
-class ExcelExport(Export):
+
+class ExcelExport(ExportFormat, http.Controller):
     _cp_path = '/web/export/xls'
     fmt = {
         'tag': 'xls',
@@ -1691,6 +1696,7 @@ class ExcelExport(Export):
         fp.close()
         return data
 
+
 class Reports(openerpweb.Controller):
     _cp_path = "/web/report"
     POLLING_DELAY = 0.25

From cfcda2b032dc555d4a5e41caecfb83ae3c17e087 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Wed, 3 Apr 2013 14:10:39 +0200
Subject: [PATCH 013/121] [IMP] reduce scope of captured logger

bzr revid: xmo@openerp.com-20130403121039-qdq6tz012uc7lgdh
---
 addons/web/tests/test_dispatch.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/web/tests/test_dispatch.py b/addons/web/tests/test_dispatch.py
index 516345bfa13..4ab3aa3f997 100644
--- a/addons/web/tests/test_dispatch.py
+++ b/addons/web/tests/test_dispatch.py
@@ -66,7 +66,7 @@ class TestHandler(logging.handlers.BufferingHandler):
 
 @contextlib.contextmanager
 def capture_logging(level=logging.DEBUG):
-    logger = logging.getLogger('openerp')
+    logger = logging.getLogger('openerp.addons.web')
     old_level = logger.level
     old_handlers = logger.handlers
 

From 0ace6833b4f98a66f4f466fa74405cb43bb06d18 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Wed, 3 Apr 2013 14:11:06 +0200
Subject: [PATCH 014/121] [IMP] don't make the diagram controller inherit from
 View, there's no point

bzr revid: xmo@openerp.com-20130403121106-55vuku5w4r0mp25n
---
 addons/web_diagram/controllers/main.py | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/addons/web_diagram/controllers/main.py b/addons/web_diagram/controllers/main.py
index c598a7e4652..2efaab7183d 100644
--- a/addons/web_diagram/controllers/main.py
+++ b/addons/web_diagram/controllers/main.py
@@ -1,9 +1,10 @@
-import openerp
+from openerp.addons.web.http import Controller, jsonrequest
 
-class DiagramView(openerp.addons.web.controllers.main.View):
+
+class Diagram(Controller):
     _cp_path = "/web_diagram/diagram"
 
-    @openerp.addons.web.http.jsonrequest
+    @jsonrequest
     def get_diagram_info(self, req, id, model, node, connector,
                          src_node, des_node, label, **kw):
 

From ebc1cb227d36f2039d44d42ed539193029303f95 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Wed, 3 Apr 2013 14:34:42 +0200
Subject: [PATCH 015/121] [IMP] make logger not propagate when captured

bzr revid: xmo@openerp.com-20130403123442-p96cj73lwtxa2sek
---
 addons/web/tests/test_dispatch.py | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/addons/web/tests/test_dispatch.py b/addons/web/tests/test_dispatch.py
index 4ab3aa3f997..ab2234e7d0d 100644
--- a/addons/web/tests/test_dispatch.py
+++ b/addons/web/tests/test_dispatch.py
@@ -69,14 +69,17 @@ def capture_logging(level=logging.DEBUG):
     logger = logging.getLogger('openerp.addons.web')
     old_level = logger.level
     old_handlers = logger.handlers
+    old_propagate = logger.propagate
 
     test_handler = TestHandler()
     logger.handlers = [test_handler]
     logger.setLevel(level)
+    logger.propagate = False
 
     try:
         yield test_handler
     finally:
+        logger.propagate = old_propagate
         logger.setLevel(old_level)
         logger.handlers = old_handlers
 

From 3df2a146cdc87410ff271b663827aa2bacfe1f65 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Wed, 3 Apr 2013 15:58:49 +0200
Subject: [PATCH 016/121] [FIX] logging capture when testing embedded in
 server, handler hooks are more complex than through oe

bzr revid: xmo@openerp.com-20130403135849-ufnn2a1hdu938p7p
---
 addons/web/tests/test_dispatch.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/addons/web/tests/test_dispatch.py b/addons/web/tests/test_dispatch.py
index ab2234e7d0d..b1304fca7f1 100644
--- a/addons/web/tests/test_dispatch.py
+++ b/addons/web/tests/test_dispatch.py
@@ -65,8 +65,8 @@ class TestHandler(logging.handlers.BufferingHandler):
         return False
 
 @contextlib.contextmanager
-def capture_logging(level=logging.DEBUG):
-    logger = logging.getLogger('openerp.addons.web')
+def capture_logging(logger, level=logging.DEBUG):
+    logger = logging.getLogger(logger)
     old_level = logger.level
     old_handlers = logger.handlers
     old_propagate = logger.propagate
@@ -257,7 +257,7 @@ class TestSubclassing(DispatchCleanup):
             def speak(self):
                 return 'Yu ordered cheezburgerz,'
 
-        with capture_logging() as handler:
+        with capture_logging('openerp.addons.web.http') as handler:
             class DogController(CatController):
                 _cp_path = '/dog'
 

From 77595a843e774a19d879a8f770444f1901c46d27 Mon Sep 17 00:00:00 2001
From: Vidhin Mehta <vme@tinyerp.com>
Date: Fri, 5 Apr 2013 14:22:24 +0530
Subject: [PATCH 017/121] [IMP]Improvements in Manage View.

bzr revid: vme@tinyerp.com-20130405085224-yecygjxi39nd60h0
---
 .../static/src/js/view_editor.js              | 22 +++++++++++++------
 1 file changed, 15 insertions(+), 7 deletions(-)

diff --git a/addons/web_view_editor/static/src/js/view_editor.js b/addons/web_view_editor/static/src/js/view_editor.js
index 48b76e02904..524c415d34a 100644
--- a/addons/web_view_editor/static/src/js/view_editor.js
+++ b/addons/web_view_editor/static/src/js/view_editor.js
@@ -15,7 +15,7 @@ instance.web.ViewManagerAction.include({
                 }
                 evt.currentTarget.selectedIndex = 0;
         }else{
-            return this._super.apply(this,arguments); 
+            return this._super.apply(this,arguments);
         }
     }
 });
@@ -232,10 +232,11 @@ instance.web_view_editor.ViewEditor =   instance.web.Widget.extend({
         return main_object;
     },
     parse_xml: function(arch, view_id) {
+        //First element of att_list must be element tagname.
         main_object = {
             'level': 0,
             'id': this.xml_element_id +=1,
-            'att_list': [],
+            'att_list': ["view"],
             'name': _.str.sprintf("<view view_id = %s>", view_id),
             'child_id': []
         };
@@ -535,15 +536,22 @@ instance.web_view_editor.ViewEditor =   instance.web.Widget.extend({
         var field_dataset = new instance.web.DataSetSearch(this, this.model, null, null);
         parent_tr = self.get_object_by_id(parseInt($(parent_tr).attr('id').replace(/[^0-9]+/g, '')), this.one_object['main_object'], [])[0].att_list[0];
         _.each([tr, parent_tr],function(element) {
-            var value = _.has(_CHILDREN, element) ? element : _.str.include(html_tag, element)?"html_tag":false; 
+            var value = _.has(_CHILDREN, element) ? element : _.str.include(html_tag, element)?"html_tag":false;
             property_to_check.push(value);
         });
         field_dataset.call( 'fields_get', []).done(function(result) {
             var fields = _.keys(result);
             fields.push(" "),fields.sort();
-            self.on_add_node(property_to_check, fields);
+            self.on_add_node(property_to_check, fields, self.inject_position(parent_tr,tr));
         });
     },
+    inject_position : function(parent_tag,current_tag){
+        if(parent_tag == "view")
+            return ['Inside'];
+        if(current_tag == "field")
+            return ['After','Before'];
+        return ['After','Before','Inside'];
+    },
     do_node_edit: function(side) {
         var self = this;
         var result = self.get_object_by_id(this.one_object.clicked_tr_id, this.one_object['main_object'], []);
@@ -941,11 +949,11 @@ instance.web_view_editor.ViewEditor =   instance.web.Widget.extend({
             });
         return def.promise();
     },
-    on_add_node: function(properties, fields){
+    on_add_node: function(properties, fields, position){
         var self = this;
         var  render_list = [{'name': 'node_type','selection': _.keys(_CHILDREN).sort(), 'value': 'field', 'string': 'Node Type','type': 'selection'},
                             {'name': 'field_value','selection': fields, 'value': false, 'string': '','type': 'selection'},
-                            {'name': 'position','selection': ['After','Before','Inside'], 'value': false, 'string': 'Position','type': 'selection'}];
+                            {'name': 'position','selection': position, 'value': false, 'string': 'Position','type': 'selection'}];
         this.add_widget = [];
         this.add_node_dialog = new instance.web.Dialog(this,{
             title: _t("Properties"),
@@ -1186,7 +1194,7 @@ var _CHILDREN = {
 //e.g.:xyz 'td' : ['field']
 };
 // Generic html_tag list and can be added html tag in future. It's support above _CHILDREN dict's *html_tag* by default.
-// For specific child node one has to define tag above and specify children tag in list. Like above xyz example. 
+// For specific child node one has to define tag above and specify children tag in list. Like above xyz example.
 var html_tag = ['div','h1','h2','h3','h4','h5','h6','td','tr'];
 
 var _ICONS = ['','STOCK_ABOUT', 'STOCK_ADD', 'STOCK_APPLY', 'STOCK_BOLD',

From ad1650854eead5af703d535cb03d5bdf56088cde Mon Sep 17 00:00:00 2001
From: Olivier Dony <odo@openerp.com>
Date: Sun, 7 Apr 2013 23:23:33 +0200
Subject: [PATCH 018/121] [FIX] account: recursively find proper partner to
 link to journal items, as discussed in bugs 1160365 and 1151947

lp bug: https://launchpad.net/bugs/1160365 fixed
lp bug: https://launchpad.net/bugs/1151947 fixed

bzr revid: odo@openerp.com-20130407212333-34jahthhppcz2wju
---
 addons/account/account_invoice.py | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/addons/account/account_invoice.py b/addons/account/account_invoice.py
index eb362455cd9..4611e0ab240 100644
--- a/addons/account/account_invoice.py
+++ b/addons/account/account_invoice.py
@@ -1260,9 +1260,7 @@ class account_invoice(osv.osv):
             ref = invoice.reference
         else:
             ref = self._convert_ref(cr, uid, invoice.number)
-        partner = invoice.partner_id
-        if partner.parent_id and not partner.is_company:
-            partner = partner.parent_id
+        partner = self.pool['res.partner']._find_accounting_partner(invoice.partner_id)
         # Pay attention to the sign for both debit/credit AND amount_currency
         l1 = {
             'debit': direction * pay_amount>0 and direction * pay_amount,
@@ -1733,15 +1731,17 @@ class res_partner(osv.osv):
         'invoice_ids': fields.one2many('account.invoice.line', 'partner_id', 'Invoices', readonly=True),
     }
 
-    def _find_accounting_partner(self, part):
+    def _find_accounting_partner(self, partner):
         '''
         Find the partner for which the accounting entries will be created
         '''
+        # FIXME: after 7.0, to replace by function field partner.commercial_id
+
         #if the chosen partner is not a company and has a parent company, use the parent for the journal entries
         #because you want to invoice 'Agrolait, accounting department' but the journal items are for 'Agrolait'
-        if part.parent_id and not part.is_company:
-            part = part.parent_id
-        return part
+        while not partner.is_company and partner.parent_id:
+            partner = partner.parent_id
+        return partner
 
     def copy(self, cr, uid, id, default=None, context=None):
         default = default or {}

From 438e1c1daf5bc4eb212f78b87f277fff8e8a0ceb Mon Sep 17 00:00:00 2001
From: Olivier Dony <odo@openerp.com>
Date: Mon, 8 Apr 2013 01:50:13 +0200
Subject: [PATCH 019/121] [FIX] res.partner: Hide commercial-related fields on
 contacts form + autosync them from parent company

Fixes handling of accounting/invoicing-related fields on partners
that are not "commercial entities" (either marked as "is_company"
or parentless).
The corresponding fields are also hidden from form views on these
partners and replaced by a short sentence and a link to edit the
"master fields" on the commercial entity.
This corresponds to part B of the solution described on bug 1160365.

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

bzr revid: odo@openerp.com-20130407235013-j3tv4uxy46eej43i
---
 addons/account/partner.py                 | 5 +++++
 addons/account/partner_view.xml           | 7 ++++++-
 addons/base_vat/base_vat.py               | 3 +++
 addons/l10n_be_invoice_bba/partner.py     | 5 +++++
 addons/l10n_ro/res_partner.py             | 4 ++++
 addons/product/partner.py                 | 3 +++
 addons/product/partner_view.xml           | 5 ++++-
 addons/purchase/partner.py                | 3 +++
 addons/sale_journal/sale_journal.py       | 4 ++++
 addons/sale_journal/sale_journal_view.xml | 2 +-
 10 files changed, 38 insertions(+), 3 deletions(-)

diff --git a/addons/account/partner.py b/addons/account/partner.py
index ae8d2fc1871..4914a17dd2b 100644
--- a/addons/account/partner.py
+++ b/addons/account/partner.py
@@ -236,6 +236,11 @@ class res_partner(osv.osv):
         'last_reconciliation_date': fields.datetime('Latest Full Reconciliation Date', help='Date on which the partner accounting entries were fully reconciled last time. It differs from the last date where a reconciliation has been made for this partner, as here we depict the fact that nothing more was to be reconciled at this date. This can be achieved in 2 different ways: either the last unreconciled debit/credit entry of this partner was reconciled, either the user pressed the button "Nothing more to reconcile" during the manual reconciliation process.')
     }
 
+    def _commercial_fields(self, cr, uid, context=None):
+        return super(res_partner, self)._commercial_fields(cr, uid, context=context) + \
+            ['debit_limit', 'property_account_payable', 'property_account_receivable', 'property_account_position',
+             'property_payment_term', 'property_supplier_payment_term', 'last_reconciliation_date']
+
 res_partner()
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/account/partner_view.xml b/addons/account/partner_view.xml
index 1267e20165b..abded67f6ab 100644
--- a/addons/account/partner_view.xml
+++ b/addons/account/partner_view.xml
@@ -73,7 +73,7 @@
             <field name="inherit_id" ref="base.view_partner_form"/>
             <field name="arch" type="xml">
                 <page string="History" position="before" version="7.0">
-                <page string="Accounting" col="4">
+                <page string="Accounting" col="4" name="accounting" attrs="{'invisible': [('is_company','=',False),('parent_id','!=',False)]}">
                     <group>
                         <group>
                             <field name="property_account_position" widget="selection"/>
@@ -103,6 +103,11 @@
                         </tree>
                     </field>
                 </page>
+                <page string="Accounting" name="accounting_disabled" attrs="{'invisible': ['|',('is_company','=',True),('parent_id','=',False)]}">
+                    <div>
+                        <p>Accounting-related settings are managed on <button name="open_commercial_entity" type="object" string="the parent company" class="oe_link"/></p>
+                    </div>
+                </page>
                 </page>
             </field>
         </record>
diff --git a/addons/base_vat/base_vat.py b/addons/base_vat/base_vat.py
index 616333e3b47..3366101c7c7 100644
--- a/addons/base_vat/base_vat.py
+++ b/addons/base_vat/base_vat.py
@@ -134,6 +134,9 @@ class res_partner(osv.osv):
         'vat_subjected': fields.boolean('VAT Legal Statement', help="Check this box if the partner is subjected to the VAT. It will be used for the VAT legal statement.")
     }
 
+    def _commercial_fields(self, cr, uid, context=None):
+        return super(res_partner, self)._commercial_fields(cr, uid, context=context) + ['vat_subjected']
+
     def _construct_constraint_msg(self, cr, uid, ids, context=None):
         def default_vat_check(cn, vn):
             # by default, a VAT number is valid if:
diff --git a/addons/l10n_be_invoice_bba/partner.py b/addons/l10n_be_invoice_bba/partner.py
index 9e0eec10713..df68268bf43 100644
--- a/addons/l10n_be_invoice_bba/partner.py
+++ b/addons/l10n_be_invoice_bba/partner.py
@@ -44,6 +44,11 @@ class res_partner(osv.osv):
             help='Select Algorithm to generate the Structured Communication on Outgoing Invoices.' ),
     }
 
+    def _commercial_fields(self, cr, uid, context=None):
+        return super(res_partner, self)._commercial_fields(cr, uid, context=context) + \
+            ['out_inv_comm_type', 'out_inv_comm_algorithm']
+
+
     _default = {
         'out_inv_comm_type': 'none',
     }
diff --git a/addons/l10n_ro/res_partner.py b/addons/l10n_ro/res_partner.py
index 1cfe7390a77..95867f8e883 100755
--- a/addons/l10n_ro/res_partner.py
+++ b/addons/l10n_ro/res_partner.py
@@ -32,6 +32,10 @@ class res_partner(osv.osv):
        ('vat_uniq', 'unique (vat)', 'The vat of the partner must be unique !'),
        ('nrc_uniq', 'unique (nrc)', 'The code of the partner must be unique !')
     ]
+
+    def _commercial_fields(self, cr, uid, context=None):
+        return super(res_partner, self)._commercial_fields(cr, uid, context=context) + ['nrc']
+
 res_partner()
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/product/partner.py b/addons/product/partner.py
index 1d11e909346..4a291a8ddd3 100644
--- a/addons/product/partner.py
+++ b/addons/product/partner.py
@@ -36,6 +36,9 @@ class res_partner(osv.osv):
             help="This pricelist will be used, instead of the default one, for sales to the current partner"),
     }
 
+    def _commercial_fields(self, cr, uid, context=None):
+        return super(res_partner, self)._commercial_fields(cr, uid, context=context) + ['property_product_pricelist']
+
 res_partner()
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/product/partner_view.xml b/addons/product/partner_view.xml
index acb087533ac..5117da6044e 100644
--- a/addons/product/partner_view.xml
+++ b/addons/product/partner_view.xml
@@ -8,9 +8,12 @@
             <field name="arch" type="xml">
                 <page string="Sales &amp; Purchases" position="inside">
                     <group>
-                        <group name="pricelists" groups="product.group_sale_pricelist">
+                        <group name="pricelists" groups="product.group_sale_pricelist" attrs="{'invisible': [('is_company','=',False),('parent_id','!=',False)]}">
                             <field name="property_product_pricelist"/>
                         </group>
+                        <div name="parent_pricelists" groups="product.group_sale_pricelist" attrs="{'invisible': ['|',('is_company','=',True),('parent_id','=',False)]}">
+                            <p>Pricelists are managed on <button name="open_commercial_entity" type="object" string="the parent company" class="oe_link"/></p>
+                        </div>
                     </group>
                 </page>
             </field>
diff --git a/addons/purchase/partner.py b/addons/purchase/partner.py
index 56eaf288fe6..e05f6b9c9c6 100644
--- a/addons/purchase/partner.py
+++ b/addons/purchase/partner.py
@@ -43,6 +43,9 @@ class res_partner(osv.osv):
 
         super(res_partner, self).copy(cr, uid, id, default=default, context=context)
 
+    def _commercial_fields(self, cr, uid, context=None):
+        return super(res_partner, self)._commercial_fields(cr, uid, context=context) + ['property_product_pricelist_purchase']
+
     _columns = {
         'property_product_pricelist_purchase': fields.property(
           'product.pricelist',
diff --git a/addons/sale_journal/sale_journal.py b/addons/sale_journal/sale_journal.py
index 8463ab3f3bd..cb33d7e2334 100644
--- a/addons/sale_journal/sale_journal.py
+++ b/addons/sale_journal/sale_journal.py
@@ -52,6 +52,10 @@ class res_partner(osv.osv):
             group_name = "Accounting Properties",
             help = "This invoicing type will be used, by default, to invoice the current partner."),
     }
+
+    def _commercial_fields(self, cr, uid, context=None):
+        return super(res_partner, self)._commercial_fields(cr, uid, context=context) + ['property_invoice_type']
+
 res_partner()
 
 class picking(osv.osv):
diff --git a/addons/sale_journal/sale_journal_view.xml b/addons/sale_journal/sale_journal_view.xml
index bcd83b5be84..9d41103252e 100644
--- a/addons/sale_journal/sale_journal_view.xml
+++ b/addons/sale_journal/sale_journal_view.xml
@@ -146,7 +146,7 @@
             <field name="inherit_id" ref="base.view_partner_form"/>
             <field name="arch" type="xml">
                 <page string="Sales &amp; Purchases" position="inside">
-                    <group colspan="2" col="2">
+                    <group colspan="2" col="2" attrs="{'invisible': [('is_company','=',False),('parent_id','!=',False)]}">
                         <separator string="Invoicing" colspan="2"/>
                         <field name="property_invoice_type"/>
                     </group>

From dcac505a5b83888d847c65b3ec3443aa47271e4f Mon Sep 17 00:00:00 2001
From: Olivier Dony <odo@openerp.com>
Date: Mon, 8 Apr 2013 01:51:15 +0200
Subject: [PATCH 020/121] [FIX] sale: remove useless code to select commercial
 entity, now handled by res.partner.address_get directly

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

bzr revid: odo@openerp.com-20130407235115-4kovy1jngblrdd5z
---
 addons/sale/sale.py | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/addons/sale/sale.py b/addons/sale/sale.py
index a6be2838171..a52efc12467 100644
--- a/addons/sale/sale.py
+++ b/addons/sale/sale.py
@@ -314,10 +314,6 @@ class sale_order(osv.osv):
             return {'value': {'partner_invoice_id': False, 'partner_shipping_id': False,  'payment_term': False, 'fiscal_position': False}}
 
         part = self.pool.get('res.partner').browse(cr, uid, part, context=context)
-        #if the chosen partner is not a company and has a parent company, use the parent to choose the delivery, the 
-        #invoicing addresses and all the fields related to the partner.
-        if part.parent_id and not part.is_company:
-            part = part.parent_id
         addr = self.pool.get('res.partner').address_get(cr, uid, [part.id], ['delivery', 'invoice', 'contact'])
         pricelist = part.property_product_pricelist and part.property_product_pricelist.id or False
         payment_term = part.property_payment_term and part.property_payment_term.id or False

From 347c784dabb42f907abc33a2b40de082b815d3f8 Mon Sep 17 00:00:00 2001
From: Olivier Dony <odo@openerp.com>
Date: Mon, 8 Apr 2013 01:56:40 +0200
Subject: [PATCH 021/121] [FIX] account: include contacts matches when
 searching for company invoices

This implements part E of the solution described on bug 1160365

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

bzr revid: odo@openerp.com-20130407235640-cg02qh4ittc743zw
---
 addons/account/account_invoice_view.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/account/account_invoice_view.xml b/addons/account/account_invoice_view.xml
index 8c7cec67ac5..1fbdbf26453 100644
--- a/addons/account/account_invoice_view.xml
+++ b/addons/account/account_invoice_view.xml
@@ -447,14 +447,14 @@
             <field name="model">account.invoice</field>
             <field name="arch" type="xml">
                 <search string="Search Invoice">
-                    <field name="number" string="Invoice" filter_domain="['|','|','|', ('number','ilike',self), ('origin','ilike',self), ('supplier_invoice_number', 'ilike', self), ('partner_id', 'ilike', self)]"/>
+                    <field name="number" string="Invoice" filter_domain="['|','|','|', ('number','ilike',self), ('origin','ilike',self), ('supplier_invoice_number', 'ilike', self), ('partner_id', 'child_of', self)]"/>
                     <filter name="draft" string="Draft" domain="[('state','=','draft')]" help="Draft Invoices"/>
                     <filter name="proforma" string="Proforma" domain="[('state','=','proforma2')]" help="Proforma Invoices" groups="account.group_proforma_invoices"/>
                     <filter name="invoices" string="Invoices" domain="[('state','not in',['draft','cancel'])]" help="Proforma/Open/Paid Invoices"/>
                     <filter name="unpaid" string="Unpaid" domain="[('state','=','open')]" help="Unpaid Invoices"/>
                     <separator/>
                     <filter domain="[('user_id','=',uid)]" help="My Invoices" icon="terp-personal"/>
-                    <field name="partner_id"/>
+                    <field name="partner_id" filter_domain="[('partner_id', 'child_of', self)]"/>
                     <field name="user_id" string="Salesperson"/>
                     <field name="period_id" string="Period"/>
                     <group expand="0" string="Group By...">

From e4f04efdd6ffb3e599bde28bd87b6ebc8f963400 Mon Sep 17 00:00:00 2001
From: Olivier Dony <odo@openerp.com>
Date: Mon, 8 Apr 2013 02:01:24 +0200
Subject: [PATCH 022/121] [FIX] account.invoice: only allow selecting partners
 that are `commercial entities`

Following-up to the discussion on bug 1160365, this will help users
make the right choice when manualling creating invoices.

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

bzr revid: odo@openerp.com-20130408000124-wcmjco9561hc9fbl
---
 addons/account/account_invoice_view.xml | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/addons/account/account_invoice_view.xml b/addons/account/account_invoice_view.xml
index 1fbdbf26453..59c78c98e54 100644
--- a/addons/account/account_invoice_view.xml
+++ b/addons/account/account_invoice_view.xml
@@ -166,7 +166,7 @@
                             <field string="Supplier" name="partner_id"
                               on_change="onchange_partner_id(type,partner_id,date_invoice,payment_term, partner_bank_id,company_id)"
                               context="{'default_customer': 0, 'search_default_supplier': 1, 'default_supplier': 1}"
-                              domain="[('supplier', '=', True)]"/>
+                              domain="[('supplier', '=', True),'|',('parent_id','=',False),('is_company','=',True)]"/>
                             <field name="fiscal_position" widget="selection"/>
                             <field name="origin"/>
                             <field name="supplier_invoice_number"/>
@@ -320,7 +320,8 @@
                             <field string="Customer" name="partner_id"
                                 on_change="onchange_partner_id(type,partner_id,date_invoice,payment_term, partner_bank_id,company_id)"
                                 groups="base.group_user" context="{'search_default_customer':1, 'show_address': 1}"
-                                options='{"always_reload": True}'/>
+                                options='{"always_reload": True}'
+                                domain="[('customer', '=', True),'|',('parent_id','=',False),('is_company','=',True)]"/>
                             <field name="fiscal_position" widget="selection" />
                         </group>
                         <group>

From ed62e366918ace0988c9edfc2594f9e31650b590 Mon Sep 17 00:00:00 2001
From: Olivier Dony <odo@openerp.com>
Date: Mon, 8 Apr 2013 02:55:26 +0200
Subject: [PATCH 023/121] [FIX] account_voucher,sale,purchase: include contacts
 matches when searching for company documents

This implements part E of the solution described on bug 1160365

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

bzr revid: odo@openerp.com-20130408005526-7124r7u39yhh9la3
---
 addons/account_voucher/account_voucher_view.xml | 2 +-
 addons/purchase/purchase_view.xml               | 6 +++---
 addons/sale/sale_view.xml                       | 6 +++---
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/addons/account_voucher/account_voucher_view.xml b/addons/account_voucher/account_voucher_view.xml
index f429480f656..4674d62b6a0 100644
--- a/addons/account_voucher/account_voucher_view.xml
+++ b/addons/account_voucher/account_voucher_view.xml
@@ -129,7 +129,7 @@
                     <filter icon="terp-camera_test" string="Posted" domain="[('state','=','posted')]" help="Posted Vouchers"/>
                     <separator/>
                     <filter icon="terp-gtk-jump-to-ltr" string="To Review" domain="[('state','=','posted'), ('audit','=',False)]" help="To Review"/>
-                    <field name="partner_id"/>
+                    <field name="partner_id" filter_domain="[('partner_id', 'child_of', self)]"/>
                     <field name="journal_id" context="{'journal_id': self, 'set_visible':False}" />
                     <field name="period_id"/>
                     <group expand="0" string="Group By...">
diff --git a/addons/purchase/purchase_view.xml b/addons/purchase/purchase_view.xml
index 63735b090dd..b497599f848 100644
--- a/addons/purchase/purchase_view.xml
+++ b/addons/purchase/purchase_view.xml
@@ -270,7 +270,7 @@
                     <filter icon="terp-emblem-important" name="exception" string="Exception" domain="[('state','in',('except_invoice','except_picking'))]" help="Purchase order which are in the exception state"/>
                     <separator/>
                     <filter icon="terp-gtk-go-back-rtl" name="not_invoiced" string="Not Invoiced" domain="[('invoice_ids','=', False)]" help="Purchase orders that include lines not invoiced."/>
-                    <field name="partner_id"/>
+                    <field name="partner_id" filter_domain="[('partner_id', 'child_of', self)]"/>
                     <field name="product_id"/>
                     <field name="create_uid"/>
                     <group expand="0" string="Group By...">
@@ -297,7 +297,7 @@
                     <filter icon="terp-emblem-important" name="exception" string="Exception" domain="[('state','in',('except_invoice','except_picking'))]" help="Purchase orders which are in exception state"/>
                     <separator/>
                     <filter icon="terp-gtk-go-back-rtl" name="not_invoiced" string="Not Invoiced" domain="[('invoice_ids','=', False)]" help="Purchase orders that include lines not invoiced."/>
-                    <field name="partner_id"/>
+                    <field name="partner_id" filter_domain="[('partner_id', 'child_of', self)]"/>
                     <field name="product_id"/>
                     <field name="create_uid"/>
                     <group expand="0" string="Group By...">
@@ -481,7 +481,7 @@
                 <search string="Search Purchase Order">
                     <field name="order_id"/>
                     <field name="product_id"/>
-                    <field name="partner_id" string="Supplier"/>
+                    <field name="partner_id" string="Supplier" filter_domain="[('partner_id', 'child_of', self)]"/>
                     <group expand="0" string="Group By...">
                         <filter string="Supplier" icon="terp-partner" domain="[]" context="{'group_by' : 'partner_id'}" />
                         <filter string="Product" icon="terp-accessories-archiver" domain="[]" context="{'group_by' : 'product_id'}" />
diff --git a/addons/sale/sale_view.xml b/addons/sale/sale_view.xml
index a6cc7df1f12..8a0c6c9e6a4 100644
--- a/addons/sale/sale_view.xml
+++ b/addons/sale/sale_view.xml
@@ -308,7 +308,7 @@
                     <filter icon="terp-dolar_ok!" string="Done" domain="[('state','=','done')]" help="Sales Order done"/>
                     <separator/>
                     <filter string="My Sales Orders" domain="[('user_id','=',uid)]" help="My Sales Orders" icon="terp-personal" name="my_sale_orders_filter"/>
-                    <field name="partner_id"/>
+                    <field name="partner_id" filter_domain="[('partner_id', 'child_of', self)]"/>
                     <field name="user_id"/>
                     <field name="project_id"/>
                     <group expand="0" string="Group By...">
@@ -472,7 +472,7 @@
                     <separator/>
                     <filter string="My Sales Order Lines" icon="terp-personnal" domain="[('salesman_id','=',uid)]" help="Sales Order Lines related to a Sales Order of mine"/>
                     <field name="order_id"/>
-                    <field name="order_partner_id"/>
+                    <field name="order_partner_id" filter_domain="[('order_partner_id', 'child_of', self)]"/>
                     <field name="product_id"/>
                     <field name="salesman_id"/>
                     <group expand="0" string="Group By...">
@@ -498,7 +498,7 @@
                     <separator/>
                     <filter string="My Sales Order Lines" icon="terp-personal" domain="[('salesman_id','=',uid)]" help="My Sales Order Lines"/>
                     <field name="order_id"/>
-                    <field name="order_partner_id"/>
+                    <field name="order_partner_id" filter_domain="[('order_partner_id', 'child_of', self)]"/>
                     <field name="product_id"/>
                     <field name="salesman_id"/>
                     <group expand="0" string="Group By...">

From 2bf1034cd2fca0115bc38a6c75a6d213a833c6a3 Mon Sep 17 00:00:00 2001
From: Olivier Dony <odo@openerp.com>
Date: Mon, 8 Apr 2013 03:37:42 +0200
Subject: [PATCH 024/121] [FIX] res.partner: autosync of commercial fields and
 address fields + correct views accordingly + basic tests

* Commercial fields (bug 1160365)

Fix autosync of accounting/invoicing-related fields on contacts,
just as if they were actually modeled as fields.related to the
parent commercial entity.
This starts with the addition of the new functional field
`commercial_id`, to locate the commercial entity for any partner.
The commercial entity is defined as the first ancestor (starting
at the partner itself) that is either marked `is_company` or has
no parent. [This is Part A of the solution on bug 1160365].

Then, whenever a partner is created or modified:
- if it is a commercial entity, the commercial fields are synced
downstream to all its descendants, stopping at company boundaries.
- if is is not a commercial entity, the commercial fields are
synced from its parent commercial entity.
The list of fields to sync is determined by calling the new
res.partner method `_commercial_fields()` which can be easily
extended by any module that adds commercial fields on res.partner.
A utility method `open_commercial_entity()` was added to
res.partner to make it easy to include a button for editing the
parent commercial entity, to be displayed instead of now-hidden
commercial fields.
[This is part B of the solution on bug 1160365]

The res.partner.address_get() method (used to find child partners
of certain types, e.g. "invoice") was udpated to take the new
"commercial entity" notion into account: it will now look for
matches in children but also parents and siblings that are part
of the same "commercial entity". The default partner `type` is
now "contact" to reflect the new model ; "default" is
inappropriate because it is a wildcard and would stop the type
lookup early.
[This composes parts C and D of the solution on bug 1160365]

Note: This fix comes with a matching addons fix to implement
module-specific extensions of part B, as well as part E of the
solution.


* Address fields (bug 1160425)

Corrected autosync of address fields is also included in the
same branch, because those two mechanisms are closely related
and share some parts of the implementation.

The `use_parent_address` field now defaults to False (except
in the mini-kanban view of contacts on a partner form), and
the autosync of address fields has been modified to only work
downstream and never update a parent company if a child contact
is modified. Instead, the address fields are now displayed
readonly on contacts that use the parent address, with a button
to edit the parent address (new method open_parent(), similar
to open_commercial_entity() but opening the direct parent).

To make the initial creation of a contact + company pair,
a special case was added: when a new contact is created for
a company that has no other contact and no address, the
address of the contact is assumed to be that of the company
so it is moved to the company, then the `use_parent_address`
flag is enabled on the contact, and the `is_company` flag on
the company. This covers a use case where contact and
company are created on-the-fly when creating a new document.

Many logical flaws in the autosync of address fields have been
corrected and are now covered by unit tests.


* Misc related fixes

- checking `is_company` does not reset the parent_id field
anymore, to allow for multi-level structures. The field is
still hidden automatically because having an empty "Company"
field on the form view of a company is quite suprising), but
this UI behavior is easily customized;
- the `email`, `phone`, `fax`, `mobile`, `lang`, etc. that
were sometimes synced when changing parent company are now
properly left alone;
- the `use_parent_address` field is now always visible next
to the parent_id field when a parent is set

lp bug: https://launchpad.net/bugs/1160425 fixed
lp bug: https://launchpad.net/bugs/1160365 fixed

bzr revid: odo@openerp.com-20130408013742-tm8w0w0nmunanokk
---
 openerp/addons/base/res/res_partner.py       | 250 ++++++++++++++-----
 openerp/addons/base/res/res_partner_view.xml |  27 +-
 openerp/addons/base/tests/test_base.py       | 206 +++++++++++++++
 3 files changed, 403 insertions(+), 80 deletions(-)

diff --git a/openerp/addons/base/res/res_partner.py b/openerp/addons/base/res/res_partner.py
index 72c221c5534..1193abcd862 100644
--- a/openerp/addons/base/res/res_partner.py
+++ b/openerp/addons/base/res/res_partner.py
@@ -30,6 +30,7 @@ from openerp import SUPERUSER_ID
 from openerp import pooler, tools
 from openerp.osv import osv, fields
 from openerp.tools.translate import _
+from openerp.tools.yaml_import import is_comment
 
 class format_address(object):
     def fields_view_get_address(self, cr, uid, arch, context={}):
@@ -159,8 +160,9 @@ def _lang_get(self, cr, uid, context=None):
     res = lang_pool.read(cr, uid, ids, ['code', 'name'], context)
     return [(r['code'], r['name']) for r in res]
 
-POSTAL_ADDRESS_FIELDS = ('street', 'street2', 'zip', 'city', 'state_id', 'country_id')
-ADDRESS_FIELDS = POSTAL_ADDRESS_FIELDS + ('email', 'phone', 'fax', 'mobile', 'website', 'ref', 'lang')
+# fields copy if 'use_parent_address' is checked
+ADDRESS_FIELDS = ('street', 'street2', 'zip', 'city', 'state_id', 'country_id', 'type')
+POSTAL_ADDRESS_FIELDS = ADDRESS_FIELDS # deprecated, to remove after 7.0
 
 class res_partner(osv.osv, format_address):
     _description = 'Partner'
@@ -193,6 +195,18 @@ class res_partner(osv.osv, format_address):
             result[obj.id] = obj.image != False
         return result
 
+    def _commercial_id_compute(self, cr, uid, ids, name, args, context=None):
+        """ Returns the partner that is considered the commercial
+        entity of this partner. The commercial entity holds the master data
+        for all commercial fields (see :py:meth:`~_commercial_fields`) """
+        result = dict.fromkeys(ids, False)
+        for partner in self.browse(cr, uid, ids, context=context):
+            current_partner = partner 
+            while not current_partner.is_company and current_partner.parent_id:
+                current_partner = current_partner.parent_id
+            result[partner.id] = current_partner.id
+        return result
+
     _order = "name"
     _columns = {
         'name': fields.char('Name', size=128, required=True, select=True),
@@ -264,6 +278,9 @@ class res_partner(osv.osv, format_address):
         'color': fields.integer('Color Index'),
         'user_ids': fields.one2many('res.users', 'partner_id', 'Users'),
         'contact_address': fields.function(_address_display,  type='char', string='Complete Address'),
+
+        # technical field used for managing commercial fields
+        'commercial_id': fields.function(_commercial_id_compute, type='many2one', relation='res.partner', string='Commercial Entity')
     }
 
     def _default_category(self, cr, uid, context=None):
@@ -302,8 +319,8 @@ class res_partner(osv.osv, format_address):
         'company_id': lambda self, cr, uid, ctx: self.pool.get('res.company')._company_default_get(cr, uid, 'res.partner', context=ctx),
         'color': 0,
         'is_company': False,
-        'type': 'default',
-        'use_parent_address': True,
+        'type': 'contact', # type 'default' is wildcard and thus inappropriate
+        'use_parent_address': False,
         'image': False,
     }
 
@@ -318,7 +335,6 @@ class res_partner(osv.osv, format_address):
         value = {}
         value['title'] = False
         if is_company:
-            value['parent_id'] = False
             domain = {'title': [('domain', '=', 'partner')]}
         else:
             domain = {'title': [('domain', '=', 'contact')]}
@@ -329,10 +345,11 @@ class res_partner(osv.osv, format_address):
             """ return val or val.id if val is a browse record """
             return val if isinstance(val, (bool, int, long, float, basestring)) else val.id
 
-        if use_parent_address and parent_id:
+        if parent_id:
             parent = self.browse(cr, uid, parent_id, context=context)
-            return {'value': dict((key, value_or_id(parent[key])) for key in ADDRESS_FIELDS)}
-        return {}
+            address_fields = self._address_fields(cr, uid, context=context)
+            return {'value': dict((key, value_or_id(parent[key])) for key in address_fields)}
+        return {'value': {'use_parent_address': False}}
 
     def onchange_state(self, cr, uid, ids, state_id, context=None):
         if state_id:
@@ -358,56 +375,134 @@ class res_partner(osv.osv, format_address):
 
 #   _constraints = [(_check_ean_key, 'Error: Invalid ean code', ['ean13'])]
 
-    def write(self, cr, uid, ids, vals, context=None):
-        # Update parent and siblings or children records
-        if isinstance(ids, (int, long)):
-            ids = [ids]
-        if vals.get('is_company')==False:
-            vals.update({'child_ids' : [(5,)]})
-        for partner in self.browse(cr, uid, ids, context=context):
-            update_ids = []
-            if partner.is_company:
-                domain_children = [('parent_id', '=', partner.id), ('use_parent_address', '=', True)]
-                update_ids = self.search(cr, uid, domain_children, context=context)
-            elif partner.parent_id:
-                 if vals.get('use_parent_address')==True:
-                     domain_siblings = [('parent_id', '=', partner.parent_id.id), ('use_parent_address', '=', True)]
-                     update_ids = [partner.parent_id.id] + self.search(cr, uid, domain_siblings, context=context)
-                 if 'use_parent_address' not in vals and  partner.use_parent_address:
-                    domain_siblings = [('parent_id', '=', partner.parent_id.id), ('use_parent_address', '=', True)]
-                    update_ids = [partner.parent_id.id] + self.search(cr, uid, domain_siblings, context=context)
-            self.update_address(cr, uid, update_ids, vals, context)
-        return super(res_partner,self).write(cr, uid, ids, vals, context=context)
-
-    def create(self, cr, uid, vals, context=None):
-        if context is None:
-            context = {}
-        # Update parent and siblings records
-        if vals.get('parent_id'):
-            if 'use_parent_address' in vals:
-                use_parent_address = vals['use_parent_address']
+    def _update_fields_values(self, cr, uid, partner, fields, context=None):
+        """ Returns dict of write() values for synchronizing ``fields`` """
+        values = {}
+        for field in fields:
+            column = self._all_columns[field].column
+            if column._type == 'one2many':
+                raise AssertionError('One2Many fields cannot be synchronized as part of `commercial_fields` or `address fields`')
+            if column._type == 'many2one':
+                values[field] = partner[field].id if partner[field] else False
+            elif column._type == 'many2many':
+                values[field] = [(6,0,[r.id for r in partner[field] or []])]
             else:
-                use_parent_address = self.default_get(cr, uid, ['use_parent_address'], context=context)['use_parent_address']
+                values[field] = partner[field]
+        return values
 
-            if use_parent_address:
-                domain_siblings = [('parent_id', '=', vals['parent_id']), ('use_parent_address', '=', True)]
-                update_ids = [vals['parent_id']] + self.search(cr, uid, domain_siblings, context=context)
-                self.update_address(cr, uid, update_ids, vals, context)
-
-                # add missing address keys
-                onchange_values = self.onchange_address(cr, uid, [], use_parent_address,
-                                                        vals['parent_id'], context=context).get('value') or {}
-                vals.update(dict((key, value)
-                            for key, value in onchange_values.iteritems()
-                            if key in ADDRESS_FIELDS and key not in vals))
-
-        return super(res_partner, self).create(cr, uid, vals, context=context)
+    def _address_fields(self, cr, uid, context=None):
+        """ Returns the list of address fields that are synced from the parent
+        when the `use_parent_address` flag is set. """
+        return ADDRESS_FIELDS
 
     def update_address(self, cr, uid, ids, vals, context=None):
-        addr_vals = dict((key, vals[key]) for key in POSTAL_ADDRESS_FIELDS if key in vals)
+        address_fields = self._address_fields(cr, uid, context=context)
+        addr_vals = dict((key, vals[key]) for key in address_fields if key in vals)
         if addr_vals:
             return super(res_partner, self).write(cr, uid, ids, addr_vals, context)
 
+    def _commercial_fields(self, cr, uid, context=None):
+        """ Returns the list of fields that are managed by the commercial entity
+        to which a partner belongs. These fields are meant to be hidden on
+        partners that aren't `commercial entities` themselves, and will be
+        delegated to the parent `commercial entity`. The list is meant to be
+        extended by inheriting classes. """
+        return ['vat']
+
+    def _commercial_sync_from_company(self, cr, uid, partner, context=None):
+        """ Handle sync of commercial fields when a new parent commercial entity is set,
+        as if they were related fields """
+        if partner.commercial_id != partner:
+            commercial_fields = self._commercial_fields(cr, uid, context=context)
+            sync_vals = self._update_fields_values(cr, uid, partner.commercial_id,
+                                                        commercial_fields, context=context)
+            return self.write(cr, uid, partner.id, sync_vals, context=context)
+
+    def _commercial_sync_to_children(self, cr, uid, partner, context=None):
+        """ Handle sync of commercial fields to descendants """
+        commercial_fields = self._commercial_fields(cr, uid, context=context)
+        sync_vals = self._update_fields_values(cr, uid, partner.commercial_id,
+                                                   commercial_fields, context=context)
+        sync_children = [c for c in partner.child_ids if not c.is_company]
+        for child in sync_children:
+            self._commercial_sync_to_children(cr, uid, child, context=context)
+        return self.write(cr, uid, [c.id for c in sync_children], sync_vals, context=context)
+
+    def _fields_sync(self, cr, uid, partner, update_values, context=None):
+        """ Sync commercial fields and address fields from company and to children after create/update,
+        just as if those were all modeled as fields.related to the parent """
+        # 1. From UPSTREAM: sync from parent
+        if update_values.get('parent_id') or update_values.get('use_company_address'):
+            # 1a. Commercial fields: sync if parent changed
+            if update_values.get('parent_id'):
+                self._commercial_sync_from_company(cr, uid, partner, context=context)
+            # 1b. Address fields: sync if parent or use_parent changed *and* both are now set 
+            if partner.parent_id and partner.use_parent_address:
+                onchange_vals = self.onchange_address(cr, uid, [partner.id],
+                                                      use_parent_address=partner.use_parent_address,
+                                                      parent_id=partner.parent_id.id,
+                                                      context=context).get('value', {})
+                self.update_address(cr, uid, partner.id, onchange_vals, context=context)
+
+        # 2. To DOWNSTREAM: sync children 
+        if partner.child_ids:
+            # 2a. Commercial Fields: sync if commercial entity
+            if partner.commercial_id == partner:
+                self._commercial_sync_to_children(cr, uid, partner, context=context)
+            # 2b. Address fields: sync if address changed
+            address_fields = self._address_fields(cr, uid, context=context)
+            if any(field in update_values for field in address_fields):
+                domain_children = [('parent_id', '=', partner.id), ('use_parent_address', '=', True)]
+                update_ids = self.search(cr, uid, domain_children, context=context)
+                self.update_address(cr, uid, update_ids, update_values, context=context)
+
+    def _handle_first_contact_creation(self, cr, uid, partner, context=None):
+        """ On creation of first contact for a company (or root) that has no address, assume contact address
+        was meant to be company address """
+        parent = partner.parent_id
+        address_data_fields = list(set(self._address_fields(cr, uid, context=context)).difference(['type']))
+        if parent and (parent.is_company or not parent.parent_id) and len(parent.child_ids) == 1 and \
+            any(partner[f] for f in address_data_fields) and not any(parent[f] for f in address_data_fields):
+            addr_vals = self._update_fields_values(cr, uid, partner, address_data_fields, context=context)
+            parent.update_address(addr_vals)
+            if not parent.is_company:
+                parent.write({'is_company': True})
+
+    def write(self, cr, uid, ids, vals, context=None):
+        if isinstance(ids, (int, long)):
+            ids = [ids]
+        result = super(res_partner,self).write(cr, uid, ids, vals, context=context)
+        for partner in self.browse(cr, uid, ids, context=context):
+            self._fields_sync(cr, uid, partner, vals, context)
+        return result
+
+    def create(self, cr, uid, vals, context=None):
+        new_id = super(res_partner, self).create(cr, uid, vals, context=context)
+        partner = self.browse(cr, uid, new_id, context=context)
+        self._fields_sync(cr, uid, partner, vals, context)
+        self._handle_first_contact_creation(cr, uid, partner, context)
+        return new_id
+
+    def open_commercial_entity(self, cr, uid, ids, context=None):
+        """ Utility method used to add an "Open Company" button in partner views """
+        partner = self.browse(cr, uid, ids[0], context=context)
+        return {'type': 'ir.actions.act_window',
+                'res_model': 'res.partner',
+                'view_mode': 'form',
+                'res_id': partner.commercial_id.id,
+                'target': 'new',
+                'flags': {'form': {'action_buttons': True}}}
+
+    def open_parent(self, cr, uid, ids, context=None):
+        """ Utility method used to add an "Open Parent" button in partner views """
+        partner = self.browse(cr, uid, ids[0], context=context)
+        return {'type': 'ir.actions.act_window',
+                'res_model': 'res.partner',
+                'view_mode': 'form',
+                'res_id': partner.parent_id.id,
+                'target': 'new',
+                'flags': {'form': {'action_buttons': True}}}
+
     def name_get(self, cr, uid, ids, context=None):
         if context is None:
             context = {}
@@ -516,25 +611,42 @@ class res_partner(osv.osv, format_address):
             ids = ids[16:]
         return True
 
-    def address_get(self, cr, uid, ids, adr_pref=None):
-        if adr_pref is None:
-            adr_pref = ['default']
+    def address_get(self, cr, uid, ids, adr_pref=None, context=None):
+        """ Find contacts/addresses of the right type(s) by doing a depth-first-search
+        through descendants within company boundaries (stop at entities flagged ``is_company``)
+        then continuing the search at the ancestors that are within the same company boundaries.
+        Defaults to partners of type ``'default'`` when the exact type is not found, or to the
+        commercial entity if no type ``'default'`` is found either. """
+        adr_pref = set(adr_pref or [])
+        if 'default' not in adr_pref:
+            adr_pref.add('default')
         result = {}
-        # retrieve addresses from the partner itself and its children
-        res = []
-        # need to fix the ids ,It get False value in list like ids[False]
-        if ids and ids[0]!=False:
-            for p in self.browse(cr, uid, ids):
-                res.append((p.type, p.id))
-                res.extend((c.type, c.id) for c in p.child_ids)
-        address_dict = dict(reversed(res))
-        # get the id of the (first) default address if there is one,
-        # otherwise get the id of the first address in the list
-        default_address = False
-        if res:
-            default_address = address_dict.get('default', res[0][1])
-        for adr in adr_pref:
-            result[adr] = address_dict.get(adr, default_address)
+        visited = set()
+        for partner in self.browse(cr, uid, filter(None, ids), context=context):
+            current_partner = partner
+            while current_partner:
+                to_scan = [current_partner]
+                # Scan descendants, DFS
+                while to_scan:
+                    record = to_scan.pop(0)
+                    visited.add(record)
+                    if record.type in adr_pref and not result.get(record.type):
+                        result[record.type] = record.id
+                    if len(result) == len(adr_pref):
+                        return result
+                    to_scan = [c for c in record.child_ids
+                                 if c not in visited
+                                 if not c.is_company] + to_scan
+
+                # Continue scanning at ancestor if current_partner is not a commercial entity
+                if current_partner.is_company or not current_partner.parent_id:
+                    break
+                current_partner = current_partner.parent_id
+
+        # default to type 'default' or the commercial_entity of the main/last partner
+        default = result.get('default', partner.commercial_id.id)
+        for adr_type in adr_pref:
+            result[adr_type] = result.get(adr_type) or default 
         return result
 
     def view_header_get(self, cr, uid, view_id, view_type, context):
diff --git a/openerp/addons/base/res/res_partner_view.xml b/openerp/addons/base/res/res_partner_view.xml
index 71c789af1a7..3650b4d6d9d 100644
--- a/openerp/addons/base/res/res_partner_view.xml
+++ b/openerp/addons/base/res/res_partner_view.xml
@@ -140,7 +140,12 @@
                             placeholder="Company"
                             domain="[('is_company', '=', True)]" context="{'default_is_company': True}"
                             attrs="{'invisible': [('is_company','=', True)]}"
-                            on_change="onchange_address(use_parent_address, parent_id)"/>
+                            on_change="onchange_address(use_parent_address, parent_id)" class="oe_inline"/>
+                         <field name="use_parent_address" class="oe_edit_only oe_inline"
+                                on_change="onchange_address(use_parent_address, parent_id)"
+                                attrs="{'invisible': [('parent_id','=', False)]}"/>
+                         <label for="use_parent_address" class="oe_edit_only"
+                                attrs="{'invisible': [('parent_id','=', False)]}"/>
                         <field name="category_id" widget="many2many_tags" placeholder="Tags..."/>
                     </div>
                     <div class="oe_right oe_button_box" name="buttons"> </div>
@@ -151,21 +156,20 @@
                             <div attrs="{'invisible': [('parent_id','=', False)]}" name="div_type">
                                 <field class="oe_inline"
                                     name="type"/>
-                                <label for="use_parent_address" class="oe_edit_only"/>
-                                <field name="use_parent_address" class="oe_edit_only oe_inline"
-                                    on_change="onchange_address(use_parent_address, parent_id)"/>
                             </div>
 
                             <label for="street" string="Address"/>
                             <div>
-                                <field name="street" placeholder="Street..."/>
-                                <field name="street2"/>
+                                <button name="open_parent" type="object" string="(edit company address)" class="oe_link oe_edit_only"
+                                        attrs="{'invisible': ['|',('parent_id','=', False),('use_parent_address','=',False)]}"/>
+                                <field name="street" placeholder="Street..."  attrs="{'readonly': [('use_parent_address','=',True)]}"/>
+                                <field name="street2"  attrs="{'readonly': [('use_parent_address','=',True)]}"/>
                                 <div class="address_format">
-                                    <field name="city" placeholder="City" style="width: 40%%"/>
-                                    <field name="state_id" class="oe_no_button" placeholder="State" style="width: 37%%" options='{"no_open": True}' on_change="onchange_state(state_id)"/>
-                                    <field name="zip" placeholder="ZIP" style="width: 20%%"/>
+                                    <field name="city" placeholder="City" style="width: 40%%" attrs="{'readonly': [('use_parent_address','=',True)]}"/>
+                                    <field name="state_id" class="oe_no_button" placeholder="State" style="width: 37%%" options='{"no_open": True}' on_change="onchange_state(state_id)" attrs="{'readonly': [('use_parent_address','=',True)]}"/>
+                                    <field name="zip" placeholder="ZIP" style="width: 20%%" attrs="{'readonly': [('use_parent_address','=',True)]}"/>
                                 </div>
-                                <field name="country_id" placeholder="Country" class="oe_no_button" options='{"no_open": True}'/>
+                                <field name="country_id" placeholder="Country" class="oe_no_button" options='{"no_open": True}' attrs="{'readonly': [('use_parent_address','=',True)]}"/>
                             </div>
                             <field name="website" widget="url" placeholder="e.g. www.openerp.com"/>
                         </group>
@@ -183,7 +187,7 @@
 
                     <notebook colspan="4">
                         <page string="Contacts" attrs="{'invisible': [('is_company','=',False)]}">
-                            <field name="child_ids" context="{'default_parent_id': active_id}" mode="kanban">
+                            <field name="child_ids" context="{'default_parent_id': active_id, 'default_use_parent_address': 1}" mode="kanban">
                                 <kanban>
                                     <field name="color"/>
                                     <field name="name"/>
@@ -252,6 +256,7 @@
                                     <field name="image" widget='image' class="oe_avatar oe_left" options='{"preview_image": "image_medium"}'/>
                                     <div class="oe_title">
                                         <group>
+                                            <field name="use_parent_address"/>
                                             <field name="name"/>
                                             <field name="category_id" widget="many2many_tags" placeholder="Tags..."/>
                                             <field name="function" placeholder="e.g. Sales Director"/>
diff --git a/openerp/addons/base/tests/test_base.py b/openerp/addons/base/tests/test_base.py
index 285af8fbf6e..1f6410f7231 100644
--- a/openerp/addons/base/tests/test_base.py
+++ b/openerp/addons/base/tests/test_base.py
@@ -39,5 +39,211 @@ class test_base(common.TransactionCase):
         self.assertTrue(new_id2 > new_id, 'find_or_create failed - should have created new one again')
 
 
+    def test_20_res_partner_address_sync(self):
+        cr, uid = self.cr, self.uid
+        ghoststep = self.res_partner.browse(cr, uid, self.res_partner.create(cr, uid,
+                                                                             {'name': 'GhostStep',
+                                                                              'is_company': True,
+                                                                              'street': 'Main Street, 10',
+                                                                              'phone': '123456789',
+                                                                              'email': 'info@ghoststep.com',
+                                                                              'vat': 'BE0477472701'}))
+        p1 = self.res_partner.browse(cr, uid, self.res_partner.name_create(cr, uid, 'Denis Bladesmith <denis.bladesmith@ghoststep.com>')[0])
+        p1phone = '123456789#34'
+        p1.write({'phone': p1phone,
+                  'parent_id': ghoststep.id,
+                  'use_parent_address': True})
+        p1.refresh()
+        self.assertEqual(p1.street, ghoststep.street, 'Address fields must be synced')
+        self.assertEqual(p1.phone, p1phone, 'Phone should be preserved after address sync')
+        self.assertEqual(p1.email, 'denis.bladesmith@ghoststep.com', 'Email should be preserved after sync')
+        ghoststreet = 'South Street, 25'
+        ghoststep.write({'street': ghoststreet})
+        p1.refresh()
+        self.assertEqual(p1.street, ghoststreet, 'Address fields must be synced automatically')
+        self.assertEqual(p1.phone, p1phone, 'Phone should not be synced')
+        self.assertEqual(p1.email, 'denis.bladesmith@ghoststep.com', 'Email should be preserved after sync')
+
+        p1street = 'My Street, 11'
+        p1.write({'street': p1street})
+        ghoststep.refresh()
+        self.assertEqual(ghoststep.street, ghoststreet, 'Touching contact should never alter parent')
+
+
+    def test_30_res_partner_first_contact_sync(self):
+        """ Test initial creation of company/contact pair where contact address gets copied to
+        company """
+        cr, uid = self.cr, self.uid
+        ironshield = self.res_partner.browse(cr, uid, self.res_partner.name_create(cr, uid, 'IronShield')[0])
+        self.assertFalse(ironshield.is_company, 'Partners are not companies by default')
+        self.assertFalse(ironshield.use_parent_address, 'use_parent_address defaults to False')
+        self.assertEqual(ironshield.type, 'contact', 'Default type must be "contact"')
+        p1 = self.res_partner.browse(cr, uid, self.res_partner.create(cr, uid,
+                                                                      {'name': 'Isen Hardearth',
+                                                                       'street': 'Strongarm Avenue, 12',
+                                                                       'parent_id': ironshield.id}))
+        self.assertEquals(p1.type, 'contact', 'Default type must be "contact"')
+        ironshield.refresh()
+        self.assertEqual(ironshield.street, p1.street, 'Address fields should be copied to company')
+        self.assertTrue(ironshield.is_company, 'Company flag should be turned on after first contact creation')
+
+    def test_40_res_partner_address_getc(self):
+        """ Test address_get address resolution mechanism: it should first go down through descendants,
+        stopping when encountering another is_copmany entity, then go up, stopping again at the first
+        is_company entity or the root ancestor and if nothing matches, it should use the commercial entity
+        of the partner (which could be itself) """
+        cr, uid = self.cr, self.uid
+        elmtree = self.res_partner.browse(cr, uid, self.res_partner.name_create(cr, uid, 'Elmtree')[0])
+        branch1 = self.res_partner.browse(cr, uid, self.res_partner.create(cr, uid, {'name': 'Branch 1',
+                                                                                     'parent_id': elmtree.id,
+                                                                                     'is_company': True}))
+        leaf10 = self.res_partner.browse(cr, uid, self.res_partner.create(cr, uid, {'name': 'Leaf 10',
+                                                                                    'parent_id': branch1.id,
+                                                                                    'type': 'invoice'}))
+        branch11 = self.res_partner.browse(cr, uid, self.res_partner.create(cr, uid, {'name': 'Branch 11',
+                                                                                      'parent_id': branch1.id,
+                                                                                      'type': 'other'}))
+        leaf111 = self.res_partner.browse(cr, uid, self.res_partner.create(cr, uid, {'name': 'Leaf 111',
+                                                                                    'parent_id': branch11.id,
+                                                                                    'type': 'delivery'}))
+        branch11.write({'is_company': False}) # force is_company after creating 1rst child
+        branch2 = self.res_partner.browse(cr, uid, self.res_partner.create(cr, uid, {'name': 'Branch 2',
+                                                                                     'parent_id': elmtree.id,
+                                                                                     'is_company': True}))
+        leaf21 = self.res_partner.browse(cr, uid, self.res_partner.create(cr, uid, {'name': 'Leaf 21',
+                                                                                    'parent_id': branch2.id,
+                                                                                    'type': 'delivery'}))
+        leaf22 = self.res_partner.browse(cr, uid, self.res_partner.create(cr, uid, {'name': 'Leaf 22',
+                                                                                    'parent_id': branch2.id}))
+        leaf23 = self.res_partner.browse(cr, uid, self.res_partner.create(cr, uid, {'name': 'Leaf 23',
+                                                                                    'parent_id': branch2.id,
+                                                                                    'type': 'default'}))
+        # go up, stop at branch1
+        self.assertEqual(self.res_partner.address_get(cr, uid, [leaf111.id], ['delivery', 'invoice', 'contact', 'other', 'default']),
+                         {'delivery': leaf111.id,
+                          'invoice': leaf10.id,
+                          'contact': branch1.id,
+                          'other': branch11.id,
+                          'default': branch1.id}, 'Invalid address resolution')
+        self.assertEqual(self.res_partner.address_get(cr, uid, [branch11.id], ['delivery', 'invoice', 'contact', 'other', 'default']),
+                         {'delivery': leaf111.id,
+                          'invoice': leaf10.id,
+                          'contact': branch1.id,
+                          'other': branch11.id,
+                          'default': branch1.id}, 'Invalid address resolution')
+
+        # go down, stop at at all child companies
+        self.assertEqual(self.res_partner.address_get(cr, uid, [elmtree.id], ['delivery', 'invoice', 'contact', 'other', 'default']),
+                         {'delivery': elmtree.id,
+                          'invoice': elmtree.id,
+                          'contact': elmtree.id,
+                          'other': elmtree.id,
+                          'default': elmtree.id}, 'Invalid address resolution')
+
+        # go down through children
+        self.assertEqual(self.res_partner.address_get(cr, uid, [branch1.id], ['delivery', 'invoice', 'contact', 'other', 'default']),
+                         {'delivery': leaf111.id,
+                          'invoice': leaf10.id,
+                          'contact': branch1.id,
+                          'other': branch11.id,
+                          'default': branch1.id}, 'Invalid address resolution')
+        self.assertEqual(self.res_partner.address_get(cr, uid, [branch2.id], ['delivery', 'invoice', 'contact', 'other', 'default']),
+                         {'delivery': leaf21.id,
+                          'invoice': leaf23.id,
+                          'contact': branch2.id,
+                          'other': leaf23.id,
+                          'default': leaf23.id}, 'Invalid address resolution')
+
+        # go up then down through siblings
+        self.assertEqual(self.res_partner.address_get(cr, uid, [leaf21.id], ['delivery', 'invoice', 'contact', 'other', 'default']),
+                         {'delivery': leaf21.id,
+                          'invoice': leaf23.id,
+                          'contact': branch2.id,
+                          'other': leaf23.id,
+                          'default': leaf23.id
+                          }, 'Invalid address resolution, should scan commercial entity ancestor and its descendants')
+        self.assertEqual(self.res_partner.address_get(cr, uid, [leaf22.id], ['delivery', 'invoice', 'contact', 'other', 'default']),
+                         {'delivery': leaf21.id,
+                          'invoice': leaf23.id,
+                          'contact': leaf22.id,
+                          'other': leaf23.id,
+                          'default': leaf23.id}, 'Invalid address resolution, should scan commercial entity ancestor and its descendants')
+        self.assertEqual(self.res_partner.address_get(cr, uid, [leaf23.id], ['delivery', 'invoice', 'contact', 'other', 'default']),
+                         {'delivery': leaf21.id,
+                          'invoice': leaf23.id,
+                          'contact': branch2.id,
+                          'other': leaf23.id,
+                          'default': leaf23.id}, 'Invalid address resolution, `default` should only override if no partner with specific type exists')
+
+        # empty adr_pref means only 'default'
+        self.assertEqual(self.res_partner.address_get(cr, uid, [elmtree.id], []),
+                        {'default': elmtree.id}, 'Invalid address resolution, no default means commercial entity ancestor')
+        self.assertEqual(self.res_partner.address_get(cr, uid, [leaf111.id], []),
+                        {'default': branch1.id}, 'Invalid address resolution, no default means commercial entity ancestor')
+        branch11.write({'type': 'default'})
+        self.assertEqual(self.res_partner.address_get(cr, uid, [leaf111.id], []),
+                        {'default': branch11.id}, 'Invalid address resolution, branch11 should now be default')
+
+
+    def test_50_res_partner_commercial_sync(self):    
+        cr, uid = self.cr, self.uid
+        p0 = self.res_partner.browse(cr, uid, self.res_partner.create(cr, uid,
+                                                                      {'name': 'Sigurd Sunknife',
+                                                                       'email': 'ssunknife@gmail.com'}))
+        sunhelm = self.res_partner.browse(cr, uid, self.res_partner.create(cr, uid,
+                                                                           {'name': 'Sunhelm',
+                                                                            'is_company': True,
+                                                                            'street': 'Rainbow Street, 13',
+                                                                            'phone': '1122334455',
+                                                                            'email': 'info@sunhelm.com',
+                                                                            'vat': 'BE0477472701',
+                                                                            'child_ids': [(4, p0.id),
+                                                                                          (0, 0, {'name': 'Alrik Greenthorn',
+                                                                                                  'email': 'agr@sunhelm.com'})],
+                                                                            }))
+        p1 = self.res_partner.browse(cr, uid, self.res_partner.create(cr, uid,
+                                                                      {'name': 'Otto Blackwood',
+                                                                       'email': 'otto.blackwood@sunhelm.com',
+                                                                       'parent_id': sunhelm.id}))
+        p11 = self.res_partner.browse(cr, uid, self.res_partner.create(cr, uid,
+                                                                      {'name': 'Gini Graywool',
+                                                                       'email': 'ggr@sunhelm.com',
+                                                                       'parent_id': p1.id}))
+        p2 = self.res_partner.browse(cr, uid, self.res_partner.search(cr, uid,
+                                                                      [('email', '=', 'agr@sunhelm.com')])[0])
+
+        for p in (p0, p1, p11, p2):
+            p.refresh()
+            self.assertEquals(p.commercial_id, sunhelm, 'Incorrect commercial entity resolution')
+            self.assertEquals(p.vat, sunhelm.vat, 'Commercial fields must be automatically synced')
+        sunhelmvat = 'BE0123456789'
+        sunhelm.write({'vat': sunhelmvat})
+        for p in (p0, p1, p11, p2):
+            p.refresh()
+            self.assertEquals(p.vat, sunhelmvat, 'Commercial fields must be automatically and recursively synced')
+
+        p1vat = 'BE0987654321'
+        p1.write({'vat': p1vat})
+        for p in (sunhelm, p0, p11, p2):
+            p.refresh()
+            self.assertEquals(p.vat, sunhelmvat, 'Sync to children should only work downstream and on commercial entities')
+
+        # promote p1 to commercial entity
+        vals = p1.onchange_type(is_company=True)['value']
+        p1.write(dict(vals, parent_id=sunhelm.id,
+                      is_company=True,
+                      name='Sunhelm Subsidiary'))
+        p1.refresh()
+        self.assertEquals(p1.vat, p1vat, 'Setting is_company should stop auto-sync of commercial fields')
+        self.assertEquals(p1.commercial_id, p1, 'Incorrect commercial entity resolution after setting is_company')
+
+        # writing on parent should not touch child commercial entities
+        sunhelmvat2 = 'BE0112233445'
+        sunhelm.write({'vat': sunhelmvat2})
+        p1.refresh()
+        self.assertEquals(p1.vat, p1vat, 'Setting is_company should stop auto-sync of commercial fields')
+        p0.refresh()
+        self.assertEquals(p0.vat, sunhelmvat2, 'Commercial fields must be automatically synced')
+
 if __name__ == '__main__':
     unittest2.main()
\ No newline at end of file

From 41d3c2ae88d89daabbdba64b899a221a7aeebf81 Mon Sep 17 00:00:00 2001
From: Olivier Dony <odo@openerp.com>
Date: Mon, 8 Apr 2013 05:00:52 +0200
Subject: [PATCH 025/121] [FIX] sale: use invoicing partner rather than main
 one for analytic account context, spotted by Raphael Valyi on bug 1160365

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

bzr revid: odo@openerp.com-20130408030052-xgk5p8zkagu21scs
---
 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 8a0c6c9e6a4..094e19c050f 100644
--- a/addons/sale/sale_view.xml
+++ b/addons/sale/sale_view.xml
@@ -156,7 +156,7 @@
                             <field name="partner_id" on_change="onchange_partner_id(partner_id, context)" domain="[('customer','=',True)]" context="{'search_default_customer':1, 'show_address': 1}" options='{"always_reload": True}'/>
                             <field name="partner_invoice_id" groups="sale.group_delivery_invoice_address" context="{'default_type':'invoice'}"/>
                             <field name="partner_shipping_id" groups="sale.group_delivery_invoice_address" context="{'default_type':'delivery'}"/>
-                            <field name="project_id" context="{'partner_id':partner_id, 'default_pricelist_id':pricelist_id, 'default_name':name, 'default_type': 'contract'}" groups="sale.group_analytic_accounting" domain="[('type','in',['view','normal','contract'])]"/>
+                            <field name="project_id" context="{'partner_id':partner_invoice_id, 'default_pricelist_id':pricelist_id, 'default_name':name, 'default_type': 'contract'}" groups="sale.group_analytic_accounting" domain="[('type','in',['view','normal','contract'])]"/>
                         </group>
                         <group>
                             <field name="date_order"/>

From 70fbc25d932a341af8ef46ffd7bcc2eec750e514 Mon Sep 17 00:00:00 2001
From: "Quentin (OpenERP)" <qdp-launchpad@openerp.com>
Date: Mon, 8 Apr 2013 17:59:34 +0200
Subject: [PATCH 026/121] [IMP] base, res_partner and contacts management:
 improve usability and user experience. 1) whennever a contact is created from
 a parent record: allow to set a dedicated address 2) move the
 use_parent_address field near the address

bzr revid: qdp-launchpad@openerp.com-20130408155934-bk2apzq1gcktqr6m
---
 openerp/addons/base/res/res_partner_view.xml | 34 ++++++++++++++------
 1 file changed, 25 insertions(+), 9 deletions(-)

diff --git a/openerp/addons/base/res/res_partner_view.xml b/openerp/addons/base/res/res_partner_view.xml
index 3650b4d6d9d..8b5736c9aea 100644
--- a/openerp/addons/base/res/res_partner_view.xml
+++ b/openerp/addons/base/res/res_partner_view.xml
@@ -141,11 +141,6 @@
                             domain="[('is_company', '=', True)]" context="{'default_is_company': True}"
                             attrs="{'invisible': [('is_company','=', True)]}"
                             on_change="onchange_address(use_parent_address, parent_id)" class="oe_inline"/>
-                         <field name="use_parent_address" class="oe_edit_only oe_inline"
-                                on_change="onchange_address(use_parent_address, parent_id)"
-                                attrs="{'invisible': [('parent_id','=', False)]}"/>
-                         <label for="use_parent_address" class="oe_edit_only"
-                                attrs="{'invisible': [('parent_id','=', False)]}"/>
                         <field name="category_id" widget="many2many_tags" placeholder="Tags..."/>
                     </div>
                     <div class="oe_right oe_button_box" name="buttons"> </div>
@@ -160,6 +155,10 @@
 
                             <label for="street" string="Address"/>
                             <div>
+                                <field name="use_parent_address" class="oe_edit_only oe_inline"
+                                       on_change="onchange_address(use_parent_address, parent_id)"
+                                       attrs="{'invisible': [('parent_id','=', False)]}"/>
+                                <label for="use_parent_address" class="oe_edit_only" attrs="{'invisible': [('parent_id','=', False)]}"/>
                                 <button name="open_parent" type="object" string="(edit company address)" class="oe_link oe_edit_only"
                                         attrs="{'invisible': ['|',('parent_id','=', False),('use_parent_address','=',False)]}"/>
                                 <field name="street" placeholder="Street..."  attrs="{'readonly': [('use_parent_address','=',True)]}"/>
@@ -187,7 +186,7 @@
 
                     <notebook colspan="4">
                         <page string="Contacts" attrs="{'invisible': [('is_company','=',False)]}">
-                            <field name="child_ids" context="{'default_parent_id': active_id, 'default_use_parent_address': 1}" mode="kanban">
+                            <field name="child_ids" context="{'default_parent_id': active_id, 'default_use_parent_address': True}" mode="kanban">
                                 <kanban>
                                     <field name="color"/>
                                     <field name="name"/>
@@ -254,9 +253,8 @@
                                 </kanban>
                                 <form string="Contact" version="7.0">
                                     <field name="image" widget='image' class="oe_avatar oe_left" options='{"preview_image": "image_medium"}'/>
-                                    <div class="oe_title">
+                                    <group>
                                         <group>
-                                            <field name="use_parent_address"/>
                                             <field name="name"/>
                                             <field name="category_id" widget="many2many_tags" placeholder="Tags..."/>
                                             <field name="function" placeholder="e.g. Sales Director"/>
@@ -264,7 +262,25 @@
                                             <field name="phone"/>
                                             <field name="mobile"/>
                                         </group>
-                                    </div>
+                                        <group>
+                                            <field name="use_parent_address"/>
+                                            <label for="type" attrs="{'invisible': [('use_parent_address','=', True)]}"/>
+                                            <div attrs="{'invisible': [('use_parent_address','=', True)]}" name="div_type">
+                                                <field class="oe_inline" name="type"/>
+                                            </div>
+                                            <label for="street" string="Address" attrs="{'invisible': [('use_parent_address','=', True)]}"/>
+                                            <div attrs="{'invisible': [('use_parent_address','=', True)]}" name="div_address">
+                                                <field name="street" placeholder="Street..."/>
+                                                <field name="street2"/>
+                                                <div class="address_format">
+                                                    <field name="city" placeholder="City" style="width: 40%%"/>
+                                                    <field name="state_id" class="oe_no_button" placeholder="State" style="width: 37%%" options='{"no_open": True}' on_change="onchange_state(state_id)"/>
+                                                    <field name="zip" placeholder="ZIP" style="width: 20%%"/>
+                                                </div>
+                                                <field name="country_id" placeholder="Country" class="oe_no_button" options='{"no_open": True}'/>
+                                            </div>
+                                        </group>
+                                    </group>
                                 </form>
                             </field>
                         </page>

From 9dbe29b2b5c40e3efbac5a35b290429b24473e87 Mon Sep 17 00:00:00 2001
From: Olivier Dony <odo@openerp.com>
Date: Wed, 10 Apr 2013 14:15:36 +0200
Subject: [PATCH 027/121] [FIX] res.partner.address_get: default to partner
 being looked up rather than company when no match is found at all (and no
 "default" exists)

Using the commercial entity is not a very good default choice
in many cases. If a new contact is created on-the-fly for a
new document (e.g. sales order), his/her company may be an
empty shell and/or a large corporation that should not be
directly used for e.g. billing/invoicing purposed.
Once a contact/company is set to "invoicing" or "delivery"
we use it, but in other cases we stick to the provided
partner/contact as a saner default.
This should not change anything for cases where advanced
contact management is used and proper address types are
set.

bzr revid: odo@openerp.com-20130410121536-vm93o6vxhi3b8feu
---
 openerp/addons/base/res/res_partner.py |  6 +++---
 openerp/addons/base/tests/test_base.py | 10 +++++-----
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/openerp/addons/base/res/res_partner.py b/openerp/addons/base/res/res_partner.py
index 1193abcd862..9d36682f17d 100644
--- a/openerp/addons/base/res/res_partner.py
+++ b/openerp/addons/base/res/res_partner.py
@@ -616,7 +616,7 @@ class res_partner(osv.osv, format_address):
         through descendants within company boundaries (stop at entities flagged ``is_company``)
         then continuing the search at the ancestors that are within the same company boundaries.
         Defaults to partners of type ``'default'`` when the exact type is not found, or to the
-        commercial entity if no type ``'default'`` is found either. """
+        provided partner itself if no type ``'default'`` is found either. """
         adr_pref = set(adr_pref or [])
         if 'default' not in adr_pref:
             adr_pref.add('default')
@@ -643,8 +643,8 @@ class res_partner(osv.osv, format_address):
                     break
                 current_partner = current_partner.parent_id
 
-        # default to type 'default' or the commercial_entity of the main/last partner
-        default = result.get('default', partner.commercial_id.id)
+        # default to type 'default' or the partner itself
+        default = result.get('default', partner.id)
         for adr_type in adr_pref:
             result[adr_type] = result.get(adr_type) or default 
         return result
diff --git a/openerp/addons/base/tests/test_base.py b/openerp/addons/base/tests/test_base.py
index 1f6410f7231..42f1386771e 100644
--- a/openerp/addons/base/tests/test_base.py
+++ b/openerp/addons/base/tests/test_base.py
@@ -90,8 +90,8 @@ class test_base(common.TransactionCase):
     def test_40_res_partner_address_getc(self):
         """ Test address_get address resolution mechanism: it should first go down through descendants,
         stopping when encountering another is_copmany entity, then go up, stopping again at the first
-        is_company entity or the root ancestor and if nothing matches, it should use the commercial entity
-        of the partner (which could be itself) """
+        is_company entity or the root ancestor and if nothing matches, it should use the provided partner
+        itself """
         cr, uid = self.cr, self.uid
         elmtree = self.res_partner.browse(cr, uid, self.res_partner.name_create(cr, uid, 'Elmtree')[0])
         branch1 = self.res_partner.browse(cr, uid, self.res_partner.create(cr, uid, {'name': 'Branch 1',
@@ -124,13 +124,13 @@ class test_base(common.TransactionCase):
                           'invoice': leaf10.id,
                           'contact': branch1.id,
                           'other': branch11.id,
-                          'default': branch1.id}, 'Invalid address resolution')
+                          'default': leaf111.id}, 'Invalid address resolution')
         self.assertEqual(self.res_partner.address_get(cr, uid, [branch11.id], ['delivery', 'invoice', 'contact', 'other', 'default']),
                          {'delivery': leaf111.id,
                           'invoice': leaf10.id,
                           'contact': branch1.id,
                           'other': branch11.id,
-                          'default': branch1.id}, 'Invalid address resolution')
+                          'default': branch11.id}, 'Invalid address resolution')
 
         # go down, stop at at all child companies
         self.assertEqual(self.res_partner.address_get(cr, uid, [elmtree.id], ['delivery', 'invoice', 'contact', 'other', 'default']),
@@ -179,7 +179,7 @@ class test_base(common.TransactionCase):
         self.assertEqual(self.res_partner.address_get(cr, uid, [elmtree.id], []),
                         {'default': elmtree.id}, 'Invalid address resolution, no default means commercial entity ancestor')
         self.assertEqual(self.res_partner.address_get(cr, uid, [leaf111.id], []),
-                        {'default': branch1.id}, 'Invalid address resolution, no default means commercial entity ancestor')
+                        {'default': leaf111.id}, 'Invalid address resolution, no default means contact itself')
         branch11.write({'type': 'default'})
         self.assertEqual(self.res_partner.address_get(cr, uid, [leaf111.id], []),
                         {'default': branch11.id}, 'Invalid address resolution, branch11 should now be default')

From 9bec1595bd85b3c78f9ac00bed959ff7ea87c19e Mon Sep 17 00:00:00 2001
From: Olivier Dony <odo@openerp.com>
Date: Wed, 10 Apr 2013 14:32:29 +0200
Subject: [PATCH 028/121] [FIX] res.partner address sync: `type` field should
 not be synced wih other address fields

It is valid to use the parent address but still set a different
type of address - the name, email, phone, etc. could be different.

bzr revid: odo@openerp.com-20130410123229-9l60sbcks3tpmy7x
---
 openerp/addons/base/res/res_partner.py | 8 ++++----
 openerp/addons/base/tests/test_base.py | 8 ++++++--
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/openerp/addons/base/res/res_partner.py b/openerp/addons/base/res/res_partner.py
index 9d36682f17d..cf69c38d0d0 100644
--- a/openerp/addons/base/res/res_partner.py
+++ b/openerp/addons/base/res/res_partner.py
@@ -161,7 +161,7 @@ def _lang_get(self, cr, uid, context=None):
     return [(r['code'], r['name']) for r in res]
 
 # fields copy if 'use_parent_address' is checked
-ADDRESS_FIELDS = ('street', 'street2', 'zip', 'city', 'state_id', 'country_id', 'type')
+ADDRESS_FIELDS = ('street', 'street2', 'zip', 'city', 'state_id', 'country_id')
 POSTAL_ADDRESS_FIELDS = ADDRESS_FIELDS # deprecated, to remove after 7.0
 
 class res_partner(osv.osv, format_address):
@@ -460,10 +460,10 @@ class res_partner(osv.osv, format_address):
         """ On creation of first contact for a company (or root) that has no address, assume contact address
         was meant to be company address """
         parent = partner.parent_id
-        address_data_fields = list(set(self._address_fields(cr, uid, context=context)).difference(['type']))
+        address_fields = self._address_fields(cr, uid, context=context)
         if parent and (parent.is_company or not parent.parent_id) and len(parent.child_ids) == 1 and \
-            any(partner[f] for f in address_data_fields) and not any(parent[f] for f in address_data_fields):
-            addr_vals = self._update_fields_values(cr, uid, partner, address_data_fields, context=context)
+            any(partner[f] for f in address_fields) and not any(parent[f] for f in address_fields):
+            addr_vals = self._update_fields_values(cr, uid, partner, address_fields, context=context)
             parent.update_address(addr_vals)
             if not parent.is_company:
                 parent.write({'is_company': True})
diff --git a/openerp/addons/base/tests/test_base.py b/openerp/addons/base/tests/test_base.py
index 42f1386771e..de6e88c2cac 100644
--- a/openerp/addons/base/tests/test_base.py
+++ b/openerp/addons/base/tests/test_base.py
@@ -47,8 +47,10 @@ class test_base(common.TransactionCase):
                                                                               'street': 'Main Street, 10',
                                                                               'phone': '123456789',
                                                                               'email': 'info@ghoststep.com',
-                                                                              'vat': 'BE0477472701'}))
+                                                                              'vat': 'BE0477472701',
+                                                                              'type': 'default'}))
         p1 = self.res_partner.browse(cr, uid, self.res_partner.name_create(cr, uid, 'Denis Bladesmith <denis.bladesmith@ghoststep.com>')[0])
+        self.assertEqual(p1.type, 'contact', 'Default type must be "contact"')
         p1phone = '123456789#34'
         p1.write({'phone': p1phone,
                   'parent_id': ghoststep.id,
@@ -56,6 +58,7 @@ class test_base(common.TransactionCase):
         p1.refresh()
         self.assertEqual(p1.street, ghoststep.street, 'Address fields must be synced')
         self.assertEqual(p1.phone, p1phone, 'Phone should be preserved after address sync')
+        self.assertEqual(p1.type, 'contact', 'Type should be preserved after address sync')
         self.assertEqual(p1.email, 'denis.bladesmith@ghoststep.com', 'Email should be preserved after sync')
         ghoststreet = 'South Street, 25'
         ghoststep.write({'street': ghoststreet})
@@ -78,11 +81,12 @@ class test_base(common.TransactionCase):
         self.assertFalse(ironshield.is_company, 'Partners are not companies by default')
         self.assertFalse(ironshield.use_parent_address, 'use_parent_address defaults to False')
         self.assertEqual(ironshield.type, 'contact', 'Default type must be "contact"')
+        ironshield.write({'type': 'default'}) # force default type to double-check sync 
         p1 = self.res_partner.browse(cr, uid, self.res_partner.create(cr, uid,
                                                                       {'name': 'Isen Hardearth',
                                                                        'street': 'Strongarm Avenue, 12',
                                                                        'parent_id': ironshield.id}))
-        self.assertEquals(p1.type, 'contact', 'Default type must be "contact"')
+        self.assertEquals(p1.type, 'contact', 'Default type must be "contact", not the copied parent type')
         ironshield.refresh()
         self.assertEqual(ironshield.street, p1.street, 'Address fields should be copied to company')
         self.assertTrue(ironshield.is_company, 'Company flag should be turned on after first contact creation')

From 140554c9f8311892885a7658f13dc28d7deaa105 Mon Sep 17 00:00:00 2001
From: Olivier Dony <odo@openerp.com>
Date: Wed, 10 Apr 2013 15:53:08 +0200
Subject: [PATCH 029/121] [REVERT] account.invoice: remove "commercial entity"
 domain on partner_id, to keep it consistent everywhere

Being able to choose a contact to invoice is very important
because the invoice must go to the right person.
When the invoice creation is automated by e.g. a Sales Order
any partner can be used (even though the system will
preselect the `invoicing` partner of the company if
one exists).
We have to keep that freedom when manually creating invoices.

bzr revid: odo@openerp.com-20130410135308-pd54c7ml8t3pcefl
---
 addons/account/account_invoice_view.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/account/account_invoice_view.xml b/addons/account/account_invoice_view.xml
index 59c78c98e54..046350f302e 100644
--- a/addons/account/account_invoice_view.xml
+++ b/addons/account/account_invoice_view.xml
@@ -166,7 +166,7 @@
                             <field string="Supplier" name="partner_id"
                               on_change="onchange_partner_id(type,partner_id,date_invoice,payment_term, partner_bank_id,company_id)"
                               context="{'default_customer': 0, 'search_default_supplier': 1, 'default_supplier': 1}"
-                              domain="[('supplier', '=', True),'|',('parent_id','=',False),('is_company','=',True)]"/>
+                              domain="[('supplier', '=', True)]"/>
                             <field name="fiscal_position" widget="selection"/>
                             <field name="origin"/>
                             <field name="supplier_invoice_number"/>
@@ -321,7 +321,7 @@
                                 on_change="onchange_partner_id(type,partner_id,date_invoice,payment_term, partner_bank_id,company_id)"
                                 groups="base.group_user" context="{'search_default_customer':1, 'show_address': 1}"
                                 options='{"always_reload": True}'
-                                domain="[('customer', '=', True),'|',('parent_id','=',False),('is_company','=',True)]"/>
+                                domain="[('customer', '=', True)]"/>
                             <field name="fiscal_position" widget="selection" />
                         </group>
                         <group>

From 8468af86065d1dddc6cdcc8383d6b17b62e098c1 Mon Sep 17 00:00:00 2001
From: Olivier Dony <odo@openerp.com>
Date: Wed, 10 Apr 2013 17:23:09 +0200
Subject: [PATCH 030/121] [FIX] res.partner.name_search: make sure companies
 always come before contacts when both match

bzr revid: odo@openerp.com-20130410152309-u4dn8bxssvcwdc8c
---
 openerp/addons/base/res/res_partner.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/openerp/addons/base/res/res_partner.py b/openerp/addons/base/res/res_partner.py
index cf69c38d0d0..574590fd2f8 100644
--- a/openerp/addons/base/res/res_partner.py
+++ b/openerp/addons/base/res/res_partner.py
@@ -570,9 +570,9 @@ class res_partner(osv.osv, format_address):
                           LEFT JOIN res_partner company ON partner.parent_id = company.id
                           WHERE partner.email ''' + operator +''' %(name)s
                              OR partner.name || ' (' || COALESCE(company.name,'') || ')'
-                          ''' + operator + ' %(name)s ' + limit_str, query_args)
+                          ''' + operator + ' %(name)s ORDER BY partner.is_company DESC, partner.name' + limit_str, query_args)
             ids = map(lambda x: x[0], cr.fetchall())
-            ids = self.search(cr, uid, [('id', 'in', ids)] + args, limit=limit, context=context)
+            ids = self.search(cr, uid, [('id', 'in', ids)] + args, limit=limit, order="is_company desc, name", context=context)
             if ids:
                 return self.name_get(cr, uid, ids, context)
         return super(res_partner,self).name_search(cr, uid, name, args, operator=operator, context=context, limit=limit)

From 5a222c8f907dc2bf5971cd0e41f5c80cb5022bf6 Mon Sep 17 00:00:00 2001
From: Olivier Dony <odo@openerp.com>
Date: Wed, 10 Apr 2013 17:42:42 +0200
Subject: [PATCH 031/121] [FIX] res.partner form view: remove now useless
 oe_inline class so `company` field can take 100% width of parent div

bzr revid: odo@openerp.com-20130410154242-kkgrthb5cb11d49d
---
 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 8b5736c9aea..ed718d80ae6 100644
--- a/openerp/addons/base/res/res_partner_view.xml
+++ b/openerp/addons/base/res/res_partner_view.xml
@@ -140,7 +140,7 @@
                             placeholder="Company"
                             domain="[('is_company', '=', True)]" context="{'default_is_company': True}"
                             attrs="{'invisible': [('is_company','=', True)]}"
-                            on_change="onchange_address(use_parent_address, parent_id)" class="oe_inline"/>
+                            on_change="onchange_address(use_parent_address, parent_id)"/>
                         <field name="category_id" widget="many2many_tags" placeholder="Tags..."/>
                     </div>
                     <div class="oe_right oe_button_box" name="buttons"> </div>

From 59fe76f24c2c974f3e74035087af36ae3fbc3b84 Mon Sep 17 00:00:00 2001
From: Olivier Dony <odo@openerp.com>
Date: Wed, 10 Apr 2013 19:01:01 +0200
Subject: [PATCH 032/121] [FIX] res.partner form: switch default
 `use_parent_address` to False in kanban contact too, replace by defaults for
 address fields

We should never turn the `use_parent_address` option on
unless the user explicitly wants to use it. It makes
further editing more convoluted (need to go to the
company address) and is really an advanced feature.

It was only set by via context defaults when adding
contacts to a company ; we can replace that with a
set of defaults that will copy the company address
fields to the contact. Users can still switch to
automatic synchronization if they really want it,
or simply further edit the address of the contact.

Also fixed the layout of the mini-form view, now
using a simpler vertical layout with address at
bottom, since the main info of a contact needs
to be entered first.

bzr revid: odo@openerp.com-20130410170101-t9covdj6nmyn44jf
---
 openerp/addons/base/res/res_partner_view.xml | 23 ++++++++++++--------
 1 file changed, 14 insertions(+), 9 deletions(-)

diff --git a/openerp/addons/base/res/res_partner_view.xml b/openerp/addons/base/res/res_partner_view.xml
index ed718d80ae6..73e3d9fe974 100644
--- a/openerp/addons/base/res/res_partner_view.xml
+++ b/openerp/addons/base/res/res_partner_view.xml
@@ -186,7 +186,7 @@
 
                     <notebook colspan="4">
                         <page string="Contacts" attrs="{'invisible': [('is_company','=',False)]}">
-                            <field name="child_ids" context="{'default_parent_id': active_id, 'default_use_parent_address': True}" mode="kanban">
+                            <field name="child_ids" mode="kanban" context="{'default_parent_id': active_id, 'default_street': street, 'default_street2': street2, 'default_city': city, 'default_state_id': state_id, 'default_zip': zip, 'default_country_id': country_id}">
                                 <kanban>
                                     <field name="color"/>
                                     <field name="name"/>
@@ -252,20 +252,25 @@
                                     </templates>
                                 </kanban>
                                 <form string="Contact" version="7.0">
-                                    <field name="image" widget='image' class="oe_avatar oe_left" options='{"preview_image": "image_medium"}'/>
-                                    <group>
+                                    <sheet>
+                                        <field name="image" widget='image' class="oe_avatar oe_left" options='{"preview_image": "image_medium"}'/>
+                                        <div class="oe_title">
+                                            <label for="name" class="oe_edit_only"/>
+                                            <h1><field name="name" style="width: 70%%"/></h1>
+                                            <field name="category_id" widget="many2many_tags" placeholder="Tags..." style="width: 70%%"/>
+                                        </div>
                                         <group>
-                                            <field name="name"/>
-                                            <field name="category_id" widget="many2many_tags" placeholder="Tags..."/>
                                             <field name="function" placeholder="e.g. Sales Director"/>
                                             <field name="email"/>
                                             <field name="phone"/>
                                             <field name="mobile"/>
                                         </group>
+                                        <div>
+                                            <field name="use_parent_address"/><label for="use_parent_address"/>
+                                        </div>
                                         <group>
-                                            <field name="use_parent_address"/>
-                                            <label for="type" attrs="{'invisible': [('use_parent_address','=', True)]}"/>
-                                            <div attrs="{'invisible': [('use_parent_address','=', True)]}" name="div_type">
+                                            <label for="type"/>
+                                            <div name="div_type">
                                                 <field class="oe_inline" name="type"/>
                                             </div>
                                             <label for="street" string="Address" attrs="{'invisible': [('use_parent_address','=', True)]}"/>
@@ -280,7 +285,7 @@
                                                 <field name="country_id" placeholder="Country" class="oe_no_button" options='{"no_open": True}'/>
                                             </div>
                                         </group>
-                                    </group>
+                                    </sheet>
                                 </form>
                             </field>
                         </page>

From 5937980b1d20aba620665b21c0d3412cbde04fbf Mon Sep 17 00:00:00 2001
From: Olivier Dony <odo@openerp.com>
Date: Wed, 10 Apr 2013 19:04:37 +0200
Subject: [PATCH 033/121] [FIX] res.partner form view: inherited view now hides
 `use_parent_address` on top of `type` + fix embedded form view too

The `use_parent_address` flag is meant for advanced use
in companies that want to make sure their contact/company
addresses are always in sync, at the possible cost of some
usability loss when editing existing addresses (need to
open the company form view, contact fields are read-only).

The embedded mini-form view of the contacts also need to
be inherited to make it match the main view.

bzr revid: odo@openerp.com-20130410170437-2v4ehptknk6yf1x2
---
 addons/sale/res_partner_view.xml | 26 +++++++++++++++++++++++---
 1 file changed, 23 insertions(+), 3 deletions(-)

diff --git a/addons/sale/res_partner_view.xml b/addons/sale/res_partner_view.xml
index 54a9813eea9..40ac119fdee 100644
--- a/addons/sale/res_partner_view.xml
+++ b/addons/sale/res_partner_view.xml
@@ -63,14 +63,34 @@
             <field name="arch" type="xml">
                 <xpath expr="//label[@for='type']" position="attributes">
                     <attribute name="groups">sale.group_delivery_invoice_address</attribute>
-                </xpath>
-                <xpath expr="//label[@for='type']" position="attributes">
                     <attribute name="invisible">False</attribute>
                 </xpath>
                 <xpath expr="//div[@name='div_type']" position="attributes">
                     <attribute name="invisible">False</attribute>
+                    <attribute name="groups">sale.group_delivery_invoice_address</attribute>
                 </xpath>
-                <xpath expr="//div[@name='div_type']" position="attributes">
+                <xpath expr="//field[@name='use_parent_address']" position="attributes">
+                    <attribute name="invisible">False</attribute>
+                    <attribute name="groups">sale.group_delivery_invoice_address</attribute>
+                </xpath>
+                <xpath expr="//label[@for='use_parent_address']" position="attributes">
+                    <attribute name="invisible">False</attribute>
+                    <attribute name="groups">sale.group_delivery_invoice_address</attribute>
+                </xpath>
+                <xpath expr="//field[@name='child_ids']//field[@name='use_parent_address']" position="attributes">
+                    <attribute name="invisible">False</attribute>
+                    <attribute name="groups">sale.group_delivery_invoice_address</attribute>
+                </xpath>
+                <xpath expr="//field[@name='child_ids']//label[@for='use_parent_address']" position="attributes">
+                    <attribute name="invisible">False</attribute>
+                    <attribute name="groups">sale.group_delivery_invoice_address</attribute>
+                </xpath>
+                <xpath expr="//field[@name='child_ids']//div[@name='div_type']" position="attributes">
+                    <attribute name="invisible">False</attribute>
+                    <attribute name="groups">sale.group_delivery_invoice_address</attribute>
+                </xpath>
+                <xpath expr="//field[@name='child_ids']//label[@for='type']" position="attributes">
+                    <attribute name="invisible">False</attribute>
                     <attribute name="groups">sale.group_delivery_invoice_address</attribute>
                 </xpath>
             </field>

From b9eafcde227a21f2e7a6e4c796cc440244bfd24f Mon Sep 17 00:00:00 2001
From: Olivier Dony <odo@openerp.com>
Date: Thu, 11 Apr 2013 14:55:25 +0200
Subject: [PATCH 034/121] [ADD] account_report_company module: new module for
 adding "commercial entity" m2o on invoices and "Partner Company" dimension on
 Invoice Analysis

bzr revid: odo@openerp.com-20130411125525-1typd4fuuvrbobae
---
 addons/account_report_company/__init__.py     | 25 +++++++++
 addons/account_report_company/__openerp__.py  | 56 +++++++++++++++++++
 .../account_report_company/account_invoice.py | 31 ++++++++++
 .../account_invoice_view.xml                  | 24 ++++++++
 .../account_report_company/report/__init__.py | 24 ++++++++
 .../report/account_invoice_report.py          | 36 ++++++++++++
 .../report/account_invoice_report_view.xml    | 24 ++++++++
 7 files changed, 220 insertions(+)
 create mode 100644 addons/account_report_company/__init__.py
 create mode 100644 addons/account_report_company/__openerp__.py
 create mode 100644 addons/account_report_company/account_invoice.py
 create mode 100644 addons/account_report_company/account_invoice_view.xml
 create mode 100644 addons/account_report_company/report/__init__.py
 create mode 100644 addons/account_report_company/report/account_invoice_report.py
 create mode 100644 addons/account_report_company/report/account_invoice_report_view.xml

diff --git a/addons/account_report_company/__init__.py b/addons/account_report_company/__init__.py
new file mode 100644
index 00000000000..623cb467c25
--- /dev/null
+++ b/addons/account_report_company/__init__.py
@@ -0,0 +1,25 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Business Applications
+#    Copyright (c) 2013 OpenERP S.A. <http://openerp.com>
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+import account_invoice
+import report
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/account_report_company/__openerp__.py b/addons/account_report_company/__openerp__.py
new file mode 100644
index 00000000000..9ee15e1556c
--- /dev/null
+++ b/addons/account_report_company/__openerp__.py
@@ -0,0 +1,56 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Business Applications
+#    Copyright (c) 2013 OpenERP S.A. <http://openerp.com>
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+{
+    'name': 'Invoice Analysis per Company',
+    'version': '1.0',
+    'category': 'Accounting & Finance',
+    'description': """
+Add an extra Company dimension on Invoices for consolidated Invoice Analysis
+============================================================================
+
+By default Customer and Supplier invoices can be linked to a contact within
+a company, but the company is not a direct reference in the database structure for
+invoices. Journal Entries are however always linked to the company and not to
+contacts, so that Accounts Payable and Receivable are always correct and consolidated
+at company level.
+
+When many different contacts/departments need to be invoiced within the same parent company,
+this can make reporting by Company more difficult: reports are directly based on the
+database structure and would not provide an aggregated company dimension.
+
+This modules solves the problem by adding an explicit company reference on invoices,
+automatically computed from the invoice contact, and use this new dimension
+when grouping the list of Invoices or the Invoice Analysis report by Partner. 
+
+Note: this module will likely be removed for the next major OpenERP version and
+directly integrated in the core accounting. 
+""",
+    'author': 'OpenERP SA',
+    'website': 'http://www.openerp.com',
+    'depends': ['account'],
+    'data': [
+        'account_invoice_view.xml',
+        'report/account_invoice_report_view.xml',
+    ],
+    'auto_install': True,
+}
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/account_report_company/account_invoice.py b/addons/account_report_company/account_invoice.py
new file mode 100644
index 00000000000..aae1ee77d0e
--- /dev/null
+++ b/addons/account_report_company/account_invoice.py
@@ -0,0 +1,31 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Business Applications
+#    Copyright (c) 2013 S.A. <http://openerp.com>
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+from openerp.osv import osv, fields
+
+class account_invoice(osv.Model):
+    _inherit = 'account.invoice'
+
+    _columns = {
+        'partner_commercial_id': fields.related('partner_id', 'commercial_id', string='Commercial Entity', type='many2one',
+                                                relation='res.partner', store=True, readonly=True,
+                                                help="The commercial entity that will be used on Journal Entries for this invoice")
+    }
\ No newline at end of file
diff --git a/addons/account_report_company/account_invoice_view.xml b/addons/account_report_company/account_invoice_view.xml
new file mode 100644
index 00000000000..2db2d77ad87
--- /dev/null
+++ b/addons/account_report_company/account_invoice_view.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0"?>
+<openerp>
+    <data>
+        <record model="ir.ui.view" id="account_report_company_tree_view">
+            <field name="model">account.invoice</field>
+            <field name="inherit_id" ref="account.invoice_tree"/>
+            <field name="arch" type="xml">
+                <field name="partner_id" position="after">
+                    <field name="partner_commercial_id" invisible="1"/>
+                </field>
+            </field>
+        </record>
+
+        <record model="ir.ui.view" id="account_report_company_search_view">
+            <field name="model">account.invoice</field>
+            <field name="inherit_id" ref="account.view_account_invoice_filter"/>
+            <field name="arch" type="xml">
+                <filter string="Partner" position="replace">
+                    <filter name="partner_commercial_id" string="Partner" domain="[]" context="{'group_by':'partner_commercial_id'}"/>
+                </filter>
+            </field>
+        </record>
+    </data>
+</openerp>
\ No newline at end of file
diff --git a/addons/account_report_company/report/__init__.py b/addons/account_report_company/report/__init__.py
new file mode 100644
index 00000000000..0fa7453c913
--- /dev/null
+++ b/addons/account_report_company/report/__init__.py
@@ -0,0 +1,24 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Business Applications
+#    Copyright (c) 2013 OpenERP S.A. <http://openerp.com>
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+import account_invoice_report
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/account_report_company/report/account_invoice_report.py b/addons/account_report_company/report/account_invoice_report.py
new file mode 100644
index 00000000000..09cf1caca83
--- /dev/null
+++ b/addons/account_report_company/report/account_invoice_report.py
@@ -0,0 +1,36 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Business Applications
+#    Copyright (c) 2013 OpenERP S.A. <http://openerp.com>
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+from openerp.osv import osv, fields
+
+class account_invoice_report(osv.Model):
+    _inherit = 'account.invoice.report'
+    _columns = {
+        'partner_commercial_id': fields.many2one('res.partner', 'Partner Company', help="Commercial Entity"),
+    }
+
+    def _select(self):
+        return  super(account_invoice_report, self)._select() + ", sub.partner_commercial_id as partner_commercial_id"
+
+    def _sub_select(self):
+        return  super(account_invoice_report, self)._sub_select() + ", ai.partner_commercial_id as partner_commercial_id"
+
+    def _group_by(self):
+        return super(account_invoice_report, self)._group_by() + ", ai.partner_commercial_id"
diff --git a/addons/account_report_company/report/account_invoice_report_view.xml b/addons/account_report_company/report/account_invoice_report_view.xml
new file mode 100644
index 00000000000..bfdc99b1361
--- /dev/null
+++ b/addons/account_report_company/report/account_invoice_report_view.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0"?>
+<openerp>
+    <data>
+        <record model="ir.ui.view" id="account_report_company_invoice_report_tree_view">
+            <field name="model">account.invoice.report</field>
+            <field name="inherit_id" ref="account.view_account_invoice_report_tree"/>
+            <field name="arch" type="xml">
+                <field name="partner_id" position="after">
+                    <field name="partner_commercial_id" invisible="1"/>
+                </field>
+            </field>
+        </record>
+
+        <record model="ir.ui.view" id="account_report_company_invoice_report_search_view">
+            <field name="model">account.invoice.report</field>
+            <field name="inherit_id" ref="account.view_account_invoice_report_search"/>
+            <field name="arch" type="xml">
+                <filter name="partner" position="replace">
+                    <filter string="Partner" name="partner_commercial_id" context="{'group_by':'partner_commercial_id','residual_visible':True}"/>
+                </filter>
+            </field>
+        </record>
+    </data>
+</openerp>
\ No newline at end of file

From 3bd4cef043141500276e743beb8028e1151d4825 Mon Sep 17 00:00:00 2001
From: Olivier Dony <odo@openerp.com>
Date: Thu, 11 Apr 2013 16:56:36 +0200
Subject: [PATCH 035/121] [FIX] sale_stock: when creating invoices after
 delivery, use invoicing contact from SO + update test (reported by Joel
 Grand-Guillaume while reviewing bug 1160365)

The existing tests were modified to explicitly cover
the case where the "invoice partner" is set on the
Sales Order. This minimal change was done with a
!python block because !record triggers the on_change
calls on the SO and cause undesired changes.
This could be improved by creating a new customer
with a real invoicing contact and creating a new
SO.

bzr revid: odo@openerp.com-20130411145636-emmagu7uu5kis1aa
---
 addons/sale_stock/stock.py                      |  2 +-
 addons/sale_stock/test/picking_order_policy.yml | 10 ++++++++--
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/addons/sale_stock/stock.py b/addons/sale_stock/stock.py
index 93acf8579f5..b69a8a27ef6 100644
--- a/addons/sale_stock/stock.py
+++ b/addons/sale_stock/stock.py
@@ -53,7 +53,7 @@ class stock_picking(osv.osv):
             We select the partner of the sales order as the partner of the customer invoice
         """
         if picking.sale_id:
-            return picking.sale_id.partner_id
+            return picking.sale_id.partner_invoice_id
         return super(stock_picking, self)._get_partner_to_invoice(cr, uid, picking, context=context)
 
     def _get_comment_invoice(self, cursor, user, picking):
diff --git a/addons/sale_stock/test/picking_order_policy.yml b/addons/sale_stock/test/picking_order_policy.yml
index 720c79685fa..09a8b73ffee 100644
--- a/addons/sale_stock/test/picking_order_policy.yml
+++ b/addons/sale_stock/test/picking_order_policy.yml
@@ -5,6 +5,12 @@
 -
   !assert {model: sale.order, id: sale.sale_order_6, string: The amount of the Quotation is not correctly computed}:
     - sum([l.price_subtotal for l in order_line]) == amount_untaxed
+- 
+  I set an explicit invoicing partner that is different from the main SO Customer
+-
+  !python {model: sale.order, id: sale.sale_order_6}: |
+    order = self.browse(cr, uid, ref("sale.sale_order_6"))
+    order.write({'partner_invoice_id': ref('base.res_partner_address_29')})
 -
   I confirm the quotation with Invoice based on deliveries policy.
 -
@@ -110,13 +116,13 @@
   !python {model: sale.order}: |
     order = self.browse(cr, uid, ref("sale.sale_order_6"))
     assert order.invoice_ids, "Invoice is not created."
-    ac = order.partner_id.property_account_receivable.id
+    ac = order.partner_invoice_id.property_account_receivable.id
     journal_ids = self.pool.get('account.journal').search(cr, uid, [('type', '=', 'sale'), ('company_id', '=', order.company_id.id)])
     for invoice in order.invoice_ids:
         assert invoice.type == 'out_invoice',"Invoice should be Customer Invoice."
         assert invoice.account_id.id == ac,"Invoice account is not correspond."
         assert invoice.reference == order.client_order_ref or order.name,"Reference is not correspond."
-        assert invoice.partner_id.id == order.partner_id.id,"Customer is not correspond."
+        assert invoice.partner_id.id == order.partner_invoice_id.id,"Customer does not correspond."
         assert invoice.currency_id.id == order.pricelist_id.currency_id.id, "Currency is not correspond."
         assert invoice.comment == (order.note or ''),"Note is not correspond."
         assert invoice.journal_id.id in journal_ids,"Sales Journal is not link on Invoice."

From e78ed60a5afc6e87637b6430a58febefde668754 Mon Sep 17 00:00:00 2001
From: Olivier Dony <odo@openerp.com>
Date: Thu, 11 Apr 2013 21:00:50 +0200
Subject: [PATCH 036/121] [FIX] res.partner: make _address_fields method
 conform to its documented return type (detected by Nhomar Hernandez)

This will make overriddes more straightforward.

bzr revid: odo@openerp.com-20130411190050-8vhx9laialsyrm3r
---
 openerp/addons/base/res/res_partner.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/openerp/addons/base/res/res_partner.py b/openerp/addons/base/res/res_partner.py
index 574590fd2f8..d1122626e58 100644
--- a/openerp/addons/base/res/res_partner.py
+++ b/openerp/addons/base/res/res_partner.py
@@ -393,7 +393,7 @@ class res_partner(osv.osv, format_address):
     def _address_fields(self, cr, uid, context=None):
         """ Returns the list of address fields that are synced from the parent
         when the `use_parent_address` flag is set. """
-        return ADDRESS_FIELDS
+        return list(ADDRESS_FIELDS)
 
     def update_address(self, cr, uid, ids, vals, context=None):
         address_fields = self._address_fields(cr, uid, context=context)

From c5e4faa7dc62e1494e9d20f88aa6c5f1dc59ae98 Mon Sep 17 00:00:00 2001
From: Olivier Dony <odo@openerp.com>
Date: Thu, 11 Apr 2013 21:11:10 +0200
Subject: [PATCH 037/121] [FIX] res.partner: make the computed display_address
 use all address fields, including extra/custom ones

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

bzr revid: odo@openerp.com-20130411191110-5q7vd77m0e78dg8u
---
 openerp/addons/base/res/res_partner.py | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/openerp/addons/base/res/res_partner.py b/openerp/addons/base/res/res_partner.py
index d1122626e58..b8b3497375c 100644
--- a/openerp/addons/base/res/res_partner.py
+++ b/openerp/addons/base/res/res_partner.py
@@ -688,8 +688,7 @@ class res_partner(osv.osv, format_address):
             'country_name': address.country_id and address.country_id.name or '',
             'company_name': address.parent_id and address.parent_id.name or '',
         }
-        address_field = ['title', 'street', 'street2', 'zip', 'city']
-        for field in address_field :
+        for field in self._address_fields(cr, uid, context=context):
             args[field] = getattr(address, field) or ''
         if without_company:
             args['company_name'] = ''

From 556e4e76c37419c810bfe0da6b13f2a19c4f0a72 Mon Sep 17 00:00:00 2001
From: Olivier Dony <odo@openerp.com>
Date: Mon, 15 Apr 2013 19:52:58 +0200
Subject: [PATCH 038/121] [FIX] l10n_ro: unique constraints on `vat` and `nrc`
 columns need to be updated for 7.0 model

With the 7.0 model all accounting-related fields are synchronized
from company to contacts (both are res.partner records), so the
unique check is not a trivial unique constraint. It must be updated
to use a *partial unique index* that applies only to "commercial
entities" and not to contacts. The condition for being a commercial
entity is "is_company is true or parent_id is NULL".
If companies have unique vat/nrc numbers, then their contacts
will be consistent because they are automatically synchronized,
so the uniqueness between contacts does not have to be checked.
(The auto-sync is performed by res.partner automatically and covered
by tests in the "base" module)

bzr revid: odo@openerp.com-20130415175258-l15meqin80sbhggu
---
 addons/l10n_ro/res_partner.py | 23 +++++++++++++++++++++--
 1 file changed, 21 insertions(+), 2 deletions(-)

diff --git a/addons/l10n_ro/res_partner.py b/addons/l10n_ro/res_partner.py
index 95867f8e883..4720c6f8157 100755
--- a/addons/l10n_ro/res_partner.py
+++ b/addons/l10n_ro/res_partner.py
@@ -28,11 +28,30 @@ class res_partner(osv.osv):
     _columns = {
         'nrc' : fields.char('NRC', size=16, help='Registration number at the Registry of Commerce'),
     }
+
+    # The SQL constraints are no-ops but present only to display the right error message to the
+    # user when the partial unique indexes defined below raise errors/  
+    # The real constraints need to be implemented with PARTIAL UNIQUE INDEXES (see auto_init),
+    # due to the way accounting data is delegated by contacts to their companies in OpenERP 7.0.
     _sql_constraints = [
-       ('vat_uniq', 'unique (vat)', 'The vat of the partner must be unique !'),
-       ('nrc_uniq', 'unique (nrc)', 'The code of the partner must be unique !')
+       ('vat_uniq', 'unique (id)', 'The vat of the partner must be unique !'),
+       ('nrc_uniq', 'unique (id)', 'The code of the partner must be unique !')
     ]
 
+    def _auto_init(self, cr, context=None):
+        result = super(res_partner, self)._auto_init(cr, context=context)
+        # Real implementation of the vat/nrc constraints: only "commercial entities" need to have
+        # unique numbers, and the condition for being a commercial entity is "is_company or parent_id IS NULL".
+        # Contacts inside a company automatically have a copy of the company's commercial fields
+        # (see _commercial_fields()), so they are automatically consistent.
+        cr.execute("""
+            DROP INDEX IF EXISTS res_partner_vat_uniq_for_companies;
+            DROP INDEX IF EXISTS res_partner_nrc_uniq_for_companies;
+            CREATE UNIQUE INDEX res_partner_vat_uniq_for_companies ON res_partner (vat) WHERE is_company OR parent_id IS NULL;
+            CREATE UNIQUE INDEX res_partner_nrc_uniq_for_companies ON res_partner (nrc) WHERE is_company OR parent_id IS NULL;
+        """)
+        return result
+
     def _commercial_fields(self, cr, uid, context=None):
         return super(res_partner, self)._commercial_fields(cr, uid, context=context) + ['nrc']
 

From 2c6d69e0f1b0d6af7ed1727ebc56188563bb04e6 Mon Sep 17 00:00:00 2001
From: Olivier Dony <odo@openerp.com>
Date: Tue, 16 Apr 2013 11:10:27 +0200
Subject: [PATCH 039/121] [FIX] res.partner: propagate `is_supplier` property
 when creating parent or child partner for a supplier

This is not necessary for the `is_customer` flag, as it is
always True by default (customers are created more frequently).
Passing the field value via an invisible field in the mini
contact form is necessary because context `default_*` values are
automatically discarded by the ORM when creating o2m
or m2m records (as they are supposed to apply to a different model).

bzr revid: odo@openerp.com-20130416091027-y7iwvpjhowg53lry
---
 openerp/addons/base/res/res_partner_view.xml | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/openerp/addons/base/res/res_partner_view.xml b/openerp/addons/base/res/res_partner_view.xml
index cdef8f0c016..7c414da5966 100644
--- a/openerp/addons/base/res/res_partner_view.xml
+++ b/openerp/addons/base/res/res_partner_view.xml
@@ -138,7 +138,7 @@
                         </h1>
                         <field name="parent_id"
                             placeholder="Company"
-                            domain="[('is_company', '=', True)]" context="{'default_is_company': True}"
+                            domain="[('is_company', '=', True)]" context="{'default_is_company': True, 'default_supplier': supplier}"
                             attrs="{'invisible': [('is_company','=', True)]}"
                             on_change="onchange_address(use_parent_address, parent_id)"/>
                         <field name="category_id" widget="many2many_tags" placeholder="Tags..."/>
@@ -186,7 +186,7 @@
 
                     <notebook colspan="4">
                         <page string="Contacts" attrs="{'invisible': [('is_company','=',False)]}" autofocus="autofocus">
-                            <field name="child_ids" mode="kanban" context="{'default_parent_id': active_id, 'default_street': street, 'default_street2': street2, 'default_city': city, 'default_state_id': state_id, 'default_zip': zip, 'default_country_id': country_id}">
+                            <field name="child_ids" mode="kanban" context="{'default_parent_id': active_id, 'default_street': street, 'default_street2': street2, 'default_city': city, 'default_state_id': state_id, 'default_zip': zip, 'default_country_id': country_id, 'default_supplier': supplier}">
                                 <kanban>
                                     <field name="color"/>
                                     <field name="name"/>
@@ -285,6 +285,7 @@
                                                 <field name="country_id" placeholder="Country" class="oe_no_button" options='{"no_open": True}'/>
                                             </div>
                                         </group>
+                                        <field name="supplier" invisible="True"/>
                                     </sheet>
                                 </form>
                             </field>

From d734bf58cc0475bbeb65567a92216e6e79422576 Mon Sep 17 00:00:00 2001
From: Olivier Dony <odo@openerp.com>
Date: Tue, 16 Apr 2013 11:31:21 +0200
Subject: [PATCH 040/121] [FIX] res.partner: name_get: return "Company,
 Contact" rather than "Contact (Company)" to make it clearer that the company
 is selected as well

bzr revid: odo@openerp.com-20130416093121-t5soophs2aui8rzq
---
 openerp/addons/base/res/res_partner.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/openerp/addons/base/res/res_partner.py b/openerp/addons/base/res/res_partner.py
index fe2cd26e43b..f578f969c4d 100644
--- a/openerp/addons/base/res/res_partner.py
+++ b/openerp/addons/base/res/res_partner.py
@@ -516,7 +516,7 @@ class res_partner(osv.osv, format_address):
         for record in self.browse(cr, uid, ids, context=context):
             name = record.name
             if record.parent_id:
-                name =  "%s (%s)" % (name, record.parent_id.name)
+                name =  "%s, %s" % (record.parent_id.name, name)
             if context.get('show_address'):
                 name = name + "\n" + self._display_address(cr, uid, record, without_company=True, context=context)
                 name = name.replace('\n\n','\n')

From 06cd0a1c7f99cb742a182a654f27e96f982b9d5b Mon Sep 17 00:00:00 2001
From: Olivier Dony <odo@openerp.com>
Date: Tue, 16 Apr 2013 11:34:03 +0200
Subject: [PATCH 041/121] [FIX] res.partner: avoid hiding `parent_id` and
 `child_ids` fields if they are set, irregardless of the rest of the
 `is_company` flag

This prevents hiding real data and also allows creating more
complex/flexible structures by setting the values of these
fields before or after setting is_company, to reach the
desired result.

bzr revid: odo@openerp.com-20130416093403-9m484d30qqq5ab8l
---
 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 7c414da5966..ce97cba4992 100644
--- a/openerp/addons/base/res/res_partner_view.xml
+++ b/openerp/addons/base/res/res_partner_view.xml
@@ -139,7 +139,7 @@
                         <field name="parent_id"
                             placeholder="Company"
                             domain="[('is_company', '=', True)]" context="{'default_is_company': True, 'default_supplier': supplier}"
-                            attrs="{'invisible': [('is_company','=', True)]}"
+                            attrs="{'invisible': [('is_company','=', True),('parent_id', '=', False)]}"
                             on_change="onchange_address(use_parent_address, parent_id)"/>
                         <field name="category_id" widget="many2many_tags" placeholder="Tags..."/>
                     </div>
@@ -185,7 +185,7 @@
                     </group>
 
                     <notebook colspan="4">
-                        <page string="Contacts" attrs="{'invisible': [('is_company','=',False)]}" autofocus="autofocus">
+                        <page string="Contacts" attrs="{'invisible': [('is_company','=',False), ('child_ids', '=', False)]}" autofocus="autofocus">
                             <field name="child_ids" mode="kanban" context="{'default_parent_id': active_id, 'default_street': street, 'default_street2': street2, 'default_city': city, 'default_state_id': state_id, 'default_zip': zip, 'default_country_id': country_id, 'default_supplier': supplier}">
                                 <kanban>
                                     <field name="color"/>

From c2f02f67982d311fb111c2c1f889ac046dd6ecdd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Wed, 17 Apr 2013 10:59:27 +0200
Subject: [PATCH 042/121] [FIX] mail, crm: fixed some access rights issues when
 using chatter on a document without access rights with portal users.

bzr revid: tde@openerp.com-20130417085927-wg07siehk2uhrkpu
---
 addons/crm/crm_lead.py     | 18 +++++++++++-------
 addons/mail/mail_thread.py |  9 ++++++---
 2 files changed, 17 insertions(+), 10 deletions(-)

diff --git a/addons/crm/crm_lead.py b/addons/crm/crm_lead.py
index cf7935dc160..8179ffa0541 100644
--- a/addons/crm/crm_lead.py
+++ b/addons/crm/crm_lead.py
@@ -23,8 +23,9 @@ from openerp.addons.base_status.base_stage import base_stage
 import crm
 from datetime import datetime
 from operator import itemgetter
-from openerp.osv import fields, osv
+from openerp.osv import fields, osv, orm
 import time
+from openerp import SUPERUSER_ID
 from openerp import tools
 from openerp.tools.translate import _
 from openerp.tools import html2plaintext
@@ -972,15 +973,18 @@ class crm_lead(base_stage, format_address, osv.osv):
     def message_get_reply_to(self, cr, uid, ids, context=None):
         """ Override to get the reply_to of the parent project. """
         return [lead.section_id.message_get_reply_to()[0] if lead.section_id else False
-                    for lead in self.browse(cr, uid, ids, context=context)]
+                    for lead in self.browse(cr, SUPERUSER_ID, ids, context=context)]
 
     def message_get_suggested_recipients(self, cr, uid, ids, context=None):
         recipients = super(crm_lead, self).message_get_suggested_recipients(cr, uid, ids, context=context)
-        for lead in self.browse(cr, uid, ids, context=context):
-            if lead.partner_id:
-                self._message_add_suggested_recipient(cr, uid, recipients, lead, partner=lead.partner_id, reason=_('Customer'))
-            elif lead.email_from:
-                self._message_add_suggested_recipient(cr, uid, recipients, lead, email=lead.email_from, reason=_('Customer Email'))
+        try:
+            for lead in self.browse(cr, uid, ids, context=context):
+                if lead.partner_id:
+                    self._message_add_suggested_recipient(cr, uid, recipients, lead, partner=lead.partner_id, reason=_('Customer'))
+                elif lead.email_from:
+                    self._message_add_suggested_recipient(cr, uid, recipients, lead, email=lead.email_from, reason=_('Customer Email'))
+        except (osv.except_osv, orm.except_orm):  # no read access rights -> just ignore suggested recipients because this imply modifying followers
+            pass
         return recipients
 
     def message_new(self, cr, uid, msg, custom_values=None, context=None):
diff --git a/addons/mail/mail_thread.py b/addons/mail/mail_thread.py
index 631119ad28d..83a1df96bdf 100644
--- a/addons/mail/mail_thread.py
+++ b/addons/mail/mail_thread.py
@@ -33,7 +33,7 @@ from email.message import Message
 from openerp import tools
 from openerp import SUPERUSER_ID
 from openerp.addons.mail.mail_message import decode
-from openerp.osv import fields, osv
+from openerp.osv import fields, osv, orm
 from openerp.tools.safe_eval import safe_eval as eval
 from openerp.tools.translate import _
 
@@ -419,7 +419,7 @@ class mail_thread(osv.AbstractModel):
         return ["%s@%s" % (record['alias_name'], record['alias_domain'])
                     if record.get('alias_domain') and record.get('alias_name')
                     else False
-                    for record in self.read(cr, uid, ids, ['alias_name', 'alias_domain'], context=context)]
+                    for record in self.read(cr, SUPERUSER_ID, ids, ['alias_name', 'alias_domain'], context=context)]
 
     #------------------------------------------------------
     # Mail gateway
@@ -1156,7 +1156,10 @@ class mail_thread(osv.AbstractModel):
         """ Add partners to the records followers. """
         user_pid = self.pool.get('res.users').read(cr, uid, uid, ['partner_id'], context=context)['partner_id'][0]
         if set(partner_ids) == set([user_pid]):
-            self.check_access_rights(cr, uid, 'read')
+            try:
+                self.check_access_rights(cr, uid, 'read')
+            except (osv.except_osv, orm.except_orm):
+                return
         else:
             self.check_access_rights(cr, uid, 'write')
 

From ef210bd48998fe1b91eb3916bcc6223e1b609580 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Tue, 16 Apr 2013 16:11:45 +0200
Subject: [PATCH 043/121] [FIX] project: default visibility is employees only.
 Updated demo data by the way.

bzr revid: tde@openerp.com-20130416141145-3tsaz7u51xt80rer
---
 addons/project/project.py       | 4 ++--
 addons/project/project_demo.xml | 4 +++-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/addons/project/project.py b/addons/project/project.py
index 739a54fe403..a5e540c8be7 100644
--- a/addons/project/project.py
+++ b/addons/project/project.py
@@ -293,8 +293,8 @@ class project(osv.osv):
         'sequence': 10,
         'type_ids': _get_type_common,
         'alias_model': 'project.task',
-        'privacy_visibility': 'public',
-        'alias_domain': False, # always hide alias during creation
+        'privacy_visibility': 'employees',
+        'alias_domain': False,  # always hide alias during creation
     }
 
     # TODO: Why not using a SQL contraints ?
diff --git a/addons/project/project_demo.xml b/addons/project/project_demo.xml
index f5fbf878fd0..b7dcc2bdb83 100644
--- a/addons/project/project_demo.xml
+++ b/addons/project/project_demo.xml
@@ -62,7 +62,7 @@
             <field name="name">E-Learning Integration</field>
             <field name="user_id" ref="base.user_demo"/>
             <field name="alias_model">project.task</field>
-            <field name="privacy_visibility">public</field>
+            <field name="privacy_visibility">employees</field>
             <field name="members" eval="[(4, ref('base.user_root')), (4, ref('base.user_demo'))]"/>
         </record>
 
@@ -76,6 +76,7 @@
             <field name="name">Website Design Templates</field>
             <field name="user_id" ref="base.user_root"/>
             <field name="alias_model">project.task</field>
+            <field name="privacy_visibility">employees</field>
             <field name="members" eval="[(4, ref('base.user_root')), (4,ref('base.user_demo'))]"/>
         </record>
 
@@ -89,6 +90,7 @@
             <field name="partner_id" ref="base.res_partner_7"/>
             <field name="name">Data Import/Export Plugin</field>
             <field name="alias_model">project.task</field>
+            <field name="privacy_visibility">followers</field>
             <field name="members" eval="[(6, 0, [
                     ref('base.user_root'),
                     ref('base.user_demo')])]"/>

From 600513f09fedf9d4e8799a895c7bb4f12e78eb3e Mon Sep 17 00:00:00 2001
From: Stephane Wirtel <stw@openerp.com>
Date: Wed, 17 Apr 2013 16:58:29 +0200
Subject: [PATCH 044/121] [FIX] account: avoid a crash if the user does not
 select an existing chart.

bzr revid: stw@openerp.com-20130417145829-0juk1t6ikbcts7v8
---
 addons/account/installer.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/account/installer.py b/addons/account/installer.py
index 7ef1b59dcbd..776b4dfe0e2 100644
--- a/addons/account/installer.py
+++ b/addons/account/installer.py
@@ -171,7 +171,7 @@ class account_installer(osv.osv_memory):
         chart = self.read(cr, uid, ids, ['charts'],
                           context=context)[0]['charts']
         _logger.debug('Installing chart of accounts %s', chart)
-        return (modules | set([chart])) - set(['has_default_company'])
+        return (modules | set([chart])) - set(['has_default_company', 'configurable'])
 
 account_installer()
 

From 4f874848056676055c0d0542ca55b254108b5bf2 Mon Sep 17 00:00:00 2001
From: Antony Lesuisse <al@openerp.com>
Date: Thu, 18 Apr 2013 03:04:10 +0200
Subject: [PATCH 045/121] [FIX] ir.cron add a safeguard mecanism against
 version mistach when polling

bzr revid: al@openerp.com-20130418010410-0zz1zkexnjzjp3si
---
 openerp/addons/base/ir/ir_cron.py | 20 ++++++++++++++------
 1 file changed, 14 insertions(+), 6 deletions(-)

diff --git a/openerp/addons/base/ir/ir_cron.py b/openerp/addons/base/ir/ir_cron.py
index a5c11d01152..24a522f6309 100644
--- a/openerp/addons/base/ir/ir_cron.py
+++ b/openerp/addons/base/ir/ir_cron.py
@@ -31,9 +31,12 @@ from openerp.osv import fields, osv
 from openerp.tools import DEFAULT_SERVER_DATETIME_FORMAT
 from openerp.tools.safe_eval import safe_eval as eval
 from openerp.tools.translate import _
+from openerp.modules import load_information_from_description_file
 
 _logger = logging.getLogger(__name__)
 
+BASE_VERSION = load_information_from_description_file('base')['version']
+
 def str2tuple(s):
     return eval('tuple(%s)' % (s or ''))
 
@@ -186,12 +189,17 @@ class ir_cron(osv.osv):
         cr = db.cursor()
         jobs = []
         try:
-            # Careful to compare timestamps with 'UTC' - everything is UTC as of v6.1.
-            cr.execute("""SELECT * FROM ir_cron
-                          WHERE numbercall != 0
-                              AND active AND nextcall <= (now() at time zone 'UTC')
-                          ORDER BY priority""")
-            jobs = cr.dictfetchall()
+            # Make sure the database we poll has the same version as the code of base
+            cr.execute("SELECT 1 FROM ir_module_module WHERE name=%s AND latest_version=%s", ('base', BASE_VERSION))
+            if cr.fetchone():
+                # Careful to compare timestamps with 'UTC' - everything is UTC as of v6.1.
+                cr.execute("""SELECT * FROM ir_cron
+                              WHERE numbercall != 0
+                                  AND active AND nextcall <= (now() at time zone 'UTC')
+                              ORDER BY priority""")
+                jobs = cr.dictfetchall()
+            else:
+                _logger.warning('Skipping database %s as its base version is not %s.', db_name, BASE_VERSION)
         except psycopg2.ProgrammingError, e:
             if e.pgcode == '42P01':
                 # Class 42 — Syntax Error or Access Rule Violation; 42P01: undefined_table

From dcd398d33edfa6fb76ae9efa8eefeb944a38c0ad Mon Sep 17 00:00:00 2001
From: Launchpad Translations on behalf of openerp <>
Date: Thu, 18 Apr 2013 06:06:03 +0000
Subject: [PATCH 046/121] Launchpad automatic translations update.

bzr revid: launchpad_translations_on_behalf_of_openerp-20130418060603-ondw9hx00c1rmh33
---
 addons/account/i18n/nl.po           |   6 +-
 addons/account/i18n/tr.po           |  24 +--
 addons/base_calendar/i18n/ro.po     | 288 ++++++++++++++--------------
 addons/base_import/i18n/tr.po       |  77 ++++----
 addons/base_setup/i18n/tr.po        |  10 +-
 addons/knowledge/i18n/ro.po         |  42 ++--
 addons/procurement/i18n/de.po       |  11 +-
 addons/project_long_term/i18n/tr.po |  15 +-
 addons/purchase/i18n/de.po          |  11 +-
 addons/sale_stock/i18n/de.po        |  11 +-
 10 files changed, 255 insertions(+), 240 deletions(-)

diff --git a/addons/account/i18n/nl.po b/addons/account/i18n/nl.po
index d1b10df8122..ea215b2a9e8 100644
--- a/addons/account/i18n/nl.po
+++ b/addons/account/i18n/nl.po
@@ -8,13 +8,13 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2013-03-07 08:37+0000\n"
-"PO-Revision-Date: 2013-04-16 11:34+0000\n"
+"PO-Revision-Date: 2013-04-17 19:01+0000\n"
 "Last-Translator: Erwin van der Ploeg (Endian Solutions) <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: 2013-04-17 05:57+0000\n"
+"X-Launchpad-Export-Date: 2013-04-18 06:05+0000\n"
 "X-Generator: Launchpad (build 16567)\n"
 
 #. module: account
@@ -11105,7 +11105,7 @@ msgstr "Niet-gerealiseerde winst of verlies"
 #: view:account.move:0
 #: view:account.move.line:0
 msgid "States"
-msgstr "Provincies"
+msgstr "Statussen"
 
 #. module: account
 #: help:product.category,property_account_income_categ:0
diff --git a/addons/account/i18n/tr.po b/addons/account/i18n/tr.po
index 67cfd37875e..7ef00787437 100644
--- a/addons/account/i18n/tr.po
+++ b/addons/account/i18n/tr.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2013-03-07 08:37+0000\n"
-"PO-Revision-Date: 2013-04-13 17:18+0000\n"
+"PO-Revision-Date: 2013-04-17 19:07+0000\n"
 "Last-Translator: Ayhan KIZILTAN <Unknown>\n"
 "Language-Team: OpenERP Türkiye Yerelleştirmesi\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-04-14 05:49+0000\n"
-"X-Generator: Launchpad (build 16564)\n"
+"X-Launchpad-Export-Date: 2013-04-18 06:05+0000\n"
+"X-Generator: Launchpad (build 16567)\n"
 "Language: tr\n"
 
 #. module: account
@@ -429,7 +429,7 @@ msgstr "Oluşturma tarihi"
 #. module: account
 #: view:account.invoice:0
 msgid "Cancel Invoice"
-msgstr "Faturayı İptalet"
+msgstr "Fatura İptal et"
 
 #. module: account
 #: selection:account.journal,type:0
@@ -1391,7 +1391,7 @@ msgstr ""
 #. module: account
 #: view:account.invoice.cancel:0
 msgid "Cancel Invoices"
-msgstr "Faturaları İptal Et"
+msgstr "Faturaları İptal et"
 
 #. module: account
 #: help:account.journal,code:0
@@ -4869,7 +4869,7 @@ msgstr ""
 #. module: account
 #: model:ir.model,name:account.model_account_invoice_cancel
 msgid "Cancel the Selected Invoices"
-msgstr "Seçilen Faturaları İptal Et"
+msgstr "Seçilen Faturaları İptal et"
 
 #. module: account
 #: code:addons/account/account_bank_statement.py:423
@@ -5350,7 +5350,7 @@ msgstr "Onaylandı"
 #. module: account
 #: report:account.invoice:0
 msgid "Cancelled Invoice"
-msgstr "İptal Fatura"
+msgstr "İptal edilmiş fatura"
 
 #. module: account
 #: view:account.invoice:0
@@ -5681,7 +5681,7 @@ msgstr "KDV Hesabı Bildirimi"
 #. module: account
 #: view:account.bank.statement:0
 msgid "Cancel Statement"
-msgstr "Hesap özeti İptal et"
+msgstr ""
 
 #. module: account
 #: help:account.config.settings,module_account_accountant:0
@@ -6016,7 +6016,7 @@ msgstr ""
 #. module: account
 #: field:account.journal,update_posted:0
 msgid "Allow Cancelling Entries"
-msgstr "Kayıtları iptale izin ver"
+msgstr "Kayıtları İptale İzin ver"
 
 #. module: account
 #: code:addons/account/wizard/account_use_model.py:44
@@ -7627,7 +7627,7 @@ msgstr "Elle"
 #. module: account
 #: selection:account.invoice.refund,filter_refund:0
 msgid "Cancel: create refund and reconcile"
-msgstr "İptal: İade oluştur ve uzlaştır"
+msgstr "İptal: iade oluştur ve uzlaştır"
 
 #. module: account
 #: code:addons/account/wizard/account_report_aged_partner_balance.py:58
@@ -10617,8 +10617,8 @@ msgid ""
 "Selected invoice(s) cannot be cancelled as they are already in 'Cancelled' "
 "or 'Done' state."
 msgstr ""
-"Seçili fatura(lar) halihazırda 'İptal edildi' ya da 'Yapıldı' durumunda "
-"olduğundan iptal edilemez."
+"Seçili fatura(lar) zaten 'İptal edildi' ya da 'Yapıldı' durumunda olduğundan "
+"iptal edilemez."
 
 #. module: account
 #: report:account.analytic.account.quantity_cost_ledger:0
diff --git a/addons/base_calendar/i18n/ro.po b/addons/base_calendar/i18n/ro.po
index 81ebd3cf983..967bea740a0 100644
--- a/addons/base_calendar/i18n/ro.po
+++ b/addons/base_calendar/i18n/ro.po
@@ -8,20 +8,20 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2013-03-07 08:37+0000\n"
-"PO-Revision-Date: 2013-03-07 18:30+0000\n"
-"Last-Translator: Fekete Mihai <mihai@erpsystems.ro>\n"
+"PO-Revision-Date: 2013-04-17 18:21+0000\n"
+"Last-Translator: Dorin <dhongu@gmail.com>\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: 2013-03-28 05:33+0000\n"
-"X-Generator: Launchpad (build 16546)\n"
+"X-Launchpad-Export-Date: 2013-04-18 06:05+0000\n"
+"X-Generator: Launchpad (build 16567)\n"
 
 #. module: base_calendar
 #: selection:calendar.alarm,trigger_related:0
 #: selection:res.alarm,trigger_related:0
 msgid "The event starts"
-msgstr "Incepe evenimentul"
+msgstr "Începe evenimentul"
 
 #. module: base_calendar
 #: view:calendar.event:0
@@ -36,15 +36,15 @@ msgid ""
 "This property defines the list of date/time exceptions for a recurring "
 "calendar component."
 msgstr ""
-"Aceasta proprietate defineste lista exceptiilor datii/timpului pentru o "
-"componenta recurenta a calendarului."
+"Această proprietate definește lista excepțiilor datei/timpului pentru o "
+"componenta recurentă a calendarului."
 
 #. module: base_calendar
 #: selection:calendar.event,rrule_type:0
 #: selection:calendar.todo,rrule_type:0
 #: selection:crm.meeting,rrule_type:0
 msgid "Week(s)"
-msgstr "Saptamani"
+msgstr "Săptămâni"
 
 #. module: base_calendar
 #: field:calendar.event,we:0
@@ -56,19 +56,19 @@ msgstr "Miercuri"
 #. module: base_calendar
 #: selection:calendar.attendee,cutype:0
 msgid "Unknown"
-msgstr "Necunoscut(a)"
+msgstr "Necunoscut(ă)"
 
 #. module: base_calendar
 #: help:calendar.event,recurrency:0
 #: help:calendar.todo,recurrency:0
 #: help:crm.meeting,recurrency:0
 msgid "Recurrent Meeting"
-msgstr "Intalnire recurenta"
+msgstr "Întalnire recurentă"
 
 #. module: base_calendar
 #: model:crm.meeting.type,name:base_calendar.categ_meet5
 msgid "Feedback Meeting"
-msgstr "Feedback Intalnire"
+msgstr "Feedback întalnire"
 
 #. module: base_calendar
 #: model:ir.actions.act_window,name:base_calendar.action_res_alarm_view
@@ -81,7 +81,7 @@ msgstr "Alarme"
 #: selection:calendar.todo,week_list:0
 #: selection:crm.meeting,week_list:0
 msgid "Sunday"
-msgstr "Duminica"
+msgstr "Duminică"
 
 #. module: base_calendar
 #: field:calendar.attendee,role:0
@@ -92,7 +92,7 @@ msgstr "Rol"
 #: view:calendar.event:0
 #: view:crm.meeting:0
 msgid "Invitation details"
-msgstr "Detalii invitatie"
+msgstr "Detalii invitație"
 
 #. module: base_calendar
 #: selection:calendar.event,byday:0
@@ -109,7 +109,7 @@ msgstr "Al patrulea (a patra)"
 #: field:crm.meeting,day:0
 #: selection:crm.meeting,select1:0
 msgid "Date of month"
-msgstr "Data din luna"
+msgstr "Dată din lună"
 
 #. module: base_calendar
 #: selection:calendar.event,class:0
@@ -134,13 +134,13 @@ msgstr "Martie"
 #. module: base_calendar
 #: help:calendar.attendee,cutype:0
 msgid "Specify the type of Invitation"
-msgstr "Specifica tipul Invitatiei"
+msgstr "Specifică tipul invitației"
 
 #. module: base_calendar
 #: view:crm.meeting:0
 #: field:crm.meeting,message_unread:0
 msgid "Unread Messages"
-msgstr "Mesaje Necitite"
+msgstr "Mesaje necitite"
 
 #. module: base_calendar
 #: selection:calendar.event,week_list:0
@@ -154,7 +154,7 @@ msgstr "Vineri"
 #: field:calendar.todo,allday:0
 #: field:crm.meeting,allday:0
 msgid "All Day"
-msgstr "Toata ziua"
+msgstr "Toată ziua"
 
 #. module: base_calendar
 #: field:calendar.event,vtimezone:0
@@ -169,17 +169,17 @@ msgstr "Fus orar"
 #: selection:calendar.todo,show_as:0
 #: selection:crm.meeting,show_as:0
 msgid "Free"
-msgstr "Gratuit"
+msgstr "Liber"
 
 #. module: base_calendar
 #: help:crm.meeting,message_unread:0
 msgid "If checked new messages require your attention."
-msgstr "Daca este selectat, mesajele noi necesita atentia dumneavoastra."
+msgstr "Dacă este selectat, mesajele noi necesită atenția dumneavoastră."
 
 #. module: base_calendar
 #: help:calendar.attendee,rsvp:0
 msgid "Indicats whether the favor of a reply is requested"
-msgstr "Indica daca este obligatoriu un raspuns"
+msgstr "Indică dacă este obligatoriu un raspuns"
 
 #. module: base_calendar
 #: field:calendar.alarm,alarm_id:0
@@ -189,7 +189,7 @@ msgstr "Alarma de baza"
 #. module: base_calendar
 #: help:calendar.attendee,delegated_to:0
 msgid "The users that the original request was delegated to"
-msgstr "Utilizatorii carora le-a fost delegata cererea originala"
+msgstr "Utilizatorii cărora le-a fost delegată cererea originală"
 
 #. module: base_calendar
 #: field:calendar.attendee,ref:0
@@ -201,7 +201,7 @@ msgstr "Ref eveniment"
 #: field:calendar.todo,tu:0
 #: field:crm.meeting,tu:0
 msgid "Tue"
-msgstr "Marti"
+msgstr "Marți"
 
 #. module: base_calendar
 #: selection:calendar.event,byday:0
@@ -214,7 +214,7 @@ msgstr "Al treilea (a treia)"
 #: selection:calendar.alarm,trigger_related:0
 #: selection:res.alarm,trigger_related:0
 msgid "The event ends"
-msgstr "Evenimentul se incheie"
+msgstr "Evenimentul se încheie"
 
 #. module: base_calendar
 #: selection:calendar.event,byday:0
@@ -226,7 +226,7 @@ msgstr "Ultimul/a"
 #. module: base_calendar
 #: help:crm.meeting,message_ids:0
 msgid "Messages and communication history"
-msgstr "Istoric mesaje si conversatii"
+msgstr "Istoric mesaje și conversații"
 
 #. module: base_calendar
 #: field:crm.meeting,message_ids:0
@@ -242,7 +242,7 @@ msgstr "Zile"
 #. module: base_calendar
 #: view:calendar.event:0
 msgid "To"
-msgstr "Catre"
+msgstr "Către"
 
 #. module: base_calendar
 #: code:addons/base_calendar/base_calendar.py:1260
@@ -253,12 +253,12 @@ msgstr "Eroare!"
 #. module: base_calendar
 #: selection:calendar.attendee,role:0
 msgid "Chair Person"
-msgstr "Presedinte"
+msgstr "Președinte"
 
 #. module: base_calendar
 #: view:crm.meeting:0
 msgid "My Meetings"
-msgstr "Intalnirile mele"
+msgstr "Întâlnirile mele"
 
 #. module: base_calendar
 #: selection:calendar.alarm,action:0
@@ -276,7 +276,7 @@ msgstr "ID recurent"
 #: selection:calendar.event,state:0
 #: selection:calendar.todo,state:0
 msgid "Cancelled"
-msgstr "Anulat(a)"
+msgstr "Anulat(ă)"
 
 #. module: base_calendar
 #: selection:calendar.alarm,trigger_interval:0
@@ -287,7 +287,7 @@ msgstr "Minute"
 #. module: base_calendar
 #: selection:calendar.alarm,action:0
 msgid "Display"
-msgstr "Afiseaza"
+msgstr "Afișează"
 
 #. module: base_calendar
 #: help:calendar.attendee,state:0
@@ -297,38 +297,38 @@ msgstr "Statusul participarii participantului"
 #. module: base_calendar
 #: view:crm.meeting:0
 msgid "Mail To"
-msgstr "E-mail catre"
+msgstr "E-mail către"
 
 #. module: base_calendar
 #: field:crm.meeting,name:0
 msgid "Meeting Subject"
-msgstr "Subiectul Intalnirii"
+msgstr "Subiectul întâlnirii"
 
 #. module: base_calendar
 #: view:calendar.event:0
 msgid "End of Recurrence"
-msgstr "Sfarsitul Recurentei"
+msgstr "Sfârșitul Recurenței"
 
 #. module: base_calendar
 #: view:calendar.event:0
 msgid "Group By..."
-msgstr "Grupeaza dupa..."
+msgstr "Grupează după..."
 
 #. module: base_calendar
 #: view:calendar.event:0
 msgid "Recurrency Option"
-msgstr "Optiune Recurenta"
+msgstr "Opțiune Recurență"
 
 #. module: base_calendar
 #: view:calendar.event:0
 msgid "Choose day where repeat the meeting"
-msgstr "Alegeti ziua in care sa repetati intalnirea"
+msgstr "Alegeți ziua în care să repetați întâlnirea"
 
 #. module: base_calendar
 #: view:crm.meeting:0
 #: model:ir.actions.act_window,name:base_calendar.action_crm_meeting
 msgid "Meetings"
-msgstr "Intalniri"
+msgstr "Întâlniri"
 
 #. module: base_calendar
 #: field:calendar.event,recurrent_id_date:0
@@ -341,12 +341,12 @@ msgstr "Data ID-ului recurent"
 #: field:calendar.alarm,event_end_date:0
 #: field:calendar.attendee,event_end_date:0
 msgid "Event End Date"
-msgstr "Data de sfarsit a evenimentului"
+msgstr "Data de sfârșit a evenimentului"
 
 #. module: base_calendar
 #: selection:calendar.attendee,role:0
 msgid "Optional Participation"
-msgstr "Participare Optionala"
+msgstr "Participare Opțională"
 
 #. module: base_calendar
 #: help:crm.meeting,message_summary:0
@@ -354,8 +354,8 @@ msgid ""
 "Holds the Chatter summary (number of messages, ...). This summary is "
 "directly in html format in order to be inserted in kanban views."
 msgstr ""
-"Contine rezumatul Chatter (numar de mesaje, ...). Acest rezumat este direct "
-"in format HTML, icu scopul de a se introduce in vizualizari kanban."
+"Conține rezumatul Chatter (număr de mesaje, ...). Acest rezumat este direct "
+"în format HTML, cu scopul de a se introduce în vizualizări kanban."
 
 #. module: base_calendar
 #: code:addons/base_calendar/base_calendar.py:399
@@ -375,8 +375,8 @@ msgid ""
 "If the active field is set to          true, it will allow you to hide the "
 "event alarm information without removing it."
 msgstr ""
-"Daca campul activ este setat pe adevarat, va va permite sa ascundeti "
-"informatia despre alarma evenimentului fara a o sterge."
+"Dacă câmpul activ este setat pe adevărat, vă va permite să ascundeți "
+"informația despre alarma evenimentului fără a o șterge."
 
 #. module: base_calendar
 #: field:calendar.alarm,repeat:0
@@ -385,7 +385,7 @@ msgstr ""
 #: field:crm.meeting,count:0
 #: field:res.alarm,repeat:0
 msgid "Repeat"
-msgstr "Repeta"
+msgstr "Repetă"
 
 #. module: base_calendar
 #: field:calendar.event,organizer:0
@@ -415,7 +415,7 @@ msgstr "Eveniment"
 #: selection:calendar.alarm,trigger_occurs:0
 #: selection:res.alarm,trigger_occurs:0
 msgid "Before"
-msgstr "Inainte"
+msgstr "Înainte"
 
 #. module: base_calendar
 #: view:calendar.event:0
@@ -424,7 +424,7 @@ msgstr "Inainte"
 #: field:crm.meeting,date_open:0
 #: selection:crm.meeting,state:0
 msgid "Confirmed"
-msgstr "Confirmat(a)"
+msgstr "Confirmat(ă)"
 
 #. module: base_calendar
 #: field:calendar.alarm,attendee_ids:0
@@ -435,29 +435,29 @@ msgstr "Confirmat(a)"
 #: field:crm.meeting,attendee_ids:0
 #: field:crm.meeting,partner_ids:0
 msgid "Attendees"
-msgstr "Participanti"
+msgstr "Participanți"
 
 #. module: base_calendar
 #: view:calendar.event:0
 msgid "Confirm"
-msgstr "Confirma"
+msgstr "Confirmă"
 
 #. module: base_calendar
 #: model:ir.model,name:base_calendar.model_calendar_todo
 msgid "Calendar Task"
-msgstr "Sarcina Calendar"
+msgstr "Sarcină Calendar"
 
 #. module: base_calendar
 #: field:calendar.event,su:0
 #: field:calendar.todo,su:0
 #: field:crm.meeting,su:0
 msgid "Sun"
-msgstr "Duminica"
+msgstr "Duminică"
 
 #. module: base_calendar
 #: field:calendar.attendee,cutype:0
 msgid "Invite Type"
-msgstr "Tip invitatie"
+msgstr "Tip invitație"
 
 #. module: base_calendar
 #: view:res.alarm:0
@@ -486,12 +486,12 @@ msgstr "Persoane interesate"
 #: field:calendar.todo,location:0
 #: field:crm.meeting,location:0
 msgid "Location"
-msgstr "Locatie"
+msgstr "Locație"
 
 #. module: base_calendar
 #: selection:calendar.attendee,role:0
 msgid "Participation required"
-msgstr "Este necesara participarea"
+msgstr "Este necesară participarea"
 
 #. module: base_calendar
 #: view:calendar.event:0
@@ -499,7 +499,7 @@ msgstr "Este necesara participarea"
 #: field:calendar.todo,show_as:0
 #: field:crm.meeting,show_as:0
 msgid "Show Time as"
-msgstr "Afiseaza timpul ca"
+msgstr "Afișează timpul ca"
 
 #. module: base_calendar
 #: selection:calendar.alarm,action:0
@@ -515,37 +515,37 @@ msgstr "Camera"
 #. module: base_calendar
 #: selection:calendar.alarm,state:0
 msgid "Run"
-msgstr "Executa"
+msgstr "Execută"
 
 #. module: base_calendar
 #: model:ir.model,name:base_calendar.model_calendar_alarm
 msgid "Event alarm information"
-msgstr "Informatii alarma eveniment"
+msgstr "Informații alarmă eveniment"
 
 #. module: base_calendar
 #: code:addons/base_calendar/base_calendar.py:1015
 #, python-format
 msgid "Count cannot be negative or 0."
-msgstr "Valoarea nu poate fi negativa sau 0."
+msgstr "Valoarea nu poate fi negativă sau 0."
 
 #. module: base_calendar
 #: field:crm.meeting,create_date:0
 msgid "Creation Date"
-msgstr "Data Crearii"
+msgstr "Data creării"
 
 #. module: base_calendar
 #: view:crm.meeting:0
 #: model:ir.model,name:base_calendar.model_crm_meeting
 #: model:res.request.link,name:base_calendar.request_link_meeting
 msgid "Meeting"
-msgstr "Intalnire"
+msgstr "Întâlnire"
 
 #. module: base_calendar
 #: selection:calendar.event,rrule_type:0
 #: selection:calendar.todo,rrule_type:0
 #: selection:crm.meeting,rrule_type:0
 msgid "Month(s)"
-msgstr "Luna (luni)"
+msgstr "Lună (luni)"
 
 #. module: base_calendar
 #: view:calendar.event:0
@@ -555,7 +555,7 @@ msgstr "Vizibilitate"
 #. module: base_calendar
 #: field:calendar.attendee,rsvp:0
 msgid "Required Reply?"
-msgstr "Necesita raspuns?"
+msgstr "Necesită răspuns?"
 
 #. module: base_calendar
 #: field:calendar.event,base_calendar_url:0
@@ -567,7 +567,7 @@ msgstr "URL Caldav"
 #. module: base_calendar
 #: model:ir.model,name:base_calendar.model_mail_wizard_invite
 msgid "Invite wizard"
-msgstr "Wizard Invitatie"
+msgstr "Wizard invitație"
 
 #. module: base_calendar
 #: selection:calendar.event,month_list:0
@@ -579,7 +579,7 @@ msgstr "Iulie"
 #. module: base_calendar
 #: selection:calendar.attendee,state:0
 msgid "Accepted"
-msgstr "Acceptat(a)"
+msgstr "Acceptat(ă)"
 
 #. module: base_calendar
 #: field:calendar.event,th:0
@@ -591,7 +591,7 @@ msgstr "Joi"
 #. module: base_calendar
 #: view:crm.meeting:0
 msgid "Meeting Details"
-msgstr "Detaliile Intalnirii"
+msgstr "Detaliile întâlnirii"
 
 #. module: base_calendar
 #: field:calendar.attendee,child_ids:0
@@ -602,7 +602,7 @@ msgstr "Delegat la"
 #: code:addons/base_calendar/crm_meeting.py:102
 #, python-format
 msgid "The following contacts have no email address :"
-msgstr "Urmatoarele contacte nu au adrese de email :"
+msgstr "Următoarele contacte nu au adrese de email :"
 
 #. module: base_calendar
 #: selection:calendar.event,rrule_type:0
@@ -616,20 +616,20 @@ msgstr "An(i)"
 #: model:ir.actions.act_window,name:base_calendar.action_crm_meeting_type
 #: model:ir.ui.menu,name:base_calendar.menu_crm_meeting_type
 msgid "Meeting Types"
-msgstr "Tipuri de Intaliniri"
+msgstr "Tipuri de întâliniri"
 
 #. module: base_calendar
 #: field:calendar.event,create_date:0
 #: field:calendar.todo,create_date:0
 msgid "Created"
-msgstr "Creat(a)"
+msgstr "Creat(ă)"
 
 #. module: base_calendar
 #: selection:calendar.event,class:0
 #: selection:calendar.todo,class:0
 #: selection:crm.meeting,class:0
 msgid "Public for Employees"
-msgstr "Public pentru Angajati"
+msgstr "Public pentru Angajați"
 
 #. module: base_calendar
 #: view:crm.meeting:0
@@ -639,7 +639,7 @@ msgstr "ore"
 #. module: base_calendar
 #: view:calendar.event:0
 msgid "Cancel Event"
-msgstr "Anulati Evenimentul"
+msgstr "Anulați Evenimentul"
 
 #. module: base_calendar
 #: field:calendar.attendee,partner_id:0
@@ -656,12 +656,12 @@ msgstr "Limba"
 #: field:calendar.todo,end_date:0
 #: field:crm.meeting,end_date:0
 msgid "Repeat Until"
-msgstr "Repeta pana cand"
+msgstr "Repetă până cand"
 
 #. module: base_calendar
 #: view:crm.meeting:0
 msgid "Options"
-msgstr "Optiuni"
+msgstr "Opțiuni"
 
 #. module: base_calendar
 #: selection:calendar.event,byday:0
@@ -695,7 +695,7 @@ msgstr "Decembrie"
 #: selection:calendar.todo,week_list:0
 #: selection:crm.meeting,week_list:0
 msgid "Tuesday"
-msgstr "Marti"
+msgstr "Marți"
 
 #. module: base_calendar
 #: field:crm.meeting,categ_ids:0
@@ -717,7 +717,7 @@ msgstr "Individual"
 #: help:calendar.todo,count:0
 #: help:crm.meeting,count:0
 msgid "Repeat x times"
-msgstr "Repeta de x ori"
+msgstr "Repetă de x ori"
 
 #. module: base_calendar
 #: field:calendar.alarm,user_id:0
@@ -729,7 +729,7 @@ msgstr "Proprietar"
 #: help:calendar.todo,rrule_type:0
 #: help:crm.meeting,rrule_type:0
 msgid "Let the event automatically repeat at that interval"
-msgstr "Permite repetarea automata a evenimentului in acel interval"
+msgstr "Permite repetarea automată a evenimentului în acel interval"
 
 #. module: base_calendar
 #: model:ir.ui.menu,name:base_calendar.mail_menu_calendar
@@ -744,21 +744,21 @@ msgstr "Nume comun"
 #. module: base_calendar
 #: selection:calendar.attendee,state:0
 msgid "Declined"
-msgstr "Refuzat(a)"
+msgstr "Refuzat(ă)"
 
 #. module: base_calendar
 #: code:addons/base_calendar/base_calendar.py:1460
 #, python-format
 msgid "Group by date is not supported, use the calendar view instead."
 msgstr ""
-"Gruparea dupa data nu este acceptata, folositi in schimb vizualizarea "
+"Gruparea după data nu este acceptată, folosiți în schimb vizualizarea "
 "calendar."
 
 #. module: base_calendar
 #: view:calendar.event:0
 #: view:crm.meeting:0
 msgid "Decline"
-msgstr "Refuza"
+msgstr "Refuză"
 
 #. module: base_calendar
 #: selection:calendar.attendee,cutype:0
@@ -778,12 +778,12 @@ msgstr "Privat"
 #: field:calendar.todo,class:0
 #: field:crm.meeting,class:0
 msgid "Privacy"
-msgstr "Confidentialitate"
+msgstr "Confidențialitate"
 
 #. module: base_calendar
 #: model:ir.model,name:base_calendar.model_res_alarm
 msgid "Basic Alarm Information"
-msgstr "informatii de Baza Alarma"
+msgstr "informații de Baza Alarma"
 
 #. module: base_calendar
 #: field:calendar.event,fr:0
@@ -795,7 +795,7 @@ msgstr "Vineri"
 #. module: base_calendar
 #: view:calendar.event:0
 msgid "Invitation Detail"
-msgstr "Detaliile invitatiei"
+msgstr "Detaliile invitației"
 
 #. module: base_calendar
 #: field:calendar.attendee,member:0
@@ -807,29 +807,29 @@ msgstr "Membru"
 #: help:calendar.todo,location:0
 #: help:crm.meeting,location:0
 msgid "Location of Event"
-msgstr "Locatia evenimentului"
+msgstr "Locația evenimentului"
 
 #. module: base_calendar
 #: field:calendar.event,rrule:0
 #: field:calendar.todo,rrule:0
 #: field:crm.meeting,rrule:0
 msgid "Recurrent Rule"
-msgstr "Regula Recurenta"
+msgstr "Regulă recurentă"
 
 #. module: base_calendar
 #: selection:calendar.alarm,state:0
 msgid "Draft"
-msgstr "Ciorna"
+msgstr "Ciornă"
 
 #. module: base_calendar
 #: field:calendar.alarm,attach:0
 msgid "Attachment"
-msgstr "Atasament"
+msgstr "Atașament"
 
 #. module: base_calendar
 #: field:crm.meeting,date_closed:0
 msgid "Closed"
-msgstr "Inchis(a)"
+msgstr "Închis(ă)"
 
 #. module: base_calendar
 #: view:calendar.event:0
@@ -849,12 +849,12 @@ msgstr "Memento"
 #: selection:calendar.todo,end_type:0
 #: selection:crm.meeting,end_type:0
 msgid "Number of repetitions"
-msgstr "Numar de repetari"
+msgstr "Număr de repetări"
 
 #. module: base_calendar
 #: model:crm.meeting.type,name:base_calendar.categ_meet2
 msgid "Internal Meeting"
-msgstr "Intalnire Interna"
+msgstr "Întalnire internă"
 
 #. module: base_calendar
 #: view:calendar.event:0
@@ -881,7 +881,7 @@ msgstr "Email-ul Persoanei Invitate"
 #. module: base_calendar
 #: model:crm.meeting.type,name:base_calendar.categ_meet1
 msgid "Customer Meeting"
-msgstr "Intalnire Clienti"
+msgstr "Întalnire Clienți"
 
 #. module: base_calendar
 #: help:calendar.attendee,dir:0
@@ -909,7 +909,7 @@ msgstr "Luni"
 #. module: base_calendar
 #: model:crm.meeting.type,name:base_calendar.categ_meet4
 msgid "Open Discussion"
-msgstr "Deschide Discutia"
+msgstr "Deschide Discuția"
 
 #. module: base_calendar
 #: model:ir.model,name:base_calendar.model_ir_model
@@ -933,7 +933,7 @@ msgstr "Data Evenimentului"
 #. module: base_calendar
 #: view:crm.meeting:0
 msgid "Invitations"
-msgstr "Invitatii"
+msgstr "Invitații"
 
 #. module: base_calendar
 #: view:calendar.event:0
@@ -971,7 +971,7 @@ msgstr "Data"
 #. module: base_calendar
 #: view:calendar.event:0
 msgid "Start Date"
-msgstr "Data de inceput"
+msgstr "Dată de început"
 
 #. module: base_calendar
 #: selection:calendar.event,month_list:0
@@ -983,7 +983,7 @@ msgstr "Noiembrie"
 #. module: base_calendar
 #: help:calendar.attendee,member:0
 msgid "Indicate the groups that the attendee belongs to"
-msgstr "Indica grupurile de care apartine participantul"
+msgstr "Indică grupurile de care aparține participantul"
 
 #. module: base_calendar
 #: field:calendar.event,mo:0
@@ -1006,7 +1006,7 @@ msgstr "Octombrie"
 #: selection:calendar.todo,state:0
 #: view:crm.meeting:0
 msgid "Uncertain"
-msgstr "Nesigur(a)"
+msgstr "Nesigur(ă)"
 
 #. module: base_calendar
 #: constraint:calendar.event:0
@@ -1020,7 +1020,7 @@ msgstr ""
 #: field:calendar.alarm,trigger_occurs:0
 #: field:res.alarm,trigger_occurs:0
 msgid "Triggers"
-msgstr "Declansatori"
+msgstr "Declanșatori"
 
 #. module: base_calendar
 #: selection:calendar.event,month_list:0
@@ -1062,23 +1062,23 @@ msgstr "Rezumat"
 #: field:crm.meeting,active:0
 #: field:res.alarm,active:0
 msgid "Active"
-msgstr "Activ(a)"
+msgstr "Activ(ă)"
 
 #. module: base_calendar
 #: code:addons/base_calendar/base_calendar.py:399
 #, python-format
 msgid "You cannot duplicate a calendar attendee."
-msgstr "Nu puteti copia un participant in calendar."
+msgstr "Nu puteți copia un participant în calendar."
 
 #. module: base_calendar
 #: view:calendar.event:0
 msgid "Choose day in the month where repeat the meeting"
-msgstr "Alegeti ziua din luna in care sa repetati intalnirea"
+msgstr "Alegeți ziua din luna în care să repetați întalnirea"
 
 #. module: base_calendar
 #: field:calendar.alarm,action:0
 msgid "Action"
-msgstr "Actiune"
+msgstr "Acțiune"
 
 #. module: base_calendar
 #: help:calendar.alarm,duration:0
@@ -1087,8 +1087,8 @@ msgid ""
 "Duration' and 'Repeat' are both optional, but if one occurs, so MUST the "
 "other"
 msgstr ""
-"'Durata' si 'Repetare' sunt ambele optionale, dar daca una are loc, la fel "
-"TREBUIE si cealalta"
+"'Durata' și 'Repetare' sunt ambele opționale, dar dacă una este specificată "
+"TREBUIE și cealaltă"
 
 #. module: base_calendar
 #: help:calendar.attendee,role:0
@@ -1104,24 +1104,24 @@ msgstr "Delegat la"
 #: help:calendar.alarm,action:0
 msgid "Defines the action to be invoked when an alarm is triggered"
 msgstr ""
-"Defineste actiunea care trebuie efectuata atunci cand este declansata alarma"
+"Definește acțiunea care trebuie efectuată atunci când este declanșată alarma"
 
 #. module: base_calendar
 #: view:crm.meeting:0
 msgid "Starting at"
-msgstr "Incepand de la"
+msgstr "Începând de la"
 
 #. module: base_calendar
 #: selection:calendar.event,end_type:0
 #: selection:calendar.todo,end_type:0
 #: selection:crm.meeting,end_type:0
 msgid "End date"
-msgstr "Data de sfarsit"
+msgstr "Data de sfârșit"
 
 #. module: base_calendar
 #: view:calendar.event:0
 msgid "Search Events"
-msgstr "Cauta Evenimente"
+msgstr "Caută evenimente"
 
 #. module: base_calendar
 #: help:calendar.alarm,active:0
@@ -1143,7 +1143,7 @@ msgstr "Incheiere Recurenta"
 #. module: base_calendar
 #: view:crm.meeting:0
 msgid "Until"
-msgstr "Pana la"
+msgstr "Până la"
 
 #. module: base_calendar
 #: view:res.alarm:0
@@ -1153,12 +1153,12 @@ msgstr "Detalii Memento"
 #. module: base_calendar
 #: model:crm.meeting.type,name:base_calendar.categ_meet3
 msgid "Off-site Meeting"
-msgstr "Intalnire in afara biroului"
+msgstr "Întalnire în afara biroului"
 
 #. module: base_calendar
 #: view:crm.meeting:0
 msgid "Day of Month"
-msgstr "Ziua din Luna"
+msgstr "Ziua din Lună"
 
 #. module: base_calendar
 #: selection:calendar.alarm,state:0
@@ -1170,12 +1170,12 @@ msgstr "Efectuat"
 #: help:calendar.todo,interval:0
 #: help:crm.meeting,interval:0
 msgid "Repeat every (Days/Week/Month/Year)"
-msgstr "Repeta fiecare (Zile/Saptamana/Luna/An)"
+msgstr "Repetă fiecare (Zile/Săptămână/Lună/An)"
 
 #. module: base_calendar
 #: view:crm.meeting:0
 msgid "All Day?"
-msgstr "Intreaga Zi?"
+msgstr "Întreaga zi?"
 
 #. module: base_calendar
 #: model:ir.actions.act_window,help:base_calendar.action_crm_meeting
@@ -1191,13 +1191,13 @@ msgid ""
 "          </p>\n"
 "        "
 msgstr ""
-"<clasa p=\"oe_vizualizare_niciuncontinut_creeaza\">\n"
-"            Faceti click pentru a programa o noua intalnire.\n"
+"<p class=\"oe_view_nocontent_create\">\n"
+"            Faceți clic pentru a programa o nouă întâlnire.\n"
 "          </p><p>\n"
-"            Calendarul este impartit intre angajati si este complet integrat "
+"            Calendarul este împărțit între angajați și este complet integrat "
 "cu\n"
-"            alte aplicatii, cum ar fi concediile angajatilor sau "
-"oportunitatile de\n"
+"            alte aplicații, cum ar fi concediile angajaților sau "
+"oportunitățile de\n"
 "            afaceri.\n"
 "          </p>\n"
 "        "
@@ -1209,7 +1209,7 @@ msgid ""
 "calendar component, than that                             provided by the "
 "\"SUMMARY\" property"
 msgstr ""
-"Ofera o descriere mai completa a componentei calendar decat cea oferita de "
+"Oferă o descriere mai completă a componentei calendar decât cea oferită de "
 "proprietatea \"REZUMAT\""
 
 #. module: base_calendar
@@ -1220,7 +1220,7 @@ msgstr "Utilizator responsabil"
 #. module: base_calendar
 #: view:crm.meeting:0
 msgid "Select Weekdays"
-msgstr "Selectati Zilele Saptamanii"
+msgstr "Selectați Zilele Saptamanii"
 
 #. module: base_calendar
 #: code:addons/base_calendar/base_calendar.py:1519
@@ -1230,7 +1230,7 @@ msgstr "Selectati Zilele Saptamanii"
 #: selection:crm.meeting,show_as:0
 #, python-format
 msgid "Busy"
-msgstr "Ocupat(a)"
+msgstr "Ocupat(ă)"
 
 #. module: base_calendar
 #: model:ir.model,name:base_calendar.model_calendar_event
@@ -1249,7 +1249,7 @@ msgstr "Recurent"
 #: field:calendar.todo,rrule_type:0
 #: field:crm.meeting,rrule_type:0
 msgid "Recurrency"
-msgstr "Recurenta"
+msgstr "Recurență"
 
 #. module: base_calendar
 #: selection:calendar.event,week_list:0
@@ -1263,7 +1263,7 @@ msgstr "Joi"
 #: field:calendar.todo,exrule:0
 #: field:crm.meeting,exrule:0
 msgid "Exception Rule"
-msgstr "Regula exceptiei"
+msgstr "Regula excepției"
 
 #. module: base_calendar
 #: help:calendar.attendee,language:0
@@ -1286,8 +1286,8 @@ msgid ""
 "Defines a rule or repeating pattern of time to exclude from the recurring "
 "rule."
 msgstr ""
-"Defineste o regula sau un tipar temporar care se repeta pentru a se exclude "
-"de la regula recurenta."
+"Definește o regulă sau un tipar temporar care se repetă pentru a se exclude "
+"de la regula recurentă."
 
 #. module: base_calendar
 #: field:calendar.event,month_list:0
@@ -1311,7 +1311,7 @@ msgstr "Evenimente Confirmate"
 #. module: base_calendar
 #: field:calendar.attendee,dir:0
 msgid "URI Reference"
-msgstr "Referinta URI"
+msgstr "Referința URI"
 
 #. module: base_calendar
 #: field:calendar.alarm,description:0
@@ -1335,12 +1335,12 @@ msgstr "Mai"
 #: selection:calendar.alarm,trigger_occurs:0
 #: selection:res.alarm,trigger_occurs:0
 msgid "After"
-msgstr "Dupa"
+msgstr "După"
 
 #. module: base_calendar
 #: selection:calendar.alarm,state:0
 msgid "Stop"
-msgstr "Opreste"
+msgstr "Oprește"
 
 #. module: base_calendar
 #: model:ir.model,name:base_calendar.model_ir_values
@@ -1350,7 +1350,7 @@ msgstr "ir.valori"
 #. module: base_calendar
 #: view:crm.meeting:0
 msgid "Search Meetings"
-msgstr "Cauta Intalniri"
+msgstr "Caută întâlniri"
 
 #. module: base_calendar
 #: model:ir.model,name:base_calendar.model_ir_attachment
@@ -1365,7 +1365,7 @@ msgstr "Tipul Intalnirii"
 #. module: base_calendar
 #: selection:calendar.attendee,state:0
 msgid "Delegated"
-msgstr "Delegat(a)"
+msgstr "Delegat(ă)"
 
 #. module: base_calendar
 #: field:calendar.event,sa:0
@@ -1386,12 +1386,12 @@ msgid ""
 "              </p>\n"
 "            "
 msgstr ""
-"<clasa p=\"oe_vizualizare_niciuncontinut_creeaza\">\n"
-"                Faceti click pentru a seta un nou tip de alarma.\n"
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Faceți clic pentru a seta un nou tip de alarma.\n"
 "              </p><p>\n"
-"                Puteti defini un tip personalizat de alarma pe calendar care "
+"                Puteți defini un tip personalizat de alarma pe calendar care "
 "poate fi\n"
-"                atribuit evenimentelor sau intalnirilor din calendar.\n"
+"                atribuit evenimentelor sau întâlnirilor din calendar.\n"
 "              </p>\n"
 "            "
 
@@ -1412,7 +1412,7 @@ msgstr ""
 #: field:calendar.todo,date_deadline:0
 #: field:crm.meeting,date_deadline:0
 msgid "End Date"
-msgstr "Data de sfarsit"
+msgstr "Dată de sfârșit"
 
 #. module: base_calendar
 #: selection:calendar.event,month_list:0
@@ -1437,7 +1437,7 @@ msgstr "Nume"
 #: field:calendar.todo,exdate:0
 #: field:crm.meeting,exdate:0
 msgid "Exception Date/Times"
-msgstr "Exceptie Data/Ore"
+msgstr "Excepție Data/Ore"
 
 #. module: base_calendar
 #: help:calendar.alarm,name:0
@@ -1488,7 +1488,7 @@ msgstr "Perioada recurenta"
 #: field:calendar.todo,week_list:0
 #: field:crm.meeting,week_list:0
 msgid "Weekday"
-msgstr "Zi lucratoare"
+msgstr "Zi lucrătoare"
 
 #. module: base_calendar
 #: code:addons/base_calendar/base_calendar.py:1013
@@ -1501,13 +1501,13 @@ msgstr "Intervalul nu poate fi negativ"
 #: field:calendar.todo,byday:0
 #: field:crm.meeting,byday:0
 msgid "By day"
-msgstr "Dupa zi"
+msgstr "După zi"
 
 #. module: base_calendar
 #: code:addons/base_calendar/base_calendar.py:441
 #, python-format
 msgid "First you have to specify the date of the invitation."
-msgstr "Mai intai trebuie sa specificati data invitatiei."
+msgstr "Mai întâi trebuie să specificați data invitației."
 
 #. module: base_calendar
 #: field:calendar.alarm,model_id:0
@@ -1529,19 +1529,19 @@ msgstr "ID"
 #. module: base_calendar
 #: selection:calendar.attendee,role:0
 msgid "For information Purpose"
-msgstr "In scop informativ"
+msgstr "În scop informativ"
 
 #. module: base_calendar
 #: field:calendar.event,select1:0
 #: field:calendar.todo,select1:0
 #: field:crm.meeting,select1:0
 msgid "Option"
-msgstr "Optiune"
+msgstr "Opțiune"
 
 #. module: base_calendar
 #: model:ir.model,name:base_calendar.model_calendar_attendee
 msgid "Attendee information"
-msgstr "Informatii participant"
+msgstr "Informații participant"
 
 #. module: base_calendar
 #: field:calendar.alarm,res_id:0
@@ -1551,19 +1551,19 @@ msgstr "ID resursa"
 #. module: base_calendar
 #: selection:calendar.attendee,state:0
 msgid "Needs Action"
-msgstr "Necesita actiune"
+msgstr "Necesită acțiune"
 
 #. module: base_calendar
 #: field:calendar.attendee,sent_by:0
 msgid "Sent By"
-msgstr "Trimis de catre"
+msgstr "Trimis de către"
 
 #. module: base_calendar
 #: field:calendar.event,sequence:0
 #: field:calendar.todo,sequence:0
 #: field:crm.meeting,sequence:0
 msgid "Sequence"
-msgstr "Secventa"
+msgstr "Secvență"
 
 #. module: base_calendar
 #: help:calendar.event,alarm_id:0
@@ -1576,21 +1576,21 @@ msgstr "Setati o alarma acum, inainte ca evenimentul sa aiba loc"
 #: view:calendar.event:0
 #: view:crm.meeting:0
 msgid "Accept"
-msgstr "Accepta"
+msgstr "Acceptă"
 
 #. module: base_calendar
 #: selection:calendar.event,week_list:0
 #: selection:calendar.todo,week_list:0
 #: selection:crm.meeting,week_list:0
 msgid "Saturday"
-msgstr "Sambata"
+msgstr "Sâmbătă"
 
 #. module: base_calendar
 #: field:calendar.event,interval:0
 #: field:calendar.todo,interval:0
 #: field:crm.meeting,interval:0
 msgid "Repeat Every"
-msgstr "Repeta fiecare"
+msgstr "Repetă fiecare"
 
 #. module: base_calendar
 #: selection:calendar.event,byday:0
@@ -1619,7 +1619,7 @@ msgstr "Durata"
 #. module: base_calendar
 #: field:calendar.alarm,trigger_date:0
 msgid "Trigger Date"
-msgstr "Data Declansare"
+msgstr "Data declanșare"
 
 #. module: base_calendar
 #: help:calendar.alarm,attach:0
diff --git a/addons/base_import/i18n/tr.po b/addons/base_import/i18n/tr.po
index 96d0567db62..d5b79702581 100644
--- a/addons/base_import/i18n/tr.po
+++ b/addons/base_import/i18n/tr.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2013-03-07 08:37+0000\n"
-"PO-Revision-Date: 2013-04-13 17:49+0000\n"
+"PO-Revision-Date: 2013-04-17 19:29+0000\n"
 "Last-Translator: Ayhan KIZILTAN <Unknown>\n"
 "Language-Team: Turkish <tr@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: 2013-04-14 05:49+0000\n"
-"X-Generator: Launchpad (build 16564)\n"
+"X-Launchpad-Export-Date: 2013-04-18 06:05+0000\n"
+"X-Generator: Launchpad (build 16567)\n"
 
 #. module: base_import
 #. openerp-web
@@ -133,7 +133,7 @@ msgstr ""
 #: code:addons/base_import/static/src/xml/import.xml:206
 #, python-format
 msgid "CSV file for Manufacturer, Retailer"
-msgstr ""
+msgstr "Üretici, Satıcı için CSV dosyası"
 
 #. module: base_import
 #. openerp-web
@@ -145,20 +145,24 @@ msgid ""
 "\n"
 "                        data from a third party application."
 msgstr ""
+"Bunu kullan \n"
+"                        Ülke/Dış ID: Bir üçüncü partiden veri "
+"içeaktaracağınızda \n"
+"                        Dış Id kullanın."
 
 #. module: base_import
 #. openerp-web
 #: code:addons/base_import/static/src/xml/import.xml:316
 #, python-format
 msgid "person_1,Fabien,False,company_1"
-msgstr ""
+msgstr "person_1,Fabien,False,company_1"
 
 #. module: base_import
 #. openerp-web
 #: code:addons/base_import/static/src/xml/import.xml:80
 #, python-format
 msgid "XXX/External ID"
-msgstr ""
+msgstr "XXX/DışID"
 
 #. module: base_import
 #. openerp-web
@@ -268,12 +272,12 @@ msgstr ""
 #: code:addons/base_import/static/src/xml/import.xml:302
 #, python-format
 msgid "External ID,Name,Is a Company"
-msgstr ""
+msgstr "Dış ID,Adı, Bir Firmadır"
 
 #. module: base_import
 #: field:base_import.tests.models.preview,somevalue:0
 msgid "Some Value"
-msgstr ""
+msgstr "Birkaç Değer"
 
 #. module: base_import
 #. openerp-web
@@ -283,6 +287,8 @@ msgid ""
 "The following CSV file shows how to import \n"
 "                        suppliers and their respective contacts"
 msgstr ""
+"Aşağıdaki CSV dosyası tedarikçi ve ilgili \n"
+"                        kişilerinin nasıl içeaktarılacağını gösterir"
 
 #. module: base_import
 #. openerp-web
@@ -353,14 +359,14 @@ msgstr ""
 #: code:addons/base_import/static/src/js/import.js:174
 #, python-format
 msgid "Semicolon"
-msgstr ""
+msgstr "Noktalı Virgül"
 
 #. module: base_import
 #. openerp-web
 #: code:addons/base_import/static/src/xml/import.xml:233
 #, python-format
 msgid "Suppliers and their respective contacts"
-msgstr ""
+msgstr "Tedarikçiler ve ilgili Kişileri"
 
 #. module: base_import
 #. openerp-web
@@ -410,12 +416,12 @@ msgstr ""
 #: code:addons/base_import/static/src/js/import.js:175
 #, python-format
 msgid "Tab"
-msgstr ""
+msgstr "Sekme"
 
 #. module: base_import
 #: field:base_import.tests.models.preview,othervalue:0
 msgid "Other Variable"
-msgstr ""
+msgstr "Diğer Değişken"
 
 #. module: base_import
 #. openerp-web
@@ -445,11 +451,13 @@ msgid ""
 "Country/Database \n"
 "                        ID: 21"
 msgstr ""
+"Ülke/Veritabanı \n"
+"                        ID: 21"
 
 #. module: base_import
 #: model:ir.model,name:base_import.model_base_import_tests_models_char
 msgid "base_import.tests.models.char"
-msgstr ""
+msgstr "base_import.tests.models.char"
 
 #. module: base_import
 #: help:base_import.import,file:0
@@ -479,7 +487,7 @@ msgstr ""
 #: code:addons/base_import/static/src/xml/import.xml:26
 #, python-format
 msgid ".CSV"
-msgstr ""
+msgstr ".CSV"
 
 #. module: base_import
 #. openerp-web
@@ -489,16 +497,18 @@ msgid ""
 ". The issue is\n"
 "            usually an incorrect file encoding."
 msgstr ""
+". Sorun\n"
+"            genellikle bir yanlış dosya şifrelemesidir."
 
 #. module: base_import
 #: model:ir.model,name:base_import.model_base_import_tests_models_m2o_required
 msgid "base_import.tests.models.m2o.required"
-msgstr ""
+msgstr "base_import.tests.models.m2o.required"
 
 #. module: base_import
 #: model:ir.model,name:base_import.model_base_import_tests_models_char_noreadonly
 msgid "base_import.tests.models.char.noreadonly"
-msgstr ""
+msgstr "base_import.tests.models.char.noreadonly"
 
 #. module: base_import
 #. openerp-web
@@ -526,32 +536,32 @@ msgstr "CSV dosyası:"
 #. module: base_import
 #: model:ir.model,name:base_import.model_base_import_tests_models_preview
 msgid "base_import.tests.models.preview"
-msgstr ""
+msgstr "base_import.tests.models.preview"
 
 #. module: base_import
 #: model:ir.model,name:base_import.model_base_import_tests_models_char_required
 msgid "base_import.tests.models.char.required"
-msgstr ""
+msgstr "base_import.tests.models.char.required"
 
 #. module: base_import
 #: code:addons/base_import/models.py:112
 #, python-format
 msgid "Database ID"
-msgstr ""
+msgstr "Veritabanı ID"
 
 #. module: base_import
 #. openerp-web
 #: code:addons/base_import/static/src/xml/import.xml:313
 #, python-format
 msgid "It will produce the following CSV file:"
-msgstr ""
+msgstr "Aşağıdaki CSV dosyasını oluşturacaktır:"
 
 #. module: base_import
 #. openerp-web
 #: code:addons/base_import/static/src/xml/import.xml:362
 #, python-format
 msgid "Here is the start of the file we could not import:"
-msgstr ""
+msgstr "İçeaktaramadığımız dosyanın başı:"
 
 #. module: base_import
 #: field:base_import.import,file_type:0
@@ -573,7 +583,7 @@ msgstr "base_import.tests.models.o2m"
 #: code:addons/base_import/static/src/xml/import.xml:360
 #, python-format
 msgid "Import preview failed due to:"
-msgstr ""
+msgstr "İçeaktarma hatasının nedeni<:"
 
 #. module: base_import
 #. openerp-web
@@ -591,12 +601,12 @@ msgstr ""
 #: code:addons/base_import/static/src/xml/import.xml:35
 #, python-format
 msgid "Reload data to check changes."
-msgstr ""
+msgstr "Değişiklikleri denetlemek için veriyi yeniden yükleyin."
 
 #. module: base_import
 #: model:ir.model,name:base_import.model_base_import_tests_models_char_readonly
 msgid "base_import.tests.models.char.readonly"
-msgstr ""
+msgstr "base_import.tests.models.char.readonly"
 
 #. module: base_import
 #. openerp-web
@@ -631,7 +641,7 @@ msgstr ""
 #: code:addons/base_import/models.py:264
 #, python-format
 msgid "You must configure at least one field to import"
-msgstr ""
+msgstr "İçeaktarma yapabilmek için enaz bir alanı yapılandırmalısınız"
 
 #. module: base_import
 #. openerp-web
@@ -648,37 +658,39 @@ msgid ""
 "The first row of the\n"
 "                file contains the label of the column"
 msgstr ""
+"Dosyanın ilk satırı\n"
+"                sütunun adını içerir"
 
 #. module: base_import
 #: model:ir.model,name:base_import.model_base_import_tests_models_char_states
 msgid "base_import.tests.models.char.states"
-msgstr ""
+msgstr "base_import.tests.models.char.states"
 
 #. module: base_import
 #. openerp-web
 #: code:addons/base_import/static/src/xml/import.xml:7
 #, python-format
 msgid "Import a CSV File"
-msgstr ""
+msgstr "Bir CSV Dosyası içeaktar"
 
 #. module: base_import
 #. openerp-web
 #: code:addons/base_import/static/src/js/import.js:74
 #, python-format
 msgid "Quoting:"
-msgstr ""
+msgstr "Çıkan:"
 
 #. module: base_import
 #: model:ir.model,name:base_import.model_base_import_tests_models_m2o_required_related
 msgid "base_import.tests.models.m2o.required.related"
-msgstr ""
+msgstr "base_import.tests.models.m2o.required.related"
 
 #. module: base_import
 #. openerp-web
 #: code:addons/base_import/static/src/xml/import.xml:293
 #, python-format
 msgid ")."
-msgstr ""
+msgstr ")."
 
 #. module: base_import
 #. openerp-web
@@ -693,14 +705,14 @@ msgstr "İçe Aktar"
 #: code:addons/base_import/static/src/js/import.js:438
 #, python-format
 msgid "Here are the possible values:"
-msgstr ""
+msgstr "Olası değerler:"
 
 #. module: base_import
 #. openerp-web
 #: code:addons/base_import/static/src/xml/import.xml:82
 #, python-format
 msgid "The"
-msgstr ""
+msgstr "Bu"
 
 #. module: base_import
 #. openerp-web
@@ -710,6 +722,7 @@ msgid ""
 "A single column was found in the file, this often means the file separator "
 "is incorrect"
 msgstr ""
+"Dosyada tek bir satır bulunmuştur, bu ayırıcının yanlış olduğu anlamına gelir"
 
 #. module: base_import
 #. openerp-web
diff --git a/addons/base_setup/i18n/tr.po b/addons/base_setup/i18n/tr.po
index 1cb53fe1cce..82dd715008a 100644
--- a/addons/base_setup/i18n/tr.po
+++ b/addons/base_setup/i18n/tr.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2013-03-07 08:38+0000\n"
-"PO-Revision-Date: 2013-03-04 23:47+0000\n"
+"PO-Revision-Date: 2013-04-17 19:35+0000\n"
 "Last-Translator: Ayhan KIZILTAN <Unknown>\n"
 "Language-Team: Turkish <tr@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: 2013-03-28 05:34+0000\n"
-"X-Generator: Launchpad (build 16546)\n"
+"X-Launchpad-Export-Date: 2013-04-18 06:05+0000\n"
+"X-Generator: Launchpad (build 16567)\n"
 
 #. module: base_setup
 #: view:sale.config.settings:0
@@ -177,8 +177,8 @@ msgid ""
 "You can use this wizard to change the terminologies for customers in the "
 "whole application."
 msgstr ""
-"Bu sihirbazı kullanarak uygulamanın içinde müşterileriniz için farklı "
-"terimler atayabilirsiniz. (Hasta, cari, müşteri,iş ortağı gibi)"
+"Bu sihirbazı kullanarak tüm uygulamanın içinde müşteri terminolojilerini "
+"değiştirebilirsiniz."
 
 #. module: base_setup
 #: selection:base.setup.terminology,partner:0
diff --git a/addons/knowledge/i18n/ro.po b/addons/knowledge/i18n/ro.po
index ce158e0adb8..cb9a9025d75 100644
--- a/addons/knowledge/i18n/ro.po
+++ b/addons/knowledge/i18n/ro.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2013-03-07 08:38+0000\n"
-"PO-Revision-Date: 2013-02-01 16:51+0000\n"
-"Last-Translator: Fekete Mihai <mihai@erpsystems.ro>\n"
+"PO-Revision-Date: 2013-04-17 17:38+0000\n"
+"Last-Translator: Mihai Satmarean <Unknown>\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: 2013-03-28 05:44+0000\n"
-"X-Generator: Launchpad (build 16546)\n"
+"X-Launchpad-Export-Date: 2013-04-18 06:05+0000\n"
+"X-Generator: Launchpad (build 16567)\n"
 
 #. module: knowledge
 #: view:knowledge.config.settings:0
@@ -33,29 +33,29 @@ msgid ""
 "Access your documents in OpenERP through WebDAV.\n"
 "                This installs the module document_webdav."
 msgstr ""
-"Accesati-va documentele in OpenERP prin WebDAV.\n"
-"                Acesta instaleaza modulul document_webdav."
+"Accesați-va documentele în OpenERP prin WebDAV.\n"
+"                Acesta instalează modulul document_webdav."
 
 #. module: knowledge
 #: help:knowledge.config.settings,module_document_page:0
 msgid "This installs the module document_page."
-msgstr "Acesta instaleaza modulul document_page."
+msgstr "Acesta instalează modulul document_page."
 
 #. module: knowledge
 #: model:ir.ui.menu,name:knowledge.menu_document2
 msgid "Collaborative Content"
-msgstr "Continut de Colaborare"
+msgstr "Conținut de Colaborare"
 
 #. module: knowledge
 #: model:ir.actions.act_window,name:knowledge.action_knowledge_configuration
 #: view:knowledge.config.settings:0
 msgid "Configure Knowledge"
-msgstr "Configureaza Cunostintele"
+msgstr "Configureaza Cunostințele"
 
 #. module: knowledge
 #: view:knowledge.config.settings:0
 msgid "Knowledge and Documents Management"
-msgstr "Managementul Cunostintelor si a Documentelor"
+msgstr "Managementul Cunostințelor și a Documentelor"
 
 #. module: knowledge
 #: help:knowledge.config.settings,module_document:0
@@ -67,19 +67,19 @@ msgid ""
 msgstr ""
 "Acesta este un sistem complet de management al documentelor, cu: "
 "autentificarea utilizatorului,\n"
-"                cautarea completa a documentelor (dar pptx si docx nu sunt "
-"acceptate), si un tablou de bord al documentelor.\n"
-"                Acesta instaleaza modulul document."
+"                căutarea completa a documentelor (dar pptx si docx nu sunt "
+"acceptate), și un tablou de bord al documentelor.\n"
+"                Acesta instalează modulul document."
 
 #. module: knowledge
 #: field:knowledge.config.settings,module_document_page:0
 msgid "Create static web pages"
-msgstr "Creeaza pagini de internet statice"
+msgstr "Creează pagini de internet statice"
 
 #. module: knowledge
 #: field:knowledge.config.settings,module_document_ftp:0
 msgid "Share repositories (FTP)"
-msgstr "Imparte depozitele (FTP)"
+msgstr "Împarte depozitele (FTP)"
 
 #. module: knowledge
 #: field:knowledge.config.settings,module_document:0
@@ -89,12 +89,12 @@ msgstr "Gestioneaza documentele"
 #. module: knowledge
 #: view:knowledge.config.settings:0
 msgid "Cancel"
-msgstr "Anuleaza"
+msgstr "Anulează"
 
 #. module: knowledge
 #: view:knowledge.config.settings:0
 msgid "Apply"
-msgstr "Aplica"
+msgstr "Aplică"
 
 #. module: knowledge
 #: model:ir.ui.menu,name:knowledge.menu_document_configuration
@@ -107,8 +107,8 @@ msgid ""
 "Access your documents in OpenERP through an FTP interface.\n"
 "                This installs the module document_ftp."
 msgstr ""
-"Accesati-va documentele din OpenERP printr-o interfata FTP.\n"
-"                Acesta instaleaza modulul document_ftp."
+"Accesați-vă documentele din OpenERP printr-o interfață FTP.\n"
+"                Acesta instalează modulul document_ftp."
 
 #. module: knowledge
 #: view:knowledge.config.settings:0
@@ -118,10 +118,10 @@ msgstr "sau"
 #. module: knowledge
 #: field:knowledge.config.settings,module_document_webdav:0
 msgid "Share repositories (WebDAV)"
-msgstr "Imparte depozitele (WebDAV)"
+msgstr "Împarte depozitele (WebDAV)"
 
 #. module: knowledge
 #: model:ir.ui.menu,name:knowledge.menu_document
 #: model:ir.ui.menu,name:knowledge.menu_knowledge_configuration
 msgid "Knowledge"
-msgstr "Cunostinte"
+msgstr "Cunoștințe"
diff --git a/addons/procurement/i18n/de.po b/addons/procurement/i18n/de.po
index 844c9c70dbe..0ca164ec2a8 100644
--- a/addons/procurement/i18n/de.po
+++ b/addons/procurement/i18n/de.po
@@ -8,15 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2013-03-07 08:38+0000\n"
-"PO-Revision-Date: 2013-01-06 22:20+0000\n"
-"Last-Translator: Thorsten Vocks (OpenBig.org) <thorsten.vocks@big-"
-"consulting.net>\n"
+"PO-Revision-Date: 2013-04-17 08:53+0000\n"
+"Last-Translator: Iyasu Beraki <iberaki@elegosoft.com>\n"
 "Language-Team: German <de@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: 2013-03-28 05:53+0000\n"
-"X-Generator: Launchpad (build 16546)\n"
+"X-Launchpad-Export-Date: 2013-04-18 06:05+0000\n"
+"X-Generator: Launchpad (build 16567)\n"
 
 #. module: procurement
 #: model:ir.ui.menu,name:procurement.menu_stock_sched
@@ -962,7 +961,7 @@ msgstr "Beschaffe von Auftrag"
 #. module: procurement
 #: field:product.template,supply_method:0
 msgid "Supply Method"
-msgstr ""
+msgstr "Beschaffungsmethode"
 
 #. module: procurement
 #: field:procurement.order,move_id:0
diff --git a/addons/project_long_term/i18n/tr.po b/addons/project_long_term/i18n/tr.po
index c449443591a..099d2b1fed8 100644
--- a/addons/project_long_term/i18n/tr.po
+++ b/addons/project_long_term/i18n/tr.po
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 7.0\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2013-03-07 08:38+0000\n"
-"PO-Revision-Date: 2013-04-02 10:07+0000\n"
-"Last-Translator: Ediz Duman <neps1192@gmail.com>\n"
+"PO-Revision-Date: 2013-04-17 19:41+0000\n"
+"Last-Translator: Ayhan KIZILTAN <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-04-03 15:03+0000\n"
-"X-Generator: Launchpad (build 16546)\n"
+"X-Launchpad-Export-Date: 2013-04-18 06:05+0000\n"
+"X-Generator: Launchpad (build 16567)\n"
 
 #. module: project_long_term
 #: help:project.phase,constraint_date_end:0
@@ -115,7 +115,7 @@ msgstr "Taslak"
 #: view:project.compute.phases:0
 #: view:project.compute.tasks:0
 msgid "C_ompute"
-msgstr ""
+msgstr "H_esapla"
 
 #. module: project_long_term
 #: view:project.phase:0
@@ -210,6 +210,11 @@ msgid ""
 "           \n"
 " If the phase is over, the status is set to 'Done'."
 msgstr ""
+"Eğer aşama oluşturulduysa durum 'Taslak'tır.\n"
+" Eğer aşama başlamışsa, durum 'Sürüyor' olur.\n"
+" Eğer inceleme gerekiyorsa durum 'Bekliyor' olur.                            "
+"      \n"
+" Eğer aşama sonlandıysa, durumu 'Yapıldı' olur."
 
 #. module: project_long_term
 #: field:project.phase,progress:0
diff --git a/addons/purchase/i18n/de.po b/addons/purchase/i18n/de.po
index 947cc3878c0..d135350d948 100644
--- a/addons/purchase/i18n/de.po
+++ b/addons/purchase/i18n/de.po
@@ -8,15 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2013-03-07 08:37+0000\n"
-"PO-Revision-Date: 2013-02-17 22:28+0000\n"
-"Last-Translator: Thorsten Vocks (OpenBig.org) <thorsten.vocks@big-"
-"consulting.net>\n"
+"PO-Revision-Date: 2013-04-17 08:22+0000\n"
+"Last-Translator: Iyasu Beraki <iberaki@elegosoft.com>\n"
 "Language-Team: German <de@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: 2013-03-28 05:58+0000\n"
-"X-Generator: Launchpad (build 16546)\n"
+"X-Launchpad-Export-Date: 2013-04-18 06:06+0000\n"
+"X-Generator: Launchpad (build 16567)\n"
 
 #. module: purchase
 #: model:res.groups,name:purchase.group_analytic_accounting
@@ -1391,7 +1390,7 @@ msgstr "Produkte"
 #. module: purchase
 #: view:purchase.order:0
 msgid "Terms and conditions..."
-msgstr ""
+msgstr "Geschäftsbedingungen..."
 
 #. module: purchase
 #: model:ir.model,name:purchase.model_stock_move
diff --git a/addons/sale_stock/i18n/de.po b/addons/sale_stock/i18n/de.po
index 0c73eb05d20..8c8c7faf79b 100644
--- a/addons/sale_stock/i18n/de.po
+++ b/addons/sale_stock/i18n/de.po
@@ -8,15 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2013-03-07 08:39+0000\n"
-"PO-Revision-Date: 2013-01-05 14:25+0000\n"
-"Last-Translator: Thorsten Vocks (OpenBig.org) <thorsten.vocks@big-"
-"consulting.net>\n"
+"PO-Revision-Date: 2013-04-17 07:52+0000\n"
+"Last-Translator: Iyasu Beraki <iberaki@elegosoft.com>\n"
 "Language-Team: German <de@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: 2013-03-28 06:01+0000\n"
-"X-Generator: Launchpad (build 16546)\n"
+"X-Launchpad-Export-Date: 2013-04-18 06:06+0000\n"
+"X-Generator: Launchpad (build 16567)\n"
 
 #. module: sale_stock
 #: help:sale.config.settings,group_invoice_deli_orders:0
@@ -161,7 +160,7 @@ msgstr "Projekt Zeiterfassung"
 #. module: sale_stock
 #: field:sale.config.settings,group_sale_delivery_address:0
 msgid "Allow a different address for delivery and invoicing "
-msgstr "Ermöglicht everschiedene Adressen für Auslieferung und Abrechnung "
+msgstr "Ermöglicht verschiedene Adressen für Auslieferung und Abrechnung "
 
 #. module: sale_stock
 #: code:addons/sale_stock/sale_stock.py:546

From d279819af7810d191f772364578d763b915f4997 Mon Sep 17 00:00:00 2001
From: Olivier Dony <odo@openerp.com>
Date: Wed, 17 Apr 2013 15:20:21 +0200
Subject: [PATCH 047/121] [FIX] stock, multicompany: avoid crashing when
 computing inventory levels and no warehouse/locations exists for a company

This is a cherry-pick backport of the trunk fix for bug 921561,
originally merged in trunk at revid fp@openerp.com-20130224101111-zz5n34c5fmr4n8jt

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

bzr revid: odo@openerp.com-20130417132021-pmf0cdvwaxrsx9ew
---
 addons/stock/product.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/addons/stock/product.py b/addons/stock/product.py
index ba556884bba..1d56ce64988 100644
--- a/addons/stock/product.py
+++ b/addons/stock/product.py
@@ -235,6 +235,8 @@ class product_product(osv.osv):
         else:
             location_ids = []
             wids = warehouse_obj.search(cr, uid, [], context=context)
+            if not wids:
+                return res
             for w in warehouse_obj.browse(cr, uid, wids, context=context):
                 location_ids.append(w.lot_stock_id.id)
 

From 56b54464312ef4e5de05c948883079f9361efc87 Mon Sep 17 00:00:00 2001
From: Launchpad Translations on behalf of openerp <>
Date: Thu, 18 Apr 2013 06:06:06 +0000
Subject: [PATCH 048/121] Launchpad automatic translations update.

bzr revid: launchpad_translations_on_behalf_of_openerp-20130417055748-w9lnddgiwwvrfpbl
bzr revid: launchpad_translations_on_behalf_of_openerp-20130418060606-6hezu76yxwsqgc11
---
 addons/web/i18n/fi.po             | 13 +++++++------
 addons/web/i18n/ro.po             |  8 ++++----
 addons/web_calendar/i18n/fi.po    | 20 ++++++++++----------
 addons/web_graph/i18n/fi.po       | 10 +++++-----
 addons/web_view_editor/i18n/lt.po | 10 +++++-----
 addons/web_view_editor/i18n/tr.po | 16 ++++++++--------
 6 files changed, 39 insertions(+), 38 deletions(-)

diff --git a/addons/web/i18n/fi.po b/addons/web/i18n/fi.po
index 94b93255fc6..8435480963b 100644
--- a/addons/web/i18n/fi.po
+++ b/addons/web/i18n/fi.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openerp-web\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2013-03-07 08:39+0000\n"
-"PO-Revision-Date: 2013-04-05 06:10+0000\n"
+"PO-Revision-Date: 2013-04-16 06:34+0000\n"
 "Last-Translator: Samuli Kivistö <samuli.kivisto@harppaus.fi>\n"
 "Language-Team: Finnish <fi@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-04-06 06:36+0000\n"
-"X-Generator: Launchpad (build 16550)\n"
+"X-Launchpad-Export-Date: 2013-04-17 05:57+0000\n"
+"X-Generator: Launchpad (build 16567)\n"
 
 #. module: web
 #. openerp-web
@@ -1931,7 +1931,7 @@ msgstr "-- Suotimet --"
 #: code:addons/web/static/src/js/search.js:2157
 #, python-format
 msgid "%(field)s %(operator)s"
-msgstr ""
+msgstr "%(field)s %(operator)s"
 
 #. module: web
 #. openerp-web
@@ -2078,7 +2078,7 @@ msgstr "Nopea lisäys"
 #: code:addons/web/static/src/xml/base.xml:1803
 #, python-format
 msgid "Latin 1"
-msgstr ""
+msgstr "Latin 1-merkistö"
 
 #. module: web
 #. openerp-web
@@ -2405,6 +2405,7 @@ msgstr "Virheellinen arvo kentälle %(fieldname)s: [%(value)s] is %(message)s"
 #, python-format
 msgid "The o2m record must be saved before an action can be used"
 msgstr ""
+"One to many yksikkö pitää tallentaa ennen kuin toimenpide voidaan suorittaa"
 
 #. module: web
 #. openerp-web
@@ -2641,7 +2642,7 @@ msgstr "Luo tietokanta"
 #: code:addons/web/static/src/xml/base.xml:423
 #, python-format
 msgid "GNU Affero General Public License"
-msgstr ""
+msgstr "GNU Affero General Public Licence"
 
 #. module: web
 #. openerp-web
diff --git a/addons/web/i18n/ro.po b/addons/web/i18n/ro.po
index f3510385da6..bad5cef529f 100644
--- a/addons/web/i18n/ro.po
+++ b/addons/web/i18n/ro.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openerp-web\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2013-03-07 08:39+0000\n"
-"PO-Revision-Date: 2013-04-09 04:47+0000\n"
+"PO-Revision-Date: 2013-04-17 17:57+0000\n"
 "Last-Translator: Dorin <dhongu@gmail.com>\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: 2013-04-10 05:54+0000\n"
-"X-Generator: Launchpad (build 16550)\n"
+"X-Launchpad-Export-Date: 2013-04-18 06:06+0000\n"
+"X-Generator: Launchpad (build 16567)\n"
 
 #. module: web
 #. openerp-web
@@ -469,7 +469,7 @@ msgstr "Faceți o pauză de cafea,<br /> pentru că se încarcă..."
 #: code:addons/web/static/src/xml/base.xml:416
 #, python-format
 msgid "Activate the developer mode"
-msgstr "Activeaza modulul programare"
+msgstr "Activează modulul programare"
 
 #. module: web
 #. openerp-web
diff --git a/addons/web_calendar/i18n/fi.po b/addons/web_calendar/i18n/fi.po
index e7713ae1da5..2c51715e4f4 100644
--- a/addons/web_calendar/i18n/fi.po
+++ b/addons/web_calendar/i18n/fi.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openerp-web\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2013-03-07 08:39+0000\n"
-"PO-Revision-Date: 2013-04-05 05:57+0000\n"
+"PO-Revision-Date: 2013-04-16 06:53+0000\n"
 "Last-Translator: Samuli Kivistö <samuli.kivisto@harppaus.fi>\n"
 "Language-Team: Finnish <fi@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-04-06 06:36+0000\n"
-"X-Generator: Launchpad (build 16550)\n"
+"X-Launchpad-Export-Date: 2013-04-17 05:57+0000\n"
+"X-Generator: Launchpad (build 16567)\n"
 
 #. module: web_calendar
 #. openerp-web
@@ -50,7 +50,7 @@ msgstr "Tallenna"
 #: code:addons/web_calendar/static/src/js/calendar.js:101
 #, python-format
 msgid "Calendar view has a 'date_delay' type != float"
-msgstr ""
+msgstr "Kalenterinäkymässä 'date_delay' tyyppi pitää olla liukuluku"
 
 #. module: web_calendar
 #. openerp-web
@@ -172,35 +172,35 @@ msgstr "Aikajakso"
 #: code:addons/web_calendar/static/src/js/calendar.js:158
 #, python-format
 msgid "Delete"
-msgstr ""
+msgstr "Poista"
 
 #. module: web_calendar
 #. openerp-web
 #: code:addons/web_calendar/static/src/js/calendar.js:152
 #, python-format
 msgid "Month"
-msgstr ""
+msgstr "Kuukausi"
 
 #. module: web_calendar
 #. openerp-web
 #: code:addons/web_calendar/static/src/js/calendar.js:168
 #, python-format
 msgid "Disabled"
-msgstr ""
+msgstr "Ei käytössä"
 
 #. module: web_calendar
 #. openerp-web
 #: code:addons/web_calendar/static/src/js/calendar.js:177
 #, python-format
 msgid "Year"
-msgstr ""
+msgstr "Vuosi"
 
 #. module: web_calendar
 #. openerp-web
 #: code:addons/web_calendar/static/src/js/calendar.js:155
 #, python-format
 msgid "Cancel"
-msgstr ""
+msgstr "Peruuta"
 
 #. module: web_calendar
 #. openerp-web
@@ -214,4 +214,4 @@ msgstr "kalenteri"
 #: code:addons/web_calendar/static/src/js/calendar.js:93
 #, python-format
 msgid "Calendar view has not defined 'date_start' attribute."
-msgstr ""
+msgstr "Kalenterinäkymään ei ole määritelty aloituspäivää 'date_start'."
diff --git a/addons/web_graph/i18n/fi.po b/addons/web_graph/i18n/fi.po
index 00c50f63220..c22eec3735c 100644
--- a/addons/web_graph/i18n/fi.po
+++ b/addons/web_graph/i18n/fi.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openerp-web\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2013-03-07 08:39+0000\n"
-"PO-Revision-Date: 2013-04-04 13:09+0000\n"
+"PO-Revision-Date: 2013-04-16 06:55+0000\n"
 "Last-Translator: Samuli Kivistö <samuli.kivisto@harppaus.fi>\n"
 "Language-Team: Finnish <fi@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-04-05 06:23+0000\n"
-"X-Generator: Launchpad (build 16550)\n"
+"X-Launchpad-Export-Date: 2013-04-17 05:57+0000\n"
+"X-Generator: Launchpad (build 16567)\n"
 
 #. module: web_graph
 #. openerp-web
@@ -50,7 +50,7 @@ msgstr "Sisäpuoli"
 #: code:addons/web_graph/static/src/xml/web_graph.xml:3
 #, python-format
 msgid "&iacute;"
-msgstr ""
+msgstr "&iacute;"
 
 #. module: web_graph
 #. openerp-web
@@ -92,7 +92,7 @@ msgstr "Lataa PNG-muodossa"
 #: code:addons/web_graph/static/src/xml/web_graph.xml:26
 #, python-format
 msgid "Top"
-msgstr ""
+msgstr "Ylin"
 
 #. module: web_graph
 #. openerp-web
diff --git a/addons/web_view_editor/i18n/lt.po b/addons/web_view_editor/i18n/lt.po
index ed63e4d44ed..f920e9dd2f9 100644
--- a/addons/web_view_editor/i18n/lt.po
+++ b/addons/web_view_editor/i18n/lt.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openerp-web\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2013-03-07 08:39+0000\n"
-"PO-Revision-Date: 2013-04-13 15:27+0000\n"
-"Last-Translator: Giedrius Slavinskas - inovera.lt <giedrius@inovera.lt>\n"
+"PO-Revision-Date: 2013-04-16 08:16+0000\n"
+"Last-Translator: Mantas Kriaučiūnas <mantas@akl.lt>\n"
 "Language-Team: Lithuanian <lt@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: 2013-04-14 05:50+0000\n"
-"X-Generator: Launchpad (build 16564)\n"
+"X-Launchpad-Export-Date: 2013-04-17 05:57+0000\n"
+"X-Generator: Launchpad (build 16567)\n"
 
 #. module: web_view_editor
 #. openerp-web
@@ -166,7 +166,7 @@ msgstr "Rodinio redaktorius %d - %s"
 #: code:addons/web_view_editor/static/src/js/view_editor.js:974
 #, python-format
 msgid "Cancel"
-msgstr "Atšaukti"
+msgstr "Atsisakyti"
 
 #. module: web_view_editor
 #. openerp-web
diff --git a/addons/web_view_editor/i18n/tr.po b/addons/web_view_editor/i18n/tr.po
index d91e34ef45b..66db70de14a 100644
--- a/addons/web_view_editor/i18n/tr.po
+++ b/addons/web_view_editor/i18n/tr.po
@@ -8,21 +8,21 @@ msgstr ""
 "Project-Id-Version: openerp-web\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2013-03-07 08:39+0000\n"
-"PO-Revision-Date: 2013-02-15 20:44+0000\n"
+"PO-Revision-Date: 2013-04-17 20:03+0000\n"
 "Last-Translator: Ayhan KIZILTAN <Unknown>\n"
 "Language-Team: Turkish <tr@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: 2013-03-29 05:10+0000\n"
-"X-Generator: Launchpad (build 16546)\n"
+"X-Launchpad-Export-Date: 2013-04-18 06:06+0000\n"
+"X-Generator: Launchpad (build 16567)\n"
 
 #. module: web_view_editor
 #. openerp-web
 #: code:addons/web_view_editor/static/src/js/view_editor.js:164
 #, python-format
 msgid "The following fields are invalid :"
-msgstr "Geçersiz alan"
+msgstr "Aşağıdaki alanlar geçersizdir:"
 
 #. module: web_view_editor
 #. openerp-web
@@ -50,7 +50,7 @@ msgstr "Devralınmış görünüm oluşturmak istediğinden emin misin?"
 #: code:addons/web_view_editor/static/src/js/view_editor.js:396
 #, python-format
 msgid "Preview"
-msgstr "Ön İzleme"
+msgstr "Önizle"
 
 #. module: web_view_editor
 #. openerp-web
@@ -79,7 +79,7 @@ msgstr "Bir öğe seçin"
 #: code:addons/web_view_editor/static/src/js/view_editor.js:954
 #, python-format
 msgid "Update"
-msgstr "GÜNCELLE"
+msgstr "Güncelle"
 
 #. module: web_view_editor
 #. openerp-web
@@ -143,7 +143,7 @@ msgstr "Kaldır"
 #: code:addons/web_view_editor/static/src/js/view_editor.js:516
 #, python-format
 msgid "Do you really want to remove this node?"
-msgstr "Bu düğümü(node) silmek istediğinize emin misiniz?"
+msgstr "Bu düğümü silmek istediğinizden emin misiniz?"
 
 #. module: web_view_editor
 #. openerp-web
@@ -181,4 +181,4 @@ msgstr "Kapat"
 #: code:addons/web_view_editor/static/src/js/view_editor.js:88
 #, python-format
 msgid "Create a view (%s)"
-msgstr "Bir ekran oluştur (%s)"
+msgstr "Bir görünüm oluştur (%s)"

From b8d99e7aa320c8ddd8c7a2ffdbc6391a1a443d31 Mon Sep 17 00:00:00 2001
From: Cedric Snauwaert <csn@openerp.com>
Date: Thu, 18 Apr 2013 11:00:11 +0200
Subject: [PATCH 049/121] [FIX]sale: fix workflow problem when deleting an
 invoice the workflow should go to invoice_exception state

bzr revid: csn@openerp.com-20130418090011-dyg175mvwrp8ilij
---
 addons/sale/sale.py | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/addons/sale/sale.py b/addons/sale/sale.py
index a6be2838171..7364932f91c 100644
--- a/addons/sale/sale.py
+++ b/addons/sale/sale.py
@@ -999,4 +999,22 @@ class mail_compose_message(osv.Model):
             wf_service.trg_validate(uid, 'sale.order', context['default_res_id'], 'quotation_sent', cr)
         return super(mail_compose_message, self).send_mail(cr, uid, ids, context=context)
 
+#
+# account.invoice is defined in module account
+#
+class account_invoice(osv.Model):
+    """ Overwrite unlink method of account invoice to send a trigger to the sale workflow upon invoice deletion """
+    _inherit = 'account.invoice'
+
+    def unlink(self, cr, uid, ids, context=None):
+        #Cancel invoice(s) first before deleting them so that if any sale order are associated with them
+        #it will trigger the workflow to put the sale order in an invoice exception state
+        #if we can't cancel all invoices, do nothing
+        invoice_ids = self.search(cr, uid, [('id', 'in', ids), ('state', 'in', ['draft', 'cancel'])], context=context)
+        if len(invoice_ids)==len(ids):
+            wf_service = netsvc.LocalService("workflow")
+            for id in ids:
+                wf_service.trg_validate(uid, 'account.invoice', id, 'invoice_cancel', cr)
+        return super(account_invoice, self).unlink(cr, uid, ids, context=context)
+
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

From db4d08e3a995bb262ebbbdab2b75b466b7c187df Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Thu, 18 Apr 2013 11:24:05 +0200
Subject: [PATCH 050/121] [FIX] Extension of controller in-place with explicit
 spec of same _cp_path

When extending a controller in-place (e.g. A(Controller), B(A)) and
providing the exact same _cp_path as parent (no-op) execution path
would go into handler for _cp_path overwriting and raise an assertion
error for overwriting of existing controller.

Except this is allowed (if ugly) pattern, so warn & ignore behavior
(it is harmless).

bzr revid: xmo@openerp.com-20130418092405-wrmmrd648b9koefu
---
 addons/web/http.py                |  8 +++++++-
 addons/web/tests/test_dispatch.py | 23 +++++++++++++++++++++++
 2 files changed, 30 insertions(+), 1 deletion(-)

diff --git a/addons/web/http.py b/addons/web/http.py
index f08d7c64c4d..9439d7aa547 100644
--- a/addons/web/http.py
+++ b/addons/web/http.py
@@ -381,6 +381,12 @@ class ControllerType(type):
 
             # inherit from a Controller subclass
             if path:
+                # if extending in place with same URL, ignore URL
+                if parent_path == path:
+                    _logger.warn(
+                        "Controller %s extending %s in-place should not "
+                        "explicitly specify URL", cls, parent)
+                    return
                 _logger.warn("Re-exposing %s at %s.\n"
                              "\tThis usage is unsupported.",
                              parent.__name__,
@@ -398,7 +404,7 @@ class Controller(object):
 
     def __new__(cls, *args, **kwargs):
         subclasses = [c for c in cls.__subclasses__()
-                      if c._cp_path is cls._cp_path]
+                      if c._cp_path == cls._cp_path]
         if subclasses:
             name = "%s (+%s)" % (
                 cls.__name__,
diff --git a/addons/web/tests/test_dispatch.py b/addons/web/tests/test_dispatch.py
index b1304fca7f1..b532cebac44 100644
--- a/addons/web/tests/test_dispatch.py
+++ b/addons/web/tests/test_dispatch.py
@@ -242,6 +242,29 @@ class TestSubclassing(DispatchCleanup):
         self.assertEqual('200 OK', status)
         self.assertEqual('1 2 3', ''.join(body))
 
+    def test_extends_same_path(self):
+        """
+        When subclassing an existing Controller and specifying the same
+        _cp_path as the parent, ???
+        """
+        class A(http.Controller):
+            _cp_path = '/foo'
+            @http.httprequest
+            def index(self, req):
+                return '1'
+
+        class B(A):
+            _cp_path = '/foo'
+            @http.httprequest
+            def index(self, req):
+                return '2'
+
+        self.app.load_addons()
+
+        body, status, headers = self.client.get('/foo')
+        self.assertEqual('200 OK', status)
+        self.assertEqual('2', ''.join(body))
+
     def test_re_expose(self):
         """
         An existing Controller should not be extended with a new cp_path

From 3da2aaf488ed5a98980e90ad3034c23e92ab3b25 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Thu, 18 Apr 2013 11:43:15 +0200
Subject: [PATCH 051/121] [IMP] only use name of class being created: module is
 incorrect for dynamically created classes

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

diff --git a/addons/web/http.py b/addons/web/http.py
index 9439d7aa547..52c9bc92e4c 100644
--- a/addons/web/http.py
+++ b/addons/web/http.py
@@ -367,7 +367,7 @@ class ControllerType(type):
 
         path = attrs.get('_cp_path')
         if Controller in bases:
-            assert path, "Controller subclass %s missing a _cp_path" % cls
+            assert path, "Controller subclass %s missing a _cp_path" % name
         else:
             parent_paths = set(base._cp_path for base in bases
                                if issubclass(base, Controller))
@@ -385,7 +385,7 @@ class ControllerType(type):
                 if parent_path == path:
                     _logger.warn(
                         "Controller %s extending %s in-place should not "
-                        "explicitly specify URL", cls, parent)
+                        "explicitly specify URL", name, parent)
                     return
                 _logger.warn("Re-exposing %s at %s.\n"
                              "\tThis usage is unsupported.",
@@ -395,7 +395,7 @@ class ControllerType(type):
         if path:
             assert path not in controllers_class,\
                 "Trying to expose %s at the same URL as %s" % (
-                    cls, controllers_class[path])
+                    name, controllers_class[path])
             controllers_class[path] = cls
 
 

From c46929268d4f94374fcb64430d92cc138e1864f3 Mon Sep 17 00:00:00 2001
From: "Quentin (OpenERP)" <qdp-launchpad@openerp.com>
Date: Thu, 18 Apr 2013 12:24:33 +0200
Subject: [PATCH 052/121] [FIX] account* modules: added
 'account_period_prefer_normal':True in context when trying to find the period
 related to a date.

This patch will be forward ported in trunk by changing the behaviour of account_period.find() in order to fetch the normal periods by default (account_period_prefer_normal will be True by default) because there are no business case i could think of where you'd like to get the opening period (except in the closure but it's held in a different way there). On the other hand, it's pretty easy to forget to put that key in the context and introduce a new bug that will select the opening period instead of the wanted one

bzr revid: qdp-launchpad@openerp.com-20130418102433-t52uj23trkpr8vnb
---
 addons/account/account.py                           | 11 ++++++-----
 addons/account/account_bank_statement.py            |  5 +++--
 addons/account/account_move_line.py                 |  3 ++-
 addons/account/report/account_entries_report.py     |  6 ++++--
 addons/account/wizard/account_reconcile.py          |  5 +++--
 addons/account/wizard/account_tax_chart.py          |  3 ++-
 addons/account_asset/account_asset.py               |  6 ++++--
 addons/account_asset/wizard/wizard_asset_compute.py |  3 ++-
 addons/account_voucher/account_voucher.py           |  5 +++--
 addons/hr_payroll_account/hr_payroll_account.py     |  3 ++-
 addons/point_of_sale/point_of_sale.py               |  3 ++-
 11 files changed, 33 insertions(+), 20 deletions(-)

diff --git a/addons/account/account.py b/addons/account/account.py
index 5d1916ee7bd..9cc6023375e 100644
--- a/addons/account/account.py
+++ b/addons/account/account.py
@@ -1006,8 +1006,7 @@ class account_period(osv.osv):
     def find(self, cr, uid, dt=None, context=None):
         if context is None: context = {}
         if not dt:
-            dt = fields.date.context_today(self,cr,uid,context=context)
-#CHECKME: shouldn't we check the state of the period?
+            dt = fields.date.context_today(self, cr, uid, context=context)
         args = [('date_start', '<=' ,dt), ('date_stop', '>=', dt)]
         if context.get('company_id', False):
             args.append(('company_id', '=', context['company_id']))
@@ -1015,6 +1014,7 @@ class account_period(osv.osv):
             company_id = self.pool.get('res.users').browse(cr, uid, uid, context=context).company_id.id
             args.append(('company_id', '=', company_id))
         result = []
+        #WARNING: in next version the default value for account_periof_prefer_normal will be True
         if context.get('account_period_prefer_normal'):
             # look for non-special periods first, and fallback to all if no result is found
             result = self.search(cr, uid, args + [('special', '=', False)], context=context)
@@ -1167,7 +1167,7 @@ class account_move(osv.osv):
             context = {}
         #put the company in context to find the good period
         ctx = context.copy()
-        ctx.update({'company_id': company_id})
+        ctx.update({'company_id': company_id, 'account_period_prefer_normal': True})
         return {
             'journal_id': journal_id,
             'date': date,
@@ -1796,7 +1796,8 @@ class account_tax_code(osv.osv):
         if context.get('period_id', False):
             period_id = context['period_id']
         else:
-            period_id = self.pool.get('account.period').find(cr, uid)
+            ctx = dict(context, account_period_prefer_normal=True)
+            period_id = self.pool.get('account.period').find(cr, uid, context=ctx)
             if not period_id:
                 return dict.fromkeys(ids, 0.0)
             period_id = period_id[0]
@@ -2313,7 +2314,7 @@ class account_model(osv.osv):
         move_date = datetime.strptime(move_date,"%Y-%m-%d")
         for model in self.browse(cr, uid, ids, context=context):
             ctx = context.copy()
-            ctx.update({'company_id': model.company_id.id})
+            ctx.update({'company_id': model.company_id.id, 'account_period_prefer_normal': True})
             period_ids = period_obj.find(cr, uid, dt=context.get('date', False), context=ctx)
             period_id = period_ids and period_ids[0] or False
             ctx.update({'journal_id': model.journal_id.id,'period_id': period_id})
diff --git a/addons/account/account_bank_statement.py b/addons/account/account_bank_statement.py
index 8e1a5dd26c6..cb95ad8d0c0 100644
--- a/addons/account/account_bank_statement.py
+++ b/addons/account/account_bank_statement.py
@@ -61,7 +61,8 @@ class account_bank_statement(osv.osv):
         return res
 
     def _get_period(self, cr, uid, context=None):
-        periods = self.pool.get('account.period').find(cr, uid,context=context)
+        ctx = dict(context or {}, account_period_prefer_normal=True)
+        periods = self.pool.get('account.period').find(cr, uid, context=ctx)
         if periods:
             return periods[0]
         return False
@@ -159,7 +160,7 @@ class account_bank_statement(osv.osv):
         if context is None:
             context = {}
         ctx = context.copy()
-        ctx.update({'company_id': company_id})
+        ctx.update({'company_id': company_id, 'account_period_prefer_normal': True})
         pids = period_pool.find(cr, uid, dt=date, context=ctx)
         if pids:
             res.update({'period_id': pids[0]})
diff --git a/addons/account/account_move_line.py b/addons/account/account_move_line.py
index 082d654c5a2..b616eecdca9 100644
--- a/addons/account/account_move_line.py
+++ b/addons/account/account_move_line.py
@@ -513,7 +513,8 @@ class account_move_line(osv.osv):
         if context.get('period_id', False):
             return context['period_id']
         account_period_obj = self.pool.get('account.period')
-        ids = account_period_obj.find(cr, uid, context=context)
+        ctx = dict(context, account_period_prefer_normal=True)
+        ids = account_period_obj.find(cr, uid, context=ctx)
         period_id = False
         if ids:
             period_id = ids[0]
diff --git a/addons/account/report/account_entries_report.py b/addons/account/report/account_entries_report.py
index d53e6153981..6dd451599b4 100644
--- a/addons/account/report/account_entries_report.py
+++ b/addons/account/report/account_entries_report.py
@@ -81,7 +81,8 @@ class account_entries_report(osv.osv):
         period_obj = self.pool.get('account.period')
         for arg in args:
             if arg[0] == 'period_id' and arg[2] == 'current_period':
-                current_period = period_obj.find(cr, uid)[0]
+                ctx = dict(context or {}, account_period_prefer_normal=True)
+                current_period = period_obj.find(cr, uid, context=ctx)[0]
                 args.append(['period_id','in',[current_period]])
                 break
             elif arg[0] == 'period_id' and arg[2] == 'current_year':
@@ -100,7 +101,8 @@ class account_entries_report(osv.osv):
         fiscalyear_obj = self.pool.get('account.fiscalyear')
         period_obj = self.pool.get('account.period')
         if context.get('period', False) == 'current_period':
-            current_period = period_obj.find(cr, uid)[0]
+            ctx = dict(context, account_period_prefer_normal=True)
+            current_period = period_obj.find(cr, uid, context=ctx)[0]
             domain.append(['period_id','in',[current_period]])
         elif context.get('year', False) == 'current_year':
             current_year = fiscalyear_obj.find(cr, uid)
diff --git a/addons/account/wizard/account_reconcile.py b/addons/account/wizard/account_reconcile.py
index 81609249fd7..28de637d16f 100644
--- a/addons/account/wizard/account_reconcile.py
+++ b/addons/account/wizard/account_reconcile.py
@@ -84,7 +84,8 @@ class account_move_line_reconcile(osv.osv_memory):
             context = {}
 
         date = time.strftime('%Y-%m-%d')
-        ids = period_obj.find(cr, uid, dt=date, context=context)
+        ctx = dict(context or {}, account_period_prefer_normal=True)
+        ids = period_obj.find(cr, uid, dt=date, context=ctx)
         if ids:
             period_id = ids[0]
         account_move_line_obj.reconcile(cr, uid, context['active_ids'], 'manual', account_id,
@@ -149,7 +150,7 @@ class account_move_line_reconcile_writeoff(osv.osv_memory):
             context['analytic_id'] = data['analytic_id'][0]
         if context['date_p']:
             date = context['date_p']
-
+        context['account_period_prefer_normal'] = True
         ids = period_obj.find(cr, uid, dt=date, context=context)
         if ids:
             period_id = ids[0]
diff --git a/addons/account/wizard/account_tax_chart.py b/addons/account/wizard/account_tax_chart.py
index 84859e2077c..da2e9677739 100644
--- a/addons/account/wizard/account_tax_chart.py
+++ b/addons/account/wizard/account_tax_chart.py
@@ -38,7 +38,8 @@ class account_tax_chart(osv.osv_memory):
 
     def _get_period(self, cr, uid, context=None):
         """Return default period value"""
-        period_ids = self.pool.get('account.period').find(cr, uid)
+        ctx = dict(context or {}, account_period_prefer_normal=True)
+        period_ids = self.pool.get('account.period').find(cr, uid, context=ctx)
         return period_ids and period_ids[0] or False
 
     def account_tax_chart_open_window(self, cr, uid, ids, context=None):
diff --git a/addons/account_asset/account_asset.py b/addons/account_asset/account_asset.py
index 3d2c81a7c15..b47339eef17 100644
--- a/addons/account_asset/account_asset.py
+++ b/addons/account_asset/account_asset.py
@@ -83,7 +83,8 @@ class account_asset_asset(osv.osv):
         return super(account_asset_asset, self).unlink(cr, uid, ids, context=context)
 
     def _get_period(self, cr, uid, context=None):
-        periods = self.pool.get('account.period').find(cr, uid)
+        ctx = dict(context or {}, account_period_prefer_normal=True)
+        periods = self.pool.get('account.period').find(cr, uid, context=ctx)
         if periods:
             return periods[0]
         else:
@@ -399,7 +400,8 @@ class account_asset_depreciation_line(osv.osv):
         asset_ids = []
         for line in self.browse(cr, uid, ids, context=context):
             depreciation_date = context.get('depreciation_date') or time.strftime('%Y-%m-%d')
-            period_ids = period_obj.find(cr, uid, depreciation_date, context=context)
+            ctx = dict(context, account_period_prefer_normal=True)
+            period_ids = period_obj.find(cr, uid, depreciation_date, context=ctx)
             company_currency = line.asset_id.company_id.currency_id.id
             current_currency = line.asset_id.currency_id.id
             context.update({'date': depreciation_date})
diff --git a/addons/account_asset/wizard/wizard_asset_compute.py b/addons/account_asset/wizard/wizard_asset_compute.py
index cc870329840..d845b2a2bae 100755
--- a/addons/account_asset/wizard/wizard_asset_compute.py
+++ b/addons/account_asset/wizard/wizard_asset_compute.py
@@ -30,7 +30,8 @@ class asset_depreciation_confirmation_wizard(osv.osv_memory):
     }
    
     def _get_period(self, cr, uid, context=None):
-        periods = self.pool.get('account.period').find(cr, uid)
+        ctx = dict(context or {}, account_period_prefer_normal=True)
+        periods = self.pool.get('account.period').find(cr, uid, context=ctx)
         if periods:
             return periods[0]
         return False
diff --git a/addons/account_voucher/account_voucher.py b/addons/account_voucher/account_voucher.py
index b0176caa101..dd8bb157067 100644
--- a/addons/account_voucher/account_voucher.py
+++ b/addons/account_voucher/account_voucher.py
@@ -86,7 +86,8 @@ class account_voucher(osv.osv):
         if context is None: context = {}
         if context.get('period_id', False):
             return context.get('period_id')
-        periods = self.pool.get('account.period').find(cr, uid)
+        ctx = dict(context, account_period_prefer_normal=True)
+        periods = self.pool.get('account.period').find(cr, uid, context=ctx)
         return periods and periods[0] or False
 
     def _make_journal_search(self, cr, uid, ttype, context=None):
@@ -791,7 +792,7 @@ class account_voucher(osv.osv):
         period_pool = self.pool.get('account.period')
         currency_obj = self.pool.get('res.currency')
         ctx = context.copy()
-        ctx.update({'company_id': company_id})
+        ctx.update({'company_id': company_id, 'account_period_prefer_normal': True})
         pids = period_pool.find(cr, uid, date, context=ctx)
         if pids:
             res['value'].update({'period_id':pids[0]})
diff --git a/addons/hr_payroll_account/hr_payroll_account.py b/addons/hr_payroll_account/hr_payroll_account.py
index b15000dd12f..43f984fadd2 100644
--- a/addons/hr_payroll_account/hr_payroll_account.py
+++ b/addons/hr_payroll_account/hr_payroll_account.py
@@ -94,7 +94,8 @@ class hr_payslip(osv.osv):
             debit_sum = 0.0
             credit_sum = 0.0
             if not slip.period_id:
-                search_periods = period_pool.find(cr, uid, slip.date_to, context=context)
+                ctx = dict(context or {}, account_period_prefer_normal=True)
+                search_periods = period_pool.find(cr, uid, slip.date_to, context=ctx)
                 period_id = search_periods[0]
             else:
                 period_id = slip.period_id.id
diff --git a/addons/point_of_sale/point_of_sale.py b/addons/point_of_sale/point_of_sale.py
index 2d9bec51b75..493c7105631 100644
--- a/addons/point_of_sale/point_of_sale.py
+++ b/addons/point_of_sale/point_of_sale.py
@@ -911,7 +911,8 @@ class pos_order(osv.osv):
         property_obj = self.pool.get('ir.property')
         cur_obj = self.pool.get('res.currency')
 
-        period = account_period_obj.find(cr, uid, context=context)[0]
+        ctx = dict(context or {}, account_period_prefer_normal=True)
+        period = account_period_obj.find(cr, uid, context=ctx)[0]
 
         #session_ids = set(order.session_id for order in self.browse(cr, uid, ids, context=context))
 

From d4977dd3bb932ea05a37b75d4712dab362bab686 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Thu, 18 Apr 2013 14:56:40 +0200
Subject: [PATCH 053/121] [FIX] missing translation mark in error message

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

bzr revid: xmo@openerp.com-20130418125640-87g9sdowig7w565d
---
 addons/web/static/src/js/chrome.js | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/addons/web/static/src/js/chrome.js b/addons/web/static/src/js/chrome.js
index ef045f07931..02228a96b06 100644
--- a/addons/web/static/src/js/chrome.js
+++ b/addons/web/static/src/js/chrome.js
@@ -249,7 +249,9 @@ instance.web.CrashManager = instance.web.Class.extend({
         }
         // yes, exception handling is shitty
         if (error.code === 300 && error.data && error.data.type == "client_exception" && error.data.debug.match("SessionExpiredException")) {
-            this.show_warning({type: "Session Expired", data: { fault_code: "Your OpenERP session expired. Please refresh the current web page." }});
+            this.show_warning({type: "Session Expired", data: {
+                fault_code: _t("Your OpenERP session expired. Please refresh the current web page.")
+            }});
             return;
         }
         if (error.data.fault_code) {

From 46e95cb136b6864cbc76a0591ad329506b976ca0 Mon Sep 17 00:00:00 2001
From: "Quentin (OpenERP)" <qdp-launchpad@openerp.com>
Date: Thu, 18 Apr 2013 15:40:32 +0200
Subject: [PATCH 054/121] [FIX] account, account.move.line form view: the same
 method was defined twice, differently, and parameters were not correctly
 passed in onchanges

bzr revid: qdp-launchpad@openerp.com-20130418134032-t3y4dk4sp4eu2031
---
 addons/account/account_move_line.py | 20 +++++++-------------
 addons/account/account_view.xml     |  6 +++---
 2 files changed, 10 insertions(+), 16 deletions(-)

diff --git a/addons/account/account_move_line.py b/addons/account/account_move_line.py
index b616eecdca9..58c4cc583b9 100644
--- a/addons/account/account_move_line.py
+++ b/addons/account/account_move_line.py
@@ -655,13 +655,7 @@ class account_move_line(osv.osv):
         }
         return result
 
-    def onchange_account_id(self, cr, uid, ids, account_id, context=None):
-        res = {'value': {}}
-        if account_id:
-            res['value']['account_tax_id'] = [x.id for x in self.pool.get('account.account').browse(cr, uid, account_id, context=context).tax_ids]
-        return res
-
-    def onchange_partner_id(self, cr, uid, ids, move_id, partner_id, account_id=None, debit=0, credit=0, date=False, journal=False):
+    def onchange_partner_id(self, cr, uid, ids, move_id, partner_id, account_id=None, debit=0, credit=0, date=False, journal=False, context=None):
         partner_obj = self.pool.get('res.partner')
         payment_term_obj = self.pool.get('account.payment.term')
         journal_obj = self.pool.get('account.journal')
@@ -675,8 +669,8 @@ class account_move_line(osv.osv):
             date = datetime.now().strftime('%Y-%m-%d')
         jt = False
         if journal:
-            jt = journal_obj.browse(cr, uid, journal).type
-        part = partner_obj.browse(cr, uid, partner_id)
+            jt = journal_obj.browse(cr, uid, journal, context=context).type
+        part = partner_obj.browse(cr, uid, partner_id, context=context)
 
         payment_term_id = False
         if jt and jt in ('purchase', 'purchase_refund') and part.property_supplier_payment_term:
@@ -701,20 +695,20 @@ class account_move_line(osv.osv):
                     elif part.supplier:
                         val['account_id'] = fiscal_pos_obj.map_account(cr, uid, part and part.property_account_position or False, id1)
                 if val.get('account_id', False):
-                    d = self.onchange_account_id(cr, uid, ids, val['account_id'])
+                    d = self.onchange_account_id(cr, uid, ids, account_id=val['account_id'], partner_id=part.id, context=context)
                     val.update(d['value'])
         return {'value':val}
 
-    def onchange_account_id(self, cr, uid, ids, account_id=False, partner_id=False):
+    def onchange_account_id(self, cr, uid, ids, account_id=False, partner_id=False, context=None):
         account_obj = self.pool.get('account.account')
         partner_obj = self.pool.get('res.partner')
         fiscal_pos_obj = self.pool.get('account.fiscal.position')
         val = {}
         if account_id:
-            res = account_obj.browse(cr, uid, account_id)
+            res = account_obj.browse(cr, uid, account_id, context=context)
             tax_ids = res.tax_ids
             if tax_ids and partner_id:
-                part = partner_obj.browse(cr, uid, partner_id)
+                part = partner_obj.browse(cr, uid, partner_id, context=context)
                 tax_id = fiscal_pos_obj.map_tax(cr, uid, part and part.property_account_position or False, tax_ids)[0]
             else:
                 tax_id = tax_ids and tax_ids[0].id or False
diff --git a/addons/account/account_view.xml b/addons/account/account_view.xml
index b8dcefdd3a4..d38684c2317 100644
--- a/addons/account/account_view.xml
+++ b/addons/account/account_view.xml
@@ -1112,7 +1112,7 @@
                     <field name="ref"/>
                     <field name="statement_id" invisible="1"/>
                     <field name="partner_id" on_change="onchange_partner_id(move_id, partner_id, account_id, debit, credit, date, journal_id)"/>
-                    <field name="account_id" options='{"no_open":True}' domain="[('journal_id','=',journal_id), ('company_id', '=', company_id)]" on_change="onchange_account_id(account_id)"/>
+                    <field name="account_id" options='{"no_open":True}' domain="[('journal_id','=',journal_id), ('company_id', '=', company_id)]" on_change="onchange_account_id(account_id, partner_id, context)"/>
                     <field name="account_tax_id" options='{"no_open":True}' invisible="context.get('journal_type', False) not in ['sale','sale_refund','purchase','purchase_refund','general']"/>
                     <field name="analytic_account_id" groups="analytic.group_analytic_accounting" domain="[('type','not in',['view','template'])]" invisible="not context.get('analytic_journal_id',False)"/>
                     <field name="move_id" required="0"/>
@@ -1288,7 +1288,7 @@
                                     <group col="6" colspan="4">
                                         <field name="name"/>
                                         <field name="ref"/>
-                                        <field name="partner_id" on_change="onchange_partner_id(False,partner_id,account_id,debit,credit,date)"/>
+                                        <field name="partner_id" on_change="onchange_partner_id(False, partner_id, account_id, debit, credit, date, journal_id, context)"/>
 
                                         <field name="journal_id"/>
                                         <field name="period_id"/>
@@ -1352,7 +1352,7 @@
                                 <tree colors="blue:state == 'draft';black:state == 'posted'" editable="top" string="Journal Items">
                                     <field name="invoice"/>
                                     <field name="name"/>
-                                    <field name="partner_id" on_change="onchange_partner_id(False,partner_id,account_id,debit,credit,parent.date,parent.journal_id)"/>
+                                    <field name="partner_id" on_change="onchange_partner_id(False, partner_id, account_id, debit, credit, parent.date, parent.journal_id, context)"/>
                                     <field name="account_id" domain="[('journal_id','=',parent.journal_id),('company_id', '=', parent.company_id)]"/>
                                     <field name="date_maturity"/>
                                     <field name="debit" sum="Total Debit"/>

From dcfbadd97ea5c7c57cf6fc133d38a62e16e947a8 Mon Sep 17 00:00:00 2001
From: "Quentin (OpenERP)" <qdp-launchpad@openerp.com>
Date: Thu, 18 Apr 2013 15:53:56 +0200
Subject: [PATCH 055/121] [FIX] hr_expense, usability: added sum in tree view

bzr revid: qdp-launchpad@openerp.com-20130418135356-p017meay192awm3y
---
 addons/hr_expense/hr_expense_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/hr_expense/hr_expense_view.xml b/addons/hr_expense/hr_expense_view.xml
index 2511130a58e..3dc40ed749d 100644
--- a/addons/hr_expense/hr_expense_view.xml
+++ b/addons/hr_expense/hr_expense_view.xml
@@ -32,7 +32,7 @@
                     <field name="user_id" invisible="1"/>
                     <field name="name"/>
                     <field name="currency_id" groups="base.group_multi_currency"/>
-                    <field name="amount"/>
+                    <field name="amount" sum="Total Amount"/>
                     <field name="state"/>
                 </tree>
             </field>

From dfbe68e69d8df437b7fe54bd242a608f94a8caec Mon Sep 17 00:00:00 2001
From: Olivier Dony <odo@openerp.com>
Date: Thu, 18 Apr 2013 16:45:33 +0200
Subject: [PATCH 056/121] [IMP] res.partner: rename commercial_id to
 commercial_partner_id + make function field inheritable

The name `commercial_partner_id` better reflects its
purpose and the fact that it is a FK to a partner.


An extra indirection through a lambda function was
also added to the definition of the function field
to make it possible to override it in other modules
(otherwise the function is passed by copy directly
and cannot be inherited later)

bzr revid: odo@openerp.com-20130418144533-owupfwn6h83q432x
---
 openerp/addons/base/res/res_partner.py | 17 ++++++++++-------
 openerp/addons/base/tests/test_base.py |  4 ++--
 2 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/openerp/addons/base/res/res_partner.py b/openerp/addons/base/res/res_partner.py
index f578f969c4d..ff6e6e7c61d 100644
--- a/openerp/addons/base/res/res_partner.py
+++ b/openerp/addons/base/res/res_partner.py
@@ -195,7 +195,7 @@ class res_partner(osv.osv, format_address):
             result[obj.id] = obj.image != False
         return result
 
-    def _commercial_id_compute(self, cr, uid, ids, name, args, context=None):
+    def _commercial_partner_compute(self, cr, uid, ids, name, args, context=None):
         """ Returns the partner that is considered the commercial
         entity of this partner. The commercial entity holds the master data
         for all commercial fields (see :py:meth:`~_commercial_fields`) """
@@ -207,6 +207,9 @@ class res_partner(osv.osv, format_address):
             result[partner.id] = current_partner.id
         return result
 
+    # indirection to avoid passing a copy of the overridable method when declaring the function field
+    _commercial_partner_id = lambda self, *args, **kwargs: self._commercial_partner_compute(*args, **kwargs)
+
     _order = "name"
     _columns = {
         'name': fields.char('Name', size=128, required=True, select=True),
@@ -280,7 +283,7 @@ class res_partner(osv.osv, format_address):
         'contact_address': fields.function(_address_display,  type='char', string='Complete Address'),
 
         # technical field used for managing commercial fields
-        'commercial_id': fields.function(_commercial_id_compute, type='many2one', relation='res.partner', string='Commercial Entity')
+        'commercial_partner_id': fields.function(_commercial_partner_id, type='many2one', relation='res.partner', string='Commercial Entity')
     }
 
     def _default_category(self, cr, uid, context=None):
@@ -416,16 +419,16 @@ class res_partner(osv.osv, format_address):
     def _commercial_sync_from_company(self, cr, uid, partner, context=None):
         """ Handle sync of commercial fields when a new parent commercial entity is set,
         as if they were related fields """
-        if partner.commercial_id != partner:
+        if partner.commercial_partner_id != partner:
             commercial_fields = self._commercial_fields(cr, uid, context=context)
-            sync_vals = self._update_fields_values(cr, uid, partner.commercial_id,
+            sync_vals = self._update_fields_values(cr, uid, partner.commercial_partner_id,
                                                         commercial_fields, context=context)
             return self.write(cr, uid, partner.id, sync_vals, context=context)
 
     def _commercial_sync_to_children(self, cr, uid, partner, context=None):
         """ Handle sync of commercial fields to descendants """
         commercial_fields = self._commercial_fields(cr, uid, context=context)
-        sync_vals = self._update_fields_values(cr, uid, partner.commercial_id,
+        sync_vals = self._update_fields_values(cr, uid, partner.commercial_partner_id,
                                                    commercial_fields, context=context)
         sync_children = [c for c in partner.child_ids if not c.is_company]
         for child in sync_children:
@@ -451,7 +454,7 @@ class res_partner(osv.osv, format_address):
         # 2. To DOWNSTREAM: sync children 
         if partner.child_ids:
             # 2a. Commercial Fields: sync if commercial entity
-            if partner.commercial_id == partner:
+            if partner.commercial_partner_id == partner:
                 self._commercial_sync_to_children(cr, uid, partner, context=context)
             # 2b. Address fields: sync if address changed
             address_fields = self._address_fields(cr, uid, context=context)
@@ -493,7 +496,7 @@ class res_partner(osv.osv, format_address):
         return {'type': 'ir.actions.act_window',
                 'res_model': 'res.partner',
                 'view_mode': 'form',
-                'res_id': partner.commercial_id.id,
+                'res_id': partner.commercial_partner_id.id,
                 'target': 'new',
                 'flags': {'form': {'action_buttons': True}}}
 
diff --git a/openerp/addons/base/tests/test_base.py b/openerp/addons/base/tests/test_base.py
index 0455e7b5aff..ec192f2667e 100644
--- a/openerp/addons/base/tests/test_base.py
+++ b/openerp/addons/base/tests/test_base.py
@@ -219,7 +219,7 @@ class test_base(common.TransactionCase):
 
         for p in (p0, p1, p11, p2):
             p.refresh()
-            self.assertEquals(p.commercial_id, sunhelm, 'Incorrect commercial entity resolution')
+            self.assertEquals(p.commercial_partner_id, sunhelm, 'Incorrect commercial entity resolution')
             self.assertEquals(p.vat, sunhelm.vat, 'Commercial fields must be automatically synced')
         sunhelmvat = 'BE0123456789'
         sunhelm.write({'vat': sunhelmvat})
@@ -240,7 +240,7 @@ class test_base(common.TransactionCase):
                       name='Sunhelm Subsidiary'))
         p1.refresh()
         self.assertEquals(p1.vat, p1vat, 'Setting is_company should stop auto-sync of commercial fields')
-        self.assertEquals(p1.commercial_id, p1, 'Incorrect commercial entity resolution after setting is_company')
+        self.assertEquals(p1.commercial_partner_id, p1, 'Incorrect commercial entity resolution after setting is_company')
 
         # writing on parent should not touch child commercial entities
         sunhelmvat2 = 'BE0112233445'

From e7aeabc8347e53d79bab5ec9c10e19af0f495900 Mon Sep 17 00:00:00 2001
From: niv-openerp <nicolas.vanhoren@openerp.com>
Date: Thu, 18 Apr 2013 17:13:53 +0200
Subject: [PATCH 057/121] [FIX] account: minor javascript problem that made
 appear a stack trace

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

bzr revid: nicolas.vanhoren@openerp.com-20130418151353-dgfawgqgvama1u84
---
 addons/account/static/src/js/account_move_reconciliation.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/account/static/src/js/account_move_reconciliation.js b/addons/account/static/src/js/account_move_reconciliation.js
index dbbfe3cc069..cbc0abc4f4d 100644
--- a/addons/account/static/src/js/account_move_reconciliation.js
+++ b/addons/account/static/src/js/account_move_reconciliation.js
@@ -26,7 +26,7 @@ openerp.account = function (instance) {
             if (this.partners) {
                 this.$el.prepend(QWeb.render("AccountReconciliation", {widget: this}));
                 this.$(".oe_account_recon_previous").click(function() {
-                    self.current_partner = (self.current_partner - 1) % self.partners.length;
+                    self.current_partner = (((self.current_partner - 1) % self.partners.length) + self.partners.length) % self.partners.length;
                     self.search_by_partner();
                 });
                 this.$(".oe_account_recon_next").click(function() {

From 3c5559045cbbdebe2e7347ae2ffd502c3a0b4d67 Mon Sep 17 00:00:00 2001
From: Olivier Dony <odo@openerp.com>
Date: Thu, 18 Apr 2013 17:38:29 +0200
Subject: [PATCH 058/121] [FIX] res.partner: add onchange warning when changing
 an existing contact's company

bzr revid: odo@openerp.com-20130418153829-rmkd6xo1cajgfer5
---
 openerp/addons/base/res/res_partner.py | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

diff --git a/openerp/addons/base/res/res_partner.py b/openerp/addons/base/res/res_partner.py
index ff6e6e7c61d..16ba66babd2 100644
--- a/openerp/addons/base/res/res_partner.py
+++ b/openerp/addons/base/res/res_partner.py
@@ -351,12 +351,22 @@ class res_partner(osv.osv, format_address):
         def value_or_id(val):
             """ return val or val.id if val is a browse record """
             return val if isinstance(val, (bool, int, long, float, basestring)) else val.id
-
+        result = {}
         if parent_id:
+            if ids:
+                partner = self.browse(cr, uid, ids[0], context=context)
+                if partner.parent_id and partner.parent_id.id != parent_id:
+                    result['warning'] = {'title': _('Warning'),
+                                         'message': _('Changing the company of a contact should only be done if it '
+                                                      'was never correctly set. If an existing contact starts working for a new '
+                                                      'company then a new contact should be created under that new '
+                                                      'company. You can use the "Discard" button to abandon this change.')}
             parent = self.browse(cr, uid, parent_id, context=context)
             address_fields = self._address_fields(cr, uid, context=context)
-            return {'value': dict((key, value_or_id(parent[key])) for key in address_fields)}
-        return {'value': {'use_parent_address': False}}
+            result['value'] = dict((key, value_or_id(parent[key])) for key in address_fields)
+        else:
+            result['value'] = {'use_parent_address': False}
+        return result
 
     def onchange_state(self, cr, uid, ids, state_id, context=None):
         if state_id:

From a9d5c2d37ef8150e90e6dc1082d721400075f468 Mon Sep 17 00:00:00 2001
From: Olivier Dony <odo@openerp.com>
Date: Thu, 18 Apr 2013 17:40:22 +0200
Subject: [PATCH 059/121] [FIX] res.partner: rename commercial_id to
 commercial_partner_id, following corresponding change in `base`

bzr revid: odo@openerp.com-20130418154022-lt7frhp9c8f2boo0
---
 addons/account/account_invoice.py                         | 2 +-
 addons/account_report_company/account_invoice.py          | 4 ++--
 addons/account_report_company/account_invoice_view.xml    | 4 ++--
 .../report/account_invoice_report.py                      | 8 ++++----
 .../report/account_invoice_report_view.xml                | 4 ++--
 5 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/addons/account/account_invoice.py b/addons/account/account_invoice.py
index 4611e0ab240..2d09753e584 100644
--- a/addons/account/account_invoice.py
+++ b/addons/account/account_invoice.py
@@ -1735,7 +1735,7 @@ class res_partner(osv.osv):
         '''
         Find the partner for which the accounting entries will be created
         '''
-        # FIXME: after 7.0, to replace by function field partner.commercial_id
+        # FIXME: after 7.0, to replace by function field partner.commercial_partner_id
 
         #if the chosen partner is not a company and has a parent company, use the parent for the journal entries
         #because you want to invoice 'Agrolait, accounting department' but the journal items are for 'Agrolait'
diff --git a/addons/account_report_company/account_invoice.py b/addons/account_report_company/account_invoice.py
index aae1ee77d0e..fe4a7b2c256 100644
--- a/addons/account_report_company/account_invoice.py
+++ b/addons/account_report_company/account_invoice.py
@@ -25,7 +25,7 @@ class account_invoice(osv.Model):
     _inherit = 'account.invoice'
 
     _columns = {
-        'partner_commercial_id': fields.related('partner_id', 'commercial_id', string='Commercial Entity', type='many2one',
+        'commercial_partner_id': fields.related('partner_id', 'commercial_partner_id', string='Commercial Entity', type='many2one',
                                                 relation='res.partner', store=True, readonly=True,
                                                 help="The commercial entity that will be used on Journal Entries for this invoice")
-    }
\ No newline at end of file
+    }
diff --git a/addons/account_report_company/account_invoice_view.xml b/addons/account_report_company/account_invoice_view.xml
index 2db2d77ad87..89479c5a5e7 100644
--- a/addons/account_report_company/account_invoice_view.xml
+++ b/addons/account_report_company/account_invoice_view.xml
@@ -6,7 +6,7 @@
             <field name="inherit_id" ref="account.invoice_tree"/>
             <field name="arch" type="xml">
                 <field name="partner_id" position="after">
-                    <field name="partner_commercial_id" invisible="1"/>
+                    <field name="commercial_partner_id" invisible="1"/>
                 </field>
             </field>
         </record>
@@ -16,7 +16,7 @@
             <field name="inherit_id" ref="account.view_account_invoice_filter"/>
             <field name="arch" type="xml">
                 <filter string="Partner" position="replace">
-                    <filter name="partner_commercial_id" string="Partner" domain="[]" context="{'group_by':'partner_commercial_id'}"/>
+                    <filter name="commercial_partner_id" string="Partner" domain="[]" context="{'group_by':'commercial_partner_id'}"/>
                 </filter>
             </field>
         </record>
diff --git a/addons/account_report_company/report/account_invoice_report.py b/addons/account_report_company/report/account_invoice_report.py
index 09cf1caca83..5941aef9e6e 100644
--- a/addons/account_report_company/report/account_invoice_report.py
+++ b/addons/account_report_company/report/account_invoice_report.py
@@ -23,14 +23,14 @@ from openerp.osv import osv, fields
 class account_invoice_report(osv.Model):
     _inherit = 'account.invoice.report'
     _columns = {
-        'partner_commercial_id': fields.many2one('res.partner', 'Partner Company', help="Commercial Entity"),
+        'commercial_partner_id': fields.many2one('res.partner', 'Partner Company', help="Commercial Entity"),
     }
 
     def _select(self):
-        return  super(account_invoice_report, self)._select() + ", sub.partner_commercial_id as partner_commercial_id"
+        return  super(account_invoice_report, self)._select() + ", sub.commercial_partner_id as commercial_partner_id"
 
     def _sub_select(self):
-        return  super(account_invoice_report, self)._sub_select() + ", ai.partner_commercial_id as partner_commercial_id"
+        return  super(account_invoice_report, self)._sub_select() + ", ai.commercial_partner_id as commercial_partner_id"
 
     def _group_by(self):
-        return super(account_invoice_report, self)._group_by() + ", ai.partner_commercial_id"
+        return super(account_invoice_report, self)._group_by() + ", ai.commercial_partner_id"
diff --git a/addons/account_report_company/report/account_invoice_report_view.xml b/addons/account_report_company/report/account_invoice_report_view.xml
index bfdc99b1361..90fa4bdf2ec 100644
--- a/addons/account_report_company/report/account_invoice_report_view.xml
+++ b/addons/account_report_company/report/account_invoice_report_view.xml
@@ -6,7 +6,7 @@
             <field name="inherit_id" ref="account.view_account_invoice_report_tree"/>
             <field name="arch" type="xml">
                 <field name="partner_id" position="after">
-                    <field name="partner_commercial_id" invisible="1"/>
+                    <field name="commercial_partner_id" invisible="1"/>
                 </field>
             </field>
         </record>
@@ -16,7 +16,7 @@
             <field name="inherit_id" ref="account.view_account_invoice_report_search"/>
             <field name="arch" type="xml">
                 <filter name="partner" position="replace">
-                    <filter string="Partner" name="partner_commercial_id" context="{'group_by':'partner_commercial_id','residual_visible':True}"/>
+                    <filter string="Partner" name="commercial_partner_id" context="{'group_by':'commercial_partner_id','residual_visible':True}"/>
                 </filter>
             </field>
         </record>

From 451f8df2506f8a78502fe7384726e4c3c1211dd7 Mon Sep 17 00:00:00 2001
From: Olivier Dony <odo@openerp.com>
Date: Thu, 18 Apr 2013 19:20:22 +0200
Subject: [PATCH 060/121] [FIX] sale: orders/quotations action should not force
 `display_address` flag

Doing so affects autocompletion of search results, etc.
while the fields on the form view are already properly
displayed anyway.

bzr revid: odo@openerp.com-20130418172022-e3lu35xq191jxcyu
---
 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 a6cc7df1f12..9dc5f51d8aa 100644
--- a/addons/sale/sale_view.xml
+++ b/addons/sale/sale_view.xml
@@ -328,7 +328,7 @@
             <field name="view_type">form</field>
             <field name="view_mode">tree,form,calendar,graph</field>
             <field name="search_view_id" ref="view_sales_order_filter"/>
-            <field name="context">{'show_address': 1}</field>
+            <field name="context">{}</field>
             <field name="domain">[('state','not in',('draft','sent','cancel'))]</field>
             <field name="help" type="html">
               <p class="oe_view_nocontent_create">
@@ -371,7 +371,7 @@
             <field name="view_type">form</field>
             <field name="view_id" ref="view_quotation_tree"/>
             <field name="view_mode">tree,form,calendar,graph</field>
-            <field name="context">{'show_address': 1}</field>
+            <field name="context">{}</field>
             <field name="domain">[('state','in',('draft','sent','cancel'))]</field>
             <field name="search_view_id" ref="view_sales_order_filter"/>
             <field name="help" type="html">

From 230b23e6cb4a1de55fa4ea521ccd71f25de9e20e Mon Sep 17 00:00:00 2001
From: Launchpad Translations on behalf of openerp <>
Date: Fri, 19 Apr 2013 06:17:48 +0000
Subject: [PATCH 061/121] Launchpad automatic translations update.

bzr revid: launchpad_translations_on_behalf_of_openerp-20130419061733-j4th561m2dju73zo
bzr revid: launchpad_translations_on_behalf_of_openerp-20130419061748-4sz8agg8laqbyu4p
---
 addons/account/i18n/tr.po      |  6 +++---
 addons/project/i18n/tr.po      |  8 ++++----
 openerp/addons/base/i18n/tr.po | 11 +++++++----
 3 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/addons/account/i18n/tr.po b/addons/account/i18n/tr.po
index 7ef00787437..bc886a80df7 100644
--- a/addons/account/i18n/tr.po
+++ b/addons/account/i18n/tr.po
@@ -8,13 +8,13 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2013-03-07 08:37+0000\n"
-"PO-Revision-Date: 2013-04-17 19:07+0000\n"
+"PO-Revision-Date: 2013-04-18 19:19+0000\n"
 "Last-Translator: Ayhan KIZILTAN <Unknown>\n"
 "Language-Team: OpenERP Türkiye Yerelleştirmesi\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-04-18 06:05+0000\n"
+"X-Launchpad-Export-Date: 2013-04-19 06:17+0000\n"
 "X-Generator: Launchpad (build 16567)\n"
 "Language: tr\n"
 
@@ -5681,7 +5681,7 @@ msgstr "KDV Hesabı Bildirimi"
 #. module: account
 #: view:account.bank.statement:0
 msgid "Cancel Statement"
-msgstr ""
+msgstr "Hesap Özeti İptal"
 
 #. module: account
 #: help:account.config.settings,module_account_accountant:0
diff --git a/addons/project/i18n/tr.po b/addons/project/i18n/tr.po
index 8278fd7faab..c4d09b1cb4c 100644
--- a/addons/project/i18n/tr.po
+++ b/addons/project/i18n/tr.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2013-03-07 08:37+0000\n"
-"PO-Revision-Date: 2013-04-14 07:42+0000\n"
+"PO-Revision-Date: 2013-04-18 19:25+0000\n"
 "Last-Translator: Ayhan KIZILTAN <Unknown>\n"
 "Language-Team: Turkish <tr@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: 2013-04-15 06:07+0000\n"
-"X-Generator: Launchpad (build 16564)\n"
+"X-Launchpad-Export-Date: 2013-04-19 06:17+0000\n"
+"X-Generator: Launchpad (build 16567)\n"
 
 #. module: project
 #: view:project.project:0
@@ -282,7 +282,7 @@ msgstr "Proje Yönetimi"
 #: model:ir.actions.act_window,name:project.action_project_task_delegate
 #: view:project.task.delegate:0
 msgid "Project Task Delegate"
-msgstr "Proje Görev Delege"
+msgstr "Prtoje Görevi Yetkilndirme"
 
 #. module: project
 #: model:mail.message.subtype,name:project.mt_project_task_started
diff --git a/openerp/addons/base/i18n/tr.po b/openerp/addons/base/i18n/tr.po
index ef2983bc61a..117555be34e 100644
--- a/openerp/addons/base/i18n/tr.po
+++ b/openerp/addons/base/i18n/tr.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-server\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2013-03-07 08:36+0000\n"
-"PO-Revision-Date: 2013-04-14 17:36+0000\n"
-"Last-Translator: Ayhan KIZILTAN <Unknown>\n"
+"PO-Revision-Date: 2013-04-18 16:28+0000\n"
+"Last-Translator: Ediz Duman <neps1192@gmail.com>\n"
 "Language-Team: Turkish <tr@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: 2013-04-15 06:06+0000\n"
-"X-Generator: Launchpad (build 16564)\n"
+"X-Launchpad-Export-Date: 2013-04-19 06:17+0000\n"
+"X-Generator: Launchpad (build 16567)\n"
 
 #. module: base
 #: model:ir.module.module,description:base.module_account_check_writing
@@ -420,6 +420,9 @@ msgid ""
 "invoices from picking, OpenERP is able to add and compute the shipping "
 "line.\n"
 msgstr ""
+"\n"
+"Teslimat yöntemlerin de satış siparişleri eklemek ve toplama için izin "
+"verir\n"
 
 #. module: base
 #: code:addons/base/ir/ir_filters.py:80

From 08a281f01f58397a816e1d7ed17c1e7df409691a Mon Sep 17 00:00:00 2001
From: Cedric Snauwaert <csn@openerp.com>
Date: Fri, 19 Apr 2013 12:03:11 +0200
Subject: [PATCH 062/121] [FIX]sale_analytic_plans: fix invoice view form to
 replace analytic account by analytic distribution

bzr revid: csn@openerp.com-20130419100311-yuc9176jrnty6gfs
---
 .../sale_analytic_plans/sale_analytic_plans_view.xml | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/addons/sale_analytic_plans/sale_analytic_plans_view.xml b/addons/sale_analytic_plans/sale_analytic_plans_view.xml
index 3600d71b7d4..121efbdf12e 100644
--- a/addons/sale_analytic_plans/sale_analytic_plans_view.xml
+++ b/addons/sale_analytic_plans/sale_analytic_plans_view.xml
@@ -52,5 +52,17 @@
         </field>
     </record>
 
+    <record model="ir.ui.view" id="view_invoice_form_analytic_inherit">
+        <field name="name">account.invoice.form.analytic.inherit</field>
+        <field name="model">account.invoice</field>
+        <field name="inherit_id" ref="account.invoice_form"/>
+        <field name="arch" type="xml">
+            <field name="account_analytic_id" position="replace">
+                <field name="analytics_id" context="{'journal_id':parent.journal_id}" domain="[('plan_id','&lt;&gt;',False)]" groups="analytic.group_analytic_accounting"/>
+            </field>
+        </field>
+    </record>
+
+
   </data>
 </openerp>

From 850396421693c405c2ab2763f3734628b09be7ad Mon Sep 17 00:00:00 2001
From: Olivier Dony <odo@openerp.com>
Date: Fri, 19 Apr 2013 15:43:35 +0200
Subject: [PATCH 063/121] [IMP] account_report_company: make
 res.partner.commercial_partner_id field stored, for further reporting needs

This is not strictly necessary, but can be useful for other
modules in order to ease SQL reporting, without even needing
to store a denormalized copy of the "commercial partner" key
on the documents themselves.

Also renamed the Python fiel to something generic since
it now inherits multiple models.

bzr revid: odo@openerp.com-20130419134335-rhsg24f2uuwl3kla
---
 addons/account_report_company/__init__.py       |  2 +-
 ...unt_invoice.py => account_report_company.py} | 17 +++++++++++++++++
 2 files changed, 18 insertions(+), 1 deletion(-)
 rename addons/account_report_company/{account_invoice.py => account_report_company.py} (63%)

diff --git a/addons/account_report_company/__init__.py b/addons/account_report_company/__init__.py
index 623cb467c25..42ec779494e 100644
--- a/addons/account_report_company/__init__.py
+++ b/addons/account_report_company/__init__.py
@@ -19,7 +19,7 @@
 #
 ##############################################################################
 
-import account_invoice
+import account_report_company
 import report
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/account_report_company/account_invoice.py b/addons/account_report_company/account_report_company.py
similarity index 63%
rename from addons/account_report_company/account_invoice.py
rename to addons/account_report_company/account_report_company.py
index fe4a7b2c256..d643acd0c95 100644
--- a/addons/account_report_company/account_invoice.py
+++ b/addons/account_report_company/account_report_company.py
@@ -21,6 +21,23 @@
 
 from openerp.osv import osv, fields
 
+class res_partner(osv.Model):
+    _inherit = 'res.partner'
+    
+    # indirection to avoid passing a copy of the overridable method when declaring the function field
+    _commercial_partner_id = lambda self, *args, **kwargs: self._commercial_partner_compute(*args, **kwargs)
+
+    _commercial_partner_id_store_triggers = {
+        'res.partner': (lambda self,cr,uid,ids,context=None: self.search(cr, uid, [('id','child_of',ids)]),
+                        ['parent_id', 'is_company'], 10)
+    }
+
+    _columns = {
+        # make the original field stored, in case it's needed for reporting purposes
+        'commercial_partner_id': fields.function(_commercial_partner_id, type='many2one', relation='res.partner', string='Commercial Entity',
+                                                 store=_commercial_partner_id_store_triggers)
+    }
+
 class account_invoice(osv.Model):
     _inherit = 'account.invoice'
 

From cfb53f1aada7a04f32fae6d30add3ef25bab5b41 Mon Sep 17 00:00:00 2001
From: Olivier Dony <odo@openerp.com>
Date: Fri, 19 Apr 2013 15:57:56 +0200
Subject: [PATCH 064/121] [FIX] res.partner: search using 'child_of' should
 include inactive children

This is necessary for 2 reasons:
- when searching on Business documents the search domain will be
  [('partner_id', 'child_of', 'ACME')] in order to match all
  descendants, and it must match inactive children as well
- in other cases like for resolving IDs to update via store
  triggers, it is necessary that 'child_of' returns inactive
  children too.

The implementation is tricky because the ORM automatically
transform 'child_of' domains into recursive searches with
[('parent_id', 'in', ids)], which is the same query that the
reverse one2many 'child_ids' will also use to find contacts.
The overridden search() therefore matches this domain pattern
only when there is one criterion (to avoid side-effects in
other cases) and a dummy extra 'domain' was added to the
definition of the 'child_ids' o2m so it won't match.
The net result is that child_ids will not return inactive
children while child_of will return all descendants when
it is the only criterion. This is the expected behavior
whenever child_of is used on res.partner, because
it's safer to always show business documents.
The only side-effects will be for custom/manual search
calls with a single criterion of the form ('parent_id','in', x)
and those can be fixed by adding an extra domain
component ('active','=',True), just like child_ids does.

bzr revid: odo@openerp.com-20130419135756-2kbhwr23lygqdoob
---
 openerp/addons/base/res/res_partner.py | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/openerp/addons/base/res/res_partner.py b/openerp/addons/base/res/res_partner.py
index 16ba66babd2..9ccd595e98a 100644
--- a/openerp/addons/base/res/res_partner.py
+++ b/openerp/addons/base/res/res_partner.py
@@ -216,7 +216,7 @@ class res_partner(osv.osv, format_address):
         'date': fields.date('Date', select=1),
         'title': fields.many2one('res.partner.title', 'Title'),
         'parent_id': fields.many2one('res.partner', 'Related Company'),
-        'child_ids': fields.one2many('res.partner', 'parent_id', 'Contacts'),
+        'child_ids': fields.one2many('res.partner', 'parent_id', 'Contacts', domain=[('active','=',True)]), # force "active_test" domain to bypass _search() override    
         'ref': fields.char('Reference', size=64, select=1),
         'lang': fields.selection(_lang_get, 'Language',
             help="If the selected language is loaded in the system, all documents related to this contact will be printed in this language. If not, it will be English."),
@@ -568,6 +568,15 @@ class res_partner(osv.osv, format_address):
         rec_id = self.create(cr, uid, {self._rec_name: name or email, 'email': email or False}, context=context)
         return self.name_get(cr, uid, [rec_id], context)[0]
 
+    def _search(self, cr, user, args, offset=0, limit=None, order=None, context=None, count=False, access_rights_uid=None):
+        """ Override search() to always show inactive children when searching via ``child_of`` operator. The ORM will
+        always call search() with a simple domain of the form [('parent_id', 'in', [ids])]. """
+        # a special ``domain`` is set on the ``child_ids`` o2m to bypass this logic, as it uses similar domain expressions
+        if len(args) == 1 and len(args[0]) == 3 and args[0][:2] == ('parent_id','in'):
+            context = dict(context or {}, active_test=False)
+        return super(res_partner, self)._search(cr, user, args, offset=offset, limit=limit, order=order, context=context,
+                                                count=count, access_rights_uid=access_rights_uid)
+
     def name_search(self, cr, uid, name, args=None, operator='ilike', context=None, limit=100):
         if not args:
             args = []

From ea2544e43277b973c4338cf77c7d8753e9703d3a Mon Sep 17 00:00:00 2001
From: niv-openerp <nicolas.vanhoren@openerp.com>
Date: Fri, 19 Apr 2013 16:35:29 +0200
Subject: [PATCH 065/121] [FIX] pad: problem about pad title not being updated
 correctly, was solved by solving another, more serious, bug that didn't
 updated correctly the database backup of the pad

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

bzr revid: nicolas.vanhoren@openerp.com-20130419143529-jku5titoacaajft0
---
 addons/pad/pad.py                 |  9 +++-
 addons/pad/static/src/js/pad.js   | 72 +++++++++++++++----------------
 addons/pad/static/src/xml/pad.xml | 37 +++++++---------
 3 files changed, 56 insertions(+), 62 deletions(-)

diff --git a/addons/pad/pad.py b/addons/pad/pad.py
index 90f5354054c..94d2097262d 100644
--- a/addons/pad/pad.py
+++ b/addons/pad/pad.py
@@ -84,10 +84,15 @@ class pad_common(osv.osv_memory):
 
     # Set the pad content in vals
     def _set_pad_value(self, cr, uid, vals, context=None):
-        for k,v in vals.items():
+        for k in self._all_columns.keys():
             field = self._all_columns[k].column
             if hasattr(field,'pad_content_field'):
-                vals[field.pad_content_field] = self.pad_get_content(cr, uid, v, context=context)        
+                url = vals.get(k)
+                if not url and ("id" in vals):
+                    url = self.read(cr, uid, vals["id"], [k], context=context)[k]
+                if url:
+                    vals[field.pad_content_field] = self.pad_get_content(cr, uid, url, context=context)
+ 
 
     def copy(self, cr, uid, id, default=None, context=None):
         if not default:
diff --git a/addons/pad/static/src/js/pad.js b/addons/pad/static/src/js/pad.js
index b96047340ad..1a2de41745b 100644
--- a/addons/pad/static/src/js/pad.js
+++ b/addons/pad/static/src/js/pad.js
@@ -1,67 +1,63 @@
 openerp.pad = function(instance) {
     
-    instance.web.form.FieldPad = instance.web.form.AbstractField.extend({
+    instance.web.form.FieldPad = instance.web.form.AbstractField.extend(instance.web.form.ReinitializeWidgetMixin, {
         template: 'FieldPad',
-        configured: false,
         content: "",
-        start: function() {
-            this._super();
-            var self  = this;
-            this.on('change:effective_readonly',this,function(){
-                self.renderElement();
+        init: function() {
+            this._super.apply(this, arguments);
+            this.set("configured", true);
+            this.on("change:configured", this, this.switch_configured);
+        },
+        initialize_content: function() {
+            this.switch_configured();
+            this.$('.oe_pad_switch').click(function() {
+                self.$el.toggleClass('oe_pad_fullscreen');
             });
+            this.render_value();
+        },
+        switch_configured: function() {
+            this.$(".oe_unconfigured").toggle(! this.get("configured"));
+            this.$(".oe_configured").toggle(this.get("configured"));
         },
         render_value: function() {
-            var self = this;
-            var _super = _.bind(this._super, this);
-            if (this.get("value") === false || this.get("value") === "") {
-                self.view.dataset.call('pad_generate_url',{context:{
+            var self  = this;
+            if (this.get("configured") && ! this.get("value")) {
+                self.view.dataset.call('pad_generate_url', {
+                    context: {
                         model: self.view.model,
                         field_name: self.name,
                         object_id: self.view.datarecord.id
-                    }}).done(function(data) {
-                    if(data&&data.url){
-                        self.set({value: data.url});
-                        _super(data.url);
-                        self.renderElement();
+                    },
+                }).done(function(data) {
+                    if (! data.url) {
+                        self.set("configured", false);
+                    } else {
+                        self.set("value", data.url);
                     }
                 });
-            } else {
-                self.renderElement();
             }
-            this._dirty_flag = true;
-        },
-        renderElement: function(){
-            var self  = this;
+            this.$('.oe_pad_content').html("");
             var value = this.get('value');
             if (this.pad_loading_request) {
                 this.pad_loading_request.abort();
             }
-            if(!_.str.startsWith(value,'http')){
-                this.configured = false;
-                this.content = "";
-            }else{
-                this.configured = true;
-                if(!this.get('effective_readonly')){
-                    this.content = '<iframe width="100%" height="100%" frameborder="0" src="'+value+'?showChat=false&userName='+this.session.username+'"></iframe>';
-                }else{
+            if (_.str.startsWith(value, 'http')) {
+                if (! this.get('effective_readonly')) {
+                    var content = '<iframe width="100%" height="100%" frameborder="0" src="' + value + '?showChat=false&userName=' + this.session.username + '"></iframe>';
+                    this.$('.oe_pad_content').html(content);
+                    this._dirty_flag = true;
+                } else {
                     this.content = '<div class="oe_pad_loading">... Loading pad ...</div>';
-                    this.pad_loading_request = $.get(value+'/export/html')
-                    .done(function(data){
+                    this.pad_loading_request = $.get(value + '/export/html').done(function(data) {
                         groups = /\<\s*body\s*\>(.*?)\<\s*\/body\s*\>/.exec(data);
                         data = (groups || []).length >= 2 ? groups[1] : '';
                         self.$('.oe_pad_content').html('<div class="oe_pad_readonly"><div>');
                         self.$('.oe_pad_readonly').html(data);
-                    }).error(function(){
+                    }).fail(function() {
                         self.$('.oe_pad_content').text('Unable to load pad');
                     });
                 }
             }
-            this._super();
-            this.$('.oe_pad_content').html(this.content);
-            this.$('.oe_pad_switch').click(function(){
-                self.$el.toggleClass('oe_pad_fullscreen');
-            });
         },
     });
 
diff --git a/addons/pad/static/src/xml/pad.xml b/addons/pad/static/src/xml/pad.xml
index bd3e296f9b3..f915e867b35 100644
--- a/addons/pad/static/src/xml/pad.xml
+++ b/addons/pad/static/src/xml/pad.xml
@@ -5,32 +5,25 @@
 
     <t t-name="FieldPad">
 
-        <t t-if="!widget.configured">
-            <div class="oe_form_field_text oe_pad oe_unconfigured">
-                <p>
-                    You must configure the etherpad through the menu Settings > Companies > Companies, in the configuration tab of your company.
-                </p>
-            </div>
-        </t>
-
-        <t t-if="widget.configured">
+        <div class="oe_form_field_text oe_pad">
+            <p class="oe_unconfigured">
+                You must configure the etherpad through the menu Settings > Companies > Companies, in the configuration tab of your company.
+            </p>
             <t t-if="widget.get('effective_readonly')">
-                <div class="oe_form_field_text oe_pad oe_configured">
-                    <div class="oe_pad_content etherpad_readonly">
-                    </div>
+                <div class="oe_pad_content etherpad_readonly oe_configured">
                 </div>
             </t>
+            <t t-if="! widget.get('effective_readonly')">
+                <div class="oe_pad_switch_positioner oe_configured">
+                    <span class="oe_pad_switch oe_e">&amp;Ntilde;</span>
+                </div>
+                <div class="oe_pad_content oe_editing oe_configured">
+                </div>
+            </t>
+        </div>
+
+
 
-            <t t-if="!widget.get('effective_readonly')">
-                <div class="oe_form_field_text oe_pad oe_configured">
-                    <div class="oe_pad_switch_positioner">
-                        <span class="oe_pad_switch oe_e">&amp;Ntilde;</span>
-                    </div>
-                    <div class="oe_pad_content oe_editing">
-                    </div>
-                </div>
-            </t>
-        </t>
     </t>
 
 </templates>

From 1f2064cb93aae96868c5b7f430bbaca71248ab81 Mon Sep 17 00:00:00 2001
From: niv-openerp <nicolas.vanhoren@openerp.com>
Date: Fri, 19 Apr 2013 16:42:38 +0200
Subject: [PATCH 066/121] [FIX] pad: revert part of previous fix because it
 could produce problems in some cases

bzr revid: nicolas.vanhoren@openerp.com-20130419144238-0hq1rgmcacw5sw1r
---
 addons/pad/pad.py | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/addons/pad/pad.py b/addons/pad/pad.py
index 94d2097262d..90f5354054c 100644
--- a/addons/pad/pad.py
+++ b/addons/pad/pad.py
@@ -84,15 +84,10 @@ class pad_common(osv.osv_memory):
 
     # Set the pad content in vals
     def _set_pad_value(self, cr, uid, vals, context=None):
-        for k in self._all_columns.keys():
+        for k,v in vals.items():
             field = self._all_columns[k].column
             if hasattr(field,'pad_content_field'):
-                url = vals.get(k)
-                if not url and ("id" in vals):
-                    url = self.read(cr, uid, vals["id"], [k], context=context)[k]
-                if url:
-                    vals[field.pad_content_field] = self.pad_get_content(cr, uid, url, context=context)
- 
+                vals[field.pad_content_field] = self.pad_get_content(cr, uid, v, context=context)        
 
     def copy(self, cr, uid, id, default=None, context=None):
         if not default:

From 83feb1c46f72389002aa3b30251dc1f71c3b972d Mon Sep 17 00:00:00 2001
From: Olivier Dony <odo@openerp.com>
Date: Fri, 19 Apr 2013 18:44:47 +0200
Subject: [PATCH 067/121] [REVERT] res.partner: undo change of ordering in
 name_search result, to be addressed via a stored display_name field
 (temporarily added by account_report_company module in 7.0)

bzr revid: odo@openerp.com-20130419164447-wrmfghxi44au3273
---
 openerp/addons/base/res/res_partner.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/openerp/addons/base/res/res_partner.py b/openerp/addons/base/res/res_partner.py
index 9ccd595e98a..d29e153e907 100644
--- a/openerp/addons/base/res/res_partner.py
+++ b/openerp/addons/base/res/res_partner.py
@@ -596,9 +596,9 @@ class res_partner(osv.osv, format_address):
                           LEFT JOIN res_partner company ON partner.parent_id = company.id
                           WHERE partner.email ''' + operator +''' %(name)s
                              OR partner.name || ' (' || COALESCE(company.name,'') || ')'
-                          ''' + operator + ' %(name)s ORDER BY partner.is_company DESC, partner.name' + limit_str, query_args)
+                          ''' + operator + ' %(name)s ' + limit_str, query_args)
             ids = map(lambda x: x[0], cr.fetchall())
-            ids = self.search(cr, uid, [('id', 'in', ids)] + args, limit=limit, order="is_company desc, name", context=context)
+            ids = self.search(cr, uid, [('id', 'in', ids)] + args, limit=limit, context=context)
             if ids:
                 return self.name_get(cr, uid, ids, context)
         return super(res_partner,self).name_search(cr, uid, name, args, operator=operator, context=context, limit=limit)

From 9b9c3fa59cb7ced71f3607a67ec3836804510dca Mon Sep 17 00:00:00 2001
From: Olivier Dony <odo@openerp.com>
Date: Fri, 19 Apr 2013 18:47:28 +0200
Subject: [PATCH 068/121] [FIX] res.partner.name_get: partners marked as
 "is_company" should appear as standalone

This is more consistent with the way we expect reporting
to work, and will also ensure that these companies
appear right above their contacts in search order
(which will match name_get)

bzr revid: odo@openerp.com-20130419164728-25312wtyzt9h6egw
---
 openerp/addons/base/res/res_partner.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/openerp/addons/base/res/res_partner.py b/openerp/addons/base/res/res_partner.py
index d29e153e907..2637b922f8c 100644
--- a/openerp/addons/base/res/res_partner.py
+++ b/openerp/addons/base/res/res_partner.py
@@ -528,7 +528,7 @@ class res_partner(osv.osv, format_address):
         res = []
         for record in self.browse(cr, uid, ids, context=context):
             name = record.name
-            if record.parent_id:
+            if record.parent_id and not record.is_company:
                 name =  "%s, %s" % (record.parent_id.name, name)
             if context.get('show_address'):
                 name = name + "\n" + self._display_address(cr, uid, record, without_company=True, context=context)

From 5e2ce8b709528f8bcf9376c84c49cb90d3422c2a Mon Sep 17 00:00:00 2001
From: Olivier Dony <odo@openerp.com>
Date: Fri, 19 Apr 2013 18:52:39 +0200
Subject: [PATCH 069/121] [IMP] account_report_company: add extra stored
 function field `display_name` on res.partner and use it for sorting

This makes name_search() results, group_by, etc. all behave as expected

bzr revid: odo@openerp.com-20130419165239-15szgi0e686k6mh9
---
 .../account_report_company.py                    | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/addons/account_report_company/account_report_company.py b/addons/account_report_company/account_report_company.py
index d643acd0c95..22719440dec 100644
--- a/addons/account_report_company/account_report_company.py
+++ b/addons/account_report_company/account_report_company.py
@@ -23,19 +23,27 @@ from openerp.osv import osv, fields
 
 class res_partner(osv.Model):
     _inherit = 'res.partner'
-    
-    # indirection to avoid passing a copy of the overridable method when declaring the function field
-    _commercial_partner_id = lambda self, *args, **kwargs: self._commercial_partner_compute(*args, **kwargs)
+    _order = 'display_name'
+
+    def _display_name_compute(self, cr, uid, ids, name, args, context=None):
+        return dict(self.name_get(cr, uid, ids, context=context))
 
     _commercial_partner_id_store_triggers = {
         'res.partner': (lambda self,cr,uid,ids,context=None: self.search(cr, uid, [('id','child_of',ids)]),
                         ['parent_id', 'is_company'], 10)
     }
 
+    # indirections to avoid passing a copy of the overridable method when declaring the function field
+    _commercial_partner_id = lambda self, *args, **kwargs: self._commercial_partner_compute(*args, **kwargs)
+    _display_name = lambda self, *args, **kwargs: self._display_name_compute(*args, **kwargs)
+
     _columns = {
         # make the original field stored, in case it's needed for reporting purposes
         'commercial_partner_id': fields.function(_commercial_partner_id, type='many2one', relation='res.partner', string='Commercial Entity',
-                                                 store=_commercial_partner_id_store_triggers)
+                                                 store=_commercial_partner_id_store_triggers),
+
+        # extra field to allow ORDER BY to match visible names
+        'display_name': fields.function(_display_name, type='char', string='Name', store=_commercial_partner_id_store_triggers),
     }
 
 class account_invoice(osv.Model):

From 64f29cfa1010a5af437f36056c53db995e185e78 Mon Sep 17 00:00:00 2001
From: Olivier Dony <odo@openerp.com>
Date: Fri, 19 Apr 2013 19:18:53 +0200
Subject: [PATCH 070/121] [IMP] account_report_company: use `display_name`
 instead of name in kanban and list views, so labels visually match order

bzr revid: odo@openerp.com-20130419171853-dvfi5jvvlof9afoo
---
 addons/account_report_company/__openerp__.py  |  1 +
 .../res_partner_view.xml                      | 24 +++++++++++++++++++
 2 files changed, 25 insertions(+)
 create mode 100644 addons/account_report_company/res_partner_view.xml

diff --git a/addons/account_report_company/__openerp__.py b/addons/account_report_company/__openerp__.py
index 9ee15e1556c..6c2f89c62c0 100644
--- a/addons/account_report_company/__openerp__.py
+++ b/addons/account_report_company/__openerp__.py
@@ -48,6 +48,7 @@ directly integrated in the core accounting.
     'depends': ['account'],
     'data': [
         'account_invoice_view.xml',
+        'res_partner_view.xml',
         'report/account_invoice_report_view.xml',
     ],
     'auto_install': True,
diff --git a/addons/account_report_company/res_partner_view.xml b/addons/account_report_company/res_partner_view.xml
new file mode 100644
index 00000000000..cae010f3066
--- /dev/null
+++ b/addons/account_report_company/res_partner_view.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0"?>
+<openerp>
+    <data>
+        <record model="ir.ui.view" id="account_report_copmany_partner_tree_view">
+            <field name="model">res.partner</field>
+            <field name="inherit_id" ref="base.view_partner_tree"/>
+            <field name="arch" type="xml">
+                <field name="name" position="replace">
+                    <field name="display_name"/>
+                </field>
+            </field>
+        </record>
+
+        <record model="ir.ui.view" id="account_report_copmany_partner_kanban_view">
+            <field name="model">res.partner</field>
+            <field name="inherit_id" ref="base.res_partner_kanban_view"/>
+            <field name="arch" type="xml">
+                <xpath expr="//templates//field[@name='name']" position="replace">
+                    <field name="display_name"/>
+                </xpath>
+            </field>
+        </record>
+    </data>
+</openerp>
\ No newline at end of file

From 18ee18244f5646beeac4be90abd23cbe17c49775 Mon Sep 17 00:00:00 2001
From: Olivier Dony <odo@openerp.com>
Date: Fri, 19 Apr 2013 19:31:59 +0200
Subject: [PATCH 071/121] [FIX] test_expression: assertion was too sensitive to
 exact parameters

Now that res.partner.child_ids has an extra domain
attribute the exact number of parameters of queries
using `child_ids` in the WHERE clause is different.

bzr revid: odo@openerp.com-20130419173159-ef1onm3823hsi77n
---
 openerp/addons/base/tests/test_expression.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/openerp/addons/base/tests/test_expression.py b/openerp/addons/base/tests/test_expression.py
index 49bc7d57ca1..4f533a5e170 100644
--- a/openerp/addons/base/tests/test_expression.py
+++ b/openerp/addons/base/tests/test_expression.py
@@ -263,7 +263,7 @@ class test_expression(common.TransactionCase):
             "_auto_join on: ('child_ids.bank_ids.id', 'in', [..]) query incorrect join condition")
         self.assertIn('"res_partner__child_ids"."id"="res_partner__child_ids__bank_ids"."partner_id"', sql_query[1],
             "_auto_join on: ('child_ids.bank_ids.id', 'in', [..]) query incorrect join condition")
-        self.assertEqual(set([b_aa, b_ba]), set(sql_query[2]),
+        self.assertEqual(set([b_aa, b_ba]), set(sql_query[2][-2:]),
             "_auto_join on: ('child_ids.bank_ids.id', 'in', [..]) query incorrect parameter")
 
         # --------------------------------------------------

From 16b38a053afea9436e21cf5325d83cf029a84d24 Mon Sep 17 00:00:00 2001
From: Olivier Dony <odo@openerp.com>
Date: Sat, 20 Apr 2013 02:47:13 +0200
Subject: [PATCH 072/121] [FIX] res.partner: fix invisible attrs on Contacts
 tab, empty o2m field results in `[]`, not `False`

bzr revid: odo@openerp.com-20130420004713-0cblmquf4t6i2n0r
---
 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 ce97cba4992..741b6eb5cdd 100644
--- a/openerp/addons/base/res/res_partner_view.xml
+++ b/openerp/addons/base/res/res_partner_view.xml
@@ -185,7 +185,7 @@
                     </group>
 
                     <notebook colspan="4">
-                        <page string="Contacts" attrs="{'invisible': [('is_company','=',False), ('child_ids', '=', False)]}" autofocus="autofocus">
+                        <page string="Contacts" attrs="{'invisible': [('is_company','=',False), ('child_ids', '=', [])]}" autofocus="autofocus">
                             <field name="child_ids" mode="kanban" context="{'default_parent_id': active_id, 'default_street': street, 'default_street2': street2, 'default_city': city, 'default_state_id': state_id, 'default_zip': zip, 'default_country_id': country_id, 'default_supplier': supplier}">
                                 <kanban>
                                     <field name="color"/>

From b91cd6127ad295a272c52b714d7ebefb3c40f446 Mon Sep 17 00:00:00 2001
From: Olivier Dony <odo@openerp.com>
Date: Sat, 20 Apr 2013 03:50:03 +0200
Subject: [PATCH 073/121] [REVERT] account_report_company: undo override of
 res.partner.commercial_partner_id field to store it, as the ORM does not
 support it and it's not strictly necessary

It works when installing the module but would break
everytime another module that inherits from res.partner
is installed/update from command-line (e.g. -i/-u crm),
as account_report_company is low in the dependency graph
so the field is dropped when the ORM notices that
the current field definition is not stored.
This can be solved in trunk by making the field stored
directly in 'base'.

bzr revid: odo@openerp.com-20130420015003-8y48xrb14cjif60w
---
 .../account_report_company/account_report_company.py  | 11 +++--------
 1 file changed, 3 insertions(+), 8 deletions(-)

diff --git a/addons/account_report_company/account_report_company.py b/addons/account_report_company/account_report_company.py
index 22719440dec..0c102fcc4e1 100644
--- a/addons/account_report_company/account_report_company.py
+++ b/addons/account_report_company/account_report_company.py
@@ -28,22 +28,17 @@ class res_partner(osv.Model):
     def _display_name_compute(self, cr, uid, ids, name, args, context=None):
         return dict(self.name_get(cr, uid, ids, context=context))
 
-    _commercial_partner_id_store_triggers = {
+    _display_name_store_triggers = {
         'res.partner': (lambda self,cr,uid,ids,context=None: self.search(cr, uid, [('id','child_of',ids)]),
                         ['parent_id', 'is_company'], 10)
     }
 
-    # indirections to avoid passing a copy of the overridable method when declaring the function field
-    _commercial_partner_id = lambda self, *args, **kwargs: self._commercial_partner_compute(*args, **kwargs)
+    # indirection to avoid passing a copy of the overridable method when declaring the function field
     _display_name = lambda self, *args, **kwargs: self._display_name_compute(*args, **kwargs)
 
     _columns = {
-        # make the original field stored, in case it's needed for reporting purposes
-        'commercial_partner_id': fields.function(_commercial_partner_id, type='many2one', relation='res.partner', string='Commercial Entity',
-                                                 store=_commercial_partner_id_store_triggers),
-
         # extra field to allow ORDER BY to match visible names
-        'display_name': fields.function(_display_name, type='char', string='Name', store=_commercial_partner_id_store_triggers),
+        'display_name': fields.function(_display_name, type='char', string='Name', store=_display_name_store_triggers),
     }
 
 class account_invoice(osv.Model):

From feefb0ad36f055167d21ae20ef3a5f5c928b709a Mon Sep 17 00:00:00 2001
From: Olivier Dony <odo@openerp.com>
Date: Sat, 20 Apr 2013 04:26:42 +0200
Subject: [PATCH 074/121] [FIX] search views: use child_of operator for
 partner_id fields that can reference both companies and contacts

The goal is to match both the Company and its contacts
when searching for the Company

bzr revid: odo@openerp.com-20130420022642-6qe8pp4ifexjms65
---
 addons/account/project/project_view.xml                     | 2 +-
 .../account_analytic_analysis_view.xml                      | 2 +-
 addons/account_asset/account_asset_view.xml                 | 2 +-
 addons/account_asset/report/account_asset_report_view.xml   | 2 +-
 addons/account_voucher/voucher_payment_receipt_view.xml     | 4 ++--
 addons/account_voucher/voucher_sales_purchase_view.xml      | 4 ++--
 addons/crm/crm_lead_view.xml                                | 4 ++--
 addons/crm/crm_phonecall_view.xml                           | 2 +-
 addons/crm/report/crm_lead_report_view.xml                  | 2 +-
 addons/crm/report/crm_phonecall_report_view.xml             | 2 +-
 addons/crm_claim/crm_claim_view.xml                         | 2 +-
 addons/crm_claim/report/crm_claim_report_view.xml           | 2 +-
 addons/crm_helpdesk/crm_helpdesk_view.xml                   | 2 +-
 addons/crm_helpdesk/report/crm_helpdesk_report_view.xml     | 1 +
 addons/mrp_repair/mrp_repair_view.xml                       | 2 +-
 addons/project/project_view.xml                             | 2 +-
 addons/project/report/project_report_view.xml               | 2 +-
 addons/project_issue/project_issue_view.xml                 | 3 ++-
 addons/project_issue/report/project_issue_report_view.xml   | 2 +-
 addons/stock/report/report_stock_move_view.xml              | 2 +-
 addons/stock/stock_view.xml                                 | 6 ++++--
 21 files changed, 28 insertions(+), 24 deletions(-)

diff --git a/addons/account/project/project_view.xml b/addons/account/project/project_view.xml
index aa567d2fc79..79a1e76c7e7 100644
--- a/addons/account/project/project_view.xml
+++ b/addons/account/project/project_view.xml
@@ -31,7 +31,7 @@
                 <search string="Analytic Account">
                     <field name="name" filter_domain="['|', ('name','ilike',self), ('code','ilike',self)]" string="Analytic Account"/>
                     <field name="date"/>
-                    <field name="partner_id"/>
+                    <field name="partner_id" filter_domain="[('partner_id','child_of',self)]"/>
                     <field name="manager_id"/>
                     <field name="parent_id"/>
                     <field name="user_id"/>
diff --git a/addons/account_analytic_analysis/account_analytic_analysis_view.xml b/addons/account_analytic_analysis/account_analytic_analysis_view.xml
index a9437267611..8d7a89e4622 100644
--- a/addons/account_analytic_analysis/account_analytic_analysis_view.xml
+++ b/addons/account_analytic_analysis/account_analytic_analysis_view.xml
@@ -186,7 +186,7 @@
                 <search string="Contracts">
                     <field name="name" filter_domain="['|', ('name','ilike',self),('code','ilike',self)]" string="Contract"/>
                     <field name="date"/>
-                    <field name="partner_id"/>
+                    <field name="partner_id" filter_domain="[('partner_id','child_of',self)]"/>
                     <field name="manager_id"/>
                     <field name="parent_id"/>
                     <filter name="open" string="In Progress" domain="[('state','in',('open','draft'))]" help="Contracts in progress (open, draft)"/>
diff --git a/addons/account_asset/account_asset_view.xml b/addons/account_asset/account_asset_view.xml
index c4cb17bded3..fe1fcf473ba 100644
--- a/addons/account_asset/account_asset_view.xml
+++ b/addons/account_asset/account_asset_view.xml
@@ -223,7 +223,7 @@
                 <filter icon="terp-check" string="Current" domain="[('state','in', ('draft','open'))]" help="Assets in draft and open states"/>
                 <filter icon="terp-dialog-close" string="Closed" domain="[('state','=', 'close')]" help="Assets in closed state"/>
                 <field name="category_id"/>
-                <field name="partner_id"/>
+                <field name="partner_id" filter_domain="[('partner_id','child_of',self)]"/>
             </search>
         </field>
     </record>
diff --git a/addons/account_asset/report/account_asset_report_view.xml b/addons/account_asset/report/account_asset_report_view.xml
index 4865196c4a8..c772c6e4103 100644
--- a/addons/account_asset/report/account_asset_report_view.xml
+++ b/addons/account_asset/report/account_asset_report_view.xml
@@ -49,7 +49,7 @@
                 <field name="asset_id"/>
                 <field name="asset_category_id"/>
                 <group expand="0" string="Extended Filters...">
-                    <field name="partner_id"/>
+                    <field name="partner_id" filter_domain="[('partner_id','child_of',self)]"/>
                     <field name="company_id" groups="base.group_multi_company"/>
                 </group>
                 <group expand="1" string="Group By...">
diff --git a/addons/account_voucher/voucher_payment_receipt_view.xml b/addons/account_voucher/voucher_payment_receipt_view.xml
index de873c9195c..109c2f9aec9 100644
--- a/addons/account_voucher/voucher_payment_receipt_view.xml
+++ b/addons/account_voucher/voucher_payment_receipt_view.xml
@@ -11,7 +11,7 @@
                     <field name="date"/>
                     <filter icon="terp-document-new" string="Draft" domain="[('state','=','draft')]" help="Draft Vouchers"/>
                     <filter icon="terp-camera_test" string="Posted" domain="[('state','=','posted')]" help="Posted Vouchers"/>
-                    <field name="partner_id" string="Customer"/>
+                    <field name="partner_id" string="Customer" filter_domain="[('partner_id','child_of',self)]"/>
                     <field name="journal_id" context="{'journal_id': self, 'set_visible':False}" domain="[('type','in',('bank','cash'))]"/>
                     <field name="period_id"/>
                     <group expand="0" string="Group By...">
@@ -34,7 +34,7 @@
                     <field name="date"/>
                     <filter icon="terp-document-new" string="Draft" domain="[('state','=','draft')]" help="Draft Vouchers"/>
                     <filter icon="terp-camera_test" string="Posted" domain="[('state','=','posted')]" help="Posted Vouchers"/>
-                    <field name="partner_id" string="Supplier"/>
+                    <field name="partner_id" string="Supplier" filter_domain="[('partner_id','child_of',self)]"/>
                     <field name="journal_id" context="{'journal_id': self, 'set_visible':False}" domain="[('type','in',('bank','cash'))]"/>
                     <field name="period_id"/>
                     <group expand="0" string="Group By...">
diff --git a/addons/account_voucher/voucher_sales_purchase_view.xml b/addons/account_voucher/voucher_sales_purchase_view.xml
index 05b783dd339..6a84a09d5e6 100644
--- a/addons/account_voucher/voucher_sales_purchase_view.xml
+++ b/addons/account_voucher/voucher_sales_purchase_view.xml
@@ -10,7 +10,7 @@
                     <field name="date"/>
                     <filter icon="terp-document-new" string="Draft" domain="[('state','=','draft')]" help="Draft Vouchers"/>
                     <filter icon="terp-camera_test" string="Posted" domain="[('state','=','posted')]" help="Posted Vouchers"/>
-                    <field name="partner_id" string="Supplier"/>
+                    <field name="partner_id" string="Supplier" filter_domain="[('partner_id','child_of',self)]"/>
                     <field name="journal_id" context="{'journal_id': self, 'set_visible':False}" domain="[('type','in',('purchase','purchase_refund'))]"/>
                     <field name="period_id"/>
                     <group expand="0" string="Group By...">
@@ -32,7 +32,7 @@
                     <field name="date"/>
                     <filter icon="terp-document-new" string="Draft" domain="[('state','=','draft')]" help="Draft Vouchers"/>
                     <filter icon="terp-camera_test" string="Posted" domain="[('state','=','posted')]" help="Posted Vouchers"/>
-                    <field name="partner_id" string="Customer"/>
+                    <field name="partner_id" string="Customer" filter_domain="[('partner_id','child_of',self)]"/>
                     <field name="journal_id" context="{'journal_id': self, 'set_visible':False}" domain="[('type','in',('sale','sale_refund'))]"/>
                     <field name="period_id"/>
                     <group expand="0" string="Group By...">
diff --git a/addons/crm/crm_lead_view.xml b/addons/crm/crm_lead_view.xml
index fb18e747fd7..be153167473 100644
--- a/addons/crm/crm_lead_view.xml
+++ b/addons/crm/crm_lead_view.xml
@@ -328,7 +328,7 @@
                     <field name="categ_ids" string="Category" filter_domain="[('categ_ids','ilike',self)]"/>
                     <field name="section_id" context="{'invisible_section': False, 'default_section_id': self}"/>
                     <field name="user_id"/>
-                    <field name="partner_id"/>
+                    <field name="partner_id" filter_domain="[('partner_id','child_of',self)]"/>
                     <field name="create_date"/>
                     <field name="country_id" context="{'invisible_country': False}"/>
                     <separator/>
@@ -546,7 +546,7 @@
                     <field name="categ_ids" string="Category" filter_domain="[('categ_ids','ilike', self)]"/>
                     <field name="section_id" context="{'invisible_section': False, 'default_section_id': self}"/>
                     <field name="user_id"/>
-                    <field name="partner_id"/>
+                    <field name="partner_id" filter_domain="[('partner_id','child_of',self)]"/>
                     <separator/>
                     <filter string="New" name="new" domain="[('state','=','draft')]" help="New Opportunities"/>
                     <filter string="In Progress" name="open" domain="[('state','=','open')]" help="Open Opportunities"/>
diff --git a/addons/crm/crm_phonecall_view.xml b/addons/crm/crm_phonecall_view.xml
index 67df85e6178..4530f412e07 100644
--- a/addons/crm/crm_phonecall_view.xml
+++ b/addons/crm/crm_phonecall_view.xml
@@ -185,7 +185,7 @@
                <separator/>
                <filter string="Phone Calls Assigned to Me or My Team(s)" icon="terp-personal+" domain="['|', ('section_id.user_id','=',uid), ('user_id', '=', uid)]"
                        help="Phone Calls Assigned to the current user or with a team having the current user as team leader"/>
-               <field name="partner_id"/>
+               <field name="partner_id" filter_domain="[('partner_id','child_of',self)]"/>
                <field name="user_id"/>
                <field name="section_id" string="Sales Team"/>
                <group expand="0" string="Group By...">
diff --git a/addons/crm/report/crm_lead_report_view.xml b/addons/crm/report/crm_lead_report_view.xml
index 0e5df8837f1..f05e8ee896b 100644
--- a/addons/crm/report/crm_lead_report_view.xml
+++ b/addons/crm/report/crm_lead_report_view.xml
@@ -80,7 +80,7 @@
                     <field name="section_id" context="{'invisible_section': False}"/>
                     <field name="user_id" string="Salesperson"/>
                     <group expand="0" string="Extended Filters...">
-                        <field name="partner_id"/>
+                        <field name="partner_id" filter_domain="[('partner_id','child_of',self)]"/>
                         <field name="stage_id" domain="[('section_ids', '=', 'section_id')]" />
                         <field name="type_id"/>
                         <field name="channel_id"/>
diff --git a/addons/crm/report/crm_phonecall_report_view.xml b/addons/crm/report/crm_phonecall_report_view.xml
index 1f1a4f91046..06966f3a0a8 100644
--- a/addons/crm/report/crm_phonecall_report_view.xml
+++ b/addons/crm/report/crm_phonecall_report_view.xml
@@ -62,7 +62,7 @@
                     <field name="section_id" string="Sales Team" context="{'invisible_section': False}"/>
                     <field name="user_id" string="Salesperson"/>
                     <group expand="0" string="Extended Filters...">
-                        <field name="partner_id"/>
+                        <field name="partner_id" filter_domain="[('partner_id','child_of',self)]"/>
                         <field name="company_id" groups="base.group_multi_company"/>
                         <field name="creation_date"/>
                         <field name="opening_date"/>
diff --git a/addons/crm_claim/crm_claim_view.xml b/addons/crm_claim/crm_claim_view.xml
index b1ab72e20f6..f545406187d 100644
--- a/addons/crm_claim/crm_claim_view.xml
+++ b/addons/crm_claim/crm_claim_view.xml
@@ -201,7 +201,7 @@
                     <filter icon="terp-gtk-media-pause" string="Pending" domain="[('state','=','pending')]"/>
                     <separator/>
                     <filter string="Unassigned Claims" icon="terp-personal-" domain="[('user_id','=', False)]" help="Unassigned Claims" />
-                    <field name="partner_id"/>
+                    <field name="partner_id" filter_domain="[('partner_id','child_of',self)]"/>
                     <field name="user_id"/>
                     <group expand="0" string="Group By...">
                         <filter string="Partner" icon="terp-partner" domain="[]" help="Partner" context="{'group_by':'partner_id'}"/>
diff --git a/addons/crm_claim/report/crm_claim_report_view.xml b/addons/crm_claim/report/crm_claim_report_view.xml
index a61490c6086..a9a4bcb27c1 100644
--- a/addons/crm_claim/report/crm_claim_report_view.xml
+++ b/addons/crm_claim/report/crm_claim_report_view.xml
@@ -63,7 +63,7 @@
                     <field name="user_id" string="Salesperson"/>
                     <field name="section_id" string="Sales Team" context="{'invisible_section': False}"/>
                     <group  expand="0" string="Extended Filters...">
-                        <field name="partner_id"/>
+                        <field name="partner_id" filter_domain="[('partner_id','child_of',self)]"/>
                         <field name="stage_id" domain="[('section_ids', '=', 'section_id')]"/>
                         <field name="categ_id" domain="[('object_id.model', '=', 'crm.claim')]"/>
                         <field name="priority"/>
diff --git a/addons/crm_helpdesk/crm_helpdesk_view.xml b/addons/crm_helpdesk/crm_helpdesk_view.xml
index 6c0e3433afe..d833e7bbcf6 100644
--- a/addons/crm_helpdesk/crm_helpdesk_view.xml
+++ b/addons/crm_helpdesk/crm_helpdesk_view.xml
@@ -152,7 +152,7 @@
                     <separator/>
                     <filter string="Assigned to Me or My Sales Team(s)" icon="terp-personal+" domain="['|', ('section_id.user_id','=',uid), ('section_id.member_ids', 'in', [uid])]"
                             help="Helpdesk requests that are assigned to me or to one of the sale teams I manage" />
-                    <field name="partner_id" />
+                    <field name="partner_id" filter_domain="[('partner_id','child_of',self)]"/>
                     <field name="user_id"/>
                     <field name="section_id" string="Sales Team"/>
                     <group expand="0" string="Group By...">
diff --git a/addons/crm_helpdesk/report/crm_helpdesk_report_view.xml b/addons/crm_helpdesk/report/crm_helpdesk_report_view.xml
index 05f502656d2..f6522a15c9f 100644
--- a/addons/crm_helpdesk/report/crm_helpdesk_report_view.xml
+++ b/addons/crm_helpdesk/report/crm_helpdesk_report_view.xml
@@ -62,6 +62,7 @@
                     <field name="user_id" string="Salesperson"/>
                     <field name="section_id" string="Sales Team" context="{'invisible_section': False}"/>   
                     <field name="company_id" groups="base.group_multi_company"/>
+                    <field name="partner_id" filter_domain="[('partner_id','child_of',self)]"/>
                     <group expand="0" string="Extended Filters..."  groups="base.group_no_one">
                         <field name="priority" string="Priority"/>
                         <field name="categ_id"/>
diff --git a/addons/mrp_repair/mrp_repair_view.xml b/addons/mrp_repair/mrp_repair_view.xml
index d35a9ebcf1d..a4526b5b581 100644
--- a/addons/mrp_repair/mrp_repair_view.xml
+++ b/addons/mrp_repair/mrp_repair_view.xml
@@ -210,7 +210,7 @@
                   <separator/>
                   <filter icon="terp-dolar" string="Invoiced" domain="[('invoiced','=',True)]"/>
                   <field name="product_id"/>
-                  <field name="partner_id"/>
+                  <field name="partner_id" filter_domain="[('partner_id', 'child_of', self)]"/>
                   <group expand="0" string="Group By...">
                       <filter string="Partner" icon="terp-partner" domain="[]" context="{'group_by':'partner_id'}"/>
                       <filter string="Product" icon="terp-accessories-archiver" domain="[]" context="{'group_by':'product_id'}"/>
diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml
index e25a5b1eb93..f0092a1dd33 100644
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -182,7 +182,7 @@
                     <separator/>
                     <filter string="Project(s) Manager" domain="[('user_id','=',uid)]" help="Projects in which I am a manager" icon="terp-personal"/>
                     <field name="user_id" string="Project Manager"/>
-                    <field name="partner_id" string="Contact"/>
+                    <field name="partner_id" string="Contact" filter_domain="[('partner_id', 'child_of', self)]"/>
                     <group expand="0" string="Group By...">
                         <filter string="Manager" name="Manager" icon="terp-personal" domain="[]" context="{'group_by':'user_id'}"/>
                         <filter string="Contact" name="Partner" icon="terp-partner" domain="[]" context="{'group_by':'partner_id'}"/>
diff --git a/addons/project/report/project_report_view.xml b/addons/project/report/project_report_view.xml
index 10f3f4a8c7c..d9650e165ce 100644
--- a/addons/project/report/project_report_view.xml
+++ b/addons/project/report/project_report_view.xml
@@ -69,7 +69,7 @@
                     <filter icon="terp-personal-" string="Non Assigned Tasks to users" help="Non Assigned Tasks to users" domain="[('user_id','=',False)]"/>
                     <field name="project_id"/>
                     <field name="user_id"/>
-                    <field name="partner_id" />
+                    <field name="partner_id" filter_domain="[('partner_id', 'child_of', self)]"/>
                     <group expand="0" string="Extended Filters...">
                         <field name="priority"/>
                         <field name="company_id" groups="base.group_multi_company"/>
diff --git a/addons/project_issue/project_issue_view.xml b/addons/project_issue/project_issue_view.xml
index f4710766d61..74c83afd304 100644
--- a/addons/project_issue/project_issue_view.xml
+++ b/addons/project_issue/project_issue_view.xml
@@ -139,7 +139,7 @@
             <field name="model">project.issue</field>
             <field name="arch" type="xml">
                 <search string="Issue Tracker Search">
-                    <field name="name" string="Issue" filter_domain="['|', '|',('partner_id','ilike',self),('email_from','ilike',self),('name','ilike',self)]"/>
+                    <field name="name" string="Issue" filter_domain="['|', '|',('partner_id','child_of',self),('email_from','ilike',self),('name','ilike',self)]"/>
                     <field name="id"/>
                     <filter icon="terp-mail-message-new" string="Unread Messages" name="message_unread" domain="[('message_unread','=',True)]"/>
                     <separator/>
@@ -150,6 +150,7 @@
                     <field name="user_id"/>
                     <field name="project_id"/>
                     <field name="categ_ids"/>
+                    <field name="partner_id" filter_domain="[('partner_id', 'child_of', self)]"/>
                     <group expand="0" string="Group By..." >
                         <filter string="Responsible" icon="terp-personal" domain="[]" context="{'group_by':'user_id'}"/>
                         <filter string="Contact" icon="terp-partner" domain="[]" context="{'group_by':'partner_id'}"/>
diff --git a/addons/project_issue/report/project_issue_report_view.xml b/addons/project_issue/report/project_issue_report_view.xml
index 47ea91fad5f..93233704e65 100644
--- a/addons/project_issue/report/project_issue_report_view.xml
+++ b/addons/project_issue/report/project_issue_report_view.xml
@@ -55,7 +55,7 @@
                     <filter icon="terp-dialog-close" string="Done" domain="[('state','=','done')]"/>
                     <field name="project_id"/>
                     <field name="user_id"/>
-                    <field name="partner_id"/>
+                    <field name="partner_id" filter_domain="[('partner_id', 'child_of', self)]"/>
                     <field name="version_id"/>
                     <group  expand="1" string="Group By...">
                         <filter string="Assigned to" name="Responsible" icon="terp-personal" domain="[]" context="{'group_by':'user_id'}" />
diff --git a/addons/stock/report/report_stock_move_view.xml b/addons/stock/report/report_stock_move_view.xml
index 4f3e256389c..fcf99f6e51e 100644
--- a/addons/stock/report/report_stock_move_view.xml
+++ b/addons/stock/report/report_stock_move_view.xml
@@ -149,7 +149,7 @@
                 <field name="location_id" filter_domain="[('location_id', 'child_of', self)]"/>
                 <field name="company_id" groups="base.group_multi_company"/>
                 <group expand="0" string="Extended Filters...">
-                    <field name="partner_id" context="{'contact_display':'partner'}"/>
+                    <field name="partner_id" context="{'contact_display':'partner'}" filter_domain="[('partner_id', 'child_of', self)]"/>
                     <field name="product_categ_id" />
                     <field name="prodlot_id"/>
                     <field name="state"/>
diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml
index 14a1dca7dc7..83362ab5d6f 100644
--- a/addons/stock/stock_view.xml
+++ b/addons/stock/stock_view.xml
@@ -807,7 +807,7 @@
                     <filter icon="terp-check" name="available" string="Ready" domain="[('state','=','assigned')]" help="Assigned Internal Moves"/>
                     <filter icon="terp-camera_test" name="confirmed" string="Waiting" domain="[('state','=','confirmed')]" help="Confirmed Internal Moves"/>
                     <filter icon="terp-dialog-close" name="done" string="Done" domain="[('state','=','done')]" help="Pickings already processed"/>
-                    <field name="partner_id"/>
+                    <field name="partner_id" filter_domain="[('partner_id','child_of',self)]"/>
                     <field name="product_id"/>
                     <field name="stock_journal_id"/>
                     <group expand="0" string="Group By...">
@@ -934,6 +934,7 @@
                     <filter icon="terp-accessories-archiver-minus" string="Back Orders" domain="[('backorder_id', '!=', False)]" help="Is a Back Order"/>
                     <separator/>
                     <filter icon="terp-dolar" name="to_invoice" string="To Invoice" domain="[('invoice_state','=','2binvoiced')]" help="Delivery orders to invoice"/>
+                    <field name="partner_id" filter_domain="[('partner_id','child_of',self)]"/>
                     <field name="stock_journal_id"/>
                     <field name="company_id" groups="base.group_multi_company"/>
                     <group expand="0" string="Group By...">
@@ -1059,6 +1060,7 @@
                     <filter icon="terp-accessories-archiver-minus" string="Back Orders" domain="[('backorder_id', '!=', False)]" help="Is a Back Order"/>
                     <separator/>
                     <filter string="To Invoice" name="to_invoice" icon="terp-dolar" domain="[('invoice_state', '=', '2binvoiced')]"/>
+                    <field name="partner_id" filter_domain="[('partner_id','child_of',self)]"/>
                     <field name="stock_journal_id"/>
                     <field name="product_id"/>
                     <group expand="0" string="Group By...">
@@ -1370,7 +1372,7 @@
                     <filter icon="terp-go-today" string="Today" domain="[('date','&lt;=',time.strftime('%%Y-%%m-%%d 23:59:59')),('date','&gt;=',time.strftime('%%Y-%%m-%%d 00:00:00'))]" help="Orders processed Today or planned for Today"/>
                     <field name="product_id"/>
                     <field name="name" string="Location" filter_domain="['|',('location_id','ilike',self),('location_dest_id','ilike',self)]"/>
-                    <field name="partner_id" string="Partner"  filter_domain="[('picking_id.partner_id','ilike',self)]"/>
+                    <field name="partner_id" string="Partner"  filter_domain="[('picking_id.partner_id','child_of',self)]"/>
                     <field name="prodlot_id"/>
                     <group expand="0" string="Group By...">
                         <filter string="Product" name="by_product" icon="terp-accessories-archiver" domain="[]"  context="{'group_by':'product_id'}"/>

From 6a600ff3115d2e196a18287108eb1f87fda825fa Mon Sep 17 00:00:00 2001
From: Launchpad Translations on behalf of openerp <>
Date: Sat, 20 Apr 2013 06:48:40 +0000
Subject: [PATCH 075/121] Launchpad automatic translations update.

bzr revid: launchpad_translations_on_behalf_of_openerp-20130420064840-ctlb3ywgmfytczfj
---
 openerp/addons/base/i18n/he.po    | 85 +++++++++++++++++++++++--------
 openerp/addons/base/i18n/zh_CN.po | 70 ++++++++++++++++++++-----
 2 files changed, 123 insertions(+), 32 deletions(-)

diff --git a/openerp/addons/base/i18n/he.po b/openerp/addons/base/i18n/he.po
index fc76958df2f..4d38b47ac82 100644
--- a/openerp/addons/base/i18n/he.po
+++ b/openerp/addons/base/i18n/he.po
@@ -8,13 +8,13 @@ msgstr ""
 "Project-Id-Version: openobject-server\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2013-03-07 08:36+0000\n"
-"PO-Revision-Date: 2013-04-16 08:22+0000\n"
-"Last-Translator: Liron Achdut <liron.achdut@gmail.com>\n"
+"PO-Revision-Date: 2013-04-19 12:49+0000\n"
+"Last-Translator: sef <Unknown>\n"
 "Language-Team: Hebrew <he@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: 2013-04-17 05:57+0000\n"
+"X-Launchpad-Export-Date: 2013-04-20 06:48+0000\n"
 "X-Generator: Launchpad (build 16567)\n"
 
 #. module: base
@@ -25,6 +25,9 @@ msgid ""
 "================================================\n"
 "    "
 msgstr ""
+"\n"
+"רכיב לכתיבת והדפסת המחאות\n"
+"    "
 
 #. module: base
 #: view:res.partner.bank:0
@@ -53,6 +56,8 @@ msgid ""
 "The second argument of the many2many field %s must be a SQL table !You used "
 "%s, which is not a valid SQL table name."
 msgstr ""
+"הארגומנט השני של השדה many2many %s חייב להיות טבלת SQL! השתמשת ב-%s, שאינו "
+"שם תקף של טבלת SQL."
 
 #. module: base
 #: field:ir.ui.view,arch:0
@@ -63,12 +68,12 @@ msgstr "הצג ארכיטקטורה"
 #. module: base
 #: model:ir.module.module,summary:base.module_sale_stock
 msgid "Quotation, Sale Orders, Delivery & Invoicing Control"
-msgstr ""
+msgstr "ניהול הצעות מחיר, הזמנות, תעודות משלוח וחשבוניות"
 
 #. module: base
 #: selection:ir.sequence,implementation:0
 msgid "No gap"
-msgstr ""
+msgstr "ללא פער"
 
 #. module: base
 #: selection:base.language.install,lang:0
@@ -85,7 +90,7 @@ msgstr "Spanish (PY) / ספרדית (PY)"
 msgid ""
 "Helps you manage your projects and tasks by tracking them, generating "
 "plannings, etc..."
-msgstr ""
+msgstr "עזרה בניהול פרויקטים ומשימות על ידי מעקב, יצירת תכנונים ועוד ..."
 
 #. module: base
 #: model:ir.module.module,summary:base.module_point_of_sale
@@ -160,6 +165,8 @@ msgid ""
 "specified as a Python expression defining a list of triplets. For example: "
 "[('color','=','red')]"
 msgstr ""
+"הדומיין החלופי להגבלת ערכים אפשריים לשדות יחסים, המוגדר כביטוי של פייטון "
+"המגדיר רשימה של שלשות. לדוגמא: [('אדום','=','צבע')]"
 
 #. module: base
 #: field:res.partner,ref:0
@@ -179,7 +186,7 @@ msgstr "חלון מטרה"
 #. module: base
 #: field:ir.actions.report.xml,report_rml:0
 msgid "Main Report File Path"
-msgstr ""
+msgstr "נתיב קובץ לדוח ראשי"
 
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_sale_analytic_plans
@@ -200,6 +207,13 @@ msgid ""
 "revenue\n"
 "reports."
 msgstr ""
+"\n"
+"הנפקת חשבוניות מתוך הוצאות, רשומות שעות עבודה\n"
+"========================================================\n"
+"\n"
+"רכיב להנפקת חשבוניות על פי הוצאות (שעות עבודה, הוצאות, וכו')\n"
+"\n"
+"באפשרותך להגדיר רשימות מחירים בניתוח חשבון, וליצור דוחות רווח צפוי"
 
 #. module: base
 #: code:addons/base/ir/ir_sequence.py:104
@@ -216,6 +230,8 @@ msgid ""
 "Properties of base fields cannot be altered in this manner! Please modify "
 "them through Python code, preferably through a custom addon!"
 msgstr ""
+"לא ניתן לשנות את תכונות הבסיס באופן זה ! נא לשנות אותם ברמת הקוד, רצוי "
+"באמצעות תוסף ייעודי"
 
 #. module: base
 #: code:addons/osv.py:151
@@ -232,7 +248,7 @@ msgstr "ir.ui.view.custom"
 #: code:addons/base/ir/ir_model.py:375
 #, python-format
 msgid "Renaming sparse field \"%s\" is not allowed"
-msgstr ""
+msgstr "אין אישור לשינוי שם שדה \"%s\""
 
 #. module: base
 #: model:res.country,name:base.sz
@@ -274,7 +290,7 @@ msgstr ""
 #. module: base
 #: model:res.groups,name:base.group_multi_currency
 msgid "Multi Currencies"
-msgstr ""
+msgstr "ריבוי מטבעות"
 
 #. module: base
 #: model:ir.module.module,description:base.module_l10n_cl
@@ -286,6 +302,10 @@ msgid ""
 "\n"
 "    "
 msgstr ""
+"\n"
+"טבלאת חשבונאות ומס צ'יליאני\n"
+"\n"
+"    "
 
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_sale
@@ -297,12 +317,12 @@ msgstr "ניהול מכירות"
 msgid ""
 "The internal user that is in charge of communicating with this contact if "
 "any."
-msgstr ""
+msgstr "המשתמש הפנימי האחראי לתקשורת עם איש קשר זה, אם קיים."
 
 #. module: base
 #: view:res.partner:0
 msgid "Search Partner"
-msgstr ""
+msgstr "חפש שותף (ספק/לקוח)"
 
 #. module: base
 #: field:ir.module.category,module_nr:0
@@ -336,6 +356,12 @@ msgid ""
 "  - tree_but_open\n"
 "For defaults, an optional condition"
 msgstr ""
+"לעולות, אחת ממשבצות הפעולה האפשריות:\n"
+"  - לקוח_פעולה_מרובה\n"
+"  - לקוח_הדפסה_מרובה\n"
+"  - לקוח_ פעולה_קשורה\n"
+"  - עץ_אבל_פתוח\n"
+"לברירות מחדל, תנאי חלופי"
 
 #. module: base
 #: sql_constraint:res.lang:0
@@ -390,6 +416,8 @@ msgid ""
 "There is already a shared filter set as default for %(model)s, delete or "
 "change it before setting a new default"
 msgstr ""
+"כבר הוגדר מסנן משותף כברירת מחדל עבור %(model)s, יש למחוק או לשנות אותו לפני "
+"בחירת מסנן ברירת מחדל חדש"
 
 #. module: base
 #: code:addons/orm.py:2649
@@ -534,7 +562,7 @@ msgstr "הגויאנה הצרפתית"
 #. module: base
 #: model:ir.module.module,summary:base.module_hr
 msgid "Jobs, Departments, Employees Details"
-msgstr "עבודות, מחלקות, פרטי עובדים"
+msgstr "משרות, מחלקות, פרטי עובדים"
 
 #. module: base
 #: model:ir.module.module,description:base.module_analytic
@@ -573,6 +601,17 @@ msgid ""
 "* Use emails to automatically confirm and send acknowledgements for any "
 "event registration\n"
 msgstr ""
+"\n"
+"ארגון וניהול אירועים\n"
+"======================================\n"
+"\n"
+"רכיב האירועים מאפשר את ניהול כל המשימות המשוייכות לאירוע בצורה יעילה: תכנון, "
+"ניהול הרשמות, הגעה וכו'.\n"
+"\n"
+"תכונות עיקריות\n"
+"------------\n"
+"* ניהול אירועים והרשמות לאירועים\n"
+"* שליחה אוטומטית של בקשות אישור הגעה בדוא\"ל\n"
 
 #. module: base
 #: selection:base.language.install,lang:0
@@ -627,7 +666,7 @@ msgstr ""
 #. module: base
 #: selection:base.language.install,lang:0
 msgid "Spanish (VE) / Español (VE)"
-msgstr ""
+msgstr "ספרדית(VE) / Español (VE)"
 
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_hr_timesheet_invoice
@@ -637,7 +676,7 @@ msgstr "חשבונית על גליון שעות"
 #. module: base
 #: view:base.module.upgrade:0
 msgid "Your system will be updated."
-msgstr ""
+msgstr "המערכת תעודכן"
 
 #. module: base
 #: field:ir.actions.todo,note:0
@@ -653,7 +692,7 @@ msgstr "שם מדינה"
 #. module: base
 #: model:res.country,name:base.co
 msgid "Colombia"
-msgstr "Colombia"
+msgstr "קולומביה"
 
 #. module: base
 #: model:res.partner.title,name:base.res_partner_title_mister
@@ -666,7 +705,7 @@ msgid ""
 "The ISO country code in two chars.\n"
 "You can use this field for quick search."
 msgstr ""
-"צופן ה-ISO בשתי אותיות.\n"
+"קוד מדינה ISO בשתי אותיות.\n"
 "ניתן להשתמש בשדה זה לחיפוש מהיר."
 
 #. module: base
@@ -715,22 +754,22 @@ msgstr "שדות מותאמים אישית חייבים להתחיל ב 'x_' !"
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_l10n_mx
 msgid "Mexico - Accounting"
-msgstr ""
+msgstr "מקסיקו - חשבונאות"
 
 #. module: base
 #: help:ir.actions.server,action_id:0
 msgid "Select the Action Window, Report, Wizard to be executed."
-msgstr "בחר בחלון הפעלה,דוח,אשף שתרצה לבצע."
+msgstr "בחלון ההפעלה ניתן להפעיל אשף או דו\"ח להפעלה ."
 
 #. module: base
 #: sql_constraint:ir.config_parameter:0
 msgid "Key must be unique."
-msgstr ""
+msgstr "יש לבחור מפתח ייחודי"
 
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_plugin_outlook
 msgid "Outlook Plug-In"
-msgstr ""
+msgstr "תוסף Outlook"
 
 #. module: base
 #: model:ir.module.module,description:base.module_account
@@ -780,6 +819,12 @@ msgid ""
 "Contains the installer for marketing-related modules.\n"
 "    "
 msgstr ""
+"\n"
+"רכיב שיווק.\n"
+"===================\n"
+"\n"
+"מכיל את ההתקנות לרכיבי שיווק.\n"
+"    "
 
 #. module: base
 #: model:ir.module.module,description:base.module_web_linkedin
diff --git a/openerp/addons/base/i18n/zh_CN.po b/openerp/addons/base/i18n/zh_CN.po
index 86f0be62849..88ffcb8331e 100644
--- a/openerp/addons/base/i18n/zh_CN.po
+++ b/openerp/addons/base/i18n/zh_CN.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-server\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2013-03-07 08:36+0000\n"
-"PO-Revision-Date: 2013-01-12 11:35+0000\n"
-"Last-Translator: 盈通 ccdos <ccdos@163.com>\n"
+"PO-Revision-Date: 2013-04-20 06:45+0000\n"
+"Last-Translator: Qian Jin <chian.jin@gmail.com>\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: 2013-03-08 05:23+0000\n"
-"X-Generator: Launchpad (build 16523)\n"
+"X-Launchpad-Export-Date: 2013-04-20 06:48+0000\n"
+"X-Generator: Launchpad (build 16567)\n"
 
 #. module: base
 #: model:ir.module.module,description:base.module_account_check_writing
@@ -33,7 +33,7 @@ msgstr ""
 #. module: base
 #: view:res.partner.bank:0
 msgid "e.g. GEBABEBB"
-msgstr ""
+msgstr "例如：GEBABEBB"
 
 #. module: base
 #: model:res.country,name:base.sh
@@ -581,6 +581,14 @@ msgid ""
 "that have no counterpart in the general financial accounts.\n"
 "    "
 msgstr ""
+"\n"
+"用于定义财务分析项目的模块。\n"
+"================================================\n"
+"\n"
+"在OpenERP中，财务分析虽与常规财务相连，但却是\n"
+"完全独立的。因此，可以使用许多不同的分析操作，\n"
+"即使在常规财务会计模块中没有对应功能。\n"
+"    "
 
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_idea
@@ -848,7 +856,7 @@ msgstr ""
 "\n"
 "OpenERP Web LinkedIn 模块.\n"
 "============================\n"
-"这个模块在OpenERP上提供了一体化的Linke dIn\n"
+"此模块用于在OpenERP中集成LinkedIn.\n"
 "        "
 
 #. module: base
@@ -875,7 +883,7 @@ msgstr ""
 #. module: base
 #: help:ir.cron,nextcall:0
 msgid "Next planned execution date for this job."
-msgstr "此任务的下一次执行时间"
+msgstr "该任务的下次执行日期"
 
 #. module: base
 #: model:ir.model,name:base.model_ir_ui_view
@@ -1080,7 +1088,7 @@ msgstr "模块升级"
 #: view:res.partner.bank:0
 #: view:res.users:0
 msgid "ZIP"
-msgstr ""
+msgstr "邮政编码"
 
 #. module: base
 #: selection:base.language.install,lang:0
@@ -1114,7 +1122,10 @@ msgid ""
 "       "
 msgstr ""
 "\n"
-"这模块目的是管理员工的考勤 根据执行的签入/签出的动作保存员工帐户的考勤记录。\n"
+"此模块用于管理员工的考勤.\n"
+"==================================================\n"
+"\n"
+"以员工的登入/退出时间为准，记录员工考勤.\n"
 "       "
 
 #. module: base
@@ -1235,7 +1246,7 @@ msgstr "TGZ 压缩包"
 #: view:res.groups:0
 msgid ""
 "Users added to this group are automatically added in the following groups."
-msgstr "若有用户添加至本组时自动将用户添加到下面的组。"
+msgstr "加入本群组的用户也将自动加入以下群组."
 
 #. module: base
 #: code:addons/base/ir/ir_model.py:733
@@ -1788,6 +1799,20 @@ msgid ""
 "in their pockets, this module is essential.\n"
 "    "
 msgstr ""
+"\n"
+"管理午餐的基本模块\n"
+"================================\n"
+"\n"
+"许多公司为给员工提供便利，会从熟悉的餐厅为其员工预定象三明治、披萨饼或其它形式的午餐。\n"
+"\n"
+"然而公司内部的午餐预定需要适当的管理，尤其是当员工和餐厅数量比较多的情况下。\n"
+"\n"
+"我们开发的“午餐订购”模块会使这个管理工作变得简单，并给员工提供了更多的工具盒便利。 \n"
+"\n"
+"除了提供完备的餐食和餐厅管理，本模块还可以根据员工的喜好提供快速订餐选项和显示提示信息。 \n"
+"\n"
+"如果想节省员工的时间，避免他们总是要准备很多零钱，这个模块就是必须的。\n"
+"    "
 
 #. module: base
 #: view:wizard.ir.model.menu.create:0
@@ -1830,7 +1855,7 @@ msgstr "该业务伙伴或者公司的网站"
 msgid ""
 "If you check this box, your customized translations will be overwritten and "
 "replaced by the official ones."
-msgstr "如果勾上这个勾，数据库中的翻译将被服务器上的po文件中的翻译覆盖"
+msgstr "如果选定，则定制翻译会被系统翻译覆盖替换。"
 
 #. module: base
 #: model:ir.actions.act_window,name:base.ir_action_report_xml
@@ -2811,6 +2836,9 @@ msgid ""
 "==================================\n"
 "    "
 msgstr ""
+"\n"
+"美国 - 会计科目\n"
+"    "
 
 #. module: base
 #: field:ir.actions.act_url,target:0
@@ -2867,6 +2895,16 @@ msgid ""
 "        * Files by Partner (graph)\n"
 "        * Files Size by Month (graph)\n"
 msgstr ""
+"\n"
+"这是一个完整的文档管理系统。\n"
+"================================================\n"
+"    * 用户身份验证\n"
+"    * 文档索引：在Windows平台上不支持pptx和docx格式文件。\n"
+"    * 文档面板包含：\n"
+"        * 新文件列表\n"
+"        * 按资源类型的文件图表\n"
+"        * 按合作者的文件图表\n"
+"        * 按月的文件大小图表\n"
 
 #. module: base
 #: view:ir.actions.report.xml:0
@@ -3013,6 +3051,14 @@ msgid ""
 "This module is currently not compatible with the ``user_ldap`` module and\n"
 "will disable LDAP authentication completely if installed at the same time.\n"
 msgstr ""
+"\n"
+"加密密码\n"
+"===================\n"
+"\n"
+"LDAP身份验证的内部功能：\n"
+"-------------------------------\n"
+"当前该模块与``user_ldap``模块并不兼容\n"
+"如果二者同时安装，会禁用LDAP身份验证。\n"
 
 #. module: base
 #: model:res.groups,name:base.group_hr_manager
@@ -14660,7 +14706,7 @@ msgstr "源模型"
 #. module: base
 #: view:ir.sequence:0
 msgid "Day of the Week (0:Monday): %(weekday)s"
-msgstr ""
+msgstr "一周的第几天 (0:星期一):%(weekday)s"
 
 #. module: base
 #: code:addons/base/module/wizard/base_module_upgrade.py:84

From d621d2651689f3e67f00c020d0df23bb7a5e42d5 Mon Sep 17 00:00:00 2001
From: "Quentin (OpenERP)" <qdp-launchpad@openerp.com>
Date: Fri, 19 Apr 2013 16:54:17 +0200
Subject: [PATCH 076/121] [FIX] orm, _generate_order_by(): allow to order by
 LOG_ACCESS_COLUMNS even if the column is not defined again in self._columns.
 Raising an error instead of silently skipping the order_by

bzr revid: qdp-launchpad@openerp.com-20130419145417-2tix8ynmx51qiqkf
---
 openerp/osv/orm.py | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/openerp/osv/orm.py b/openerp/osv/orm.py
index 1296472fd95..870efd3dd8b 100644
--- a/openerp/osv/orm.py
+++ b/openerp/osv/orm.py
@@ -4792,8 +4792,8 @@ class BaseModel(object):
                 order_field = order_split[0].strip()
                 order_direction = order_split[1].strip() if len(order_split) == 2 else ''
                 inner_clause = None
-                if order_field == 'id':
-                    order_by_elements.append('"%s"."id" %s' % (self._table, order_direction))
+                if order_field == 'id' or (self._log_access and order_field in LOG_ACCESS_COLUMNS.keys()):
+                    order_by_elements.append('"%s"."%s" %s' % (self._table, order_field, order_direction))
                 elif order_field in self._columns:
                     order_column = self._columns[order_field]
                     if order_column._classic_read:
@@ -4811,6 +4811,8 @@ class BaseModel(object):
                         inner_clause = self._generate_m2o_order_by(order_field, query)
                     else:
                         continue  # ignore non-readable or "non-joinable" fields
+                else:
+                    raise ValueError( _("Sorting field %s not found on model %s") %( order_field, self._name))
                 if inner_clause:
                     if isinstance(inner_clause, list):
                         for clause in inner_clause:

From 7fda7e1dbde513ae12896d2555c57ed9a441dc25 Mon Sep 17 00:00:00 2001
From: "Quentin (OpenERP)" <qdp-launchpad@openerp.com>
Date: Fri, 19 Apr 2013 17:49:20 +0200
Subject: [PATCH 077/121] [FIX] ir_sequence: the field company_id does not
 exist in res.company, and thus cannot be used as sorting criterion in
 search()

bzr revid: qdp-launchpad@openerp.com-20130419154920-ipddx1mszl2c5az4
---
 openerp/addons/base/ir/ir_sequence.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/openerp/addons/base/ir/ir_sequence.py b/openerp/addons/base/ir/ir_sequence.py
index 8ba94d37006..44c9e57af32 100644
--- a/openerp/addons/base/ir/ir_sequence.py
+++ b/openerp/addons/base/ir/ir_sequence.py
@@ -217,7 +217,7 @@ class ir_sequence(openerp.osv.osv.osv):
     def next_by_id(self, cr, uid, sequence_id, context=None):
         """ Draw an interpolated string using the specified sequence."""
         self.check_access_rights(cr, uid, 'read')
-        company_ids = self.pool.get('res.company').search(cr, uid, [], order='company_id', context=context) + [False]
+        company_ids = self.pool.get('res.company').search(cr, uid, [], context=context) + [False]
         ids = self.search(cr, uid, ['&',('id','=', sequence_id),('company_id','in',company_ids)])
         return self._next(cr, uid, ids, context)
 
@@ -234,8 +234,8 @@ class ir_sequence(openerp.osv.osv.osv):
                 specific company will get higher priority. 
         """
         self.check_access_rights(cr, uid, 'read')
-        company_ids = self.pool.get('res.company').search(cr, uid, [], order='company_id', context=context) + [False]
-        ids = self.search(cr, uid, ['&',('code','=', sequence_code),('company_id','in',company_ids)])
+        company_ids = self.pool.get('res.company').search(cr, uid, [], context=context) + [False]
+        ids = self.search(cr, uid, ['&', ('code', '=', sequence_code), ('company_id', 'in', company_ids)])
         return self._next(cr, uid, ids, context)
 
     def get_id(self, cr, uid, sequence_code_or_id, code_or_id='id', context=None):

From 6a2da1c2f7a6e83bb30c578e74c1f8d2759444f5 Mon Sep 17 00:00:00 2001
From: Launchpad Translations on behalf of openerp <>
Date: Sun, 21 Apr 2013 05:32:37 +0000
Subject: [PATCH 078/121] Launchpad automatic translations update.

bzr revid: launchpad_translations_on_behalf_of_openerp-20130421053215-jdbdrur8vk4zu5tc
bzr revid: launchpad_translations_on_behalf_of_openerp-20130420064852-b6bt9syb79h1x16m
bzr revid: launchpad_translations_on_behalf_of_openerp-20130421053233-g4dbsfidsqrs301v
bzr revid: launchpad_translations_on_behalf_of_openerp-20130421053237-8jhzy2qe55bb766x
---
 addons/account/i18n/tr.po          |     8 +-
 addons/base_import/i18n/pt_BR.po   |    26 +-
 addons/point_of_sale/i18n/pt_BR.po |   265 +-
 addons/point_of_sale/i18n/tr.po    |   190 +-
 addons/report_webkit/i18n/tr.po    |    44 +-
 addons/web/i18n/fr_CA.po           |    30 +-
 addons/web_graph/i18n/fr_CA.po     |   138 +
 addons/web_kanban/i18n/fr_CA.po    |   161 +
 openerp/addons/base/i18n/fr_CA.po  | 15423 +++++++++++++++++++++++++++
 openerp/addons/base/i18n/zh_CN.po  |     2 +-
 10 files changed, 16023 insertions(+), 264 deletions(-)
 create mode 100644 addons/web_graph/i18n/fr_CA.po
 create mode 100644 addons/web_kanban/i18n/fr_CA.po
 create mode 100644 openerp/addons/base/i18n/fr_CA.po

diff --git a/addons/account/i18n/tr.po b/addons/account/i18n/tr.po
index bc886a80df7..29c22bdb47c 100644
--- a/addons/account/i18n/tr.po
+++ b/addons/account/i18n/tr.po
@@ -8,13 +8,13 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2013-03-07 08:37+0000\n"
-"PO-Revision-Date: 2013-04-18 19:19+0000\n"
+"PO-Revision-Date: 2013-04-21 01:20+0000\n"
 "Last-Translator: Ayhan KIZILTAN <Unknown>\n"
 "Language-Team: OpenERP Türkiye Yerelleştirmesi\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-04-19 06:17+0000\n"
+"X-Launchpad-Export-Date: 2013-04-21 05:32+0000\n"
 "X-Generator: Launchpad (build 16567)\n"
 "Language: tr\n"
 
@@ -4048,7 +4048,7 @@ msgstr "Vergi Tablosu"
 #. module: account
 #: view:account.journal:0
 msgid "Search Account Journal"
-msgstr "Günlük Hesabı Ara"
+msgstr "Hesap Günlüğü Ara"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_invoice_tree_pending_invoice
@@ -7243,7 +7243,7 @@ msgstr "Kullanıcı Hatası!"
 #. module: account
 #: view:account.open.closed.fiscalyear:0
 msgid "Discard"
-msgstr "Gözardı et"
+msgstr "Vazgeç"
 
 #. module: account
 #: selection:account.account,type:0
diff --git a/addons/base_import/i18n/pt_BR.po b/addons/base_import/i18n/pt_BR.po
index f032b98c302..f33d7028fbf 100644
--- a/addons/base_import/i18n/pt_BR.po
+++ b/addons/base_import/i18n/pt_BR.po
@@ -8,15 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2013-03-07 08:37+0000\n"
-"PO-Revision-Date: 2013-03-31 23:10+0000\n"
-"Last-Translator: Fábio Martinelli - http://zupy.com.br "
-"<webmaster@guaru.net>\n"
+"PO-Revision-Date: 2013-04-20 04:26+0000\n"
+"Last-Translator: Thiago Tognoli <Unknown>\n"
 "Language-Team: Brazilian Portuguese <pt_BR@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: 2013-04-01 05:31+0000\n"
-"X-Generator: Launchpad (build 16546)\n"
+"X-Launchpad-Export-Date: 2013-04-21 05:32+0000\n"
+"X-Generator: Launchpad (build 16567)\n"
 
 #. module: base_import
 #. openerp-web
@@ -210,6 +209,13 @@ msgid ""
 "\n"
 "                        See the following question."
 msgstr ""
+"Observe que caso seu Arquivo CSV\n"
+"                        tenha tabulações como separadores, o OpenERP não "
+"irá\n"
+"                        detectar as separações. Você irá precisar trocar o\n"
+"                        a opção de formato de arquivo em seu programa de "
+"planilha eletrônica. \n"
+"                        Confira essa questão."
 
 #. module: base_import
 #. openerp-web
@@ -465,6 +471,8 @@ msgid ""
 "file to import. If you need a sample importable file, you\n"
 "            can use the export tool to generate one."
 msgstr ""
+"arquivo para importar. Se você precisa de um arquivo modelo, você\n"
+"            pode usar a ferramenta de exportação para gerar um."
 
 #. module: base_import
 #. openerp-web
@@ -681,6 +689,8 @@ msgid ""
 "The first row of the\n"
 "                file contains the label of the column"
 msgstr ""
+"A primeira linha do\n"
+"                arquivo contém os títulos das colunas"
 
 #. module: base_import
 #: model:ir.model,name:base_import.model_base_import_tests_models_char_states
@@ -1008,7 +1018,7 @@ msgstr ""
 #: code:addons/base_import/static/src/js/import.js:176
 #, python-format
 msgid "Space"
-msgstr ""
+msgstr "Espaço"
 
 #. module: base_import
 #. openerp-web
@@ -1110,7 +1120,7 @@ msgstr ""
 #: code:addons/base_import/static/src/js/import.js:184
 #, python-format
 msgid "Comma"
-msgstr ""
+msgstr "Vírgula"
 
 #. module: base_import
 #: model:ir.model,name:base_import.model_base_import_tests_models_m2o_related
@@ -1236,4 +1246,4 @@ msgstr ""
 #. module: base_import
 #: field:base_import.import,file:0
 msgid "File"
-msgstr ""
+msgstr "Arquivo"
diff --git a/addons/point_of_sale/i18n/pt_BR.po b/addons/point_of_sale/i18n/pt_BR.po
index 47f1889ce8b..e64faffb898 100644
--- a/addons/point_of_sale/i18n/pt_BR.po
+++ b/addons/point_of_sale/i18n/pt_BR.po
@@ -8,20 +8,19 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2013-03-07 08:37+0000\n"
-"PO-Revision-Date: 2013-02-02 22:33+0000\n"
-"Last-Translator: Fábio Martinelli - http://zupy.com.br "
-"<webmaster@guaru.net>\n"
+"PO-Revision-Date: 2013-04-20 22:44+0000\n"
+"Last-Translator: Thiago Tognoli <Unknown>\n"
 "Language-Team: Brazilian Portuguese <pt_BR@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: 2013-03-28 05:52+0000\n"
-"X-Generator: Launchpad (build 16546)\n"
+"X-Launchpad-Export-Date: 2013-04-21 05:32+0000\n"
+"X-Generator: Launchpad (build 16567)\n"
 
 #. module: point_of_sale
 #: field:report.transaction.pos,product_nb:0
 msgid "Product Nb."
-msgstr "Produto No."
+msgstr "Núm. Produto"
 
 #. module: point_of_sale
 #: model:ir.actions.act_window,name:point_of_sale.action_trans_pos_tree_today
@@ -116,7 +115,7 @@ msgstr "Detalhes das Vendas"
 #. module: point_of_sale
 #: constraint:pos.config:0
 msgid "You cannot have two cash controls in one Point Of Sale !"
-msgstr "Você não pode ter dois controles de caixa em um ponto de venda!"
+msgstr "Você não pode ter dois controles de caixa em um Ponto de Venda!"
 
 #. module: point_of_sale
 #: field:pos.payment.report.user,user_id:0
@@ -158,9 +157,7 @@ msgid ""
 "touchscreen interface."
 msgstr ""
 "Você deve controlar o valor na caixa registradora, antes\n"
-"                                                                             "
-"                                             de iniciar as vendas através da "
-"interface de toque."
+"                          de iniciar as vendas através da interface de toque."
 
 #. module: point_of_sale
 #: report:account.statement:0
@@ -230,7 +227,7 @@ msgstr "Pesando"
 #. module: point_of_sale
 #: model:product.template,name:point_of_sale.fenouil_fenouil_product_template
 msgid "Fennel"
-msgstr "erva-doce"
+msgstr "Erva Doce"
 
 #. module: point_of_sale
 #. openerp-web
@@ -279,7 +276,7 @@ msgstr "Informação Contábil"
 #: code:addons/point_of_sale/static/src/xml/pos.xml:427
 #, python-format
 msgid "0.00€"
-msgstr ""
+msgstr "0.00"
 
 #. module: point_of_sale
 #: field:pos.session.opening,show_config:0
@@ -289,13 +286,13 @@ msgstr "Mostrar Configuração"
 #. module: point_of_sale
 #: report:pos.lines:0
 msgid "Disc. (%)"
-msgstr "Desconto (%)"
+msgstr "Desc. (%)"
 
 #. module: point_of_sale
 #: report:pos.details:0
 #: report:pos.details_summary:0
 msgid "Total discount"
-msgstr "Total de Desconto"
+msgstr "Desconto total"
 
 #. module: point_of_sale
 #. openerp-web
@@ -363,6 +360,9 @@ msgid ""
 "Check this if this point of sale should open by default in a self checkout "
 "mode. If unchecked, OpenERP uses the normal cashier mode by default."
 msgstr ""
+"Marque esta opção se este ponto de venda deve ser aberto por padrão em modo "
+"de auto atendimento. Se não marcada, o OpenERP irá usar o modo normal por "
+"padrão."
 
 #. module: point_of_sale
 #: model:ir.actions.report.xml,name:point_of_sale.pos_sales_user
@@ -406,7 +406,7 @@ msgstr "Abrir Caixa Registradora"
 #. module: point_of_sale
 #: view:pos.session.opening:0
 msgid "Select your Point of Sale"
-msgstr "Escolha seu Ponto de Vendas"
+msgstr "Escolha seu Ponto de Venda"
 
 #. module: point_of_sale
 #: field:report.sales.by.margin.pos,total:0
@@ -442,18 +442,18 @@ msgstr "Para Pesar"
 #: code:addons/point_of_sale/static/src/xml/pos.xml:476
 #, python-format
 msgid "Hardware Events"
-msgstr "Eventos do Hardware"
+msgstr "Eventos do Equipamento"
 
 #. module: point_of_sale
 #: code:addons/point_of_sale/point_of_sale.py:301
 #, python-format
 msgid "You should assign a Point of Sale to your session."
-msgstr "Você precisa associar um Ponto de Vendas a sua sessão."
+msgstr "Você precisa associar um Ponto de Venda a sua sessão."
 
 #. module: point_of_sale
 #: view:pos.order.line:0
 msgid "Total qty"
-msgstr "Total de Qtd"
+msgstr "Qtd Total"
 
 #. module: point_of_sale
 #: model:product.template,name:point_of_sale.fanta_orange_33cl_product_template
@@ -469,6 +469,10 @@ msgid ""
 "close this session, you can update the 'Closing Cash Control' to avoid any "
 "difference."
 msgstr ""
+"Por favor, defina suas contas de lucros e perdas no seu método de pagamento "
+"'%s'. Isso permitirá o OpenERP colocar a diferença de %.2f em seu saldo "
+"final. Para fechar a sessão, você pode atualizar o 'Fechando Controle de "
+"Caixa'para evitar qualquer diferença."
 
 #. module: point_of_sale
 #: code:addons/point_of_sale/point_of_sale.py:315
@@ -492,7 +496,7 @@ msgstr ""
 #. module: point_of_sale
 #: view:pos.session.opening:0
 msgid ") is \""
-msgstr ") é \""
+msgstr ") está \""
 
 #. module: point_of_sale
 #: model:product.template,name:point_of_sale.Onions_product_template
@@ -516,12 +520,12 @@ msgstr "Em Andamento"
 #: view:pos.session:0
 #: field:pos.session,opening_details_ids:0
 msgid "Opening Cash Control"
-msgstr "Controle de Abertura de Caixa"
+msgstr "Abrindo Controle de Caixa"
 
 #. module: point_of_sale
 #: help:res.users,ean13:0
 msgid "BarCode"
-msgstr "Código de barras"
+msgstr "Código de Barras"
 
 #. module: point_of_sale
 #: help:pos.category,image_medium:0
@@ -786,7 +790,7 @@ msgstr "Imprimir Relatório"
 #. module: point_of_sale
 #: model:product.template,name:point_of_sale.oetker_bolognese_product_template
 msgid "Dr. Oetker Ristorante Bolognese"
-msgstr ""
+msgstr "Dr. Oetker Ristorante Bolognese"
 
 #. module: point_of_sale
 #: model:pos.category,name:point_of_sale.pizza
@@ -796,7 +800,7 @@ msgstr "Pizza"
 #. module: point_of_sale
 #: view:pos.session:0
 msgid "= Theoretical Balance"
-msgstr ""
+msgstr "= Balanço Teórico"
 
 #. module: point_of_sale
 #: code:addons/point_of_sale/wizard/pos_return.py:85
@@ -928,7 +932,7 @@ msgstr "Data de término"
 #. module: point_of_sale
 #: model:product.template,name:point_of_sale.pomme_jonagold_product_template
 msgid "Jonagold apples"
-msgstr ""
+msgstr "Jonagold apples"
 
 #. module: point_of_sale
 #: view:account.bank.statement:0
@@ -937,7 +941,7 @@ msgstr ""
 #: model:ir.model,name:point_of_sale.model_account_journal
 #: field:report.pos.order,journal_id:0
 msgid "Journal"
-msgstr "Registro"
+msgstr "Diário"
 
 #. module: point_of_sale
 #: view:pos.session:0
@@ -947,7 +951,7 @@ msgstr "Demonstrativos"
 #. module: point_of_sale
 #: report:pos.details:0
 msgid "Sales total(Revenue)"
-msgstr "Vendas Totais"
+msgstr "Total de vendas (Receita)"
 
 #. module: point_of_sale
 #: help:pos.config,group_by:0
@@ -983,7 +987,7 @@ msgstr "Lista de Caixas Registradoras"
 #. module: point_of_sale
 #: model:product.template,name:point_of_sale.maes_50cl_product_template
 msgid "Maes 50cl"
-msgstr ""
+msgstr "Maes 50cl"
 
 #. module: point_of_sale
 #: view:report.pos.order:0
@@ -1045,7 +1049,7 @@ msgstr "Spa Reine 33cl"
 #. module: point_of_sale
 #: model:ir.model,name:point_of_sale.model_pos_discount
 msgid "Add a Global Discount"
-msgstr "Adicionar Desconto Global"
+msgstr "Adicionar um Desconto Global"
 
 #. module: point_of_sale
 #: view:pos.config:0
@@ -1055,7 +1059,7 @@ msgstr "Diários"
 #. module: point_of_sale
 #: model:product.template,name:point_of_sale.oetker_prosciutto_product_template
 msgid "Dr. Oetker Ristorante Prosciutto"
-msgstr ""
+msgstr "Dr. Oetker Ristorante Prosciutto"
 
 #. module: point_of_sale
 #: model:product.template,name:point_of_sale.lays_light_paprika_170g_product_template
@@ -1141,7 +1145,7 @@ msgstr "Re-impressão"
 #. module: point_of_sale
 #: model:product.template,name:point_of_sale.chimay_bleu_75cl_product_template
 msgid "Chimay Bleu 75cl"
-msgstr ""
+msgstr "Chimay Bleu 75cl"
 
 #. module: point_of_sale
 #: report:pos.payment.report.user:0
@@ -1171,7 +1175,7 @@ msgstr "No. de Linhas"
 #: code:addons/point_of_sale/static/src/xml/pos.xml:89
 #, python-format
 msgid "Disc"
-msgstr "Disco"
+msgstr "Desc."
 
 #. module: point_of_sale
 #: view:pos.order:0
@@ -1181,7 +1185,7 @@ msgstr "(atualizar)"
 #. module: point_of_sale
 #: model:product.template,name:point_of_sale.ijsboerke_vanille_2,5l_product_template
 msgid "IJsboerke Vanilla 2.5L"
-msgstr ""
+msgstr "IJsboerke Vanilla 2.5L"
 
 #. module: point_of_sale
 #: model:ir.actions.act_window,name:point_of_sale.action_report_pos_details
@@ -1192,7 +1196,7 @@ msgstr "Detalhes da Venda"
 #. module: point_of_sale
 #: model:product.template,name:point_of_sale.evian_2l_product_template
 msgid "2L Evian"
-msgstr ""
+msgstr "2L Evian"
 
 #. module: point_of_sale
 #: code:addons/point_of_sale/point_of_sale.py:373
@@ -1200,7 +1204,7 @@ msgstr ""
 #: code:addons/point_of_sale/wizard/pos_session_opening.py:34
 #, python-format
 msgid "Start Point Of Sale"
-msgstr ""
+msgstr "Iniciar Ponto de Venda"
 
 #. module: point_of_sale
 #: model:pos.category,name:point_of_sale.pils
@@ -1210,7 +1214,7 @@ msgstr ""
 #. module: point_of_sale
 #: help:pos.session,cash_register_balance_end_real:0
 msgid "Computed using the cash control lines"
-msgstr ""
+msgstr "Calculado usando as linhas de controle de caixa"
 
 #. module: point_of_sale
 #: report:all.closed.cashbox.of.the.day:0
@@ -1232,7 +1236,7 @@ msgstr "ABC"
 #. module: point_of_sale
 #: model:product.template,name:point_of_sale.ijsboerke_dame_blanche_2,5l_product_template
 msgid "IJsboerke 2.5L White Lady"
-msgstr ""
+msgstr "IJsboerke 2.5L White Lady"
 
 #. module: point_of_sale
 #: field:pos.order,lines:0
@@ -1247,14 +1251,14 @@ msgstr "Total da Transação"
 #. module: point_of_sale
 #: model:product.template,name:point_of_sale.chaudfontaine_petillante_50cl_product_template
 msgid "Chaudfontaine Petillante 50cl"
-msgstr ""
+msgstr "Chaudfontaine Petillante 50cl"
 
 #. module: point_of_sale
 #. openerp-web
 #: code:addons/point_of_sale/static/src/xml/pos.xml:485
 #, python-format
 msgid "Read Weighting Scale"
-msgstr ""
+msgstr "Lendo a Balança"
 
 #. module: point_of_sale
 #. openerp-web
@@ -1317,7 +1321,7 @@ msgstr "Marcar como Obsoleto"
 #. module: point_of_sale
 #: model:product.template,name:point_of_sale.limon_product_template
 msgid "Stringers"
-msgstr ""
+msgstr "Limões"
 
 #. module: point_of_sale
 #: field:pos.order,pricelist_id:0
@@ -1384,19 +1388,19 @@ msgstr "Stella Artois 33cl"
 #. module: point_of_sale
 #: model:product.template,name:point_of_sale.lays_naturel_300g_product_template
 msgid "Lays Natural XXL 300g"
-msgstr ""
+msgstr "Lays Natural XXL 300g"
 
 #. module: point_of_sale
 #. openerp-web
 #: code:addons/point_of_sale/static/src/xml/pos.xml:479
 #, python-format
 msgid "Scan Item Unrecognized"
-msgstr ""
+msgstr "item Escaneado não Reconhecido"
 
 #. module: point_of_sale
 #: report:all.closed.cashbox.of.the.day:0
 msgid "Today's Closed Cashbox"
-msgstr "Fechamento de Caixa do dia"
+msgstr "Fechamento de Caixa do Dia"
 
 #. module: point_of_sale
 #: code:addons/point_of_sale/point_of_sale.py:897
@@ -1412,7 +1416,7 @@ msgstr "Fatura Provisória"
 #. module: point_of_sale
 #: model:product.template,name:point_of_sale.lays_paprika_oven_150g_product_template
 msgid "Oven Baked Lays Paprika 150g"
-msgstr ""
+msgstr "Oven Baked Lays Paprika 150g"
 
 #. module: point_of_sale
 #: report:pos.invoice:0
@@ -1464,7 +1468,7 @@ msgstr "Coca-Cola Light 2L"
 #. module: point_of_sale
 #: model:product.template,name:point_of_sale.oetker_funghi_product_template
 msgid "Dr. Oetker Ristorante Funghi"
-msgstr ""
+msgstr "Dr. Oetker Ristorante Funghi"
 
 #. module: point_of_sale
 #: model:ir.actions.act_window,name:point_of_sale.pos_category_action
@@ -1492,7 +1496,7 @@ msgstr "Ean Inválido"
 #. module: point_of_sale
 #: model:product.template,name:point_of_sale.lindemans_kriek_37,5cl_product_template
 msgid "Lindemans Kriek 37.5cl"
-msgstr ""
+msgstr "Lindemans Kriek 37.5cl"
 
 #. module: point_of_sale
 #: view:pos.config:0
@@ -1509,7 +1513,7 @@ msgstr "Coca-Cola Zero 33cl"
 #: code:addons/point_of_sale/static/src/xml/pos.xml:405
 #, python-format
 msgid "&auml;"
-msgstr ""
+msgstr "&auml;"
 
 #. module: point_of_sale
 #: report:pos.invoice:0
@@ -1538,7 +1542,7 @@ msgstr "Desconhecido"
 #. module: point_of_sale
 #: field:product.product,income_pdt:0
 msgid "Point of Sale Cash In"
-msgstr ""
+msgstr "Colocar dinheiro no Ponto de Venda"
 
 #. module: point_of_sale
 #. openerp-web
@@ -1623,7 +1627,7 @@ msgstr ""
 #. module: point_of_sale
 #: model:product.template,name:point_of_sale.boon_framboise_37,5cl_product_template
 msgid "Boon Framboise 37.5cl"
-msgstr ""
+msgstr "Boon Framboise 37.5cl"
 
 #. module: point_of_sale
 #: model:ir.model,name:point_of_sale.model_pos_config
@@ -1642,7 +1646,7 @@ msgstr ""
 #. module: point_of_sale
 #: field:product.product,expense_pdt:0
 msgid "Point of Sale Cash Out"
-msgstr ""
+msgstr "Sacar do Ponto de Venda"
 
 #. module: point_of_sale
 #: selection:report.pos.order,month:0
@@ -1654,7 +1658,7 @@ msgstr "Novembro"
 #: code:addons/point_of_sale/static/src/xml/pos.xml:267
 #, python-format
 msgid "Please scan an item or your member card"
-msgstr ""
+msgstr "Por favor escaneie um item ou seu cartão de associado"
 
 #. module: point_of_sale
 #: model:product.template,name:point_of_sale.poivron_verts_product_template
@@ -1664,7 +1668,7 @@ msgstr "Pimentões Verdes"
 #. module: point_of_sale
 #: model:product.template,name:point_of_sale.timmermans_faro_37,5cl_product_template
 msgid "Timmermans Faro 37.5cl"
-msgstr ""
+msgstr "Timmermans Faro 37.5cl"
 
 #. module: point_of_sale
 #: code:addons/point_of_sale/point_of_sale.py:410
@@ -1677,7 +1681,7 @@ msgstr ""
 #. module: point_of_sale
 #: view:pos.session:0
 msgid "Validate Closing & Post Entries"
-msgstr ""
+msgstr "Validar Encerramento e Lançar Entradas"
 
 #. module: point_of_sale
 #: field:report.transaction.pos,no_trans:0
@@ -1720,7 +1724,7 @@ msgstr "Cancelar"
 #: code:addons/point_of_sale/static/src/xml/pos.xml:296
 #, python-format
 msgid "Please put your product on the scale"
-msgstr ""
+msgstr "Por favor, coloque seu produto na balança"
 
 #. module: point_of_sale
 #: model:ir.actions.report.xml,name:point_of_sale.pos_details_summary
@@ -1730,12 +1734,12 @@ msgstr "Vendas(Resumo)"
 #. module: point_of_sale
 #: model:product.template,name:point_of_sale.nectarine_product_template
 msgid "Peach"
-msgstr ""
+msgstr "Pêssego"
 
 #. module: point_of_sale
 #: model:product.template,name:point_of_sale.timmermans_kriek_37,5cl_product_template
 msgid "Timmermans Kriek 37.5cl"
-msgstr ""
+msgstr "Timmermans Kriek 37.5cl"
 
 #. module: point_of_sale
 #: field:pos.config,sequence_id:0
@@ -1768,7 +1772,7 @@ msgstr "fechar"
 #. module: point_of_sale
 #: model:ir.actions.report.xml,name:point_of_sale.report_user_label
 msgid "User Labels"
-msgstr ""
+msgstr "Etiquetas do Usuário"
 
 #. module: point_of_sale
 #: model:ir.model,name:point_of_sale.model_pos_order_line
@@ -1843,7 +1847,7 @@ msgstr "Ponto de Venda"
 #: code:addons/point_of_sale/static/src/xml/pos.xml:587
 #, python-format
 msgid "Subtotal:"
-msgstr ""
+msgstr "Subtotal:"
 
 #. module: point_of_sale
 #: model:product.template,name:point_of_sale.coca_regular_33cl_product_template
@@ -1891,7 +1895,7 @@ msgstr "Nome"
 #. module: point_of_sale
 #: model:product.template,name:point_of_sale.spa_gazeuse_33cl_product_template
 msgid "Spa Barisart 33cl"
-msgstr ""
+msgstr "Spa Barisart 33cl"
 
 #. module: point_of_sale
 #: view:pos.confirm:0
@@ -1919,6 +1923,9 @@ msgid ""
 "complete\n"
 "            your purchase"
 msgstr ""
+"Por favor, insira seu cartão no leitor e aguarde as instruções para "
+"completar\n"
+"            sua compra"
 
 #. module: point_of_sale
 #: help:product.product,income_pdt:0
@@ -1930,7 +1937,7 @@ msgstr ""
 #. module: point_of_sale
 #: model:product.template,name:point_of_sale.ijsboerke_moka_2,5l_product_template
 msgid "IJsboerke Mocha 2.5L"
-msgstr ""
+msgstr "IJsboerke Mocha 2.5L"
 
 #. module: point_of_sale
 #: field:pos.session,cash_control:0
@@ -1957,6 +1964,8 @@ msgid ""
 "Unable to open the session. You have to assign a sale journal to your point "
 "of sale."
 msgstr ""
+"Não é possível abrir a sessão. Você tem que atribuir um diário de venda para "
+"o seu ponto de venda."
 
 #. module: point_of_sale
 #: view:report.pos.order:0
@@ -2010,7 +2019,7 @@ msgstr "Estabelecimento:"
 #. module: point_of_sale
 #: field:account.journal,self_checkout_payment_method:0
 msgid "Self Checkout Payment Method"
-msgstr ""
+msgstr "Forma de Pagamento do Auto Atendimento"
 
 #. module: point_of_sale
 #: view:pos.order:0
@@ -2056,7 +2065,7 @@ msgstr "caps lock"
 #. module: point_of_sale
 #: model:product.template,name:point_of_sale.grisette_cerise_25cl_product_template
 msgid "Grisette Cherry 25cl"
-msgstr ""
+msgstr "Grisette Cherry 25cl"
 
 #. module: point_of_sale
 #: report:pos.invoice:0
@@ -2146,12 +2155,12 @@ msgstr "Produtos"
 #. module: point_of_sale
 #: model:product.template,name:point_of_sale.oetker_4formaggi_product_template
 msgid "Dr. Oetker Ristorante Quattro Formaggi"
-msgstr ""
+msgstr "Dr. Oetker Ristorante Quattro Formaggi"
 
 #. module: point_of_sale
 #: model:product.template,name:point_of_sale.croky_naturel_45g_product_template
 msgid "Croky Natural 45g"
-msgstr ""
+msgstr "Croky Natural 45g"
 
 #. module: point_of_sale
 #: model:product.template,name:point_of_sale.tomate_en_grappe_product_template
@@ -2161,7 +2170,7 @@ msgstr "Tomates em Conjunto"
 #. module: point_of_sale
 #: model:ir.actions.client,name:point_of_sale.action_pos_pos
 msgid "Start Point of Sale"
-msgstr "Iniciar Ponto de Vendas"
+msgstr "Iniciar Ponto de Venda"
 
 #. module: point_of_sale
 #. openerp-web
@@ -2195,7 +2204,7 @@ msgstr "Pedidos do Ponto de Vendas"
 #. module: point_of_sale
 #: model:product.template,name:point_of_sale.spa_et_fruit_50cl_product_template
 msgid "Spa Fruit and Orange 50cl"
-msgstr ""
+msgstr "Spa Fruit and Orange 50cl"
 
 #. module: point_of_sale
 #: view:pos.config:0
@@ -2391,7 +2400,7 @@ msgstr "<![endif]-->"
 #. module: point_of_sale
 #: model:product.template,name:point_of_sale.jupiler_50cl_product_template
 msgid "Jupiler 50cl"
-msgstr ""
+msgstr "Jupiler 50cl"
 
 #. module: point_of_sale
 #: report:pos.details:0
@@ -2424,7 +2433,7 @@ msgstr "Sincronizada"
 #. module: point_of_sale
 #: model:product.template,name:point_of_sale.chimay_rouge_33cl_product_template
 msgid "Chimay Red 33cl"
-msgstr ""
+msgstr "Chimay Red 33cl"
 
 #. module: point_of_sale
 #: view:report.pos.order:0
@@ -2440,7 +2449,7 @@ msgstr "Imagem de tamanho Médio"
 #. module: point_of_sale
 #: model:product.template,name:point_of_sale.papillon_orange_product_template
 msgid "Orange Butterfly"
-msgstr ""
+msgstr "Laranja Butterfly"
 
 #. module: point_of_sale
 #: view:report.pos.order:0
@@ -2612,7 +2621,7 @@ msgstr "Linhas do demonstrativo"
 #. module: point_of_sale
 #: model:product.template,name:point_of_sale.croky_paprika_45g_product_template
 msgid "Croky Paprika 45g"
-msgstr ""
+msgstr "Croky Paprika 45g"
 
 #. module: point_of_sale
 #: view:pos.order:0
@@ -2676,12 +2685,12 @@ msgstr "Fatura"
 #: code:addons/point_of_sale/static/src/xml/pos.xml:701
 #, python-format
 msgid "shift"
-msgstr ""
+msgstr "shift"
 
 #. module: point_of_sale
 #: model:product.template,name:point_of_sale.rochefort_8_33cl_product_template
 msgid "Rochefort \"8\" 33cl"
-msgstr ""
+msgstr "Rochefort \"8\" 33cl"
 
 #. module: point_of_sale
 #: view:account.bank.statement:0
@@ -2711,7 +2720,7 @@ msgstr ""
 #. module: point_of_sale
 #: model:product.template,name:point_of_sale.timmermans_geuze_37,5cl_product_template
 msgid "Timmermans Geuze 37.5cl"
-msgstr ""
+msgstr "Timmermans Geuze 37.5cl"
 
 #. module: point_of_sale
 #: view:pos.session:0
@@ -2734,7 +2743,7 @@ msgstr "Responsável"
 #. module: point_of_sale
 #: model:product.template,name:point_of_sale.croky_bolognaise_250g_product_template
 msgid "Croky Bolognese 250g"
-msgstr ""
+msgstr "Croky Bolognese 250g"
 
 #. module: point_of_sale
 #. openerp-web
@@ -2748,7 +2757,7 @@ msgstr "Ean13 Personalizado"
 #: code:addons/point_of_sale/static/src/xml/pos.xml:465
 #, python-format
 msgid "1.54€ Lemon"
-msgstr ""
+msgstr "1.54R$ Limão"
 
 #. module: point_of_sale
 #: field:pos.make.payment,payment_name:0
@@ -2782,12 +2791,12 @@ msgstr "Vendas por Margem de Usuário"
 #: report:pos.invoice:0
 #, python-format
 msgid "Taxes:"
-msgstr "Taxas:"
+msgstr "Impostos:"
 
 #. module: point_of_sale
 #: model:product.template,name:point_of_sale.pepsi_max_33cl_product_template
 msgid "Pepsi Max 33cl"
-msgstr ""
+msgstr "Pepsi Max 33cl"
 
 #. module: point_of_sale
 #: model:ir.model,name:point_of_sale.model_report_pos_order
@@ -2808,7 +2817,7 @@ msgstr "Produto"
 #. module: point_of_sale
 #: model:product.template,name:point_of_sale.oetker_pollo_product_template
 msgid "Dr. Oetker Ristorante Pollo"
-msgstr ""
+msgstr "Dr. Oetker Ristorante Pollo"
 
 #. module: point_of_sale
 #: constraint:pos.session:0
@@ -2853,12 +2862,12 @@ msgstr "Sessão"
 #. module: point_of_sale
 #: model:product.template,name:point_of_sale.chaudfontaine_33cl_product_template
 msgid "Chaudfontaine 33cl"
-msgstr ""
+msgstr "Chaudfontaine 33cl"
 
 #. module: point_of_sale
 #: model:product.template,name:point_of_sale.oetker_margherita_product_template
 msgid "Dr. Oetker La Margherita"
-msgstr ""
+msgstr "Dr. Oetker La Margherita"
 
 #. module: point_of_sale
 #: view:pos.order:0
@@ -2958,7 +2967,7 @@ msgstr "Gerente"
 #. module: point_of_sale
 #: model:product.template,name:point_of_sale.lays_poivre_sel_oven_150g_product_template
 msgid "Lays Salt and Pepper Oven Baked 150g"
-msgstr ""
+msgstr "Lays Salt and Pepper Oven Baked 150g"
 
 #. module: point_of_sale
 #: field:pos.details,date_start:0
@@ -3015,7 +3024,7 @@ msgstr "Procurar Pedido de Venda"
 #. module: point_of_sale
 #: field:pos.config,iface_self_checkout:0
 msgid "Self Checkout Mode"
-msgstr ""
+msgstr "Modo de Auto Atendimento"
 
 #. module: point_of_sale
 #: field:account.journal,journal_user:0
@@ -3049,7 +3058,7 @@ msgstr "Relatório de Pagamento"
 #. module: point_of_sale
 #: model:product.template,name:point_of_sale.fanta_orange_25cl_product_template
 msgid "Fanta Orange 25cl"
-msgstr ""
+msgstr "Fanta Laranja 25cl"
 
 #. module: point_of_sale
 #: view:pos.confirm:0
@@ -3085,7 +3094,7 @@ msgstr "Motivo"
 #. module: point_of_sale
 #: model:product.template,name:point_of_sale.orangina_33cl_product_template
 msgid "Orangina 33cl"
-msgstr ""
+msgstr "Orangina 33cl"
 
 #. module: point_of_sale
 #: view:pos.config:0
@@ -3095,7 +3104,7 @@ msgstr "Definir como Inativo"
 #. module: point_of_sale
 #: model:product.template,name:point_of_sale.chimay_bleu_33cl_product_template
 msgid "Chimay Bleu 33cl"
-msgstr ""
+msgstr "Chimay Bleu 33cl"
 
 #. module: point_of_sale
 #: model:ir.actions.act_window,name:point_of_sale.action_account_journal_form
@@ -3111,7 +3120,7 @@ msgstr "Fritas"
 #. module: point_of_sale
 #: model:product.template,name:point_of_sale.oetker_spinaci_product_template
 msgid "Dr. Oetker Ristorante Spinaci"
-msgstr ""
+msgstr "Dr. Oetker Ristorante Spinaci"
 
 #. module: point_of_sale
 #. openerp-web
@@ -3143,7 +3152,7 @@ msgstr "Colocar dinheiro em"
 #. module: point_of_sale
 #: model:product.template,name:point_of_sale.fanta_zero_orange_1,5l_product_template
 msgid "Fanta Orange Zero 1.5L"
-msgstr ""
+msgstr "Fanta Laranja Zero 1.5L"
 
 #. module: point_of_sale
 #: model:product.template,name:point_of_sale.boni_orange_product_template
@@ -3200,7 +3209,7 @@ msgstr ""
 #. module: point_of_sale
 #: model:product.template,name:point_of_sale.orangina_1,5l_product_template
 msgid "Orangina 1.5L"
-msgstr ""
+msgstr "Orangina 1.5L"
 
 #. module: point_of_sale
 #: view:report.pos.order:0
@@ -3234,17 +3243,17 @@ msgstr "Linha do Demonstrativo Bancário"
 #. module: point_of_sale
 #: model:product.template,name:point_of_sale.belle_vue_kriek_25cl_product_template
 msgid "Belle-Vue Kriek 25cl"
-msgstr ""
+msgstr "Belle-Vue Kriek 25cl"
 
 #. module: point_of_sale
 #: model:product.template,name:point_of_sale.chaudfontaine_petillante_1,5l_product_template
 msgid "Chaudfontaine Petillante 1.5l"
-msgstr ""
+msgstr "Chaudfontaine Petillante 1.5l"
 
 #. module: point_of_sale
 #: model:product.template,name:point_of_sale.ijsboerke_stracciatella_2,5l_product_template
 msgid "IJsboerke Stracciatella 2.5L"
-msgstr ""
+msgstr "IJsboerke Stracciatella 2.5L"
 
 #. module: point_of_sale
 #: view:report.sales.by.user.pos:0
@@ -3256,7 +3265,7 @@ msgstr "Relatório do PDV"
 #. module: point_of_sale
 #: model:product.template,name:point_of_sale.chaudfontaine_1,5l_product_template
 msgid "Chaudfontaine 1.5l"
-msgstr ""
+msgstr "Chaudfontaine 1.5l"
 
 #. module: point_of_sale
 #: code:addons/point_of_sale/point_of_sale.py:1069
@@ -3326,7 +3335,7 @@ msgstr "Coca-Cola Zero 50cl"
 #. module: point_of_sale
 #: model:product.template,name:point_of_sale.oetker_tonno_product_template
 msgid "Dr. Oetker Ristorante Tonno"
-msgstr ""
+msgstr "Dr. Oetker Ristorante Tonno"
 
 #. module: point_of_sale
 #: report:pos.invoice:0
@@ -3368,7 +3377,7 @@ msgstr "cash.box.out"
 #. module: point_of_sale
 #: model:product.template,name:point_of_sale.fanta_zero_orange_33cl_product_template
 msgid "Fanta Zero Orange 33cl"
-msgstr ""
+msgstr "Fanta Laranja Zero 33cl"
 
 #. module: point_of_sale
 #: help:product.product,available_in_pos:0
@@ -3383,7 +3392,7 @@ msgstr "Dia da data do pedido"
 #. module: point_of_sale
 #: model:product.template,name:point_of_sale.maes_33cl_product_template
 msgid "Maes 33cl"
-msgstr ""
+msgstr "Maes 33cl"
 
 #. module: point_of_sale
 #. openerp-web
@@ -3400,7 +3409,7 @@ msgstr "Configuração"
 #. module: point_of_sale
 #: model:product.template,name:point_of_sale.orval_33cl_product_template
 msgid "Orval 33cl"
-msgstr ""
+msgstr "Orval 33cl"
 
 #. module: point_of_sale
 #. openerp-web
@@ -3433,7 +3442,7 @@ msgstr "Frutas Frescas"
 #. module: point_of_sale
 #: model:product.template,name:point_of_sale.lindemans_pecheresse_37,,5cl_product_template
 msgid "Lindemans sinful 37.5cl"
-msgstr ""
+msgstr "Lindemans sinful 37.5cl"
 
 #. module: point_of_sale
 #: model:ir.actions.act_window,name:point_of_sale.action_pos_invoice
@@ -3453,7 +3462,7 @@ msgstr "Imagem"
 #. module: point_of_sale
 #: model:product.template,name:point_of_sale.spa_gazeuse_1,5l_product_template
 msgid "Spa Barisart 1.5l"
-msgstr ""
+msgstr "Spa Barisart 1.5l"
 
 #. module: point_of_sale
 #: code:addons/point_of_sale/point_of_sale.py:789
@@ -3465,7 +3474,7 @@ msgstr "Retornar Produtos"
 #. module: point_of_sale
 #: model:product.template,name:point_of_sale.jupiler_33cl_product_template
 msgid "Jupiler 33cl"
-msgstr ""
+msgstr "Jupiler 33cl"
 
 #. module: point_of_sale
 #. openerp-web
@@ -3573,7 +3582,7 @@ msgstr "Balança Eletrônica"
 #. module: point_of_sale
 #: model:product.template,name:point_of_sale.spa_gazeuse_50cl_product_template
 msgid "Spa Barisart 50cl"
-msgstr ""
+msgstr "Spa Barisart 50cl"
 
 #. module: point_of_sale
 #: field:res.users,pos_config:0
@@ -3617,7 +3626,7 @@ msgstr "Pago"
 #: code:addons/point_of_sale/static/src/xml/pos.xml:464
 #, python-format
 msgid "3.141Kg Oranges"
-msgstr ""
+msgstr "3.141Kg de Laranjas"
 
 #. module: point_of_sale
 #: report:pos.invoice:0
@@ -3633,7 +3642,7 @@ msgstr "Por favor informe um parceiro para a venda"
 #. module: point_of_sale
 #: model:pos.category,name:point_of_sale.fruity_beers
 msgid "Fruity Beers"
-msgstr ""
+msgstr "Cerveja de Frutas"
 
 #. module: point_of_sale
 #: view:pos.session:0
@@ -3645,7 +3654,7 @@ msgstr ""
 #: code:addons/point_of_sale/static/src/xml/pos.xml:463
 #, python-format
 msgid "Soda 33cl"
-msgstr ""
+msgstr "Soda 33cl"
 
 #. module: point_of_sale
 #: help:pos.session,cash_register_balance_start:0
@@ -3666,7 +3675,7 @@ msgstr "Vendas do Usuário"
 #. module: point_of_sale
 #: model:product.template,name:point_of_sale.oetker_hawaii_product_template
 msgid "Dr. Oetker Ristorante Hawaii"
-msgstr ""
+msgstr "Dr. Oetker Ristorante Hawaii"
 
 #. module: point_of_sale
 #. openerp-web
@@ -3700,12 +3709,12 @@ msgstr ""
 #. module: point_of_sale
 #: model:product.template,name:point_of_sale.chaudfontaine_petillante_33cl_product_template
 msgid "Chaudfontaine Petillante 33cl"
-msgstr ""
+msgstr "Chaudfontaine Petillante 33cl"
 
 #. module: point_of_sale
 #: model:product.template,name:point_of_sale.pepsi_max_2l_product_template
 msgid "Pepsi Max 2L"
-msgstr ""
+msgstr "Pepsi Max 2L"
 
 #. module: point_of_sale
 #: field:pos.session,details_ids:0
@@ -3715,17 +3724,17 @@ msgstr "Controle de Caixa"
 #. module: point_of_sale
 #: model:product.template,name:point_of_sale.oetker_vegetale_product_template
 msgid "Dr. Oetker Ristorante Vegetable"
-msgstr ""
+msgstr "Dr. Oetker Ristorante Vegetable"
 
 #. module: point_of_sale
 #: model:pos.category,name:point_of_sale.soda
 msgid "Soda"
-msgstr ""
+msgstr "Soda"
 
 #. module: point_of_sale
 #: model:product.template,name:point_of_sale.lays_paprika_300g_product_template
 msgid "Lays Paprika XXL 300g"
-msgstr ""
+msgstr "Lays Paprika XXL 300g"
 
 #. module: point_of_sale
 #: report:pos.invoice:0
@@ -3737,7 +3746,7 @@ msgstr "Reembolso"
 #: code:addons/point_of_sale/static/src/xml/pos.xml:417
 #, python-format
 msgid "Your shopping cart is empty"
-msgstr ""
+msgstr "Seu Carrinho de Compras está vazio"
 
 #. module: point_of_sale
 #: code:addons/point_of_sale/report/pos_invoice.py:46
@@ -3748,7 +3757,7 @@ msgstr "Por favor crie uma fatura para esta venda."
 #. module: point_of_sale
 #: model:product.template,name:point_of_sale.oetker_mozzarella_product_template
 msgid "Dr. Oetker Ristorante Mozzarella"
-msgstr ""
+msgstr "Dr. Oetker Ristorante Mozzarella"
 
 #. module: point_of_sale
 #: report:pos.details:0
@@ -3759,7 +3768,7 @@ msgstr "Desc(%)"
 #. module: point_of_sale
 #: view:pos.session.opening:0
 msgid "The session"
-msgstr ""
+msgstr "A sessão"
 
 #. module: point_of_sale
 #: view:pos.order:0
@@ -3784,12 +3793,12 @@ msgstr "Ordem de Linhas"
 #. module: point_of_sale
 #: view:pos.session.opening:0
 msgid "PoS Session Opening"
-msgstr ""
+msgstr "Abrindo Sessão do PDV"
 
 #. module: point_of_sale
 #: field:pos.order.line,price_subtotal:0
 msgid "Subtotal w/o Tax"
-msgstr ""
+msgstr "Subtotal Sem Impostos"
 
 #. module: point_of_sale
 #. openerp-web
@@ -3802,7 +3811,7 @@ msgstr "excluir"
 #. module: point_of_sale
 #: model:product.template,name:point_of_sale.spa_50cl_product_template
 msgid "Spa Reine 50cl"
-msgstr ""
+msgstr "Spa Reine 50cl"
 
 #. module: point_of_sale
 #: model:product.template,name:point_of_sale.chicon_flandria_extra_product_template
@@ -3813,22 +3822,22 @@ msgstr ""
 #: model:product.template,name:point_of_sale.lays_light_naturel_170g_product_template
 #: model:product.template,name:point_of_sale.lays_naturel_170g_product_template
 msgid "Lays Natural Light 170g"
-msgstr ""
+msgstr "Lays Natural Light 170g"
 
 #. module: point_of_sale
 #: model:product.template,name:point_of_sale.leffe_blonde_33cl_product_template
 msgid "Leffe Blonde 33cl"
-msgstr ""
+msgstr "Leffe Blonde 33cl"
 
 #. module: point_of_sale
 #: model:ir.actions.act_window,name:point_of_sale.action_report_pos_payment
 msgid "Pyament Report"
-msgstr ""
+msgstr "Relatório de Pagamento"
 
 #. module: point_of_sale
 #: field:report.transaction.pos,jl_id:0
 msgid "Cash Journals"
-msgstr ""
+msgstr "Diários de  Dinheiro"
 
 #. module: point_of_sale
 #: view:pos.session:0
@@ -3838,12 +3847,12 @@ msgstr "Sessão:"
 #. module: point_of_sale
 #: field:pos.config,iface_print_via_proxy:0
 msgid "Print via Proxy"
-msgstr ""
+msgstr "Imprimir via Proxy"
 
 #. module: point_of_sale
 #: report:pos.sales.user.today:0
 msgid "Today's Sales By User"
-msgstr ""
+msgstr "Vendas de hoje por Usuário"
 
 #. module: point_of_sale
 #: help:account.journal,amount_authorized_diff:0
@@ -3889,7 +3898,7 @@ msgstr "Anotações Internas"
 #. module: point_of_sale
 #: model:product.template,name:point_of_sale.ijsboerke_chocolat_2,5l_product_template
 msgid "IJsboerke Chocolat 2.5L"
-msgstr ""
+msgstr "IJsboerke Chocolat 2.5L"
 
 #. module: point_of_sale
 #: help:pos.category,image_small:0
@@ -3902,7 +3911,7 @@ msgstr ""
 #. module: point_of_sale
 #: field:pos.session.opening,pos_state:0
 msgid "Session Status"
-msgstr ""
+msgstr "Status da Sessão"
 
 #. module: point_of_sale
 #: field:pos.order,picking_id:0
@@ -3946,12 +3955,12 @@ msgstr "Editar"
 #. module: point_of_sale
 #: view:pos.session.opening:0
 msgid "Click to continue the session."
-msgstr ""
+msgstr "Clique para continuar a sessão."
 
 #. module: point_of_sale
 #: view:pos.config:0
 msgid "Set to Active"
-msgstr ""
+msgstr "Marque para Ativar"
 
 #. module: point_of_sale
 #: view:pos.category:0
@@ -3961,7 +3970,7 @@ msgstr ""
 #. module: point_of_sale
 #: view:pos.session.opening:0
 msgid "Start Selling"
-msgstr ""
+msgstr "Começar a Vender"
 
 #. module: point_of_sale
 #: selection:report.pos.order,month:0
@@ -3994,7 +4003,7 @@ msgstr ""
 #. module: point_of_sale
 #: model:product.template,name:point_of_sale.leffe_9_33cl_product_template
 msgid "Leffe Brune \"9\" 33cl"
-msgstr ""
+msgstr "Leffe Brune \"9\" 33cl"
 
 #. module: point_of_sale
 #: help:account.journal,journal_user:0
@@ -4042,7 +4051,7 @@ msgstr ""
 #: code:addons/point_of_sale/static/src/xml/pos.xml:351
 #, python-format
 msgid "Sorry, we could not create a session for this user."
-msgstr ""
+msgstr "Desculpe, não podemos criar uma sessão para esse usuário."
 
 #. module: point_of_sale
 #: code:addons/point_of_sale/point_of_sale.py:98
@@ -4050,7 +4059,7 @@ msgstr ""
 #: selection:pos.session.opening,pos_state:0
 #, python-format
 msgid "Opening Control"
-msgstr ""
+msgstr "Abrindo Controle"
 
 #. module: point_of_sale
 #: view:report.pos.order:0
diff --git a/addons/point_of_sale/i18n/tr.po b/addons/point_of_sale/i18n/tr.po
index 2b7b1eda953..0b2cc18b8d7 100644
--- a/addons/point_of_sale/i18n/tr.po
+++ b/addons/point_of_sale/i18n/tr.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2013-03-07 08:37+0000\n"
-"PO-Revision-Date: 2013-03-27 12:20+0000\n"
-"Last-Translator: Volkan Gezer <Unknown>\n"
+"PO-Revision-Date: 2013-04-19 10:28+0000\n"
+"Last-Translator: Ediz Duman <neps1192@gmail.com>\n"
 "Language-Team: Turkish <tr@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: 2013-03-28 05:52+0000\n"
-"X-Generator: Launchpad (build 16546)\n"
+"X-Launchpad-Export-Date: 2013-04-20 06:48+0000\n"
+"X-Generator: Launchpad (build 16567)\n"
 
 #. module: point_of_sale
 #: field:report.transaction.pos,product_nb:0
@@ -285,7 +285,7 @@ msgstr "Toplam indirim"
 #: code:addons/point_of_sale/static/src/xml/pos.xml:441
 #, python-format
 msgid "Debug Window"
-msgstr ""
+msgstr "Hata Ayıklama Penceresi"
 
 #. module: point_of_sale
 #. openerp-web
@@ -326,7 +326,7 @@ msgstr "İnd.(%)"
 #: code:addons/point_of_sale/point_of_sale.py:1006
 #, python-format
 msgid "Please define income account for this product: \"%s\" (id:%d)."
-msgstr ""
+msgstr "Lütfen bu ürün için gelir hesabı belirtin: \"%s\" (id:%d)."
 
 #. module: point_of_sale
 #: view:report.pos.order:0
@@ -417,14 +417,14 @@ msgstr "Ödeme İsteği"
 #. module: point_of_sale
 #: field:product.product,to_weight:0
 msgid "To Weight"
-msgstr ""
+msgstr "Ağırlık"
 
 #. module: point_of_sale
 #. openerp-web
 #: code:addons/point_of_sale/static/src/xml/pos.xml:476
 #, python-format
 msgid "Hardware Events"
-msgstr ""
+msgstr "Donanım Etkinlikler"
 
 #. module: point_of_sale
 #: code:addons/point_of_sale/point_of_sale.py:301
@@ -512,6 +512,9 @@ msgid ""
 "128x128px image, with aspect ratio preserved. Use this field in form views "
 "or some kanban views."
 msgstr ""
+"Kategorinin orta boyutlu görüntü. Otomatik olarak korunmuş en boy oranına "
+"sahip, bir 128x128px görüntü olarak yeniden boyutlandırılır. Form "
+"görünümleri ya da kanban görünümlerinde bu alanı kullanın."
 
 #. module: point_of_sale
 #: view:pos.session.opening:0
@@ -528,7 +531,7 @@ msgstr "Günlük Operasyonlar"
 #: code:addons/point_of_sale/static/src/xml/pos.xml:42
 #, python-format
 msgid "Google Chrome"
-msgstr ""
+msgstr "Google Chrome"
 
 #. module: point_of_sale
 #: model:pos.category,name:point_of_sale.sparkling_water
@@ -718,12 +721,12 @@ msgstr "İşleme POS Yevmiye Girişlerini"
 #: code:addons/point_of_sale/static/src/xml/pos.xml:457
 #, python-format
 msgid "Barcode Scanner"
-msgstr ""
+msgstr "Barkod Okuyucu"
 
 #. module: point_of_sale
 #: model:product.template,name:point_of_sale.pomme_granny_smith_product_template
 msgid "Granny Smith apples"
-msgstr ""
+msgstr "Granny Smith elma"
 
 #. module: point_of_sale
 #: help:product.product,expense_pdt:0
@@ -841,6 +844,8 @@ msgid ""
 "This field holds the image used as image for the cateogry, limited to "
 "1024x1024px."
 msgstr ""
+"Bu alanda 1024x1024px sınırlı kategorik için resmi olarak kullanılan görüntü "
+"tutar."
 
 #. module: point_of_sale
 #: model:product.template,name:point_of_sale.pepsi_max_50cl_product_template
@@ -866,7 +871,7 @@ msgstr ""
 #. module: point_of_sale
 #: model:pos.category,name:point_of_sale.rouges_noyau_fruits
 msgid "Berries"
-msgstr ""
+msgstr "Meyveler"
 
 #. module: point_of_sale
 #: view:pos.ean_wizard:0
@@ -887,7 +892,7 @@ msgstr "Hata: Geçersiz barkod"
 #. module: point_of_sale
 #: model:pos.category,name:point_of_sale.legumes_racine
 msgid "Root vegetables"
-msgstr ""
+msgstr "Sebzeler"
 
 #. module: point_of_sale
 #: model:ir.actions.act_window,name:point_of_sale.act_pos_open_statement
@@ -905,7 +910,7 @@ msgstr "Bitiş Tarihi"
 #. module: point_of_sale
 #: model:product.template,name:point_of_sale.pomme_jonagold_product_template
 msgid "Jonagold apples"
-msgstr ""
+msgstr "Jonagold elma"
 
 #. module: point_of_sale
 #: view:account.bank.statement:0
@@ -932,6 +937,8 @@ msgid ""
 "Check this if you want to group the Journal Items by Product while closing a "
 "Session"
 msgstr ""
+"Bir Oturum kapatırken Ürün tarafından Yevmiye öğeler gruplandırmak "
+"istiyorsanız bu kontrol edin"
 
 #. module: point_of_sale
 #: report:pos.details:0
@@ -942,12 +949,12 @@ msgstr "Toplam ödeme"
 #. module: point_of_sale
 #: model:ir.model,name:point_of_sale.model_pos_session_opening
 msgid "pos.session.opening"
-msgstr ""
+msgstr "pos.session.opening"
 
 #. module: point_of_sale
 #: view:res.users:0
 msgid "Edit EAN"
-msgstr ""
+msgstr "EAN Düzenle"
 
 #. module: point_of_sale
 #: code:addons/point_of_sale/wizard/pos_open_statement.py:80
@@ -990,7 +997,7 @@ msgstr "Kullanıcının Ürünleri"
 #: code:addons/point_of_sale/point_of_sale.py:984
 #, python-format
 msgid "The POS order must have lines when calling this method"
-msgstr ""
+msgstr "Bu yöntemi çağırırken POS sipariş hatları olmalıdır"
 
 #. module: point_of_sale
 #: code:addons/point_of_sale/point_of_sale.py:1143
@@ -1055,7 +1062,7 @@ msgstr "dönen"
 #. module: point_of_sale
 #: view:product.product:0
 msgid "Set a Custom EAN"
-msgstr ""
+msgstr "EAN Özel  Ayarlama"
 
 #. module: point_of_sale
 #. openerp-web
@@ -1067,12 +1074,12 @@ msgstr "Kalan:"
 #. module: point_of_sale
 #: model:pos.category,name:point_of_sale.legumes
 msgid "Fresh vegetables"
-msgstr ""
+msgstr "Taze sebzeler"
 
 #. module: point_of_sale
 #: view:pos.session:0
 msgid "tab of the"
-msgstr ""
+msgstr "sekmesinde"
 
 #. module: point_of_sale
 #. openerp-web
@@ -1096,7 +1103,7 @@ msgstr ""
 #. module: point_of_sale
 #: sql_constraint:pos.session:0
 msgid "The name of this POS Session must be unique !"
-msgstr ""
+msgstr "Bu POS Oturum adı benzersiz olmalıdır!"
 
 #. module: point_of_sale
 #: view:pos.session:0
@@ -1167,7 +1174,7 @@ msgstr "Satış Detayları"
 #. module: point_of_sale
 #: model:product.template,name:point_of_sale.evian_2l_product_template
 msgid "2L Evian"
-msgstr ""
+msgstr "2L Evian"
 
 #. module: point_of_sale
 #: code:addons/point_of_sale/point_of_sale.py:373
@@ -1202,12 +1209,12 @@ msgstr "Toplam satış"
 #: code:addons/point_of_sale/static/src/xml/pos.xml:741
 #, python-format
 msgid "ABC"
-msgstr ""
+msgstr "ABC"
 
 #. module: point_of_sale
 #: model:product.template,name:point_of_sale.ijsboerke_dame_blanche_2,5l_product_template
 msgid "IJsboerke 2.5L White Lady"
-msgstr ""
+msgstr "Copy text \t IJsboerke 2.5L White Lady"
 
 #. module: point_of_sale
 #: field:pos.order,lines:0
@@ -1229,7 +1236,7 @@ msgstr "Chaudfontaine Petillante 50cl"
 #: code:addons/point_of_sale/static/src/xml/pos.xml:485
 #, python-format
 msgid "Read Weighting Scale"
-msgstr ""
+msgstr "Ağırlık Ölçü Okuma"
 
 #. module: point_of_sale
 #. openerp-web
@@ -1289,7 +1296,7 @@ msgstr "Satışlarım"
 #. module: point_of_sale
 #: view:pos.config:0
 msgid "Set to Deprecated"
-msgstr ""
+msgstr "Kaldırılan Ayarlayın"
 
 #. module: point_of_sale
 #: model:product.template,name:point_of_sale.limon_product_template
@@ -1325,6 +1332,8 @@ msgid ""
 "This sequence is automatically created by OpenERP but you can change it to "
 "customize the reference numbers of your orders."
 msgstr ""
+"Bu sıralama otomatik OpenERP tarafından oluşturulur ancak siparişlerin "
+"referans numaraları özelleştirmek için değiştirebilirsiniz."
 
 #. module: point_of_sale
 #. openerp-web
@@ -1341,7 +1350,7 @@ msgstr "Orana göre aylık satışlar"
 #. module: point_of_sale
 #: model:product.template,name:point_of_sale.poivron_jaunes_product_template
 msgid "Yellow Peppers"
-msgstr ""
+msgstr "Sarı Biberler"
 
 #. module: point_of_sale
 #: view:pos.order:0
@@ -1379,7 +1388,7 @@ msgstr "Günün Kapanmış Kasaları"
 #: code:addons/point_of_sale/point_of_sale.py:897
 #, python-format
 msgid "Selected orders do not have the same session!"
-msgstr ""
+msgstr "Seçilen siparişler aynı seansta yok!"
 
 #. module: point_of_sale
 #: report:pos.invoice:0
@@ -1431,7 +1440,7 @@ msgstr "Vergiler :"
 #: code:addons/point_of_sale/static/src/xml/pos.xml:271
 #, python-format
 msgid "Thank you for shopping with us."
-msgstr ""
+msgstr "Bizimle alışveriş ettiğiniz için teşekkür ederiz."
 
 #. module: point_of_sale
 #: model:product.template,name:point_of_sale.coca_light_2l_product_template
@@ -1452,7 +1461,7 @@ msgstr "Ürün Kategorileri"
 #. module: point_of_sale
 #: help:pos.config,journal_id:0
 msgid "Accounting journal used to post sales entries."
-msgstr ""
+msgstr "Muhasebe Yevmiye satış kayıtları göndermek için kullanılır."
 
 #. module: point_of_sale
 #: field:report.transaction.pos,disc:0
@@ -1486,7 +1495,7 @@ msgstr "Coca-Cola Zero 33cl"
 #: code:addons/point_of_sale/static/src/xml/pos.xml:405
 #, python-format
 msgid "&auml;"
-msgstr ""
+msgstr "&auml;"
 
 #. module: point_of_sale
 #: report:pos.invoice:0
@@ -1562,7 +1571,7 @@ msgstr "Kg"
 #. module: point_of_sale
 #: field:product.product,available_in_pos:0
 msgid "Available in the Point of Sale"
-msgstr ""
+msgstr "Satış Noktası Mevcuttur"
 
 #. module: point_of_sale
 #: selection:pos.config,state:0
@@ -1572,14 +1581,14 @@ msgstr "Kaldırılmış"
 #. module: point_of_sale
 #: model:product.template,name:point_of_sale.coca_light_decaf_33cl_product_template
 msgid "Coca-Cola Light 33cl Decaf"
-msgstr ""
+msgstr "Coca-Cola Light 33cl Decaf"
 
 #. module: point_of_sale
 #. openerp-web
 #: code:addons/point_of_sale/static/src/xml/pos.xml:338
 #, python-format
 msgid "The scanned product was not recognized"
-msgstr ""
+msgstr "Taranan ürün tanınmadı"
 
 #. module: point_of_sale
 #: model:ir.model,name:point_of_sale.model_report_transaction_pos
@@ -1605,7 +1614,7 @@ msgstr "Boon Framboise 37.5cl"
 #. module: point_of_sale
 #: model:ir.model,name:point_of_sale.model_pos_config
 msgid "pos.config"
-msgstr ""
+msgstr "pos.config"
 
 #. module: point_of_sale
 #: view:pos.ean_wizard:0
@@ -1617,7 +1626,7 @@ msgstr ""
 #. module: point_of_sale
 #: field:product.product,expense_pdt:0
 msgid "Point of Sale Cash Out"
-msgstr ""
+msgstr "Satış Noktası  Nakit Çıkış"
 
 #. module: point_of_sale
 #: selection:report.pos.order,month:0
@@ -1629,12 +1638,12 @@ msgstr "Kasım"
 #: code:addons/point_of_sale/static/src/xml/pos.xml:267
 #, python-format
 msgid "Please scan an item or your member card"
-msgstr ""
+msgstr "Lütfen bir ürün veya üye kartı tarama"
 
 #. module: point_of_sale
 #: model:product.template,name:point_of_sale.poivron_verts_product_template
 msgid "Green Peppers"
-msgstr ""
+msgstr "Yeşil Biber"
 
 #. module: point_of_sale
 #: model:product.template,name:point_of_sale.timmermans_faro_37,5cl_product_template
@@ -1652,7 +1661,7 @@ msgstr ""
 #. module: point_of_sale
 #: view:pos.session:0
 msgid "Validate Closing & Post Entries"
-msgstr ""
+msgstr "Kapanış ve İşlem Girişler Doğrulama"
 
 #. module: point_of_sale
 #: field:report.transaction.pos,no_trans:0
@@ -1666,6 +1675,8 @@ msgid ""
 "There is no receivable account defined to make payment for the partner: "
 "\"%s\" (id:%d)."
 msgstr ""
+"Partner için ödeme yapmak için tanımlanmış bir alacak hesabı yok: \"% s\" "
+"(id:% d)."
 
 #. module: point_of_sale
 #: view:pos.config:0
@@ -1705,7 +1716,7 @@ msgstr "Satış (Özetleri)"
 #. module: point_of_sale
 #: model:product.template,name:point_of_sale.nectarine_product_template
 msgid "Peach"
-msgstr ""
+msgstr "Şeftali"
 
 #. module: point_of_sale
 #: model:product.template,name:point_of_sale.timmermans_kriek_37,5cl_product_template
@@ -1715,7 +1726,7 @@ msgstr "Timmermans Kriek 37.5cl"
 #. module: point_of_sale
 #: field:pos.config,sequence_id:0
 msgid "Order IDs Sequence"
-msgstr ""
+msgstr "Sipariş ID Sıralaması"
 
 #. module: point_of_sale
 #: report:pos.invoice:0
@@ -1770,7 +1781,7 @@ msgstr "Yazar Kasalar"
 #. module: point_of_sale
 #: help:pos.session,cash_register_balance_end:0
 msgid "Computed with the initial cash control and the sum of all payments."
-msgstr ""
+msgstr "İlk nakit kontrolü ve tüm ödemeler toplamı ile hesaplanmıştır."
 
 #. module: point_of_sale
 #. openerp-web
@@ -1907,7 +1918,7 @@ msgstr ""
 #. module: point_of_sale
 #: model:product.template,name:point_of_sale.ijsboerke_moka_2,5l_product_template
 msgid "IJsboerke Mocha 2.5L"
-msgstr ""
+msgstr "Copy text \t IJsboerke Mocha 2.5L"
 
 #. module: point_of_sale
 #: field:pos.session,cash_control:0
@@ -1934,6 +1945,7 @@ msgid ""
 "Unable to open the session. You have to assign a sale journal to your point "
 "of sale."
 msgstr ""
+"Oturum açılamıyor. Satış noktasına bir satış yevmiyesi atamak zorundasınız."
 
 #. module: point_of_sale
 #: view:report.pos.order:0
@@ -2008,7 +2020,7 @@ msgstr "Satışelamanı"
 #: code:addons/point_of_sale/wizard/pos_box_out.py:91
 #, python-format
 msgid "You have to open at least one cashbox."
-msgstr ""
+msgstr "En az bir kasa açmak zorunda."
 
 #. module: point_of_sale
 #: code:addons/point_of_sale/point_of_sale.py:1142
@@ -2019,14 +2031,14 @@ msgstr "FiyatListesi yok!"
 #. module: point_of_sale
 #: model:product.template,name:point_of_sale.poivron_rouges_product_template
 msgid "Red Pepper"
-msgstr ""
+msgstr "Kırmızı Biber"
 
 #. module: point_of_sale
 #. openerp-web
 #: code:addons/point_of_sale/static/src/xml/pos.xml:677
 #, python-format
 msgid "caps lock"
-msgstr ""
+msgstr "büyük harf kilidi"
 
 #. module: point_of_sale
 #: model:product.template,name:point_of_sale.grisette_cerise_25cl_product_template
@@ -2044,7 +2056,7 @@ msgstr "Matrah"
 #: code:addons/point_of_sale/static/src/xml/pos.xml:742
 #, python-format
 msgid "&nbsp;"
-msgstr ""
+msgstr "&nbsp;"
 
 #. module: point_of_sale
 #: model:pos.category,name:point_of_sale.categ_others
@@ -2054,7 +2066,7 @@ msgstr "Diğerleri"
 #. module: point_of_sale
 #: model:pos.category,name:point_of_sale.autres_legumes_frais
 msgid "Other fresh vegetables"
-msgstr ""
+msgstr "Diğer taze sebze"
 
 #. module: point_of_sale
 #: code:addons/point_of_sale/wizard/pos_open_statement.py:49
@@ -2068,11 +2080,13 @@ msgstr "Hiç Nakit Kasası Tanımlanmamış!"
 msgid ""
 "No cash statement found for this session. Unable to record returned cash."
 msgstr ""
+"Bu oturum için nakit açıklamada bulunamadı. Geri nakit kaydetmek için "
+"açılamıyor."
 
 #. module: point_of_sale
 #: model:pos.category,name:point_of_sale.oignons_ail_echalotes
 msgid "Onions / Garlic / Shallots"
-msgstr ""
+msgstr "Soğan / Sarımsak / Arpacık"
 
 #. module: point_of_sale
 #: model:product.template,name:point_of_sale.evian_50cl_product_template
@@ -2108,7 +2122,7 @@ msgstr "Satış Satırı"
 #: code:addons/point_of_sale/static/src/xml/pos.xml:741
 #, python-format
 msgid "123"
-msgstr ""
+msgstr "123"
 
 #. module: point_of_sale
 #: model:ir.actions.act_window,name:point_of_sale.product_normal_action
@@ -2126,7 +2140,7 @@ msgstr "Dr. Oetker Ristorante Quattro Formaggi"
 #. module: point_of_sale
 #: model:product.template,name:point_of_sale.croky_naturel_45g_product_template
 msgid "Croky Natural 45g"
-msgstr ""
+msgstr "Croky Natural 45g"
 
 #. module: point_of_sale
 #: model:product.template,name:point_of_sale.tomate_en_grappe_product_template
@@ -2136,7 +2150,7 @@ msgstr ""
 #. module: point_of_sale
 #: model:ir.actions.client,name:point_of_sale.action_pos_pos
 msgid "Start Point of Sale"
-msgstr ""
+msgstr "Satış Noktası Başlat"
 
 #. module: point_of_sale
 #. openerp-web
@@ -2165,19 +2179,19 @@ msgstr "Sipariş Tarihi"
 #. module: point_of_sale
 #: view:pos.order:0
 msgid "Point of Sale Orders"
-msgstr ""
+msgstr "Satış Noktası Siparişi"
 
 #. module: point_of_sale
 #: model:product.template,name:point_of_sale.spa_et_fruit_50cl_product_template
 msgid "Spa Fruit and Orange 50cl"
-msgstr ""
+msgstr "Spa Meyve ve Turuncu 50 cl"
 
 #. module: point_of_sale
 #: view:pos.config:0
 #: field:pos.config,journal_ids:0
 #: field:pos.session,journal_ids:0
 msgid "Available Payment Methods"
-msgstr ""
+msgstr "Ödeme Yöntemleri"
 
 #. module: point_of_sale
 #: model:ir.actions.act_window,help:point_of_sale.product_normal_action
@@ -2229,7 +2243,7 @@ msgstr "Kaynak"
 #: code:addons/point_of_sale/static/src/xml/pos.xml:461
 #, python-format
 msgid "Admin Badge"
-msgstr ""
+msgstr "Yönetici Rozet"
 
 #. module: point_of_sale
 #: field:pos.make.payment,journal_id:0
@@ -2282,7 +2296,7 @@ msgstr "Su"
 #. module: point_of_sale
 #: model:ir.model,name:point_of_sale.model_pos_ean_wizard
 msgid "pos.ean_wizard"
-msgstr ""
+msgstr "pos.ean_wizard"
 
 #. module: point_of_sale
 #: selection:report.pos.order,month:0
@@ -2305,7 +2319,7 @@ msgstr "Ürün Mik."
 #. module: point_of_sale
 #: model:product.template,name:point_of_sale.pomme_golden_perlim_product_template
 msgid "Golden Apples Perlim"
-msgstr ""
+msgstr "Altın Elma"
 
 #. module: point_of_sale
 #: code:addons/point_of_sale/point_of_sale.py:100
@@ -2347,7 +2361,7 @@ msgstr "Bilinmeyen Ürün"
 #: code:addons/point_of_sale/static/src/xml/pos.xml:36
 #, python-format
 msgid "<![endif]-->"
-msgstr ""
+msgstr "<![endif]-->"
 
 #. module: point_of_sale
 #: model:product.template,name:point_of_sale.jupiler_50cl_product_template
@@ -2370,7 +2384,7 @@ msgstr "Coca-Cola Light Lemon 33cl"
 #: code:addons/point_of_sale/static/src/xml/pos.xml:33
 #, python-format
 msgid "<!--[if IE]>"
-msgstr ""
+msgstr "<!--[if IE]>"
 
 #. module: point_of_sale
 #: model:product.template,name:point_of_sale.lays_ketchup_250g_product_template
@@ -2385,7 +2399,7 @@ msgstr "Senkronize edildi"
 #. module: point_of_sale
 #: model:product.template,name:point_of_sale.chimay_rouge_33cl_product_template
 msgid "Chimay Red 33cl"
-msgstr ""
+msgstr "Chimay Kırmızı 33 cl"
 
 #. module: point_of_sale
 #: view:report.pos.order:0
@@ -2396,12 +2410,12 @@ msgstr "Ay"
 #. module: point_of_sale
 #: field:pos.category,image_medium:0
 msgid "Medium-sized image"
-msgstr ""
+msgstr "Orta ölçekli resim"
 
 #. module: point_of_sale
 #: model:product.template,name:point_of_sale.papillon_orange_product_template
 msgid "Orange Butterfly"
-msgstr ""
+msgstr "Turuncu Kelebek"
 
 #. module: point_of_sale
 #: view:report.pos.order:0
@@ -2447,7 +2461,7 @@ msgstr "Kasa Aç"
 #. module: point_of_sale
 #: model:pos.category,name:point_of_sale.poire
 msgid "Pears"
-msgstr ""
+msgstr "Armut"
 
 #. module: point_of_sale
 #: field:report.transaction.pos,journal_id:0
@@ -2468,12 +2482,12 @@ msgstr "Kapatıldı"
 #. module: point_of_sale
 #: field:pos.config,iface_cashdrawer:0
 msgid "Cashdrawer Interface"
-msgstr ""
+msgstr "Nakit Çekmece Arayüzü"
 
 #. module: point_of_sale
 #: model:pos.category,name:point_of_sale.tomates
 msgid "Tomatos"
-msgstr ""
+msgstr "Domates"
 
 #. module: point_of_sale
 #: view:report.pos.order:0
@@ -2488,7 +2502,7 @@ msgstr "Coca-Cola Zero 2L"
 #. module: point_of_sale
 #: model:pos.category,name:point_of_sale.oranges
 msgid "Oranges"
-msgstr ""
+msgstr "Portakal"
 
 #. module: point_of_sale
 #: model:ir.actions.act_window,name:point_of_sale.action_pos_all_sales_lines
@@ -2531,7 +2545,7 @@ msgstr "Ödeme Yöntemleri Özet"
 #: code:addons/point_of_sale/static/src/xml/pos.xml:470
 #, python-format
 msgid "Hardware Status"
-msgstr ""
+msgstr "Donanım Durum"
 
 #. module: point_of_sale
 #. openerp-web
@@ -2549,14 +2563,14 @@ msgstr "Toplam:"
 #. module: point_of_sale
 #: field:res.users,ean13:0
 msgid "EAN13"
-msgstr ""
+msgstr "EAN13"
 
 #. module: point_of_sale
 #. openerp-web
 #: code:addons/point_of_sale/static/src/xml/pos.xml:573
 #, python-format
 msgid "% discount"
-msgstr ""
+msgstr "% indirim"
 
 #. module: point_of_sale
 #: model:ir.model,name:point_of_sale.model_report_sales_by_margin_pos
@@ -2581,7 +2595,7 @@ msgstr "Yeni baskı"
 #. module: point_of_sale
 #: field:pos.config,iface_payment_terminal:0
 msgid "Payment Terminal Interface"
-msgstr ""
+msgstr "Ödeme Terminal Arayüzü"
 
 #. module: point_of_sale
 #. openerp-web
@@ -2603,7 +2617,7 @@ msgstr "AltToplam"
 #. module: point_of_sale
 #: model:product.template,name:point_of_sale.carotte_product_template
 msgid "Carrots"
-msgstr ""
+msgstr "Havuç"
 
 #. module: point_of_sale
 #: view:pos.open.statement:0
@@ -2637,7 +2651,7 @@ msgstr "Fatura"
 #: code:addons/point_of_sale/static/src/xml/pos.xml:701
 #, python-format
 msgid "shift"
-msgstr ""
+msgstr "değiştirme"
 
 #. module: point_of_sale
 #: model:product.template,name:point_of_sale.rochefort_8_33cl_product_template
@@ -2662,12 +2676,12 @@ msgstr "Sipariş Ref."
 #: code:addons/point_of_sale/static/src/xml/pos.xml:572
 #, python-format
 msgid "With a"
-msgstr ""
+msgstr "bir ile"
 
 #. module: point_of_sale
 #: model:product.template,name:point_of_sale.courgette_product_template
 msgid "Zucchini"
-msgstr ""
+msgstr "Kabak"
 
 #. module: point_of_sale
 #: model:product.template,name:point_of_sale.timmermans_geuze_37,5cl_product_template
@@ -2695,21 +2709,21 @@ msgstr "Sorumlu"
 #. module: point_of_sale
 #: model:product.template,name:point_of_sale.croky_bolognaise_250g_product_template
 msgid "Croky Bolognese 250g"
-msgstr ""
+msgstr "Croky Bolognese 250g"
 
 #. module: point_of_sale
 #. openerp-web
 #: code:addons/point_of_sale/static/src/xml/pos.xml:460
 #, python-format
 msgid "Custom Ean13"
-msgstr ""
+msgstr "Özel EAN13"
 
 #. module: point_of_sale
 #. openerp-web
 #: code:addons/point_of_sale/static/src/xml/pos.xml:465
 #, python-format
 msgid "1.54€ Lemon"
-msgstr ""
+msgstr "1.54 € Limon"
 
 #. module: point_of_sale
 #: field:pos.make.payment,payment_name:0
@@ -2775,12 +2789,12 @@ msgstr "Dr. Oetker Ristorante Pollo"
 #: constraint:pos.session:0
 msgid ""
 "You cannot create two active sessions related to the same point of sale!"
-msgstr ""
+msgstr "Bu satış noktaya aynı  iki etkin oturum oluşturamazsınız!"
 
 #. module: point_of_sale
 #: field:pos.category,image_small:0
 msgid "Smal-sized image"
-msgstr ""
+msgstr "Küçük boy resim"
 
 #. module: point_of_sale
 #: model:ir.actions.report.xml,name:point_of_sale.pos_lines_report
@@ -2798,7 +2812,7 @@ msgstr "Satış Noktası Karı"
 #: code:addons/point_of_sale/static/src/xml/pos.xml:338
 #, python-format
 msgid "Please wait, a cashier is on the way"
-msgstr ""
+msgstr "Lütfen bekleyin, bir kasiyer yolda"
 
 #. module: point_of_sale
 #: code:addons/point_of_sale/wizard/pos_session_opening.py:68
@@ -2851,7 +2865,7 @@ msgstr "Patates"
 #. module: point_of_sale
 #: view:pos.session.opening:0
 msgid "\"."
-msgstr ""
+msgstr "\"."
 
 #. module: point_of_sale
 #: model:ir.actions.act_window,name:point_of_sale.action_report_pos_payment_report_user
@@ -2874,7 +2888,7 @@ msgstr "Pepsi 2L"
 #. module: point_of_sale
 #: model:pos.category,name:point_of_sale.pomme
 msgid "Apples"
-msgstr ""
+msgstr "Elmalar"
 
 #. module: point_of_sale
 #: report:pos.details:0
@@ -2897,7 +2911,7 @@ msgstr "POS Detayları"
 #: code:addons/point_of_sale/static/src/xml/pos.xml:462
 #, python-format
 msgid "Client Badge"
-msgstr ""
+msgstr "Müşteri Rozet"
 
 #. module: point_of_sale
 #: report:pos.lines:0
@@ -2947,24 +2961,24 @@ msgstr "Nakit Kasa Aç"
 #. module: point_of_sale
 #: field:account.journal,amount_authorized_diff:0
 msgid "Amount Authorized Difference"
-msgstr ""
+msgstr "Miktar Fark Yetkili"
 
 #. module: point_of_sale
 #. openerp-web
 #: code:addons/point_of_sale/static/src/xml/pos.xml:311
 #, python-format
 msgid "Please be patient, help is on the way"
-msgstr ""
+msgstr "Lütfen sabırlı olun, yardım yolda"
 
 #. module: point_of_sale
 #: model:ir.model,name:point_of_sale.model_pos_session
 msgid "pos.session"
-msgstr ""
+msgstr "pos.session"
 
 #. module: point_of_sale
 #: help:pos.session,config_id:0
 msgid "The physical point of sale you will use."
-msgstr ""
+msgstr "Satış nokta fiziksel kullanır."
 
 #. module: point_of_sale
 #: view:pos.order:0
diff --git a/addons/report_webkit/i18n/tr.po b/addons/report_webkit/i18n/tr.po
index aa340410493..95c220a9fd4 100644
--- a/addons/report_webkit/i18n/tr.po
+++ b/addons/report_webkit/i18n/tr.po
@@ -8,40 +8,40 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2013-03-07 08:38+0000\n"
-"PO-Revision-Date: 2012-12-21 23:00+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"PO-Revision-Date: 2013-04-19 10:49+0000\n"
+"Last-Translator: Ediz Duman <neps1192@gmail.com>\n"
 "Language-Team: Turkish <tr@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: 2013-03-28 05:59+0000\n"
-"X-Generator: Launchpad (build 16546)\n"
+"X-Launchpad-Export-Date: 2013-04-20 06:48+0000\n"
+"X-Generator: Launchpad (build 16567)\n"
 
 #. module: report_webkit
 #: view:ir.actions.report.xml:0
 msgid "Webkit Template (used if Report File is not found)"
-msgstr ""
+msgstr "Webkit Şablon (Rapor Dosya bulunamazsa, kullanılır)"
 
 #. module: report_webkit
 #: selection:ir.header_webkit,format:0
 msgid "Tabloid 29 279.4 x 431.8 mm"
-msgstr ""
+msgstr "Tabloid 29 279.4 x 431.8 mm"
 
 #. module: report_webkit
 #: selection:ir.header_webkit,format:0
 msgid "Ledger  28  431.8 x 279.4 mm"
-msgstr ""
+msgstr "Ledger 28 431.8 x 279.4 mm"
 
 #. module: report_webkit
 #: code:addons/report_webkit/webkit_report.py:233
 #, python-format
 msgid "No header defined for this Webkit report!"
-msgstr ""
+msgstr "Böyle bir başlık Bu Webkit rapor için tanımlı!"
 
 #. module: report_webkit
 #: help:ir.header_img,type:0
 msgid "Image type(png,gif,jpeg)"
-msgstr ""
+msgstr "Görüntü tipi (png, gif, jpeg)"
 
 #. module: report_webkit
 #: help:ir.actions.report.xml,precise_mode:0
@@ -51,11 +51,13 @@ msgid ""
 "                                                         but memory and disk "
 "usage is wider"
 msgstr ""
+"Her nesne ayrı bir HTML yazdırılır  bu gibi mod daha hassas elemanı "
+"pozisyonu sağlar. ama bellek ve disk kullanımı daha geniş"
 
 #. module: report_webkit
 #: selection:ir.header_webkit,format:0
 msgid "Executive 4   7.5 x 10 inches, 190.5 x 254 mm"
-msgstr ""
+msgstr "Executive 4 7.5 x 10 inç, 190.5 x 254 mm"
 
 #. module: report_webkit
 #: field:ir.header_img,company_id:0
@@ -67,12 +69,12 @@ msgstr "Şirket"
 #: code:addons/report_webkit/webkit_report.py:234
 #, python-format
 msgid "Please set a header in company settings."
-msgstr ""
+msgstr "Şirket ayarlarında bir başlık ayarlayın."
 
 #. module: report_webkit
 #: selection:ir.header_webkit,format:0
 msgid "DLE 26 110 x 220 mm"
-msgstr ""
+msgstr "DLE 26 110 x 220 mm"
 
 #. module: report_webkit
 #: selection:ir.header_webkit,format:0
@@ -82,44 +84,44 @@ msgstr ""
 #. module: report_webkit
 #: view:res.company:0
 msgid "Headers"
-msgstr ""
+msgstr "Başlıklar"
 
 #. module: report_webkit
 #: help:ir.header_img,name:0
 msgid "Name of Image"
-msgstr ""
+msgstr "Resim Adı"
 
 #. module: report_webkit
 #: model:ir.actions.act_window,name:report_webkit.action_header_webkit
 #: model:ir.ui.menu,name:report_webkit.menu_header_webkit
 msgid "Webkit Headers/Footers"
-msgstr ""
+msgstr "Webkit Üstbilgi / altbilgi"
 
 #. module: report_webkit
 #: selection:ir.header_webkit,format:0
 msgid "Legal    3   8.5 x 14 inches, 215.9 x 355.6 mm"
-msgstr ""
+msgstr "Legal 3 8.5 x 14 inches, 215.9 x 355.6 mm"
 
 #. module: report_webkit
 #: model:ir.model,name:report_webkit.model_ir_header_webkit
 msgid "ir.header_webkit"
-msgstr ""
+msgstr "ir.header_webkit"
 
 #. module: report_webkit
 #: selection:ir.header_webkit,format:0
 msgid "A4  0   210 x 297 mm, 8.26 x 11.69 inches"
-msgstr ""
+msgstr "Copy text \t A4 0 210 x 297 mm, 8.26 x 11.69 inches"
 
 #. module: report_webkit
 #: code:addons/report_webkit/webkit_report.py:176
 #, python-format
 msgid "Webkit error"
-msgstr ""
+msgstr "webkit hata"
 
 #. module: report_webkit
 #: selection:ir.header_webkit,format:0
 msgid "B2  17  500 x 707 mm"
-msgstr ""
+msgstr "B2 17 500 x 707 mm"
 
 #. module: report_webkit
 #: code:addons/report_webkit/webkit_report.py:260
@@ -129,7 +131,7 @@ msgstr ""
 #: code:addons/report_webkit/webkit_report.py:304
 #, python-format
 msgid "Webkit render!"
-msgstr ""
+msgstr "Webkit render!"
 
 #. module: report_webkit
 #: model:ir.model,name:report_webkit.model_ir_header_img
diff --git a/addons/web/i18n/fr_CA.po b/addons/web/i18n/fr_CA.po
index 4eb1620d264..2947c899185 100644
--- a/addons/web/i18n/fr_CA.po
+++ b/addons/web/i18n/fr_CA.po
@@ -8,14 +8,15 @@ msgstr ""
 "Project-Id-Version: openerp-web\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2013-03-07 08:39+0000\n"
-"PO-Revision-Date: 2012-12-21 23:00+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"PO-Revision-Date: 2013-04-20 20:32+0000\n"
+"Last-Translator: Maxime Chambreuil (http://www.savoirfairelinux.com) "
+"<maxime.chambreuil@savoirfairelinux.com>\n"
 "Language-Team: French (Canada) <fr_CA@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: 2013-03-29 05:10+0000\n"
-"X-Generator: Launchpad (build 16546)\n"
+"X-Launchpad-Export-Date: 2013-04-21 05:32+0000\n"
+"X-Generator: Launchpad (build 16567)\n"
 
 #. module: web
 #. openerp-web
@@ -291,7 +292,7 @@ msgstr ""
 #: code:addons/web/static/src/js/view_form.js:4908
 #, python-format
 msgid "File Upload"
-msgstr ""
+msgstr "Téléversement de fichier"
 
 #. module: web
 #. openerp-web
@@ -319,7 +320,7 @@ msgstr ""
 #: code:addons/web/static/src/xml/base.xml:422
 #, python-format
 msgid "OpenERP SA Company"
-msgstr ""
+msgstr "la compagnie OpenERP SA"
 
 #. module: web
 #. openerp-web
@@ -411,7 +412,7 @@ msgstr ""
 #: code:addons/web/static/src/xml/base.xml:1279
 #, python-format
 msgid "...Upload in progress..."
-msgstr ""
+msgstr "…Téléversement en cours…"
 
 #. module: web
 #. openerp-web
@@ -432,7 +433,7 @@ msgstr ""
 #: code:addons/web/static/src/js/view_form.js:4888
 #, python-format
 msgid "File upload"
-msgstr ""
+msgstr "Téléversement de fichier"
 
 #. module: web
 #. openerp-web
@@ -587,7 +588,7 @@ msgstr ""
 #: code:addons/web/static/src/xml/base.xml:553
 #, python-format
 msgid "Print Workflow"
-msgstr ""
+msgstr "Imprimer le flux de travail"
 
 #. module: web
 #. openerp-web
@@ -875,6 +876,7 @@ msgstr ""
 #, python-format
 msgid "Can't send email to invalid e-mail address"
 msgstr ""
+"Impossible d'envoyer un courriel à une adresse electronique incorrecte"
 
 #. module: web
 #. openerp-web
@@ -1363,7 +1365,7 @@ msgstr ""
 #: code:addons/web/static/src/xml/base.xml:444
 #, python-format
 msgid "Edit Company data"
-msgstr ""
+msgstr "Modifier les données de la compagnie"
 
 #. module: web
 #. openerp-web
@@ -1629,7 +1631,7 @@ msgstr ""
 #: code:addons/web/static/src/js/view_form.js:4908
 #, python-format
 msgid "There was a problem while uploading your file"
-msgstr ""
+msgstr "Il y a eu un problème lors du téléversement du fichier"
 
 #. module: web
 #. openerp-web
@@ -1883,7 +1885,7 @@ msgstr ""
 #: code:addons/web/static/src/xml/base.xml:1249
 #, python-format
 msgid "Uploading ..."
-msgstr ""
+msgstr "Téléversement…"
 
 #. module: web
 #. openerp-web
@@ -2079,7 +2081,7 @@ msgstr ""
 #: code:addons/web/static/src/js/views.js:1217
 #, python-format
 msgid "Uploading..."
-msgstr ""
+msgstr "Téléversement en cours..."
 
 #. module: web
 #. openerp-web
@@ -2463,7 +2465,7 @@ msgstr ""
 #: code:addons/web/static/src/xml/base.xml:552
 #, python-format
 msgid "Edit Workflow"
-msgstr ""
+msgstr "Modifier le flux de travail"
 
 #. module: web
 #. openerp-web
diff --git a/addons/web_graph/i18n/fr_CA.po b/addons/web_graph/i18n/fr_CA.po
new file mode 100644
index 00000000000..2d9b1123b76
--- /dev/null
+++ b/addons/web_graph/i18n/fr_CA.po
@@ -0,0 +1,138 @@
+# French (Canada) translation for openerp-web
+# Copyright (c) 2013 Rosetta Contributors and Canonical Ltd 2013
+# This file is distributed under the same license as the openerp-web package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2013.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openerp-web\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2013-03-07 08:39+0000\n"
+"PO-Revision-Date: 2013-04-20 20:40+0000\n"
+"Last-Translator: Maxime Chambreuil (http://www.savoirfairelinux.com) "
+"<maxime.chambreuil@savoirfairelinux.com>\n"
+"Language-Team: French (Canada) <fr_CA@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: 2013-04-21 05:32+0000\n"
+"X-Generator: Launchpad (build 16567)\n"
+
+#. module: web_graph
+#. openerp-web
+#: code:addons/web_graph/static/src/xml/web_graph.xml:12
+#, python-format
+msgid "Bars"
+msgstr ""
+
+#. module: web_graph
+#. openerp-web
+#: code:addons/web_graph/static/src/xml/web_graph.xml:33
+#, python-format
+msgid "Show Data"
+msgstr ""
+
+#. module: web_graph
+#. openerp-web
+#: code:addons/web_graph/static/src/js/graph.js:22
+#, python-format
+msgid "Graph"
+msgstr ""
+
+#. module: web_graph
+#. openerp-web
+#: code:addons/web_graph/static/src/xml/web_graph.xml:25
+#, python-format
+msgid "Inside"
+msgstr ""
+
+#. module: web_graph
+#. openerp-web
+#: code:addons/web_graph/static/src/xml/web_graph.xml:3
+#, python-format
+msgid "&iacute;"
+msgstr ""
+
+#. module: web_graph
+#. openerp-web
+#: code:addons/web_graph/static/src/xml/web_graph.xml:11
+#, python-format
+msgid "Pie"
+msgstr "Tarte"
+
+#. module: web_graph
+#. openerp-web
+#: code:addons/web_graph/static/src/xml/web_graph.xml:28
+#, python-format
+msgid "Actions"
+msgstr ""
+
+#. module: web_graph
+#. openerp-web
+#: code:addons/web_graph/static/src/xml/web_graph.xml:7
+#, python-format
+msgid "Graph Mode"
+msgstr ""
+
+#. module: web_graph
+#. openerp-web
+#: code:addons/web_graph/static/src/xml/web_graph.xml:18
+#, python-format
+msgid "Radar"
+msgstr ""
+
+#. module: web_graph
+#. openerp-web
+#: code:addons/web_graph/static/src/xml/web_graph.xml:34
+#, python-format
+msgid "Download as PNG"
+msgstr ""
+
+#. module: web_graph
+#. openerp-web
+#: code:addons/web_graph/static/src/xml/web_graph.xml:26
+#, python-format
+msgid "Top"
+msgstr ""
+
+#. module: web_graph
+#. openerp-web
+#: code:addons/web_graph/static/src/xml/web_graph.xml:24
+#, python-format
+msgid "Hidden"
+msgstr ""
+
+#. module: web_graph
+#. openerp-web
+#: code:addons/web_graph/static/src/xml/web_graph.xml:3
+#, python-format
+msgid "Graph Options"
+msgstr ""
+
+#. module: web_graph
+#. openerp-web
+#: code:addons/web_graph/static/src/xml/web_graph.xml:14
+#, python-format
+msgid "Lines"
+msgstr ""
+
+#. module: web_graph
+#. openerp-web
+#: code:addons/web_graph/static/src/xml/web_graph.xml:20
+#, python-format
+msgid "Legend"
+msgstr ""
+
+#. module: web_graph
+#. openerp-web
+#: code:addons/web_graph/static/src/xml/web_graph.xml:32
+#, python-format
+msgid "Switch Axis"
+msgstr ""
+
+#. module: web_graph
+#. openerp-web
+#: code:addons/web_graph/static/src/xml/web_graph.xml:15
+#, python-format
+msgid "Areas"
+msgstr ""
diff --git a/addons/web_kanban/i18n/fr_CA.po b/addons/web_kanban/i18n/fr_CA.po
new file mode 100644
index 00000000000..e12110d293f
--- /dev/null
+++ b/addons/web_kanban/i18n/fr_CA.po
@@ -0,0 +1,161 @@
+# French (Canada) translation for openerp-web
+# Copyright (c) 2013 Rosetta Contributors and Canonical Ltd 2013
+# This file is distributed under the same license as the openerp-web package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2013.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openerp-web\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2013-03-07 08:39+0000\n"
+"PO-Revision-Date: 2013-04-20 20:41+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: French (Canada) <fr_CA@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: 2013-04-21 05:32+0000\n"
+"X-Generator: Launchpad (build 16567)\n"
+
+#. module: web_kanban
+#. openerp-web
+#: code:addons/web_kanban/static/src/js/kanban.js:686
+#, python-format
+msgid "Edit column"
+msgstr ""
+
+#. module: web_kanban
+#. openerp-web
+#: code:addons/web_kanban/static/src/xml/web_kanban.xml:80
+#, python-format
+msgid "Show more... ("
+msgstr ""
+
+#. module: web_kanban
+#. openerp-web
+#: code:addons/web_kanban/static/src/js/kanban.js:10
+#, python-format
+msgid "Kanban"
+msgstr ""
+
+#. module: web_kanban
+#. openerp-web
+#: code:addons/web_kanban/static/src/js/kanban.js:539
+#, python-format
+msgid "Undefined"
+msgstr ""
+
+#. module: web_kanban
+#. openerp-web
+#: code:addons/web_kanban/static/src/js/kanban.js:705
+#, python-format
+msgid "Are you sure to remove this column ?"
+msgstr ""
+
+#. module: web_kanban
+#. openerp-web
+#: code:addons/web_kanban/static/src/xml/web_kanban.xml:47
+#, python-format
+msgid "Edit"
+msgstr ""
+
+#. module: web_kanban
+#. openerp-web
+#: code:addons/web_kanban/static/src/js/kanban.js:192
+#, python-format
+msgid "Add column"
+msgstr ""
+
+#. module: web_kanban
+#. openerp-web
+#: code:addons/web_kanban/static/src/js/kanban.js:1082
+#, python-format
+msgid "Create: "
+msgstr ""
+
+#. module: web_kanban
+#. openerp-web
+#: code:addons/web_kanban/static/src/xml/web_kanban.xml:24
+#, python-format
+msgid "Add a new column"
+msgstr ""
+
+#. module: web_kanban
+#. openerp-web
+#: code:addons/web_kanban/static/src/js/kanban.js:677
+#: code:addons/web_kanban/static/src/xml/web_kanban.xml:45
+#, python-format
+msgid "Fold"
+msgstr ""
+
+#. module: web_kanban
+#. openerp-web
+#: code:addons/web_kanban/static/src/xml/web_kanban.xml:98
+#, python-format
+msgid "Add"
+msgstr ""
+
+#. module: web_kanban
+#. openerp-web
+#: code:addons/web_kanban/static/src/xml/web_kanban.xml:35
+#, python-format
+msgid "Quick create"
+msgstr ""
+
+#. module: web_kanban
+#. openerp-web
+#: code:addons/web_kanban/static/src/js/kanban.js:918
+#, python-format
+msgid "Are you sure you want to delete this record ?"
+msgstr ""
+
+#. module: web_kanban
+#. openerp-web
+#: code:addons/web_kanban/static/src/js/kanban.js:677
+#, python-format
+msgid "Unfold"
+msgstr ""
+
+#. module: web_kanban
+#. openerp-web
+#: code:addons/web_kanban/static/src/xml/web_kanban.xml:99
+#, python-format
+msgid "Cancel"
+msgstr ""
+
+#. module: web_kanban
+#. openerp-web
+#: code:addons/web_kanban/static/src/xml/web_kanban.xml:80
+#, python-format
+msgid "remaining)"
+msgstr ""
+
+#. module: web_kanban
+#. openerp-web
+#: code:addons/web_kanban/static/src/js/kanban.js:421
+#, python-format
+msgid "An error has occured while moving the record to this group: "
+msgstr ""
+
+#. module: web_kanban
+#. openerp-web
+#: code:addons/web_kanban/static/src/xml/web_kanban.xml:22
+#: code:addons/web_kanban/static/src/xml/web_kanban.xml:98
+#, python-format
+msgid "or"
+msgstr ""
+
+#. module: web_kanban
+#. openerp-web
+#: code:addons/web_kanban/static/src/xml/web_kanban.xml:40
+#: code:addons/web_kanban/static/src/xml/web_kanban.xml:55
+#, python-format
+msgid "99+"
+msgstr ""
+
+#. module: web_kanban
+#. openerp-web
+#: code:addons/web_kanban/static/src/xml/web_kanban.xml:48
+#, python-format
+msgid "Delete"
+msgstr ""
diff --git a/openerp/addons/base/i18n/fr_CA.po b/openerp/addons/base/i18n/fr_CA.po
new file mode 100644
index 00000000000..264a975dd5a
--- /dev/null
+++ b/openerp/addons/base/i18n/fr_CA.po
@@ -0,0 +1,15423 @@
+# French (Canada) translation for openobject-server
+# Copyright (c) 2013 Rosetta Contributors and Canonical Ltd 2013
+# This file is distributed under the same license as the openobject-server package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2013.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-server\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2013-03-07 08:36+0000\n"
+"PO-Revision-Date: 2013-04-20 19:52+0000\n"
+"Last-Translator: Maxime Chambreuil (http://www.savoirfairelinux.com) "
+"<maxime.chambreuil@savoirfairelinux.com>\n"
+"Language-Team: French (Canada) <fr_CA@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: 2013-04-21 05:32+0000\n"
+"X-Generator: Launchpad (build 16567)\n"
+
+#. module: base
+#: model:ir.module.module,description:base.module_account_check_writing
+msgid ""
+"\n"
+"Module for the Check Writing and Check Printing.\n"
+"================================================\n"
+"    "
+msgstr ""
+
+#. module: base
+#: view:res.partner.bank:0
+msgid "e.g. GEBABEBB"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.sh
+msgid "Saint Helena"
+msgstr ""
+
+#. module: base
+#: view:ir.actions.report.xml:0
+msgid "Other Configuration"
+msgstr ""
+
+#. module: base
+#: selection:ir.property,type:0
+msgid "DateTime"
+msgstr ""
+
+#. module: base
+#: code:addons/fields.py:652
+#, python-format
+msgid ""
+"The second argument of the many2many field %s must be a SQL table !You used "
+"%s, which is not a valid SQL table name."
+msgstr ""
+
+#. module: base
+#: field:ir.ui.view,arch:0
+#: field:ir.ui.view.custom,arch:0
+msgid "View Architecture"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,summary:base.module_sale_stock
+msgid "Quotation, Sale Orders, Delivery & Invoicing Control"
+msgstr "Soumissions, commandes, livraisons et contrôle des factures."
+
+#. module: base
+#: selection:ir.sequence,implementation:0
+msgid "No gap"
+msgstr ""
+
+#. module: base
+#: selection:base.language.install,lang:0
+msgid "Hungarian / Magyar"
+msgstr ""
+
+#. module: base
+#: selection:base.language.install,lang:0
+msgid "Spanish (PY) / Español (PY)"
+msgstr ""
+
+#. module: base
+#: model:ir.module.category,description:base.module_category_project_management
+msgid ""
+"Helps you manage your projects and tasks by tracking them, generating "
+"plannings, etc..."
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,summary:base.module_point_of_sale
+msgid "Touchscreen Interface for Shops"
+msgstr "Interface tactile pour magasins"
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_l10n_in_hr_payroll
+msgid "Indian Payroll"
+msgstr ""
+
+#. module: base
+#: help:ir.cron,model:0
+msgid ""
+"Model name on which the method to be called is located, e.g. 'res.partner'."
+msgstr ""
+
+#. module: base
+#: view:ir.module.module:0
+msgid "Created Views"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_product_manufacturer
+msgid ""
+"\n"
+"A module that adds manufacturers and attributes on the product form.\n"
+"====================================================================\n"
+"\n"
+"You can now define the following for a product:\n"
+"-----------------------------------------------\n"
+"    * Manufacturer\n"
+"    * Manufacturer Product Name\n"
+"    * Manufacturer Product Code\n"
+"    * Product Attributes\n"
+"    "
+msgstr ""
+
+#. module: base
+#: field:ir.actions.client,params:0
+msgid "Supplementary arguments"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_google_base_account
+msgid ""
+"\n"
+"The module adds google user in res user.\n"
+"========================================\n"
+msgstr ""
+
+#. module: base
+#: help:res.partner,employee:0
+msgid "Check this box if this contact is an Employee."
+msgstr ""
+
+#. module: base
+#: help:ir.model.fields,domain:0
+msgid ""
+"The optional domain to restrict possible values for relationship fields, "
+"specified as a Python expression defining a list of triplets. For example: "
+"[('color','=','red')]"
+msgstr ""
+
+#. module: base
+#: field:res.partner,ref:0
+msgid "Reference"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_l10n_be_invoice_bba
+msgid "Belgium - Structured Communication"
+msgstr ""
+
+#. module: base
+#: field:ir.actions.act_window,target:0
+msgid "Target Window"
+msgstr ""
+
+#. module: base
+#: field:ir.actions.report.xml,report_rml:0
+msgid "Main Report File Path"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_sale_analytic_plans
+msgid "Sales Analytic Distribution"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_hr_timesheet_invoice
+msgid ""
+"\n"
+"Generate your Invoices from Expenses, Timesheet Entries.\n"
+"========================================================\n"
+"\n"
+"Module to generate invoices based on costs (human resources, expenses, "
+"...).\n"
+"\n"
+"You can define price lists in analytic account, make some theoretical "
+"revenue\n"
+"reports."
+msgstr ""
+
+#. module: base
+#: code:addons/base/ir/ir_sequence.py:104
+#: code:addons/base/ir/ir_sequence.py:130
+#: code:addons/base/res/res_users.py:473
+#, python-format
+msgid "Warning!"
+msgstr ""
+
+#. module: base
+#: code:addons/base/ir/ir_model.py:406
+#, python-format
+msgid ""
+"Properties of base fields cannot be altered in this manner! Please modify "
+"them through Python code, preferably through a custom addon!"
+msgstr ""
+
+#. module: base
+#: code:addons/osv.py:151
+#, python-format
+msgid "Constraint Error"
+msgstr ""
+
+#. module: base
+#: model:ir.model,name:base.model_ir_ui_view_custom
+msgid "ir.ui.view.custom"
+msgstr ""
+
+#. module: base
+#: code:addons/base/ir/ir_model.py:375
+#, python-format
+msgid "Renaming sparse field \"%s\" is not allowed"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.sz
+msgid "Swaziland"
+msgstr ""
+
+#. module: base
+#: code:addons/orm.py:4486
+#, python-format
+msgid "created."
+msgstr ""
+
+#. module: base
+#: field:ir.actions.report.xml,report_xsl:0
+msgid "XSL Path"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_l10n_tr
+msgid "Turkey - Accounting"
+msgstr ""
+
+#. module: base
+#: field:ir.sequence,number_increment:0
+msgid "Increment Number"
+msgstr ""
+
+#. module: base
+#: model:ir.actions.act_window,name:base.action_res_company_tree
+#: model:ir.ui.menu,name:base.menu_action_res_company_tree
+msgid "Company's Structure"
+msgstr "Structure de la compagnie"
+
+#. module: base
+#: selection:base.language.install,lang:0
+msgid "Inuktitut / ᐃᓄᒃᑎᑐᑦ"
+msgstr ""
+
+#. module: base
+#: model:res.groups,name:base.group_multi_currency
+msgid "Multi Currencies"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_l10n_cl
+msgid ""
+"\n"
+"Chilean accounting chart and tax localization.\n"
+"==============================================\n"
+"Plan contable chileno e impuestos de acuerdo a disposiciones vigentes\n"
+"\n"
+"    "
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_sale
+msgid "Sales Management"
+msgstr ""
+
+#. module: base
+#: help:res.partner,user_id:0
+msgid ""
+"The internal user that is in charge of communicating with this contact if "
+"any."
+msgstr ""
+
+#. module: base
+#: view:res.partner:0
+msgid "Search Partner"
+msgstr ""
+
+#. module: base
+#: field:ir.module.category,module_nr:0
+msgid "Number of Modules"
+msgstr ""
+
+#. module: base
+#: help:multi_company.default,company_dest_id:0
+msgid "Company to store the current record"
+msgstr "Compagnie pour laquelle est fait cet enregistrement"
+
+#. module: base
+#: field:res.partner.bank.type.field,size:0
+msgid "Max. Size"
+msgstr ""
+
+#. module: base
+#: help:ir.actions.act_window,res_id:0
+msgid ""
+"Database ID of record to open in form view, when ``view_mode`` is set to "
+"'form' only"
+msgstr ""
+
+#. module: base
+#: help:ir.values,key2:0
+msgid ""
+"For actions, one of the possible action slots: \n"
+"  - client_action_multi\n"
+"  - client_print_multi\n"
+"  - client_action_relate\n"
+"  - tree_but_open\n"
+"For defaults, an optional condition"
+msgstr ""
+
+#. module: base
+#: sql_constraint:res.lang:0
+msgid "The name of the language must be unique !"
+msgstr ""
+
+#. module: base
+#: selection:res.request,state:0
+msgid "active"
+msgstr ""
+
+#. module: base
+#: field:ir.actions.wizard,wiz_name:0
+msgid "Wizard Name"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_knowledge
+msgid ""
+"\n"
+"Installer for knowledge-based Hidden.\n"
+"=====================================\n"
+"\n"
+"Makes the Knowledge Application Configuration available from where you can "
+"install\n"
+"document and Wiki based Hidden.\n"
+"    "
+msgstr ""
+
+#. module: base
+#: model:ir.module.category,name:base.module_category_customer_relationship_management
+msgid "Customer Relationship Management"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_delivery
+msgid ""
+"\n"
+"Allows you to add delivery methods in sale orders and picking.\n"
+"==============================================================\n"
+"\n"
+"You can define your own carrier and delivery grids for prices. When creating "
+"\n"
+"invoices from picking, OpenERP is able to add and compute the shipping "
+"line.\n"
+msgstr ""
+
+#. module: base
+#: code:addons/base/ir/ir_filters.py:80
+#, python-format
+msgid ""
+"There is already a shared filter set as default for %(model)s, delete or "
+"change it before setting a new default"
+msgstr ""
+
+#. module: base
+#: code:addons/orm.py:2649
+#, python-format
+msgid "Invalid group_by"
+msgstr ""
+
+#. module: base
+#: field:ir.module.category,child_ids:0
+msgid "Child Applications"
+msgstr ""
+
+#. module: base
+#: field:res.partner,credit_limit:0
+msgid "Credit Limit"
+msgstr ""
+
+#. module: base
+#: field:ir.model.constraint,date_update:0
+#: field:ir.model.data,date_update:0
+#: field:ir.model.relation,date_update:0
+msgid "Update Date"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_base_action_rule
+msgid "Automated Action Rules"
+msgstr ""
+
+#. module: base
+#: view:ir.attachment:0
+#: field:ir.attachment,create_uid:0
+msgid "Owner"
+msgstr ""
+
+#. module: base
+#: view:ir.actions.act_window:0
+msgid "Source Object"
+msgstr ""
+
+#. module: base
+#: model:res.partner.bank.type,format_layout:base.bank_normal
+msgid "%(bank_name)s: %(acc_number)s"
+msgstr ""
+
+#. module: base
+#: view:ir.actions.todo:0
+msgid "Config Wizard Steps"
+msgstr ""
+
+#. module: base
+#: model:ir.model,name:base.model_ir_ui_view_sc
+msgid "ir.ui.view_sc"
+msgstr ""
+
+#. module: base
+#: view:ir.model.access:0
+#: field:ir.model.access,group_id:0
+#: view:res.groups:0
+msgid "Group"
+msgstr ""
+
+#. module: base
+#: constraint:res.lang:0
+msgid ""
+"Invalid date/time format directive specified. Please refer to the list of "
+"allowed directives, displayed when you edit a language."
+msgstr ""
+
+#. module: base
+#: code:addons/orm.py:4153
+#, python-format
+msgid ""
+"One of the records you are trying to modify has already been deleted "
+"(Document type: %s)."
+msgstr ""
+
+#. module: base
+#: help:ir.actions.act_window,views:0
+msgid ""
+"This function field computes the ordered list of views that should be "
+"enabled when displaying the result of an action, federating view mode, views "
+"and reference view. The result is returned as an ordered list of pairs "
+"(view_id,view_mode)."
+msgstr ""
+
+#. module: base
+#: field:ir.model.relation,name:0
+msgid "Relation Name"
+msgstr ""
+
+#. module: base
+#: view:ir.rule:0
+msgid "Create Access Right"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.tv
+msgid "Tuvalu"
+msgstr ""
+
+#. module: base
+#: field:ir.actions.configuration.wizard,note:0
+msgid "Next Wizard"
+msgstr ""
+
+#. module: base
+#: field:res.lang,date_format:0
+msgid "Date Format"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_base_report_designer
+msgid "OpenOffice Report Designer"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.an
+msgid "Netherlands Antilles"
+msgstr ""
+
+#. module: base
+#: code:addons/base/res/res_users.py:311
+#, python-format
+msgid ""
+"You can not remove the admin user as it is used internally for resources "
+"created by OpenERP (updates, module installation, ...)"
+msgstr ""
+
+#. module: base
+#: view:workflow.transition:0
+msgid "Workflow Transition"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.gf
+msgid "French Guyana"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,summary:base.module_hr
+msgid "Jobs, Departments, Employees Details"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_analytic
+msgid ""
+"\n"
+"Module for defining analytic accounting object.\n"
+"===============================================\n"
+"\n"
+"In OpenERP, analytic accounts are linked to general accounts but are "
+"treated\n"
+"totally independently. So, you can enter various different analytic "
+"operations\n"
+"that have no counterpart in the general financial accounts.\n"
+"    "
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_idea
+msgid "Ideas"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_event
+msgid ""
+"\n"
+"Organization and management of Events.\n"
+"======================================\n"
+"\n"
+"The event module allows you to efficiently organise events and all related "
+"tasks: planification, registration tracking,\n"
+"attendances, etc.\n"
+"\n"
+"Key Features\n"
+"------------\n"
+"* Manage your Events and Registrations\n"
+"* Use emails to automatically confirm and send acknowledgements for any "
+"event registration\n"
+msgstr ""
+
+#. module: base
+#: selection:base.language.install,lang:0
+msgid "Bosnian / bosanski jezik"
+msgstr ""
+
+#. module: base
+#: help:ir.actions.report.xml,attachment_use:0
+msgid ""
+"If you check this, then the second time the user prints with same attachment "
+"name, it returns the previous report."
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_mrp_byproduct
+msgid ""
+"\n"
+"This module allows you to produce several products from one production "
+"order.\n"
+"============================================================================="
+"\n"
+"\n"
+"You can configure by-products in the bill of material.\n"
+"\n"
+"Without this module:\n"
+"--------------------\n"
+"    A + B + C -> D\n"
+"\n"
+"With this module:\n"
+"-----------------\n"
+"    A + B + C -> D + E\n"
+"    "
+msgstr ""
+
+#. module: base
+#: selection:base.language.install,lang:0
+msgid "Spanish (VE) / Español (VE)"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_hr_timesheet_invoice
+msgid "Invoice on Timesheets"
+msgstr ""
+
+#. module: base
+#: view:base.module.upgrade:0
+msgid "Your system will be updated."
+msgstr ""
+
+#. module: base
+#: field:ir.actions.todo,note:0
+#: selection:ir.property,type:0
+msgid "Text"
+msgstr ""
+
+#. module: base
+#: field:res.country,name:0
+msgid "Country Name"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.co
+msgid "Colombia"
+msgstr ""
+
+#. module: base
+#: model:res.partner.title,name:base.res_partner_title_mister
+msgid "Mister"
+msgstr ""
+
+#. module: base
+#: help:res.country,code:0
+msgid ""
+"The ISO country code in two chars.\n"
+"You can use this field for quick search."
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.pw
+msgid "Palau"
+msgstr ""
+
+#. module: base
+#: view:res.partner:0
+msgid "Sales & Purchases"
+msgstr ""
+
+#. module: base
+#: view:res.partner:0
+msgid "Put an internal note..."
+msgstr ""
+
+#. module: base
+#: view:ir.translation:0
+msgid "Untranslated"
+msgstr ""
+
+#. module: base
+#: view:ir.mail_server:0
+msgid "Outgoing Mail Server"
+msgstr ""
+
+#. module: base
+#: help:ir.actions.act_window,context:0
+#: help:ir.actions.client,context:0
+msgid ""
+"Context dictionary as Python expression, empty by default (Default: {})"
+msgstr ""
+
+#. module: base
+#: field:res.company,logo_web:0
+msgid "Logo Web"
+msgstr ""
+
+#. module: base
+#: code:addons/base/ir/ir_model.py:345
+#, python-format
+msgid "Custom fields must have a name that starts with 'x_' !"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_l10n_mx
+msgid "Mexico - Accounting"
+msgstr ""
+
+#. module: base
+#: help:ir.actions.server,action_id:0
+msgid "Select the Action Window, Report, Wizard to be executed."
+msgstr ""
+
+#. module: base
+#: sql_constraint:ir.config_parameter:0
+msgid "Key must be unique."
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_plugin_outlook
+msgid "Outlook Plug-In"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_account
+msgid ""
+"\n"
+"Accounting and Financial Management.\n"
+"====================================\n"
+"\n"
+"Financial and accounting module that covers:\n"
+"--------------------------------------------\n"
+"    * General Accounting\n"
+"    * Cost/Analytic accounting\n"
+"    * Third party accounting\n"
+"    * Taxes management\n"
+"    * Budgets\n"
+"    * Customer and Supplier Invoices\n"
+"    * Bank statements\n"
+"    * Reconciliation process by partner\n"
+"\n"
+"Creates a dashboard for accountants that includes:\n"
+"--------------------------------------------------\n"
+"    * List of Customer Invoice to Approve\n"
+"    * Company Analysis\n"
+"    * Graph of Treasury\n"
+"\n"
+"The processes like maintaining of general ledger is done through the defined "
+"financial Journals (entry move line orgrouping is maintained through "
+"journal) \n"
+"for a particular financial year and for preparation of vouchers there is a "
+"module named account_voucher.\n"
+"    "
+msgstr ""
+
+#. module: base
+#: view:ir.model:0
+#: field:ir.model,name:0
+msgid "Model Description"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_marketing
+msgid ""
+"\n"
+"Menu for Marketing.\n"
+"===================\n"
+"\n"
+"Contains the installer for marketing-related modules.\n"
+"    "
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_web_linkedin
+msgid ""
+"\n"
+"OpenERP Web LinkedIn module.\n"
+"============================\n"
+"This module provides the Integration of the LinkedIn with OpenERP.\n"
+"        "
+msgstr ""
+
+#. module: base
+#: help:ir.actions.act_window,src_model:0
+msgid ""
+"Optional model name of the objects on which this action should be visible"
+msgstr ""
+
+#. module: base
+#: field:workflow.transition,trigger_expr_id:0
+msgid "Trigger Expression"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.jo
+msgid "Jordan"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_l10n_hr
+msgid "Croatia - RRIF 2012 COA"
+msgstr ""
+
+#. module: base
+#: help:ir.cron,nextcall:0
+msgid "Next planned execution date for this job."
+msgstr ""
+
+#. module: base
+#: model:ir.model,name:base.model_ir_ui_view
+msgid "ir.ui.view"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.er
+msgid "Eritrea"
+msgstr ""
+
+#. module: base
+#: sql_constraint:res.company:0
+msgid "The company name must be unique !"
+msgstr ""
+
+#. module: base
+#: model:ir.ui.menu,name:base.menu_base_action_rule_admin
+msgid "Automated Actions"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_l10n_ro
+msgid "Romania - Accounting"
+msgstr ""
+
+#. module: base
+#: model:ir.model,name:base.model_res_config_settings
+msgid "res.config.settings"
+msgstr ""
+
+#. module: base
+#: help:res.partner,image_small:0
+msgid ""
+"Small-sized image of this contact. It is automatically resized as a 64x64px "
+"image, with aspect ratio preserved. Use this field anywhere a small image is "
+"required."
+msgstr ""
+
+#. module: base
+#: help:ir.actions.server,mobile:0
+msgid ""
+"Provides fields that be used to fetch the mobile number, e.g. you select the "
+"invoice, then `object.invoice_address_id.mobile` is the field which gives "
+"the correct mobile number"
+msgstr ""
+
+#. module: base
+#: view:ir.mail_server:0
+msgid "Security and Authentication"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_web_calendar
+msgid "Web Calendar"
+msgstr ""
+
+#. module: base
+#: selection:base.language.install,lang:0
+msgid "Swedish / svenska"
+msgstr ""
+
+#. module: base
+#: field:base.language.export,name:0
+#: field:ir.attachment,datas_fname:0
+msgid "File Name"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.rs
+msgid "Serbia"
+msgstr ""
+
+#. module: base
+#: selection:ir.translation,type:0
+msgid "Wizard View"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.kh
+msgid "Cambodia, Kingdom of"
+msgstr ""
+
+#. module: base
+#: field:base.language.import,overwrite:0
+#: field:base.language.install,overwrite:0
+msgid "Overwrite Existing Terms"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_hr_holidays
+msgid ""
+"\n"
+"Manage leaves and allocation requests\n"
+"=====================================\n"
+"\n"
+"This application controls the holiday schedule of your company. It allows "
+"employees to request holidays. Then, managers can review requests for "
+"holidays and approve or reject them. This way you can control the overall "
+"holiday planning for the company or department.\n"
+"\n"
+"You can configure several kinds of leaves (sickness, holidays, paid days, "
+"...) and allocate leaves to an employee or department quickly using "
+"allocation requests. An employee can also make a request for more days off "
+"by making a new Allocation. It will increase the total of available days for "
+"that leave type (if the request is accepted).\n"
+"\n"
+"You can keep track of leaves in different ways by following reports: \n"
+"\n"
+"* Leaves Summary\n"
+"* Leaves by Department\n"
+"* Leaves Analysis\n"
+"\n"
+"A synchronization with an internal agenda (Meetings of the CRM module) is "
+"also possible in order to automatically create a meeting when a holiday "
+"request is accepted by setting up a type of meeting in Leave Type.\n"
+msgstr ""
+
+#. module: base
+#: selection:base.language.install,lang:0
+msgid "Albanian / Shqip"
+msgstr ""
+
+#. module: base
+#: model:ir.ui.menu,name:base.menu_crm_config_opportunity
+msgid "Opportunities"
+msgstr ""
+
+#. module: base
+#: model:ir.model,name:base.model_base_language_export
+msgid "base.language.export"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.pg
+msgid "Papua New Guinea"
+msgstr ""
+
+#. module: base
+#: help:ir.actions.report.xml,report_type:0
+msgid "Report Type, e.g. pdf, html, raw, sxw, odt, html2html, mako2html, ..."
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_document_webdav
+msgid "Shared Repositories (WebDAV)"
+msgstr ""
+
+#. module: base
+#: view:res.users:0
+msgid "Email Preferences"
+msgstr ""
+
+#. module: base
+#: code:addons/base/ir/ir_fields.py:195
+#, python-format
+msgid "'%s' does not seem to be a valid date for field '%%(field)s'"
+msgstr ""
+
+#. module: base
+#: view:res.partner:0
+msgid "My Partners"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.zw
+msgid "Zimbabwe"
+msgstr ""
+
+#. module: base
+#: help:ir.model.constraint,type:0
+msgid ""
+"Type of the constraint: `f` for a foreign key, `u` for other constraints."
+msgstr ""
+
+#. module: base
+#: view:ir.actions.report.xml:0
+msgid "XML Report"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.es
+msgid "Spain"
+msgstr ""
+
+#. module: base
+#: help:ir.actions.act_window,domain:0
+msgid ""
+"Optional domain filtering of the destination data, as a Python expression"
+msgstr ""
+
+#. module: base
+#: model:ir.model,name:base.model_base_module_upgrade
+msgid "Module Upgrade"
+msgstr ""
+
+#. module: base
+#: view:res.bank:0
+#: view:res.company:0
+#: view:res.partner:0
+#: view:res.partner.bank:0
+#: view:res.users:0
+msgid "ZIP"
+msgstr ""
+
+#. module: base
+#: selection:base.language.install,lang:0
+msgid "Spanish (UY) / Español (UY)"
+msgstr ""
+
+#. module: base
+#: field:res.partner,mobile:0
+msgid "Mobile"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.om
+msgid "Oman"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_mrp
+msgid "MRP"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_hr_attendance
+msgid ""
+"\n"
+"This module aims to manage employee's attendances.\n"
+"==================================================\n"
+"\n"
+"Keeps account of the attendances of the employees on the basis of the\n"
+"actions(Sign in/Sign out) performed by them.\n"
+"       "
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.nu
+msgid "Niue"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_membership
+msgid "Membership Management"
+msgstr ""
+
+#. module: base
+#: selection:ir.module.module,license:0
+msgid "Other OSI Approved Licence"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_web_gantt
+msgid "Web Gantt"
+msgstr ""
+
+#. module: base
+#: model:ir.actions.act_window,name:base.act_menu_create
+#: view:wizard.ir.model.menu.create:0
+msgid "Create Menu"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.in
+msgid "India"
+msgstr ""
+
+#. module: base
+#: model:ir.actions.act_window,name:base.res_request_link-act
+#: model:ir.ui.menu,name:base.menu_res_request_link_act
+msgid "Request Reference Types"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_google_base_account
+msgid "Google Users"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_fleet
+msgid "Fleet Management"
+msgstr ""
+
+#. module: base
+#: help:ir.server.object.lines,value:0
+msgid ""
+"Expression containing a value specification. \n"
+"When Formula type is selected, this field may be a Python expression  that "
+"can use the same values as for the condition field on the server action.\n"
+"If Value type is selected, the value will be used directly without "
+"evaluation."
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.ad
+msgid "Andorra, Principality of"
+msgstr ""
+
+#. module: base
+#: field:ir.rule,perm_read:0
+msgid "Apply for Read"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.mn
+msgid "Mongolia"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_crm
+msgid ""
+"\n"
+"The generic OpenERP Customer Relationship Management\n"
+"====================================================\n"
+"\n"
+"This application enables a group of people to intelligently and efficiently "
+"manage leads, opportunities, meetings and phone calls.\n"
+"\n"
+"It manages key tasks such as communication, identification, prioritization, "
+"assignment, resolution and notification.\n"
+"\n"
+"OpenERP ensures that all cases are successfully tracked by users, customers "
+"and suppliers. It can automatically send reminders, escalate the request, "
+"trigger specific methods and many other actions based on your own enterprise "
+"rules.\n"
+"\n"
+"The greatest thing about this system is that users don't need to do anything "
+"special. The CRM module has an email gateway for the synchronization "
+"interface between mails and OpenERP. That way, users can just send emails to "
+"the request tracker.\n"
+"\n"
+"OpenERP will take care of thanking them for their message, automatically "
+"routing it to the appropriate staff and make sure all future correspondence "
+"gets to the right place.\n"
+"\n"
+"\n"
+"Dashboard for CRM will include:\n"
+"-------------------------------\n"
+"* Planned Revenue by Stage and User (graph)\n"
+"* Opportunities by Stage (graph)\n"
+msgstr ""
+
+#. module: base
+#: selection:base.language.export,format:0
+msgid "TGZ Archive"
+msgstr ""
+
+#. module: base
+#: view:res.groups:0
+msgid ""
+"Users added to this group are automatically added in the following groups."
+msgstr ""
+
+#. module: base
+#: code:addons/base/ir/ir_model.py:733
+#: code:addons/base/ir/ir_model.py:736
+#, python-format
+msgid "Document model"
+msgstr ""
+
+#. module: base
+#: view:res.users:0
+msgid "Change the user password."
+msgstr ""
+
+#. module: base
+#: view:res.lang:0
+msgid "%B - Full month name."
+msgstr ""
+
+#. module: base
+#: field:ir.actions.todo,type:0
+#: view:ir.attachment:0
+#: field:ir.attachment,type:0
+#: field:ir.model,state:0
+#: field:ir.model.fields,state:0
+#: field:ir.property,type:0
+#: field:ir.server.object.lines,type:0
+#: field:ir.translation,type:0
+#: view:ir.ui.view:0
+#: view:ir.values:0
+#: field:ir.values,key:0
+msgid "Type"
+msgstr ""
+
+#. module: base
+#: field:ir.mail_server,smtp_user:0
+msgid "Username"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_l10n_br
+msgid ""
+"\n"
+"Base module for the Brazilian localization\n"
+"==========================================\n"
+"\n"
+"This module consists in:\n"
+"\n"
+" - Generic Brazilian chart of accounts\n"
+" - Brazilian taxes such as:\n"
+"\n"
+"        - IPI\n"
+"        - ICMS\n"
+"        - PIS\n"
+"        - COFINS\n"
+"        - ISS\n"
+"        - IR\n"
+"        - IRPJ\n"
+"        - CSLL\n"
+"\n"
+"The field tax_discount has also been added in the account.tax.template and \n"
+"account.tax objects to allow the proper computation of some Brazilian VATs \n"
+"such as ICMS. The chart of account creation wizard has been extended to \n"
+"propagate those new data properly.\n"
+"\n"
+"It's important to note however that this module lack many implementations to "
+"\n"
+"use OpenERP properly in Brazil. Those implementations (such as the "
+"electronic \n"
+"fiscal Invoicing which is already operational) are brought by more than 15 \n"
+"additional modules of the Brazilian Launchpad localization project \n"
+"https://launchpad.net/openerp.pt-br-localiz and their dependencies in the \n"
+"extra addons branch. Those modules aim at not breaking with the remarkable \n"
+"OpenERP modularity, this is why they are numerous but small. One of the \n"
+"reasons for maintaining those modules apart is that Brazilian Localization \n"
+"leaders need commit rights agility to complete the localization as companies "
+"\n"
+"fund the remaining legal requirements (such as soon fiscal ledgers, \n"
+"accounting SPED, fiscal SPED and PAF ECF that are still missing as September "
+"\n"
+"2011). Those modules are also strictly licensed under AGPL V3 and today "
+"don't \n"
+"come with any additional paid permission for online use of 'private "
+"modules'.\n"
+msgstr ""
+
+#. module: base
+#: code:addons/orm.py:406
+#, python-format
+msgid ""
+"Language with code \"%s\" is not defined in your system !\n"
+"Define it through the Administration menu."
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.gu
+msgid "Guam (USA)"
+msgstr ""
+
+#. module: base
+#: sql_constraint:res.country:0
+msgid "The name of the country must be unique !"
+msgstr ""
+
+#. module: base
+#: field:ir.module.module,installed_version:0
+msgid "Latest Version"
+msgstr ""
+
+#. module: base
+#: view:ir.rule:0
+msgid "Delete Access Right"
+msgstr ""
+
+#. module: base
+#: code:addons/base/ir/ir_mail_server.py:214
+#, python-format
+msgid "Connection test failed!"
+msgstr ""
+
+#. module: base
+#: selection:ir.actions.server,state:0
+#: selection:workflow.activity,kind:0
+msgid "Dummy"
+msgstr ""
+
+#. module: base
+#: constraint:ir.ui.view:0
+msgid "Invalid XML for View Architecture!"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.ky
+msgid "Cayman Islands"
+msgstr ""
+
+#. module: base
+#: view:ir.rule:0
+msgid "Record Rule"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.kr
+msgid "South Korea"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_l10n_si
+msgid "Kontni načrt za gospodarske družbe"
+msgstr ""
+
+#. module: base
+#: code:addons/orm.py:4918
+#, python-format
+msgid "Record #%d of %s not found, cannot copy!"
+msgstr ""
+
+#. module: base
+#: field:ir.module.module,contributors:0
+msgid "Contributors"
+msgstr ""
+
+#. module: base
+#: field:ir.rule,perm_unlink:0
+msgid "Apply for Delete"
+msgstr ""
+
+#. module: base
+#: selection:ir.property,type:0
+msgid "Char"
+msgstr ""
+
+#. module: base
+#: field:ir.module.category,visible:0
+msgid "Visible"
+msgstr ""
+
+#. module: base
+#: model:ir.actions.client,name:base.action_client_base_menu
+msgid "Open Settings Menu"
+msgstr ""
+
+#. module: base
+#: selection:base.language.install,lang:0
+msgid "Spanish (AR) / Español (AR)"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.ug
+msgid "Uganda"
+msgstr ""
+
+#. module: base
+#: field:ir.model.access,perm_unlink:0
+msgid "Delete Access"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.ne
+msgid "Niger"
+msgstr ""
+
+#. module: base
+#: selection:base.language.install,lang:0
+msgid "Chinese (HK)"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.ba
+msgid "Bosnia-Herzegovina"
+msgstr ""
+
+#. module: base
+#: selection:ir.translation,type:0
+msgid "Wizard Field"
+msgstr ""
+
+#. module: base
+#: selection:base.language.install,lang:0
+msgid "Spanish (GT) / Español (GT)"
+msgstr ""
+
+#. module: base
+#: field:ir.mail_server,smtp_port:0
+msgid "SMTP Port"
+msgstr ""
+
+#. module: base
+#: help:res.users,login:0
+msgid "Used to log into the system"
+msgstr ""
+
+#. module: base
+#: view:base.language.export:0
+msgid ""
+"TGZ format: this is a compressed archive containing a PO file, directly "
+"suitable\n"
+"                                for uploading to OpenERP's translation "
+"platform,"
+msgstr ""
+
+#. module: base
+#: view:res.lang:0
+msgid ""
+"%W - Week number of the year (Monday as the first day of the week) as a "
+"decimal number [00,53]. All days in a new year preceding the first Monday "
+"are considered to be in week 0."
+msgstr ""
+
+#. module: base
+#: code:addons/base/module/wizard/base_language_install.py:53
+#, python-format
+msgid "Language Pack"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_web_tests
+msgid "Tests"
+msgstr ""
+
+#. module: base
+#: field:ir.actions.report.xml,attachment:0
+msgid "Save as Attachment Prefix"
+msgstr ""
+
+#. module: base
+#: field:ir.ui.view_sc,res_id:0
+msgid "Resource Ref."
+msgstr ""
+
+#. module: base
+#: field:ir.actions.act_url,url:0
+msgid "Action URL"
+msgstr ""
+
+#. module: base
+#: field:base.module.import,module_name:0
+#: field:ir.module.module,shortdesc:0
+msgid "Module Name"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.mh
+msgid "Marshall Islands"
+msgstr ""
+
+#. module: base
+#: code:addons/base/ir/ir_model.py:430
+#, python-format
+msgid "Changing the model of a field is forbidden!"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.ht
+msgid "Haiti"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_l10n_fr_hr_payroll
+msgid "French Payroll"
+msgstr ""
+
+#. module: base
+#: view:ir.ui.view:0
+#: selection:ir.ui.view,type:0
+msgid "Search"
+msgstr ""
+
+#. module: base
+#: code:addons/osv.py:154
+#, python-format
+msgid ""
+"The operation cannot be completed, probably due to the following:\n"
+"- deletion: you may be trying to delete a record while other records still "
+"reference it\n"
+"- creation/update: a mandatory field is not correctly set"
+msgstr ""
+
+#. module: base
+#: field:ir.module.category,parent_id:0
+msgid "Parent Application"
+msgstr ""
+
+#. module: base
+#: model:ir.actions.act_window,name:base.ir_action_wizard
+#: view:ir.actions.wizard:0
+#: model:ir.ui.menu,name:base.menu_ir_action_wizard
+msgid "Wizards"
+msgstr ""
+
+#. module: base
+#: code:addons/base/res/res_users.py:131
+#, python-format
+msgid "Operation Canceled"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_document
+msgid "Document Management System"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_crm_claim
+msgid "Claims Management"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_document_webdav
+msgid ""
+"\n"
+"With this module, the WebDAV server for documents is activated.\n"
+"===============================================================\n"
+"\n"
+"You can then use any compatible browser to remotely see the attachments of "
+"OpenObject.\n"
+"\n"
+"After installation, the WebDAV server can be controlled by a [webdav] "
+"section in \n"
+"the server's config.\n"
+"\n"
+"Server Configuration Parameter:\n"
+"-------------------------------\n"
+"[webdav]:\n"
+"+++++++++ \n"
+"    * enable = True ; Serve webdav over the http(s) servers\n"
+"    * vdir = webdav ; the directory that webdav will be served at\n"
+"    * this default val means that webdav will be\n"
+"    * on \"http://localhost:8069/webdav/\n"
+"    * verbose = True ; Turn on the verbose messages of webdav\n"
+"    * debug = True ; Turn on the debugging messages of webdav\n"
+"    * since the messages are routed to the python logging, with\n"
+"    * levels \"debug\" and \"debug_rpc\" respectively, you can leave\n"
+"    * these options on\n"
+"\n"
+"Also implements IETF RFC 5785 for services discovery on a http server,\n"
+"which needs explicit configuration in openerp-server.conf too.\n"
+msgstr ""
+
+#. module: base
+#: model:ir.module.category,name:base.module_category_purchase_management
+#: model:ir.ui.menu,name:base.menu_purchase_root
+msgid "Purchases"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.md
+msgid "Moldavia"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_base_iban
+msgid ""
+"\n"
+"This module installs the base for IBAN (International Bank Account Number) "
+"bank accounts and checks for it's validity.\n"
+"============================================================================="
+"=========================================\n"
+"\n"
+"The ability to extract the correctly represented local accounts from IBAN "
+"accounts \n"
+"with a single statement.\n"
+"    "
+msgstr ""
+
+#. module: base
+#: view:ir.module.module:0
+msgid "Features"
+msgstr ""
+
+#. module: base
+#: view:ir.attachment:0
+msgid "Data"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_portal_claim
+msgid ""
+"\n"
+"This module adds claim menu and features to your portal if claim and portal "
+"are installed.\n"
+"============================================================================="
+"=============\n"
+"    "
+msgstr ""
+
+#. module: base
+#: model:ir.actions.act_window,help:base.action_res_partner_bank_account_form
+msgid ""
+"Configure your company's bank accounts and select those that must appear on "
+"the report footer. You can reorder bank accounts from the list view. If you "
+"use the accounting application of OpenERP, journals and accounts will be "
+"created automatically based on these data."
+msgstr ""
+
+#. module: base
+#: report:ir.module.reference:0
+msgid "Version"
+msgstr ""
+
+#. module: base
+#: help:res.users,action_id:0
+msgid ""
+"If specified, this action will be opened at logon for this user, in addition "
+"to the standard menu."
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.mf
+msgid "Saint Martin (French part)"
+msgstr ""
+
+#. module: base
+#: model:ir.model,name:base.model_ir_exports
+msgid "ir.exports"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_l10n_lu
+msgid ""
+"\n"
+"This is the base module to manage the accounting chart for Luxembourg.\n"
+"======================================================================\n"
+"\n"
+"    * the Luxembourg Official Chart of Accounts (law of June 2009 + 2011 "
+"chart and Taxes),\n"
+"    * the Tax Code Chart for Luxembourg\n"
+"    * the main taxes used in Luxembourg\n"
+"    * default fiscal position for local, intracom, extracom "
+msgstr ""
+
+#. module: base
+#: code:addons/base/module/wizard/base_update_translations.py:39
+#, python-format
+msgid "No language with code \"%s\" exists"
+msgstr ""
+
+#. module: base
+#: model:ir.module.category,name:base.module_category_social_network
+#: model:ir.module.module,shortdesc:base.module_mail
+msgid "Social Network"
+msgstr ""
+
+#. module: base
+#: view:res.lang:0
+msgid "%Y - Year with century."
+msgstr ""
+
+#. module: base
+#: view:res.company:0
+msgid "Report Footer Configuration"
+msgstr ""
+
+#. module: base
+#: field:ir.translation,comments:0
+msgid "Translation comments"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_lunch
+msgid ""
+"\n"
+"The base module to manage lunch.\n"
+"================================\n"
+"\n"
+"Many companies order sandwiches, pizzas and other, from usual suppliers, for "
+"their employees to offer them more facilities. \n"
+"\n"
+"However lunches management within the company requires proper administration "
+"especially when the number of employees or suppliers is important. \n"
+"\n"
+"The “Lunch Order” module has been developed to make this management easier "
+"but also to offer employees more tools and usability. \n"
+"\n"
+"In addition to a full meal and supplier management, this module offers the "
+"possibility to display warning and provides quick order selection based on "
+"employee’s preferences.\n"
+"\n"
+"If you want to save your employees' time and avoid them to always have coins "
+"in their pockets, this module is essential.\n"
+"    "
+msgstr ""
+
+#. module: base
+#: view:wizard.ir.model.menu.create:0
+msgid "Create _Menu"
+msgstr ""
+
+#. module: base
+#: help:ir.actions.server,trigger_obj_id:0
+msgid ""
+"The field on the current object that links to the target object record (must "
+"be a many2one, or an integer field with the record ID)"
+msgstr ""
+
+#. module: base
+#: model:ir.model,name:base.model_res_bank
+#: view:res.bank:0
+#: field:res.partner.bank,bank:0
+msgid "Bank"
+msgstr ""
+
+#. module: base
+#: model:ir.model,name:base.model_ir_exports_line
+msgid "ir.exports.line"
+msgstr ""
+
+#. module: base
+#: model:ir.module.category,description:base.module_category_purchase_management
+msgid ""
+"Helps you manage your purchase-related processes such as requests for "
+"quotations, supplier invoices, etc..."
+msgstr ""
+
+#. module: base
+#: help:res.partner,website:0
+msgid "Website of Partner or Company"
+msgstr ""
+
+#. module: base
+#: help:base.language.install,overwrite:0
+msgid ""
+"If you check this box, your customized translations will be overwritten and "
+"replaced by the official ones."
+msgstr ""
+
+#. module: base
+#: model:ir.actions.act_window,name:base.ir_action_report_xml
+#: field:ir.module.module,reports_by_module:0
+#: model:ir.ui.menu,name:base.menu_ir_action_report_xml
+msgid "Reports"
+msgstr ""
+
+#. module: base
+#: help:ir.actions.act_window.view,multi:0
+#: help:ir.actions.report.xml,multi:0
+msgid ""
+"If set to true, the action will not be displayed on the right toolbar of a "
+"form view."
+msgstr ""
+
+#. module: base
+#: field:workflow,on_create:0
+msgid "On Create"
+msgstr ""
+
+#. module: base
+#: code:addons/base/ir/ir_model.py:914
+#, python-format
+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 ""
+
+#. module: base
+#: field:res.users,login:0
+msgid "Login"
+msgstr ""
+
+#. module: base
+#: view:ir.actions.server:0
+msgid ""
+"Access all the fields related to the current object using expressions, i.e. "
+"object.partner_id.name "
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_portal_project_issue
+msgid "Portal Issue"
+msgstr ""
+
+#. module: base
+#: model:ir.ui.menu,name:base.menu_tools
+msgid "Tools"
+msgstr ""
+
+#. module: base
+#: selection:ir.property,type:0
+msgid "Float"
+msgstr ""
+
+#. module: base
+#: help:ir.actions.todo,type:0
+msgid ""
+"Manual: Launched manually.\n"
+"Automatic: Runs whenever the system is reconfigured.\n"
+"Launch Manually Once: after having been launched manually, it sets "
+"automatically to Done."
+msgstr ""
+
+#. module: base
+#: field:res.partner,image_small:0
+msgid "Small-sized image"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_stock
+msgid "Warehouse Management"
+msgstr ""
+
+#. module: base
+#: model:ir.model,name:base.model_res_request_link
+msgid "res.request.link"
+msgstr ""
+
+#. module: base
+#: field:ir.actions.wizard,name:0
+msgid "Wizard Info"
+msgstr ""
+
+#. module: base
+#: model:ir.actions.act_window,name:base.action_wizard_lang_export
+#: model:ir.ui.menu,name:base.menu_wizard_lang_export
+msgid "Export Translation"
+msgstr ""
+
+#. module: base
+#: model:ir.actions.act_window,name:base.action_server_action
+#: view:ir.actions.server:0
+#: model:ir.ui.menu,name:base.menu_server_action
+msgid "Server Actions"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_l10n_lu
+msgid "Luxembourg - Accounting"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.tp
+msgid "East Timor"
+msgstr ""
+
+#. module: base
+#: code:addons/base/module/module.py:414
+#: view:ir.module.module:0
+#, python-format
+msgid "Install"
+msgstr ""
+
+#. module: base
+#: field:res.currency,accuracy:0
+msgid "Computational Accuracy"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_l10n_at
+msgid ""
+"\n"
+"This module provides the standard Accounting Chart for Austria which is "
+"based on the Template from BMF.gv.at.\n"
+"============================================================================="
+"================================ \n"
+"Please keep in mind that you should review and adapt it with your "
+"Accountant, before using it in a live Environment.\n"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.kg
+msgid "Kyrgyz Republic (Kyrgyzstan)"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_account_accountant
+msgid ""
+"\n"
+"Accounting Access Rights\n"
+"========================\n"
+"It gives the Administrator user access to all accounting features such as "
+"journal items and the chart of accounts.\n"
+"\n"
+"It assigns manager and user access rights to the Administrator and only user "
+"rights to the Demo user. \n"
+msgstr ""
+
+#. module: base
+#: view:ir.sequence:0
+msgid "Day: %(day)s"
+msgstr ""
+
+#. module: base
+#: model:ir.module.category,description:base.module_category_point_of_sale
+msgid ""
+"Helps you get the most out of your points of sales with fast sale encoding, "
+"simplified payment mode encoding, automatic picking lists generation and "
+"more."
+msgstr ""
+
+#. module: base
+#: code:addons/base/ir/ir_fields.py:164
+#, python-format
+msgid "Unknown value '%s' for boolean field '%%(field)s', assuming '%s'"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.nl
+msgid "Netherlands"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_portal_event
+msgid "Portal Event"
+msgstr ""
+
+#. module: base
+#: selection:ir.translation,state:0
+msgid "Translation in Progress"
+msgstr ""
+
+#. module: base
+#: model:ir.model,name:base.model_ir_rule
+msgid "ir.rule"
+msgstr ""
+
+#. module: base
+#: selection:ir.cron,interval_type:0
+msgid "Days"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,summary:base.module_fleet
+msgid "Vehicle, leasing, insurances, costs"
+msgstr ""
+
+#. module: base
+#: view:ir.model.access:0
+#: field:ir.model.access,perm_read:0
+msgid "Read Access"
+msgstr ""
+
+#. module: base
+#: help:ir.attachment,res_id:0
+msgid "The record id this is attached to"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_share
+msgid ""
+"\n"
+"This module adds generic sharing tools to your current OpenERP database.\n"
+"========================================================================\n"
+"\n"
+"It specifically adds a 'share' button that is available in the Web client "
+"to\n"
+"share any kind of OpenERP data with colleagues, customers, friends.\n"
+"\n"
+"The system will work by creating new users and groups on the fly, and by\n"
+"combining the appropriate access rights and ir.rules to ensure that the "
+"shared\n"
+"users only have access to the data that has been shared with them.\n"
+"\n"
+"This is extremely useful for collaborative work, knowledge sharing,\n"
+"synchronization with other companies.\n"
+"    "
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_process
+msgid "Enterprise Process"
+msgstr ""
+
+#. module: base
+#: help:res.partner,supplier:0
+msgid ""
+"Check this box if this contact is a supplier. If it's not checked, purchase "
+"people will not see it when encoding a purchase order."
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_hr_evaluation
+msgid "Employee Appraisals"
+msgstr ""
+
+#. module: base
+#: selection:ir.actions.server,state:0
+msgid "Write Object"
+msgstr ""
+
+#. module: base
+#: code:addons/base/res/res_company.py:68
+#, python-format
+msgid " (copy)"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.tm
+msgid "Turkmenistan"
+msgstr ""
+
+#. module: base
+#: view:res.lang:0
+msgid "7.  %H:%M:%S      ==> 18:25:20"
+msgstr ""
+
+#. module: base
+#: view:res.partner:0
+#: field:res.partner.category,partner_ids:0
+msgid "Partners"
+msgstr ""
+
+#. module: base
+#: field:res.partner.category,parent_left:0
+msgid "Left parent"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_project_mrp
+msgid "Create Tasks on SO"
+msgstr ""
+
+#. module: base
+#: code:addons/base/ir/ir_model.py:321
+#, python-format
+msgid "This column contains module data and cannot be removed!"
+msgstr ""
+
+#. module: base
+#: field:res.partner.bank,footer:0
+msgid "Display on Reports"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_project_timesheet
+msgid ""
+"\n"
+"Synchronization of project task work entries with timesheet entries.\n"
+"====================================================================\n"
+"\n"
+"This module lets you transfer the entries under tasks defined for Project\n"
+"Management to the Timesheet line entries for particular date and particular "
+"user\n"
+"with the effect of creating, editing and deleting either ways.\n"
+"    "
+msgstr ""
+
+#. module: base
+#: model:ir.model,name:base.model_ir_model_access
+msgid "ir.model.access"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_l10n_multilang
+msgid ""
+"\n"
+"    * Multi language support for Chart of Accounts, Taxes, Tax Codes, "
+"Journals,\n"
+"      Accounting Templates, Analytic Chart of Accounts and Analytic "
+"Journals.\n"
+"    * Setup wizard changes\n"
+"        - Copy translations for COA, Tax, Tax Code and Fiscal Position from\n"
+"          templates to target objects.\n"
+"    "
+msgstr ""
+
+#. module: base
+#: field:workflow.transition,act_from:0
+msgid "Source Activity"
+msgstr ""
+
+#. module: base
+#: view:ir.sequence:0
+msgid "Legend (for prefix, suffix)"
+msgstr ""
+
+#. module: base
+#: selection:ir.server.object.lines,type:0
+msgid "Formula"
+msgstr ""
+
+#. module: base
+#: code:addons/base/res/res_users.py:311
+#, python-format
+msgid "Can not remove root user!"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.mw
+msgid "Malawi"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_l10n_ec
+msgid ""
+"\n"
+"This is the base module to manage the accounting chart for Ecuador in "
+"OpenERP.\n"
+"============================================================================="
+"=\n"
+"\n"
+"Accounting chart and localization for Ecuador.\n"
+"    "
+msgstr ""
+
+#. module: base
+#: code:addons/base/ir/ir_filters.py:36
+#: code:addons/base/res/res_partner.py:314
+#: code:addons/base/res/res_users.py:92
+#: code:addons/base/res/res_users.py:335
+#: code:addons/base/res/res_users.py:337
+#, python-format
+msgid "%s (copy)"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_account_chart
+msgid "Template of Charts of Accounts"
+msgstr ""
+
+#. module: base
+#: field:res.partner,type:0
+msgid "Address Type"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_sale_stock
+msgid ""
+"\n"
+"Manage sales quotations and orders\n"
+"==================================\n"
+"\n"
+"This module makes the link between the sales and warehouses management "
+"applications.\n"
+"\n"
+"Preferences\n"
+"-----------\n"
+"* Shipping: Choice of delivery at once or partial delivery\n"
+"* Invoicing: choose how invoices will be paid\n"
+"* Incoterms: International Commercial terms\n"
+"\n"
+"You can choose flexible invoicing methods:\n"
+"\n"
+"* *On Demand*: Invoices are created manually from Sales Orders when needed\n"
+"* *On Delivery Order*: Invoices are generated from picking (delivery)\n"
+"* *Before Delivery*: A Draft invoice is created and must be paid before "
+"delivery\n"
+msgstr ""
+
+#. module: base
+#: field:ir.ui.menu,complete_name:0
+msgid "Full Path"
+msgstr ""
+
+#. module: base
+#: view:base.language.export:0
+msgid "The next step depends on the file format:"
+msgstr ""
+
+#. module: base
+#: view:res.lang:0
+msgid ""
+"%U - Week number of the year (Sunday as the first day of the week) as a "
+"decimal number [00,53]. All days in a new year preceding the first Sunday "
+"are considered to be in week 0."
+msgstr ""
+
+#. module: base
+#: view:base.language.export:0
+msgid "PO(T) format: you should edit it with a PO editor such as"
+msgstr ""
+
+#. module: base
+#: model:ir.ui.menu,name:base.menu_administration
+#: model:res.groups,name:base.group_system
+msgid "Settings"
+msgstr ""
+
+#. module: base
+#: selection:ir.actions.act_window,view_type:0
+#: selection:ir.actions.act_window.view,view_mode:0
+#: view:ir.ui.view:0
+#: selection:ir.ui.view,type:0
+msgid "Tree"
+msgstr ""
+
+#. module: base
+#: view:ir.actions.server:0
+msgid "Create / Write / Copy"
+msgstr ""
+
+#. module: base
+#: view:ir.sequence:0
+msgid "Second: %(sec)s"
+msgstr ""
+
+#. module: base
+#: field:ir.actions.act_window,view_mode:0
+msgid "View Mode"
+msgstr ""
+
+#. module: base
+#: help:res.partner.bank,footer:0
+msgid ""
+"Display this bank account on the footer of printed documents like invoices "
+"and sales orders."
+msgstr ""
+
+#. module: base
+#: selection:base.language.install,lang:0
+msgid "Spanish / Español"
+msgstr ""
+
+#. module: base
+#: selection:base.language.install,lang:0
+msgid "Korean (KP) / 한국어 (KP)"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.ax
+msgid "Åland Islands"
+msgstr ""
+
+#. module: base
+#: field:res.company,logo:0
+msgid "Logo"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_l10n_cr
+msgid "Costa Rica - Accounting"
+msgstr ""
+
+#. module: base
+#: selection:ir.actions.act_url,target:0
+#: selection:ir.actions.act_window,target:0
+msgid "New Window"
+msgstr ""
+
+#. module: base
+#: field:ir.values,action_id:0
+msgid "Action (change only)"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_subscription
+msgid "Recurring Documents"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.bs
+msgid "Bahamas"
+msgstr ""
+
+#. module: base
+#: field:ir.rule,perm_create:0
+msgid "Apply for Create"
+msgstr ""
+
+#. module: base
+#: model:ir.module.category,name:base.module_category_tools
+msgid "Extra Tools"
+msgstr ""
+
+#. module: base
+#: view:ir.attachment:0
+msgid "Attachment"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.ie
+msgid "Ireland"
+msgstr ""
+
+#. module: base
+#: help:res.company,rml_header1:0
+msgid ""
+"Appears by default on the top right corner of your printed documents (report "
+"header)."
+msgstr ""
+
+#. module: base
+#: field:base.module.update,update:0
+msgid "Number of modules updated"
+msgstr ""
+
+#. module: base
+#: field:ir.cron,function:0
+msgid "Method"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_auth_crypt
+msgid "Password Encryption"
+msgstr ""
+
+#. module: base
+#: view:workflow.activity:0
+msgid "Workflow Activity"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_hr_timesheet_sheet
+msgid ""
+"\n"
+"Record and validate timesheets and attendances easily\n"
+"=====================================================\n"
+"\n"
+"This application supplies a new screen enabling you to manage both "
+"attendances (Sign in/Sign out) and your work encoding (timesheet) by period. "
+"Timesheet entries are made by employees each day. At the end of the defined "
+"period, employees validate their sheet and the manager must then approve his "
+"team's entries. Periods are defined in the company forms and you can set "
+"them to run monthly or weekly.\n"
+"\n"
+"The complete timesheet validation process is:\n"
+"---------------------------------------------\n"
+"* Draft sheet\n"
+"* Confirmation at the end of the period by the employee\n"
+"* Validation by the project manager\n"
+"\n"
+"The validation can be configured in the company:\n"
+"------------------------------------------------\n"
+"* Period size (Day, Week, Month)\n"
+"* Maximal difference between timesheet and attendances\n"
+"    "
+msgstr ""
+
+#. module: base
+#: code:addons/base/ir/ir_fields.py:341
+#, python-format
+msgid ""
+"No matching record found for %(field_type)s '%(value)s' in field '%%(field)s'"
+msgstr ""
+
+#. module: base
+#: field:change.password.user,new_passwd:0
+msgid "New Password"
+msgstr ""
+
+#. module: base
+#: model:ir.actions.act_window,help:base.action_ui_view
+msgid ""
+"Views allows you to personalize each view of OpenERP. You can add new "
+"fields, move fields, rename them or delete the ones that you do not need."
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_base_setup
+msgid "Initial Setup Tools"
+msgstr ""
+
+#. module: base
+#: field:ir.actions.act_window,groups_id:0
+#: model:ir.actions.act_window,name:base.action_res_groups
+#: field:ir.actions.report.xml,groups_id:0
+#: view:ir.actions.todo:0
+#: field:ir.actions.todo,groups_id:0
+#: field:ir.actions.wizard,groups_id:0
+#: view:ir.model:0
+#: field:ir.model.fields,groups:0
+#: field:ir.rule,groups:0
+#: view:ir.ui.menu:0
+#: field:ir.ui.menu,groups_id:0
+#: model:ir.ui.menu,name:base.menu_action_res_groups
+#: view:ir.ui.view:0
+#: field:ir.ui.view,groups_id:0
+#: view:res.groups:0
+#: field:res.users,groups_id:0
+msgid "Groups"
+msgstr ""
+
+#. module: base
+#: selection:base.language.install,lang:0
+msgid "Spanish (CL) / Español (CL)"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.bz
+msgid "Belize"
+msgstr ""
+
+#. module: base
+#: help:ir.actions.report.xml,header:0
+msgid "Add or not the corporate RML header"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_portal_anonymous
+msgid ""
+"\n"
+"Allow anonymous to Access Portal.\n"
+"=================================\n"
+" "
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.ge
+msgid "Georgia"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_l10n_be_invoice_bba
+msgid ""
+"\n"
+"    \n"
+"Belgian localization for in- and outgoing invoices (prereq to "
+"account_coda):\n"
+"============================================================================"
+"\n"
+"    - Rename 'reference' field labels to 'Communication'\n"
+"    - Add support for Belgian Structured Communication\n"
+"\n"
+"A Structured Communication can be generated automatically on outgoing "
+"invoices according to the following algorithms:\n"
+"-----------------------------------------------------------------------------"
+"----------------------------------------\n"
+"    1) Random : +++RRR/RRRR/RRRDD+++\n"
+"        **R..R =** Random Digits, **DD =** Check Digits\n"
+"    2) Date : +++DOY/YEAR/SSSDD+++\n"
+"        **DOY =** Day of the Year, **SSS =** Sequence Number, **DD =** Check "
+"Digits\n"
+"    3) Customer Reference +++RRR/RRRR/SSSDDD+++\n"
+"        **R..R =** Customer Reference without non-numeric characters, **SSS "
+"=** Sequence Number, **DD =** Check Digits  \n"
+"        \n"
+"The preferred type of Structured Communication and associated Algorithm can "
+"be\n"
+"specified on the Partner records. A 'random' Structured Communication will\n"
+"generated if no algorithm is specified on the Partner record. \n"
+"\n"
+"    "
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.pl
+msgid "Poland"
+msgstr ""
+
+#. module: base
+#: help:ir.actions.act_window,view_mode:0
+msgid ""
+"Comma-separated list of allowed view modes, such as 'form', 'tree', "
+"'calendar', etc. (Default: tree,form)"
+msgstr ""
+
+#. module: base
+#: code:addons/orm.py:3843
+#, python-format
+msgid "A document was modified since you last viewed it (%s:%d)"
+msgstr ""
+
+#. module: base
+#: view:workflow:0
+msgid "Workflow Editor"
+msgstr ""
+
+#. module: base
+#: selection:ir.module.module,state:0
+#: selection:ir.module.module.dependency,state:0
+msgid "To be removed"
+msgstr ""
+
+#. module: base
+#: model:ir.model,name:base.model_ir_sequence
+msgid "ir.sequence"
+msgstr ""
+
+#. module: base
+#: help:ir.actions.server,expression:0
+msgid ""
+"Enter the field/expression that will return the list. E.g. select the sale "
+"order in Object, and you can have loop on the sales order line. Expression = "
+"`object.order_line`."
+msgstr ""
+
+#. module: base
+#: field:ir.mail_server,smtp_debug:0
+msgid "Debugging"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_crm_helpdesk
+msgid ""
+"\n"
+"Helpdesk Management.\n"
+"====================\n"
+"\n"
+"Like records and processing of claims, Helpdesk and Support are good tools\n"
+"to trace your interventions. This menu is more adapted to oral "
+"communication,\n"
+"which is not necessarily related to a claim. Select a customer, add notes\n"
+"and categorize your interventions with a channel and a priority level.\n"
+"    "
+msgstr ""
+
+#. module: base
+#: help:ir.actions.act_window,view_type:0
+msgid ""
+"View type: Tree type to use for the tree view, set to 'tree' for a "
+"hierarchical tree view, or 'form' for a regular list view"
+msgstr ""
+
+#. module: base
+#: sql_constraint:ir.ui.view_sc:0
+msgid "Shortcut for this menu already exists!"
+msgstr ""
+
+#. module: base
+#: view:ir.rule:0
+msgid "Groups (no group = global)"
+msgstr ""
+
+#. module: base
+#: view:ir.module.module:0
+msgid "Extra"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.st
+msgid "Saint Tome (Sao Tome) and Principe"
+msgstr ""
+
+#. module: base
+#: selection:res.partner,type:0
+msgid "Invoice"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_product
+msgid ""
+"\n"
+"This is the base module for managing products and pricelists in OpenERP.\n"
+"========================================================================\n"
+"\n"
+"Products support variants, different pricing methods, suppliers "
+"information,\n"
+"make to stock/order, different unit of measures, packaging and properties.\n"
+"\n"
+"Pricelists support:\n"
+"-------------------\n"
+"    * Multiple-level of discount (by product, category, quantities)\n"
+"    * Compute price based on different criteria:\n"
+"        * Other pricelist\n"
+"        * Cost price\n"
+"        * List price\n"
+"        * Supplier price\n"
+"\n"
+"Pricelists preferences by product and/or partners.\n"
+"\n"
+"Print product labels with barcode.\n"
+"    "
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_account_analytic_default
+msgid ""
+"\n"
+"Set default values for your analytic accounts.\n"
+"==============================================\n"
+"\n"
+"Allows to automatically select analytic accounts based on criterions:\n"
+"---------------------------------------------------------------------\n"
+"    * Product\n"
+"    * Partner\n"
+"    * User\n"
+"    * Company\n"
+"    * Date\n"
+"    "
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.bb
+msgid "Barbados"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.mg
+msgid "Madagascar"
+msgstr ""
+
+#. module: base
+#: code:addons/base/ir/ir_model.py:127
+#, python-format
+msgid ""
+"The Object name must start with x_ and not contain any special character !"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_auth_oauth_signup
+msgid "Signup with OAuth2 Authentication"
+msgstr ""
+
+#. module: base
+#: selection:ir.model,state:0
+msgid "Custom Object"
+msgstr ""
+
+#. module: base
+#: model:ir.actions.act_window,name:base.action_menu_admin
+#: view:ir.ui.menu:0
+#: field:ir.ui.menu,name:0
+msgid "Menu"
+msgstr ""
+
+#. module: base
+#: field:res.currency,rate:0
+msgid "Current Rate"
+msgstr ""
+
+#. module: base
+#: selection:base.language.install,lang:0
+msgid "Greek / Ελληνικά"
+msgstr ""
+
+#. module: base
+#: field:res.company,custom_footer:0
+msgid "Custom Footer"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_sale_crm
+msgid "Opportunity to Quotation"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_sale_analytic_plans
+msgid ""
+"\n"
+"The base module to manage analytic distribution and sales orders.\n"
+"=================================================================\n"
+"\n"
+"Using this module you will be able to link analytic accounts to sales "
+"orders.\n"
+"    "
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_l10n_us
+msgid ""
+"\n"
+"United States - Chart of accounts.\n"
+"==================================\n"
+"    "
+msgstr ""
+
+#. module: base
+#: field:ir.actions.act_url,target:0
+msgid "Action Target"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.ai
+msgid "Anguilla"
+msgstr ""
+
+#. module: base
+#: model:ir.actions.report.xml,name:base.report_ir_model_overview
+msgid "Model Overview"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_product_margin
+msgid "Margins by Products"
+msgstr ""
+
+#. module: base
+#: model:ir.ui.menu,name:base.menu_invoiced
+msgid "Invoicing"
+msgstr ""
+
+#. module: base
+#: field:ir.ui.view_sc,name:0
+msgid "Shortcut Name"
+msgstr ""
+
+#. module: base
+#: field:res.partner,contact_address:0
+msgid "Complete Address"
+msgstr ""
+
+#. module: base
+#: help:ir.actions.act_window,limit:0
+msgid "Default limit for the list view"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_document
+msgid ""
+"\n"
+"This is a complete document management system.\n"
+"==============================================\n"
+"    * User Authentication\n"
+"    * Document Indexation:- .pptx and .docx files are not supported in "
+"Windows platform.\n"
+"    * Dashboard for Document that includes:\n"
+"        * New Files (list)\n"
+"        * Files by Resource Type (graph)\n"
+"        * Files by Partner (graph)\n"
+"        * Files Size by Month (graph)\n"
+msgstr ""
+
+#. module: base
+#: view:ir.actions.report.xml:0
+msgid "RML Report"
+msgstr ""
+
+#. module: base
+#: model:ir.ui.menu,name:base.menu_translation_export
+msgid "Import / Export"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_sale
+msgid ""
+"\n"
+"Manage sales quotations and orders\n"
+"==================================\n"
+"\n"
+"This application allows you to manage your sales goals in an effective and "
+"efficient manner by keeping track of all sales orders and history.\n"
+"\n"
+"It handles the full sales workflow:\n"
+"\n"
+"* **Quotation** -> **Sales order** -> **Invoice**\n"
+"\n"
+"Preferences (only with Warehouse Management installed)\n"
+"------------------------------------------------------\n"
+"\n"
+"If you also installed the Warehouse Management, you can deal with the "
+"following preferences:\n"
+"\n"
+"* Shipping: Choice of delivery at once or partial delivery\n"
+"* Invoicing: choose how invoices will be paid\n"
+"* Incoterms: International Commercial terms\n"
+"\n"
+"You can choose flexible invoicing methods:\n"
+"\n"
+"* *On Demand*: Invoices are created manually from Sales Orders when needed\n"
+"* *On Delivery Order*: Invoices are generated from picking (delivery)\n"
+"* *Before Delivery*: A Draft invoice is created and must be paid before "
+"delivery\n"
+"\n"
+"\n"
+"The Dashboard for the Sales Manager will include\n"
+"------------------------------------------------\n"
+"* My Quotations\n"
+"* Monthly Turnover (Graph)\n"
+"    "
+msgstr ""
+
+#. module: base
+#: field:ir.actions.act_window,res_id:0
+#: field:ir.model.data,res_id:0
+#: field:ir.translation,res_id:0
+#: field:ir.values,res_id:0
+msgid "Record ID"
+msgstr ""
+
+#. module: base
+#: field:ir.actions.server,email:0
+msgid "Email Address"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_google_docs
+msgid ""
+"\n"
+"Module to attach a google document to any model.\n"
+"================================================\n"
+msgstr ""
+
+#. module: base
+#: code:addons/base/ir/ir_fields.py:333
+#, python-format
+msgid "Found multiple matches for field '%%(field)s' (%d matches)"
+msgstr ""
+
+#. module: base
+#: selection:base.language.install,lang:0
+msgid "French (BE) / Français (BE)"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_l10n_pe
+msgid ""
+"\n"
+"Peruvian accounting chart and tax localization. According the PCGE 2010.\n"
+"========================================================================\n"
+"\n"
+"Plan contable peruano e impuestos de acuerdo a disposiciones vigentes de la\n"
+"SUNAT 2011 (PCGE 2010).\n"
+"\n"
+"    "
+msgstr ""
+
+#. module: base
+#: view:ir.actions.server:0
+#: field:workflow.activity,action_id:0
+msgid "Server Action"
+msgstr ""
+
+#. module: base
+#: help:ir.actions.client,params:0
+msgid "Arguments sent to the client along withthe view tag"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,summary:base.module_contacts
+msgid "Contacts, People and Companies"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.tt
+msgid "Trinidad and Tobago"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.lv
+msgid "Latvia"
+msgstr ""
+
+#. module: base
+#: view:ir.actions.server:0
+msgid "Field Mappings"
+msgstr ""
+
+#. module: base
+#: view:base.language.export:0
+msgid "Export Translations"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_auth_crypt
+msgid ""
+"\n"
+"Ecrypted passwords\n"
+"==================\n"
+"\n"
+"Interaction with LDAP authentication:\n"
+"-------------------------------------\n"
+"This module is currently not compatible with the ``user_ldap`` module and\n"
+"will disable LDAP authentication completely if installed at the same time.\n"
+msgstr ""
+
+#. module: base
+#: model:res.groups,name:base.group_hr_manager
+#: model:res.groups,name:base.group_sale_manager
+#: model:res.groups,name:base.group_tool_manager
+msgid "Manager"
+msgstr ""
+
+#. module: base
+#: code:addons/base/ir/ir_model.py:727
+#, python-format
+msgid "Sorry, you are not allowed to access this document."
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.py
+msgid "Paraguay"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.fj
+msgid "Fiji"
+msgstr ""
+
+#. module: base
+#: view:ir.actions.report.xml:0
+msgid "Report Xml"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_purchase
+msgid ""
+"\n"
+"Manage goods requirement by Purchase Orders easily\n"
+"==================================================\n"
+"\n"
+"Purchase management enables you to track your suppliers' price quotations "
+"and convert them into purchase orders if necessary.\n"
+"OpenERP has several methods of monitoring invoices and tracking the receipt "
+"of ordered goods. You can handle partial deliveries in OpenERP, so you can "
+"keep track of items that are still to be delivered in your orders, and you "
+"can issue reminders automatically.\n"
+"\n"
+"OpenERP’s replenishment management rules enable the system to generate draft "
+"purchase orders automatically, or you can configure it to run a lean process "
+"driven entirely by current production needs.\n"
+"\n"
+"Dashboard / Reports for Purchase Management will include:\n"
+"---------------------------------------------------------\n"
+"* Request for Quotations\n"
+"* Purchase Orders Waiting Approval \n"
+"* Monthly Purchases by Category\n"
+"* Receptions Analysis\n"
+"* Purchase Analysis\n"
+"    "
+msgstr ""
+
+#. module: base
+#: model:ir.model,name:base.model_ir_actions_act_window_close
+msgid "ir.actions.act_window_close"
+msgstr ""
+
+#. module: base
+#: field:ir.server.object.lines,col1:0
+msgid "Destination"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.lt
+msgid "Lithuania"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_web_graph
+msgid ""
+"\n"
+"Graph Views for Web Client.\n"
+"===========================\n"
+"\n"
+"    * Parse a <graph> view but allows changing dynamically the presentation\n"
+"    * Graph Types: pie, lines, areas, bars, radar\n"
+"    * Stacked/Not Stacked for areas and bars\n"
+"    * Legends: top, inside (top/left), hidden\n"
+"    * Features: download as PNG or CSV, browse data grid, switch "
+"orientation\n"
+"    * Unlimited \"Group By\" levels (not stacked), two cross level analysis "
+"(stacked)\n"
+msgstr ""
+
+#. module: base
+#: view:res.groups:0
+msgid "Inherited"
+msgstr ""
+
+#. module: base
+#: code:addons/base/ir/ir_fields.py:146
+#, python-format
+msgid "yes"
+msgstr ""
+
+#. module: base
+#: field:ir.model.fields,serialization_field_id:0
+msgid "Serialization Field"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_l10n_be_hr_payroll
+msgid ""
+"\n"
+"Belgian Payroll Rules.\n"
+"======================\n"
+"\n"
+"    * Employee Details\n"
+"    * Employee Contracts\n"
+"    * Passport based Contract\n"
+"    * Allowances/Deductions\n"
+"    * Allow to configure Basic/Gross/Net Salary\n"
+"    * Employee Payslip\n"
+"    * Monthly Payroll Register\n"
+"    * Integrated with Holiday Management\n"
+"    * Salary Maj, ONSS, Withholding Tax, Child Allowance, ...\n"
+"    "
+msgstr ""
+
+#. module: base
+#: code:addons/base/ir/ir_fields.py:174
+#, python-format
+msgid "'%s' does not seem to be an integer for field '%%(field)s'"
+msgstr ""
+
+#. module: base
+#: model:ir.module.category,description:base.module_category_report_designer
+msgid ""
+"Lets you install various tools to simplify and enhance OpenERP's report "
+"creation."
+msgstr ""
+
+#. module: base
+#: view:res.lang:0
+msgid "%y - Year without century [00,99]."
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_account_anglo_saxon
+msgid ""
+"\n"
+"This module supports the Anglo-Saxon accounting methodology by changing the "
+"accounting logic with stock transactions.\n"
+"============================================================================="
+"========================================\n"
+"\n"
+"The difference between the Anglo-Saxon accounting countries and the Rhine \n"
+"(or also called Continental accounting) countries is the moment of taking \n"
+"the Cost of Goods Sold versus Cost of Sales. Anglo-Saxons accounting does \n"
+"take the cost when sales invoice is created, Continental accounting will \n"
+"take the cost at the moment the goods are shipped.\n"
+"\n"
+"This module will add this functionality by using a interim account, to \n"
+"store the value of shipped goods and will contra book this interim \n"
+"account when the invoice is created to transfer this amount to the \n"
+"debtor or creditor account. Secondly, price differences between actual \n"
+"purchase price and fixed product standard price are booked on a separate \n"
+"account."
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.si
+msgid "Slovenia"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_base_status
+msgid ""
+"\n"
+"This module handles state and stage. It is derived from the crm_base and "
+"crm_case classes from crm.\n"
+"============================================================================="
+"======================\n"
+"\n"
+"    * ``base_state``: state management\n"
+"    * ``base_stage``: stage management\n"
+"    "
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_web_linkedin
+msgid "LinkedIn Integration"
+msgstr ""
+
+#. module: base
+#: code:addons/orm.py:2021
+#: code:addons/orm.py:2032
+#, python-format
+msgid "Invalid Object Architecture!"
+msgstr ""
+
+#. module: base
+#: code:addons/base/ir/ir_model.py:373
+#: code:addons/base/ir/ir_model.py:375
+#: code:addons/base/ir/ir_model.py:405
+#: code:addons/base/ir/ir_model.py:419
+#: code:addons/base/ir/ir_model.py:421
+#: code:addons/base/ir/ir_model.py:423
+#: code:addons/base/ir/ir_model.py:430
+#: code:addons/base/ir/ir_model.py:433
+#: code:addons/base/module/wizard/base_update_translations.py:39
+#, python-format
+msgid "Error!"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_l10n_fr_rib
+msgid "French RIB Bank Details"
+msgstr ""
+
+#. module: base
+#: view:res.lang:0
+msgid "%p - Equivalent of either AM or PM."
+msgstr ""
+
+#. module: base
+#: view:ir.actions.server:0
+msgid "Iteration Actions"
+msgstr ""
+
+#. module: base
+#: help:multi_company.default,company_id:0
+msgid "Company where the user is connected"
+msgstr ""
+
+#. module: base
+#: model:res.groups,comment:base.group_sale_manager
+msgid ""
+"the user will have an access to the sales configuration as well as statistic "
+"reports."
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.nz
+msgid "New Zealand"
+msgstr ""
+
+#. module: base
+#: field:ir.exports.line,name:0
+#: view:ir.model.fields:0
+#: field:res.partner.bank.type.field,name:0
+msgid "Field Name"
+msgstr ""
+
+#. module: base
+#: model:ir.actions.act_window,help:base.action_country
+msgid ""
+"Display and manage the list of all countries that can be assigned to your "
+"partner records. You can create or delete countries to make sure the ones "
+"you are working on will be maintained."
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.nf
+msgid "Norfolk Island"
+msgstr ""
+
+#. module: base
+#: selection:base.language.install,lang:0
+msgid "Korean (KR) / 한국어 (KR)"
+msgstr ""
+
+#. module: base
+#: help:ir.model.fields,model:0
+msgid "The technical name of the model this field belongs to"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_hr_expense
+msgid "Expense Management"
+msgstr ""
+
+#. module: base
+#: field:ir.actions.server,action_id:0
+#: selection:ir.actions.server,state:0
+#: view:ir.values:0
+msgid "Client Action"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_subscription
+msgid ""
+"\n"
+"Create recurring documents.\n"
+"===========================\n"
+"\n"
+"This module allows to create new documents and add subscriptions on that "
+"document.\n"
+"\n"
+"e.g. To have an invoice generated automatically periodically:\n"
+"-------------------------------------------------------------\n"
+"    * Define a document type based on Invoice object\n"
+"    * Define a subscription whose source document is the document defined "
+"as\n"
+"      above. Specify the interval information and partner to be invoice.\n"
+"    "
+msgstr ""
+
+#. module: base
+#: view:res.company:0
+msgid "e.g. Global Business Solutions"
+msgstr ""
+
+#. module: base
+#: field:res.company,rml_header1:0
+msgid "Company Tagline"
+msgstr ""
+
+#. module: base
+#: code:addons/base/res/res_users.py:674
+#: model:ir.model,name:base.model_ir_module_category
+#: field:ir.module.module,application:0
+#: field:res.groups,category_id:0
+#: view:res.users:0
+#, python-format
+msgid "Application"
+msgstr ""
+
+#. module: base
+#: model:res.groups,comment:base.group_hr_manager
+msgid ""
+"the user will have an access to the human resources configuration as well as "
+"statistic reports."
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_l10n_pl
+msgid ""
+"\n"
+"This is the module to manage the accounting chart and taxes for Poland in "
+"OpenERP.\n"
+"============================================================================="
+"=====\n"
+"\n"
+"To jest moduł do tworzenia wzorcowego planu kont i podstawowych ustawień do "
+"podatków\n"
+"VAT 0%, 7% i 22%. Moduł ustawia też konta do kupna i sprzedaży towarów "
+"zakładając,\n"
+"że wszystkie towary są w obrocie hurtowym.\n"
+"    "
+msgstr ""
+
+#. module: base
+#: field:ir.actions.client,params_store:0
+msgid "Params storage"
+msgstr ""
+
+#. module: base
+#: code:addons/base/module/module.py:525
+#, python-format
+msgid "Can not upgrade module '%s'. It is not installed."
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.cu
+msgid "Cuba"
+msgstr ""
+
+#. module: base
+#: code:addons/report_sxw.py:443
+#, python-format
+msgid "Unknown report type: %s"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,summary:base.module_hr_expense
+msgid "Expenses Validation, Invoicing"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_l10n_be_hr_payroll_account
+msgid ""
+"\n"
+"Accounting Data for Belgian Payroll Rules.\n"
+"==========================================\n"
+"    "
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.am
+msgid "Armenia"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,summary:base.module_hr_evaluation
+msgid "Periodical Evaluations, Appraisals, Surveys"
+msgstr ""
+
+#. module: base
+#: model:ir.actions.act_window,name:base.ir_property_form
+#: model:ir.ui.menu,name:base.menu_ir_property_form_all
+msgid "Configuration Parameters"
+msgstr ""
+
+#. module: base
+#: constraint:ir.cron:0
+msgid "Invalid arguments"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.se
+msgid "Sweden"
+msgstr ""
+
+#. module: base
+#: field:ir.actions.report.xml,report_file:0
+msgid "Report File"
+msgstr ""
+
+#. module: base
+#: selection:ir.actions.act_window.view,view_mode:0
+#: selection:ir.ui.view,type:0
+msgid "Gantt"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_l10n_in_hr_payroll
+msgid ""
+"\n"
+"Indian Payroll Salary Rules.\n"
+"============================\n"
+"\n"
+"    -Configuration of hr_payroll for India localization\n"
+"    -All main contributions rules for India payslip.\n"
+"    * New payslip report\n"
+"    * Employee Contracts\n"
+"    * Allow to configure Basic / Gross / Net Salary\n"
+"    * Employee PaySlip\n"
+"    * Allowance / Deduction\n"
+"    * Integrated with Holiday Management\n"
+"    * Medical Allowance, Travel Allowance, Child Allowance, ...\n"
+"    - Payroll Advice and Report\n"
+"    - Yearly Salary by Head and Yearly Salary by Employee Report\n"
+"    "
+msgstr ""
+
+#. module: base
+#: code:addons/orm.py:3871
+#, python-format
+msgid "Missing document(s)"
+msgstr ""
+
+#. module: base
+#: model:ir.model,name:base.model_res_partner_bank_type
+#: field:res.partner.bank,state:0
+#: view:res.partner.bank.type:0
+msgid "Bank Account Type"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_hr_expense
+msgid ""
+"\n"
+"Manage expenses by Employees\n"
+"============================\n"
+"\n"
+"This application allows you to manage your employees' daily expenses. It "
+"gives you access to your employees’ fee notes and give you the right to "
+"complete and validate or refuse the notes. After validation it creates an "
+"invoice for the employee.\n"
+"Employee can encode their own expenses and the validation flow puts it "
+"automatically in the accounting after validation by managers.\n"
+"\n"
+"\n"
+"The whole flow is implemented as:\n"
+"---------------------------------\n"
+"* Draft expense\n"
+"* Confirmation of the sheet by the employee\n"
+"* Validation by his manager\n"
+"* Validation by the accountant and receipt creation\n"
+"\n"
+"This module also uses analytic accounting and is compatible with the invoice "
+"on timesheet module so that you are able to automatically re-invoice your "
+"customers' expenses if your work by project.\n"
+"    "
+msgstr ""
+
+#. module: base
+#: view:base.language.export:0
+msgid ""
+"For more details about translating OpenERP in your language, please refer to "
+"the"
+msgstr ""
+
+#. module: base
+#: field:res.partner,image:0
+msgid "Image"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.at
+msgid "Austria"
+msgstr ""
+
+#. module: base
+#: selection:ir.actions.act_window.view,view_mode:0
+#: model:ir.module.module,shortdesc:base.module_base_calendar
+#: model:ir.ui.menu,name:base.menu_calendar_configuration
+#: selection:ir.ui.view,type:0
+msgid "Calendar"
+msgstr ""
+
+#. module: base
+#: model:ir.module.category,name:base.module_category_knowledge_management
+msgid "Knowledge"
+msgstr ""
+
+#. module: base
+#: field:workflow.activity,signal_send:0
+msgid "Signal (subflow.*)"
+msgstr ""
+
+#. module: base
+#: code:addons/orm.py:4685
+#, python-format
+msgid ""
+"Invalid \"order\" specified. A valid \"order\" specification is a comma-"
+"separated list of valid field names (optionally followed by asc/desc for the "
+"direction)"
+msgstr ""
+
+#. module: base
+#: model:ir.model,name:base.model_ir_module_module_dependency
+msgid "Module dependency"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.bd
+msgid "Bangladesh"
+msgstr ""
+
+#. module: base
+#: model:ir.actions.act_window,help:base.action_partner_title_contact
+msgid ""
+"Manage the contact titles you want to have available in your system and the "
+"way you want to print them in letters and other documents. Some example: "
+"Mr., Mrs. "
+msgstr ""
+
+#. module: base
+#: view:ir.model.access:0
+#: view:res.groups:0
+#: field:res.groups,model_access:0
+msgid "Access Controls"
+msgstr ""
+
+#. module: base
+#: code:addons/base/ir/ir_model.py:278
+#, python-format
+msgid ""
+"The Selection Options expression is not a valid Pythonic expression.Please "
+"provide an expression in the [('key','Label'), ...] format."
+msgstr ""
+
+#. module: base
+#: model:res.groups,name:base.group_survey_user
+msgid "Survey / User"
+msgstr ""
+
+#. module: base
+#: view:ir.module.module:0
+#: field:ir.module.module,dependencies_id:0
+msgid "Dependencies"
+msgstr ""
+
+#. module: base
+#: field:multi_company.default,company_id:0
+msgid "Main Company"
+msgstr ""
+
+#. module: base
+#: field:ir.ui.menu,web_icon_hover:0
+msgid "Web Icon File (hover)"
+msgstr ""
+
+#. module: base
+#: help:res.currency,name:0
+msgid "Currency Code (ISO 4217)"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_hr_contract
+msgid "Employee Contracts"
+msgstr ""
+
+#. module: base
+#: view:ir.actions.server:0
+msgid ""
+"If you use a formula type, use a python expression using the variable "
+"'object'."
+msgstr ""
+
+#. module: base
+#: constraint:res.company:0
+msgid "Error! You can not create recursive companies."
+msgstr ""
+
+#. module: base
+#: field:res.partner,birthdate:0
+msgid "Birthdate"
+msgstr ""
+
+#. module: base
+#: model:ir.actions.act_window,name:base.action_partner_title_contact
+#: model:ir.ui.menu,name:base.menu_partner_title_contact
+msgid "Contact Titles"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_product_manufacturer
+msgid "Products Manufacturers"
+msgstr ""
+
+#. module: base
+#: code:addons/base/ir/ir_mail_server.py:239
+#, python-format
+msgid "SMTP-over-SSL mode unavailable"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_survey
+#: model:ir.ui.menu,name:base.next_id_10
+msgid "Survey"
+msgstr ""
+
+#. module: base
+#: selection:base.language.install,lang:0
+msgid "Spanish (DO) / Español (DO)"
+msgstr ""
+
+#. module: base
+#: model:ir.model,name:base.model_workflow_activity
+msgid "workflow.activity"
+msgstr ""
+
+#. module: base
+#: view:base.language.export:0
+msgid "Export Complete"
+msgstr ""
+
+#. module: base
+#: help:ir.ui.view_sc,res_id:0
+msgid ""
+"Reference of the target resource, whose model/table depends on the 'Resource "
+"Name' field."
+msgstr ""
+
+#. module: base
+#: field:ir.model.fields,select_level:0
+msgid "Searchable"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.uy
+msgid "Uruguay"
+msgstr ""
+
+#. module: base
+#: selection:base.language.install,lang:0
+msgid "Finnish / Suomi"
+msgstr ""
+
+#. module: base
+#: view:ir.config_parameter:0
+msgid "System Properties"
+msgstr ""
+
+#. module: base
+#: field:ir.sequence,prefix:0
+msgid "Prefix"
+msgstr ""
+
+#. module: base
+#: selection:base.language.install,lang:0
+msgid "German / Deutsch"
+msgstr ""
+
+#. module: base
+#: view:ir.actions.server:0
+msgid "Fields Mapping"
+msgstr ""
+
+#. module: base
+#: model:res.partner.title,name:base.res_partner_title_sir
+#: model:res.partner.title,shortcut:base.res_partner_title_sir
+msgid "Sir"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_l10n_ca
+msgid ""
+"\n"
+"This is the module to manage the English and French - Canadian accounting "
+"chart in OpenERP.\n"
+"============================================================================="
+"==============\n"
+"\n"
+"Canadian accounting charts and localizations.\n"
+"    "
+msgstr ""
+
+#. module: base
+#: view:base.module.import:0
+msgid "Select module package to import (.zip file):"
+msgstr ""
+
+#. module: base
+#: field:base.language.export,modules:0
+msgid "Modules To Export"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.mt
+msgid "Malta"
+msgstr ""
+
+#. module: base
+#: code:addons/base/ir/ir_model.py:733
+#, python-format
+msgid ""
+"Only users with the following access level are currently allowed to do that"
+msgstr ""
+
+#. module: base
+#: field:ir.actions.server,fields_lines:0
+msgid "Field Mappings."
+msgstr ""
+
+#. module: base
+#: selection:res.request,priority:0
+msgid "High"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_mrp
+msgid ""
+"\n"
+"Manage the Manufacturing process in OpenERP\n"
+"===========================================\n"
+"\n"
+"The manufacturing module allows you to cover planning, ordering, stocks and "
+"the manufacturing or assembly of products from raw materials and components. "
+"It handles the consumption and production of products according to a bill of "
+"materials and the necessary operations on machinery, tools or human "
+"resources according to routings.\n"
+"\n"
+"It supports complete integration and planification of stockable goods, "
+"consumables or services. Services are completely integrated with the rest of "
+"the software. For instance, you can set up a sub-contracting service in a "
+"bill of materials to automatically purchase on order the assembly of your "
+"production.\n"
+"\n"
+"Key Features\n"
+"------------\n"
+"* Make to Stock/Make to Order\n"
+"* Multi-level bill of materials, no limit\n"
+"* Multi-level routing, no limit\n"
+"* Routing and work center integrated with analytic accounting\n"
+"* Periodical scheduler computation \n"
+"* Allows to browse bills of materials in a complete structure that includes "
+"child and phantom bills of materials\n"
+"\n"
+"Dashboard / Reports for MRP will include:\n"
+"-----------------------------------------\n"
+"* Procurements in Exception (Graph)\n"
+"* Stock Value Variation (Graph)\n"
+"* Work Order Analysis\n"
+"    "
+msgstr ""
+
+#. module: base
+#: view:ir.attachment:0
+#: field:ir.attachment,description:0
+#: field:ir.mail_server,name:0
+#: field:ir.module.category,description:0
+#: view:ir.module.module:0
+#: field:ir.module.module,description:0
+msgid "Description"
+msgstr ""
+
+#. module: base
+#: model:ir.actions.act_window,name:base.action_workflow_instance_form
+#: model:ir.ui.menu,name:base.menu_workflow_instance
+msgid "Instances"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_purchase_requisition
+msgid ""
+"\n"
+"This module allows you to manage your Purchase Requisition.\n"
+"===========================================================\n"
+"\n"
+"When a purchase order is created, you now have the opportunity to save the\n"
+"related requisition. This new object will regroup and will allow you to "
+"easily\n"
+"keep track and order all your purchase orders.\n"
+msgstr ""
+
+#. module: base
+#: help:ir.mail_server,smtp_host:0
+msgid "Hostname or IP of SMTP server"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.aq
+msgid "Antarctica"
+msgstr ""
+
+#. module: base
+#: view:res.partner:0
+msgid "Persons"
+msgstr ""
+
+#. module: base
+#: view:base.language.import:0
+msgid "_Import"
+msgstr ""
+
+#. module: base
+#: field:res.users,action_id:0
+msgid "Home Action"
+msgstr ""
+
+#. module: base
+#: field:res.lang,grouping:0
+msgid "Separator Format"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_report_webkit
+msgid "Webkit Report Engine"
+msgstr ""
+
+#. module: base
+#: model:ir.ui.menu,name:base.next_id_9
+msgid "Database Structure"
+msgstr ""
+
+#. module: base
+#: model:ir.actions.act_window,name:base.action_partner_mass_mail
+msgid "Mass Mailing"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.yt
+msgid "Mayotte"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_crm_todo
+msgid "Tasks on CRM"
+msgstr ""
+
+#. module: base
+#: help:ir.model.fields,relation_field:0
+msgid ""
+"For one2many fields, the field on the target model that implement the "
+"opposite many2one relationship"
+msgstr ""
+
+#. module: base
+#: view:ir.rule:0
+msgid "Interaction between rules"
+msgstr ""
+
+#. module: base
+#: field:res.company,rml_footer:0
+#: field:res.company,rml_footer_readonly:0
+msgid "Report Footer"
+msgstr ""
+
+#. module: base
+#: selection:res.lang,direction:0
+msgid "Right-to-Left"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.sx
+msgid "Sint Maarten (Dutch part)"
+msgstr ""
+
+#. module: base
+#: view:ir.actions.act_window:0
+#: model:ir.actions.act_window,name:base.actions_ir_filters_view
+#: view:ir.filters:0
+#: model:ir.model,name:base.model_ir_filters
+msgid "Filters"
+msgstr ""
+
+#. module: base
+#: model:ir.actions.act_window,name:base.ir_cron_act
+#: view:ir.cron:0
+#: model:ir.ui.menu,name:base.menu_ir_cron_act
+msgid "Scheduled Actions"
+msgstr ""
+
+#. module: base
+#: model:ir.module.category,name:base.module_category_reporting
+#: model:ir.ui.menu,name:base.menu_lunch_reporting
+#: model:ir.ui.menu,name:base.menu_reporting
+msgid "Reporting"
+msgstr ""
+
+#. module: base
+#: field:res.partner,title:0
+#: field:res.partner.title,name:0
+msgid "Title"
+msgstr ""
+
+#. module: base
+#: help:ir.property,res_id:0
+msgid "If not set, acts as a default value for new resources"
+msgstr ""
+
+#. module: base
+#: code:addons/orm.py:4246
+#, python-format
+msgid "Recursivity Detected."
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_l10n_et
+msgid "Ethiopia - Accounting"
+msgstr ""
+
+#. module: base
+#: code:addons/base/module/module.py:366
+#, python-format
+msgid "Recursion error in modules dependencies !"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_analytic_user_function
+msgid ""
+"\n"
+"This module allows you to define what is the default function of a specific "
+"user on a given account.\n"
+"============================================================================="
+"=======================\n"
+"\n"
+"This is mostly used when a user encodes his timesheet: the values are "
+"retrieved\n"
+"and the fields are auto-filled. But the possibility to change these values "
+"is\n"
+"still available.\n"
+"\n"
+"Obviously if no data has been recorded for the current account, the default\n"
+"value is given as usual by the employee data so that this module is "
+"perfectly\n"
+"compatible with older configurations.\n"
+"\n"
+"    "
+msgstr ""
+
+#. module: base
+#: view:ir.model:0
+msgid "Create a Menu"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.tg
+msgid "Togo"
+msgstr ""
+
+#. module: base
+#: field:ir.actions.act_window,res_model:0
+#: field:ir.actions.client,res_model:0
+msgid "Destination Model"
+msgstr ""
+
+#. module: base
+#: selection:ir.sequence,implementation:0
+msgid "Standard"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.ru
+msgid "Russian Federation"
+msgstr ""
+
+#. module: base
+#: selection:base.language.install,lang:0
+msgid "Urdu / اردو"
+msgstr ""
+
+#. module: base
+#: code:addons/base/ir/ir_model.py:740
+#: code:addons/orm.py:3567
+#: code:addons/orm.py:3860
+#: code:addons/orm.py:3902
+#, python-format
+msgid "Access Denied"
+msgstr ""
+
+#. module: base
+#: field:res.company,name:0
+msgid "Company Name"
+msgstr ""
+
+#. module: base
+#: code:addons/orm.py:2808
+#, python-format
+msgid ""
+"Invalid value for reference field \"%s.%s\" (last part must be a non-zero "
+"integer): \"%s\""
+msgstr ""
+
+#. module: base
+#: model:ir.actions.act_window,name:base.action_country
+#: model:ir.ui.menu,name:base.menu_country_partner
+msgid "Countries"
+msgstr ""
+
+#. module: base
+#: selection:ir.translation,type:0
+msgid "RML  (deprecated - use Report)"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_l10n_fr_hr_payroll
+msgid ""
+"\n"
+"French Payroll Rules.\n"
+"=====================\n"
+"\n"
+"    - Configuration of hr_payroll for French localization\n"
+"    - All main contributions rules for French payslip, for 'cadre' and 'non-"
+"cadre'\n"
+"    - New payslip report\n"
+"\n"
+"TODO:\n"
+"-----\n"
+"    - Integration with holidays module for deduction and allowance\n"
+"    - Integration with hr_payroll_account for the automatic "
+"account_move_line\n"
+"      creation from the payslip\n"
+"    - Continue to integrate the contribution. Only the main contribution "
+"are\n"
+"      currently implemented\n"
+"    - Remake the report under webkit\n"
+"    - The payslip.line with appears_in_payslip = False should appears in "
+"the\n"
+"      payslip interface, but not in the payslip report\n"
+"    "
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.pm
+msgid "Saint Pierre and Miquelon"
+msgstr ""
+
+#. module: base
+#: view:ir.actions.todo:0
+msgid "Search Actions"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_base_calendar
+msgid ""
+"\n"
+"This is a full-featured calendar system.\n"
+"========================================\n"
+"\n"
+"It supports:\n"
+"------------\n"
+"    - Calendar of events\n"
+"    - Recurring events\n"
+"\n"
+"If you need to manage your meetings, you should install the CRM module.\n"
+"    "
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.je
+msgid "Jersey"
+msgstr ""
+
+#. module: base
+#: model:ir.model,name:base.model_ir_translation
+msgid "ir.translation"
+msgstr ""
+
+#. module: base
+#: view:res.lang:0
+msgid "12. %w              ==> 5 ( Friday is the 6th day)"
+msgstr ""
+
+#. module: base
+#: constraint:res.partner.category:0
+msgid "Error ! You can not create recursive categories."
+msgstr ""
+
+#. module: base
+#: view:res.lang:0
+msgid "%x - Appropriate date representation."
+msgstr ""
+
+#. module: base
+#: view:res.partner:0
+msgid "Tag"
+msgstr ""
+
+#. module: base
+#: view:res.lang:0
+msgid "%d - Day of the month [01,31]."
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.tj
+msgid "Tajikistan"
+msgstr ""
+
+#. module: base
+#: selection:ir.module.module,license:0
+msgid "GPL-2 or later version"
+msgstr ""
+
+#. module: base
+#: selection:workflow.activity,kind:0
+msgid "Stop All"
+msgstr ""
+
+#. module: base
+#: field:res.company,paper_format:0
+msgid "Paper Format"
+msgstr ""
+
+#. module: base
+#: code:addons/base/module/module.py:644
+#, python-format
+msgid ""
+"Can not create the module file:\n"
+" %s"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.sk
+msgid "Slovakia"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.nr
+msgid "Nauru"
+msgstr ""
+
+#. module: base
+#: code:addons/base/res/res_company.py:166
+#, python-format
+msgid "Reg"
+msgstr ""
+
+#. module: base
+#: model:ir.model,name:base.model_ir_property
+msgid "ir.property"
+msgstr ""
+
+#. module: base
+#: selection:ir.actions.act_window,view_type:0
+#: selection:ir.actions.act_window.view,view_mode:0
+#: view:ir.ui.view:0
+#: selection:ir.ui.view,type:0
+msgid "Form"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.pf
+msgid "Polynesia (French)"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_l10n_it
+msgid ""
+"\n"
+"Piano dei conti italiano di un'impresa generica.\n"
+"================================================\n"
+"\n"
+"Italian accounting chart and localization.\n"
+"    "
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.me
+msgid "Montenegro"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_fetchmail
+msgid "Email Gateway"
+msgstr ""
+
+#. module: base
+#: code:addons/base/ir/ir_mail_server.py:469
+#, python-format
+msgid ""
+"Mail delivery failed via SMTP server '%s'.\n"
+"%s: %s"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.tk
+msgid "Tokelau"
+msgstr ""
+
+#. module: base
+#: view:ir.cron:0
+#: view:ir.module.module:0
+msgid "Technical Data"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_l10n_co
+msgid ""
+"\n"
+"Chart of account for Colombia\n"
+"=============================\n"
+"\n"
+"Source of this chart of account is here_.\n"
+"\n"
+"All the documentation available in this website is embeded in this module, "
+"to\n"
+"be sure when you open OpenERP it has all necesary information to manage \n"
+"accounting en Colombia.\n"
+"\n"
+"The law that enable this chart of account as valid for this country is \n"
+"available in this other link_.\n"
+"\n"
+"This module has the intention to put available out of the box the chart of \n"
+"account for Colombia in Openerp.\n"
+"\n"
+"We recommend install the module account_anglo_sxon to be able to have the "
+"cost\n"
+"accounting correctly setted in out invoices.\n"
+"\n"
+"After installing this module, the Configuration wizard for accounting is "
+"launched.\n"
+"    * We have the account templates which can be helpful to generate Charts "
+"of Accounts.\n"
+"    * On that particular wizard, you will be asked to pass the name of the "
+"company,\n"
+"      the chart template to follow, the no. of digits to generate, the code "
+"for your\n"
+"      account and bank account, currency to create journals.\n"
+"\n"
+".. _here: http://puc.com.co/\n"
+".. _link: http://puc.com.co/normatividad/\n"
+"    "
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_account_bank_statement_extensions
+msgid ""
+"\n"
+"Module that extends the standard account_bank_statement_line object for "
+"improved e-banking support.\n"
+"============================================================================="
+"======================\n"
+"\n"
+"This module adds:\n"
+"-----------------\n"
+"    - valuta date\n"
+"    - batch payments\n"
+"    - traceability of changes to bank statement lines\n"
+"    - bank statement line views\n"
+"    - bank statements balances report\n"
+"    - performance improvements for digital import of bank statement (via \n"
+"      'ebanking_import' context flag)\n"
+"    - name_search on res.partner.bank enhanced to allow search on bank \n"
+"      and iban account numbers\n"
+"    "
+msgstr ""
+
+#. module: base
+#: selection:ir.module.module,state:0
+#: selection:ir.module.module.dependency,state:0
+msgid "To be upgraded"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.ly
+msgid "Libya"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.cf
+msgid "Central African Republic"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.li
+msgid "Liechtenstein"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_project_issue_sheet
+msgid "Timesheet on Issues"
+msgstr ""
+
+#. module: base
+#: model:res.partner.title,name:base.res_partner_title_ltd
+msgid "Ltd"
+msgstr ""
+
+#. module: base
+#: model:ir.actions.server,name:base.action_run_ir_action_todo
+msgid "Run Remaining Action Todo"
+msgstr ""
+
+#. module: base
+#: field:res.partner,ean13:0
+msgid "EAN13"
+msgstr ""
+
+#. module: base
+#: code:addons/orm.py:2247
+#, python-format
+msgid "Invalid Architecture!"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.pt
+msgid "Portugal"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_share
+msgid "Share any Document"
+msgstr ""
+
+#. module: base
+#: field:workflow.transition,group_id:0
+msgid "Group Required"
+msgstr ""
+
+#. module: base
+#: view:res.lang:0
+msgid "6.  %d, %m         ==> 05, 12"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_l10n_it
+msgid "Italy - Accounting"
+msgstr ""
+
+#. module: base
+#: field:ir.actions.act_url,help:0
+#: field:ir.actions.act_window,help:0
+#: field:ir.actions.act_window_close,help:0
+#: field:ir.actions.actions,help:0
+#: field:ir.actions.client,help:0
+#: field:ir.actions.report.xml,help:0
+#: field:ir.actions.server,help:0
+#: field:ir.actions.wizard,help:0
+msgid "Action description"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_l10n_ma
+msgid ""
+"\n"
+"This is the base module to manage the accounting chart for Maroc.\n"
+"=================================================================\n"
+"\n"
+"Ce Module charge le modèle du plan de comptes standard Marocain et permet "
+"de\n"
+"générer les états comptables aux normes marocaines (Bilan, CPC (comptes de\n"
+"produits et charges), balance générale à 6 colonnes, Grand livre "
+"cumulatif...).\n"
+"L'intégration comptable a été validé avec l'aide du Cabinet d'expertise "
+"comptable\n"
+"Seddik au cours du troisième trimestre 2010."
+msgstr ""
+
+#. module: base
+#: help:ir.module.module,auto_install:0
+msgid ""
+"An auto-installable module is automatically installed by the system when all "
+"its dependencies are satisfied. If the module has no dependency, it is "
+"always installed."
+msgstr ""
+
+#. module: base
+#: model:ir.actions.act_window,name:base.res_lang_act_window
+#: model:ir.model,name:base.model_res_lang
+#: model:ir.ui.menu,name:base.menu_res_lang_act_window
+#: view:res.lang:0
+msgid "Languages"
+msgstr ""
+
+#. module: base
+#: selection:workflow.activity,join_mode:0
+#: selection:workflow.activity,split_mode:0
+msgid "Xor"
+msgstr ""
+
+#. module: base
+#: model:ir.module.category,name:base.module_category_localization_account_charts
+msgid "Account Charts"
+msgstr ""
+
+#. module: base
+#: model:ir.ui.menu,name:base.menu_event_main
+msgid "Events Organization"
+msgstr ""
+
+#. module: base
+#: model:ir.actions.act_window,name:base.action_partner_customer_form
+#: model:ir.actions.act_window,name:base.action_partner_form
+#: model:ir.ui.menu,name:base.menu_partner_form
+#: view:res.partner:0
+msgid "Customers"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.au
+msgid "Australia"
+msgstr ""
+
+#. module: base
+#: report:ir.module.reference:0
+msgid "Menu :"
+msgstr ""
+
+#. module: base
+#: selection:ir.model.fields,state:0
+msgid "Base Field"
+msgstr ""
+
+#. module: base
+#: model:ir.module.category,name:base.module_category_managing_vehicles_and_contracts
+msgid "Managing vehicles and contracts"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_base_setup
+msgid ""
+"\n"
+"This module helps to configure the system at the installation of a new "
+"database.\n"
+"============================================================================="
+"===\n"
+"\n"
+"Shows you a list of applications features to install from.\n"
+"\n"
+"    "
+msgstr ""
+
+#. module: base
+#: model:ir.model,name:base.model_res_config
+msgid "res.config"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_l10n_pl
+msgid "Poland - Accounting"
+msgstr ""
+
+#. module: base
+#: view:ir.cron:0
+msgid "Action to Trigger"
+msgstr ""
+
+#. module: base
+#: field:ir.model.constraint,name:0
+#: selection:ir.translation,type:0
+msgid "Constraint"
+msgstr ""
+
+#. module: base
+#: selection:ir.values,key:0
+#: selection:res.partner,type:0
+msgid "Default"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,summary:base.module_lunch
+msgid "Lunch Order, Meal, Food"
+msgstr ""
+
+#. module: base
+#: view:ir.model.fields:0
+#: field:ir.model.fields,required:0
+#: field:res.partner.bank.type.field,required:0
+msgid "Required"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.ro
+msgid "Romania"
+msgstr ""
+
+#. module: base
+#: field:ir.module.module,summary:0
+#: field:res.request.history,name:0
+msgid "Summary"
+msgstr ""
+
+#. module: base
+#: model:ir.module.category,name:base.module_category_hidden_dependency
+msgid "Dependency"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_portal
+msgid ""
+"\n"
+"Customize access to your OpenERP database to external users by creating "
+"portals.\n"
+"============================================================================="
+"===\n"
+"A portal defines a specific user menu and access rights for its members.  "
+"This\n"
+"menu can ben seen by portal members, anonymous users and any other user "
+"that\n"
+"have the access to technical features (e.g. the administrator).\n"
+"Also, each portal member is linked to a specific partner.\n"
+"\n"
+"The module also associates user groups to the portal users (adding a group "
+"in\n"
+"the portal automatically adds it to the portal users, etc).  That feature "
+"is\n"
+"very handy when used in combination with the module 'share'.\n"
+"    "
+msgstr ""
+
+#. module: base
+#: field:multi_company.default,expression:0
+msgid "Expression"
+msgstr ""
+
+#. module: base
+#: view:res.company:0
+msgid "Header/Footer"
+msgstr ""
+
+#. module: base
+#: help:ir.mail_server,sequence:0
+msgid ""
+"When no specific mail server is requested for a mail, the highest priority "
+"one is used. Default priority is 10 (smaller number = higher priority)"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,summary:base.module_sale
+msgid "Quotations, Sales Orders, Invoicing"
+msgstr ""
+
+#. module: base
+#: field:res.partner,parent_id:0
+msgid "Related Company"
+msgstr ""
+
+#. module: base
+#: help:ir.actions.act_url,help:0
+#: help:ir.actions.act_window,help:0
+#: help:ir.actions.act_window_close,help:0
+#: help:ir.actions.actions,help:0
+#: help:ir.actions.client,help:0
+#: help:ir.actions.report.xml,help:0
+#: help:ir.actions.server,help:0
+#: help:ir.actions.wizard,help:0
+msgid ""
+"Optional help text for the users with a description of the target view, such "
+"as its usage and purpose."
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.va
+msgid "Holy See (Vatican City State)"
+msgstr ""
+
+#. module: base
+#: field:base.module.import,module_file:0
+msgid "Module .ZIP file"
+msgstr ""
+
+#. module: base
+#: model:res.partner.category,name:base.res_partner_category_17
+msgid "Telecom sector"
+msgstr ""
+
+#. module: base
+#: field:workflow.transition,trigger_model:0
+msgid "Trigger Object"
+msgstr ""
+
+#. module: base
+#: sql_constraint:ir.sequence.type:0
+msgid "`code` must be unique."
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_knowledge
+msgid "Knowledge Management System"
+msgstr ""
+
+#. module: base
+#: view:workflow.activity:0
+#: field:workflow.activity,in_transitions:0
+msgid "Incoming Transitions"
+msgstr ""
+
+#. module: base
+#: field:ir.values,value_unpickle:0
+msgid "Default value or action reference"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_note_pad
+msgid ""
+"\n"
+"This module update memos inside OpenERP for using an external pad\n"
+"=================================================================\n"
+"\n"
+"Use for update your text memo in real time with the following user that you "
+"invite.\n"
+"\n"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_account_sequence
+msgid ""
+"\n"
+"This module maintains internal sequence number for accounting entries.\n"
+"======================================================================\n"
+"\n"
+"Allows you to configure the accounting sequences to be maintained.\n"
+"\n"
+"You can customize the following attributes of the sequence:\n"
+"-----------------------------------------------------------\n"
+"    * Prefix\n"
+"    * Suffix\n"
+"    * Next Number\n"
+"    * Increment Number\n"
+"    * Number Padding\n"
+"    "
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_project_timesheet
+msgid "Bill Time on Tasks"
+msgstr ""
+
+#. module: base
+#: model:ir.module.category,name:base.module_category_marketing
+#: model:ir.module.module,shortdesc:base.module_marketing
+#: model:ir.ui.menu,name:base.marketing_menu
+#: model:ir.ui.menu,name:base.menu_report_marketing
+msgid "Marketing"
+msgstr ""
+
+#. module: base
+#: view:res.partner.bank:0
+msgid "Bank account"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_web_calendar
+msgid ""
+"\n"
+"OpenERP Web Calendar view.\n"
+"==========================\n"
+"\n"
+msgstr ""
+
+#. module: base
+#: selection:base.language.install,lang:0
+msgid "Spanish (HN) / Español (HN)"
+msgstr ""
+
+#. module: base
+#: view:ir.sequence.type:0
+msgid "Sequence Type"
+msgstr ""
+
+#. module: base
+#: view:base.language.export:0
+msgid "Unicode/UTF-8"
+msgstr ""
+
+#. module: base
+#: selection:base.language.install,lang:0
+msgid "Hindi / हिंदी"
+msgstr ""
+
+#. module: base
+#: view:base.language.install:0
+#: model:ir.actions.act_window,name:base.action_view_base_language_install
+#: model:ir.ui.menu,name:base.menu_view_base_language_install
+msgid "Load a Translation"
+msgstr ""
+
+#. module: base
+#: field:ir.module.module,latest_version:0
+msgid "Installed Version"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_account_test
+msgid ""
+"\n"
+"Asserts on accounting.\n"
+"======================\n"
+"With this module you can manually check consistencies and inconsistencies of "
+"accounting module from menu Reporting/Accounting/Accounting Tests.\n"
+"\n"
+"You can write a query in order to create Consistency Test and you will get "
+"the result of the test \n"
+"in PDF format which can be accessed by Menu Reporting -> Accounting Tests, "
+"then select the test \n"
+"and print the report from Print button in header area.\n"
+msgstr ""
+
+#. module: base
+#: field:ir.module.module,license:0
+msgid "License"
+msgstr ""
+
+#. module: base
+#: field:ir.attachment,url:0
+msgid "Url"
+msgstr ""
+
+#. module: base
+#: selection:ir.translation,type:0
+msgid "SQL Constraint"
+msgstr ""
+
+#. module: base
+#: help:ir.ui.menu,groups_id:0
+msgid ""
+"If you have groups, the visibility of this menu will be based on these "
+"groups. If this field is empty, OpenERP will compute visibility based on the "
+"related object's read access."
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_event_sale
+msgid ""
+"\n"
+"Creating registration with sale orders.\n"
+"=======================================\n"
+"\n"
+"This module allows you to automate and connect your registration creation "
+"with\n"
+"your main sale flow and therefore, to enable the invoicing feature of "
+"registrations.\n"
+"\n"
+"It defines a new kind of service products that offers you the possibility "
+"to\n"
+"choose an event category associated with it. When you encode a sale order "
+"for\n"
+"that product, you will be able to choose an existing event of that category "
+"and\n"
+"when you confirm your sale order it will automatically create a registration "
+"for\n"
+"this event.\n"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_sale_order_dates
+msgid ""
+"\n"
+"Add additional date information to the sales order.\n"
+"===================================================\n"
+"\n"
+"You can add the following additional dates to a sales order:\n"
+"------------------------------------------------------------\n"
+"    * Requested Date\n"
+"    * Commitment Date\n"
+"    * Effective Date\n"
+msgstr ""
+
+#. module: base
+#: field:ir.actions.server,srcmodel_id:0
+#: view:ir.filters:0
+#: field:ir.filters,model_id:0
+#: view:ir.model:0
+#: field:ir.model,model:0
+#: field:ir.model.constraint,model:0
+#: field:ir.model.fields,model_id:0
+#: field:ir.model.relation,model:0
+#: view:ir.values:0
+msgid "Model"
+msgstr ""
+
+#. module: base
+#: view:base.language.install:0
+msgid ""
+"The selected language has been successfully installed. You must change the "
+"preferences of the user and open a new menu to view the changes."
+msgstr ""
+
+#. module: base
+#: field:ir.actions.act_window.view,view_id:0
+#: field:ir.default,page:0
+#: selection:ir.translation,type:0
+#: view:ir.ui.view:0
+msgid "View"
+msgstr ""
+
+#. module: base
+#: code:addons/base/ir/ir_fields.py:146
+#, python-format
+msgid "no"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_crm_partner_assign
+msgid ""
+"\n"
+"This is the module used by OpenERP SA to redirect customers to its partners, "
+"based on geolocalization.\n"
+"============================================================================="
+"=========================\n"
+"\n"
+"You can geolocalize your opportunities by using this module.\n"
+"\n"
+"Use geolocalization when assigning opportunities to partners.\n"
+"Determine the GPS coordinates according to the address of the partner.\n"
+"\n"
+"The most appropriate partner can be assigned.\n"
+"You can also use the geolocalization without using the GPS coordinates.\n"
+"    "
+msgstr ""
+
+#. module: base
+#: view:ir.actions.act_window:0
+msgid "Open a Window"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.gq
+msgid "Equatorial Guinea"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_web_api
+msgid "OpenERP Web API"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_l10n_fr_rib
+msgid ""
+"\n"
+"This module lets users enter the banking details of Partners in the RIB "
+"format (French standard for bank accounts details).\n"
+"============================================================================="
+"==============================================\n"
+"\n"
+"RIB Bank Accounts can be entered in the \"Accounting\" tab of the Partner "
+"form by specifying the account type \"RIB\". \n"
+"\n"
+"The four standard RIB fields will then become mandatory:\n"
+"--------------------------------------------------------    \n"
+"    - Bank Code\n"
+"    - Office Code\n"
+"    - Account number\n"
+"    - RIB key\n"
+"    \n"
+"As a safety measure, OpenERP will check the RIB key whenever a RIB is saved, "
+"and\n"
+"will refuse to record the data if the key is incorrect. Please bear in mind "
+"that\n"
+"this can only happen when the user presses the 'save' button, for example on "
+"the\n"
+"Partner Form. Since each bank account may relate to a Bank, users may enter "
+"the\n"
+"RIB Bank Code in the Bank form - it will the pre-fill the Bank Code on the "
+"RIB\n"
+"when they select the Bank. To make this easier, this module will also let "
+"users\n"
+"find Banks using their RIB code.\n"
+"\n"
+"The module base_iban can be a useful addition to this module, because French "
+"banks\n"
+"are now progressively adopting the international IBAN format instead of the "
+"RIB format.\n"
+"The RIB and IBAN codes for a single account can be entered by recording two "
+"Bank\n"
+"Accounts in OpenERP: the first with the type 'RIB', the second with the type "
+"'IBAN'. \n"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.ps
+msgid "Palestinian Territory, Occupied"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_l10n_ch
+msgid "Switzerland - Accounting"
+msgstr ""
+
+#. module: base
+#: field:res.bank,zip:0
+#: field:res.company,zip:0
+#: field:res.partner,zip:0
+#: field:res.partner.bank,zip:0
+msgid "Zip"
+msgstr ""
+
+#. module: base
+#: view:ir.module.module:0
+#: field:ir.module.module,author:0
+msgid "Author"
+msgstr ""
+
+#. module: base
+#: view:ir.actions.todo:0
+msgid "Set as Todo"
+msgstr ""
+
+#. module: base
+#: view:res.lang:0
+msgid "%c - Appropriate date and time representation."
+msgstr ""
+
+#. module: base
+#: code:addons/base/res/res_config.py:388
+#, python-format
+msgid ""
+"Your database is now fully configured.\n"
+"\n"
+"Click 'Continue' and enjoy your OpenERP experience..."
+msgstr ""
+
+#. module: base
+#: model:ir.module.category,description:base.module_category_marketing
+msgid "Helps you manage your marketing campaigns step by step."
+msgstr ""
+
+#. module: base
+#: selection:base.language.install,lang:0
+msgid "Hebrew / עִבְרִי"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.bo
+msgid "Bolivia"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.gh
+msgid "Ghana"
+msgstr ""
+
+#. module: base
+#: field:res.lang,direction:0
+msgid "Direction"
+msgstr ""
+
+#. module: base
+#: view:ir.actions.act_window:0
+#: model:ir.actions.act_window,name:base.action_ui_view
+#: field:ir.actions.act_window,view_ids:0
+#: field:ir.actions.act_window,views:0
+#: view:ir.model:0
+#: field:ir.model,view_ids:0
+#: field:ir.module.module,views_by_module:0
+#: model:ir.ui.menu,name:base.menu_action_ui_view
+#: view:ir.ui.view:0
+#: view:res.groups:0
+#: field:res.groups,view_access:0
+msgid "Views"
+msgstr ""
+
+#. module: base
+#: view:res.groups:0
+#: field:res.groups,rule_groups:0
+msgid "Rules"
+msgstr ""
+
+#. module: base
+#: field:ir.mail_server,smtp_host:0
+msgid "SMTP Server"
+msgstr ""
+
+#. module: base
+#: code:addons/base/module/module.py:320
+#, python-format
+msgid "You try to remove a module that is installed or will be installed"
+msgstr ""
+
+#. module: base
+#: view:base.module.upgrade:0
+msgid "The selected modules have been updated / installed !"
+msgstr ""
+
+#. module: base
+#: selection:base.language.install,lang:0
+msgid "Spanish (PR) / Español (PR)"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_crm_profiling
+msgid ""
+"\n"
+"This module allows users to perform segmentation within partners.\n"
+"=================================================================\n"
+"\n"
+"It uses the profiles criteria from the earlier segmentation module and "
+"improve it. \n"
+"Thanks to the new concept of questionnaire. You can now regroup questions "
+"into a \n"
+"questionnaire and directly use it on a partner.\n"
+"\n"
+"It also has been merged with the earlier CRM & SRM segmentation tool because "
+"they \n"
+"were overlapping.\n"
+"\n"
+"    **Note:** this module is not compatible with the module segmentation, "
+"since it's the same which has been renamed.\n"
+"    "
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.gt
+msgid "Guatemala"
+msgstr ""
+
+#. module: base
+#: help:ir.actions.server,message:0
+msgid ""
+"Email contents, may contain expressions enclosed in double brackets based on "
+"the same values as those available in the condition field, e.g. `Dear [[ "
+"object.partner_id.name ]]`"
+msgstr ""
+
+#. module: base
+#: model:ir.actions.act_window,name:base.action_workflow_form
+#: model:ir.ui.menu,name:base.menu_workflow
+#: model:ir.ui.menu,name:base.menu_workflow_root
+msgid "Workflows"
+msgstr ""
+
+#. module: base
+#: model:ir.ui.menu,name:base.next_id_73
+msgid "Purchase"
+msgstr ""
+
+#. module: base
+#: selection:base.language.install,lang:0
+msgid "Portuguese (BR) / Português (BR)"
+msgstr ""
+
+#. module: base
+#: model:ir.model,name:base.model_ir_needaction_mixin
+msgid "ir.needaction_mixin"
+msgstr ""
+
+#. module: base
+#: view:base.language.export:0
+msgid "This file was generated using the universal"
+msgstr ""
+
+#. module: base
+#: model:res.partner.category,name:base.res_partner_category_7
+msgid "IT Services"
+msgstr ""
+
+#. module: base
+#: model:ir.module.category,name:base.module_category_specific_industry_applications
+msgid "Specific Industry Applications"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_google_docs
+msgid "Google Docs integration"
+msgstr ""
+
+#. module: base
+#: help:ir.attachment,res_model:0
+msgid "The database object this attachment will be attached to"
+msgstr ""
+
+#. module: base
+#: code:addons/base/ir/ir_fields.py:327
+#, python-format
+msgid "name"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_mrp_operations
+msgid ""
+"\n"
+"This module adds state, date_start, date_stop in manufacturing order "
+"operation lines (in the 'Work Orders' tab).\n"
+"============================================================================="
+"===================================\n"
+"\n"
+"Status: draft, confirm, done, cancel\n"
+"When finishing/confirming, cancelling manufacturing orders set all state "
+"lines\n"
+"to the according state.\n"
+"\n"
+"Create menus:\n"
+"-------------\n"
+"    **Manufacturing** > **Manufacturing** > **Work Orders**\n"
+"\n"
+"Which is a view on 'Work Orders' lines in manufacturing order.\n"
+"\n"
+"Add buttons in the form view of manufacturing order under workorders tab:\n"
+"-------------------------------------------------------------------------\n"
+"    * start (set state to confirm), set date_start\n"
+"    * done (set state to done), set date_stop\n"
+"    * set to draft (set state to draft)\n"
+"    * cancel set state to cancel\n"
+"\n"
+"When the manufacturing order becomes 'ready to produce', operations must\n"
+"become 'confirmed'. When the manufacturing order is done, all operations\n"
+"must become done.\n"
+"\n"
+"The field 'Working Hours' is the delay(stop date - start date).\n"
+"So, that we can compare the theoretic delay and real delay. \n"
+"    "
+msgstr ""
+
+#. module: base
+#: view:res.config.installer:0
+msgid "Skip"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_event_sale
+msgid "Events Sales"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.ls
+msgid "Lesotho"
+msgstr ""
+
+#. module: base
+#: view:base.language.export:0
+msgid ", or your preferred text editor"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_crm_partner_assign
+msgid "Partners Geo-Localization"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.ke
+msgid "Kenya"
+msgstr ""
+
+#. module: base
+#: model:ir.actions.act_window,name:base.action_translation
+#: model:ir.ui.menu,name:base.menu_action_translation
+msgid "Translated Terms"
+msgstr ""
+
+#. module: base
+#: selection:base.language.install,lang:0
+msgid "Abkhazian / аҧсуа"
+msgstr ""
+
+#. module: base
+#: view:base.module.configuration:0
+msgid "System Configuration Done"
+msgstr ""
+
+#. module: base
+#: code:addons/orm.py:1540
+#, python-format
+msgid "Error occurred while validating the field(s) %s: %s"
+msgstr ""
+
+#. module: base
+#: view:ir.property:0
+msgid "Generic"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_document_ftp
+msgid "Shared Repositories (FTP)"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.sm
+msgid "San Marino"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.bm
+msgid "Bermuda"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.pe
+msgid "Peru"
+msgstr ""
+
+#. module: base
+#: selection:ir.model.fields,on_delete:0
+msgid "Set NULL"
+msgstr ""
+
+#. module: base
+#: view:res.users:0
+msgid "Save"
+msgstr ""
+
+#. module: base
+#: field:ir.actions.report.xml,report_xml:0
+msgid "XML Path"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.bj
+msgid "Benin"
+msgstr ""
+
+#. module: base
+#: model:ir.actions.act_window,name:base.action_res_partner_bank_type_form
+#: model:ir.ui.menu,name:base.menu_action_res_partner_bank_typeform
+msgid "Bank Account Types"
+msgstr ""
+
+#. module: base
+#: help:ir.sequence,suffix:0
+msgid "Suffix value of the record for the sequence"
+msgstr ""
+
+#. module: base
+#: help:ir.mail_server,smtp_user:0
+msgid "Optional username for SMTP authentication"
+msgstr ""
+
+#. module: base
+#: model:ir.model,name:base.model_ir_actions_actions
+msgid "ir.actions.actions"
+msgstr ""
+
+#. module: base
+#: selection:ir.model.fields,select_level:0
+msgid "Not Searchable"
+msgstr ""
+
+#. module: base
+#: view:ir.config_parameter:0
+#: field:ir.config_parameter,key:0
+msgid "Key"
+msgstr ""
+
+#. module: base
+#: field:res.company,rml_header:0
+msgid "RML Header"
+msgstr ""
+
+#. module: base
+#: help:res.country,address_format:0
+msgid ""
+"You can state here the usual format to use for the addresses belonging to "
+"this country.\n"
+"\n"
+"You can use the python-style string patern with all the field of the address "
+"(for example, use '%(street)s' to display the field 'street') plus\n"
+"            \n"
+"%(state_name)s: the name of the state\n"
+"            \n"
+"%(state_code)s: the code of the state\n"
+"            \n"
+"%(country_name)s: the name of the country\n"
+"            \n"
+"%(country_code)s: the code of the country"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.mu
+msgid "Mauritius"
+msgstr ""
+
+#. module: base
+#: view:ir.model.access:0
+msgid "Full Access"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_l10n_pt
+msgid "Plano de contas SNC para Portugal"
+msgstr ""
+
+#. module: base
+#: view:ir.actions.act_window:0
+#: view:ir.actions.report.xml:0
+#: model:ir.ui.menu,name:base.menu_security
+msgid "Security"
+msgstr ""
+
+#. module: base
+#: selection:base.language.install,lang:0
+msgid "Portuguese / Português"
+msgstr ""
+
+#. module: base
+#: code:addons/base/ir/ir_model.py:373
+#, python-format
+msgid "Changing the storing system for field \"%s\" is not allowed."
+msgstr ""
+
+#. module: base
+#: help:res.partner.bank,company_id:0
+msgid "Only if this bank account belong to your company"
+msgstr ""
+
+#. module: base
+#: code:addons/base/ir/ir_fields.py:337
+#, python-format
+msgid "Unknown sub-field '%s'"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.za
+msgid "South Africa"
+msgstr ""
+
+#. module: base
+#: view:ir.module.module:0
+#: selection:ir.module.module,state:0
+#: selection:ir.module.module.dependency,state:0
+msgid "Installed"
+msgstr ""
+
+#. module: base
+#: selection:base.language.install,lang:0
+msgid "Ukrainian / українська"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.sn
+msgid "Senegal"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.hu
+msgid "Hungary"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_web_analytics
+msgid ""
+"\n"
+"Google Analytics.\n"
+"=================\n"
+"\n"
+"Collects web application usage with Google Analytics.\n"
+"    "
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_hr_recruitment
+msgid "Recruitment Process"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.br
+msgid "Brazil"
+msgstr ""
+
+#. module: base
+#: view:res.lang:0
+msgid "%M - Minute [00,59]."
+msgstr ""
+
+#. module: base
+#: selection:ir.module.module,license:0
+msgid "Affero GPL-3"
+msgstr ""
+
+#. module: base
+#: field:ir.sequence,number_next:0
+msgid "Next Number"
+msgstr ""
+
+#. module: base
+#: help:workflow.transition,condition:0
+msgid "Expression to be satisfied if we want the transition done."
+msgstr ""
+
+#. module: base
+#: selection:base.language.install,lang:0
+msgid "Spanish (PA) / Español (PA)"
+msgstr ""
+
+#. module: base
+#: view:res.currency:0
+#: field:res.currency,rate_ids:0
+msgid "Rates"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_email_template
+msgid "Email Templates"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.sy
+msgid "Syria"
+msgstr ""
+
+#. module: base
+#: view:res.lang:0
+msgid "======================================================"
+msgstr ""
+
+#. module: base
+#: sql_constraint:ir.model:0
+msgid "Each model must be unique!"
+msgstr ""
+
+#. module: base
+#: model:ir.module.category,name:base.module_category_localization
+#: model:ir.ui.menu,name:base.menu_localisation
+msgid "Localization"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_web_api
+msgid ""
+"\n"
+"Openerp Web API.\n"
+"================\n"
+"\n"
+msgstr ""
+
+#. module: base
+#: selection:res.request,state:0
+msgid "draft"
+msgstr ""
+
+#. module: base
+#: selection:ir.property,type:0
+#: field:res.currency,date:0
+#: field:res.currency.rate,name:0
+#: field:res.partner,date:0
+#: field:res.request,date_sent:0
+msgid "Date"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_event_moodle
+msgid "Event Moodle"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_email_template
+msgid ""
+"\n"
+"Email Templating (simplified version of the original Power Email by "
+"Openlabs).\n"
+"============================================================================="
+"=\n"
+"\n"
+"Lets you design complete email templates related to any OpenERP document "
+"(Sale\n"
+"Orders, Invoices and so on), including sender, recipient, subject, body "
+"(HTML and\n"
+"Text). You may also automatically attach files to your templates, or print "
+"and\n"
+"attach a report.\n"
+"\n"
+"For advanced use, the templates may include dynamic attributes of the "
+"document\n"
+"they are related to. For example, you may use the name of a Partner's "
+"country\n"
+"when writing to them, also providing a safe default in case the attribute "
+"is\n"
+"not defined. Each template contains a built-in assistant to help with the\n"
+"inclusion of these dynamic values.\n"
+"\n"
+"If you enable the option, a composition assistant will also appear in the "
+"sidebar\n"
+"of the OpenERP documents to which the template applies (e.g. Invoices).\n"
+"This serves as a quick way to send a new email based on the template, after\n"
+"reviewing and adapting the contents, if needed.\n"
+"This composition assistant will also turn into a mass mailing system when "
+"called\n"
+"for multiple documents at once.\n"
+"\n"
+"These email templates are also at the heart of the marketing campaign "
+"system\n"
+"(see the ``marketing_campaign`` application), if you need to automate "
+"larger\n"
+"campaigns on any OpenERP document.\n"
+"\n"
+"    **Technical note:** only the templating system of the original Power "
+"Email by Openlabs was kept.\n"
+"    "
+msgstr ""
+
+#. module: base
+#: model:ir.ui.menu,name:base.menu_partner_category_form
+msgid "Partner Tags"
+msgstr ""
+
+#. module: base
+#: view:res.company:0
+msgid "Preview Header/Footer"
+msgstr ""
+
+#. module: base
+#: field:ir.ui.menu,parent_id:0
+#: field:wizard.ir.model.menu.create,menu_id:0
+msgid "Parent Menu"
+msgstr ""
+
+#. module: base
+#: field:res.partner.bank,owner_name:0
+msgid "Account Owner Name"
+msgstr ""
+
+#. module: base
+#: code:addons/base/ir/ir_model.py:421
+#, python-format
+msgid "Cannot rename column to %s, because that column already exists!"
+msgstr ""
+
+#. module: base
+#: view:ir.attachment:0
+msgid "Attached To"
+msgstr ""
+
+#. module: base
+#: field:res.lang,decimal_point:0
+msgid "Decimal Separator"
+msgstr ""
+
+#. module: base
+#: code:addons/orm.py:5319
+#, python-format
+msgid "Missing required value for the field '%s'."
+msgstr ""
+
+#. module: base
+#: view:ir.rule:0
+msgid "Write Access Right"
+msgstr ""
+
+#. module: base
+#: model:ir.actions.act_window,help:base.action_res_groups
+msgid ""
+"A group is a set of functional areas that will be assigned to the user in "
+"order to give them access and rights to specific applications and tasks in "
+"the system. You can create custom groups or edit the ones existing by "
+"default in order to customize the view of the menu that users will be able "
+"to see. Whether they can have a read, write, create and delete access right "
+"can be managed from here."
+msgstr ""
+
+#. module: base
+#: view:ir.filters:0
+#: field:ir.filters,name:0
+msgid "Filter Name"
+msgstr ""
+
+#. module: base
+#: view:ir.attachment:0
+#: view:res.partner:0
+#: field:res.request,history:0
+msgid "History"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.im
+msgid "Isle of Man"
+msgstr ""
+
+#. module: base
+#: help:ir.actions.client,res_model:0
+msgid "Optional model, mostly used for needactions."
+msgstr ""
+
+#. module: base
+#: code:addons/base/module/module.py:306
+#, python-format
+msgid "The name of the module must be unique !"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.bv
+msgid "Bouvet Island"
+msgstr ""
+
+#. module: base
+#: field:ir.model.constraint,type:0
+msgid "Constraint Type"
+msgstr ""
+
+#. module: base
+#: field:res.company,child_ids:0
+msgid "Child Companies"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.ni
+msgid "Nicaragua"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_stock_invoice_directly
+msgid ""
+"\n"
+"Invoice Wizard for Delivery.\n"
+"============================\n"
+"\n"
+"When you send or deliver goods, this module automatically launch the "
+"invoicing\n"
+"wizard if the delivery is to be invoiced.\n"
+"    "
+msgstr ""
+
+#. module: base
+#: selection:ir.translation,type:0
+msgid "Wizard Button"
+msgstr ""
+
+#. module: base
+#: view:ir.model.fields:0
+#: field:ir.property,fields_id:0
+#: selection:ir.translation,type:0
+#: field:multi_company.default,field_id:0
+msgid "Field"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_project_long_term
+msgid "Long Term Projects"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.ve
+msgid "Venezuela"
+msgstr ""
+
+#. module: base
+#: view:res.lang:0
+msgid "9.  %j              ==> 340"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.zm
+msgid "Zambia"
+msgstr ""
+
+#. module: base
+#: view:ir.actions.todo:0
+msgid "Launch Configuration Wizard"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,summary:base.module_mrp
+msgid "Manufacturing Orders, Bill of Materials, Routing"
+msgstr ""
+
+#. module: base
+#: field:ir.attachment,name:0
+msgid "Attachment Name"
+msgstr ""
+
+#. module: base
+#: view:ir.module.module:0
+msgid "Cancel Upgrade"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_report_webkit
+msgid ""
+"\n"
+"This module adds a new Report Engine based on WebKit library (wkhtmltopdf) "
+"to support reports designed in HTML + CSS.\n"
+"============================================================================="
+"========================================\n"
+"\n"
+"The module structure and some code is inspired by the report_openoffice "
+"module.\n"
+"\n"
+"The module allows:\n"
+"------------------\n"
+"    - HTML report definition\n"
+"    - Multi header support\n"
+"    - Multi logo\n"
+"    - Multi company support\n"
+"    - HTML and CSS-3 support (In the limit of the actual WebKIT version)\n"
+"    - JavaScript support\n"
+"    - Raw HTML debugger\n"
+"    - Book printing capabilities\n"
+"    - Margins definition\n"
+"    - Paper size definition\n"
+"\n"
+"Multiple headers and logos can be defined per company. CSS style, header "
+"and\n"
+"footer body are defined per company.\n"
+"\n"
+"For a sample report see also the webkit_report_sample module, and this "
+"video:\n"
+"    http://files.me.com/nbessi/06n92k.mov\n"
+"\n"
+"Requirements and Installation:\n"
+"------------------------------\n"
+"This module requires the ``wkthtmltopdf`` library to render HTML documents "
+"as\n"
+"PDF. Version 0.9.9 or later is necessary, and can be found at\n"
+"http://code.google.com/p/wkhtmltopdf/ for Linux, Mac OS X (i386) and Windows "
+"(32bits).\n"
+"\n"
+"After installing the library on the OpenERP Server machine, you need to set "
+"the\n"
+"path to the ``wkthtmltopdf`` executable file on each Company.\n"
+"\n"
+"If you are experiencing missing header/footer problems on Linux, be sure to\n"
+"install a 'static' version of the library. The default ``wkhtmltopdf`` on\n"
+"Ubuntu is known to have this issue.\n"
+"\n"
+"\n"
+"TODO:\n"
+"-----\n"
+"    * JavaScript support activation deactivation\n"
+"    * Collated and book format support\n"
+"    * Zip return for separated PDF\n"
+"    * Web client WYSIWYG\n"
+msgstr ""
+
+#. module: base
+#: model:res.groups,name:base.group_sale_salesman_all_leads
+msgid "See all Leads"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.ci
+msgid "Ivory Coast (Cote D'Ivoire)"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.kz
+msgid "Kazakhstan"
+msgstr ""
+
+#. module: base
+#: view:res.lang:0
+msgid "%w - Weekday number [0(Sunday),6]."
+msgstr ""
+
+#. module: base
+#: field:ir.attachment,res_name:0
+#: field:ir.ui.view_sc,resource:0
+msgid "Resource Name"
+msgstr ""
+
+#. module: base
+#: model:ir.ui.menu,name:base.menu_ir_filters
+msgid "User-defined Filters"
+msgstr ""
+
+#. module: base
+#: field:ir.actions.act_window_close,name:0
+#: field:ir.actions.actions,name:0
+#: field:ir.actions.report.xml,name:0
+#: field:ir.actions.todo,name:0
+#: field:ir.cron,name:0
+#: field:ir.model.access,name:0
+#: field:ir.model.fields,name:0
+#: field:ir.module.category,name:0
+#: field:ir.module.module.dependency,name:0
+#: report:ir.module.reference:0
+#: view:ir.property:0
+#: field:ir.property,name:0
+#: field:ir.rule,name:0
+#: field:ir.sequence,name:0
+#: field:ir.sequence.type,name:0
+#: field:ir.values,name:0
+#: view:multi_company.default:0
+#: field:multi_company.default,name:0
+#: field:res.bank,name:0
+#: view:res.currency.rate.type:0
+#: field:res.currency.rate.type,name:0
+#: field:res.groups,name:0
+#: field:res.lang,name:0
+#: view:res.partner:0
+#: field:res.partner,name:0
+#: view:res.partner.bank:0
+#: field:res.partner.bank.type,name:0
+#: field:res.request.link,name:0
+#: view:res.users:0
+#: field:workflow,name:0
+#: field:workflow.activity,name:0
+msgid "Name"
+msgstr ""
+
+#. module: base
+#: help:ir.actions.act_window,multi:0
+msgid ""
+"If set to true, the action will not be displayed on the right toolbar of a "
+"form view"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.ms
+msgid "Montserrat"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_decimal_precision
+msgid "Decimal Precision Configuration"
+msgstr ""
+
+#. module: base
+#: model:ir.model,name:base.model_ir_actions_act_url
+#: selection:ir.ui.menu,action:0
+msgid "ir.actions.act_url"
+msgstr ""
+
+#. module: base
+#: model:ir.ui.menu,name:base.menu_translation_app
+msgid "Application Terms"
+msgstr ""
+
+#. module: base
+#: model:ir.actions.act_window,help:base.open_module_tree
+msgid ""
+"<p><b>No module found!</b></p>\n"
+"              <p>You should try others search criteria.</p>\n"
+"            "
+msgstr ""
+
+#. module: base
+#: model:ir.model,name:base.model_ir_module_module
+#: field:ir.model.constraint,module:0
+#: view:ir.model.data:0
+#: field:ir.model.data,module:0
+#: field:ir.model.relation,module:0
+#: view:ir.module.module:0
+#: field:ir.module.module.dependency,module_id:0
+#: report:ir.module.reference:0
+#: field:ir.translation,module:0
+msgid "Module"
+msgstr ""
+
+#. module: base
+#: selection:base.language.install,lang:0
+msgid "English (UK)"
+msgstr ""
+
+#. module: base
+#: selection:base.language.install,lang:0
+msgid "Japanese / 日本語"
+msgstr ""
+
+#. module: base
+#: model:ir.model,name:base.model_base_language_import
+msgid "Language Import"
+msgstr ""
+
+#. module: base
+#: help:workflow.transition,act_from:0
+msgid ""
+"Source activity. When this activity is over, the condition is tested to "
+"determine if we can start the ACT_TO activity."
+msgstr ""
+
+#. module: base
+#: model:ir.module.category,name:base.module_category_generic_modules_accounting
+#: view:res.company:0
+msgid "Accounting"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_base_vat
+msgid ""
+"\n"
+"VAT validation for Partner's VAT numbers.\n"
+"=========================================\n"
+"\n"
+"After installing this module, values entered in the VAT field of Partners "
+"will\n"
+"be validated for all supported countries. The country is inferred from the\n"
+"2-letter country code that prefixes the VAT number, e.g. ``BE0477472701``\n"
+"will be validated using the Belgian rules.\n"
+"\n"
+"There are two different levels of VAT number validation:\n"
+"--------------------------------------------------------\n"
+"    * By default, a simple off-line check is performed using the known "
+"validation\n"
+"      rules for the country, usually a simple check digit. This is quick and "
+"\n"
+"      always available, but allows numbers that are perhaps not truly "
+"allocated,\n"
+"      or not valid anymore.\n"
+"      \n"
+"    * When the \"VAT VIES Check\" option is enabled (in the configuration of "
+"the user's\n"
+"      Company), VAT numbers will be instead submitted to the online EU VIES\n"
+"      database, which will truly verify that the number is valid and "
+"currently\n"
+"      allocated to a EU company. This is a little bit slower than the "
+"simple\n"
+"      off-line check, requires an Internet connection, and may not be "
+"available\n"
+"      all the time. If the service is not available or does not support the\n"
+"      requested country (e.g. for non-EU countries), a simple check will be "
+"performed\n"
+"      instead.\n"
+"\n"
+"Supported countries currently include EU countries, and a few non-EU "
+"countries\n"
+"such as Chile, Colombia, Mexico, Norway or Russia. For unsupported "
+"countries,\n"
+"only the country code will be validated.\n"
+"    "
+msgstr ""
+
+#. module: base
+#: model:ir.model,name:base.model_ir_actions_act_window_view
+msgid "ir.actions.act_window.view"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_web
+#: report:ir.module.reference:0
+msgid "Web"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_lunch
+msgid "Lunch Orders"
+msgstr ""
+
+#. module: base
+#: selection:base.language.install,lang:0
+msgid "English (CA)"
+msgstr ""
+
+#. module: base
+#: model:ir.module.category,name:base.module_category_human_resources
+msgid "Human Resources"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_l10n_syscohada
+msgid ""
+"\n"
+"This module implements the accounting chart for OHADA area.\n"
+"===========================================================\n"
+"    \n"
+"It allows any company or association to manage its financial accounting.\n"
+"\n"
+"Countries that use OHADA are the following:\n"
+"-------------------------------------------\n"
+"    Benin, Burkina Faso, Cameroon, Central African Republic, Comoros, "
+"Congo,\n"
+"    \n"
+"    Ivory Coast, Gabon, Guinea, Guinea Bissau, Equatorial Guinea, Mali, "
+"Niger,\n"
+"    \n"
+"    Replica of Democratic Congo, Senegal, Chad, Togo.\n"
+"    "
+msgstr ""
+
+#. module: base
+#: view:ir.translation:0
+msgid "Comments"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.et
+msgid "Ethiopia"
+msgstr ""
+
+#. module: base
+#: model:ir.module.category,name:base.module_category_authentication
+msgid "Authentication"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.sj
+msgid "Svalbard and Jan Mayen Islands"
+msgstr ""
+
+#. module: base
+#: model:ir.model,name:base.model_ir_actions_wizard
+#: selection:ir.ui.menu,action:0
+msgid "ir.actions.wizard"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_web_kanban
+msgid "Base Kanban"
+msgstr ""
+
+#. module: base
+#: view:ir.actions.act_window:0
+#: view:ir.actions.report.xml:0
+#: view:ir.actions.server:0
+msgid "Group By"
+msgstr ""
+
+#. module: base
+#: view:res.config.installer:0
+msgid "title"
+msgstr ""
+
+#. module: base
+#: code:addons/base/ir/ir_fields.py:146
+#, python-format
+msgid "true"
+msgstr ""
+
+#. module: base
+#: model:ir.model,name:base.model_base_language_install
+msgid "Install Language"
+msgstr ""
+
+#. module: base
+#: model:res.partner.category,name:base.res_partner_category_11
+msgid "Services"
+msgstr ""
+
+#. module: base
+#: view:ir.translation:0
+msgid "Translation"
+msgstr ""
+
+#. module: base
+#: selection:res.request,state:0
+msgid "closed"
+msgstr ""
+
+#. module: base
+#: selection:base.language.export,state:0
+msgid "get"
+msgstr ""
+
+#. module: base
+#: help:ir.model.fields,on_delete:0
+msgid "On delete property for many2one fields"
+msgstr ""
+
+#. module: base
+#: model:ir.module.category,name:base.module_category_accounting_and_finance
+msgid "Accounting & Finance"
+msgstr ""
+
+#. module: base
+#: field:ir.actions.server,write_id:0
+msgid "Write Id"
+msgstr ""
+
+#. module: base
+#: model:ir.ui.menu,name:base.menu_product
+msgid "Products"
+msgstr ""
+
+#. module: base
+#: model:ir.actions.act_window,name:base.act_values_form_defaults
+#: model:ir.ui.menu,name:base.menu_values_form_defaults
+#: view:ir.values:0
+msgid "User-defined Defaults"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_auth_signup
+msgid ""
+"\n"
+"Allow users to sign up and reset their password\n"
+"===============================================\n"
+"    "
+msgstr ""
+
+#. module: base
+#: model:ir.module.category,name:base.module_category_usability
+#: view:res.users:0
+msgid "Usability"
+msgstr ""
+
+#. module: base
+#: field:ir.actions.act_window,domain:0
+msgid "Domain Value"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_association
+msgid ""
+"\n"
+"This module is to configure modules related to an association.\n"
+"==============================================================\n"
+"\n"
+"It installs the profile for associations to manage events, registrations, "
+"memberships, \n"
+"membership products (schemes).\n"
+"    "
+msgstr ""
+
+#. module: base
+#: model:ir.ui.menu,name:base.menu_base_config
+#: model:ir.ui.menu,name:base.menu_config
+#: model:ir.ui.menu,name:base.menu_definitions
+#: model:ir.ui.menu,name:base.menu_event_config
+#: model:ir.ui.menu,name:base.menu_lunch_survey_root
+#: model:ir.ui.menu,name:base.menu_marketing_config_association
+#: model:ir.ui.menu,name:base.menu_marketing_config_root
+#: model:ir.ui.menu,name:base.menu_reporting_config
+#: view:res.company:0
+#: view:res.config:0
+msgid "Configuration"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_edi
+msgid ""
+"\n"
+"Provides a common EDI platform that other Applications can use.\n"
+"===============================================================\n"
+"\n"
+"OpenERP specifies a generic EDI format for exchanging business documents "
+"between \n"
+"different systems, and provides generic mechanisms to import and export "
+"them.\n"
+"\n"
+"More details about OpenERP's EDI format may be found in the technical "
+"OpenERP \n"
+"documentation at http://doc.openerp.com.\n"
+"    "
+msgstr ""
+
+#. module: base
+#: code:addons/base/ir/workflow/workflow.py:99
+#, python-format
+msgid "Operation forbidden"
+msgstr ""
+
+#. module: base
+#: view:ir.actions.server:0
+msgid "SMS Configuration"
+msgstr ""
+
+#. module: base
+#: help:ir.rule,active:0
+msgid ""
+"If you uncheck the active field, it will disable the record rule without "
+"deleting it (if you delete a native record rule, it may be re-created when "
+"you reload the module."
+msgstr ""
+
+#. module: base
+#: selection:base.language.install,lang:0
+msgid "Spanish (BO) / Español (BO)"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_board
+msgid ""
+"\n"
+"Lets the user create a custom dashboard.\n"
+"========================================\n"
+"\n"
+"Allows users to create custom dashboard.\n"
+"    "
+msgstr ""
+
+#. module: base
+#: model:ir.actions.act_window,name:base.ir_access_act
+#: model:ir.ui.menu,name:base.menu_ir_access_act
+msgid "Access Controls List"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.um
+msgid "USA Minor Outlying Islands"
+msgstr ""
+
+#. module: base
+#: view:base.language.import:0
+msgid "e.g. English"
+msgstr ""
+
+#. module: base
+#: help:ir.cron,numbercall:0
+msgid ""
+"How many times the method is called,\n"
+"a negative number indicates no limit."
+msgstr ""
+
+#. module: base
+#: field:res.partner.bank.type.field,bank_type_id:0
+msgid "Bank Type"
+msgstr ""
+
+#. module: base
+#: code:addons/base/res/res_users.py:99
+#, python-format
+msgid "The name of the group can not start with \"-\""
+msgstr ""
+
+#. module: base
+#: model:ir.actions.client,name:base.modules_act_cl
+#: view:ir.module.module:0
+#: model:ir.ui.menu,name:base.module_mi
+msgid "Apps"
+msgstr ""
+
+#. module: base
+#: view:ir.ui.view_sc:0
+msgid "Shortcut"
+msgstr ""
+
+#. module: base
+#: field:ir.model.data,date_init:0
+msgid "Init Date"
+msgstr ""
+
+#. module: base
+#: selection:base.language.install,lang:0
+msgid "Gujarati / ગુજરાતી"
+msgstr ""
+
+#. module: base
+#: code:addons/base/module/module.py:361
+#, python-format
+msgid ""
+"Unable to process module \"%s\" because an external dependency is not met: %s"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_l10n_be_hr_payroll
+msgid "Belgium - Payroll"
+msgstr ""
+
+#. module: base
+#: view:workflow.activity:0
+#: field:workflow.activity,flow_start:0
+msgid "Flow Start"
+msgstr ""
+
+#. module: base
+#: model:ir.model,name:base.model_res_partner_title
+msgid "res.partner.title"
+msgstr ""
+
+#. module: base
+#: view:res.partner.bank:0
+msgid "Bank Account Owner"
+msgstr ""
+
+#. module: base
+#: model:ir.module.category,name:base.module_category_uncategorized
+msgid "Uncategorized"
+msgstr ""
+
+#. module: base
+#: view:res.partner:0
+msgid "Phone:"
+msgstr ""
+
+#. module: base
+#: field:res.partner,is_company:0
+msgid "Is a Company"
+msgstr ""
+
+#. module: base
+#: view:res.company:0
+#: view:res.partner:0
+#: view:res.users:0
+msgid "e.g. www.openerp.com"
+msgstr ""
+
+#. module: base
+#: selection:ir.cron,interval_type:0
+msgid "Hours"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.gp
+msgid "Guadeloupe (French)"
+msgstr ""
+
+#. module: base
+#: code:addons/base/res/res_lang.py:185
+#: code:addons/base/res/res_lang.py:187
+#: code:addons/base/res/res_lang.py:189
+#, python-format
+msgid "User Error"
+msgstr ""
+
+#. module: base
+#: help:workflow.transition,signal:0
+msgid ""
+"When the operation of transition comes from a button pressed in the client "
+"form, signal tests the name of the pressed button. If signal is NULL, no "
+"button is necessary to validate this transition."
+msgstr ""
+
+#. module: base
+#: field:ir.ui.view.custom,ref_id:0
+msgid "Original View"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_web_kanban
+msgid ""
+"\n"
+"OpenERP Web kanban view.\n"
+"========================\n"
+"\n"
+msgstr ""
+
+#. module: base
+#: code:addons/base/ir/ir_fields.py:182
+#, python-format
+msgid "'%s' does not seem to be a number for field '%%(field)s'"
+msgstr ""
+
+#. module: base
+#: help:res.country.state,name:0
+msgid ""
+"Administrative divisions of a country. E.g. Fed. State, Departement, Canton"
+msgstr ""
+
+#. module: base
+#: view:res.partner.bank:0
+msgid "My Banks"
+msgstr ""
+
+#. module: base
+#: sql_constraint:ir.filters:0
+msgid "Filter names must be unique"
+msgstr ""
+
+#. module: base
+#: help:multi_company.default,object_id:0
+msgid "Object affected by this rule"
+msgstr ""
+
+#. module: base
+#: selection:ir.actions.act_window,target:0
+msgid "Inline View"
+msgstr ""
+
+#. module: base
+#: field:ir.filters,is_default:0
+msgid "Default filter"
+msgstr ""
+
+#. module: base
+#: report:ir.module.reference:0
+msgid "Directory"
+msgstr ""
+
+#. module: base
+#: field:wizard.ir.model.menu.create,name:0
+msgid "Menu Name"
+msgstr ""
+
+#. module: base
+#: field:ir.values,key2:0
+msgid "Qualifier"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_l10n_be_coda
+msgid ""
+"\n"
+"Module to import CODA bank statements.\n"
+"======================================\n"
+"\n"
+"Supported are CODA flat files in V2 format from Belgian bank accounts.\n"
+"----------------------------------------------------------------------\n"
+"    * CODA v1 support.\n"
+"    * CODA v2.2 support.\n"
+"    * Foreign Currency support.\n"
+"    * Support for all data record types (0, 1, 2, 3, 4, 8, 9).\n"
+"    * Parsing & logging of all Transaction Codes and Structured Format \n"
+"      Communications.\n"
+"    * Automatic Financial Journal assignment via CODA configuration "
+"parameters.\n"
+"    * Support for multiple Journals per Bank Account Number.\n"
+"    * Support for multiple statements from different bank accounts in a "
+"single \n"
+"      CODA file.\n"
+"    * Support for 'parsing only' CODA Bank Accounts (defined as type='info' "
+"in \n"
+"      the CODA Bank Account configuration records).\n"
+"    * Multi-language CODA parsing, parsing configuration data provided for "
+"EN, \n"
+"      NL, FR.\n"
+"\n"
+"The machine readable CODA Files are parsed and stored in human readable "
+"format in \n"
+"CODA Bank Statements. Also Bank Statements are generated containing a subset "
+"of \n"
+"the CODA information (only those transaction lines that are required for the "
+"\n"
+"creation of the Financial Accounting records). The CODA Bank Statement is a "
+"\n"
+"'read-only' object, hence remaining a reliable representation of the "
+"original\n"
+"CODA file whereas the Bank Statement will get modified as required by "
+"accounting \n"
+"business processes.\n"
+"\n"
+"CODA Bank Accounts configured as type 'Info' will only generate CODA Bank "
+"Statements.\n"
+"\n"
+"A removal of one object in the CODA processing results in the removal of the "
+"\n"
+"associated objects. The removal of a CODA File containing multiple Bank \n"
+"Statements will also remove those associated statements.\n"
+"\n"
+"The following reconciliation logic has been implemented in the CODA "
+"processing:\n"
+"-----------------------------------------------------------------------------"
+"--\n"
+"    1) The Company's Bank Account Number of the CODA statement is compared "
+"against \n"
+"       the Bank Account Number field of the Company's CODA Bank Account \n"
+"       configuration records (whereby bank accounts defined in type='info' \n"
+"       configuration records are ignored). If this is the case an 'internal "
+"transfer'\n"
+"       transaction is generated using the 'Internal Transfer Account' field "
+"of the \n"
+"       CODA File Import wizard.\n"
+"    2) As a second step the 'Structured Communication' field of the CODA "
+"transaction\n"
+"       line is matched against the reference field of in- and outgoing "
+"invoices \n"
+"       (supported : Belgian Structured Communication Type).\n"
+"    3) When the previous step doesn't find a match, the transaction "
+"counterparty is \n"
+"       located via the Bank Account Number configured on the OpenERP "
+"Customer and \n"
+"       Supplier records.\n"
+"    4) In case the previous steps are not successful, the transaction is "
+"generated \n"
+"       by using the 'Default Account for Unrecognized Movement' field of the "
+"CODA \n"
+"       File Import wizard in order to allow further manual processing.\n"
+"\n"
+"In stead of a manual adjustment of the generated Bank Statements, you can "
+"also \n"
+"re-import the CODA after updating the OpenERP database with the information "
+"that \n"
+"was missing to allow automatic reconciliation.\n"
+"\n"
+"Remark on CODA V1 support:\n"
+"~~~~~~~~~~~~~~~~~~~~~~~~~~\n"
+"In some cases a transaction code, transaction category or structured \n"
+"communication code has been given a new or clearer description in CODA "
+"V2.The\n"
+"description provided by the CODA configuration tables is based upon the CODA "
+"\n"
+"V2.2 specifications.\n"
+"If required, you can manually adjust the descriptions via the CODA "
+"configuration menu.\n"
+msgstr ""
+
+#. module: base
+#: view:ir.attachment:0
+msgid "Month"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.my
+msgid "Malaysia"
+msgstr ""
+
+#. module: base
+#: code:addons/base/ir/ir_sequence.py:104
+#: code:addons/base/ir/ir_sequence.py:130
+#, python-format
+msgid "Increment number must not be zero."
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_account_cancel
+msgid "Cancel Journal Entries"
+msgstr ""
+
+#. module: base
+#: field:res.partner,tz_offset:0
+msgid "Timezone offset"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_marketing_campaign
+msgid ""
+"\n"
+"This module provides leads automation through marketing campaigns (campaigns "
+"can in fact be defined on any resource, not just CRM Leads).\n"
+"============================================================================="
+"============================================================\n"
+"\n"
+"The campaigns are dynamic and multi-channels. The process is as follows:\n"
+"------------------------------------------------------------------------\n"
+"    * Design marketing campaigns like workflows, including email templates "
+"to\n"
+"      send, reports to print and send by email, custom actions\n"
+"    * Define input segments that will select the items that should enter "
+"the\n"
+"      campaign (e.g leads from certain countries.)\n"
+"    * Run you campaign in simulation mode to test it real-time or "
+"accelerated,\n"
+"      and fine-tune it\n"
+"    * You may also start the real campaign in manual mode, where each "
+"action\n"
+"      requires manual validation\n"
+"    * Finally launch your campaign live, and watch the statistics as the\n"
+"      campaign does everything fully automatically.\n"
+"\n"
+"While the campaign runs you can of course continue to fine-tune the "
+"parameters,\n"
+"input segments, workflow.\n"
+"\n"
+"**Note:** If you need demo data, you can install the "
+"marketing_campaign_crm_demo\n"
+"      module, but this will also install the CRM application as it depends "
+"on\n"
+"      CRM Leads.\n"
+"    "
+msgstr ""
+
+#. module: base
+#: help:ir.mail_server,smtp_debug:0
+msgid ""
+"If enabled, the full output of SMTP sessions will be written to the server "
+"log at DEBUG level(this is very verbose and may include confidential info!)"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_sale_margin
+msgid ""
+"\n"
+"This module adds the 'Margin' on sales order.\n"
+"=============================================\n"
+"\n"
+"This gives the profitability by calculating the difference between the Unit\n"
+"Price and Cost Price.\n"
+"    "
+msgstr ""
+
+#. module: base
+#: selection:ir.actions.todo,type:0
+msgid "Launch Automatically"
+msgstr ""
+
+#. module: base
+#: help:ir.model.fields,translate:0
+msgid ""
+"Whether values for this field can be translated (enables the translation "
+"mechanism for that field)"
+msgstr ""
+
+#. module: base
+#: selection:base.language.install,lang:0
+msgid "Indonesian / Bahasa Indonesia"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.cv
+msgid "Cape Verde"
+msgstr ""
+
+#. module: base
+#: model:res.groups,comment:base.group_sale_salesman
+msgid "the user will have access to his own data in the sales application."
+msgstr ""
+
+#. module: base
+#: model:res.groups,comment:base.group_user
+msgid ""
+"the user will be able to manage his own human resources stuff (leave "
+"request, timesheets, ...), if he is linked to an employee in the system."
+msgstr ""
+
+#. module: base
+#: code:addons/orm.py:2247
+#, python-format
+msgid "There is no view of type '%s' defined for the structure!"
+msgstr ""
+
+#. module: base
+#: help:ir.values,key:0
+msgid ""
+"- Action: an action attached to one slot of the given model\n"
+"- Default: a default value for a model field"
+msgstr ""
+
+#. module: base
+#: field:base.module.update,add:0
+msgid "Number of modules added"
+msgstr ""
+
+#. module: base
+#: view:res.currency:0
+msgid "Price Accuracy"
+msgstr ""
+
+#. module: base
+#: selection:base.language.install,lang:0
+msgid "Latvian / latviešu valoda"
+msgstr ""
+
+#. module: base
+#: selection:base.language.install,lang:0
+msgid "French / Français"
+msgstr ""
+
+#. module: base
+#: view:ir.module.module:0
+msgid "Created Menus"
+msgstr ""
+
+#. module: base
+#: code:addons/base/module/module.py:502
+#: view:ir.module.module:0
+#, python-format
+msgid "Uninstall"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_account_budget
+msgid "Budgets Management"
+msgstr ""
+
+#. module: base
+#: field:workflow.triggers,workitem_id:0
+msgid "Workitem"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_anonymization
+msgid "Database Anonymization"
+msgstr ""
+
+#. module: base
+#: selection:ir.mail_server,smtp_encryption:0
+msgid "SSL/TLS"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_l10n_hr
+msgid ""
+"\n"
+"Croatian localisation.\n"
+"======================\n"
+"\n"
+"Author: Goran Kliska, Slobodni programi d.o.o., Zagreb\n"
+"        http://www.slobodni-programi.hr\n"
+"\n"
+"Contributions:\n"
+"  Tomislav Bošnjaković, Storm Computers: tipovi konta\n"
+"  Ivan Vađić, Slobodni programi: tipovi konta\n"
+"\n"
+"Description:\n"
+"\n"
+"Croatian Chart of Accounts (RRIF ver.2012)\n"
+"\n"
+"RRIF-ov računski plan za poduzetnike za 2012.\n"
+"Vrste konta\n"
+"Kontni plan prema RRIF-u, dorađen u smislu kraćenja naziva i dodavanja "
+"analitika\n"
+"Porezne grupe prema poreznoj prijavi\n"
+"Porezi PDV obrasca\n"
+"Ostali porezi \n"
+"Osnovne fiskalne pozicije\n"
+"\n"
+"Izvori podataka:\n"
+" http://www.rrif.hr/dok/preuzimanje/rrif-rp2011.rar\n"
+" http://www.rrif.hr/dok/preuzimanje/rrif-rp2012.rar\n"
+"\n"
+msgstr ""
+
+#. module: base
+#: view:ir.actions.act_window:0
+#: field:ir.actions.act_window.view,act_window_id:0
+#: view:ir.actions.actions:0
+#: field:ir.actions.todo,action_id:0
+#: field:ir.ui.menu,action:0
+#: selection:ir.values,key:0
+msgid "Action"
+msgstr ""
+
+#. module: base
+#: view:ir.actions.server:0
+msgid "Email Configuration"
+msgstr ""
+
+#. module: base
+#: model:ir.model,name:base.model_ir_cron
+msgid "ir.cron"
+msgstr ""
+
+#. module: base
+#: model:ir.ui.menu,name:base.menu_sales_followup
+msgid "Payment Follow-up"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.cw
+msgid "Curaçao"
+msgstr ""
+
+#. module: base
+#: view:ir.sequence:0
+msgid "Current Year without Century: %(y)s"
+msgstr ""
+
+#. module: base
+#: model:ir.actions.act_window,name:base.ir_config_list_action
+#: view:ir.config_parameter:0
+#: model:ir.ui.menu,name:base.ir_config_menu
+msgid "System Parameters"
+msgstr ""
+
+#. module: base
+#: help:ir.actions.client,tag:0
+msgid ""
+"An arbitrary string, interpreted by the client according to its own needs "
+"and wishes. There is no central tag repository across clients."
+msgstr ""
+
+#. module: base
+#: sql_constraint:ir.rule:0
+msgid "Rule must have at least one checked access right !"
+msgstr ""
+
+#. module: base
+#: field:res.partner.bank.type,format_layout:0
+msgid "Format Layout"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_document_ftp
+msgid ""
+"\n"
+"This is a support FTP Interface with document management system.\n"
+"================================================================\n"
+"\n"
+"With this module you would not only be able to access documents through "
+"OpenERP\n"
+"but you would also be able to connect with them through the file system "
+"using the\n"
+"FTP client.\n"
+msgstr ""
+
+#. module: base
+#: field:ir.model.fields,size:0
+msgid "Size"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_audittrail
+msgid "Audit Trail"
+msgstr ""
+
+#. module: base
+#: code:addons/base/ir/ir_fields.py:264
+#, python-format
+msgid "Value '%s' not found in selection field '%%(field)s'"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.sd
+msgid "Sudan"
+msgstr ""
+
+#. module: base
+#: model:ir.actions.act_window,name:base.action_currency_rate_type_form
+#: model:ir.model,name:base.model_res_currency_rate_type
+#: field:res.currency.rate,currency_rate_type_id:0
+#: view:res.currency.rate.type:0
+msgid "Currency Rate Type"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_l10n_fr
+msgid ""
+"\n"
+"This is the module to manage the accounting chart for France in OpenERP.\n"
+"========================================================================\n"
+"\n"
+"This module applies to companies based in France mainland. It doesn't apply "
+"to\n"
+"companies based in the DOM-TOMs (Guadeloupe, Martinique, Guyane, Réunion, "
+"Mayotte).\n"
+"\n"
+"This localisation module creates the VAT taxes of type 'tax included' for "
+"purchases\n"
+"(it is notably required when you use the module 'hr_expense'). Beware that "
+"these\n"
+"'tax included' VAT taxes are not managed by the fiscal positions provided by "
+"this\n"
+"module (because it is complex to manage both 'tax excluded' and 'tax "
+"included'\n"
+"scenarios in fiscal positions).\n"
+"\n"
+"This localisation module doesn't properly handle the scenario when a France-"
+"mainland\n"
+"company sells services to a company based in the DOMs. We could manage it in "
+"the\n"
+"fiscal positions, but it would require to differentiate between 'product' "
+"VAT taxes\n"
+"and 'service' VAT taxes. We consider that it is too 'heavy' to have this by "
+"default\n"
+"in l10n_fr; companies that sell services to DOM-based companies should "
+"update the\n"
+"configuration of their taxes and fiscal positions manually.\n"
+"\n"
+"**Credits:** Sistheo, Zeekom, CrysaLEAD, Akretion and Camptocamp.\n"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.fm
+msgid "Micronesia"
+msgstr ""
+
+#. module: base
+#: field:ir.module.module,menus_by_module:0
+#: view:res.groups:0
+msgid "Menus"
+msgstr ""
+
+#. module: base
+#: selection:ir.actions.todo,type:0
+msgid "Launch Manually Once"
+msgstr ""
+
+#. module: base
+#: view:workflow:0
+#: view:workflow.activity:0
+#: field:workflow.activity,wkf_id:0
+#: field:workflow.instance,wkf_id:0
+#: field:workflow.transition,wkf_id:0
+#: field:workflow.workitem,wkf_id:0
+msgid "Workflow"
+msgstr ""
+
+#. module: base
+#: selection:base.language.install,lang:0
+msgid "Serbian (Latin) / srpski"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.il
+msgid "Israel"
+msgstr ""
+
+#. module: base
+#: code:addons/base/res/res_config.py:444
+#, python-format
+msgid "Cannot duplicate configuration!"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_l10n_syscohada
+msgid "OHADA - Accounting"
+msgstr ""
+
+#. module: base
+#: help:res.bank,bic:0
+msgid "Sometimes called BIC or Swift."
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_l10n_in
+msgid "Indian - Accounting"
+msgstr ""
+
+#. module: base
+#: field:res.lang,time_format:0
+msgid "Time Format"
+msgstr ""
+
+#. module: base
+#: field:res.company,rml_header3:0
+msgid "RML Internal Header for Landscape Reports"
+msgstr ""
+
+#. module: base
+#: model:res.groups,name:base.group_partner_manager
+msgid "Contact Creation"
+msgstr ""
+
+#. module: base
+#: view:ir.module.module:0
+msgid "Defined Reports"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_project_gtd
+msgid "Todo Lists"
+msgstr ""
+
+#. module: base
+#: view:ir.actions.report.xml:0
+msgid "Report xml"
+msgstr ""
+
+#. module: base
+#: model:ir.actions.act_window,name:base.action_module_open_categ
+#: field:ir.module.category,module_ids:0
+#: view:ir.module.module:0
+#: model:ir.ui.menu,name:base.menu_management
+msgid "Modules"
+msgstr ""
+
+#. module: base
+#: view:workflow.activity:0
+#: selection:workflow.activity,kind:0
+#: field:workflow.activity,subflow_id:0
+#: field:workflow.workitem,subflow_id:0
+msgid "Subflow"
+msgstr ""
+
+#. module: base
+#: model:ir.actions.act_window,name:base.action_res_bank_form
+#: model:ir.ui.menu,name:base.menu_action_res_bank_form
+#: view:res.bank:0
+#: field:res.partner,bank_ids:0
+msgid "Banks"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_web
+msgid ""
+"\n"
+"OpenERP Web core module.\n"
+"========================\n"
+"\n"
+"This module provides the core of the OpenERP Web Client.\n"
+"        "
+msgstr ""
+
+#. module: base
+#: view:ir.sequence:0
+msgid "Week of the Year: %(woy)s"
+msgstr ""
+
+#. module: base
+#: field:res.users,id:0
+msgid "ID"
+msgstr ""
+
+#. module: base
+#: field:ir.cron,doall:0
+msgid "Repeat Missed"
+msgstr ""
+
+#. module: base
+#: code:addons/base/module/wizard/base_module_import.py:67
+#, python-format
+msgid "Can not create the module file: %s !"
+msgstr ""
+
+#. module: base
+#: field:ir.server.object.lines,server_id:0
+msgid "Object Mapping"
+msgstr ""
+
+#. module: base
+#: field:ir.module.category,xml_id:0
+#: field:ir.ui.view,xml_id:0
+msgid "External ID"
+msgstr ""
+
+#. module: base
+#: help:res.currency.rate,rate:0
+msgid "The rate of the currency to the currency of rate 1"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.uk
+msgid "United Kingdom"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_l10n_pa
+msgid "Panama Localization Chart Account"
+msgstr ""
+
+#. module: base
+#: help:res.partner.category,active:0
+msgid "The active field allows you to hide the category without removing it."
+msgstr ""
+
+#. module: base
+#: report:ir.module.reference:0
+msgid "Object:"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.bw
+msgid "Botswana"
+msgstr ""
+
+#. module: base
+#: view:res.partner.title:0
+msgid "Partner Titles"
+msgstr ""
+
+#. module: base
+#: code:addons/base/ir/ir_fields.py:196
+#: code:addons/base/ir/ir_fields.py:227
+#, python-format
+msgid "Use the format '%s'"
+msgstr ""
+
+#. module: base
+#: help:ir.actions.act_window,auto_refresh:0
+msgid "Add an auto-refresh on the view"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_crm_profiling
+msgid "Customer Profiling"
+msgstr ""
+
+#. module: base
+#: selection:ir.cron,interval_type:0
+msgid "Work Days"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_multi_company
+msgid "Multi-Company"
+msgstr ""
+
+#. module: base
+#: model:ir.actions.act_window,name:base.action_workflow_workitem_form
+#: model:ir.ui.menu,name:base.menu_workflow_workitem
+msgid "Workitems"
+msgstr ""
+
+#. module: base
+#: code:addons/base/res/res_bank.py:195
+#, python-format
+msgid "Invalid Bank Account Type Name format."
+msgstr ""
+
+#. module: base
+#: view:ir.filters:0
+msgid "Filters visible only for one user"
+msgstr ""
+
+#. module: base
+#: model:ir.model,name:base.model_ir_attachment
+msgid "ir.attachment"
+msgstr ""
+
+#. module: base
+#: code:addons/orm.py:4348
+#, python-format
+msgid ""
+"You cannot perform this operation. New Record Creation is not allowed for "
+"this object as this object is for reporting purpose."
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_base_import
+msgid ""
+"\n"
+"New extensible file import for OpenERP\n"
+"======================================\n"
+"\n"
+"Re-implement openerp's file import system:\n"
+"\n"
+"* Server side, the previous system forces most of the logic into the\n"
+"  client which duplicates the effort (between clients), makes the\n"
+"  import system much harder to use without a client (direct RPC or\n"
+"  other forms of automation) and makes knowledge about the\n"
+"  import/export system much harder to gather as it is spread over\n"
+"  3+ different projects.\n"
+"\n"
+"* In a more extensible manner, so users and partners can build their\n"
+"  own front-end to import from other file formats (e.g. OpenDocument\n"
+"  files) which may be simpler to handle in their work flow or from\n"
+"  their data production sources.\n"
+"\n"
+"* In a module, so that administrators and users of OpenERP who do not\n"
+"  need or want an online import can avoid it being available to users.\n"
+msgstr ""
+
+#. module: base
+#: selection:res.currency,position:0
+msgid "After Amount"
+msgstr ""
+
+#. module: base
+#: selection:base.language.install,lang:0
+msgid "Lithuanian / Lietuvių kalba"
+msgstr ""
+
+#. module: base
+#: help:ir.actions.server,record_id:0
+msgid ""
+"Provide the field name where the record id is stored after the create "
+"operations. If it is empty, you can not track the new record."
+msgstr ""
+
+#. module: base
+#: model:res.groups,comment:base.group_hr_user
+msgid "the user will be able to approve document created by employees."
+msgstr ""
+
+#. module: base
+#: field:ir.ui.menu,needaction_enabled:0
+msgid "Target model uses the need action mechanism"
+msgstr ""
+
+#. module: base
+#: help:ir.model.fields,relation:0
+msgid "For relationship fields, the technical name of the target model"
+msgstr ""
+
+#. module: base
+#: view:res.lang:0
+msgid "%S - Seconds [00,61]."
+msgstr ""
+
+#. module: base
+#: help:base.language.import,overwrite:0
+msgid ""
+"If you enable this option, existing translations (including custom ones) "
+"will be overwritten and replaced by those in this file"
+msgstr ""
+
+#. module: base
+#: field:ir.ui.view,inherit_id:0
+msgid "Inherited View"
+msgstr ""
+
+#. module: base
+#: view:ir.translation:0
+msgid "Source Term"
+msgstr ""
+
+#. module: base
+#: model:ir.module.category,name:base.module_category_project_management
+#: model:ir.ui.menu,name:base.menu_main_pm
+#: model:ir.ui.menu,name:base.menu_project_config
+#: model:ir.ui.menu,name:base.menu_project_report
+msgid "Project"
+msgstr ""
+
+#. module: base
+#: field:ir.ui.menu,web_icon_hover_data:0
+msgid "Web Icon Image (hover)"
+msgstr ""
+
+#. module: base
+#: view:base.module.import:0
+msgid "Module file successfully imported!"
+msgstr ""
+
+#. module: base
+#: model:ir.actions.act_window,name:base.action_model_constraint
+#: view:ir.model.constraint:0
+#: model:ir.ui.menu,name:base.ir_model_constraint_menu
+msgid "Model Constraints"
+msgstr ""
+
+#. module: base
+#: model:ir.actions.act_window,name:base.action_workflow_transition_form
+#: model:ir.ui.menu,name:base.menu_workflow_transition
+#: view:workflow.activity:0
+msgid "Transitions"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_hr_timesheet
+#: model:ir.module.module,shortdesc:base.module_hr_timesheet_sheet
+msgid "Timesheets"
+msgstr ""
+
+#. module: base
+#: help:ir.values,company_id:0
+msgid "If set, action binding only applies for this company"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_l10n_cn
+msgid ""
+"\n"
+"添加中文省份数据\n"
+"科目类型\\会计科目表模板\\增值税\\辅助核算类别\\管理会计凭证簿\\财务会计凭证簿\n"
+"============================================================\n"
+"    "
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.lc
+msgid "Saint Lucia"
+msgstr ""
+
+#. module: base
+#: help:res.users,new_password:0
+msgid ""
+"Specify a value only when creating a user or if you're changing the user's "
+"password, otherwise leave empty. After a change of password, the user has to "
+"login again."
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.so
+msgid "Somalia"
+msgstr ""
+
+#. module: base
+#: model:res.partner.title,shortcut:base.res_partner_title_doctor
+msgid "Dr."
+msgstr ""
+
+#. module: base
+#: model:res.groups,name:base.group_user
+#: field:res.partner,employee:0
+#: model:res.partner.category,name:base.res_partner_category_3
+msgid "Employee"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_project_issue
+msgid ""
+"\n"
+"Track Issues/Bugs Management for Projects\n"
+"=========================================\n"
+"This application allows you to manage the issues you might face in a project "
+"like bugs in a system, client complaints or material breakdowns. \n"
+"\n"
+"It allows the manager to quickly check the issues, assign them and decide on "
+"their status quickly as they evolve.\n"
+"    "
+msgstr ""
+
+#. module: base
+#: field:ir.model.access,perm_create:0
+msgid "Create Access"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_hr_timesheet
+msgid ""
+"\n"
+"This module implements a timesheet system.\n"
+"==========================================\n"
+"\n"
+"Each employee can encode and track their time spent on the different "
+"projects.\n"
+"A project is an analytic account and the time spent on a project generates "
+"costs on\n"
+"the analytic account.\n"
+"\n"
+"Lots of reporting on time and employee tracking are provided.\n"
+"\n"
+"It is completely integrated with the cost accounting module. It allows you "
+"to set\n"
+"up a management by affair.\n"
+"    "
+msgstr ""
+
+#. module: base
+#: field:res.bank,state:0
+#: field:res.company,state_id:0
+#: field:res.partner.bank,state_id:0
+msgid "Fed. State"
+msgstr ""
+
+#. module: base
+#: field:ir.actions.server,copy_object:0
+msgid "Copy Of"
+msgstr ""
+
+#. module: base
+#: field:ir.model.data,display_name:0
+msgid "Record Name"
+msgstr ""
+
+#. module: base
+#: model:ir.model,name:base.model_ir_actions_client
+#: selection:ir.ui.menu,action:0
+msgid "ir.actions.client"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.io
+msgid "British Indian Ocean Territory"
+msgstr ""
+
+#. module: base
+#: model:ir.actions.server,name:base.action_server_module_immediate_install
+msgid "Module Immediate Install"
+msgstr ""
+
+#. module: base
+#: view:ir.actions.server:0
+msgid "Field Mapping"
+msgstr ""
+
+#. module: base
+#: field:ir.model.fields,ttype:0
+msgid "Field Type"
+msgstr ""
+
+#. module: base
+#: field:res.country.state,code:0
+msgid "State Code"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_l10n_multilang
+msgid "Multi Language Chart of Accounts"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_l10n_gt
+msgid ""
+"\n"
+"This is the base module to manage the accounting chart for Guatemala.\n"
+"=====================================================================\n"
+"\n"
+"Agrega una nomenclatura contable para Guatemala. También icluye impuestos y\n"
+"la moneda del Quetzal. -- Adds accounting chart for Guatemala. It also "
+"includes\n"
+"taxes and the Quetzal currency."
+msgstr ""
+
+#. module: base
+#: selection:res.lang,direction:0
+msgid "Left-to-Right"
+msgstr ""
+
+#. module: base
+#: field:ir.model.fields,translate:0
+#: view:res.lang:0
+#: field:res.lang,translatable:0
+msgid "Translatable"
+msgstr ""
+
+#. module: base
+#: help:base.language.import,code:0
+msgid "ISO Language and Country code, e.g. en_US"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.vn
+msgid "Vietnam"
+msgstr ""
+
+#. module: base
+#: field:res.users,signature:0
+msgid "Signature"
+msgstr ""
+
+#. module: base
+#: field:res.partner.category,complete_name:0
+msgid "Full Name"
+msgstr ""
+
+#. module: base
+#: view:ir.attachment:0
+msgid "on"
+msgstr ""
+
+#. module: base
+#: view:ir.property:0
+msgid "Parameters that are used by all resources."
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.mz
+msgid "Mozambique"
+msgstr ""
+
+#. module: base
+#: help:ir.values,action_id:0
+msgid ""
+"Action bound to this entry - helper field for binding an action, will "
+"automatically set the correct reference"
+msgstr ""
+
+#. module: base
+#: model:ir.ui.menu,name:base.menu_project_long_term
+msgid "Long Term Planning"
+msgstr ""
+
+#. module: base
+#: field:ir.actions.server,message:0
+msgid "Message"
+msgstr ""
+
+#. module: base
+#: field:ir.actions.act_window.view,multi:0
+#: field:ir.actions.report.xml,multi:0
+msgid "On Multiple Doc."
+msgstr ""
+
+#. module: base
+#: view:base.language.export:0
+#: view:base.language.import:0
+#: view:base.language.install:0
+#: view:base.module.import:0
+#: view:base.module.update:0
+#: view:base.module.upgrade:0
+#: view:base.update.translations:0
+#: view:change.password.wizard:0
+#: view:ir.actions.configuration.wizard:0
+#: view:res.config:0
+#: view:res.config.installer:0
+#: view:res.users:0
+#: view:wizard.ir.model.menu.create:0
+msgid "or"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_account_accountant
+msgid "Accounting and Finance"
+msgstr ""
+
+#. module: base
+#: view:ir.module.module:0
+msgid "Upgrade"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_base_action_rule
+msgid ""
+"\n"
+"This module allows to implement action rules for any object.\n"
+"============================================================\n"
+"\n"
+"Use automated actions to automatically trigger actions for various screens.\n"
+"\n"
+"**Example:** A lead created by a specific user may be automatically set to a "
+"specific\n"
+"sales team, or an opportunity which still has status pending after 14 days "
+"might\n"
+"trigger an automatic reminder email.\n"
+"    "
+msgstr ""
+
+#. module: base
+#: field:res.partner,function:0
+msgid "Job Position"
+msgstr ""
+
+#. module: base
+#: view:res.partner:0
+#: field:res.partner,child_ids:0
+msgid "Contacts"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.fo
+msgid "Faroe Islands"
+msgstr ""
+
+#. module: base
+#: field:ir.mail_server,smtp_encryption:0
+msgid "Connection Security"
+msgstr ""
+
+#. module: base
+#: code:addons/base/ir/ir_actions.py:606
+#, python-format
+msgid "Please specify an action to launch !"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_l10n_ec
+msgid "Ecuador - Accounting"
+msgstr ""
+
+#. module: base
+#: field:res.partner.category,name:0
+msgid "Category Name"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.mp
+msgid "Northern Mariana Islands"
+msgstr ""
+
+#. module: base
+#: field:change.password.user,user_login:0
+msgid "User Login"
+msgstr ""
+
+#. module: base
+#: view:ir.filters:0
+msgid "Filters created by myself"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_l10n_hn
+msgid "Honduras - Accounting"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_report_intrastat
+msgid "Intrastat Reporting"
+msgstr ""
+
+#. module: base
+#: code:addons/base/res/res_users.py:131
+#, python-format
+msgid ""
+"Please use the change password wizard (in User Preferences or User menu) to "
+"change your own password."
+msgstr ""
+
+#. module: base
+#: model:ir.model,name:base.model_ir_config_parameter
+msgid "ir.config_parameter"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_project_long_term
+msgid ""
+"\n"
+"Long Term Project management module that tracks planning, scheduling, "
+"resources allocation.\n"
+"============================================================================="
+"==============\n"
+"\n"
+"Features:\n"
+"---------\n"
+"    * Manage Big project\n"
+"    * Define various Phases of Project\n"
+"    * Compute Phase Scheduling: Compute start date and end date of the "
+"phases\n"
+"      which are in draft, open and pending state of the project given. If "
+"no\n"
+"      project given then all the draft, open and pending state phases will "
+"be taken.\n"
+"    * Compute Task Scheduling: This works same as the scheduler button on\n"
+"      project.phase. It takes the project as argument and computes all the "
+"open,\n"
+"      draft and pending tasks.\n"
+"    * Schedule Tasks: All the tasks which are in draft, pending and open "
+"state\n"
+"      are scheduled with taking the phase's start date.\n"
+"    "
+msgstr ""
+
+#. module: base
+#: code:addons/orm.py:2021
+#, python-format
+msgid "Insufficient fields for Calendar View!"
+msgstr ""
+
+#. module: base
+#: selection:ir.property,type:0
+msgid "Integer"
+msgstr ""
+
+#. module: base
+#: help:ir.actions.report.xml,report_rml:0
+msgid ""
+"The path to the main report file (depending on Report Type) or NULL if the "
+"content is in another data field"
+msgstr ""
+
+#. module: base
+#: model:res.partner.category,name:base.res_partner_category_14
+msgid "Manufacturer"
+msgstr ""
+
+#. module: base
+#: help:res.users,company_id:0
+msgid "The company this user is currently working for."
+msgstr ""
+
+#. module: base
+#: model:ir.model,name:base.model_wizard_ir_model_menu_create
+msgid "wizard.ir.model.menu.create"
+msgstr ""
+
+#. module: base
+#: view:workflow.transition:0
+msgid "Transition"
+msgstr ""
+
+#. module: base
+#: field:ir.cron,active:0
+#: field:ir.mail_server,active:0
+#: field:ir.model.access,active:0
+#: field:ir.rule,active:0
+#: field:ir.sequence,active:0
+#: field:res.bank,active:0
+#: field:res.currency,active:0
+#: field:res.lang,active:0
+#: field:res.partner,active:0
+#: field:res.partner.category,active:0
+#: field:res.request,active:0
+#: field:res.users,active:0
+#: view:workflow.instance:0
+#: view:workflow.workitem:0
+msgid "Active"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.na
+msgid "Namibia"
+msgstr ""
+
+#. module: base
+#: field:res.partner.category,child_ids:0
+msgid "Child Categories"
+msgstr ""
+
+#. module: base
+#: code:addons/base/ir/ir_actions.py:606
+#: code:addons/base/ir/ir_actions.py:702
+#: code:addons/base/ir/ir_actions.py:705
+#: code:addons/base/ir/ir_model.py:165
+#: code:addons/base/ir/ir_model.py:277
+#: code:addons/base/ir/ir_model.py:291
+#: code:addons/base/ir/ir_model.py:321
+#: code:addons/base/ir/ir_model.py:340
+#: code:addons/base/ir/ir_model.py:345
+#: code:addons/base/ir/ir_model.py:348
+#: code:addons/base/ir/ir_translation.py:341
+#: code:addons/base/module/module.py:320
+#: code:addons/base/module/module.py:362
+#: code:addons/base/module/module.py:366
+#: code:addons/base/module/module.py:372
+#: code:addons/base/module/module.py:499
+#: code:addons/base/module/module.py:525
+#: code:addons/base/module/module.py:539
+#: code:addons/base/module/module.py:644
+#: code:addons/base/res/res_currency.py:193
+#: code:addons/base/res/res_users.py:98
+#: code:addons/custom.py:555
+#: code:addons/orm.py:787
+#: code:addons/orm.py:3961
+#, python-format
+msgid "Error"
+msgstr ""
+
+#. module: base
+#: help:res.partner,tz:0
+msgid ""
+"The partner's timezone, used to output proper date and time values inside "
+"printed reports. It is important to set a value for this field. You should "
+"use the same timezone that is otherwise used to pick and render date and "
+"time values: your computer's timezone."
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_account_analytic_default
+msgid "Account Analytic Defaults"
+msgstr ""
+
+#. module: base
+#: selection:ir.ui.view,type:0
+msgid "mdx"
+msgstr ""
+
+#. module: base
+#: view:ir.cron:0
+msgid "Scheduled Action"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.bi
+msgid "Burundi"
+msgstr ""
+
+#. module: base
+#: view:base.language.export:0
+#: view:base.language.install:0
+#: view:base.module.configuration:0
+#: view:base.module.update:0
+msgid "Close"
+msgstr ""
+
+#. module: base
+#: selection:base.language.install,lang:0
+msgid "Spanish (MX) / Español (MX)"
+msgstr ""
+
+#. module: base
+#: view:ir.actions.todo:0
+msgid "Wizards to be Launched"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.bt
+msgid "Bhutan"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_portal_event
+msgid ""
+"\n"
+"This module adds event menu and features to your portal if event and portal "
+"are installed.\n"
+"============================================================================="
+"=============\n"
+"    "
+msgstr ""
+
+#. module: base
+#: help:ir.sequence,number_next:0
+msgid "Next number of this sequence"
+msgstr ""
+
+#. module: base
+#: view:res.partner:0
+#: view:res.users:0
+msgid "Tags..."
+msgstr ""
+
+#. module: base
+#: view:res.partner:0
+msgid "at"
+msgstr ""
+
+#. module: base
+#: view:ir.rule:0
+msgid "Rule Definition (Domain Filter)"
+msgstr ""
+
+#. module: base
+#: selection:ir.actions.act_url,target:0
+msgid "This Window"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_portal_anonymous
+msgid "Anonymous portal"
+msgstr ""
+
+#. module: base
+#: field:base.language.export,format:0
+msgid "File Format"
+msgstr ""
+
+#. module: base
+#: view:ir.filters:0
+msgid "My filters"
+msgstr ""
+
+#. module: base
+#: field:res.lang,iso_code:0
+msgid "ISO code"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_association
+msgid "Associations Management"
+msgstr ""
+
+#. module: base
+#: help:ir.model,modules:0
+msgid "List of modules in which the object is defined or inherited"
+msgstr ""
+
+#. module: base
+#: model:ir.module.category,name:base.module_category_localization_payroll
+#: model:ir.module.module,shortdesc:base.module_hr_payroll
+msgid "Payroll"
+msgstr ""
+
+#. module: base
+#: model:ir.actions.act_window,help:base.action_country_state
+msgid ""
+"If you are working on the American market, you can manage the different "
+"federal states you are working on from here. Each state is attached to one "
+"country."
+msgstr ""
+
+#. module: base
+#: view:workflow.workitem:0
+msgid "Workflow Workitems"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.vc
+msgid "Saint Vincent & Grenadines"
+msgstr ""
+
+#. module: base
+#: field:ir.mail_server,smtp_pass:0
+#: field:res.users,password:0
+msgid "Password"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_portal_claim
+msgid "Portal Claim"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_l10n_pe
+msgid "Peru Localization Chart Account"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_auth_oauth
+msgid ""
+"\n"
+"Allow users to login through OAuth2 Provider.\n"
+"=============================================\n"
+msgstr ""
+
+#. module: base
+#: model:ir.actions.act_window,name:base.action_model_fields
+#: view:ir.model:0
+#: field:ir.model,field_id:0
+#: model:ir.model,name:base.model_ir_model_fields
+#: view:ir.model.fields:0
+#: model:ir.ui.menu,name:base.ir_model_model_fields
+msgid "Fields"
+msgstr ""
+
+#. module: base
+#: model:ir.actions.act_window,name:base.action_partner_employee_form
+msgid "Employees"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_web_shortcuts
+msgid ""
+"\n"
+"Enable shortcuts feature in the web client.\n"
+"===========================================\n"
+"\n"
+"Add a Shortcut icon in the systray in order to access the user's shortcuts "
+"(if any).\n"
+"\n"
+"Add a Shortcut icon besides the views title in order to add/remove a "
+"shortcut.\n"
+"    "
+msgstr ""
+
+#. module: base
+#: field:res.company,rml_header2:0
+msgid "RML Internal Header"
+msgstr ""
+
+#. module: base
+#: field:ir.actions.act_window,search_view_id:0
+msgid "Search View Ref."
+msgstr ""
+
+#. module: base
+#: help:res.users,partner_id:0
+msgid "Partner-related data of the user"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_crm_todo
+msgid ""
+"\n"
+"Todo list for CRM leads and opportunities.\n"
+"==========================================\n"
+"    "
+msgstr ""
+
+#. module: base
+#: view:ir.mail_server:0
+msgid "Test Connection"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.mm
+msgid "Myanmar"
+msgstr ""
+
+#. module: base
+#: help:ir.model.fields,modules:0
+msgid "List of modules in which the field is defined"
+msgstr ""
+
+#. module: base
+#: selection:base.language.install,lang:0
+msgid "Chinese (CN) / 简体中文"
+msgstr ""
+
+#. module: base
+#: field:ir.model.fields,selection:0
+msgid "Selection Options"
+msgstr ""
+
+#. module: base
+#: field:res.bank,street:0
+#: field:res.company,street:0
+#: field:res.partner,street:0
+#: view:res.partner.bank:0
+#: field:res.partner.bank,street:0
+msgid "Street"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.yu
+msgid "Yugoslavia"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_base_gengo
+msgid ""
+"\n"
+"Automated Translations through Gengo API\n"
+"========================================\n"
+"\n"
+"This module will install passive scheduler job for automated translations \n"
+"using the Gengo API. To activate it, you must\n"
+"1) Configure your Gengo authentication parameters under `Settings > "
+"Companies > Gengo Parameters`\n"
+"2) Launch the wizard under `Settings > Application Terms > Gengo: Manual "
+"Request of Translation` and follow the wizard.\n"
+"\n"
+"This wizard will activate the CRON job and the Scheduler and will start the "
+"automatic translation via Gengo Services for all the terms where you "
+"requested it.\n"
+"    "
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_fetchmail
+msgid ""
+"\n"
+"Retrieve incoming email on POP/IMAP servers.\n"
+"============================================\n"
+"\n"
+"Enter the parameters of your POP/IMAP account(s), and any incoming emails "
+"on\n"
+"these accounts will be automatically downloaded into your OpenERP system. "
+"All\n"
+"POP3/IMAP-compatible servers are supported, included those that require an\n"
+"encrypted SSL/TLS connection.\n"
+"\n"
+"This can be used to easily create email-based workflows for many email-"
+"enabled OpenERP documents, such as:\n"
+"-----------------------------------------------------------------------------"
+"-----------------------------\n"
+"    * CRM Leads/Opportunities\n"
+"    * CRM Claims\n"
+"    * Project Issues\n"
+"    * Project Tasks\n"
+"    * Human Resource Recruitments (Applicants)\n"
+"\n"
+"Just install the relevant application, and you can assign any of these "
+"document\n"
+"types (Leads, Project Issues) to your incoming email accounts. New emails "
+"will\n"
+"automatically spawn new documents of the chosen type, so it's a snap to "
+"create a\n"
+"mailbox-to-OpenERP integration. Even better: these documents directly act as "
+"mini\n"
+"conversations synchronized by email. You can reply from within OpenERP, and "
+"the\n"
+"answers will automatically be collected when they come back, and attached to "
+"the\n"
+"same *conversation* document.\n"
+"\n"
+"For more specific needs, you may also assign custom-defined actions\n"
+"(technically: Server Actions) to be triggered for each incoming mail.\n"
+"    "
+msgstr ""
+
+#. module: base
+#: field:res.currency,rounding:0
+msgid "Rounding Factor"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.ca
+msgid "Canada"
+msgstr ""
+
+#. module: base
+#: view:base.language.export:0
+msgid "Launchpad"
+msgstr ""
+
+#. module: base
+#: help:res.currency.rate,currency_rate_type_id:0
+msgid ""
+"Allow you to define your own currency rate types, like 'Average' or 'Year to "
+"Date'. Leave empty if you simply want to use the normal 'spot' rate type"
+msgstr ""
+
+#. module: base
+#: selection:ir.module.module.dependency,state:0
+msgid "Unknown"
+msgstr ""
+
+#. module: base
+#: model:ir.actions.act_window,name:base.action_res_users_my
+msgid "Change My Preferences"
+msgstr ""
+
+#. module: base
+#: code:addons/base/ir/ir_actions.py:171
+#, python-format
+msgid "Invalid model name in the action definition."
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_l10n_ro
+msgid ""
+"\n"
+"This is the module to manage the accounting chart, VAT structure and "
+"Registration Number for Romania in OpenERP.\n"
+"============================================================================="
+"===================================\n"
+"\n"
+"Romanian accounting chart and localization.\n"
+"    "
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.cm
+msgid "Cameroon"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.bf
+msgid "Burkina Faso"
+msgstr ""
+
+#. module: base
+#: selection:ir.model.fields,state:0
+msgid "Custom Field"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,summary:base.module_account_accountant
+msgid "Financial and Analytic Accounting"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_portal_project
+msgid "Portal Project"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.cc
+msgid "Cocos (Keeling) Islands"
+msgstr ""
+
+#. module: base
+#: selection:base.language.install,state:0
+#: selection:base.module.import,state:0
+#: selection:base.module.update,state:0
+msgid "init"
+msgstr ""
+
+#. module: base
+#: view:res.partner:0
+#: field:res.partner,user_id:0
+msgid "Salesperson"
+msgstr ""
+
+#. module: base
+#: view:res.lang:0
+msgid "11. %U or %W       ==> 48 (49th week)"
+msgstr ""
+
+#. module: base
+#: model:ir.model,name:base.model_res_partner_bank_type_field
+msgid "Bank type fields"
+msgstr ""
+
+#. module: base
+#: constraint:ir.rule:0
+msgid "Rules can not be applied on Transient models."
+msgstr ""
+
+#. module: base
+#: selection:base.language.install,lang:0
+msgid "Dutch / Nederlands"
+msgstr ""
+
+#. module: base
+#: selection:res.company,paper_format:0
+msgid "US Letter"
+msgstr ""
+
+#. module: base
+#: model:ir.actions.act_window,help:base.action_partner_customer_form
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to add a contact in your address book.\n"
+"              </p><p>\n"
+"                OpenERP helps you easily track all activities related to\n"
+"                a customer: discussions, history of business opportunities,\n"
+"                documents, etc.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
+#. module: base
+#: model:ir.actions.act_window,name:base.bank_account_update
+msgid "Company Bank Accounts"
+msgstr ""
+
+#. module: base
+#: code:addons/base/res/res_users.py:473
+#, python-format
+msgid "Setting empty passwords is not allowed for security reasons!"
+msgstr ""
+
+#. module: base
+#: help:ir.mail_server,smtp_pass:0
+msgid "Optional password for SMTP authentication"
+msgstr ""
+
+#. module: base
+#: code:addons/base/ir/ir_model.py:728
+#, python-format
+msgid "Sorry, you are not allowed to modify this document."
+msgstr ""
+
+#. module: base
+#: code:addons/base/res/res_config.py:350
+#, python-format
+msgid ""
+"\n"
+"\n"
+"This addon is already installed on your system"
+msgstr ""
+
+#. module: base
+#: help:ir.cron,interval_number:0
+msgid "Repeat every x."
+msgstr ""
+
+#. module: base
+#: model:res.partner.bank.type,name:base.bank_normal
+msgid "Normal Bank Account"
+msgstr ""
+
+#. module: base
+#: field:change.password.user,wizard_id:0
+#: view:ir.actions.wizard:0
+msgid "Wizard"
+msgstr ""
+
+#. module: base
+#: code:addons/base/ir/ir_fields.py:303
+#, python-format
+msgid "database id"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_base_import
+msgid "Base import"
+msgstr ""
+
+#. module: base
+#: report:ir.module.reference:0
+msgid "1cm 28cm 20cm 28cm"
+msgstr ""
+
+#. module: base
+#: field:ir.module.module,maintainer:0
+msgid "Maintainer"
+msgstr ""
+
+#. module: base
+#: field:ir.sequence,suffix:0
+msgid "Suffix"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.mo
+msgid "Macau"
+msgstr ""
+
+#. module: base
+#: model:ir.actions.report.xml,name:base.res_partner_address_report
+msgid "Labels"
+msgstr ""
+
+#. module: base
+#: help:res.partner,use_parent_address:0
+msgid ""
+"Select this if you want to set company's address information  for this "
+"contact"
+msgstr ""
+
+#. module: base
+#: field:ir.default,field_name:0
+msgid "Object Field"
+msgstr ""
+
+#. module: base
+#: selection:base.language.install,lang:0
+msgid "Spanish (PE) / Español (PE)"
+msgstr ""
+
+#. module: base
+#: selection:base.language.install,lang:0
+msgid "French (CH) / Français (CH)"
+msgstr ""
+
+#. module: base
+#: model:res.partner.category,name:base.res_partner_category_13
+msgid "Distributor"
+msgstr ""
+
+#. module: base
+#: help:ir.actions.server,subject:0
+msgid ""
+"Email subject, may contain expressions enclosed in double brackets based on "
+"the same values as those available in the condition field, e.g. `Hello [[ "
+"object.partner_id.name ]]`"
+msgstr ""
+
+#. module: base
+#: help:res.partner,image:0
+msgid ""
+"This field holds the image used as avatar for this contact, limited to "
+"1024x1024px"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.to
+msgid "Tonga"
+msgstr ""
+
+#. module: base
+#: help:ir.model.fields,serialization_field_id:0
+msgid ""
+"If set, this field will be stored in the sparse structure of the "
+"serialization field, instead of having its own database column. This cannot "
+"be changed after creation."
+msgstr ""
+
+#. module: base
+#: view:res.partner.bank:0
+msgid "Bank accounts belonging to one of your companies"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_account_analytic_plans
+msgid ""
+"\n"
+"This module allows to use several analytic plans according to the general "
+"journal.\n"
+"============================================================================="
+"=====\n"
+"\n"
+"Here multiple analytic lines are created when the invoice or the entries\n"
+"are confirmed.\n"
+"\n"
+"For example, you can define the following analytic structure:\n"
+"-------------------------------------------------------------\n"
+"  * **Projects**\n"
+"      * Project 1\n"
+"          + SubProj 1.1\n"
+"          \n"
+"          + SubProj 1.2\n"
+"\n"
+"      * Project 2\n"
+"      \n"
+"  * **Salesman**\n"
+"      * Eric\n"
+"      \n"
+"      * Fabien\n"
+"\n"
+"Here, we have two plans: Projects and Salesman. An invoice line must be able "
+"to write analytic entries in the 2 plans: SubProj 1.1 and Fabien. The amount "
+"can also be split.\n"
+" \n"
+"The following example is for an invoice that touches the two subprojects and "
+"assigned to one salesman:\n"
+"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
+"~~~~~~~~~~~~~~~~~~~~~~~~~\n"
+"**Plan1:**\n"
+"\n"
+"    * SubProject 1.1 : 50%\n"
+"    \n"
+"    * SubProject 1.2 : 50%\n"
+"    \n"
+"**Plan2:**\n"
+"    Eric: 100%\n"
+"\n"
+"So when this line of invoice will be confirmed, it will generate 3 analytic "
+"lines,for one account entry.\n"
+"\n"
+"The analytic plan validates the minimum and maximum percentage at the time "
+"of creation of distribution models.\n"
+"        "
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_account_sequence
+msgid "Entries Sequence Numbering"
+msgstr ""
+
+#. module: base
+#: view:base.language.export:0
+msgid "POEdit"
+msgstr ""
+
+#. module: base
+#: view:ir.values:0
+msgid "Client Actions"
+msgstr ""
+
+#. module: base
+#: field:res.partner.bank.type,field_ids:0
+msgid "Type Fields"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,summary:base.module_hr_recruitment
+msgid "Jobs, Recruitment, Applications, Job Interviews"
+msgstr ""
+
+#. module: base
+#: code:addons/base/module/module.py:539
+#, python-format
+msgid ""
+"You try to upgrade a module that depends on the module: %s.\n"
+"But this module is not available in your system."
+msgstr ""
+
+#. module: base
+#: field:workflow.transition,act_to:0
+msgid "Destination Activity"
+msgstr ""
+
+#. module: base
+#: help:res.currency,position:0
+msgid ""
+"Determines where the currency symbol should be placed after or before the "
+"amount."
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_pad_project
+msgid "Pad on tasks"
+msgstr ""
+
+#. module: base
+#: model:ir.model,name:base.model_base_update_translations
+msgid "base.update.translations"
+msgstr ""
+
+#. module: base
+#: view:ir.rule:0
+msgid "Full Access Right"
+msgstr ""
+
+#. module: base
+#: field:res.partner.category,parent_id:0
+msgid "Parent Category"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.fi
+msgid "Finland"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_web_shortcuts
+msgid "Web Shortcuts"
+msgstr ""
+
+#. module: base
+#: view:res.partner:0
+#: selection:res.partner,type:0
+#: selection:res.partner.title,domain:0
+#: view:res.users:0
+msgid "Contact"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_l10n_at
+msgid "Austria - Accounting"
+msgstr ""
+
+#. module: base
+#: model:ir.model,name:base.model_ir_ui_menu
+msgid "ir.ui.menu"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_project
+msgid "Project Management"
+msgstr ""
+
+#. module: base
+#: view:ir.module.module:0
+msgid "Cancel Uninstall"
+msgstr ""
+
+#. module: base
+#: view:res.bank:0
+msgid "Communication"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_analytic
+msgid "Analytic Accounting"
+msgstr ""
+
+#. module: base
+#: model:ir.model,name:base.model_ir_model_constraint
+msgid "ir.model.constraint"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_web_graph
+msgid "Graph Views"
+msgstr ""
+
+#. module: base
+#: help:ir.model.relation,name:0
+msgid "PostgreSQL table name implementing a many2many relation."
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_base
+msgid ""
+"\n"
+"The kernel of OpenERP, needed for all installation.\n"
+"===================================================\n"
+msgstr ""
+
+#. module: base
+#: model:ir.model,name:base.model_ir_server_object_lines
+msgid "ir.server.object.lines"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_l10n_be
+msgid "Belgium - Accounting"
+msgstr ""
+
+#. module: base
+#: view:ir.model.access:0
+msgid "Access Control"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.kw
+msgid "Kuwait"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_account_followup
+msgid "Payment Follow-up Management"
+msgstr ""
+
+#. module: base
+#: code:addons/orm.py:5334
+#, python-format
+msgid "The value for the field '%s' already exists."
+msgstr ""
+
+#. module: base
+#: field:workflow.workitem,inst_id:0
+msgid "Instance"
+msgstr ""
+
+#. module: base
+#: help:ir.actions.report.xml,attachment:0
+msgid ""
+"This is the filename of the attachment used to store the printing result. "
+"Keep empty to not save the printed reports. You can use a python expression "
+"with the object and time variables."
+msgstr ""
+
+#. module: base
+#: sql_constraint:ir.model.data:0
+msgid ""
+"You cannot have multiple records with the same external ID in the same "
+"module!"
+msgstr ""
+
+#. module: base
+#: selection:ir.property,type:0
+msgid "Many2One"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.ng
+msgid "Nigeria"
+msgstr ""
+
+#. module: base
+#: code:addons/base/ir/ir_model.py:340
+#, python-format
+msgid "For selection fields, the Selection Options must be given!"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_base_iban
+msgid "IBAN Bank Accounts"
+msgstr ""
+
+#. module: base
+#: field:res.company,user_ids:0
+msgid "Accepted Users"
+msgstr ""
+
+#. module: base
+#: field:ir.ui.menu,web_icon_data:0
+msgid "Web Icon Image"
+msgstr ""
+
+#. module: base
+#: field:ir.actions.server,wkf_model_id:0
+msgid "Target Object"
+msgstr ""
+
+#. module: base
+#: selection:ir.model.fields,select_level:0
+msgid "Always Searchable"
+msgstr ""
+
+#. module: base
+#: help:res.country.state,code:0
+msgid "The state code in max. three chars."
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.hk
+msgid "Hong Kong"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_portal_sale
+msgid "Portal Sale"
+msgstr ""
+
+#. module: base
+#: field:ir.default,ref_id:0
+msgid "ID Ref."
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.ph
+msgid "Philippines"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,summary:base.module_hr_timesheet_sheet
+msgid "Timesheets, Attendances, Activities"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.ma
+msgid "Morocco"
+msgstr ""
+
+#. module: base
+#: help:ir.values,model_id:0
+msgid ""
+"Model to which this entry applies - helper field for setting a model, will "
+"automatically set the correct model name"
+msgstr ""
+
+#. module: base
+#: view:res.lang:0
+msgid "2.  %a ,%A         ==> Fri, Friday"
+msgstr ""
+
+#. module: base
+#: code:addons/base/ir/ir_translation.py:341
+#, python-format
+msgid ""
+"Translation features are unavailable until you install an extra OpenERP "
+"translation."
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_l10n_nl
+msgid ""
+"\n"
+"This is the module to manage the accounting chart for Netherlands in "
+"OpenERP.\n"
+"============================================================================="
+"\n"
+"\n"
+"Read changelog in file __openerp__.py for version information.\n"
+"Dit is een basismodule om een uitgebreid grootboek- en BTW schema voor\n"
+"Nederlandse bedrijven te installeren in OpenERP versie 7.0.\n"
+"\n"
+"De BTW rekeningen zijn waar nodig gekoppeld om de juiste rapportage te "
+"genereren,\n"
+"denk b.v. aan intracommunautaire verwervingen waarbij u 21% BTW moet "
+"opvoeren,\n"
+"maar tegelijkertijd ook 21% 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\n"
+"      Nederlandse grootboekschema bevind.\n"
+"\n"
+"    * Als de configuratie wizard start, wordt u gevraagd om de naam van uw "
+"bedrijf\n"
+"      in te voeren, welke grootboekschema te installeren, uit hoeveel "
+"cijfers een\n"
+"      grootboekrekening mag bestaan, het rekeningnummer van uw bank en de "
+"currency\n"
+"      om Journalen te creeren.\n"
+"\n"
+"Let op!! -> De template van het Nederlandse rekeningschema is opgebouwd uit "
+"4\n"
+"cijfers. Dit is het minimale aantal welk u moet invullen, u mag het aantal "
+"verhogen.\n"
+"De extra cijfers worden dan achter het rekeningnummer aangevult met "
+"'nullen'.\n"
+"\n"
+"    "
+msgstr ""
+
+#. module: base
+#: help:ir.rule,global:0
+msgid "If no group is specified the rule is global and applied to everyone"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.td
+msgid "Chad"
+msgstr ""
+
+#. module: base
+#: help:ir.cron,priority:0
+msgid ""
+"The priority of the job, as an integer: 0 means higher priority, 10 means "
+"lower priority."
+msgstr ""
+
+#. module: base
+#: model:ir.model,name:base.model_workflow_transition
+msgid "workflow.transition"
+msgstr ""
+
+#. module: base
+#: view:res.lang:0
+msgid "%a - Abbreviated weekday name."
+msgstr ""
+
+#. module: base
+#: view:ir.ui.menu:0
+msgid "Submenus"
+msgstr ""
+
+#. module: base
+#: report:ir.module.reference:0
+msgid "Introspection report on objects"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_web_analytics
+msgid "Google Analytics"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_note
+msgid ""
+"\n"
+"This module allows users to create their own notes inside OpenERP\n"
+"=================================================================\n"
+"\n"
+"Use notes to write meeting minutes, organize ideas, organize personnal todo\n"
+"lists, etc. Each user manages his own personnal Notes. Notes are available "
+"to\n"
+"their authors only, but they can share notes to others users so that "
+"several\n"
+"people can work on the same note in real time. It's very efficient to share\n"
+"meeting minutes.\n"
+"\n"
+"Notes can be found in the 'Home' menu.\n"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.dm
+msgid "Dominica"
+msgstr ""
+
+#. module: base
+#: field:ir.translation,name:0
+msgid "Translated field"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_stock_location
+msgid "Advanced Routes"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_pad
+msgid "Collaborative Pads"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.np
+msgid "Nepal"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_document_page
+msgid "Document Page"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_l10n_ar
+msgid "Argentina Localization Chart Account"
+msgstr ""
+
+#. module: base
+#: field:ir.module.module,description_html:0
+msgid "Description HTML"
+msgstr ""
+
+#. module: base
+#: help:res.groups,implied_ids:0
+msgid "Users of this group automatically inherit those groups"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,summary:base.module_note
+msgid "Sticky notes, Collaborative, Memos"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_hr_attendance
+#: model:res.groups,name:base.group_hr_attendance
+msgid "Attendances"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_warning
+msgid "Warning Messages and Alerts"
+msgstr ""
+
+#. module: base
+#: model:ir.actions.act_window,name:base.action_ui_view_custom
+#: model:ir.ui.menu,name:base.menu_action_ui_view_custom
+#: view:ir.ui.view.custom:0
+msgid "Customized Views"
+msgstr ""
+
+#. module: base
+#: view:base.module.import:0
+#: model:ir.actions.act_window,name:base.action_view_base_module_import
+msgid "Module Import"
+msgstr ""
+
+#. module: base
+#: model:ir.actions.act_window,name:base.act_values_form_action
+#: model:ir.ui.menu,name:base.menu_values_form_action
+#: view:ir.values:0
+msgid "Action Bindings"
+msgstr ""
+
+#. module: base
+#: help:res.partner,lang:0
+msgid ""
+"If the selected language is loaded in the system, all documents related to "
+"this contact will be printed in this language. If not, it will be English."
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_hr_evaluation
+msgid ""
+"\n"
+"Periodical Employees evaluation and appraisals\n"
+"==============================================\n"
+"\n"
+"By using this application you can maintain the motivational process by doing "
+"periodical evaluations of your employees' performance. The regular "
+"assessment of human resources can benefit your people as well your "
+"organization. \n"
+"\n"
+"An evaluation plan can be assigned to each employee. These plans define the "
+"frequency and the way you manage your periodic personal evaluations. You "
+"will be able to define steps and attach interview forms to each step. \n"
+"\n"
+"Manages several types of evaluations: bottom-up, top-down, self-evaluations "
+"and the final evaluation by the manager.\n"
+"\n"
+"Key Features\n"
+"------------\n"
+"* Ability to create employees evaluations.\n"
+"* An evaluation can be created by an employee for subordinates, juniors as "
+"well as his manager.\n"
+"* The evaluation is done according to a plan in which various surveys can be "
+"created. Each survey can be answered by a particular level in the employees "
+"hierarchy. The final review and evaluation is done by the manager.\n"
+"* Every evaluation filled by employees can be viewed in a PDF form.\n"
+"* Interview Requests are generated automatically by OpenERP according to "
+"employees evaluation plans. Each user receives automatic emails and requests "
+"to perform a periodical evaluation of their colleagues.\n"
+msgstr ""
+
+#. module: base
+#: model:ir.ui.menu,name:base.menu_view_base_module_update
+msgid "Update Modules List"
+msgstr ""
+
+#. module: base
+#: code:addons/base/module/module.py:359
+#, python-format
+msgid ""
+"Unable to upgrade module \"%s\" because an external dependency is not met: %s"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_account
+msgid "eInvoicing"
+msgstr ""
+
+#. module: base
+#: code:addons/base/res/res_users.py:171
+#, python-format
+msgid ""
+"Please keep in mind that documents currently displayed may not be relevant "
+"after switching to another company. If you have unsaved changes, please make "
+"sure to save and close all forms before switching to a different company. "
+"(You can click on Cancel in the User Preferences now)"
+msgstr ""
+
+#. module: base
+#: code:addons/orm.py:2818
+#, python-format
+msgid "The value \"%s\" for the field \"%s.%s\" is not in the selection"
+msgstr ""
+
+#. module: base
+#: view:ir.actions.configuration.wizard:0
+msgid "Continue"
+msgstr ""
+
+#. module: base
+#: selection:base.language.install,lang:0
+msgid "Thai / ภาษาไทย"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_l10n_bo
+msgid ""
+"\n"
+"Bolivian accounting chart and tax localization.\n"
+"\n"
+"Plan contable boliviano e impuestos de acuerdo a disposiciones vigentes\n"
+"\n"
+"    "
+msgstr ""
+
+#. module: base
+#: view:res.lang:0
+msgid "%j - Day of the year [001,366]."
+msgstr ""
+
+#. module: base
+#: selection:base.language.install,lang:0
+msgid "Slovenian / slovenščina"
+msgstr ""
+
+#. module: base
+#: field:res.currency,position:0
+msgid "Symbol Position"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_l10n_de
+msgid ""
+"\n"
+"Dieses  Modul beinhaltet einen deutschen Kontenrahmen basierend auf dem "
+"SKR03.\n"
+"============================================================================="
+"=\n"
+"\n"
+"German accounting chart and localization.\n"
+"    "
+msgstr ""
+
+#. module: base
+#: field:ir.actions.report.xml,attachment_use:0
+msgid "Reload from Attachment"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.mx
+msgid "Mexico"
+msgstr ""
+
+#. module: base
+#: code:addons/orm.py:3903
+#, python-format
+msgid ""
+"For this kind of document, you may only access records you created "
+"yourself.\n"
+"\n"
+"(Document type: %s)"
+msgstr ""
+
+#. module: base
+#: view:base.language.export:0
+msgid "documentation"
+msgstr ""
+
+#. module: base
+#: help:ir.model,osv_memory:0
+msgid ""
+"This field specifies whether the model is transient or not (i.e. if records "
+"are automatically deleted from the database or not)"
+msgstr ""
+
+#. module: base
+#: code:addons/base/ir/ir_mail_server.py:444
+#, python-format
+msgid "Missing SMTP Server"
+msgstr ""
+
+#. module: base
+#: sql_constraint:ir.translation:0
+msgid "Language code of translation item must be among known languages"
+msgstr ""
+
+#. module: base
+#: field:base.language.export,data:0
+#: field:base.language.import,data:0
+msgid "File"
+msgstr ""
+
+#. module: base
+#: model:ir.actions.act_window,name:base.action_view_base_module_upgrade_install
+msgid "Module Upgrade Install"
+msgstr ""
+
+#. module: base
+#: model:ir.model,name:base.model_ir_actions_configuration_wizard
+msgid "ir.actions.configuration.wizard"
+msgstr ""
+
+#. module: base
+#: view:res.lang:0
+msgid "%b - Abbreviated month name."
+msgstr ""
+
+#. module: base
+#: code:addons/base/ir/ir_model.py:730
+#, python-format
+msgid "Sorry, you are not allowed to delete this document."
+msgstr ""
+
+#. module: base
+#: constraint:ir.rule:0
+msgid "Rules can not be applied on the Record Rules model."
+msgstr ""
+
+#. module: base
+#: field:res.partner,supplier:0
+#: model:res.partner.category,name:base.res_partner_category_1
+msgid "Supplier"
+msgstr ""
+
+#. module: base
+#: view:ir.actions.server:0
+#: selection:ir.actions.server,state:0
+msgid "Multi Actions"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,summary:base.module_mail
+msgid "Discussions, Mailing Lists, News"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_fleet
+msgid ""
+"\n"
+"Vehicle, leasing, insurances, cost\n"
+"==================================\n"
+"With this module, OpenERP helps you managing all your vehicles, the\n"
+"contracts associated to those vehicle as well as services, fuel log\n"
+"entries, costs and many other features necessary to the management \n"
+"of your fleet of vehicle(s)\n"
+"\n"
+"Main Features\n"
+"-------------\n"
+"* Add vehicles to your fleet\n"
+"* Manage contracts for vehicles\n"
+"* Reminder when a contract reach its expiration date\n"
+"* Add services, fuel log entry, odometer values for all vehicles\n"
+"* Show all costs associated to a vehicle or to a type of service\n"
+"* Analysis graph for costs\n"
+msgstr ""
+
+#. module: base
+#: field:multi_company.default,company_dest_id:0
+msgid "Default Company"
+msgstr ""
+
+#. module: base
+#: selection:base.language.install,lang:0
+msgid "Spanish (EC) / Español (EC)"
+msgstr ""
+
+#. module: base
+#: help:ir.ui.view,xml_id:0
+msgid "ID of the view defined in xml file"
+msgstr ""
+
+#. module: base
+#: model:ir.model,name:base.model_base_module_import
+msgid "Import Module"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.as
+msgid "American Samoa"
+msgstr ""
+
+#. module: base
+#: view:ir.attachment:0
+msgid "My Document(s)"
+msgstr ""
+
+#. module: base
+#: help:ir.actions.act_window,res_model:0
+msgid "Model name of the object to open in the view window"
+msgstr ""
+
+#. module: base
+#: field:ir.model.fields,selectable:0
+msgid "Selectable"
+msgstr ""
+
+#. module: base
+#: code:addons/base/ir/ir_mail_server.py:221
+#, python-format
+msgid "Everything seems properly set up!"
+msgstr ""
+
+#. module: base
+#: view:res.request.link:0
+msgid "Request Link"
+msgstr ""
+
+#. module: base
+#: view:ir.attachment:0
+#: selection:ir.attachment,type:0
+#: field:ir.module.module,url:0
+msgid "URL"
+msgstr ""
+
+#. module: base
+#: help:res.country,name:0
+msgid "The full name of the country."
+msgstr ""
+
+#. module: base
+#: selection:ir.actions.server,state:0
+msgid "Iteration"
+msgstr ""
+
+#. module: base
+#: code:addons/orm.py:4246
+#: code:addons/orm.py:4347
+#, python-format
+msgid "UserError"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,summary:base.module_project_issue
+msgid "Support, Bug Tracker, Helpdesk"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.ae
+msgid "United Arab Emirates"
+msgstr ""
+
+#. module: base
+#: help:ir.ui.menu,needaction_enabled:0
+msgid ""
+"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."
+msgstr ""
+
+#. module: base
+#: code:addons/orm.py:3961
+#, python-format
+msgid ""
+"Unable to delete this document because it is used as a default property"
+msgstr ""
+
+#. module: base
+#: model:res.partner.category,name:base.res_partner_category_5
+msgid "Silver"
+msgstr ""
+
+#. module: base
+#: field:res.partner.title,shortcut:0
+msgid "Abbreviation"
+msgstr ""
+
+#. module: base
+#: model:ir.ui.menu,name:base.menu_crm_case_job_req_main
+msgid "Recruitment"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_l10n_gr
+msgid ""
+"\n"
+"This is the base module to manage the accounting chart for Greece.\n"
+"==================================================================\n"
+"\n"
+"Greek accounting chart and localization.\n"
+"    "
+msgstr ""
+
+#. module: base
+#: view:ir.values:0
+msgid "Action Reference"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_auth_ldap
+msgid ""
+"\n"
+"Adds support for authentication by LDAP server.\n"
+"===============================================\n"
+"This module allows users to login with their LDAP username and password, "
+"and\n"
+"will automatically create OpenERP users for them on the fly.\n"
+"\n"
+"**Note:** This module only work on servers who have Python's ``ldap`` module "
+"installed.\n"
+"\n"
+"Configuration:\n"
+"--------------\n"
+"After installing this module, you need to configure the LDAP parameters in "
+"the\n"
+"Configuration tab of the Company details. Different companies may have "
+"different\n"
+"LDAP servers, as long as they have unique usernames (usernames need to be "
+"unique\n"
+"in OpenERP, even across multiple companies).\n"
+"\n"
+"Anonymous LDAP binding is also supported (for LDAP servers that allow it), "
+"by\n"
+"simply keeping the LDAP user and password empty in the LDAP configuration.\n"
+"This does not allow anonymous authentication for users, it is only for the "
+"master\n"
+"LDAP account that is used to verify if a user exists before attempting to\n"
+"authenticate it.\n"
+"\n"
+"Securing the connection with STARTTLS is available for LDAP servers "
+"supporting\n"
+"it, by enabling the TLS option in the LDAP configuration.\n"
+"\n"
+"For further options configuring the LDAP settings, refer to the ldap.conf\n"
+"manpage: manpage:`ldap.conf(5)`.\n"
+"\n"
+"Security Considerations:\n"
+"------------------------\n"
+"Users' LDAP passwords are never stored in the OpenERP database, the LDAP "
+"server\n"
+"is queried whenever a user needs to be authenticated. No duplication of the\n"
+"password occurs, and passwords are managed in one place only.\n"
+"\n"
+"OpenERP does not manage password changes in the LDAP, so any change of "
+"password\n"
+"should be conducted by other means in the LDAP directory directly (for LDAP "
+"users).\n"
+"\n"
+"It is also possible to have local OpenERP users in the database along with\n"
+"LDAP-authenticated users (the Administrator account is one obvious "
+"example).\n"
+"\n"
+"Here is how it works:\n"
+"---------------------\n"
+"    * The system first attempts to authenticate users against the local "
+"OpenERP\n"
+"      database;\n"
+"    * if this authentication fails (for example because the user has no "
+"local\n"
+"      password), the system then attempts to authenticate against LDAP;\n"
+"\n"
+"As LDAP users have blank passwords by default in the local OpenERP database\n"
+"(which means no access), the first step always fails and the LDAP server is\n"
+"queried to do the authentication.\n"
+"\n"
+"Enabling STARTTLS ensures that the authentication query to the LDAP server "
+"is\n"
+"encrypted.\n"
+"\n"
+"User Template:\n"
+"--------------\n"
+"In the LDAP configuration on the Company form, it is possible to select a "
+"*User\n"
+"Template*. If set, this user will be used as template to create the local "
+"users\n"
+"whenever someone authenticates for the first time via LDAP authentication. "
+"This\n"
+"allows pre-setting the default groups and menus of the first-time users.\n"
+"\n"
+"**Warning:** if you set a password for the user template, this password will "
+"be\n"
+"         assigned as local password for each new LDAP user, effectively "
+"setting\n"
+"         a *master password* for these users (until manually changed). You\n"
+"         usually do not want this. One easy way to setup a template user is "
+"to\n"
+"         login once with a valid LDAP user, let OpenERP create a blank "
+"local\n"
+"         user with the same login (and a blank password), then rename this "
+"new\n"
+"         user to a username that does not exist in LDAP, and setup its "
+"groups\n"
+"         the way you want.\n"
+"\n"
+"Interaction with base_crypt:\n"
+"----------------------------\n"
+"The base_crypt module is not compatible with this module, and will disable "
+"LDAP\n"
+"authentication if installed at the same time.\n"
+"    "
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.re
+msgid "Reunion (French)"
+msgstr ""
+
+#. module: base
+#: code:addons/base/ir/ir_model.py:423
+#, python-format
+msgid ""
+"New column name must still start with x_ , because it is a custom field!"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_mrp_repair
+msgid "Repairs Management"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_account_asset
+msgid "Assets Management"
+msgstr ""
+
+#. module: base
+#: view:ir.model.access:0
+#: view:ir.rule:0
+#: field:ir.rule,global:0
+msgid "Global"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.cz
+msgid "Czech Republic"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_claim_from_delivery
+msgid "Claim on Deliveries"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.sb
+msgid "Solomon Islands"
+msgstr ""
+
+#. module: base
+#: code:addons/orm.py:4152
+#: code:addons/orm.py:4685
+#, python-format
+msgid "AccessError"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_web_gantt
+msgid ""
+"\n"
+"OpenERP Web Gantt chart view.\n"
+"=============================\n"
+"\n"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_base_status
+msgid "State/Stage Management"
+msgstr ""
+
+#. module: base
+#: model:ir.module.category,name:base.module_category_warehouse_management
+msgid "Warehouse"
+msgstr ""
+
+#. module: base
+#: field:ir.exports,resource:0
+#: model:ir.module.module,shortdesc:base.module_resource
+#: field:ir.property,res_id:0
+msgid "Resource"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_process
+msgid ""
+"\n"
+"This module shows the basic processes involved in the selected modules and "
+"in the sequence they occur.\n"
+"============================================================================="
+"=========================\n"
+"\n"
+"**Note:** This applies to the modules containing modulename_process.xml.\n"
+"\n"
+"**e.g.** product/process/product_process.xml.\n"
+"\n"
+"    "
+msgstr ""
+
+#. module: base
+#: view:res.lang:0
+msgid "8.  %I:%M:%S %p  ==> 06:25:20 PM"
+msgstr ""
+
+#. module: base
+#: view:ir.filters:0
+msgid "Filters shared with all users"
+msgstr ""
+
+#. module: base
+#: view:ir.translation:0
+#: model:ir.ui.menu,name:base.menu_translation
+msgid "Translations"
+msgstr ""
+
+#. module: base
+#: view:ir.actions.report.xml:0
+msgid "Report"
+msgstr ""
+
+#. module: base
+#: model:res.partner.title,shortcut:base.res_partner_title_prof
+msgid "Prof."
+msgstr ""
+
+#. module: base
+#: code:addons/base/ir/ir_mail_server.py:240
+#, python-format
+msgid ""
+"Your OpenERP Server does not support SMTP-over-SSL. You could use STARTTLS "
+"instead.If SSL is needed, an upgrade to Python 2.6 on the server-side should "
+"do the trick."
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.ua
+msgid "Ukraine"
+msgstr ""
+
+#. module: base
+#: code:addons/base/res/res_company.py:164
+#: field:ir.module.module,website:0
+#: field:res.company,website:0
+#: field:res.partner,website:0
+#, python-format
+msgid "Website"
+msgstr ""
+
+#. module: base
+#: selection:ir.mail_server,smtp_encryption:0
+msgid "None"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_hr_holidays
+msgid "Leave Management"
+msgstr ""
+
+#. module: base
+#: model:res.company,overdue_msg:base.main_company
+msgid ""
+"Dear Sir/Madam,\n"
+"\n"
+"Our records indicate that some payments on your account are still due. "
+"Please find details below.\n"
+"If the amount has already been paid, please disregard this notice. "
+"Otherwise, please forward us the total amount stated below.\n"
+"If you have any queries regarding your account, Please contact us.\n"
+"\n"
+"Thank you in advance for your cooperation.\n"
+"Best Regards,"
+msgstr ""
+
+#. module: base
+#: view:ir.module.category:0
+msgid "Module Category"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.us
+msgid "United States"
+msgstr ""
+
+#. module: base
+#: view:ir.ui.view:0
+msgid "Architecture"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.ml
+msgid "Mali"
+msgstr ""
+
+#. module: base
+#: model:ir.ui.menu,name:base.menu_project_config_project
+msgid "Stages"
+msgstr ""
+
+#. module: base
+#: selection:base.language.install,lang:0
+msgid "Flemish (BE) / Vlaams (BE)"
+msgstr ""
+
+#. module: base
+#: selection:base.language.install,lang:0
+msgid "Vietnamese / Tiếng Việt"
+msgstr ""
+
+#. module: base
+#: field:ir.cron,interval_number:0
+msgid "Interval Number"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.dz
+msgid "Algeria"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_portal_hr_employees
+msgid ""
+"\n"
+"This module adds a list of employees to your portal's contact page if hr and "
+"portal_crm (which creates the contact page) are installed.\n"
+"============================================================================="
+"==========================================================\n"
+"    "
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.bn
+msgid "Brunei Darussalam"
+msgstr ""
+
+#. module: base
+#: view:ir.actions.act_window:0
+#: field:ir.actions.act_window,view_type:0
+#: field:ir.actions.act_window.view,view_mode:0
+#: field:ir.ui.view,type:0
+msgid "View Type"
+msgstr ""
+
+#. module: base
+#: model:ir.ui.menu,name:base.next_id_2
+msgid "User Interface"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_mrp_byproduct
+msgid "MRP Byproducts"
+msgstr ""
+
+#. module: base
+#: field:res.request,ref_partner_id:0
+msgid "Partner Ref."
+msgstr ""
+
+#. module: base
+#. openerp-web
+#: code:addons/base/static/src/js/apps.js:103
+#, python-format
+msgid "OpenERP Apps Unreachable"
+msgstr ""
+
+#. module: base
+#: field:ir.attachment,create_date:0
+msgid "Date Created"
+msgstr ""
+
+#. module: base
+#: help:ir.actions.server,trigger_name:0
+msgid "The workflow signal to trigger"
+msgstr ""
+
+#. module: base
+#: selection:base.language.install,state:0
+#: selection:base.module.import,state:0
+#: selection:base.module.update,state:0
+msgid "done"
+msgstr ""
+
+#. module: base
+#: view:ir.actions.act_window:0
+msgid "General Settings"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_l10n_in
+msgid ""
+"\n"
+"Indian Accounting: Chart of Account.\n"
+"====================================\n"
+"\n"
+"Indian accounting chart and localization.\n"
+"    "
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_l10n_uy
+msgid "Uruguay - Chart of Accounts"
+msgstr ""
+
+#. module: base
+#: model:ir.ui.menu,name:base.menu_administration_shortcut
+msgid "Custom Shortcuts"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_l10n_si
+msgid "Slovenian - Accounting"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_account_cancel
+msgid ""
+"\n"
+"Allows canceling accounting entries.\n"
+"====================================\n"
+"\n"
+"This module adds 'Allow Canceling Entries' field on form view of account "
+"journal.\n"
+"If set to true it allows user to cancel entries & invoices.\n"
+"    "
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_plugin
+msgid "CRM Plugins"
+msgstr ""
+
+#. module: base
+#: model:ir.actions.act_window,name:base.action_model_model
+#: model:ir.model,name:base.model_ir_model
+#: model:ir.ui.menu,name:base.ir_model_model_menu
+msgid "Models"
+msgstr ""
+
+#. module: base
+#: code:addons/base/module/module.py:499
+#, python-format
+msgid "The `base` module cannot be uninstalled"
+msgstr ""
+
+#. module: base
+#: code:addons/base/ir/ir_cron.py:254
+#, python-format
+msgid "Record cannot be modified right now"
+msgstr ""
+
+#. module: base
+#: selection:ir.actions.todo,type:0
+msgid "Launch Manually"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.be
+msgid "Belgium"
+msgstr ""
+
+#. module: base
+#: model:ir.model,name:base.model_osv_memory_autovacuum
+msgid "osv_memory.autovacuum"
+msgstr ""
+
+#. module: base
+#: code:addons/base/ir/ir_model.py:729
+#, python-format
+msgid "Sorry, you are not allowed to create this kind of document."
+msgstr ""
+
+#. module: base
+#: field:base.language.export,lang:0
+#: field:base.language.install,lang:0
+#: field:base.update.translations,lang:0
+#: field:ir.translation,lang:0
+#: view:res.lang:0
+#: field:res.partner,lang:0
+msgid "Language"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.gm
+msgid "Gambia"
+msgstr ""
+
+#. module: base
+#: model:ir.actions.act_window,name:base.action_res_company_form
+#: model:ir.actions.act_window,name:base.company_normal_action_tree
+#: model:ir.model,name:base.model_res_company
+#: model:ir.ui.menu,name:base.menu_action_res_company_form
+#: model:ir.ui.menu,name:base.menu_res_company_global
+#: view:res.company:0
+#: view:res.partner:0
+#: field:res.users,company_ids:0
+msgid "Companies"
+msgstr ""
+
+#. module: base
+#: help:res.currency,symbol:0
+msgid "Currency sign, to be used when printing amounts."
+msgstr ""
+
+#. module: base
+#: view:res.lang:0
+msgid "%H - Hour (24-hour clock) [00,23]."
+msgstr ""
+
+#. module: base
+#: field:ir.model.fields,on_delete:0
+msgid "On Delete"
+msgstr ""
+
+#. module: base
+#: code:addons/base/ir/ir_model.py:348
+#, python-format
+msgid "Model %s does not exist!"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_mrp_jit
+msgid "Just In Time Scheduling"
+msgstr ""
+
+#. module: base
+#: view:ir.actions.server:0
+#: field:ir.actions.server,code:0
+#: selection:ir.actions.server,state:0
+msgid "Python Code"
+msgstr ""
+
+#. module: base
+#: help:ir.actions.server,state:0
+msgid "Type of the Action that is to be executed"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_portal_crm
+msgid ""
+"\n"
+"This module adds a contact page (with a contact form creating a lead when "
+"submitted) to your portal if crm and portal are installed.\n"
+"============================================================================="
+"=======================================================\n"
+"    "
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_l10n_us
+msgid "United States - Chart of accounts"
+msgstr ""
+
+#. module: base
+#: view:base.language.export:0
+#: view:base.language.import:0
+#: view:base.language.install:0
+#: view:base.module.import:0
+#: view:base.module.update:0
+#: view:base.module.upgrade:0
+#: view:base.update.translations:0
+#: view:change.password.wizard:0
+#: view:ir.actions.configuration.wizard:0
+#: view:res.config:0
+#: view:res.users:0
+#: view:wizard.ir.model.menu.create:0
+msgid "Cancel"
+msgstr ""
+
+#. module: base
+#: code:addons/orm.py:1507
+#, python-format
+msgid "Unknown database identifier '%s'"
+msgstr ""
+
+#. module: base
+#: selection:base.language.export,format:0
+msgid "PO File"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_web_diagram
+msgid ""
+"\n"
+"Openerp Web Diagram view.\n"
+"=========================\n"
+"\n"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_l10n_ch
+msgid ""
+"\n"
+"Swiss localization :\n"
+"====================\n"
+"**Multilang swiss STERCHI account chart and taxes**\n"
+" **Author:** Camptocamp SA\n"
+"\n"
+" **Donors:** Hasa Sàrl, Open Net Sàrl and Prisme Solutions Informatique SA\n"
+"\n"
+" **Translators:** brain-tec AG, Agile Business Group\n"
+"\n"
+"**This release will introduce major changes to l10n_ch.**\n"
+"\n"
+"Due to important refactoring needs and the Switzerland adoption of new "
+"international payment standard during 2013-2014. We have reorganised the "
+"swiss localization addons this way:\n"
+"\n"
+"- **l10n_ch**: Multilang swiss STERCHI account chart and taxes (official "
+"addon)\n"
+"- **l10n_ch_base_bank**: Technical module that introduces a new and "
+"simplified version of bank type management\n"
+"- **l10n_ch_bank**: List of swiss banks\n"
+"- **l10n_ch_zip**: List of swiss postal zip\n"
+"- **l10n_ch_dta**: Support of dta payment protocol (will be deprecated end "
+"2014)\n"
+"- **l10n_ch_payment_slip**: Support of ESR/BVR payment slip report and "
+"reconciliation. Report refactored with easy element positioning.\n"
+"- **l10n_ch_sepa**: Alpha implementation of PostFinance SEPA/PAIN support "
+"will be completed during 2013/2014\n"
+"\n"
+"The modules will be soon available on OpenERP swiss localization on "
+"launchpad:\n"
+"https://launchpad.net/openerp-swiss-localization\n"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.nt
+msgid "Neutral Zone"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_portal_sale
+msgid ""
+"\n"
+"This module adds a Sales menu to your portal as soon as sale and portal are "
+"installed.\n"
+"============================================================================="
+"=========\n"
+"\n"
+"After installing this module, portal users will be able to access their own "
+"documents\n"
+"via the following menus:\n"
+"\n"
+"  - Quotations\n"
+"  - Sale Orders\n"
+"  - Delivery Orders\n"
+"  - Products (public ones)\n"
+"  - Invoices\n"
+"  - Payments/Refunds\n"
+"\n"
+"If online payment acquirers are configured, portal users will also be given "
+"the opportunity to\n"
+"pay online on their Sale Orders and Invoices that are not paid yet. Paypal "
+"is included\n"
+"by default, you simply need to configure a Paypal account in the "
+"Accounting/Invoicing settings.\n"
+"    "
+msgstr ""
+
+#. module: base
+#: code:addons/base/ir/ir_fields.py:316
+#, python-format
+msgid "external id"
+msgstr ""
+
+#. module: base
+#: view:ir.model:0
+msgid "Custom"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_sale_margin
+msgid "Margins in Sales Orders"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_purchase
+msgid "Purchase Management"
+msgstr ""
+
+#. module: base
+#: field:ir.module.module,published_version:0
+msgid "Published Version"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.is
+msgid "Iceland"
+msgstr ""
+
+#. module: base
+#: model:ir.actions.act_window,name:base.ir_action_window
+#: model:ir.ui.menu,name:base.menu_ir_action_window
+msgid "Window Actions"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_portal_project_issue
+msgid ""
+"\n"
+"This module adds issue menu and features to your portal if project_issue and "
+"portal are installed.\n"
+"============================================================================="
+"=====================\n"
+"    "
+msgstr ""
+
+#. module: base
+#: view:res.lang:0
+msgid "%I - Hour (12-hour clock) [01,12]."
+msgstr ""
+
+#. module: base
+#: view:res.config:0
+msgid "res_config_contents"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.de
+msgid "Germany"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_auth_oauth
+msgid "OAuth2 Authentication"
+msgstr ""
+
+#. module: base
+#: view:workflow:0
+msgid ""
+"When customizing a workflow, be sure you do not modify an existing node or "
+"arrow, but rather add new nodes or arrows. If you absolutly need to modify a "
+"node or arrow, you can only change fields that are empty or set to the "
+"default value. If you don't do that, your customization will be overwrited "
+"at the next update or upgrade to a future version of OpenERP."
+msgstr ""
+
+#. module: base
+#: report:ir.module.reference:0
+msgid "Reports :"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_multi_company
+msgid ""
+"\n"
+"This module is for managing a multicompany environment.\n"
+"=======================================================\n"
+"\n"
+"This module is the base module for other multi-company modules.\n"
+"    "
+msgstr ""
+
+#. module: base
+#: sql_constraint:res.currency:0
+msgid "The currency code must be unique per company!"
+msgstr ""
+
+#. module: base
+#: code:addons/base/module/wizard/base_export_language.py:39
+#, python-format
+msgid "New Language (Empty translation template)"
+msgstr ""
+
+#. module: base
+#: help:ir.actions.server,email:0
+msgid ""
+"Expression that returns the email address to send to. Can be based on the "
+"same values as for the condition field.\n"
+"Example: object.invoice_address_id.email, or 'me@example.com'"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_project_issue_sheet
+msgid ""
+"\n"
+"This module adds the Timesheet support for the Issues/Bugs Management in "
+"Project.\n"
+"============================================================================="
+"====\n"
+"\n"
+"Worklogs can be maintained to signify number of hours spent by users to "
+"handle an issue.\n"
+"                "
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.gy
+msgid "Guyana"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_product_expiry
+msgid "Products Expiry Date"
+msgstr ""
+
+#. module: base
+#: code:addons/base/res/res_config.py:387
+#, python-format
+msgid "Click 'Continue' to configure the next addon..."
+msgstr ""
+
+#. module: base
+#: field:ir.actions.server,record_id:0
+msgid "Create Id"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.hn
+msgid "Honduras"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.eg
+msgid "Egypt"
+msgstr ""
+
+#. module: base
+#: view:ir.attachment:0
+msgid "Creation"
+msgstr ""
+
+#. module: base
+#: help:ir.actions.server,model_id:0
+msgid ""
+"Select the object on which the action will work (read, write, create)."
+msgstr ""
+
+#. module: base
+#: field:base.language.import,name:0
+msgid "Language Name"
+msgstr ""
+
+#. module: base
+#: selection:ir.property,type:0
+msgid "Boolean"
+msgstr ""
+
+#. module: base
+#: help:ir.mail_server,smtp_encryption:0
+msgid ""
+"Choose the connection encryption scheme:\n"
+"- None: SMTP sessions are done in cleartext.\n"
+"- TLS (STARTTLS): TLS encryption is requested at start of SMTP session "
+"(Recommended)\n"
+"- SSL/TLS: SMTP sessions are encrypted with SSL/TLS through a dedicated port "
+"(default: 465)"
+msgstr ""
+
+#. module: base
+#: view:ir.model:0
+msgid "Fields Description"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_analytic_contract_hr_expense
+msgid "Contracts Management: hr_expense link"
+msgstr ""
+
+#. module: base
+#: code:addons/base/module/module.py:670
+#, python-format
+msgid ""
+"The `%s` module appears to be unavailable at the moment, please try again "
+"later."
+msgstr ""
+
+#. module: base
+#: view:ir.attachment:0
+#: view:ir.cron:0
+#: view:ir.filters:0
+#: view:ir.model.access:0
+#: view:ir.model.data:0
+#: view:ir.model.fields:0
+#: view:ir.module.module:0
+#: view:ir.ui.view:0
+#: view:ir.values:0
+#: view:res.partner:0
+#: view:workflow.activity:0
+msgid "Group By..."
+msgstr ""
+
+#. module: base
+#: view:base.module.update:0
+msgid "Module Update Result"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_analytic_contract_hr_expense
+msgid ""
+"\n"
+"This module is for modifying account analytic view to show some data related "
+"to the hr_expense module.\n"
+"============================================================================="
+"=========================\n"
+msgstr ""
+
+#. module: base
+#: field:ir.attachment,store_fname:0
+msgid "Stored Filename"
+msgstr ""
+
+#. module: base
+#: field:res.partner,use_parent_address:0
+msgid "Use Company Address"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,summary:base.module_hr_holidays
+msgid "Holidays, Allocation and Leave Requests"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_web_hello
+msgid ""
+"\n"
+"OpenERP Web example module.\n"
+"===========================\n"
+"\n"
+msgstr ""
+
+#. module: base
+#: selection:ir.module.module,state:0
+#: selection:ir.module.module.dependency,state:0
+msgid "To be installed"
+msgstr ""
+
+#. module: base
+#: view:ir.model:0
+#: model:ir.module.module,shortdesc:base.module_base
+#: field:res.currency,base:0
+msgid "Base"
+msgstr ""
+
+#. module: base
+#: field:ir.model.data,model:0
+#: field:ir.values,model:0
+msgid "Model Name"
+msgstr ""
+
+#. module: base
+#: selection:base.language.install,lang:0
+msgid "Telugu / తెలుగు"
+msgstr ""
+
+#. module: base
+#: model:ir.actions.act_window,help:base.action_partner_supplier_form
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to add a contact in your address book.\n"
+"              </p><p>\n"
+"                OpenERP helps you easily track all activities related to\n"
+"                a supplier: discussions, history of purchases,\n"
+"                documents, etc.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.lr
+msgid "Liberia"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_web_tests
+msgid ""
+"\n"
+"OpenERP Web test suite.\n"
+"=======================\n"
+"\n"
+msgstr ""
+
+#. module: base
+#: view:ir.model:0
+#: model:ir.module.module,shortdesc:base.module_note
+#: view:res.groups:0
+#: field:res.partner,comment:0
+msgid "Notes"
+msgstr ""
+
+#. module: base
+#: field:ir.config_parameter,value:0
+#: field:ir.property,value_binary:0
+#: field:ir.property,value_datetime:0
+#: field:ir.property,value_float:0
+#: field:ir.property,value_integer:0
+#: field:ir.property,value_reference:0
+#: field:ir.property,value_text:0
+#: selection:ir.server.object.lines,type:0
+#: field:ir.server.object.lines,value:0
+#: field:ir.values,value:0
+msgid "Value"
+msgstr ""
+
+#. module: base
+#: view:base.language.import:0
+#: field:ir.sequence,code:0
+#: field:ir.sequence.type,code:0
+#: selection:ir.translation,type:0
+#: field:res.partner.bank.type,code:0
+msgid "Code"
+msgstr ""
+
+#. module: base
+#: model:ir.model,name:base.model_res_config_installer
+msgid "res.config.installer"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.mc
+msgid "Monaco"
+msgstr ""
+
+#. module: base
+#: selection:ir.cron,interval_type:0
+msgid "Minutes"
+msgstr ""
+
+#. module: base
+#: view:res.currency:0
+msgid "Display"
+msgstr ""
+
+#. module: base
+#: model:res.groups,name:base.group_multi_company
+msgid "Multi Companies"
+msgstr ""
+
+#. module: base
+#: help:res.users,menu_id:0
+msgid ""
+"If specified, the action will replace the standard menu for this user."
+msgstr ""
+
+#. module: base
+#: model:ir.actions.report.xml,name:base.preview_report
+msgid "Preview Report"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_purchase_analytic_plans
+msgid "Purchase Analytic Plans"
+msgstr ""
+
+#. module: base
+#: model:ir.actions.act_window,name:base.ir_sequence_type
+#: model:ir.ui.menu,name:base.menu_ir_sequence_type
+msgid "Sequence Codes"
+msgstr ""
+
+#. module: base
+#: selection:base.language.install,lang:0
+msgid "Spanish (CO) / Español (CO)"
+msgstr ""
+
+#. module: base
+#: view:base.module.configuration:0
+msgid ""
+"All pending configuration wizards have been executed. You may restart "
+"individual wizards via the list of configuration wizards."
+msgstr ""
+
+#. module: base
+#: view:ir.sequence:0
+msgid "Current Year with Century: %(year)s"
+msgstr ""
+
+#. module: base
+#: field:ir.exports,export_fields:0
+msgid "Export ID"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.fr
+msgid "France"
+msgstr ""
+
+#. module: base
+#: view:workflow.activity:0
+#: field:workflow.activity,flow_stop:0
+msgid "Flow Stop"
+msgstr ""
+
+#. module: base
+#: selection:ir.cron,interval_type:0
+msgid "Weeks"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.af
+msgid "Afghanistan, Islamic State of"
+msgstr ""
+
+#. module: base
+#: code:addons/base/module/wizard/base_module_import.py:58
+#: code:addons/base/module/wizard/base_module_import.py:66
+#, python-format
+msgid "Error !"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_marketing_campaign_crm_demo
+msgid "Marketing Campaign - Demo"
+msgstr ""
+
+#. module: base
+#: code:addons/base/ir/ir_fields.py:360
+#, python-format
+msgid ""
+"Can not create Many-To-One records indirectly, import the field separately"
+msgstr ""
+
+#. module: base
+#: field:ir.cron,interval_type:0
+msgid "Interval Unit"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_portal_stock
+msgid "Portal Stock"
+msgstr ""
+
+#. module: base
+#: field:workflow.activity,kind:0
+msgid "Kind"
+msgstr ""
+
+#. module: base
+#: code:addons/orm.py:4647
+#, python-format
+msgid "This method does not exist anymore"
+msgstr ""
+
+#. module: base
+#: view:base.update.translations:0
+#: 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 ""
+
+#. module: base
+#: field:res.lang,thousands_sep:0
+msgid "Thousands Separator"
+msgstr ""
+
+#. module: base
+#: field:res.request,create_date:0
+msgid "Created Date"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_l10n_cn
+msgid "中国会计科目表 - Accounting"
+msgstr ""
+
+#. module: base
+#: sql_constraint:ir.model.constraint:0
+msgid "Constraints with the same name are unique per module."
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_report_intrastat
+msgid ""
+"\n"
+"A module that adds intrastat reports.\n"
+"=====================================\n"
+"\n"
+"This module gives the details of the goods traded between the countries of\n"
+"European Union."
+msgstr ""
+
+#. module: base
+#: help:ir.actions.server,loop_action:0
+msgid ""
+"Select the action that will be executed. Loop action will not be avaliable "
+"inside loop."
+msgstr ""
+
+#. module: base
+#: help:ir.model.data,res_id:0
+msgid "ID of the target record in the database"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_account_analytic_analysis
+msgid "Contracts Management"
+msgstr ""
+
+#. module: base
+#: selection:base.language.install,lang:0
+msgid "Chinese (TW) / 正體字"
+msgstr ""
+
+#. module: base
+#: model:ir.model,name:base.model_res_request
+msgid "res.request"
+msgstr ""
+
+#. module: base
+#: field:res.partner,image_medium:0
+msgid "Medium-sized image"
+msgstr ""
+
+#. module: base
+#: view:ir.model:0
+msgid "In Memory"
+msgstr ""
+
+#. module: base
+#: view:ir.actions.todo:0
+msgid "Todo"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_product_visible_discount
+msgid "Prices Visible Discounts"
+msgstr ""
+
+#. module: base
+#: field:ir.attachment,datas:0
+msgid "File Content"
+msgstr ""
+
+#. module: base
+#: model:ir.actions.act_window,name:base.action_model_relation
+#: view:ir.model.relation:0
+#: model:ir.ui.menu,name:base.ir_model_relation_menu
+msgid "ManyToMany Relations"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.pa
+msgid "Panama"
+msgstr ""
+
+#. module: base
+#: help:workflow.transition,group_id:0
+msgid ""
+"The group that a user must have to be authorized to validate this transition."
+msgstr ""
+
+#. module: base
+#: view:res.bank:0
+#: view:res.company:0
+#: view:res.partner:0
+#: view:res.users:0
+msgid "Street..."
+msgstr ""
+
+#. module: base
+#: constraint:res.users:0
+msgid "The chosen company is not in the allowed companies for this user"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.gi
+msgid "Gibraltar"
+msgstr ""
+
+#. module: base
+#: field:ir.actions.report.xml,report_name:0
+msgid "Service Name"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.pn
+msgid "Pitcairn Island"
+msgstr ""
+
+#. module: base
+#: field:res.partner,category_id:0
+msgid "Tags"
+msgstr ""
+
+#. module: base
+#: view:base.module.upgrade:0
+msgid ""
+"We suggest to reload the menu tab to see the new menus (Ctrl+T then Ctrl+R)."
+msgstr ""
+
+#. module: base
+#: model:ir.actions.act_window,name:base.action_rule
+#: view:ir.rule:0
+#: model:ir.ui.menu,name:base.menu_action_rule
+msgid "Record Rules"
+msgstr ""
+
+#. module: base
+#: view:multi_company.default:0
+msgid "Multi Company"
+msgstr ""
+
+#. module: base
+#: model:ir.module.category,name:base.module_category_portal
+#: model:ir.module.module,shortdesc:base.module_portal
+msgid "Portal"
+msgstr ""
+
+#. module: base
+#: selection:ir.translation,state:0
+msgid "To Translate"
+msgstr ""
+
+#. module: base
+#: code:addons/base/ir/ir_fields.py:294
+#, python-format
+msgid "See all possible values"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_claim_from_delivery
+msgid ""
+"\n"
+"Create a claim from a delivery order.\n"
+"=====================================\n"
+"\n"
+"Adds a Claim link to the delivery order.\n"
+msgstr ""
+
+#. module: base
+#: view:ir.model:0
+#: view:workflow.activity:0
+msgid "Properties"
+msgstr ""
+
+#. module: base
+#: help:ir.sequence,padding:0
+msgid ""
+"OpenERP will automatically adds some '0' on the left of the 'Next Number' to "
+"get the required padding size."
+msgstr ""
+
+#. module: base
+#: help:ir.model.constraint,name:0
+msgid "PostgreSQL constraint or foreign key name."
+msgstr ""
+
+#. module: base
+#: view:res.company:0
+msgid "Click to set your company logo."
+msgstr ""
+
+#. module: base
+#: view:res.lang:0
+msgid "%A - Full weekday name."
+msgstr ""
+
+#. module: base
+#: help:ir.values,user_id:0
+msgid "If set, action binding only applies for this user."
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.gw
+msgid "Guinea Bissau"
+msgstr ""
+
+#. module: base
+#: field:ir.actions.report.xml,header:0
+msgid "Add RML Header"
+msgstr ""
+
+#. module: base
+#: help:res.company,rml_footer:0
+msgid "Footer text displayed at the bottom of all reports."
+msgstr ""
+
+#. module: base
+#: field:ir.module.module,icon:0
+msgid "Icon URL"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_note_pad
+msgid "Memos pad"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_pad
+msgid ""
+"\n"
+"Adds enhanced support for (Ether)Pad attachments in the web client.\n"
+"===================================================================\n"
+"\n"
+"Lets the company customize which Pad installation should be used to link to "
+"new\n"
+"pads (by default, http://ietherpad.com/).\n"
+"    "
+msgstr ""
+
+#. module: base
+#: sql_constraint:res.lang:0
+msgid "The code of the language must be unique !"
+msgstr ""
+
+#. module: base
+#: model:ir.actions.act_window,name:base.action_attachment
+#: view:ir.actions.report.xml:0
+#: view:ir.attachment:0
+#: model:ir.ui.menu,name:base.menu_action_attachment
+msgid "Attachments"
+msgstr ""
+
+#. module: base
+#: help:res.company,bank_ids:0
+msgid "Bank accounts related to this company"
+msgstr ""
+
+#. module: base
+#: model:ir.module.category,name:base.module_category_sales_management
+#: model:ir.ui.menu,name:base.menu_base_partner
+#: model:ir.ui.menu,name:base.menu_sale_config
+#: model:ir.ui.menu,name:base.menu_sale_config_sales
+#: model:ir.ui.menu,name:base.menu_sales
+#: model:ir.ui.menu,name:base.next_id_64
+#: view:res.users:0
+msgid "Sales"
+msgstr ""
+
+#. module: base
+#: field:ir.actions.server,child_ids:0
+msgid "Other Actions"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_l10n_be_coda
+msgid "Belgium - Import Bank CODA Statements"
+msgstr ""
+
+#. module: base
+#: selection:ir.actions.todo,state:0
+msgid "Done"
+msgstr ""
+
+#. module: base
+#: help:ir.cron,doall:0
+msgid ""
+"Specify if missed occurrences should be executed when the server restarts."
+msgstr ""
+
+#. module: base
+#: model:res.partner.title,name:base.res_partner_title_miss
+#: model:res.partner.title,shortcut:base.res_partner_title_miss
+msgid "Miss"
+msgstr ""
+
+#. module: base
+#: view:ir.model.access:0
+#: field:ir.model.access,perm_write:0
+msgid "Write Access"
+msgstr ""
+
+#. module: base
+#: view:res.lang:0
+msgid "%m - Month number [01,12]."
+msgstr ""
+
+#. module: base
+#: view:res.bank:0
+#: field:res.bank,city:0
+#: view:res.company:0
+#: field:res.company,city:0
+#: view:res.partner:0
+#: field:res.partner,city:0
+#: view:res.partner.bank:0
+#: field:res.partner.bank,city:0
+#: view:res.users:0
+msgid "City"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.qa
+msgid "Qatar"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.it
+msgid "Italy"
+msgstr ""
+
+#. module: base
+#: model:res.groups,name:base.group_sale_salesman
+msgid "See Own Leads"
+msgstr ""
+
+#. module: base
+#: view:ir.actions.todo:0
+#: selection:ir.actions.todo,state:0
+msgid "To Do"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_portal_hr_employees
+msgid "Portal HR employees"
+msgstr ""
+
+#. module: base
+#: selection:base.language.install,lang:0
+msgid "Estonian / Eesti keel"
+msgstr ""
+
+#. module: base
+#: help:ir.actions.server,write_id:0
+msgid ""
+"Provide the field name that the record id refers to for the write operation. "
+"If it is empty it will refer to the active id of the object."
+msgstr ""
+
+#. module: base
+#: selection:ir.module.module,license:0
+msgid "GPL-3 or later version"
+msgstr ""
+
+#. module: base
+#: code:addons/orm.py:2033
+#, python-format
+msgid ""
+"Insufficient fields to generate a Calendar View for %s, missing a date_stop "
+"or a date_delay"
+msgstr ""
+
+#. module: base
+#: field:workflow.activity,action:0
+msgid "Python Action"
+msgstr ""
+
+#. module: base
+#: selection:base.language.install,lang:0
+msgid "English (US)"
+msgstr ""
+
+#. module: base
+#: model:ir.actions.act_window,help:base.action_partner_title_partner
+msgid ""
+"Manage the partner titles you want to have available in your system. The "
+"partner titles is the legal status of the company: Private Limited, SA, etc."
+msgstr ""
+
+#. module: base
+#: view:res.bank:0
+#: view:res.company:0
+#: view:res.partner:0
+#: view:res.partner.bank:0
+#: view:res.users:0
+msgid "Address"
+msgstr ""
+
+#. module: base
+#: selection:base.language.install,lang:0
+msgid "Mongolian / монгол"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.mr
+msgid "Mauritania"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_resource
+msgid ""
+"\n"
+"Module for resource management.\n"
+"===============================\n"
+"\n"
+"A resource represent something that can be scheduled (a developer on a task "
+"or a\n"
+"work center on manufacturing orders). This module manages a resource "
+"calendar\n"
+"associated to every resource. It also manages the leaves of every resource.\n"
+"    "
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_account_followup
+msgid ""
+"\n"
+"Module to automate letters for unpaid invoices, with multi-level recalls.\n"
+"=========================================================================\n"
+"\n"
+"You can define your multiple levels of recall through the menu:\n"
+"---------------------------------------------------------------\n"
+"    Configuration / Follow-Up Levels\n"
+"    \n"
+"Once it is defined, you can automatically print recalls every day through "
+"simply clicking on the menu:\n"
+"-----------------------------------------------------------------------------"
+"-------------------------\n"
+"    Payment Follow-Up / Send Email and letters\n"
+"\n"
+"It will generate a PDF / send emails / set manual actions according to the "
+"the different levels \n"
+"of recall defined. You can define different policies for different "
+"companies. \n"
+"\n"
+"Note that if you want to check the follow-up level for a given "
+"partner/account entry, you can do from in the menu:\n"
+"-----------------------------------------------------------------------------"
+"-------------------------------------\n"
+"    Reporting / Accounting / **Follow-ups Analysis\n"
+"\n"
+msgstr ""
+
+#. module: base
+#: code:addons/base/ir/ir_model.py:736
+#, python-format
+msgid ""
+"Please contact your system administrator if you think this is an error."
+msgstr ""
+
+#. module: base
+#: code:addons/base/module/module.py:545
+#: view:base.module.upgrade:0
+#: model:ir.actions.act_window,name:base.action_view_base_module_upgrade
+#, python-format
+msgid "Apply Schedule Upgrade"
+msgstr ""
+
+#. module: base
+#: view:workflow.activity:0
+#: field:workflow.workitem,act_id:0
+msgid "Activity"
+msgstr ""
+
+#. module: base
+#: view:change.password.user:0
+#: field:change.password.wizard,user_ids:0
+#: model:ir.actions.act_window,name:base.action_res_users
+#: field:ir.default,uid:0
+#: model:ir.model,name:base.model_res_users
+#: model:ir.ui.menu,name:base.menu_action_res_users
+#: model:ir.ui.menu,name:base.menu_users
+#: view:res.groups:0
+#: field:res.groups,users:0
+#: field:res.partner,user_ids:0
+#: view:res.users:0
+msgid "Users"
+msgstr ""
+
+#. module: base
+#: field:res.company,parent_id:0
+msgid "Parent Company"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_auth_openid
+msgid "OpenID Authentification"
+msgstr ""
+
+#. module: base
+#: code:addons/orm.py:3872
+#, python-format
+msgid ""
+"One of the documents you are trying to access has been deleted, please try "
+"again after refreshing."
+msgstr ""
+
+#. module: base
+#: model:ir.model,name:base.model_ir_mail_server
+msgid "ir.mail_server"
+msgstr ""
+
+#. module: base
+#: selection:base.language.install,lang:0
+msgid "Spanish (CR) / Español (CR)"
+msgstr ""
+
+#. module: base
+#: view:ir.rule:0
+msgid ""
+"Global rules (non group-specific) are restrictions, and cannot be bypassed. "
+"Group-local rules grant additional permissions, but are constrained within "
+"the bounds of global ones. The first group rules restrict further than "
+"global rules, but any additional group rule will add more permissions"
+msgstr ""
+
+#. module: base
+#: field:res.currency.rate,rate:0
+msgid "Rate"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.cg
+msgid "Congo"
+msgstr ""
+
+#. module: base
+#: view:res.lang:0
+msgid "Examples"
+msgstr ""
+
+#. module: base
+#: field:ir.default,value:0
+msgid "Default Value"
+msgstr ""
+
+#. module: base
+#: model:ir.model,name:base.model_res_country_state
+msgid "Country state"
+msgstr ""
+
+#. module: base
+#: model:ir.ui.menu,name:base.next_id_5
+msgid "Sequences & Identifiers"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_l10n_th
+msgid ""
+"\n"
+"Chart of Accounts for Thailand.\n"
+"===============================\n"
+"\n"
+"Thai accounting chart and localization.\n"
+"    "
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.kn
+msgid "Saint Kitts & Nevis Anguilla"
+msgstr ""
+
+#. module: base
+#: code:addons/base/res/res_currency.py:193
+#, python-format
+msgid ""
+"No rate found \n"
+"for the currency: %s \n"
+"at the date: %s"
+msgstr ""
+
+#. module: base
+#: model:ir.actions.act_window,help:base.action_ui_view_custom
+msgid ""
+"Customized views are used when users reorganize the content of their "
+"dashboard views (via web client)"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_sale_stock
+msgid "Sales and Warehouse Management"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_hr_recruitment
+msgid ""
+"\n"
+"Manage job positions and the recruitment process\n"
+"================================================\n"
+"\n"
+"This application allows you to easily keep track of jobs, vacancies, "
+"applications, interviews...\n"
+"\n"
+"It is integrated with the mail gateway to automatically fetch email sent to "
+"<jobs@yourcompany.com> in the list of applications. It's also integrated "
+"with the document management system to store and search in the CV base and "
+"find the candidate that you are looking for. Similarly, it is integrated "
+"with the survey module to allow you to define interviews for different "
+"jobs.\n"
+"You can define the different phases of interviews and easily rate the "
+"applicant from the kanban view.\n"
+msgstr ""
+
+#. module: base
+#: field:ir.model.fields,model:0
+msgid "Object Name"
+msgstr ""
+
+#. module: base
+#: help:ir.actions.server,srcmodel_id:0
+msgid ""
+"Object in which you want to create / write the object. If it is empty then "
+"refer to the Object field."
+msgstr ""
+
+#. module: base
+#: view:ir.module.module:0
+#: selection:ir.module.module,state:0
+#: selection:ir.module.module.dependency,state:0
+msgid "Not Installed"
+msgstr ""
+
+#. module: base
+#: view:workflow.activity:0
+#: field:workflow.activity,out_transitions:0
+msgid "Outgoing Transitions"
+msgstr ""
+
+#. module: base
+#: field:ir.module.module,icon_image:0
+#: field:ir.ui.menu,icon:0
+msgid "Icon"
+msgstr ""
+
+#. module: base
+#: model:ir.module.category,description:base.module_category_human_resources
+msgid ""
+"Helps you manage your human resources by encoding your employees structure, "
+"generating work sheets, tracking attendance and more."
+msgstr ""
+
+#. module: base
+#: help:res.partner,ean13:0
+msgid "BarCode"
+msgstr ""
+
+#. module: base
+#: help:ir.model.fields,model_id:0
+msgid "The model this field belongs to"
+msgstr ""
+
+#. module: base
+#: field:ir.actions.server,sms:0
+#: selection:ir.actions.server,state:0
+msgid "SMS"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.mq
+msgid "Martinique (French)"
+msgstr ""
+
+#. module: base
+#: help:res.partner,is_company:0
+msgid "Check if the contact is a company, otherwise it is a person"
+msgstr ""
+
+#. module: base
+#: view:ir.sequence.type:0
+msgid "Sequences Type"
+msgstr ""
+
+#. module: base
+#: view:res.partner:0
+msgid "Mobile:"
+msgstr ""
+
+#. module: base
+#: code:addons/base/res/res_bank.py:195
+#, python-format
+msgid "Formating Error"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.ye
+msgid "Yemen"
+msgstr ""
+
+#. module: base
+#: selection:workflow.activity,split_mode:0
+msgid "Or"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_l10n_br
+msgid "Brazilian - Accounting"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.pk
+msgid "Pakistan"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_product_margin
+msgid ""
+"\n"
+"Adds a reporting menu in products that computes sales, purchases, margins "
+"and other interesting indicators based on invoices.\n"
+"============================================================================="
+"================================================\n"
+"\n"
+"The wizard to launch the report has several options to help you get the data "
+"you need.\n"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.al
+msgid "Albania"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.ws
+msgid "Samoa"
+msgstr ""
+
+#. module: base
+#: code:addons/base/res/res_lang.py:189
+#, python-format
+msgid ""
+"You cannot delete the language which is Active !\n"
+"Please de-activate the language first."
+msgstr ""
+
+#. module: base
+#: code:addons/base/ir/ir_model.py:510
+#: code:addons/base/ir/ir_model.py:571
+#: code:addons/base/ir/ir_model.py:1032
+#, python-format
+msgid "Permission Denied"
+msgstr ""
+
+#. module: base
+#: field:ir.ui.menu,child_id:0
+msgid "Child IDs"
+msgstr ""
+
+#. module: base
+#: code:addons/base/ir/ir_actions.py:702
+#: code:addons/base/ir/ir_actions.py:705
+#, python-format
+msgid "Problem in configuration `Record Id` in Server Action!"
+msgstr ""
+
+#. module: base
+#: code:addons/orm.py:2807
+#: code:addons/orm.py:2817
+#, python-format
+msgid "ValidateError"
+msgstr ""
+
+#. module: base
+#: view:base.module.import:0
+#: view:base.module.update:0
+msgid "Open Modules"
+msgstr ""
+
+#. module: base
+#: model:ir.actions.act_window,help:base.action_res_bank_form
+msgid "Manage bank records you want to be used in the system."
+msgstr ""
+
+#. module: base
+#: view:base.module.import:0
+msgid "Import module"
+msgstr ""
+
+#. module: base
+#: field:ir.actions.server,loop_action:0
+msgid "Loop Action"
+msgstr ""
+
+#. module: base
+#: help:ir.actions.report.xml,report_file:0
+msgid ""
+"The path to the main report file (depending on Report Type) or NULL if the "
+"content is in another field"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.la
+msgid "Laos"
+msgstr ""
+
+#. module: base
+#: code:addons/base/res/res_company.py:163
+#: selection:ir.actions.server,state:0
+#: model:ir.ui.menu,name:base.menu_email
+#: field:res.bank,email:0
+#: field:res.company,email:0
+#: field:res.partner,email:0
+#, python-format
+msgid "Email"
+msgstr ""
+
+#. module: base
+#: model:res.partner.category,name:base.res_partner_category_12
+msgid "Office Supplies"
+msgstr ""
+
+#. module: base
+#: field:ir.attachment,res_model:0
+msgid "Resource Model"
+msgstr ""
+
+#. module: base
+#: code:addons/custom.py:555
+#, python-format
+msgid ""
+"The sum of the data (2nd field) is null.\n"
+"We can't draw a pie chart !"
+msgstr ""
+
+#. module: base
+#: view:res.partner.bank:0
+msgid "Information About the Bank"
+msgstr ""
+
+#. module: base
+#: help:ir.actions.server,condition:0
+msgid ""
+"Condition that is tested before the action is executed, and prevent "
+"execution if it is not verified.\n"
+"Example: object.list_price > 5000\n"
+"It is a Python expression that can use the following values:\n"
+" - self: ORM model of the record on which the action is triggered\n"
+" - object or obj: browse_record of the record on which the action is "
+"triggered\n"
+" - pool: ORM model pool (i.e. self.pool)\n"
+" - time: Python time module\n"
+" - cr: database cursor\n"
+" - uid: current user id\n"
+" - context: current context"
+msgstr ""
+
+#. module: base
+#: view:ir.rule:0
+msgid ""
+"2. Group-specific rules are combined together with a logical OR operator"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.bl
+msgid "Saint Barthélémy"
+msgstr ""
+
+#. module: base
+#: selection:ir.module.module,license:0
+msgid "Other Proprietary"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.ec
+msgid "Ecuador"
+msgstr ""
+
+#. module: base
+#: model:ir.model,name:base.model_workflow
+msgid "workflow"
+msgstr ""
+
+#. module: base
+#: view:ir.rule:0
+msgid "Read Access Right"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_analytic_user_function
+msgid "Jobs on Contracts"
+msgstr ""
+
+#. module: base
+#: code:addons/base/res/res_lang.py:187
+#, python-format
+msgid "You cannot delete the language which is User's Preferred Language !"
+msgstr ""
+
+#. module: base
+#: view:ir.model.data:0
+msgid "Updatable"
+msgstr ""
+
+#. module: base
+#: view:res.lang:0
+msgid "3.  %x ,%X         ==> 12/05/08, 18:25:20"
+msgstr ""
+
+#. module: base
+#: selection:ir.model.fields,on_delete:0
+msgid "Cascade"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,summary:base.module_crm
+msgid "Leads, Opportunities, Phone Calls"
+msgstr ""
+
+#. module: base
+#: model:ir.module.category,description:base.module_category_knowledge_management
+msgid ""
+"Lets you install addons geared towards sharing knowledge with and between "
+"your employees."
+msgstr ""
+
+#. module: base
+#: selection:base.language.install,lang:0
+msgid "Arabic / الْعَرَبيّة"
+msgstr ""
+
+#. module: base
+#: selection:ir.translation,state:0
+msgid "Translated"
+msgstr ""
+
+#. module: base
+#: model:ir.actions.act_window,name:base.action_inventory_form
+#: model:ir.ui.menu,name:base.menu_action_inventory_form
+msgid "Default Company per Object"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_web_hello
+msgid "Hello"
+msgstr ""
+
+#. module: base
+#: view:ir.actions.configuration.wizard:0
+msgid "Next Configuration Step"
+msgstr ""
+
+#. module: base
+#: field:res.groups,comment:0
+msgid "Comment"
+msgstr ""
+
+#. module: base
+#: field:ir.filters,domain:0
+#: field:ir.model.fields,domain:0
+#: field:ir.rule,domain:0
+#: field:ir.rule,domain_force:0
+#: field:res.partner.title,domain:0
+msgid "Domain"
+msgstr ""
+
+#. module: base
+#: code:addons/base/ir/ir_fields.py:166
+#, python-format
+msgid "Use '1' for yes and '0' for no"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_marketing_campaign
+msgid "Marketing Campaigns"
+msgstr ""
+
+#. module: base
+#: field:res.country.state,name:0
+msgid "State Name"
+msgstr ""
+
+#. module: base
+#: help:ir.attachment,type:0
+msgid "Binary File or URL"
+msgstr ""
+
+#. module: base
+#: code:addons/base/ir/ir_fields.py:313
+#, python-format
+msgid "Invalid database id '%s' for the field '%%(field)s'"
+msgstr ""
+
+#. module: base
+#: view:res.lang:0
+msgid "Update Languague Terms"
+msgstr ""
+
+#. module: base
+#: field:workflow.activity,join_mode:0
+msgid "Join Mode"
+msgstr ""
+
+#. module: base
+#: field:res.partner,tz:0
+msgid "Timezone"
+msgstr ""
+
+#. module: base
+#: model:ir.model,name:base.model_ir_actions_report_xml
+#: selection:ir.ui.menu,action:0
+msgid "ir.actions.report.xml"
+msgstr ""
+
+#. module: base
+#: model:ir.actions.act_window,name:base.ir_sequence_form
+#: view:ir.sequence:0
+#: model:ir.ui.menu,name:base.menu_ir_sequence_form
+msgid "Sequences"
+msgstr ""
+
+#. module: base
+#: help:res.lang,code:0
+msgid "This field is used to set/get locales for user"
+msgstr ""
+
+#. module: base
+#: view:ir.filters:0
+msgid "Shared"
+msgstr ""
+
+#. module: base
+#: code:addons/base/module/module.py:357
+#, python-format
+msgid ""
+"Unable to install module \"%s\" because an external dependency is not met: %s"
+msgstr ""
+
+#. module: base
+#: view:ir.module.module:0
+msgid "Search modules"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.by
+msgid "Belarus"
+msgstr ""
+
+#. module: base
+#: field:ir.actions.act_url,name:0
+#: field:ir.actions.act_window,name:0
+#: field:ir.actions.client,name:0
+#: field:ir.actions.server,name:0
+msgid "Action Name"
+msgstr ""
+
+#. module: base
+#: model:ir.actions.act_window,help:base.action_res_users
+msgid ""
+"Create and manage users that will connect to the system. Users can be "
+"deactivated should there be a period of time during which they will/should "
+"not connect to the system. You can assign them groups in order to give them "
+"specific access to the applications they need to use in the system."
+msgstr ""
+
+#. module: base
+#: selection:res.request,priority:0
+msgid "Normal"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_purchase_double_validation
+msgid "Double Validation on Purchases"
+msgstr ""
+
+#. module: base
+#: field:res.bank,street2:0
+#: field:res.company,street2:0
+#: field:res.partner,street2:0
+msgid "Street2"
+msgstr ""
+
+#. module: base
+#: model:ir.actions.act_window,name:base.action_view_base_module_update
+msgid "Module Update"
+msgstr ""
+
+#. module: base
+#: code:addons/base/module/wizard/base_module_upgrade.py:85
+#, python-format
+msgid "Following modules are not installed or unknown: %s"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_auth_oauth_signup
+msgid ""
+"\n"
+"Allow users to sign up through OAuth2 Provider.\n"
+"===============================================\n"
+msgstr ""
+
+#. module: base
+#: field:change.password.user,user_id:0
+#: view:ir.cron:0
+#: field:ir.cron,user_id:0
+#: view:ir.filters:0
+#: field:ir.filters,user_id:0
+#: field:ir.ui.view.custom,user_id:0
+#: field:ir.values,user_id:0
+#: model:res.groups,name:base.group_document_user
+#: model:res.groups,name:base.group_tool_user
+#: view:res.users:0
+msgid "User"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.pr
+msgid "Puerto Rico"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_web_tests_demo
+msgid "Demonstration of web/javascript tests"
+msgstr ""
+
+#. module: base
+#: field:workflow.transition,signal:0
+msgid "Signal (Button Name)"
+msgstr ""
+
+#. module: base
+#: view:ir.actions.act_window:0
+msgid "Open Window"
+msgstr ""
+
+#. module: base
+#: field:ir.actions.act_window,auto_search:0
+msgid "Auto Search"
+msgstr ""
+
+#. module: base
+#: field:ir.actions.act_window,filter:0
+msgid "Filter"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.ch
+msgid "Switzerland"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.gd
+msgid "Grenada"
+msgstr ""
+
+#. module: base
+#: help:res.partner,customer:0
+msgid "Check this box if this contact is a customer."
+msgstr ""
+
+#. module: base
+#: view:ir.actions.server:0
+msgid "Trigger Configuration"
+msgstr ""
+
+#. module: base
+#: view:base.language.install:0
+msgid "Load"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_warning
+msgid ""
+"\n"
+"Module to trigger warnings in OpenERP objects.\n"
+"==============================================\n"
+"\n"
+"Warning messages can be displayed for objects like sale order, purchase "
+"order,\n"
+"picking and invoice. The message is triggered by the form's onchange event.\n"
+"    "
+msgstr ""
+
+#. module: base
+#: field:res.users,partner_id:0
+msgid "Related Partner"
+msgstr ""
+
+#. module: base
+#: code:addons/osv.py:172
+#: code:addons/osv.py:174
+#, python-format
+msgid "Integrity Error"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_l10n_pa
+msgid ""
+"\n"
+"Panamenian accounting chart and tax localization.\n"
+"\n"
+"Plan contable panameño e impuestos de acuerdo a disposiciones vigentes\n"
+"\n"
+"Con la Colaboración de \n"
+"- AHMNET CORP http://www.ahmnet.com\n"
+"\n"
+"    "
+msgstr ""
+
+#. module: base
+#: code:addons/base/ir/ir_model.py:296
+#, python-format
+msgid "Size of the field can never be less than 1 !"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_mrp_operations
+msgid "Manufacturing Operations"
+msgstr ""
+
+#. module: base
+#: view:base.language.export:0
+msgid "Here is the exported translation file:"
+msgstr ""
+
+#. module: base
+#: field:ir.actions.report.xml,report_rml_content:0
+#: field:ir.actions.report.xml,report_rml_content_data:0
+msgid "RML Content"
+msgstr ""
+
+#. module: base
+#: view:res.lang:0
+msgid "Update Terms"
+msgstr ""
+
+#. module: base
+#: field:res.request,act_to:0
+#: field:res.request.history,act_to:0
+msgid "To"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_hr
+msgid "Employee Directory"
+msgstr ""
+
+#. module: base
+#: field:ir.cron,args:0
+msgid "Arguments"
+msgstr ""
+
+#. module: base
+#: selection:ir.module.module,license:0
+msgid "GPL Version 2"
+msgstr ""
+
+#. module: base
+#: selection:ir.module.module,license:0
+msgid "GPL Version 3"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_stock_location
+msgid ""
+"\n"
+"This module supplements the Warehouse application by effectively "
+"implementing Push and Pull inventory flows.\n"
+"============================================================================="
+"===============================\n"
+"\n"
+"Typically this could be used to:\n"
+"--------------------------------\n"
+"    * Manage product manufacturing chains\n"
+"    * Manage default locations per product\n"
+"    * Define routes within your warehouse according to business needs, such "
+"as:\n"
+"        - Quality Control\n"
+"        - After Sales Services\n"
+"        - Supplier Returns\n"
+"\n"
+"    * Help rental management, by generating automated return moves for "
+"rented products\n"
+"\n"
+"Once this module is installed, an additional tab appear on the product "
+"form,\n"
+"where you can add Push and Pull flow specifications. The demo data of CPU1\n"
+"product for that push/pull :\n"
+"\n"
+"Push flows:\n"
+"-----------\n"
+"Push flows are useful when the arrival of certain products in a given "
+"location\n"
+"should always be followed by a corresponding move to another location, "
+"optionally\n"
+"after a certain delay. The original Warehouse application already supports "
+"such\n"
+"Push flow specifications on the Locations themselves, but these cannot be\n"
+"refined per-product.\n"
+"\n"
+"A push flow specification indicates which location is chained with which "
+"location,\n"
+"and with what parameters. As soon as a given quantity of products is moved "
+"in the\n"
+"source location, a chained move is automatically foreseen according to the\n"
+"parameters set on the flow specification (destination location, delay, type "
+"of\n"
+"move, journal). The new move can be automatically processed, or require a "
+"manual\n"
+"confirmation, depending on the parameters.\n"
+"\n"
+"Pull flows:\n"
+"-----------\n"
+"Pull flows are a bit different from Push flows, in the sense that they are "
+"not\n"
+"related to the processing of product moves, but rather to the processing of\n"
+"procurement orders. What is being pulled is a need, not directly products. "
+"A\n"
+"classical example of Pull flow is when you have an Outlet company, with a "
+"parent\n"
+"Company that is responsible for the supplies of the Outlet.\n"
+"\n"
+"  [ Customer ] <- A - [ Outlet ]  <- B -  [ Holding ] <~ C ~ [ Supplier ]\n"
+"\n"
+"When a new procurement order (A, coming from the confirmation of a Sale "
+"Order\n"
+"for example) arrives in the Outlet, it is converted into another "
+"procurement\n"
+"(B, via a Pull flow of type 'move') requested from the Holding. When "
+"procurement\n"
+"order B is processed by the Holding company, and if the product is out of "
+"stock,\n"
+"it can be converted into a Purchase Order (C) from the Supplier (Pull flow "
+"of\n"
+"type Purchase). The result is that the procurement order, the need, is "
+"pushed\n"
+"all the way between the Customer and Supplier.\n"
+"\n"
+"Technically, Pull flows allow to process procurement orders differently, "
+"not\n"
+"only depending on the product being considered, but also depending on which\n"
+"location holds the 'need' for that product (i.e. the destination location "
+"of\n"
+"that procurement order).\n"
+"\n"
+"Use-Case:\n"
+"---------\n"
+"\n"
+"You can use the demo data as follow:\n"
+"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~\n"
+"  **CPU1:** Sell some CPU1 from Chicago Shop and run the scheduler\n"
+"     - Warehouse: delivery order, Chicago Shop: reception\n"
+"  **CPU3:**\n"
+"     - When receiving the product, it goes to Quality Control location then\n"
+"       stored to shelf 2.\n"
+"     - When delivering the customer: Pick List -> Packing -> Delivery Order "
+"from Gate A\n"
+"    "
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_decimal_precision
+msgid ""
+"\n"
+"Configure the price accuracy you need for different kinds of usage: "
+"accounting, sales, purchases.\n"
+"============================================================================="
+"====================\n"
+"\n"
+"The decimal precision is configured per company.\n"
+msgstr ""
+
+#. module: base
+#: selection:res.company,paper_format:0
+msgid "A4"
+msgstr ""
+
+#. module: base
+#: view:res.config.installer:0
+msgid "Configuration Installer"
+msgstr ""
+
+#. module: base
+#: field:res.partner,customer:0
+msgid "Customer"
+msgstr ""
+
+#. module: base
+#: view:res.partner:0
+#: view:res.users:0
+msgid "e.g. +32.81.81.37.00"
+msgstr ""
+
+#. module: base
+#: selection:base.language.install,lang:0
+msgid "Spanish (NI) / Español (NI)"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_pad_project
+msgid ""
+"\n"
+"This module adds a PAD in all project kanban views.\n"
+"===================================================\n"
+"    "
+msgstr ""
+
+#. module: base
+#: field:ir.actions.act_window,context:0
+#: field:ir.actions.client,context:0
+msgid "Context Value"
+msgstr ""
+
+#. module: base
+#: view:ir.sequence:0
+msgid "Hour 00->24: %(h24)s"
+msgstr ""
+
+#. module: base
+#: field:ir.cron,nextcall:0
+msgid "Next Execution Date"
+msgstr ""
+
+#. module: base
+#: field:ir.sequence,padding:0
+msgid "Number Padding"
+msgstr ""
+
+#. module: base
+#: help:multi_company.default,field_id:0
+msgid "Select field property"
+msgstr ""
+
+#. module: base
+#: field:res.request.history,date_sent:0
+msgid "Date sent"
+msgstr ""
+
+#. module: base
+#: view:ir.sequence:0
+msgid "Month: %(month)s"
+msgstr ""
+
+#. module: base
+#: model:ir.actions.client,name:base.modules_updates_act_cl
+#: model:ir.ui.menu,name:base.menu_module_updates
+msgid "Updates"
+msgstr ""
+
+#. module: base
+#: field:ir.actions.act_window.view,sequence:0
+#: field:ir.actions.server,sequence:0
+#: field:ir.actions.todo,sequence:0
+#: view:ir.cron:0
+#: field:ir.module.category,sequence:0
+#: field:ir.module.module,sequence:0
+#: view:ir.sequence:0
+#: field:ir.ui.menu,sequence:0
+#: view:ir.ui.view:0
+#: field:ir.ui.view,priority:0
+#: field:ir.ui.view_sc,sequence:0
+#: field:multi_company.default,sequence:0
+#: field:res.partner.bank,sequence:0
+msgid "Sequence"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.tn
+msgid "Tunisia"
+msgstr ""
+
+#. module: base
+#: help:ir.model.access,active:0
+msgid ""
+"If you uncheck the active field, it will disable the ACL without deleting it "
+"(if you delete a native ACL, it will be re-created when you reload the "
+"module."
+msgstr ""
+
+#. module: base
+#: model:ir.model,name:base.model_ir_fields_converter
+msgid "ir.fields.converter"
+msgstr ""
+
+#. module: base
+#: code:addons/base/res/res_partner.py:439
+#, python-format
+msgid "Couldn't create contact without email address !"
+msgstr ""
+
+#. module: base
+#: model:ir.module.category,name:base.module_category_manufacturing
+#: model:ir.ui.menu,name:base.menu_mrp_config
+#: model:ir.ui.menu,name:base.menu_mrp_root
+msgid "Manufacturing"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.km
+msgid "Comoros"
+msgstr ""
+
+#. module: base
+#: view:ir.module.module:0
+msgid "Cancel Install"
+msgstr ""
+
+#. module: base
+#: model:ir.model,name:base.model_ir_model_relation
+msgid "ir.model.relation"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_account_check_writing
+msgid "Check Writing"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_plugin_outlook
+msgid ""
+"\n"
+"This module provides the Outlook Plug-in.\n"
+"=========================================\n"
+"\n"
+"Outlook plug-in allows you to select an object that you would like to add "
+"to\n"
+"your email and its attachments from MS Outlook. You can select a partner, a "
+"task,\n"
+"a project, an analytical account, or any other object and archive selected "
+"mail\n"
+"into mail.message with attachments.\n"
+"      "
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_l10n_bo
+msgid "Bolivia Localization Chart Account"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_plugin_thunderbird
+msgid ""
+"\n"
+"This module is required for the Thuderbird Plug-in to work properly.\n"
+"====================================================================\n"
+"\n"
+"The plugin allows you archive email and its attachments to the selected\n"
+"OpenERP objects. You can select a partner, a task, a project, an analytical\n"
+"account, or any other object and attach the selected mail as a .eml file in\n"
+"the attachment of a selected record. You can create documents for CRM Lead,\n"
+"HR Applicant and Project Issue from selected mails.\n"
+"      "
+msgstr ""
+
+#. module: base
+#: view:res.lang:0
+msgid "Legends for Date and Time Formats"
+msgstr ""
+
+#. module: base
+#: selection:ir.actions.server,state:0
+msgid "Copy Object"
+msgstr ""
+
+#. module: base
+#: field:ir.actions.server,trigger_name:0
+msgid "Trigger Signal"
+msgstr ""
+
+#. module: base
+#: model:ir.actions.act_window,name:base.action_country_state
+#: model:ir.ui.menu,name:base.menu_country_state_partner
+msgid "Fed. States"
+msgstr ""
+
+#. module: base
+#: view:ir.model:0
+#: view:res.groups:0
+msgid "Access Rules"
+msgstr ""
+
+#. module: base
+#: field:res.groups,trans_implied_ids:0
+msgid "Transitively inherits"
+msgstr ""
+
+#. module: base
+#: field:ir.default,ref_table:0
+msgid "Table Ref."
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_sale_journal
+msgid ""
+"\n"
+"The sales journal modules allows you to categorise your sales and deliveries "
+"(picking lists) between different journals.\n"
+"============================================================================="
+"===========================================\n"
+"\n"
+"This module is very helpful for bigger companies that works by departments.\n"
+"\n"
+"You can use journal for different purposes, some examples:\n"
+"----------------------------------------------------------\n"
+"    * isolate sales of different departments\n"
+"    * journals for deliveries by truck or by UPS\n"
+"\n"
+"Journals have a responsible and evolves between different status:\n"
+"-----------------------------------------------------------------\n"
+"    * draft, open, cancel, done.\n"
+"\n"
+"Batch operations can be processed on the different journals to confirm all "
+"sales\n"
+"at once, to validate or invoice packing.\n"
+"\n"
+"It also supports batch invoicing methods that can be configured by partners "
+"and sales orders, examples:\n"
+"-----------------------------------------------------------------------------"
+"--------------------------\n"
+"    * daily invoicing\n"
+"    * monthly invoicing\n"
+"\n"
+"Some statistics by journals are provided.\n"
+"    "
+msgstr ""
+
+#. module: base
+#: code:addons/base/ir/ir_mail_server.py:473
+#, python-format
+msgid "Mail delivery failed"
+msgstr ""
+
+#. module: base
+#: view:ir.actions.act_window:0
+#: field:ir.actions.report.xml,model:0
+#: field:ir.actions.server,model_id:0
+#: field:ir.actions.wizard,model:0
+#: field:ir.cron,model:0
+#: field:ir.default,field_tbl:0
+#: view:ir.model.access:0
+#: field:ir.model.access,model_id:0
+#: view:ir.model.data:0
+#: view:ir.model.fields:0
+#: field:ir.rule,model_id:0
+#: selection:ir.translation,type:0
+#: view:ir.ui.view:0
+#: field:ir.ui.view,model:0
+#: field:multi_company.default,object_id:0
+#: field:res.request.link,object:0
+#: field:workflow.triggers,model:0
+msgid "Object"
+msgstr ""
+
+#. module: base
+#: code:addons/osv.py:169
+#, python-format
+msgid ""
+"\n"
+"\n"
+"[object with reference: %s - %s]"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_account_analytic_plans
+msgid "Multiple Analytic Plans"
+msgstr ""
+
+#. module: base
+#: model:ir.model,name:base.model_ir_default
+msgid "ir.default"
+msgstr ""
+
+#. module: base
+#: view:ir.sequence:0
+msgid "Minute: %(min)s"
+msgstr ""
+
+#. module: base
+#: model:ir.ui.menu,name:base.menu_ir_cron
+msgid "Scheduler"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_event_moodle
+msgid ""
+"\n"
+"Configure your moodle server.\n"
+"============================= \n"
+"\n"
+"With this module you are able to connect your OpenERP with a moodle "
+"platform.\n"
+"This module will create courses and students automatically in your moodle "
+"platform \n"
+"to avoid wasting time.\n"
+"Now you have a simple way to create training or courses with OpenERP and "
+"moodle.\n"
+"\n"
+"STEPS TO CONFIGURE:\n"
+"-------------------\n"
+"\n"
+"1. Activate web service in moodle.\n"
+"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~\n"
+">site administration >plugins >web services >manage protocols activate the "
+"xmlrpc web service \n"
+"\n"
+"\n"
+">site administration >plugins >web services >manage tokens create a token \n"
+"\n"
+"\n"
+">site administration >plugins >web services >overview activate webservice\n"
+"\n"
+"\n"
+"2. Create confirmation email with login and password.\n"
+"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~\n"
+"We strongly suggest you to add those following lines at the bottom of your "
+"event\n"
+"confirmation email to communicate the login/password of moodle to your "
+"subscribers.\n"
+"\n"
+"\n"
+"........your configuration text.......\n"
+"\n"
+"**URL:** your moodle link for exemple: http://openerp.moodle.com\n"
+"\n"
+"**LOGIN:** ${object.moodle_username}\n"
+"\n"
+"**PASSWORD:** ${object.moodle_user_password}\n"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_l10n_uk
+msgid "UK - Accounting"
+msgstr ""
+
+#. module: base
+#: model:res.partner.title,shortcut:base.res_partner_title_madam
+msgid "Mrs."
+msgstr ""
+
+#. module: base
+#: code:addons/base/ir/ir_model.py:433
+#, python-format
+msgid ""
+"Changing the type of a column is not yet supported. Please drop it and "
+"create it again!"
+msgstr ""
+
+#. module: base
+#: field:ir.ui.view_sc,user_id:0
+msgid "User Ref."
+msgstr ""
+
+#. module: base
+#: code:addons/base/ir/ir_fields.py:226
+#, python-format
+msgid "'%s' does not seem to be a valid datetime for field '%%(field)s'"
+msgstr ""
+
+#. module: base
+#: model:res.partner.bank.type.field,name:base.bank_normal_field_bic
+msgid "bank_bic"
+msgstr ""
+
+#. module: base
+#: field:ir.actions.server,expression:0
+msgid "Loop Expression"
+msgstr ""
+
+#. module: base
+#: model:res.partner.category,name:base.res_partner_category_16
+msgid "Retailer"
+msgstr ""
+
+#. module: base
+#: view:ir.model.fields:0
+#: field:ir.model.fields,readonly:0
+#: field:res.partner.bank.type.field,readonly:0
+msgid "Readonly"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_l10n_gt
+msgid "Guatemala - Accounting"
+msgstr ""
+
+#. module: base
+#: help:ir.cron,args:0
+msgid "Arguments to be passed to the method, e.g. (uid,)."
+msgstr ""
+
+#. module: base
+#: report:ir.module.reference:0
+msgid "Reference Guide"
+msgstr ""
+
+#. module: base
+#: model:ir.model,name:base.model_res_partner
+#: field:res.company,partner_id:0
+#: model:res.partner.category,name:base.res_partner_category_0
+#: selection:res.partner.title,domain:0
+#: model:res.request.link,name:base.req_link_partner
+msgid "Partner"
+msgstr ""
+
+#. module: base
+#: code:addons/base/ir/ir_mail_server.py:481
+#, python-format
+msgid ""
+"Your server does not seem to support SSL, you may want to try STARTTLS "
+"instead"
+msgstr ""
+
+#. module: base
+#: code:addons/base/ir/workflow/workflow.py:100
+#, python-format
+msgid ""
+"Please make sure no workitems refer to an activity before deleting it!"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.tr
+msgid "Turkey"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.fk
+msgid "Falkland Islands"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.lb
+msgid "Lebanon"
+msgstr ""
+
+#. module: base
+#: view:ir.actions.report.xml:0
+#: field:ir.actions.report.xml,report_type:0
+msgid "Report Type"
+msgstr ""
+
+#. module: base
+#: view:res.bank:0
+#: view:res.company:0
+#: view:res.country.state:0
+#: view:res.partner:0
+#: field:res.partner,state_id:0
+#: view:res.partner.bank:0
+#: view:res.users:0
+msgid "State"
+msgstr ""
+
+#. module: base
+#: selection:base.language.install,lang:0
+msgid "Galician / Galego"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.no
+msgid "Norway"
+msgstr ""
+
+#. module: base
+#: view:res.lang:0
+msgid "4.  %b, %B         ==> Dec, December"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_l10n_cl
+msgid "Chile Localization Chart Account"
+msgstr ""
+
+#. module: base
+#: selection:base.language.install,lang:0
+msgid "Sinhalese / සිංහල"
+msgstr ""
+
+#. module: base
+#: selection:res.request,state:0
+msgid "waiting"
+msgstr ""
+
+#. module: base
+#: model:ir.model,name:base.model_workflow_triggers
+msgid "workflow.triggers"
+msgstr ""
+
+#. module: base
+#: selection:ir.translation,type:0
+msgid "XSL"
+msgstr ""
+
+#. module: base
+#: code:addons/base/ir/ir_model.py:85
+#, python-format
+msgid "Invalid search criterions"
+msgstr ""
+
+#. module: base
+#: view:ir.mail_server:0
+msgid "Connection Information"
+msgstr ""
+
+#. module: base
+#: model:res.partner.title,name:base.res_partner_title_prof
+msgid "Professor"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.hm
+msgid "Heard and McDonald Islands"
+msgstr ""
+
+#. module: base
+#: help:ir.model.data,name:0
+msgid ""
+"External Key/Identifier that can be used for data integration with third-"
+"party systems"
+msgstr ""
+
+#. module: base
+#: field:ir.actions.act_window,view_id:0
+msgid "View Ref."
+msgstr ""
+
+#. module: base
+#: model:ir.module.category,description:base.module_category_sales_management
+msgid "Helps you handle your quotations, sale orders and invoicing."
+msgstr ""
+
+#. module: base
+#: field:res.users,login_date:0
+msgid "Latest connection"
+msgstr ""
+
+#. module: base
+#: field:res.groups,implied_ids:0
+msgid "Inherits"
+msgstr ""
+
+#. module: base
+#: selection:ir.translation,type:0
+msgid "Selection"
+msgstr ""
+
+#. module: base
+#: view:change.password.wizard:0
+#: model:ir.actions.act_window,name:base.change_password_wizard_action
+#: view:res.users:0
+msgid "Change Password"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_l10n_es
+msgid ""
+"\n"
+"Spanish Charts of Accounts (PGCE 2008).\n"
+"=======================================\n"
+"\n"
+"    * Defines the following chart of account templates:\n"
+"        * Spanish General Chart of Accounts 2008\n"
+"        * Spanish General Chart of Accounts 2008 for small and medium "
+"companies\n"
+"    * Defines templates for sale and purchase VAT\n"
+"    * Defines tax code templates\n"
+"\n"
+"**Note:** You should install the l10n_ES_account_balance_report module for "
+"yearly\n"
+"      account reporting (balance, profit & losses).\n"
+msgstr ""
+
+#. module: base
+#: field:ir.actions.act_url,type:0
+#: field:ir.actions.act_window,type:0
+#: field:ir.actions.act_window_close,type:0
+#: field:ir.actions.actions,type:0
+#: field:ir.actions.client,type:0
+#: field:ir.actions.report.xml,type:0
+#: view:ir.actions.server:0
+#: field:ir.actions.server,state:0
+#: field:ir.actions.server,type:0
+#: field:ir.actions.wizard,type:0
+msgid "Action Type"
+msgstr ""
+
+#. module: base
+#: code:addons/base/module/module.py:372
+#, python-format
+msgid ""
+"You try to install module '%s' that depends on module '%s'.\n"
+"But the latter module is not available in your system."
+msgstr ""
+
+#. module: base
+#: view:base.language.import:0
+#: model:ir.actions.act_window,name:base.action_view_base_import_language
+#: model:ir.ui.menu,name:base.menu_view_base_import_language
+msgid "Import Translation"
+msgstr ""
+
+#. module: base
+#: view:ir.module.module:0
+#: field:ir.module.module,category_id:0
+msgid "Category"
+msgstr ""
+
+#. module: base
+#: view:ir.attachment:0
+#: selection:ir.attachment,type:0
+#: selection:ir.property,type:0
+msgid "Binary"
+msgstr ""
+
+#. module: base
+#: model:res.partner.title,name:base.res_partner_title_doctor
+msgid "Doctor"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_mrp_repair
+msgid ""
+"\n"
+"The aim is to have a complete module to manage all products repairs.\n"
+"====================================================================\n"
+"\n"
+"The following topics should be covered by this module:\n"
+"------------------------------------------------------\n"
+"    * Add/remove products in the reparation\n"
+"    * Impact for stocks\n"
+"    * Invoicing (products and/or services)\n"
+"    * Warranty concept\n"
+"    * Repair quotation report\n"
+"    * Notes for the technician and for the final customer\n"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.cd
+msgid "Congo, Democratic Republic of the"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.cr
+msgid "Costa Rica"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_auth_ldap
+msgid "Authentication via LDAP"
+msgstr ""
+
+#. module: base
+#: view:workflow.activity:0
+msgid "Conditions"
+msgstr ""
+
+#. module: base
+#: model:ir.actions.act_window,name:base.action_partner_other_form
+msgid "Other Partners"
+msgstr ""
+
+#. module: base
+#: field:base.language.install,state:0
+#: field:base.module.import,state:0
+#: field:base.module.update,state:0
+#: field:ir.actions.todo,state:0
+#: field:ir.module.module,state:0
+#: field:ir.module.module.dependency,state:0
+#: field:ir.translation,state:0
+#: field:res.request,state:0
+#: field:workflow.instance,state:0
+#: view:workflow.workitem:0
+#: field:workflow.workitem,state:0
+msgid "Status"
+msgstr ""
+
+#. module: base
+#: model:ir.actions.act_window,name:base.action_currency_form
+#: model:ir.ui.menu,name:base.menu_action_currency_form
+#: view:res.currency:0
+msgid "Currencies"
+msgstr ""
+
+#. module: base
+#: model:res.partner.category,name:base.res_partner_category_8
+msgid "Consultancy Services"
+msgstr ""
+
+#. module: base
+#: help:ir.values,value:0
+msgid "Default value (pickled) or reference to an action"
+msgstr ""
+
+#. module: base
+#: field:ir.actions.report.xml,auto:0
+msgid "Custom Python Parser"
+msgstr ""
+
+#. module: base
+#: sql_constraint:res.groups:0
+msgid "The name of the group must be unique !"
+msgstr ""
+
+#. module: base
+#: help:ir.translation,module:0
+msgid "Module this term belongs to"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_web_view_editor
+msgid ""
+"\n"
+"OpenERP Web to edit views.\n"
+"==========================\n"
+"\n"
+"        "
+msgstr ""
+
+#. module: base
+#: view:ir.sequence:0
+msgid "Hour 00->12: %(h12)s"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.dk
+msgid "Denmark"
+msgstr ""
+
+#. module: base
+#: field:res.country,code:0
+msgid "Country Code"
+msgstr ""
+
+#. module: base
+#: model:ir.model,name:base.model_workflow_instance
+msgid "workflow.instance"
+msgstr ""
+
+#. module: base
+#: code:addons/orm.py:479
+#, python-format
+msgid "Unknown attribute %s in %s "
+msgstr ""
+
+#. module: base
+#: view:res.lang:0
+msgid "10. %S              ==> 20"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_l10n_ar
+msgid ""
+"\n"
+"Argentinian accounting chart and tax localization.\n"
+"==================================================\n"
+"\n"
+"Plan contable argentino e impuestos de acuerdo a disposiciones vigentes\n"
+"\n"
+"    "
+msgstr ""
+
+#. module: base
+#: code:addons/fields.py:130
+#, python-format
+msgid "undefined get method !"
+msgstr ""
+
+#. module: base
+#: selection:base.language.install,lang:0
+msgid "Norwegian Bokmål / Norsk bokmål"
+msgstr ""
+
+#. module: base
+#: model:res.partner.title,name:base.res_partner_title_madam
+msgid "Madam"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.ee
+msgid "Estonia"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_board
+#: model:ir.ui.menu,name:base.menu_reporting_dashboard
+msgid "Dashboards"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_procurement
+msgid "Procurements"
+msgstr ""
+
+#. module: base
+#: model:res.partner.category,name:base.res_partner_category_6
+msgid "Bronze"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_hr_payroll_account
+msgid "Payroll Accounting"
+msgstr ""
+
+#. module: base
+#: view:res.users:0
+msgid "Change password"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.sr
+msgid "Suriname"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_sale_order_dates
+msgid "Dates on Sales Order"
+msgstr ""
+
+#. module: base
+#: view:ir.attachment:0
+msgid "Creation Month"
+msgstr ""
+
+#. module: base
+#: field:ir.module.module,demo:0
+msgid "Demo Data"
+msgstr ""
+
+#. module: base
+#: model:res.partner.title,shortcut:base.res_partner_title_mister
+msgid "Mr."
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.mv
+msgid "Maldives"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_portal_crm
+msgid "Portal CRM"
+msgstr ""
+
+#. module: base
+#: model:ir.ui.menu,name:base.next_id_4
+msgid "Low Level Objects"
+msgstr ""
+
+#. module: base
+#: help:ir.values,model:0
+msgid "Model to which this entry applies"
+msgstr ""
+
+#. module: base
+#: field:res.country,address_format:0
+msgid "Address Format"
+msgstr ""
+
+#. module: base
+#: model:ir.model,name:base.model_change_password_user
+msgid "Change Password Wizard User"
+msgstr ""
+
+#. module: base
+#: model:res.groups,name:base.group_no_one
+msgid "Technical Features"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_l10n_ve
+msgid ""
+"\n"
+"Chart of Account for Venezuela.\n"
+"===============================\n"
+"\n"
+"Venezuela doesn't have any chart of account by law, but the default\n"
+"proposed in OpenERP should comply with some Accepted best practices in "
+"Venezuela, \n"
+"this plan comply with this practices.\n"
+"\n"
+"This module has been tested as base for more of 1000 companies, because \n"
+"it is based in a mixtures of most common softwares in the Venezuelan \n"
+"market what will allow for sure to accountants feel them first steps with \n"
+"OpenERP more confortable.\n"
+"\n"
+"This module doesn't pretend be the total localization for Venezuela, \n"
+"but it will help you to start really quickly with OpenERP in this country.\n"
+"\n"
+"This module give you.\n"
+"---------------------\n"
+"\n"
+"- Basic taxes for Venezuela.\n"
+"- Have basic data to run tests with community localization.\n"
+"- Start a company from 0 if your needs are basic from an accounting PoV.\n"
+"\n"
+"We recomend install account_anglo_saxon if you want valued your \n"
+"stocks as Venezuela does with out invoices.\n"
+"\n"
+"If you install this module, and select Custom chart a basic chart will be "
+"proposed, \n"
+"but you will need set manually account defaults for taxes.\n"
+msgstr ""
+
+#. module: base
+#: selection:base.language.install,lang:0
+msgid "Occitan (FR, post 1500) / Occitan"
+msgstr ""
+
+#. module: base
+#: code:addons/base/ir/ir_mail_server.py:214
+#, python-format
+msgid ""
+"Here is what we got instead:\n"
+" %s"
+msgstr ""
+
+#. module: base
+#: model:ir.actions.act_window,name:base.action_model_data
+#: view:ir.model.data:0
+#: model:ir.ui.menu,name:base.ir_model_data_menu
+msgid "External Identifiers"
+msgstr ""
+
+#. module: base
+#. openerp-web
+#: code:addons/base/static/src/js/apps.js:103
+#, python-format
+msgid "Showing locally available modules"
+msgstr ""
+
+#. module: base
+#: selection:base.language.install,lang:0
+msgid "Malayalam / മലയാളം"
+msgstr ""
+
+#. module: base
+#: field:res.request,body:0
+#: field:res.request.history,req_id:0
+msgid "Request"
+msgstr ""
+
+#. module: base
+#: model:ir.actions.act_window,help:base.act_ir_actions_todo_form
+msgid ""
+"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."
+msgstr ""
+
+#. module: base
+#: field:ir.actions.report.xml,report_sxw:0
+msgid "SXW Path"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_account_asset
+msgid ""
+"\n"
+"Financial and accounting asset management.\n"
+"==========================================\n"
+"\n"
+"This Module manages the assets owned by a company or an individual. It will "
+"keep \n"
+"track of depreciation's occurred on those assets. And it allows to create "
+"Move's \n"
+"of the depreciation lines.\n"
+"\n"
+"    "
+msgstr ""
+
+#. module: base
+#: field:ir.cron,numbercall:0
+msgid "Number of Calls"
+msgstr ""
+
+#. module: base
+#: code:addons/base/res/res_bank.py:192
+#, python-format
+msgid "BANK"
+msgstr ""
+
+#. module: base
+#: model:ir.module.category,name:base.module_category_point_of_sale
+#: model:ir.module.module,shortdesc:base.module_point_of_sale
+msgid "Point of Sale"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_mail
+msgid ""
+"\n"
+"Business oriented Social Networking\n"
+"===================================\n"
+"The Social Networking module provides a unified social network abstraction "
+"layer allowing applications to display a complete\n"
+"communication history on documents with a fully-integrated email and message "
+"management system.\n"
+"\n"
+"It enables the users to read and send messages as well as emails. It also "
+"provides a feeds page combined to a subscription mechanism that allows to "
+"follow documents and to be constantly updated about recent news.\n"
+"\n"
+"Main Features\n"
+"-------------\n"
+"* Clean and renewed communication history for any OpenERP document that can "
+"act as a discussion topic\n"
+"* Subscription mechanism to be updated about new messages on interesting "
+"documents\n"
+"* Unified feeds page to see recent messages and activity on followed "
+"documents\n"
+"* User communication through the feeds page\n"
+"* Threaded discussion design on documents\n"
+"* Relies on the global outgoing mail server - an integrated email management "
+"system - allowing to send emails with a configurable scheduler-based "
+"processing engine\n"
+"* Includes an extensible generic email composition assistant, that can turn "
+"into a mass-mailing assistant and is capable of interpreting simple "
+"*placeholder expressions* that will be replaced with dynamic data when each "
+"email is actually sent.\n"
+"    "
+msgstr ""
+
+#. module: base
+#: help:ir.actions.server,sequence:0
+msgid ""
+"Important when you deal with multiple actions, the execution order will be "
+"decided based on this, low number is higher priority."
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.gr
+msgid "Greece"
+msgstr ""
+
+#. module: base
+#: view:res.config:0
+msgid "Apply"
+msgstr ""
+
+#. module: base
+#: field:res.request,trigger_date:0
+msgid "Trigger Date"
+msgstr ""
+
+#. module: base
+#: selection:base.language.install,lang:0
+msgid "Croatian / hrvatski jezik"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_l10n_uy
+msgid ""
+"\n"
+"General Chart of Accounts.\n"
+"==========================\n"
+"\n"
+"Provide Templates for Chart of Accounts, Taxes for Uruguay.\n"
+"\n"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_l10n_gr
+msgid "Greece - Accounting"
+msgstr ""
+
+#. module: base
+#: sql_constraint:res.country:0
+msgid "The code of the country must be unique !"
+msgstr ""
+
+#. module: base
+#: selection:ir.module.module.dependency,state:0
+msgid "Uninstallable"
+msgstr ""
+
+#. module: base
+#: view:res.partner.category:0
+msgid "Partner Category"
+msgstr ""
+
+#. module: base
+#: view:ir.actions.server:0
+#: selection:ir.actions.server,state:0
+msgid "Trigger"
+msgstr ""
+
+#. module: base
+#: model:ir.module.category,description:base.module_category_warehouse_management
+msgid ""
+"Helps you manage your inventory and main stock operations: delivery orders, "
+"receptions, etc."
+msgstr ""
+
+#. module: base
+#: model:ir.model,name:base.model_ir_values
+msgid "ir.values"
+msgstr ""
+
+#. module: base
+#: model:ir.model,name:base.model_base_module_update
+msgid "Update Module"
+msgstr ""
+
+#. module: base
+#: view:ir.model.fields:0
+msgid "Translate"
+msgstr ""
+
+#. module: base
+#: field:res.request.history,body:0
+msgid "Body"
+msgstr ""
+
+#. module: base
+#: code:addons/base/ir/ir_mail_server.py:221
+#, python-format
+msgid "Connection test succeeded!"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_project_gtd
+msgid ""
+"\n"
+"Implement concepts of the \"Getting Things Done\" methodology \n"
+"===========================================================\n"
+"\n"
+"This module implements a simple personal to-do list based on tasks. It adds "
+"an editable list of tasks simplified to the minimum required fields in the "
+"project application.\n"
+"\n"
+"The to-do list is based on the GTD methodology. This world-wide used "
+"methodology is used for personal time management improvement.\n"
+"\n"
+"Getting Things Done (commonly abbreviated as GTD) is an action management "
+"method created by David Allen, and described in a book of the same name.\n"
+"\n"
+"GTD rests on the principle that a person needs to move tasks out of the mind "
+"by recording them externally. That way, the mind is freed from the job of "
+"remembering everything that needs to be done, and can concentrate on "
+"actually performing those tasks.\n"
+"    "
+msgstr ""
+
+#. module: base
+#: field:res.users,menu_id:0
+msgid "Menu Action"
+msgstr ""
+
+#. module: base
+#: help:ir.model.fields,selection:0
+msgid ""
+"List of options for a selection field, specified as a Python expression "
+"defining a list of (key, label) pairs. For example: "
+"[('blue','Blue'),('yellow','Yellow')]"
+msgstr ""
+
+#. module: base
+#: selection:base.language.export,state:0
+msgid "choose"
+msgstr ""
+
+#. module: base
+#: code:addons/base/ir/ir_mail_server.py:445
+#, python-format
+msgid ""
+"Please define at least one SMTP server, or provide the SMTP parameters "
+"explicitly."
+msgstr ""
+
+#. module: base
+#: view:ir.attachment:0
+msgid "Filter on my documents"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,summary:base.module_project_gtd
+msgid "Personal Tasks, Contexts, Timeboxes"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_l10n_cr
+msgid ""
+"\n"
+"Chart of accounts for Costa Rica.\n"
+"=================================\n"
+"\n"
+"Includes:\n"
+"---------\n"
+"    * account.type\n"
+"    * account.account.template\n"
+"    * account.tax.template\n"
+"    * account.tax.code.template\n"
+"    * account.chart.template\n"
+"\n"
+"Everything is in English with Spanish translation. Further translations are "
+"welcome,\n"
+"please go to http://translations.launchpad.net/openerp-costa-rica.\n"
+"    "
+msgstr ""
+
+#. module: base
+#: model:ir.actions.act_window,name:base.action_partner_supplier_form
+#: model:ir.ui.menu,name:base.menu_procurement_management_supplier_name
+#: view:res.partner:0
+msgid "Suppliers"
+msgstr ""
+
+#. module: base
+#: field:res.request,ref_doc2:0
+msgid "Document Ref 2"
+msgstr ""
+
+#. module: base
+#: field:res.request,ref_doc1:0
+msgid "Document Ref 1"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.ga
+msgid "Gabon"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,summary:base.module_stock
+msgid "Inventory, Logistic, Storage"
+msgstr ""
+
+#. module: base
+#: view:ir.actions.act_window:0
+#: selection:ir.translation,type:0
+msgid "Help"
+msgstr ""
+
+#. module: base
+#: view:ir.model:0
+#: view:ir.rule:0
+#: view:res.groups:0
+#: model:res.groups,name:base.group_erp_manager
+#: view:res.users:0
+msgid "Access Rights"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.gl
+msgid "Greenland"
+msgstr ""
+
+#. module: base
+#: view:res.partner.bank:0
+#: field:res.partner.bank,acc_number:0
+msgid "Account Number"
+msgstr ""
+
+#. module: base
+#: view:ir.rule:0
+msgid ""
+"Example: GLOBAL_RULE_1 AND GLOBAL_RULE_2 AND ( (GROUP_A_RULE_1 OR "
+"GROUP_A_RULE_2) OR (GROUP_B_RULE_1 OR GROUP_B_RULE_2) )"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_l10n_th
+msgid "Thailand - Accounting"
+msgstr ""
+
+#. module: base
+#: view:res.lang:0
+msgid "1.  %c              ==> Fri Dec  5 18:25:20 2008"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.nc
+msgid "New Caledonia (French)"
+msgstr ""
+
+#. module: base
+#: field:ir.model,osv_memory:0
+msgid "Transient Model"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.cy
+msgid "Cyprus"
+msgstr ""
+
+#. module: base
+#: field:res.users,new_password:0
+msgid "Set Password"
+msgstr ""
+
+#. module: base
+#: field:ir.actions.server,subject:0
+#: field:res.request,name:0
+#: view:res.request.link:0
+msgid "Subject"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_membership
+msgid ""
+"\n"
+"This module allows you to manage all operations for managing memberships.\n"
+"=========================================================================\n"
+"\n"
+"It supports different kind of members:\n"
+"--------------------------------------\n"
+"    * Free member\n"
+"    * Associated member (e.g.: a group subscribes to a membership for all "
+"subsidiaries)\n"
+"    * Paid members\n"
+"    * Special member prices\n"
+"\n"
+"It is integrated with sales and accounting to allow you to automatically\n"
+"invoice and send propositions for membership renewal.\n"
+"    "
+msgstr ""
+
+#. module: base
+#: selection:res.currency,position:0
+msgid "Before Amount"
+msgstr ""
+
+#. module: base
+#: field:res.request,act_from:0
+#: field:res.request.history,act_from:0
+msgid "From"
+msgstr ""
+
+#. module: base
+#: view:res.users:0
+msgid "Preferences"
+msgstr ""
+
+#. module: base
+#: model:res.partner.category,name:base.res_partner_category_9
+msgid "Components Buyer"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_web_tests_demo
+msgid ""
+"\n"
+"OpenERP Web demo of a test suite\n"
+"================================\n"
+"\n"
+"Test suite example, same code as that used in the testing documentation.\n"
+"    "
+msgstr ""
+
+#. module: base
+#: help:ir.cron,function:0
+msgid "Name of the method to be called when this job is processed."
+msgstr ""
+
+#. module: base
+#: field:ir.actions.client,tag:0
+msgid "Client action tag"
+msgstr ""
+
+#. module: base
+#: field:ir.values,model_id:0
+msgid "Model (change only)"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_marketing_campaign_crm_demo
+msgid ""
+"\n"
+"Demo data for the module marketing_campaign.\n"
+"============================================\n"
+"\n"
+"Creates demo data like leads, campaigns and segments for the module "
+"marketing_campaign.\n"
+"    "
+msgstr ""
+
+#. module: base
+#: selection:ir.actions.act_window.view,view_mode:0
+#: view:ir.ui.view:0
+#: selection:ir.ui.view,type:0
+msgid "Kanban"
+msgstr ""
+
+#. module: base
+#: code:addons/base/ir/ir_model.py:292
+#, python-format
+msgid ""
+"The Selection Options expression is must be in the [('key','Label'), ...] "
+"format!"
+msgstr ""
+
+#. module: base
+#: field:res.company,company_registry:0
+msgid "Company Registry"
+msgstr ""
+
+#. module: base
+#: view:ir.actions.report.xml:0
+#: view:res.currency:0
+msgid "Miscellaneous"
+msgstr ""
+
+#. module: base
+#: model:ir.actions.act_window,name:base.action_ir_mail_server_list
+#: view:ir.mail_server:0
+#: model:ir.ui.menu,name:base.menu_mail_servers
+msgid "Outgoing Mail Servers"
+msgstr ""
+
+#. module: base
+#: model:ir.ui.menu,name:base.menu_custom
+msgid "Technical"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.cn
+msgid "China"
+msgstr ""
+
+#. module: base
+#: help:ir.actions.server,wkf_model_id:0
+msgid ""
+"The object that should receive the workflow signal (must have an associated "
+"workflow)"
+msgstr ""
+
+#. module: base
+#: model:ir.module.category,description:base.module_category_account_voucher
+msgid ""
+"Allows you to create your invoices and track the payments. It is an easier "
+"version of the accounting module for managers who are not accountants."
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.eh
+msgid "Western Sahara"
+msgstr ""
+
+#. module: base
+#: model:ir.module.category,name:base.module_category_account_voucher
+msgid "Invoicing & Payments"
+msgstr ""
+
+#. module: base
+#: model:ir.actions.act_window,help:base.action_res_company_form
+msgid ""
+"Create and manage the companies that will be managed by OpenERP from here. "
+"Shops or subsidiaries can be created and maintained from here."
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.id
+msgid "Indonesia"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_stock_no_autopicking
+msgid ""
+"\n"
+"This module allows an intermediate picking process to provide raw materials "
+"to production orders.\n"
+"============================================================================="
+"====================\n"
+"\n"
+"One example of usage of this module is to manage production made by your\n"
+"suppliers (sub-contracting). To achieve this, set the assembled product "
+"which is\n"
+"sub-contracted to 'No Auto-Picking' and put the location of the supplier in "
+"the\n"
+"routing of the assembly operation.\n"
+"    "
+msgstr ""
+
+#. module: base
+#: help:multi_company.default,expression:0
+msgid ""
+"Expression, must be True to match\n"
+"use context.get or user (browse)"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.bg
+msgid "Bulgaria"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.ao
+msgid "Angola"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.tf
+msgid "French Southern Territories"
+msgstr ""
+
+#. module: base
+#: model:ir.model,name:base.model_res_currency
+#: field:res.company,currency_id:0
+#: field:res.company,currency_ids:0
+#: field:res.country,currency_id:0
+#: view:res.currency:0
+#: field:res.currency,name:0
+#: field:res.currency.rate,currency_id:0
+msgid "Currency"
+msgstr ""
+
+#. module: base
+#: view:res.lang:0
+msgid "5.  %y, %Y         ==> 08, 2008"
+msgstr ""
+
+#. module: base
+#: model:res.partner.title,shortcut:base.res_partner_title_ltd
+msgid "ltd"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_crm_claim
+msgid ""
+"\n"
+"\n"
+"Manage Customer Claims.\n"
+"=======================\n"
+"This application allows you to track your customers/suppliers claims and "
+"grievances.\n"
+"\n"
+"It is fully integrated with the email gateway so that you can create\n"
+"automatically new claims based on incoming emails.\n"
+"    "
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_account_test
+msgid "Accounting Consistency Tests"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_purchase_double_validation
+msgid ""
+"\n"
+"Double-validation for purchases exceeding minimum amount.\n"
+"=========================================================\n"
+"\n"
+"This module modifies the purchase workflow in order to validate purchases "
+"that\n"
+"exceeds minimum amount set by configuration wizard.\n"
+"    "
+msgstr ""
+
+#. module: base
+#: model:ir.module.category,name:base.module_category_administration
+msgid "Administration"
+msgstr ""
+
+#. module: base
+#: view:base.module.update:0
+msgid "Click on Update below to start the process..."
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.ir
+msgid "Iran"
+msgstr ""
+
+#. module: base
+#: selection:base.language.install,lang:0
+msgid "Slovak / Slovenský jazyk"
+msgstr ""
+
+#. module: base
+#: field:base.language.export,state:0
+#: field:ir.ui.menu,icon_pict:0
+#: field:res.partner,has_image:0
+#: field:res.users,user_email:0
+msgid "unknown"
+msgstr ""
+
+#. module: base
+#: field:res.currency,symbol:0
+msgid "Symbol"
+msgstr ""
+
+#. module: base
+#: help:res.partner,image_medium:0
+msgid ""
+"Medium-sized image of this contact. It is automatically resized as a "
+"128x128px image, with aspect ratio preserved. Use this field in form views "
+"or some kanban views."
+msgstr ""
+
+#. module: base
+#: view:base.update.translations:0
+msgid "Synchronize Translation"
+msgstr ""
+
+#. module: base
+#: view:res.partner.bank:0
+#: field:res.partner.bank,bank_name:0
+msgid "Bank Name"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.ki
+msgid "Kiribati"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.iq
+msgid "Iraq"
+msgstr ""
+
+#. module: base
+#: model:ir.module.category,name:base.module_category_association
+#: model:ir.ui.menu,name:base.menu_association
+#: model:ir.ui.menu,name:base.menu_report_association
+msgid "Association"
+msgstr ""
+
+#. module: base
+#: view:ir.actions.server:0
+msgid "Action to Launch"
+msgstr ""
+
+#. module: base
+#: field:ir.model,modules:0
+#: field:ir.model.fields,modules:0
+msgid "In Modules"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_contacts
+#: model:ir.ui.menu,name:base.menu_config_address_book
+msgid "Address Book"
+msgstr ""
+
+#. module: base
+#: model:ir.model,name:base.model_ir_sequence_type
+msgid "ir.sequence.type"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_l10n_be_hr_payroll_account
+msgid "Belgium - Payroll with Accounting"
+msgstr ""
+
+#. module: base
+#: selection:base.language.export,format:0
+msgid "CSV File"
+msgstr ""
+
+#. module: base
+#: field:res.company,account_no:0
+msgid "Account No."
+msgstr ""
+
+#. module: base
+#: code:addons/base/res/res_lang.py:185
+#, python-format
+msgid "Base Language 'en_US' can not be deleted !"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_l10n_uk
+msgid ""
+"\n"
+"This is the latest UK OpenERP localisation necessary to run OpenERP "
+"accounting for UK SME's with:\n"
+"============================================================================="
+"====================\n"
+"    - a CT600-ready chart of accounts\n"
+"    - VAT100-ready tax structure\n"
+"    - InfoLogic UK counties listing\n"
+"    - a few other adaptations"
+msgstr ""
+
+#. module: base
+#: selection:ir.model,state:0
+msgid "Base Object"
+msgstr ""
+
+#. module: base
+#: field:ir.cron,priority:0
+#: field:ir.mail_server,sequence:0
+#: field:res.request,priority:0
+#: field:res.request.link,priority:0
+msgid "Priority"
+msgstr ""
+
+#. module: base
+#: report:ir.module.reference:0
+msgid "Dependencies :"
+msgstr ""
+
+#. module: base
+#: field:res.company,vat:0
+msgid "Tax ID"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_account_bank_statement_extensions
+msgid "Bank Statement Extensions to Support e-banking"
+msgstr ""
+
+#. module: base
+#: field:ir.model.fields,field_description:0
+msgid "Field Label"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.dj
+msgid "Djibouti"
+msgstr ""
+
+#. module: base
+#: field:ir.translation,value:0
+msgid "Translation Value"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.ag
+msgid "Antigua and Barbuda"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.zr
+msgid "Zaire"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,summary:base.module_project
+msgid "Projects, Tasks"
+msgstr ""
+
+#. module: base
+#: field:ir.attachment,res_id:0
+#: field:workflow.instance,res_id:0
+#: field:workflow.triggers,res_id:0
+msgid "Resource ID"
+msgstr ""
+
+#. module: base
+#: view:ir.cron:0
+#: field:ir.model,info:0
+msgid "Information"
+msgstr ""
+
+#. module: base
+#: code:addons/base/ir/ir_fields.py:146
+#, python-format
+msgid "false"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_account_analytic_analysis
+msgid ""
+"\n"
+"This module is for modifying account analytic view to show important data to "
+"project manager of services companies.\n"
+"============================================================================="
+"======================================\n"
+"\n"
+"Adds menu to show relevant information to each manager.You can also view the "
+"report of account analytic summary user-wise as well as month-wise.\n"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_hr_payroll_account
+msgid ""
+"\n"
+"Generic Payroll system Integrated with Accounting.\n"
+"==================================================\n"
+"\n"
+"    * Expense Encoding\n"
+"    * Payment Encoding\n"
+"    * Company Contribution Management\n"
+"    "
+msgstr ""
+
+#. module: base
+#: field:res.partner.category,parent_right:0
+msgid "Right parent"
+msgstr ""
+
+#. module: base
+#: view:base.module.update:0
+msgid "Update Module List"
+msgstr ""
+
+#. module: base
+#: code:addons/base/res/res_users.py:685
+#: code:addons/base/res/res_users.py:825
+#: selection:res.partner,type:0
+#: view:res.users:0
+#, python-format
+msgid "Other"
+msgstr ""
+
+#. module: base
+#: selection:base.language.install,lang:0
+msgid "Turkish / Türkçe"
+msgstr ""
+
+#. module: base
+#: model:ir.actions.act_window,name:base.action_workflow_activity_form
+#: model:ir.ui.menu,name:base.menu_workflow_activity
+#: field:workflow,activities:0
+msgid "Activities"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_product
+msgid "Products & Pricelists"
+msgstr ""
+
+#. module: base
+#: help:ir.filters,user_id:0
+msgid ""
+"The user this filter is private to. When left empty the filter is public and "
+"available to all users."
+msgstr ""
+
+#. module: base
+#: field:ir.actions.act_window,auto_refresh:0
+msgid "Auto-Refresh"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_product_expiry
+msgid ""
+"\n"
+"Track different dates on products and production lots.\n"
+"======================================================\n"
+"\n"
+"Following dates can be tracked:\n"
+"-------------------------------\n"
+"    - end of life\n"
+"    - best before date\n"
+"    - removal date\n"
+"    - alert date\n"
+"\n"
+"Used, for example, in food industries."
+msgstr ""
+
+#. module: base
+#: help:ir.translation,state:0
+msgid ""
+"Automatically set to let administators find new terms that might need to be "
+"translated"
+msgstr ""
+
+#. module: base
+#: code:addons/base/ir/ir_model.py:85
+#, python-format
+msgid "The osv_memory field can only be compared with = and != operator."
+msgstr ""
+
+#. module: base
+#: view:res.partner:0
+msgid "Fax:"
+msgstr ""
+
+#. module: base
+#: selection:ir.ui.view,type:0
+msgid "Diagram"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_l10n_es
+msgid "Spanish - Accounting (PGCE 2008)"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_stock_no_autopicking
+msgid "Picking Before Manufacturing"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,summary:base.module_note_pad
+msgid "Sticky memos, Collaborative"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.wf
+msgid "Wallis and Futuna Islands"
+msgstr ""
+
+#. module: base
+#: help:multi_company.default,name:0
+msgid "Name it to easily find a record"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_hr
+msgid ""
+"\n"
+"Human Resources Management\n"
+"==========================\n"
+"\n"
+"This application enables you to manage important aspects of your company's "
+"staff and other details such as their skills, contacts, working time...\n"
+"\n"
+"\n"
+"You can manage:\n"
+"---------------\n"
+"* Employees and hierarchies : You can define your employee with User and "
+"display hierarchies\n"
+"* HR Departments\n"
+"* HR Jobs\n"
+"    "
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_hr_contract
+msgid ""
+"\n"
+"Add all information on the employee form to manage contracts.\n"
+"=============================================================\n"
+"\n"
+"    * Contract\n"
+"    * Place of Birth,\n"
+"    * Medical Examination Date\n"
+"    * Company Vehicle\n"
+"\n"
+"You can assign several contracts per employee.\n"
+"    "
+msgstr ""
+
+#. module: base
+#: view:ir.model.data:0
+#: field:ir.model.data,name:0
+msgid "External Identifier"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_audittrail
+msgid ""
+"\n"
+"This module lets administrator track every user operation on all the objects "
+"of the system.\n"
+"============================================================================="
+"==============\n"
+"\n"
+"The administrator can subscribe to rules for read, write and delete on "
+"objects \n"
+"and can check logs.\n"
+"    "
+msgstr ""
+
+#. module: base
+#: model:ir.actions.act_window,name:base.grant_menu_access
+#: model:ir.ui.menu,name:base.menu_grant_menu_access
+msgid "Menu Items"
+msgstr ""
+
+#. module: base
+#: model:res.groups,comment:base.group_sale_salesman_all_leads
+msgid ""
+"the user will have access to all records of everyone in the sales "
+"application."
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_event
+msgid "Events Organisation"
+msgstr ""
+
+#. module: base
+#: model:ir.actions.act_window,name:base.ir_sequence_actions
+#: model:ir.ui.menu,name:base.menu_ir_sequence_actions
+#: model:ir.ui.menu,name:base.next_id_6
+#: view:workflow.activity:0
+msgid "Actions"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_delivery
+msgid "Delivery Costs"
+msgstr ""
+
+#. module: base
+#: code:addons/base/ir/ir_cron.py:255
+#, python-format
+msgid ""
+"This cron task is currently being executed and may not be modified, please "
+"try again in a few minutes"
+msgstr ""
+
+#. module: base
+#: view:base.language.export:0
+#: field:ir.exports.line,export_id:0
+msgid "Export"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_l10n_ma
+msgid "Maroc - Accounting"
+msgstr ""
+
+#. module: base
+#: field:res.bank,bic:0
+#: field:res.partner.bank,bank_bic:0
+msgid "Bank Identifier Code"
+msgstr ""
+
+#. module: base
+#: view:base.language.export:0
+msgid ""
+"CSV format: you may edit it directly with your favorite spreadsheet "
+"software,\n"
+"                                the rightmost column (value) contains the "
+"translations"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_account_chart
+msgid ""
+"\n"
+"Remove minimal account chart.\n"
+"=============================\n"
+"\n"
+"Deactivates minimal chart of accounts.\n"
+msgstr ""
+
+#. module: base
+#: view:ir.rule:0
+msgid "Record rules"
+msgstr ""
+
+#. module: base
+#: help:workflow.transition,act_to:0
+msgid "The destination activity."
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_project_issue
+msgid "Issue Tracker"
+msgstr ""
+
+#. module: base
+#: view:base.module.update:0
+#: view:base.module.upgrade:0
+#: view:base.update.translations:0
+msgid "Update"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_plugin
+msgid ""
+"\n"
+"The common interface for plug-in.\n"
+"=================================\n"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_sale_crm
+msgid ""
+"\n"
+"This module adds a shortcut on one or several opportunity cases in the CRM.\n"
+"===========================================================================\n"
+"\n"
+"This shortcut allows you to generate a sales order based on the selected "
+"case.\n"
+"If different cases are open (a list), it generates one sale order by case.\n"
+"The case is then closed and linked to the generated sales order.\n"
+"\n"
+"We suggest you to install this module, if you installed both the sale and "
+"the crm\n"
+"modules.\n"
+"    "
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.bq
+msgid "Bonaire, Sint Eustatius and Saba"
+msgstr ""
+
+#. module: base
+#: model:ir.actions.report.xml,name:base.ir_module_reference_print
+msgid "Technical guide"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.tz
+msgid "Tanzania"
+msgstr ""
+
+#. module: base
+#: selection:base.language.install,lang:0
+msgid "Danish / Dansk"
+msgstr ""
+
+#. module: base
+#: selection:ir.model.fields,select_level:0
+msgid "Advanced Search (deprecated)"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.cx
+msgid "Christmas Island"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_contacts
+msgid ""
+"\n"
+"This module gives you a quick view of your address book, accessible from "
+"your home page.\n"
+"You can track your suppliers, customers and other contacts.\n"
+msgstr ""
+
+#. module: base
+#: help:res.company,custom_footer:0
+msgid ""
+"Check this to define the report footer manually.  Otherwise it will be "
+"filled in automatically."
+msgstr ""
+
+#. module: base
+#: view:res.partner:0
+msgid "Supplier Partners"
+msgstr ""
+
+#. module: base
+#: view:res.config.installer:0
+msgid "Install Modules"
+msgstr ""
+
+#. module: base
+#: model:ir.ui.menu,name:base.menu_import_crm
+msgid "Import & Synchronize"
+msgstr ""
+
+#. module: base
+#: view:res.partner:0
+msgid "Customer Partners"
+msgstr ""
+
+#. module: base
+#: sql_constraint:res.users:0
+msgid "You can not have two users with the same login !"
+msgstr ""
+
+#. module: base
+#: model:ir.model,name:base.model_res_request_history
+msgid "res.request.history"
+msgstr ""
+
+#. module: base
+#: model:ir.model,name:base.model_multi_company_default
+msgid "Default multi company"
+msgstr ""
+
+#. module: base
+#: field:ir.translation,src:0
+msgid "Source"
+msgstr ""
+
+#. module: base
+#: field:ir.model.constraint,date_init:0
+#: field:ir.model.relation,date_init:0
+msgid "Initialization Date"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.vu
+msgid "Vanuatu"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_product_visible_discount
+msgid ""
+"\n"
+"This module lets you calculate discounts on Sale Order lines and Invoice "
+"lines base on the partner's pricelist.\n"
+"============================================================================="
+"==================================\n"
+"\n"
+"To this end, a new check box named 'Visible Discount' is added to the "
+"pricelist form.\n"
+"\n"
+"**Example:**\n"
+"    For the product PC1 and the partner \"Asustek\": if listprice=450, and "
+"the price\n"
+"    calculated using Asustek's pricelist is 225. If the check box is "
+"checked, we\n"
+"    will have on the sale order line: Unit price=450, Discount=50,00, Net "
+"price=225.\n"
+"    If the check box is unchecked, we will have on Sale Order and Invoice "
+"lines:\n"
+"    Unit price=225, Discount=0,00, Net price=225.\n"
+"    "
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_crm
+msgid "CRM"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_base_report_designer
+msgid ""
+"\n"
+"This module is used along with OpenERP OpenOffice Plugin.\n"
+"=========================================================\n"
+"\n"
+"This module adds wizards to Import/Export .sxw report that you can modify in "
+"OpenOffice. \n"
+"Once you have modified it you can upload the report using the same wizard.\n"
+msgstr ""
+
+#. module: base
+#: view:base.module.upgrade:0
+msgid "Start configuration"
+msgstr ""
+
+#. module: base
+#: selection:base.language.install,lang:0
+msgid "Catalan / Català"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.do
+msgid "Dominican Republic"
+msgstr ""
+
+#. module: base
+#: selection:base.language.install,lang:0
+msgid "Serbian (Cyrillic) / српски"
+msgstr ""
+
+#. module: base
+#: code:addons/orm.py:2650
+#, python-format
+msgid ""
+"Invalid group_by specification: \"%s\".\n"
+"A group_by specification must be a list of valid fields."
+msgstr ""
+
+#. module: base
+#: selection:ir.mail_server,smtp_encryption:0
+msgid "TLS (STARTTLS)"
+msgstr ""
+
+#. module: base
+#: help:ir.actions.act_window,usage:0
+msgid "Used to filter menu and home actions from the user form."
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.sa
+msgid "Saudi Arabia"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_sale_mrp
+msgid ""
+"\n"
+"This module provides facility to the user to install mrp and sales modulesat "
+"a time.\n"
+"============================================================================="
+"=======\n"
+"\n"
+"It is basically used when we want to keep track of production orders "
+"generated\n"
+"from sales order. It adds sales name and sales Reference on production "
+"order.\n"
+"    "
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_portal_stock
+msgid ""
+"\n"
+"This module adds access rules to your portal if stock and portal are "
+"installed.\n"
+"============================================================================="
+"=============\n"
+"    "
+msgstr ""
+
+#. module: base
+#: field:ir.actions.server,trigger_obj_id:0
+#: field:ir.model.fields,relation_field:0
+msgid "Relation Field"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_portal_project
+msgid ""
+"\n"
+"This module adds project menu and features (tasks) to your portal if project "
+"and portal are installed.\n"
+"============================================================================="
+"=========================\n"
+"    "
+msgstr ""
+
+#. module: base
+#: code:addons/base/module/wizard/base_module_configuration.py:38
+#, python-format
+msgid "System Configuration done"
+msgstr ""
+
+#. module: base
+#: field:ir.attachment,db_datas:0
+msgid "Database Data"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.tc
+msgid "Turks and Caicos Islands"
+msgstr ""
+
+#. module: base
+#: field:workflow.triggers,instance_id:0
+msgid "Destination Instance"
+msgstr ""
+
+#. module: base
+#: field:ir.actions.act_window,multi:0
+#: field:ir.actions.wizard,multi:0
+msgid "Action on Multiple Doc."
+msgstr ""
+
+#. module: base
+#: model:ir.actions.act_window,name:base.action_partner_title_partner
+#: model:ir.ui.menu,name:base.menu_partner_title_partner
+msgid "Titles"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_anonymization
+msgid ""
+"\n"
+"This module allows you to anonymize a database.\n"
+"===============================================\n"
+"\n"
+"This module allows you to keep your data confidential for a given database.\n"
+"This process is useful, if you want to use the migration process and "
+"protect\n"
+"your own or your customer’s confidential data. The principle is that you "
+"run\n"
+"an anonymization tool which will hide your confidential data(they are "
+"replaced\n"
+"by ‘XXX’ characters). Then you can send the anonymized database to the "
+"migration\n"
+"team. Once you get back your migrated database, you restore it and reverse "
+"the\n"
+"anonymization process to recover your previous data.\n"
+"    "
+msgstr ""
+
+#. module: base
+#: help:ir.sequence,implementation:0
+msgid ""
+"Two sequence object implementations are offered: Standard and 'No gap'. The "
+"later is slower than the former but forbids any gap in the sequence (while "
+"they are possible in the former)."
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.gn
+msgid "Guinea"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_web_diagram
+msgid "OpenERP Web Diagram"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.lu
+msgid "Luxembourg"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,summary:base.module_base_calendar
+msgid "Personal & Shared Calendar"
+msgstr ""
+
+#. module: base
+#: selection:res.request,priority:0
+msgid "Low"
+msgstr ""
+
+#. module: base
+#: code:addons/base/ir/ir_ui_menu.py:354
+#, python-format
+msgid "Error ! You can not create recursive Menu."
+msgstr ""
+
+#. module: base
+#: view:ir.translation:0
+msgid "Web-only translations"
+msgstr ""
+
+#. module: base
+#: view:ir.rule:0
+msgid ""
+"3. If user belongs to several groups, the results from step 2 are combined "
+"with logical OR operator"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_l10n_be
+msgid ""
+"\n"
+"This is the base module to manage the accounting chart for Belgium in "
+"OpenERP.\n"
+"============================================================================="
+"=\n"
+"\n"
+"After installing this module, the Configuration wizard for accounting is "
+"launched.\n"
+"    * We have the account templates which can be helpful to generate Charts "
+"of Accounts.\n"
+"    * On that particular wizard, you will be asked to pass the name of the "
+"company,\n"
+"      the chart template to follow, the no. of digits to generate, the code "
+"for your\n"
+"      account and bank account, currency to create journals.\n"
+"\n"
+"Thus, the pure copy of Chart Template is generated.\n"
+"\n"
+"Wizards provided by this module:\n"
+"--------------------------------\n"
+"    * Partner VAT Intra: Enlist the partners with their related VAT and "
+"invoiced\n"
+"      amounts. Prepares an XML file format.\n"
+"      \n"
+"        **Path to access :** Invoicing/Reporting/Legal Reports/Belgium "
+"Statements/Partner VAT Intra\n"
+"    * Periodical VAT Declaration: Prepares an XML file for Vat Declaration "
+"of\n"
+"      the Main company of the User currently Logged in.\n"
+"      \n"
+"        **Path to access :** Invoicing/Reporting/Legal Reports/Belgium "
+"Statements/Periodical VAT Declaration\n"
+"    * Annual Listing Of VAT-Subjected Customers: Prepares an XML file for "
+"Vat\n"
+"      Declaration of the Main company of the User currently Logged in Based "
+"on\n"
+"      Fiscal year.\n"
+"      \n"
+"        **Path to access :** Invoicing/Reporting/Legal Reports/Belgium "
+"Statements/Annual Listing Of VAT-Subjected Customers\n"
+"\n"
+"    "
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_base_gengo
+msgid "Automated Translations through Gengo API"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_account_payment
+msgid "Suppliers Payment Management"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.sv
+msgid "El Salvador"
+msgstr ""
+
+#. module: base
+#: code:addons/base/res/res_company.py:161
+#: field:res.bank,phone:0
+#: field:res.company,phone:0
+#: field:res.partner,phone:0
+#, python-format
+msgid "Phone"
+msgstr ""
+
+#. module: base
+#: field:res.groups,menu_access:0
+msgid "Access Menu"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.th
+msgid "Thailand"
+msgstr ""
+
+#. module: base
+#: model:ir.model,name:base.model_change_password_wizard
+msgid "Change Password Wizard"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,summary:base.module_account_voucher
+msgid "Send Invoices and Track Payments"
+msgstr ""
+
+#. module: base
+#: model:ir.ui.menu,name:base.menu_crm_config_lead
+msgid "Leads & Opportunities"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.gg
+msgid "Guernsey"
+msgstr ""
+
+#. module: base
+#: selection:base.language.install,lang:0
+msgid "Romanian / română"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_l10n_mx
+msgid ""
+"\n"
+"Minimal accounting configuration for Mexico.\n"
+"============================================\n"
+"\n"
+"This Chart of account is a minimal proposal to be able to use OoB the \n"
+"accounting feature of Openerp.\n"
+"\n"
+"This doesn't pretend be all the localization for MX it is just the minimal \n"
+"data required to start from 0 in mexican localization.\n"
+"\n"
+"This modules and its content is updated frequently by openerp-mexico team.\n"
+"\n"
+"With this module you will have:\n"
+"\n"
+" - Minimal chart of account tested in production eviroments.\n"
+" - Minimal chart of taxes, to comply with SAT_ requirements.\n"
+"\n"
+".. SAT: http://www.sat.gob.mx/\n"
+"    "
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_l10n_tr
+msgid ""
+"\n"
+"Türkiye için Tek düzen hesap planı şablonu OpenERP Modülü.\n"
+"==========================================================\n"
+"\n"
+"Bu modül kurulduktan sonra, Muhasebe yapılandırma sihirbazı çalışır\n"
+"    * Sihirbaz sizden hesap planı şablonu, planın kurulacağı şirket, banka "
+"hesap\n"
+"      bilgileriniz, ilgili para birimi gibi bilgiler isteyecek.\n"
+"    "
+msgstr ""
+
+#. module: base
+#: selection:workflow.activity,join_mode:0
+#: selection:workflow.activity,split_mode:0
+msgid "And"
+msgstr ""
+
+#. module: base
+#: help:ir.values,res_id:0
+msgid ""
+"Database identifier of the record to which this applies. 0 = for all records"
+msgstr ""
+
+#. module: base
+#: field:ir.model.fields,relation:0
+msgid "Object Relation"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_account_voucher
+msgid "eInvoicing & Payments"
+msgstr ""
+
+#. module: base
+#: view:ir.rule:0
+msgid "General"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.uz
+msgid "Uzbekistan"
+msgstr ""
+
+#. module: base
+#: model:ir.model,name:base.model_ir_actions_act_window
+#: selection:ir.ui.menu,action:0
+msgid "ir.actions.act_window"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.vi
+msgid "Virgin Islands (USA)"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.tw
+msgid "Taiwan"
+msgstr ""
+
+#. module: base
+#: model:ir.model,name:base.model_res_currency_rate
+msgid "Currency Rate"
+msgstr ""
+
+#. module: base
+#: view:base.module.upgrade:0
+#: field:base.module.upgrade,module_info:0
+msgid "Modules to Update"
+msgstr ""
+
+#. module: base
+#: model:ir.ui.menu,name:base.menu_custom_multicompany
+msgid "Multi-Companies"
+msgstr ""
+
+#. module: base
+#: field:workflow,osv:0
+#: view:workflow.instance:0
+#: field:workflow.instance,res_type:0
+msgid "Resource Object"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_crm_helpdesk
+msgid "Helpdesk"
+msgstr ""
+
+#. module: base
+#: field:ir.rule,perm_write:0
+msgid "Apply for Write"
+msgstr ""
+
+#. module: base
+#: field:ir.ui.menu,parent_left:0
+msgid "Parent Left"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_document_page
+msgid ""
+"\n"
+"Pages\n"
+"=====\n"
+"Web pages\n"
+"    "
+msgstr ""
+
+#. module: base
+#: help:ir.actions.server,code:0
+msgid ""
+"Python code to be executed if condition is met.\n"
+"It is a Python block that can use the same values as for the condition field"
+msgstr ""
+
+#. module: base
+#: model:ir.actions.act_window,help:base.grant_menu_access
+msgid ""
+"Manage and customize the items available and displayed in your OpenERP "
+"system menu. You can delete an item by clicking on the box at the beginning "
+"of each line and then delete it through the button that appeared. Items can "
+"be assigned to specific groups in order to make them accessible to some "
+"users within the system."
+msgstr ""
+
+#. module: base
+#: field:ir.ui.view,field_parent:0
+msgid "Child Field"
+msgstr ""
+
+#. module: base
+#: view:ir.rule:0
+msgid "Detailed algorithm:"
+msgstr ""
+
+#. module: base
+#: field:ir.actions.act_url,usage:0
+#: field:ir.actions.act_window,usage:0
+#: field:ir.actions.act_window_close,usage:0
+#: field:ir.actions.actions,usage:0
+#: field:ir.actions.client,usage:0
+#: field:ir.actions.report.xml,usage:0
+#: field:ir.actions.server,usage:0
+#: field:ir.actions.wizard,usage:0
+msgid "Action Usage"
+msgstr ""
+
+#. module: base
+#: field:ir.module.module,name:0
+msgid "Technical Name"
+msgstr ""
+
+#. module: base
+#: model:ir.model,name:base.model_workflow_workitem
+msgid "workflow.workitem"
+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 ""
+
+#. module: base
+#: selection:ir.module.module,state:0
+msgid "Not Installable"
+msgstr ""
+
+#. module: base
+#: help:res.lang,iso_code:0
+msgid "This ISO code is the name of po files to use for translations"
+msgstr ""
+
+#. module: base
+#: report:ir.module.reference:0
+msgid "View :"
+msgstr ""
+
+#. module: base
+#: field:ir.model.fields,view_load:0
+msgid "View Auto-Load"
+msgstr ""
+
+#. module: base
+#: view:res.country:0
+msgid "Address format..."
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_l10n_et
+msgid ""
+"\n"
+"Base Module for Ethiopian Localization\n"
+"======================================\n"
+"\n"
+"This is the latest Ethiopian OpenERP localization and consists of:\n"
+"    - Chart of Accounts\n"
+"    - VAT tax structure\n"
+"    - Withholding tax structure\n"
+"    - Regional State listings\n"
+"    "
+msgstr ""
+
+#. module: base
+#: view:res.users:0
+msgid "Allowed Companies"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_l10n_de
+msgid "Deutschland - Accounting"
+msgstr ""
+
+#. module: base
+#: view:ir.sequence:0
+msgid "Day of the Year: %(doy)s"
+msgstr ""
+
+#. module: base
+#: field:ir.ui.menu,web_icon:0
+msgid "Web Icon File"
+msgstr ""
+
+#. module: base
+#: model:ir.ui.menu,name:base.menu_view_base_module_upgrade
+msgid "Apply Scheduled Upgrades"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_sale_journal
+msgid "Invoicing Journals"
+msgstr ""
+
+#. module: base
+#: help:ir.ui.view,groups_id:0
+msgid ""
+"If this field is empty, the view applies to all users. Otherwise, the view "
+"applies to the users of those groups only."
+msgstr ""
+
+#. module: base
+#: selection:base.language.install,lang:0
+msgid "Persian / فارس"
+msgstr ""
+
+#. module: base
+#: view:base.language.export:0
+msgid "Export Settings"
+msgstr ""
+
+#. module: base
+#: field:ir.actions.act_window,src_model:0
+msgid "Source Model"
+msgstr ""
+
+#. module: base
+#: view:ir.sequence:0
+msgid "Day of the Week (0:Monday): %(weekday)s"
+msgstr ""
+
+#. module: base
+#: code:addons/base/module/wizard/base_module_upgrade.py:84
+#, python-format
+msgid "Unmet dependency !"
+msgstr ""
+
+#. module: base
+#: code:addons/base/ir/ir_model.py:510
+#: code:addons/base/ir/ir_model.py:571
+#: code:addons/base/ir/ir_model.py:1032
+#, python-format
+msgid "Administrator access is required to uninstall a module"
+msgstr ""
+
+#. module: base
+#: model:ir.model,name:base.model_base_module_configuration
+msgid "base.module.configuration"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_point_of_sale
+msgid ""
+"\n"
+"Quick and Easy sale process\n"
+"===========================\n"
+"\n"
+"This module allows you to manage your shop sales very easily with a fully "
+"web based touchscreen interface.\n"
+"It is compatible with all PC tablets and the iPad, offering multiple payment "
+"methods. \n"
+"\n"
+"Product selection can be done in several ways: \n"
+"\n"
+"* Using a barcode reader\n"
+"* Browsing through categories of products or via a text search.\n"
+"\n"
+"Main Features\n"
+"-------------\n"
+"* Fast encoding of the sale\n"
+"* Choose one payment method (the quick way) or split the payment between "
+"several payment methods\n"
+"* Computation of the amount of money to return\n"
+"* Create and confirm the picking list automatically\n"
+"* Allows the user to create an invoice automatically\n"
+"* Refund previous sales\n"
+"    "
+msgstr ""
+
+#. module: base
+#: code:addons/orm.py:3568
+#: code:addons/orm.py:3861
+#, python-format
+msgid ""
+"The requested operation cannot be completed due to security restrictions. "
+"Please contact your system administrator.\n"
+"\n"
+"(Document type: %s, Operation: %s)"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_idea
+msgid ""
+"\n"
+"This module allows user to easily and efficiently participate in enterprise "
+"innovation.\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."
+msgstr ""
+
+#. module: base
+#: code:addons/orm.py:5322
+#: code:addons/orm.py:5337
+#, python-format
+msgid ""
+"%s This might be '%s' in the current model, or a field of the same name in "
+"an o2m."
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_account_payment
+msgid ""
+"\n"
+"Module to manage the payment of your supplier invoices.\n"
+"=======================================================\n"
+"\n"
+"This module allows you to create and manage your payment orders, with "
+"purposes to\n"
+"-----------------------------------------------------------------------------"
+"---- \n"
+"    * serve as base for an easy plug-in of various automated payment "
+"mechanisms.\n"
+"    * provide a more efficient way to manage invoice payment.\n"
+"\n"
+"Warning:\n"
+"~~~~~~~~\n"
+"The confirmation of a payment order does _not_ create accounting entries, it "
+"just \n"
+"records the fact that you gave your payment order to your bank. The booking "
+"of \n"
+"your order must be encoded as usual through a bank statement. Indeed, it's "
+"only \n"
+"when you get the confirmation from your bank that your order has been "
+"accepted \n"
+"that you can book it in your accounting. To help you with that operation, "
+"you \n"
+"have a new option to import payment orders as bank statement lines.\n"
+"    "
+msgstr ""
+
+#. module: base
+#: field:ir.model,access_ids:0
+#: view:ir.model.access:0
+msgid "Access"
+msgstr ""
+
+#. module: base
+#: code:addons/base/res/res_company.py:165
+#: field:res.partner,vat:0
+#, python-format
+msgid "TIN"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.aw
+msgid "Aruba"
+msgstr ""
+
+#. module: base
+#: code:addons/base/module/wizard/base_module_import.py:58
+#, python-format
+msgid "File is not a zip file!"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.ar
+msgid "Argentina"
+msgstr ""
+
+#. module: base
+#: field:res.groups,full_name:0
+msgid "Group Name"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.bh
+msgid "Bahrain"
+msgstr ""
+
+#. module: base
+#: code:addons/base/res/res_company.py:162
+#: field:res.bank,fax:0
+#: field:res.company,fax:0
+#: field:res.partner,fax:0
+#, python-format
+msgid "Fax"
+msgstr ""
+
+#. module: base
+#: view:ir.attachment:0
+#: field:ir.attachment,company_id:0
+#: field:ir.default,company_id:0
+#: field:ir.property,company_id:0
+#: field:ir.sequence,company_id:0
+#: field:ir.values,company_id:0
+#: view:res.company:0
+#: field:res.currency,company_id:0
+#: view:res.partner:0
+#: field:res.partner,company_id:0
+#: field:res.partner.bank,company_id:0
+#: view:res.users:0
+#: field:res.users,company_id:0
+msgid "Company"
+msgstr ""
+
+#. module: base
+#: model:ir.module.category,name:base.module_category_report_designer
+msgid "Advanced Reporting"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,summary:base.module_purchase
+msgid "Purchase Orders, Receptions, Supplier Invoices"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_hr_payroll
+msgid ""
+"\n"
+"Generic Payroll system.\n"
+"=======================\n"
+"\n"
+"    * Employee Details\n"
+"    * Employee Contracts\n"
+"    * Passport based Contract\n"
+"    * Allowances/Deductions\n"
+"    * Allow to configure Basic/Gross/Net Salary\n"
+"    * Employee Payslip\n"
+"    * Monthly Payroll Register\n"
+"    * Integrated with Holiday Management\n"
+"    "
+msgstr ""
+
+#. module: base
+#: model:ir.model,name:base.model_ir_model_data
+msgid "ir.model.data"
+msgstr ""
+
+#. module: base
+#: selection:base.language.install,lang:0
+msgid "Bulgarian / български език"
+msgstr ""
+
+#. module: base
+#: model:ir.ui.menu,name:base.menu_aftersale
+msgid "After-Sale Services"
+msgstr ""
+
+#. module: base
+#: field:base.language.import,code:0
+msgid "ISO Code"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_l10n_fr
+msgid "France - Accounting"
+msgstr ""
+
+#. module: base
+#: view:ir.actions.todo:0
+msgid "Launch"
+msgstr ""
+
+#. module: base
+#: selection:res.partner,type:0
+msgid "Shipping"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_project_mrp
+msgid ""
+"\n"
+"Automatically creates project tasks from procurement lines.\n"
+"===========================================================\n"
+"\n"
+"This module will automatically create a new task for each procurement order "
+"line\n"
+"(e.g. for sale order lines), if the corresponding product meets the "
+"following\n"
+"characteristics:\n"
+"\n"
+"    * Product Type = Service\n"
+"    * Procurement Method (Order fulfillment) = MTO (Make to Order)\n"
+"    * Supply/Procurement Method = Manufacture\n"
+"\n"
+"If on top of that a projet is specified on the product form (in the "
+"Procurement\n"
+"tab), then the new task will be created in that specific project. Otherwise, "
+"the\n"
+"new task will not belong to any project, and may be added to a project "
+"manually\n"
+"later.\n"
+"\n"
+"When the project task is completed or cancelled, the workflow of the "
+"corresponding\n"
+"procurement line is updated accordingly. For example, if this procurement "
+"corresponds\n"
+"to a sale order line, the sale order line will be considered delivered when "
+"the\n"
+"task is completed.\n"
+msgstr ""
+
+#. module: base
+#: field:ir.actions.act_window,limit:0
+msgid "Limit"
+msgstr ""
+
+#. module: base
+#: model:res.groups,name:base.group_hr_user
+msgid "Officer"
+msgstr ""
+
+#. module: base
+#: code:addons/orm.py:787
+#, python-format
+msgid "Serialization field `%s` not found for sparse field `%s`!"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.jm
+msgid "Jamaica"
+msgstr ""
+
+#. module: base
+#: field:res.partner,color:0
+msgid "Color Index"
+msgstr ""
+
+#. module: base
+#: model:ir.actions.act_window,help:base.action_partner_category_form
+msgid ""
+"Manage the partner categories in order to better classify them for tracking "
+"and analysis purposes. A partner may belong to several categories and "
+"categories have a hierarchy structure: a partner belonging to a category "
+"also belong to his parent category."
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_survey
+msgid ""
+"\n"
+"This module is used for surveying.\n"
+"==================================\n"
+"\n"
+"It depends on the answers or reviews of some questions by different users. "
+"A\n"
+"survey may have multiple pages. Each page may contain multiple questions and "
+"each\n"
+"question may have multiple answers. Different users may give different "
+"answers of\n"
+"question and according to that survey is done. Partners are also sent mails "
+"with\n"
+"user name and password for the invitation of the survey.\n"
+"    "
+msgstr ""
+
+#. module: base
+#: code:addons/base/ir/ir_model.py:165
+#, python-format
+msgid "Model '%s' contains module data and cannot be removed!"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.az
+msgid "Azerbaijan"
+msgstr ""
+
+#. module: base
+#: code:addons/base/ir/ir_mail_server.py:480
+#: code:addons/base/res/res_partner.py:439
+#, python-format
+msgid "Warning"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_edi
+msgid "Electronic Data Interchange (EDI)"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_account_anglo_saxon
+msgid "Anglo-Saxon Accounting"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.vg
+msgid "Virgin Islands (British)"
+msgstr ""
+
+#. module: base
+#: view:ir.property:0
+#: model:ir.ui.menu,name:base.menu_ir_property
+msgid "Parameters"
+msgstr ""
+
+#. module: base
+#: view:res.partner:0
+msgid "e.g. Sales Director"
+msgstr ""
+
+#. module: base
+#: selection:base.language.install,lang:0
+msgid "Czech / Čeština"
+msgstr ""
+
+#. module: base
+#: model:ir.module.category,name:base.module_category_generic_modules
+msgid "Generic Modules"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.mk
+msgid "Macedonia, the former Yugoslav Republic of"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.rw
+msgid "Rwanda"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_auth_openid
+msgid ""
+"\n"
+"Allow users to login through OpenID.\n"
+"====================================\n"
+msgstr ""
+
+#. module: base
+#: help:ir.mail_server,smtp_port:0
+msgid "SMTP Port. Usually 465 for SSL, and 25 or 587 for other cases."
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.ck
+msgid "Cook Islands"
+msgstr ""
+
+#. module: base
+#: field:ir.model.data,noupdate:0
+msgid "Non Updatable"
+msgstr ""
+
+#. module: base
+#: selection:base.language.install,lang:0
+msgid "Klingon"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.sg
+msgid "Singapore"
+msgstr ""
+
+#. module: base
+#: selection:ir.actions.act_window,target:0
+msgid "Current Window"
+msgstr ""
+
+#. module: base
+#: model:ir.module.category,name:base.module_category_hidden
+#: view:res.users:0
+msgid "Technical Settings"
+msgstr ""
+
+#. 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 ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_plugin_thunderbird
+msgid "Thunderbird Plug-In"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,summary:base.module_event
+msgid "Trainings, Conferences, Meetings, Exhibitions, Registrations"
+msgstr ""
+
+#. module: base
+#: model:ir.model,name:base.model_res_country
+#: view:res.bank:0
+#: field:res.bank,country:0
+#: view:res.company:0
+#: field:res.company,country_id:0
+#: view:res.country:0
+#: field:res.country.state,country_id:0
+#: view:res.partner:0
+#: field:res.partner,country:0
+#: field:res.partner,country_id:0
+#: view:res.partner.bank:0
+#: field:res.partner.bank,country_id:0
+#: view:res.users:0
+msgid "Country"
+msgstr ""
+
+#. module: base
+#: model:res.partner.category,name:base.res_partner_category_15
+msgid "Wholesaler"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_base_vat
+msgid "VAT Number Validation"
+msgstr ""
+
+#. module: base
+#: field:ir.model.fields,complete_name:0
+msgid "Complete Name"
+msgstr ""
+
+#. module: base
+#: help:ir.actions.wizard,multi:0
+msgid ""
+"If set to true, the wizard will not be displayed on the right toolbar of a "
+"form view."
+msgstr ""
+
+#. module: base
+#: view:ir.values:0
+msgid "Action Bindings/Defaults"
+msgstr ""
+
+#. module: base
+#: view:base.language.export:0
+msgid ""
+"file encoding, please be sure to view and edit\n"
+"                           using the same encoding."
+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 ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_l10n_nl
+msgid "Netherlands - Accounting"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.gs
+msgid "South Georgia and the South Sandwich Islands"
+msgstr ""
+
+#. module: base
+#: view:res.lang:0
+msgid "%X - Appropriate time representation."
+msgstr ""
+
+#. module: base
+#: selection:base.language.install,lang:0
+msgid "Spanish (SV) / Español (SV)"
+msgstr ""
+
+#. module: base
+#: help:res.lang,grouping:0
+msgid ""
+"The Separator Format should be like [,n] where 0 < n :starting from Unit "
+"digit.-1 will end the separation. e.g. [3,2,-1] will represent 106500 to be "
+"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 ""
+
+#. module: base
+#: field:ir.module.module,auto_install:0
+msgid "Automatic Installation"
+msgstr ""
+
+#. module: base
+#: view:base.language.import:0
+msgid "e.g. en_US"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_l10n_hn
+msgid ""
+"\n"
+"This is the base module to manage the accounting chart for Honduras.\n"
+"====================================================================\n"
+"    \n"
+"Agrega una nomenclatura contable para Honduras. También incluye impuestos y "
+"la\n"
+"moneda Lempira. -- Adds accounting chart for Honduras. It also includes "
+"taxes\n"
+"and the Lempira currency."
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.jp
+msgid "Japan"
+msgstr ""
+
+#. module: base
+#: code:addons/base/ir/ir_model.py:419
+#, python-format
+msgid "Can only rename one column at a time!"
+msgstr ""
+
+#. module: base
+#: selection:ir.translation,type:0
+msgid "Report/Template"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_account_budget
+msgid ""
+"\n"
+"This module allows accountants to manage analytic and crossovered budgets.\n"
+"==========================================================================\n"
+"\n"
+"Once the Budgets are defined (in Invoicing/Budgets/Budgets), the Project "
+"Managers \n"
+"can set the planned amount on each Analytic Account.\n"
+"\n"
+"The accountant has the possibility to see the total of amount planned for "
+"each\n"
+"Budget in order to ensure the total planned is not greater/lower than what "
+"he \n"
+"planned for this Budget. Each list of record can also be switched to a "
+"graphical \n"
+"view of it.\n"
+"\n"
+"Three reports are available:\n"
+"----------------------------\n"
+"    1. The first is available from a list of Budgets. It gives the "
+"spreading, for \n"
+"       these Budgets, of the Analytic Accounts.\n"
+"\n"
+"    2. The second is a summary of the previous one, it only gives the "
+"spreading, \n"
+"       for the selected Budgets, of the Analytic Accounts.\n"
+"\n"
+"    3. The last one is available from the Analytic Chart of Accounts. It "
+"gives \n"
+"       the spreading, for the selected Analytic Accounts of Budgets.\n"
+msgstr ""
+
+#. module: base
+#: selection:ir.actions.act_window.view,view_mode:0
+#: selection:ir.ui.view,type:0
+msgid "Graph"
+msgstr ""
+
+#. module: base
+#: model:ir.model,name:base.model_ir_actions_server
+#: selection:ir.ui.menu,action:0
+msgid "ir.actions.server"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_l10n_ca
+msgid "Canada - Accounting"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_l10n_co
+msgid "Colombian - Accounting"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_account_voucher
+msgid ""
+"\n"
+"Invoicing & Payments by Accounting Voucher & Receipts\n"
+"=====================================================\n"
+"The specific and easy-to-use Invoicing system in OpenERP allows you to keep "
+"track of your accounting, even when you are not an accountant. It provides "
+"an easy way to follow up on your suppliers and customers. \n"
+"\n"
+"You could use this simplified accounting in case you work with an (external) "
+"account to keep your books, and you still want to keep track of payments. \n"
+"\n"
+"The Invoicing system includes receipts and vouchers (an easy way to keep "
+"track of sales and purchases). It also offers you an easy method of "
+"registering payments, without having to encode complete abstracts of "
+"account.\n"
+"\n"
+"This module manages:\n"
+"\n"
+"* Voucher Entry\n"
+"* Voucher Receipt [Sales & Purchase]\n"
+"* Voucher Payment [Customer & Supplier]\n"
+"    "
+msgstr ""
+
+#. module: base
+#: model:ir.actions.act_window,name:base.act_ir_actions_todo_form
+#: model:ir.model,name:base.model_ir_actions_todo
+#: model:ir.ui.menu,name:base.menu_ir_actions_todo
+#: model:ir.ui.menu,name:base.menu_ir_actions_todo_form
+msgid "Configuration Wizards"
+msgstr ""
+
+#. module: base
+#: field:res.lang,code:0
+msgid "Locale Code"
+msgstr ""
+
+#. module: base
+#: field:workflow.activity,split_mode:0
+msgid "Split Mode"
+msgstr ""
+
+#. module: base
+#: view:base.module.upgrade:0
+msgid "Note that this operation might take a few minutes."
+msgstr ""
+
+#. module: base
+#: code:addons/base/ir/ir_fields.py:363
+#, python-format
+msgid ""
+"Ambiguous specification for field '%(field)s', only provide one of name, "
+"external id or database id"
+msgstr ""
+
+#. module: base
+#: field:ir.sequence,implementation:0
+msgid "Implementation"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_l10n_ve
+msgid "Venezuela - Accounting"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.cl
+msgid "Chile"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_web_view_editor
+msgid "View Editor"
+msgstr ""
+
+#. module: base
+#: view:ir.cron:0
+msgid "Execution"
+msgstr ""
+
+#. module: base
+#: field:ir.actions.server,condition:0
+#: view:ir.values:0
+#: field:workflow.transition,condition:0
+msgid "Condition"
+msgstr ""
+
+#. module: base
+#: code:addons/base/module/module.py:669
+#, python-format
+msgid "Module not found"
+msgstr ""
+
+#. module: base
+#: help:res.currency,rate:0
+msgid "The rate of the currency to the currency of rate 1."
+msgstr ""
+
+#. module: base
+#: field:ir.ui.view,name:0
+msgid "View Name"
+msgstr ""
+
+#. module: base
+#: model:ir.model,name:base.model_res_groups
+msgid "Access Groups"
+msgstr ""
+
+#. module: base
+#: selection:base.language.install,lang:0
+msgid "Italian / Italiano"
+msgstr ""
+
+#. module: base
+#: view:ir.actions.server:0
+msgid ""
+"Only one client action will be executed, last client action will be "
+"considered in case of multiple client actions."
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_mrp_jit
+msgid ""
+"\n"
+"This module allows Just In Time computation of procurement orders.\n"
+"==================================================================\n"
+"\n"
+"If you install this module, you will not have to run the regular "
+"procurement\n"
+"scheduler anymore (but you still need to run the minimum order point rule\n"
+"scheduler, or for example let it run daily).\n"
+"All procurement orders will be processed immediately, which could in some\n"
+"cases entail a small performance impact.\n"
+"\n"
+"It may also increase your stock size because products are reserved as soon\n"
+"as possible and the scheduler time range is not taken into account anymore.\n"
+"In that case, you can not use priorities any more on the different picking.\n"
+"    "
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.hr
+msgid "Croatia"
+msgstr ""
+
+#. module: base
+#: view:ir.module.module:0
+msgid ""
+"Do you confirm the uninstallation of this module? This will permanently "
+"erase all data currently stored by the module!"
+msgstr ""
+
+#. module: base
+#: field:ir.actions.server,mobile:0
+msgid "Mobile No"
+msgstr ""
+
+#. module: base
+#: model:ir.actions.act_window,name:base.action_partner_by_category
+#: model:ir.actions.act_window,name:base.action_partner_category_form
+#: model:ir.model,name:base.model_res_partner_category
+#: view:res.partner.category:0
+msgid "Partner Categories"
+msgstr ""
+
+#. module: base
+#: view:base.module.upgrade:0
+msgid "System Update"
+msgstr ""
+
+#. module: base
+#: field:ir.actions.report.xml,report_sxw_content:0
+#: field:ir.actions.report.xml,report_sxw_content_data:0
+msgid "SXW Content"
+msgstr ""
+
+#. module: base
+#: field:ir.attachment,file_size:0
+msgid "File Size"
+msgstr ""
+
+#. module: base
+#: help:ir.sequence,prefix:0
+msgid "Prefix value of the record for the sequence"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.sc
+msgid "Seychelles"
+msgstr ""
+
+#. module: base
+#: model:res.partner.category,name:base.res_partner_category_4
+msgid "Gold"
+msgstr ""
+
+#. module: base
+#: code:addons/base/res/res_company.py:173
+#: model:ir.actions.act_window,name:base.action_res_partner_bank_account_form
+#: model:ir.model,name:base.model_res_partner_bank
+#: model:ir.ui.menu,name:base.menu_action_res_partner_bank_form
+#: view:res.company:0
+#: field:res.company,bank_ids:0
+#: view:res.partner.bank:0
+#, python-format
+msgid "Bank Accounts"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.sl
+msgid "Sierra Leone"
+msgstr ""
+
+#. module: base
+#: view:res.company:0
+msgid "General Information"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_l10n_pt
+msgid "Portugal - Chart of Accounts"
+msgstr ""
+
+#. module: base
+#: field:ir.model.data,complete_name:0
+msgid "Complete ID"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_stock
+msgid ""
+"\n"
+"Manage multi-warehouses, multi- and structured stock locations\n"
+"==============================================================\n"
+"\n"
+"The warehouse and inventory management is based on a hierarchical location "
+"structure, from warehouses to storage bins. \n"
+"The double entry inventory system allows you to manage customers, suppliers "
+"as well as manufacturing inventories. \n"
+"\n"
+"OpenERP has the capacity to manage lots and serial numbers ensuring "
+"compliance with the traceability requirements imposed by the majority of "
+"industries.\n"
+"\n"
+"Key Features\n"
+"------------\n"
+"* Moves history and planning,\n"
+"* Stock valuation (standard or average price, ...)\n"
+"* Robustness faced with Inventory differences\n"
+"* Automatic reordering rules\n"
+"* Support for barcodes\n"
+"* Rapid detection of mistakes through double entry system\n"
+"* Traceability (Upstream / Downstream, Serial numbers, ...)\n"
+"\n"
+"Dashboard / Reports for Warehouse Management will include:\n"
+"----------------------------------------------------------\n"
+"* Incoming Products (Graph)\n"
+"* Outgoing Products (Graph)\n"
+"* Procurement in Exception\n"
+"* Inventory Analysis\n"
+"* Last Product Inventories\n"
+"* Moves Analysis\n"
+"    "
+msgstr ""
+
+#. module: base
+#: help:res.partner,vat:0
+msgid ""
+"Tax Identification Number. Check the box if this contact is subjected to "
+"taxes. Used by the some of the legal statements."
+msgstr ""
+
+#. module: base
+#: field:res.partner.bank,partner_id:0
+msgid "Account Owner"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_procurement
+msgid ""
+"\n"
+"This is the module for computing Procurements.\n"
+"==============================================\n"
+"\n"
+"In the MRP process, procurements orders are created to launch manufacturing\n"
+"orders, purchase orders, stock allocations. Procurement orders are\n"
+"generated automatically by the system and unless there is a problem, the\n"
+"user will not be notified. In case of problems, the system will raise some\n"
+"procurement exceptions to inform the user about blocking problems that need\n"
+"to be resolved manually (like, missing BoM structure or missing supplier).\n"
+"\n"
+"The procurement order will schedule a proposal for automatic procurement\n"
+"for the product which needs replenishment. This procurement will start a\n"
+"task, either a purchase order form for the supplier, or a production order\n"
+"depending on the product's configuration.\n"
+"    "
+msgstr ""
+
+#. module: base
+#: model:ir.actions.act_window,name:base.open_module_tree
+#: model:ir.ui.menu,name:base.menu_module_tree
+msgid "Installed Modules"
+msgstr ""
+
+#. module: base
+#: code:addons/base/res/res_users.py:170
+#, python-format
+msgid "Company Switch Warning"
+msgstr ""
+
+#. module: base
+#: model:ir.module.category,description:base.module_category_manufacturing
+msgid ""
+"Helps you manage your manufacturing processes and generate reports on those "
+"processes."
+msgstr ""
+
+#. module: base
+#: help:ir.sequence,number_increment:0
+msgid "The next number of the sequence will be incremented by this number"
+msgstr ""
+
+#. module: base
+#: selection:workflow.activity,kind:0
+msgid "Function"
+msgstr ""
+
+#. module: base
+#: field:ir.ui.menu,parent_right:0
+msgid "Parent Right"
+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 ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_project
+msgid ""
+"\n"
+"Track multi-level projects, tasks, work done on tasks\n"
+"=====================================================\n"
+"\n"
+"This application allows an operational project management system to organize "
+"your activities into tasks and plan the work you need to get the tasks "
+"completed.\n"
+"\n"
+"Gantt diagrams will give you a graphical representation of your project "
+"plans, as well as resources availability and workload.\n"
+"\n"
+"Dashboard / Reports for Project Management will include:\n"
+"--------------------------------------------------------\n"
+"* My Tasks\n"
+"* Open Tasks\n"
+"* Tasks Analysis\n"
+"* Cumulative Flow\n"
+"    "
+msgstr ""
+
+#. module: base
+#: view:res.partner:0
+msgid "Internal Notes"
+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 ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_purchase_requisition
+msgid "Purchase Requisitions"
+msgstr ""
+
+#. module: base
+#: selection:ir.actions.act_window,target:0
+msgid "Inline Edit"
+msgstr ""
+
+#. module: base
+#: selection:ir.cron,interval_type:0
+msgid "Months"
+msgstr ""
+
+#. module: base
+#: view:workflow.instance:0
+msgid "Workflow Instances"
+msgstr ""
+
+#. module: base
+#: code:addons/base/res/res_partner.py:531
+#, python-format
+msgid "Partners: "
+msgstr ""
+
+#. module: base
+#: view:res.partner:0
+msgid "Is a Company?"
+msgstr ""
+
+#. module: base
+#: code:addons/base/res/res_company.py:173
+#: field:res.partner.bank,name:0
+#, python-format
+msgid "Bank Account"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.kp
+msgid "North Korea"
+msgstr ""
+
+#. module: base
+#: selection:ir.actions.server,state:0
+msgid "Create Object"
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.ss
+msgid "South Sudan"
+msgstr ""
+
+#. module: base
+#: field:ir.filters,context:0
+msgid "Context"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_sale_mrp
+msgid "Sales and MRP Management"
+msgstr ""
+
+#. module: base
+#: model:ir.actions.act_window,help:base.action_partner_form
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to add a contact in your address book.\n"
+"              </p><p>\n"
+"                OpenERP helps you easily track all activities related to\n"
+"                a customer; discussions, history of business opportunities,\n"
+"                documents, etc.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
+#. module: base
+#: model:res.partner.category,name:base.res_partner_category_2
+msgid "Prospect"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_stock_invoice_directly
+msgid "Invoice Picking Directly"
+msgstr ""
+
+#. module: base
+#: selection:base.language.install,lang:0
+msgid "Polish / Język polski"
+msgstr ""
+
+#. module: base
+#: field:ir.exports,name:0
+msgid "Export Name"
+msgstr ""
+
+#. module: base
+#: help:res.partner,type:0
+msgid ""
+"Used to select automatically the right address according to the context in "
+"sales and purchases documents."
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,description:base.module_purchase_analytic_plans
+msgid ""
+"\n"
+"The base module to manage analytic distribution and purchase orders.\n"
+"====================================================================\n"
+"\n"
+"Allows the user to maintain several analysis plans. These let you split a "
+"line\n"
+"on a supplier purchase order into several accounts and analytic plans.\n"
+"    "
+msgstr ""
+
+#. module: base
+#: model:res.country,name:base.lk
+msgid "Sri Lanka"
+msgstr ""
+
+#. module: base
+#: field:ir.actions.act_window,search_view:0
+msgid "Search View"
+msgstr ""
+
+#. module: base
+#: selection:base.language.install,lang:0
+msgid "Russian / русский язык"
+msgstr ""
+
+#. module: base
+#: model:ir.module.module,shortdesc:base.module_auth_signup
+msgid "Signup"
+msgstr ""
diff --git a/openerp/addons/base/i18n/zh_CN.po b/openerp/addons/base/i18n/zh_CN.po
index 88ffcb8331e..3220b27287c 100644
--- a/openerp/addons/base/i18n/zh_CN.po
+++ b/openerp/addons/base/i18n/zh_CN.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: 2013-04-20 06:48+0000\n"
+"X-Launchpad-Export-Date: 2013-04-21 05:32+0000\n"
 "X-Generator: Launchpad (build 16567)\n"
 
 #. module: base

From 3d1e5d69988746871878df348e0ca9ab054f44a2 Mon Sep 17 00:00:00 2001
From: Christophe Matthieu <chm@openerp.com>
Date: Mon, 22 Apr 2013 10:43:08 +0200
Subject: [PATCH 079/121] [FIX] web_linkedin: display the real linkedin error
 inside the openerp popup.

bzr revid: chm@openerp.com-20130422084308-t32vp4v8k3006uzp
---
 addons/web_linkedin/static/src/js/linkedin.js | 108 +++++++++++++++---
 .../web_linkedin/static/src/xml/linkedin.xml  |   6 +-
 2 files changed, 99 insertions(+), 15 deletions(-)

diff --git a/addons/web_linkedin/static/src/js/linkedin.js b/addons/web_linkedin/static/src/js/linkedin.js
index a7409570958..2ab81dcc609 100644
--- a/addons/web_linkedin/static/src/js/linkedin.js
+++ b/addons/web_linkedin/static/src/js/linkedin.js
@@ -6,28 +6,110 @@ openerp.web_linkedin = function(instance) {
     var QWeb = instance.web.qweb;
     var _t = instance.web._t;
     
+    /*
+    * instance.web_linkedin.tester.test_authentication()
+    * Call check if the Linkedin session is open or open a connection popup
+    * return a deferrer :
+    *   - resolve if the authentication is true
+    *   - reject if the authentication is wrong or when the user logout
+    */
     instance.web_linkedin.LinkedinTester = instance.web.Class.extend({
         init: function() {
             this.linkedin_added = false;
             this.linkedin_def = $.Deferred();
             this.auth_def = $.Deferred();
         },
+        error_catcher: function (callback) {
+            var self = this;
+            if (!this.realError) {
+                this.realError = Error;
+                this.window_onerror = window.onerror;
+            }
+            if (!callback) {
+                Error = self.realError;
+                return false;
+            }
+            this.callback = callback;
+            window.onerror = function(message, fileName, lineNumber) {
+                if (!window.onerror.prototype.catched) {
+                    self.window_onerror(message, fileName, lineNumber);
+                }
+                if (self.realError != Error) {
+                    window.onerror.prototype.catched = false;
+                } else {
+                    window.onerror = self.window_onerror;
+                }
+            };
+            window.onerror.prototype.catched = false;
+            Error = function (message, fileName, lineNumber) {
+                this.name = message;
+                this.message = message;
+                this.fileName = fileName;
+                this.lineNumber = lineNumber;
+                this.caller = Error.caller.toString();
+                window.onerror.prototype.catched = self.callback.apply(self, [this]);
+                return this;
+            };
+            Error.prototype.toString = function () {return this.name;};
+        },
+        linkedin_disabled: function(error) {
+            this.linkedin_def.reject();
+            this.auth_def.reject();
+            IN = false;
+            instance.web.dialog($(QWeb.render("LinkedIn.DisabledWarning", {'error': error})), {
+                title: _t("LinkedIn is not enabled"),
+                buttons: [
+                    {text: _t("Ok"), click: function() { $(this).dialog("close"); }}
+                ]
+            });
+        },
         test_linkedin: function() {
             var self = this;
             return this.test_api_key().then(function() {
-                if (self.linkedin_added)
-                    return self.linkedin_def.promise();
+                if (self.linkedin_added) {
+                    return self.linkedin_def;
+                }
+                self.$linkedin = $('<div class="oe_linkedin_login_hidden" style="display:none;"><script type="in/Login"></script></div>');
+
+                self.error_catcher(function (error) {
+                    if (!!error.caller.match(/API Key is invalid/)) {
+                        self.linkedin_disabled(error);
+                        self.$linkedin.remove();
+                        console.debug("LinkedIn JavaScript removed.");
+                        self.linkedin_added = false;
+                        self.error_catcher(false);
+                        return true;
+                    } else {
+                        return false;
+                    }
+                });
+                window.setTimeout(function () {self.error_catcher(false);}, 5000);
+
+                $("body").append(self.$linkedin);
                 var tag = document.createElement('script');
                 tag.type = 'text/javascript';
                 tag.src = "https://platform.linkedin.com/in.js";
-                tag.innerHTML = 'api_key : ' + self.api_key + '\nauthorize : true\nscope: r_network r_contactinfo';
+                tag.innerHTML = 'api_key : ' + self.api_key + '\nauthorize : true\nscope: r_network r_basicprofile'; // r_contactinfo r_fullprofile r_emailaddress';
+                
                 document.getElementsByTagName('head')[0].appendChild(tag);
                 self.linkedin_added = true;
-                $(tag).load(function() {
+                $(tag).load(function(event) {
+                    console.debug("LinkedIn JavaScript inserted.");
+                    IN.Event.on(IN, "frameworkLoaded", function() {
+                        self.error_catcher(false);
+                        console.debug("LinkedIn DOM node inserted and frameworkLoaded.");
+                    });
+                    IN.Event.on(IN, "systemReady", function() {
+                        self.linkedin_def.resolve();
+                        console.debug("LinkedIn systemReady.");
+                    });
                     IN.Event.on(IN, "auth", function() {
                         self.auth_def.resolve();
                     });
-                    self.linkedin_def.resolve();
+                    IN.Event.on(IN, "logout", function() {
+                        self.auth_def.reject();
+                        self.auth_def = $.Deferred();
+                    });
                 });
                 return self.linkedin_def.promise();
             });
@@ -47,6 +129,14 @@ openerp.web_linkedin = function(instance) {
             });
         },
         test_authentication: function() {
+            var self = this;
+           this.linkedin_def.done(function () {
+                if (IN.User.isAuthorized()) {
+                    self.auth_def.resolve();
+                } else {
+                    IN.User.authorize();
+                }
+            });
             return this.auth_def.promise();
         },
     });
@@ -75,14 +165,6 @@ openerp.web_linkedin = function(instance) {
                 pop.on("selected", this, function(entity) {
                     self.selected_entity(entity);
                 });
-            }).fail(_.bind(this.linkedin_disabled, this));
-        },
-        linkedin_disabled: function() {
-            instance.web.dialog($(QWeb.render("LinkedIn.DisabledWarning")), {
-                title: _t("LinkedIn is not enabled"),
-                buttons: [
-                    {text: _t("Ok"), click: function() { $(this).dialog("close"); }}
-                ]
             });
         },
         selected_entity: function(entity) {
diff --git a/addons/web_linkedin/static/src/xml/linkedin.xml b/addons/web_linkedin/static/src/xml/linkedin.xml
index 4956fd7df5a..de538948951 100644
--- a/addons/web_linkedin/static/src/xml/linkedin.xml
+++ b/addons/web_linkedin/static/src/xml/linkedin.xml
@@ -29,8 +29,10 @@
     </t>
     <t t-name="LinkedIn.DisabledWarning">
         <div>
-            LinkedIn access was not enabled on this server.
-            Please ask your administrator to configure it in Settings > Configuration > Sales > Social Network Integration.
+            <img t-att-src='_s + "/web/static/src/img/warning.png"' style="float: left; margin: 5px"/>
+            <p>LinkedIn access was not enabled on this server.</p>
+            <p>Please ask your administrator to configure it in Settings > Configuration > Sales > Social Network Integration.</p>
+            <p>LinkedIn: <t t-raw="error.name"/></p>
         </div>
     </t>
 </templates>
\ No newline at end of file

From cffce8a42564eefefe14564cf2021d88236cfb95 Mon Sep 17 00:00:00 2001
From: Cedric Snauwaert <csn@openerp.com>
Date: Mon, 22 Apr 2013 11:37:58 +0200
Subject: [PATCH 080/121] [FIX]hr_timesheet: fix multi-company problem, when
 user from company b was trying to create an employee, it was having a read
 access error due to default value not being on same company

bzr revid: csn@openerp.com-20130422093758-2vwa4faf1q485bxq
---
 addons/hr_timesheet/hr_timesheet.py | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

diff --git a/addons/hr_timesheet/hr_timesheet.py b/addons/hr_timesheet/hr_timesheet.py
index 6a538e5d09c..68c158e04e1 100644
--- a/addons/hr_timesheet/hr_timesheet.py
+++ b/addons/hr_timesheet/hr_timesheet.py
@@ -38,7 +38,13 @@ class hr_employee(osv.osv):
         md = self.pool.get('ir.model.data')
         try:
             result = md.get_object_reference(cr, uid, 'hr_timesheet', 'analytic_journal')
-            return result[1]
+            #search on id found in result to check if current user has read access right, if he does, it will return same id,
+            #otherwise it will return empty list
+            check_right = self.pool.get('account.analytic.journal').search(cr, uid, [('name', '=', result[1])], context=context)
+            if check_right:
+                return result[1]
+            else:
+                return False
         except ValueError:
             pass
         return False
@@ -47,7 +53,13 @@ class hr_employee(osv.osv):
         md = self.pool.get('ir.model.data')
         try:
             result = md.get_object_reference(cr, uid, 'product', 'product_product_consultant')
-            return result[1]
+            #search on id found in result to check if current user has read access right, if he does, it will return same id,
+            #otherwise it will return empty list
+            check_right = self.pool.get('product.template').search(cr, uid, [('id', '=', result[1])], context=context)
+            if check_right:
+                return result[1]
+            else:
+                return False
         except ValueError:
             pass
         return False

From 856083e2b4e07a98192bd1d31fe4d6cc2c141b27 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Mon, 22 Apr 2013 12:21:14 +0200
Subject: [PATCH 081/121] [FIX] email_template: fixed wrong res_id given to
 attachments in send_mail (should be a mail.message res_id, not a mail.mail
 res_id), to use the low-level attachments unlink.

bzr revid: tde@openerp.com-20130422102114-a179ylzpgu3g6vcr
---
 addons/email_template/email_template.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/addons/email_template/email_template.py b/addons/email_template/email_template.py
index a602a447867..356d903b03d 100644
--- a/addons/email_template/email_template.py
+++ b/addons/email_template/email_template.py
@@ -381,6 +381,7 @@ class email_template(osv.osv):
         attachment_ids = values.pop('attachment_ids', [])
         attachments = values.pop('attachments', [])
         msg_id = mail_mail.create(cr, uid, values, context=context)
+        mail = mail_mail.browse(cr, uid, msg_id, context=context)
 
         # manage attachments
         for attachment in attachments:
@@ -389,7 +390,7 @@ class email_template(osv.osv):
                     'datas_fname': attachment[0],
                     'datas': attachment[1],
                     'res_model': 'mail.message',
-                    'res_id': msg_id,
+                    'res_id': mail.mail_message_id.id,
             }
             context.pop('default_type', None)
             attachment_ids.append(ir_attachment.create(cr, uid, attachment_data, context=context))

From 0915663545d4ba29d8d2a6e2860b90a85a89fd0f Mon Sep 17 00:00:00 2001
From: Christophe Matthieu <chm@openerp.com>
Date: Mon, 22 Apr 2013 13:24:38 +0200
Subject: [PATCH 082/121] [FIX] note: notes without user's stage are added to
 the first user's stage (sort by sequence)

bzr revid: chm@openerp.com-20130422112438-0f1s6we5ggq3t6xn
---
 addons/note/note.py       | 23 +++++++++++++++--------
 addons/note/note_data.xml |  6 ++++++
 2 files changed, 21 insertions(+), 8 deletions(-)

diff --git a/addons/note/note.py b/addons/note/note.py
index 2d95b15107a..90c2cb9bc54 100644
--- a/addons/note/note.py
+++ b/addons/note/note.py
@@ -141,12 +141,19 @@ class note_note(osv.osv):
                 #note without user's stage
                 nb_notes_ws = self.search(cr,uid, domain+[('stage_ids', 'not in', current_stage_ids)], context=context, count=True)
                 if nb_notes_ws:
-                    result += [{ #notes for unknown stage and if stage_ids is not empty
-                        '__context': {'group_by': groupby[1:]},
-                        '__domain': domain + [('stage_ids', 'not in', current_stage_ids)],
-                        'stage_id': (0, 'Unknown'),
-                        'stage_id_count':nb_notes_ws
-                    }]
+                    # add note to the first column if it's the first stage
+                    dom_not_in = ('stage_ids', 'not in', current_stage_ids)
+                    if result and result[0]['stage_id'][0] == current_stage_ids[0]:
+                        dom_in = result[0]['__domain'].pop()
+                        result[0]['__domain'] = domain + ['|', dom_in, dom_not_in]
+                    else:
+                        # add the first stage column
+                        result = [{
+                            '__context': {'group_by': groupby[1:]},
+                            '__domain': domain + [dom_not_in],
+                            'stage_id': (current_stage_ids[0], stage_name[current_stage_ids[0]]),
+                            'stage_id_count':nb_notes_ws
+                        }] + result
 
             else: # if stage_ids is empty
 
@@ -156,7 +163,7 @@ class note_note(osv.osv):
                     result = [{ #notes for unknown stage
                         '__context': {'group_by': groupby[1:]},
                         '__domain': domain,
-                        'stage_id': (0, 'Unknown'),
+                        'stage_id': False,
                         'stage_id_count':nb_notes_ws
                     }]
                 else:
@@ -187,7 +194,7 @@ class res_users(osv.Model):
         model_id = data_obj.get_object_reference(cr, uid, 'base', 'group_user') #Employee Group
         group_id = model_id and model_id[1] or False
         if group_id in [x.id for x in user.groups_id]:
-            for note_xml_id in ['note_stage_01','note_stage_02','note_stage_03','note_stage_04']:
+            for note_xml_id in ['note_stage_00','note_stage_01','note_stage_02','note_stage_03','note_stage_04']:
                 data_id = data_obj._get_id(cr, uid, 'note', note_xml_id)
                 stage_id  = data_obj.browse(cr, uid, data_id, context=context).res_id
                 note_obj.copy(cr, uid, stage_id, default = { 
diff --git a/addons/note/note_data.xml b/addons/note/note_data.xml
index 592292788b3..376b8e9053f 100644
--- a/addons/note/note_data.xml
+++ b/addons/note/note_data.xml
@@ -2,6 +2,12 @@
 <openerp>
   <data>
 
+    <record model="note.stage" id="note_stage_00">
+      <field name="name">New</field>
+      <field name="sequence" eval="0"/>
+      <field name="user_id" eval="ref('base.user_root')"/>
+    </record>
+
     <record model="note.stage" id="note_stage_01">
       <field name="name">Today</field>
       <field name="sequence">1</field>

From b2e2d854f87f7fa73d698093d113a650ff58698f Mon Sep 17 00:00:00 2001
From: Cedric Snauwaert <csn@openerp.com>
Date: Mon, 22 Apr 2013 13:46:57 +0200
Subject: [PATCH 083/121] [FIX]hr_timesheet: correct mistake in default, should
 be 'id' instead of 'name' in search

bzr revid: csn@openerp.com-20130422114657-ktu1a7z83c0bhv2n
---
 addons/hr_timesheet/hr_timesheet.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/hr_timesheet/hr_timesheet.py b/addons/hr_timesheet/hr_timesheet.py
index 68c158e04e1..bb311778b33 100644
--- a/addons/hr_timesheet/hr_timesheet.py
+++ b/addons/hr_timesheet/hr_timesheet.py
@@ -40,7 +40,7 @@ class hr_employee(osv.osv):
             result = md.get_object_reference(cr, uid, 'hr_timesheet', 'analytic_journal')
             #search on id found in result to check if current user has read access right, if he does, it will return same id,
             #otherwise it will return empty list
-            check_right = self.pool.get('account.analytic.journal').search(cr, uid, [('name', '=', result[1])], context=context)
+            check_right = self.pool.get('account.analytic.journal').search(cr, uid, [('id', '=', result[1])], context=context)
             if check_right:
                 return result[1]
             else:

From 4b85daf182beef4c7bba86e64dbb330497bc5650 Mon Sep 17 00:00:00 2001
From: Olivier Dony <odo@openerp.com>
Date: Mon, 22 Apr 2013 16:15:18 +0200
Subject: [PATCH 084/121] [FIX] account_report_company: be more conservative
 and hide the `name` field instead of removing it from list view

This makes the inherited view still compatible with
modules that depend on the presence of the `name`
field in the list view (otherwise it would depend on the
module loading order and would sometimes work and
sometimes not).

bzr revid: odo@openerp.com-20130422141518-imyiuu59uxnzq5eh
---
 addons/account_report_company/res_partner_view.xml | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/addons/account_report_company/res_partner_view.xml b/addons/account_report_company/res_partner_view.xml
index cae010f3066..ad31d01d515 100644
--- a/addons/account_report_company/res_partner_view.xml
+++ b/addons/account_report_company/res_partner_view.xml
@@ -5,7 +5,10 @@
             <field name="model">res.partner</field>
             <field name="inherit_id" ref="base.view_partner_tree"/>
             <field name="arch" type="xml">
-                <field name="name" position="replace">
+                <field name="name" position="attributes">
+                    <attribute name="invisible">True</attribute>
+                </field>
+                <field name="name" position="before">
                     <field name="display_name"/>
                 </field>
             </field>

From 7d3a07aa79e276e9b7e17548cc40cfe4113ee2cc Mon Sep 17 00:00:00 2001
From: Cedric Snauwaert <csn@openerp.com>
Date: Mon, 22 Apr 2013 16:44:38 +0200
Subject: [PATCH 085/121] [FIX]account_financial_report_data: fix profit and
 loss sign, sign should be reverse for P&L journal and children

bzr revid: csn@openerp.com-20130422144438-2uc9vhotsznf42ru
---
 addons/account/account_financial_report_data.xml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/addons/account/account_financial_report_data.xml b/addons/account/account_financial_report_data.xml
index 6410a5e887c..e8ff33151c3 100644
--- a/addons/account/account_financial_report_data.xml
+++ b/addons/account/account_financial_report_data.xml
@@ -6,16 +6,19 @@
         -->
         <record id="account_financial_report_profitandloss0" model="account.financial.report">
             <field name="name">Profit and Loss</field>
+            <field name="sign" eval="-1" />
             <field name="type">sum</field>
         </record>
         <record id="account_financial_report_income0" model="account.financial.report">
             <field name="name">Income</field>
+            <field name="sign" eval="-1" />
             <field name="parent_id" ref="account_financial_report_profitandloss0"/>
             <field name="display_detail">detail_with_hierarchy</field>
             <field name="type">account_type</field>
         </record>
         <record id="account_financial_report_expense0" model="account.financial.report">
             <field name="name">Expense</field>
+            <field name="sign" eval="-1" />
             <field name="parent_id" ref="account_financial_report_profitandloss0"/>
             <field name="display_detail">detail_with_hierarchy</field>
             <field name="type">account_type</field>

From 41146460c027d8839fbe3f49d60f2566785d25bf Mon Sep 17 00:00:00 2001
From: Olivier Dony <odo@openerp.com>
Date: Mon, 22 Apr 2013 19:04:20 +0200
Subject: [PATCH 086/121] [FIX] rml2html: incorrect license headers in some
 source files, reported and contributed by Alec Leamas

Mixing LGPL 2.1 and AGPL 3.0 in the same source file
is incorrect, and the AGPLv3 license was added by
mistake: keep only LGPL license and preserve
copypright info.

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

bzr revid: odo@openerp.com-20130422170420-in1wo45v3q8q0fhr
---
 openerp/report/render/rml2html/__init__.py |  4 ++--
 openerp/report/render/rml2html/rml2html.py | 21 +++--------------
 openerp/report/render/rml2html/utils.py    | 27 +++++++++++-----------
 3 files changed, 19 insertions(+), 33 deletions(-)

diff --git a/openerp/report/render/rml2html/__init__.py b/openerp/report/render/rml2html/__init__.py
index 96b9afc6e70..ee7448b89d6 100644
--- a/openerp/report/render/rml2html/__init__.py
+++ b/openerp/report/render/rml2html/__init__.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 ##############################################################################
-#    
+#
 #    OpenERP, Open Source Management Solution
 #    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
 #
@@ -15,7 +15,7 @@
 #    GNU Affero General Public License for more details.
 #
 #    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.     
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
 
diff --git a/openerp/report/render/rml2html/rml2html.py b/openerp/report/render/rml2html/rml2html.py
index 0e82a5d3ea8..c80698150b8 100644
--- a/openerp/report/render/rml2html/rml2html.py
+++ b/openerp/report/render/rml2html/rml2html.py
@@ -1,25 +1,8 @@
 # -*- coding: utf-8 -*-
 ##############################################################################
-#    
-#    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
 #
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU Affero General Public License as
-#    published by the Free Software Foundation, either version 3 of the
-#    License, or (at your option) any later version.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU Affero General Public License for more details.
-#
-#    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.     
-#
-##############################################################################
-
 # Copyright (C) 2005, Fabien Pinckaers, UCL, FSA
+# Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public
@@ -34,6 +17,8 @@
 # You should have received a copy of the GNU Lesser General Public
 # License along with this library; if not, write to the Free Software
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+#
+##############################################################################
 
 import sys
 import cStringIO
diff --git a/openerp/report/render/rml2html/utils.py b/openerp/report/render/rml2html/utils.py
index b811cc5d47b..c40118477f8 100644
--- a/openerp/report/render/rml2html/utils.py
+++ b/openerp/report/render/rml2html/utils.py
@@ -1,21 +1,22 @@
 # -*- coding: utf-8 -*-
 ##############################################################################
-#    
-#    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
 #
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU Affero General Public License as
-#    published by the Free Software Foundation, either version 3 of the
-#    License, or (at your option) any later version.
+# Copyright (C) 2005, Fabien Pinckaers, UCL, FSA
+# Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
 #
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU Affero General Public License for more details.
+# This library is free software; you can redistribute it and/or
+# modify it under the terms of the GNU Lesser General Public
+# License as published by the Free Software Foundation; either
+# version 2.1 of the License, or (at your option) any later version.
 #
-#    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.     
+# This library is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this library; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 #
 ##############################################################################
 

From 26f2543dbfd51dbef2201c2c8729813f57a39bbd Mon Sep 17 00:00:00 2001
From: Olivier Dony <odo@openerp.com>
Date: Mon, 22 Apr 2013 19:04:29 +0200
Subject: [PATCH 087/121] [FIX] base_report_designer: incorrect license headers
 in some source files, reported and contributed by Alec Leamas

  Mixing LGPL 2.1 and AGPL 3.0 in the same source file
  is incorrect, and the AGPLv3 license was added by
  mistake: keep only LGPL license and preserve
  copypright info.

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

bzr revid: odo@openerp.com-20130422170429-o8tb92x4mukspe9o
---
 .../bin/script/About.py                       | 56 ++++----------
 .../bin/script/AddAttachment.py               | 57 +++++---------
 .../bin/script/Change.py                      | 75 +++++++------------
 .../bin/script/ConvertBracesToField.py        | 57 +++++---------
 .../bin/script/ConvertFieldsToBraces.py       | 58 +++++---------
 .../bin/script/ExportToRML.py                 | 57 +++++---------
 .../bin/script/Expression.py                  | 57 +++++---------
 .../bin/script/Fields.py                      | 57 ++++----------
 .../bin/script/LoginTest.py                   | 57 +++++---------
 .../bin/script/ModifyExistingReport.py        | 56 ++++----------
 .../bin/script/NewReport.py                   | 57 +++++---------
 .../bin/script/Repeatln.py                    | 57 +++++---------
 .../bin/script/SendToServer.py                | 58 +++++---------
 .../bin/script/ServerParameter.py             | 57 +++++---------
 .../bin/script/Translation.py                 | 56 ++++----------
 .../bin/script/__init__.py                    | 57 +++++---------
 .../bin/script/compile_all.py                 | 57 +++++---------
 .../bin/script/modify.py                      | 56 ++++----------
 18 files changed, 310 insertions(+), 732 deletions(-)

diff --git a/addons/base_report_designer/plugin/openerp_report_designer/bin/script/About.py b/addons/base_report_designer/plugin/openerp_report_designer/bin/script/About.py
index 43b452b82e2..3ede2c5ae6a 100644
--- a/addons/base_report_designer/plugin/openerp_report_designer/bin/script/About.py
+++ b/addons/base_report_designer/plugin/openerp_report_designer/bin/script/About.py
@@ -1,49 +1,25 @@
-##########################################################################
+#########################################################################
 #
-# Portions of this file are under the following copyright and license:
+#  Copyright (c) 2003-2004 Danny Brewer d29583@groovegarden.com
+#  Copyright (C) 2004-2010 OpenERP SA (<http://openerp.com>).
 #
+#  This library is free software; you can redistribute it and/or
+#  modify it under the terms of the GNU Lesser General Public
+#  License as published by the Free Software Foundation; either
+#  version 2.1 of the License, or (at your option) any later version.
 #
-#   Copyright (c) 2003-2004 Danny Brewer 
-#   d29583@groovegarden.com 
-# 
-#   This library is free software; you can redistribute it and/or 
-#   modify it under the terms of the GNU Lesser General Public 
-#   License as published by the Free Software Foundation; either 
-#   version 2.1 of the License, or (at your option) any later version. 
-# 
-#   This library is distributed in the hope that it will be useful, 
-#   but WITHOUT ANY WARRANTY; without even the implied warranty of 
-#   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU 
-#   Lesser General Public License for more details. 
-# 
-#   You should have received a copy of the GNU Lesser General Public 
-#   License along with this library; if not, write to the Free Software 
-#   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA 
-# 
-#   See:  http://www.gnu.org/licenses/lgpl.html 
+#  This library is distributed in the hope that it will be useful,
+#  but WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+#  Lesser General Public License for more details.
 #
-# 
-# and other portions are under the following copyright and license:
+#  You should have received a copy of the GNU Lesser General Public
+#  License along with this library; if not, write to the Free Software
+#  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
 #
+#  See:  http://www.gnu.org/licenses/lgpl.html
 #
-#    OpenERP, Open Source Management Solution>..
-#    Copyright (C) 2004-2010 OpenERP SA (<http://openerp.com>). 
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU Affero General Public License as published by
-#    the Free Software Foundation, either version 3 of the License, or
-#    (at your option) any later version.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU Affero General Public License for more details.
-#
-#    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-#
-##############################################################################
+#############################################################################
 
 import uno
 from com.sun.star.task import XJobExecutor
diff --git a/addons/base_report_designer/plugin/openerp_report_designer/bin/script/AddAttachment.py b/addons/base_report_designer/plugin/openerp_report_designer/bin/script/AddAttachment.py
index ba69174ffc6..c7f743f916e 100644
--- a/addons/base_report_designer/plugin/openerp_report_designer/bin/script/AddAttachment.py
+++ b/addons/base_report_designer/plugin/openerp_report_designer/bin/script/AddAttachment.py
@@ -1,49 +1,26 @@
-##########################################################################
+#########################################################################
 #
-# Portions of this file are under the following copyright and license:
+#  Copyright (c) 2003-2004 Danny Brewer d29583@groovegarden.com
+#  Copyright (C) 2004-2010 OpenERP SA (<http://openerp.com>).
 #
+#  This library is free software; you can redistribute it and/or
+#  modify it under the terms of the GNU Lesser General Public
+#  License as published by the Free Software Foundation; either
+#  version 2.1 of the License, or (at your option) any later version.
 #
-#   Copyright (c) 2003-2004 Danny Brewer
-#   d29583@groovegarden.com
+#  This library is distributed in the hope that it will be useful,
+#  but WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+#  Lesser General Public License for more details.
 #
-#   This library is free software; you can redistribute it and/or
-#   modify it under the terms of the GNU Lesser General Public
-#   License as published by the Free Software Foundation; either
-#   version 2.1 of the License, or (at your option) any later version.
+#  You should have received a copy of the GNU Lesser General Public
+#  License along with this library; if not, write to the Free Software
+#  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
 #
-#   This library is distributed in the hope that it will be useful,
-#   but WITHOUT ANY WARRANTY; without even the implied warranty of
-#   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-#   Lesser General Public License for more details.
+#  See:  http://www.gnu.org/licenses/lgpl.html
 #
-#   You should have received a copy of the GNU Lesser General Public
-#   License along with this library; if not, write to the Free Software
-#   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
-#
-#   See:  http://www.gnu.org/licenses/lgpl.html
-#
-#
-# and other portions are under the following copyright and license:
-#
-#
-#    OpenERP, Open Source Management Solution>..
-#    Copyright (C) 2004-2010 OpenERP SA (<http://openerp.com>).
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU Affero General Public License as published by
-#    the Free Software Foundation, either version 3 of the License, or
-#    (at your option) any later version.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU Affero General Public License for more details.
-#
-#    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-#
-##############################################################################
+#############################################################################
+
 import os
 import uno
 import unohelper
diff --git a/addons/base_report_designer/plugin/openerp_report_designer/bin/script/Change.py b/addons/base_report_designer/plugin/openerp_report_designer/bin/script/Change.py
index b85a9d9bb06..cfea09c7163 100644
--- a/addons/base_report_designer/plugin/openerp_report_designer/bin/script/Change.py
+++ b/addons/base_report_designer/plugin/openerp_report_designer/bin/script/Change.py
@@ -1,49 +1,26 @@
-##########################################################################
+#########################################################################
 #
-# Portions of this file are under the following copyright and license:
+#  Copyright (c) 2003-2004 Danny Brewer d29583@groovegarden.com
+#  Copyright (C) 2004-2010 OpenERP SA (<http://openerp.com>).
 #
+#  This library is free software; you can redistribute it and/or
+#  modify it under the terms of the GNU Lesser General Public
+#  License as published by the Free Software Foundation; either
+#  version 2.1 of the License, or (at your option) any later version.
 #
-#   Copyright (c) 2003-2004 Danny Brewer 
-#   d29583@groovegarden.com 
-# 
-#   This library is free software; you can redistribute it and/or 
-#   modify it under the terms of the GNU Lesser General Public 
-#   License as published by the Free Software Foundation; either 
-#   version 2.1 of the License, or (at your option) any later version. 
-# 
-#   This library is distributed in the hope that it will be useful, 
-#   but WITHOUT ANY WARRANTY; without even the implied warranty of 
-#   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU 
-#   Lesser General Public License for more details. 
-# 
-#   You should have received a copy of the GNU Lesser General Public 
-#   License along with this library; if not, write to the Free Software 
-#   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA 
-# 
-#   See:  http://www.gnu.org/licenses/lgpl.html 
+#  This library is distributed in the hope that it will be useful,
+#  but WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+#  Lesser General Public License for more details.
 #
-# 
-# and other portions are under the following copyright and license:
+#  You should have received a copy of the GNU Lesser General Public
+#  License along with this library; if not, write to the Free Software
+#  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
 #
+#  See:  http://www.gnu.org/licenses/lgpl.html
 #
-#    OpenERP, Open Source Management Solution>..
-#    Copyright (C) 2004-2010 OpenERP SA (<http://openerp.com>). 
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU Affero General Public License as published by
-#    the Free Software Foundation, either version 3 of the License, or
-#    (at your option) any later version.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU Affero General Public License for more details.
-#
-#    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-#
-##############################################################################
+#############################################################################
+
 import uno
 import string
 import unohelper
@@ -72,7 +49,7 @@ class Change( unohelper.Base, XJobExecutor ):
             'XML-RPC': 'http://',
             'XML-RPC secure': 'https://',
             'NET-RPC': 'socket://',
-        }  
+        }
         host=port=protocol=''
         if docinfo.getUserFieldValue(0):
             m = re.match('^(http[s]?://|socket://)([\w.\-]+):(\d{1,5})$',  docinfo.getUserFieldValue(0) or '')
@@ -80,7 +57,7 @@ class Change( unohelper.Base, XJobExecutor ):
             port = m.group(3)
             protocol = m.group(1)
         if  protocol:
-            for (key, value) in self.protocol.iteritems(): 
+            for (key, value) in self.protocol.iteritems():
                 if value==protocol:
                     protocol=key
                     break
@@ -102,7 +79,7 @@ class Change( unohelper.Base, XJobExecutor ):
         self.win.addButton( 'btnNext', -2, -5, 30, 15, 'Next', actionListenerProc = self.btnNext_clicked )
 
         self.win.addButton( 'btnCancel', -2 - 30 - 5 ,-5, 30, 15, 'Cancel', actionListenerProc = self.btnCancel_clicked )
-       
+
         for i in self.protocol.keys():
             self.lstProtocol.addItem(i,self.lstProtocol.getItemCount() )
         self.win.doModalDialog( "lstProtocol",  protocol)
@@ -110,27 +87,27 @@ class Change( unohelper.Base, XJobExecutor ):
     def btnNext_clicked(self, oActionEvent):
         global url
         aVal=''
-        #aVal= Fetature used 
+        #aVal= Fetature used
         try:
             url = self.protocol[self.win.getListBoxSelectedItem("lstProtocol")]+self.win.getEditText("txtHost")+":"+self.win.getEditText("txtPort")
             self.sock=RPCSession(url)
             desktop=getDesktop()
             doc = desktop.getCurrentComponent()
-            docinfo=doc.getDocumentInfo()        
+            docinfo=doc.getDocumentInfo()
             docinfo.setUserFieldValue(0,url)
             res=self.sock.listdb()
             self.win.endExecute()
             ServerParameter(aVal,url)
         except :
-            import traceback,sys 
+            import traceback,sys
             info = reduce(lambda x, y: x+y, traceback.format_exception(sys.exc_type, sys.exc_value, sys.exc_traceback))
-            self.logobj.log_write('ServerParameter', LOG_ERROR, info)     
+            self.logobj.log_write('ServerParameter', LOG_ERROR, info)
             ErrorDialog("Connection to server is fail. Please check your Server Parameter.", "", "Error!")
             self.win.endExecute()
-                 
+
     def btnCancel_clicked(self,oActionEvent):
         self.win.endExecute()
-        
+
 
 if __name__<>"package" and __name__=="__main__":
     Change(None)
diff --git a/addons/base_report_designer/plugin/openerp_report_designer/bin/script/ConvertBracesToField.py b/addons/base_report_designer/plugin/openerp_report_designer/bin/script/ConvertBracesToField.py
index c1fa8b22a85..b84c94fcc75 100644
--- a/addons/base_report_designer/plugin/openerp_report_designer/bin/script/ConvertBracesToField.py
+++ b/addons/base_report_designer/plugin/openerp_report_designer/bin/script/ConvertBracesToField.py
@@ -1,49 +1,26 @@
-##########################################################################
+#########################################################################
 #
-# Portions of this file are under the following copyright and license:
+#  Copyright (c) 2003-2004 Danny Brewer d29583@groovegarden.com
+#  Copyright (C) 2004-2010 OpenERP SA (<http://openerp.com>).
 #
+#  This library is free software; you can redistribute it and/or
+#  modify it under the terms of the GNU Lesser General Public
+#  License as published by the Free Software Foundation; either
+#  version 2.1 of the License, or (at your option) any later version.
 #
-#   Copyright (c) 2003-2004 Danny Brewer
-#   d29583@groovegarden.com
+#  This library is distributed in the hope that it will be useful,
+#  but WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+#  Lesser General Public License for more details.
 #
-#   This library is free software; you can redistribute it and/or
-#   modify it under the terms of the GNU Lesser General Public
-#   License as published by the Free Software Foundation; either
-#   version 2.1 of the License, or (at your option) any later version.
+#  You should have received a copy of the GNU Lesser General Public
+#  License along with this library; if not, write to the Free Software
+#  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
 #
-#   This library is distributed in the hope that it will be useful,
-#   but WITHOUT ANY WARRANTY; without even the implied warranty of
-#   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-#   Lesser General Public License for more details.
+#  See:  http://www.gnu.org/licenses/lgpl.html
 #
-#   You should have received a copy of the GNU Lesser General Public
-#   License along with this library; if not, write to the Free Software
-#   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
-#
-#   See:  http://www.gnu.org/licenses/lgpl.html
-#
-#
-# and other portions are under the following copyright and license:
-#
-#
-#    OpenERP, Open Source Management Solution>..
-#    Copyright (C) 2004-2010 OpenERP SA (<http://openerp.com>).
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU Affero General Public License as published by
-#    the Free Software Foundation, either version 3 of the License, or
-#    (at your option) any later version.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU Affero General Public License for more details.
-#
-#    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-#
-##############################################################################
+#############################################################################
+
 import uno
 import unohelper
 import string
diff --git a/addons/base_report_designer/plugin/openerp_report_designer/bin/script/ConvertFieldsToBraces.py b/addons/base_report_designer/plugin/openerp_report_designer/bin/script/ConvertFieldsToBraces.py
index ffa88a8cd06..e4e3f4ca31c 100644
--- a/addons/base_report_designer/plugin/openerp_report_designer/bin/script/ConvertFieldsToBraces.py
+++ b/addons/base_report_designer/plugin/openerp_report_designer/bin/script/ConvertFieldsToBraces.py
@@ -1,49 +1,25 @@
-##########################################################################
+#########################################################################
 #
-# Portions of this file are under the following copyright and license:
+#  Copyright (c) 2003-2004 Danny Brewer d29583@groovegarden.com
+#  Copyright (C) 2004-2010 OpenERP SA (<http://openerp.com>).
 #
+#  This library is free software; you can redistribute it and/or
+#  modify it under the terms of the GNU Lesser General Public
+#  License as published by the Free Software Foundation; either
+#  version 2.1 of the License, or (at your option) any later version.
 #
-#   Copyright (c) 2003-2004 Danny Brewer 
-#   d29583@groovegarden.com 
-# 
-#   This library is free software; you can redistribute it and/or 
-#   modify it under the terms of the GNU Lesser General Public 
-#   License as published by the Free Software Foundation; either 
-#   version 2.1 of the License, or (at your option) any later version. 
-# 
-#   This library is distributed in the hope that it will be useful, 
-#   but WITHOUT ANY WARRANTY; without even the implied warranty of 
-#   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU 
-#   Lesser General Public License for more details. 
-# 
-#   You should have received a copy of the GNU Lesser General Public 
-#   License along with this library; if not, write to the Free Software 
-#   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA 
-# 
-#   See:  http://www.gnu.org/licenses/lgpl.html 
+#  This library is distributed in the hope that it will be useful,
+#  but WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+#  Lesser General Public License for more details.
 #
-# 
-# and other portions are under the following copyright and license:
+#  You should have received a copy of the GNU Lesser General Public
+#  License along with this library; if not, write to the Free Software
+#  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
 #
+#  See:  http://www.gnu.org/licenses/lgpl.html
 #
-#    OpenERP, Open Source Management Solution>..
-#    Copyright (C) 2004-2010 OpenERP SA (<http://openerp.com>). 
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU Affero General Public License as published by
-#    the Free Software Foundation, either version 3 of the License, or
-#    (at your option) any later version.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU Affero General Public License for more details.
-#
-#    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-#
-##############################################################################
+#############################################################################
 
 import uno
 import unohelper
@@ -81,7 +57,7 @@ class ConvertFieldsToBraces( unohelper.Base, XJobExecutor ):
 if __name__<>"package":
     ConvertFieldsToBraces(None)
 else:
-    g_ImplementationHelper.addImplementation( ConvertFieldsToBraces, "org.openoffice.openerp.report.convertFB", ("com.sun.star.task.Job",),) 
+    g_ImplementationHelper.addImplementation( ConvertFieldsToBraces, "org.openoffice.openerp.report.convertFB", ("com.sun.star.task.Job",),)
 
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/base_report_designer/plugin/openerp_report_designer/bin/script/ExportToRML.py b/addons/base_report_designer/plugin/openerp_report_designer/bin/script/ExportToRML.py
index d2605ce73e4..c09bac21b3f 100644
--- a/addons/base_report_designer/plugin/openerp_report_designer/bin/script/ExportToRML.py
+++ b/addons/base_report_designer/plugin/openerp_report_designer/bin/script/ExportToRML.py
@@ -1,49 +1,26 @@
-##########################################################################
+#########################################################################
 #
-# Portions of this file are under the following copyright and license:
+#  Copyright (c) 2003-2004 Danny Brewer d29583@groovegarden.com
+#  Copyright (C) 2004-2010 OpenERP SA (<http://openerp.com>).
 #
+#  This library is free software; you can redistribute it and/or
+#  modify it under the terms of the GNU Lesser General Public
+#  License as published by the Free Software Foundation; either
+#  version 2.1 of the License, or (at your option) any later version.
 #
-#   Copyright (c) 2003-2004 Danny Brewer
-#   d29583@groovegarden.com
+#  This library is distributed in the hope that it will be useful,
+#  but WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+#  Lesser General Public License for more details.
 #
-#   This library is free software; you can redistribute it and/or
-#   modify it under the terms of the GNU Lesser General Public
-#   License as published by the Free Software Foundation; either
-#   version 2.1 of the License, or (at your option) any later version.
+#  You should have received a copy of the GNU Lesser General Public
+#  License along with this library; if not, write to the Free Software
+#  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
 #
-#   This library is distributed in the hope that it will be useful,
-#   but WITHOUT ANY WARRANTY; without even the implied warranty of
-#   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-#   Lesser General Public License for more details.
+#  See:  http://www.gnu.org/licenses/lgpl.html
 #
-#   You should have received a copy of the GNU Lesser General Public
-#   License along with this library; if not, write to the Free Software
-#   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
-#
-#   See:  http://www.gnu.org/licenses/lgpl.html
-#
-#
-# and other portions are under the following copyright and license:
-#
-#
-#    OpenERP, Open Source Management Solution>..
-#    Copyright (C) 2004-2010 OpenERP SA (<http://openerp.com>).
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU Affero General Public License as published by
-#    the Free Software Foundation, either version 3 of the License, or
-#    (at your option) any later version.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU Affero General Public License for more details.
-#
-#    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-#
-##############################################################################
+#############################################################################
+
 import os
 import uno
 import unohelper
diff --git a/addons/base_report_designer/plugin/openerp_report_designer/bin/script/Expression.py b/addons/base_report_designer/plugin/openerp_report_designer/bin/script/Expression.py
index 9e3b175b67b..9ba40432c6d 100644
--- a/addons/base_report_designer/plugin/openerp_report_designer/bin/script/Expression.py
+++ b/addons/base_report_designer/plugin/openerp_report_designer/bin/script/Expression.py
@@ -1,49 +1,26 @@
-##########################################################################
+#########################################################################
 #
-# Portions of this file are under the following copyright and license:
+#  Copyright (c) 2003-2004 Danny Brewer d29583@groovegarden.com
+#  Copyright (C) 2004-2010 OpenERP SA (<http://openerp.com>).
 #
+#  This library is free software; you can redistribute it and/or
+#  modify it under the terms of the GNU Lesser General Public
+#  License as published by the Free Software Foundation; either
+#  version 2.1 of the License, or (at your option) any later version.
 #
-#   Copyright (c) 2003-2004 Danny Brewer 
-#   d29583@groovegarden.com 
-# 
-#   This library is free software; you can redistribute it and/or 
-#   modify it under the terms of the GNU Lesser General Public 
-#   License as published by the Free Software Foundation; either 
-#   version 2.1 of the License, or (at your option) any later version. 
-# 
-#   This library is distributed in the hope that it will be useful, 
-#   but WITHOUT ANY WARRANTY; without even the implied warranty of 
-#   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU 
-#   Lesser General Public License for more details. 
-# 
-#   You should have received a copy of the GNU Lesser General Public 
-#   License along with this library; if not, write to the Free Software 
-#   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA 
-# 
-#   See:  http://www.gnu.org/licenses/lgpl.html 
+#  This library is distributed in the hope that it will be useful,
+#  but WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+#  Lesser General Public License for more details.
 #
-# 
-# and other portions are under the following copyright and license:
+#  You should have received a copy of the GNU Lesser General Public
+#  License along with this library; if not, write to the Free Software
+#  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
 #
+#  See:  http://www.gnu.org/licenses/lgpl.html
 #
-#    OpenERP, Open Source Management Solution>..
-#    Copyright (C) 2004-2010 OpenERP SA (<http://openerp.com>). 
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU Affero General Public License as published by
-#    the Free Software Foundation, either version 3 of the License, or
-#    (at your option) any later version.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU Affero General Public License for more details.
-#
-#    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-#
-##############################################################################
+#############################################################################
+
 import uno
 import string
 import unohelper
diff --git a/addons/base_report_designer/plugin/openerp_report_designer/bin/script/Fields.py b/addons/base_report_designer/plugin/openerp_report_designer/bin/script/Fields.py
index 90f85e57a0d..edfc35e30ae 100644
--- a/addons/base_report_designer/plugin/openerp_report_designer/bin/script/Fields.py
+++ b/addons/base_report_designer/plugin/openerp_report_designer/bin/script/Fields.py
@@ -1,50 +1,25 @@
-##########################################################################
+#########################################################################
 #
-# Portions of this file are under the following copyright and license:
+#  Copyright (c) 2003-2004 Danny Brewer d29583@groovegarden.com
+#  Copyright (C) 2004-2010 OpenERP SA (<http://openerp.com>).
 #
+#  This library is free software; you can redistribute it and/or
+#  modify it under the terms of the GNU Lesser General Public
+#  License as published by the Free Software Foundation; either
+#  version 2.1 of the License, or (at your option) any later version.
 #
-#   Copyright (c) 2003-2004 Danny Brewer 
-#   d29583@groovegarden.com 
-# 
-#   This library is free software; you can redistribute it and/or 
-#   modify it under the terms of the GNU Lesser General Public 
-#   License as published by the Free Software Foundation; either 
-#   version 2.1 of the License, or (at your option) any later version. 
-# 
-#   This library is distributed in the hope that it will be useful, 
-#   but WITHOUT ANY WARRANTY; without even the implied warranty of 
-#   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU 
-#   Lesser General Public License for more details. 
-# 
-#   You should have received a copy of the GNU Lesser General Public 
-#   License along with this library; if not, write to the Free Software 
-#   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA 
-# 
-#   See:  http://www.gnu.org/licenses/lgpl.html 
+#  This library is distributed in the hope that it will be useful,
+#  but WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+#  Lesser General Public License for more details.
 #
-# 
-# and other portions are under the following copyright and license:
+#  You should have received a copy of the GNU Lesser General Public
+#  License along with this library; if not, write to the Free Software
+#  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
 #
+#  See:  http://www.gnu.org/licenses/lgpl.html
 #
-#    OpenERP, Open Source Management Solution>..
-#    Copyright (C) 2004-2010 OpenERP SA (<http://openerp.com>). 
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU Affero General Public License as published by
-#    the Free Software Foundation, either version 3 of the License, or
-#    (at your option) any later version.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU Affero General Public License for more details.
-#
-#    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-#
-##############################################################################
-
+#############################################################################
 
 import uno
 import string
diff --git a/addons/base_report_designer/plugin/openerp_report_designer/bin/script/LoginTest.py b/addons/base_report_designer/plugin/openerp_report_designer/bin/script/LoginTest.py
index 85059d7712c..c6d4b3733cd 100644
--- a/addons/base_report_designer/plugin/openerp_report_designer/bin/script/LoginTest.py
+++ b/addons/base_report_designer/plugin/openerp_report_designer/bin/script/LoginTest.py
@@ -1,49 +1,26 @@
-##########################################################################
+#########################################################################
 #
-# Portions of this file are under the following copyright and license:
+#  Copyright (c) 2003-2004 Danny Brewer d29583@groovegarden.com
+#  Copyright (C) 2004-2010 OpenERP SA (<http://openerp.com>).
 #
+#  This library is free software; you can redistribute it and/or
+#  modify it under the terms of the GNU Lesser General Public
+#  License as published by the Free Software Foundation; either
+#  version 2.1 of the License, or (at your option) any later version.
 #
-#   Copyright (c) 2003-2004 Danny Brewer 
-#   d29583@groovegarden.com 
-# 
-#   This library is free software; you can redistribute it and/or 
-#   modify it under the terms of the GNU Lesser General Public 
-#   License as published by the Free Software Foundation; either 
-#   version 2.1 of the License, or (at your option) any later version. 
-# 
-#   This library is distributed in the hope that it will be useful, 
-#   but WITHOUT ANY WARRANTY; without even the implied warranty of 
-#   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU 
-#   Lesser General Public License for more details. 
-# 
-#   You should have received a copy of the GNU Lesser General Public 
-#   License along with this library; if not, write to the Free Software 
-#   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA 
-# 
-#   See:  http://www.gnu.org/licenses/lgpl.html 
+#  This library is distributed in the hope that it will be useful,
+#  but WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+#  Lesser General Public License for more details.
 #
-# 
-# and other portions are under the following copyright and license:
+#  You should have received a copy of the GNU Lesser General Public
+#  License along with this library; if not, write to the Free Software
+#  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
 #
+#  See:  http://www.gnu.org/licenses/lgpl.html
 #
-#    OpenERP, Open Source Management Solution>..
-#    Copyright (C) 2004-2010 OpenERP SA (<http://openerp.com>). 
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU Affero General Public License as published by
-#    the Free Software Foundation, either version 3 of the License, or
-#    (at your option) any later version.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU Affero General Public License for more details.
-#
-#    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-#
-##############################################################################
+#############################################################################
+
 if __name__<>"package":
     from ServerParameter import *
     from lib.gui import *
diff --git a/addons/base_report_designer/plugin/openerp_report_designer/bin/script/ModifyExistingReport.py b/addons/base_report_designer/plugin/openerp_report_designer/bin/script/ModifyExistingReport.py
index bc7d439c76d..ff75e0bcd75 100644
--- a/addons/base_report_designer/plugin/openerp_report_designer/bin/script/ModifyExistingReport.py
+++ b/addons/base_report_designer/plugin/openerp_report_designer/bin/script/ModifyExistingReport.py
@@ -1,49 +1,25 @@
-##########################################################################
+#########################################################################
 #
-# Portions of this file are under the following copyright and license:
+#  Copyright (c) 2003-2004 Danny Brewer d29583@groovegarden.com
+#  Copyright (C) 2004-2010 OpenERP SA (<http://openerp.com>).
 #
+#  This library is free software; you can redistribute it and/or
+#  modify it under the terms of the GNU Lesser General Public
+#  License as published by the Free Software Foundation; either
+#  version 2.1 of the License, or (at your option) any later version.
 #
-#   Copyright (c) 2003-2004 Danny Brewer
-#   d29583@groovegarden.com
+#  This library is distributed in the hope that it will be useful,
+#  but WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+#  Lesser General Public License for more details.
 #
-#   This library is free software; you can redistribute it and/or
-#   modify it under the terms of the GNU Lesser General Public
-#   License as published by the Free Software Foundation; either
-#   version 2.1 of the License, or (at your option) any later version.
+#  You should have received a copy of the GNU Lesser General Public
+#  License along with this library; if not, write to the Free Software
+#  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
 #
-#   This library is distributed in the hope that it will be useful,
-#   but WITHOUT ANY WARRANTY; without even the implied warranty of
-#   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-#   Lesser General Public License for more details.
+#  See:  http://www.gnu.org/licenses/lgpl.html
 #
-#   You should have received a copy of the GNU Lesser General Public
-#   License along with this library; if not, write to the Free Software
-#   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
-#
-#   See:  http://www.gnu.org/licenses/lgpl.html
-#
-#
-# and other portions are under the following copyright and license:
-#
-#
-#    OpenERP, Open Source Management Solution>..
-#    Copyright (C) 2004-2010 OpenERP SA (<http://openerp.com>).
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU Affero General Public License as published by
-#    the Free Software Foundation, either version 3 of the License, or
-#    (at your option) any later version.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU Affero General Public License for more details.
-#
-#    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-#
-##############################################################################
+#############################################################################
 
 import uno
 import string
diff --git a/addons/base_report_designer/plugin/openerp_report_designer/bin/script/NewReport.py b/addons/base_report_designer/plugin/openerp_report_designer/bin/script/NewReport.py
index 138c68b690e..884e601b9ad 100644
--- a/addons/base_report_designer/plugin/openerp_report_designer/bin/script/NewReport.py
+++ b/addons/base_report_designer/plugin/openerp_report_designer/bin/script/NewReport.py
@@ -1,49 +1,26 @@
-##########################################################################
+#########################################################################
 #
-# Portions of this file are under the following copyright and license:
+#  Copyright (c) 2003-2004 Danny Brewer d29583@groovegarden.com
+#  Copyright (C) 2004-2010 OpenERP SA (<http://openerp.com>).
 #
+#  This library is free software; you can redistribute it and/or
+#  modify it under the terms of the GNU Lesser General Public
+#  License as published by the Free Software Foundation; either
+#  version 2.1 of the License, or (at your option) any later version.
 #
-#   Copyright (c) 2003-2004 Danny Brewer 
-#   d29583@groovegarden.com 
-# 
-#   This library is free software; you can redistribute it and/or 
-#   modify it under the terms of the GNU Lesser General Public 
-#   License as published by the Free Software Foundation; either 
-#   version 2.1 of the License, or (at your option) any later version. 
-# 
-#   This library is distributed in the hope that it will be useful, 
-#   but WITHOUT ANY WARRANTY; without even the implied warranty of 
-#   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU 
-#   Lesser General Public License for more details. 
-# 
-#   You should have received a copy of the GNU Lesser General Public 
-#   License along with this library; if not, write to the Free Software 
-#   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA 
-# 
-#   See:  http://www.gnu.org/licenses/lgpl.html 
+#  This library is distributed in the hope that it will be useful,
+#  but WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+#  Lesser General Public License for more details.
 #
-# 
-# and other portions are under the following copyright and license:
+#  You should have received a copy of the GNU Lesser General Public
+#  License along with this library; if not, write to the Free Software
+#  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
 #
+#  See:  http://www.gnu.org/licenses/lgpl.html
 #
-#    OpenERP, Open Source Management Solution>..
-#    Copyright (C) 2004-2010 OpenERP SA (<http://openerp.com>). 
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU Affero General Public License as published by
-#    the Free Software Foundation, either version 3 of the License, or
-#    (at your option) any later version.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU Affero General Public License for more details.
-#
-#    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-#
-##############################################################################
+#############################################################################
+
 import uno
 import string
 import unohelper
diff --git a/addons/base_report_designer/plugin/openerp_report_designer/bin/script/Repeatln.py b/addons/base_report_designer/plugin/openerp_report_designer/bin/script/Repeatln.py
index f5e0972d2dd..35e4966de84 100644
--- a/addons/base_report_designer/plugin/openerp_report_designer/bin/script/Repeatln.py
+++ b/addons/base_report_designer/plugin/openerp_report_designer/bin/script/Repeatln.py
@@ -1,49 +1,26 @@
-##########################################################################
+#########################################################################
 #
-# Portions of this file are under the following copyright and license:
+#  Copyright (c) 2003-2004 Danny Brewer d29583@groovegarden.com
+#  Copyright (C) 2004-2010 OpenERP SA (<http://openerp.com>).
 #
+#  This library is free software; you can redistribute it and/or
+#  modify it under the terms of the GNU Lesser General Public
+#  License as published by the Free Software Foundation; either
+#  version 2.1 of the License, or (at your option) any later version.
 #
-#   Copyright (c) 2003-2004 Danny Brewer 
-#   d29583@groovegarden.com 
-# 
-#   This library is free software; you can redistribute it and/or 
-#   modify it under the terms of the GNU Lesser General Public 
-#   License as published by the Free Software Foundation; either 
-#   version 2.1 of the License, or (at your option) any later version. 
-# 
-#   This library is distributed in the hope that it will be useful, 
-#   but WITHOUT ANY WARRANTY; without even the implied warranty of 
-#   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU 
-#   Lesser General Public License for more details. 
-# 
-#   You should have received a copy of the GNU Lesser General Public 
-#   License along with this library; if not, write to the Free Software 
-#   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA 
-# 
-#   See:  http://www.gnu.org/licenses/lgpl.html 
+#  This library is distributed in the hope that it will be useful,
+#  but WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+#  Lesser General Public License for more details.
 #
-# 
-# and other portions are under the following copyright and license:
+#  You should have received a copy of the GNU Lesser General Public
+#  License along with this library; if not, write to the Free Software
+#  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
 #
+#  See:  http://www.gnu.org/licenses/lgpl.html
 #
-#    OpenERP, Open Source Management Solution>..
-#    Copyright (C) 2004-2010 OpenERP SA (<http://openerp.com>). 
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU Affero General Public License as published by
-#    the Free Software Foundation, either version 3 of the License, or
-#    (at your option) any later version.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU Affero General Public License for more details.
-#
-#    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-#
-##############################################################################
+#############################################################################
+
 import uno
 import string
 import unohelper
diff --git a/addons/base_report_designer/plugin/openerp_report_designer/bin/script/SendToServer.py b/addons/base_report_designer/plugin/openerp_report_designer/bin/script/SendToServer.py
index 7e83910a427..eec2131a8bf 100644
--- a/addons/base_report_designer/plugin/openerp_report_designer/bin/script/SendToServer.py
+++ b/addons/base_report_designer/plugin/openerp_report_designer/bin/script/SendToServer.py
@@ -1,49 +1,25 @@
-##########################################################################
+#########################################################################
 #
-# Portions of this file are under the following copyright and license:
+#  Copyright (c) 2003-2004 Danny Brewer d29583@groovegarden.com
+#  Copyright (C) 2004-2010 OpenERP SA (<http://openerp.com>).
 #
+#  This library is free software; you can redistribute it and/or
+#  modify it under the terms of the GNU Lesser General Public
+#  License as published by the Free Software Foundation; either
+#  version 2.1 of the License, or (at your option) any later version.
 #
-#   Copyright (c) 2003-2004 Danny Brewer
-#   d29583@groovegarden.com
+#  This library is distributed in the hope that it will be useful,
+#  but WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+#  Lesser General Public License for more details.
 #
-#   This library is free software; you can redistribute it and/or
-#   modify it under the terms of the GNU Lesser General Public
-#   License as published by the Free Software Foundation; either
-#   version 2.1 of the License, or (at your option) any later version.
+#  You should have received a copy of the GNU Lesser General Public
+#  License along with this library; if not, write to the Free Software
+#  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
 #
-#   This library is distributed in the hope that it will be useful,
-#   but WITHOUT ANY WARRANTY; without even the implied warranty of
-#   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-#   Lesser General Public License for more details.
+#  See:  http://www.gnu.org/licenses/lgpl.html
 #
-#   You should have received a copy of the GNU Lesser General Public
-#   License along with this library; if not, write to the Free Software
-#   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
-#
-#   See:  http://www.gnu.org/licenses/lgpl.html
-#
-#
-# and other portions are under the following copyright and license:
-#
-#
-#    OpenERP, Open Source Management Solution>..
-#    Copyright (C) 2004-2010 OpenERP SA (<http://openerp.com>).
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU Affero General Public License as published by
-#    the Free Software Foundation, either version 3 of the License, or
-#    (at your option) any later version.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU Affero General Public License for more details.
-#
-#    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-#
-##############################################################################
+#############################################################################
 
 import uno
 import string
@@ -201,7 +177,7 @@ class SendtoServer(unohelper.Base, XJobExecutor):
             if self.win.getListBoxSelectedItem("lstResourceType")=='OpenOffice':
                 params['report_type']=file_type
             self.sock.execute(database, uid, self.password, 'ir.actions.report.xml', 'write', int(docinfo.getUserFieldValue(2)), params)
-            
+
             # Call upload_report as the *last* step, as it will call register_all() and cause the report service
             # to be loaded - which requires all the data to be correct in the database
             self.sock.execute(database, uid, self.password, 'ir.actions.report.xml', 'upload_report', int(docinfo.getUserFieldValue(2)),base64.encodestring(data),file_type,{})
diff --git a/addons/base_report_designer/plugin/openerp_report_designer/bin/script/ServerParameter.py b/addons/base_report_designer/plugin/openerp_report_designer/bin/script/ServerParameter.py
index c399634bfe5..b65fe403a80 100644
--- a/addons/base_report_designer/plugin/openerp_report_designer/bin/script/ServerParameter.py
+++ b/addons/base_report_designer/plugin/openerp_report_designer/bin/script/ServerParameter.py
@@ -1,49 +1,26 @@
-##########################################################################
+#########################################################################
 #
-# Portions of this file are under the following copyright and license:
+#  Copyright (c) 2003-2004 Danny Brewer d29583@groovegarden.com
+#  Copyright (C) 2004-2010 OpenERP SA (<http://openerp.com>).
 #
+#  This library is free software; you can redistribute it and/or
+#  modify it under the terms of the GNU Lesser General Public
+#  License as published by the Free Software Foundation; either
+#  version 2.1 of the License, or (at your option) any later version.
 #
-#   Copyright (c) 2003-2004 Danny Brewer
-#   d29583@groovegarden.com
+#  This library is distributed in the hope that it will be useful,
+#  but WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+#  Lesser General Public License for more details.
 #
-#   This library is free software; you can redistribute it and/or
-#   modify it under the terms of the GNU Lesser General Public
-#   License as published by the Free Software Foundation; either
-#   version 2.1 of the License, or (at your option) any later version.
+#  You should have received a copy of the GNU Lesser General Public
+#  License along with this library; if not, write to the Free Software
+#  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
 #
-#   This library is distributed in the hope that it will be useful,
-#   but WITHOUT ANY WARRANTY; without even the implied warranty of
-#   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-#   Lesser General Public License for more details.
+#  See:  http://www.gnu.org/licenses/lgpl.html
 #
-#   You should have received a copy of the GNU Lesser General Public
-#   License along with this library; if not, write to the Free Software
-#   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
-#
-#   See:  http://www.gnu.org/licenses/lgpl.html
-#
-#
-# and other portions are under the following copyright and license:
-#
-#
-#    OpenERP, Open Source Management Solution>..
-#    Copyright (C) 2004-2010 OpenERP SA (<http://openerp.com>).
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU Affero General Public License as published by
-#    the Free Software Foundation, either version 3 of the License, or
-#    (at your option) any later version.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU Affero General Public License for more details.
-#
-#    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-#
-##############################################################################
+#############################################################################
+
 import uno
 import string
 import unohelper
diff --git a/addons/base_report_designer/plugin/openerp_report_designer/bin/script/Translation.py b/addons/base_report_designer/plugin/openerp_report_designer/bin/script/Translation.py
index 05f81a5c5b2..0b513b1256d 100644
--- a/addons/base_report_designer/plugin/openerp_report_designer/bin/script/Translation.py
+++ b/addons/base_report_designer/plugin/openerp_report_designer/bin/script/Translation.py
@@ -1,49 +1,25 @@
-##########################################################################
+#########################################################################
 #
-# Portions of this file are under the following copyright and license:
+#  Copyright (c) 2003-2004 Danny Brewer d29583@groovegarden.com
+#  Copyright (C) 2004-2010 OpenERP SA (<http://openerp.com>).
 #
+#  This library is free software; you can redistribute it and/or
+#  modify it under the terms of the GNU Lesser General Public
+#  License as published by the Free Software Foundation; either
+#  version 2.1 of the License, or (at your option) any later version.
 #
-#   Copyright (c) 2003-2004 Danny Brewer
-#   d29583@groovegarden.com
+#  This library is distributed in the hope that it will be useful,
+#  but WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+#  Lesser General Public License for more details.
 #
-#   This library is free software; you can redistribute it and/or
-#   modify it under the terms of the GNU Lesser General Public
-#   License as published by the Free Software Foundation; either
-#   version 2.1 of the License, or (at your option) any later version.
+#  You should have received a copy of the GNU Lesser General Public
+#  License along with this library; if not, write to the Free Software
+#  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
 #
-#   This library is distributed in the hope that it will be useful,
-#   but WITHOUT ANY WARRANTY; without even the implied warranty of
-#   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-#   Lesser General Public License for more details.
+#  See:  http://www.gnu.org/licenses/lgpl.html
 #
-#   You should have received a copy of the GNU Lesser General Public
-#   License along with this library; if not, write to the Free Software
-#   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
-#
-#   See:  http://www.gnu.org/licenses/lgpl.html
-#
-#
-# and other portions are under the following copyright and license:
-#
-#
-#    OpenERP, Open Source Management Solution>..
-#    Copyright (C) 2004-2010 OpenERP SA (<http://openerp.com>).
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU Affero General Public License as published by
-#    the Free Software Foundation, either version 3 of the License, or
-#    (at your option) any later version.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU Affero General Public License for more details.
-#
-#    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-#
-##############################################################################
+#############################################################################
 
 import uno
 import string
diff --git a/addons/base_report_designer/plugin/openerp_report_designer/bin/script/__init__.py b/addons/base_report_designer/plugin/openerp_report_designer/bin/script/__init__.py
index 0ccd1c9d011..8c2545c6fdc 100644
--- a/addons/base_report_designer/plugin/openerp_report_designer/bin/script/__init__.py
+++ b/addons/base_report_designer/plugin/openerp_report_designer/bin/script/__init__.py
@@ -1,49 +1,26 @@
-##########################################################################
+#########################################################################
 #
-# Portions of this file are under the following copyright and license:
+#  Copyright (c) 2003-2004 Danny Brewer d29583@groovegarden.com
+#  Copyright (C) 2004-2010 OpenERP SA (<http://openerp.com>).
 #
+#  This library is free software; you can redistribute it and/or
+#  modify it under the terms of the GNU Lesser General Public
+#  License as published by the Free Software Foundation; either
+#  version 2.1 of the License, or (at your option) any later version.
 #
-#   Copyright (c) 2003-2004 Danny Brewer 
-#   d29583@groovegarden.com 
-# 
-#   This library is free software; you can redistribute it and/or 
-#   modify it under the terms of the GNU Lesser General Public 
-#   License as published by the Free Software Foundation; either 
-#   version 2.1 of the License, or (at your option) any later version. 
-# 
-#   This library is distributed in the hope that it will be useful, 
-#   but WITHOUT ANY WARRANTY; without even the implied warranty of 
-#   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU 
-#   Lesser General Public License for more details. 
-# 
-#   You should have received a copy of the GNU Lesser General Public 
-#   License along with this library; if not, write to the Free Software 
-#   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA 
-# 
-#   See:  http://www.gnu.org/licenses/lgpl.html 
+#  This library is distributed in the hope that it will be useful,
+#  but WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+#  Lesser General Public License for more details.
 #
-# 
-# and other portions are under the following copyright and license:
+#  You should have received a copy of the GNU Lesser General Public
+#  License along with this library; if not, write to the Free Software
+#  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
 #
+#  See:  http://www.gnu.org/licenses/lgpl.html
 #
-#    OpenERP, Open Source Management Solution>..
-#    Copyright (C) 2004-2010 OpenERP SA (<http://openerp.com>). 
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU Affero General Public License as published by
-#    the Free Software Foundation, either version 3 of the License, or
-#    (at your option) any later version.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU Affero General Public License for more details.
-#
-#    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-#
-##############################################################################
+#############################################################################
+
 import Expression
 import lib
 import Fields
diff --git a/addons/base_report_designer/plugin/openerp_report_designer/bin/script/compile_all.py b/addons/base_report_designer/plugin/openerp_report_designer/bin/script/compile_all.py
index 4740c61b178..05decaaab5d 100644
--- a/addons/base_report_designer/plugin/openerp_report_designer/bin/script/compile_all.py
+++ b/addons/base_report_designer/plugin/openerp_report_designer/bin/script/compile_all.py
@@ -1,49 +1,26 @@
-##########################################################################
+#########################################################################
 #
-# Portions of this file are under the following copyright and license:
+#  Copyright (c) 2003-2004 Danny Brewer d29583@groovegarden.com
+#  Copyright (C) 2004-2010 OpenERP SA (<http://openerp.com>).
 #
+#  This library is free software; you can redistribute it and/or
+#  modify it under the terms of the GNU Lesser General Public
+#  License as published by the Free Software Foundation; either
+#  version 2.1 of the License, or (at your option) any later version.
 #
-#   Copyright (c) 2003-2004 Danny Brewer 
-#   d29583@groovegarden.com 
-# 
-#   This library is free software; you can redistribute it and/or 
-#   modify it under the terms of the GNU Lesser General Public 
-#   License as published by the Free Software Foundation; either 
-#   version 2.1 of the License, or (at your option) any later version. 
-# 
-#   This library is distributed in the hope that it will be useful, 
-#   but WITHOUT ANY WARRANTY; without even the implied warranty of 
-#   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU 
-#   Lesser General Public License for more details. 
-# 
-#   You should have received a copy of the GNU Lesser General Public 
-#   License along with this library; if not, write to the Free Software 
-#   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA 
-# 
-#   See:  http://www.gnu.org/licenses/lgpl.html 
+#  This library is distributed in the hope that it will be useful,
+#  but WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+#  Lesser General Public License for more details.
 #
-# 
-# and other portions are under the following copyright and license:
+#  You should have received a copy of the GNU Lesser General Public
+#  License along with this library; if not, write to the Free Software
+#  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
 #
+#  See:  http://www.gnu.org/licenses/lgpl.html
 #
-#    OpenERP, Open Source Management Solution>..
-#    Copyright (C) 2004-2010 OpenERP SA (<http://openerp.com>). 
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU Affero General Public License as published by
-#    the Free Software Foundation, either version 3 of the License, or
-#    (at your option) any later version.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU Affero General Public License for more details.
-#
-#    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-#
-##############################################################################
+#############################################################################
+
 import compileall
 
 compileall.compile_dir('package')
diff --git a/addons/base_report_designer/plugin/openerp_report_designer/bin/script/modify.py b/addons/base_report_designer/plugin/openerp_report_designer/bin/script/modify.py
index 60edbc71d96..aed354771d1 100644
--- a/addons/base_report_designer/plugin/openerp_report_designer/bin/script/modify.py
+++ b/addons/base_report_designer/plugin/openerp_report_designer/bin/script/modify.py
@@ -1,49 +1,25 @@
-##########################################################################
+#########################################################################
 #
-# Portions of this file are under the following copyright and license:
+#  Copyright (c) 2003-2004 Danny Brewer d29583@groovegarden.com
+#  Copyright (C) 2004-2010 OpenERP SA (<http://openerp.com>).
 #
+#  This library is free software; you can redistribute it and/or
+#  modify it under the terms of the GNU Lesser General Public
+#  License as published by the Free Software Foundation; either
+#  version 2.1 of the License, or (at your option) any later version.
 #
-#   Copyright (c) 2003-2004 Danny Brewer
-#   d29583@groovegarden.com
+#  This library is distributed in the hope that it will be useful,
+#  but WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+#  Lesser General Public License for more details.
 #
-#   This library is free software; you can redistribute it and/or
-#   modify it under the terms of the GNU Lesser General Public
-#   License as published by the Free Software Foundation; either
-#   version 2.1 of the License, or (at your option) any later version.
+#  You should have received a copy of the GNU Lesser General Public
+#  License along with this library; if not, write to the Free Software
+#  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
 #
-#   This library is distributed in the hope that it will be useful,
-#   but WITHOUT ANY WARRANTY; without even the implied warranty of
-#   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-#   Lesser General Public License for more details.
+#  See:  http://www.gnu.org/licenses/lgpl.html
 #
-#   You should have received a copy of the GNU Lesser General Public
-#   License along with this library; if not, write to the Free Software
-#   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
-#
-#   See:  http://www.gnu.org/licenses/lgpl.html
-#
-#
-# and other portions are under the following copyright and license:
-#
-#
-#    OpenERP, Open Source Management Solution>..
-#    Copyright (C) 2004-2010 OpenERP SA (<http://openerp.com>).
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU Affero General Public License as published by
-#    the Free Software Foundation, either version 3 of the License, or
-#    (at your option) any later version.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU Affero General Public License for more details.
-#
-#    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-#
-##############################################################################
+#############################################################################
 
 import re
 import uno

From 6b04a532b8fa11405e1219d6d0640d1a8db140a7 Mon Sep 17 00:00:00 2001
From: Launchpad Translations on behalf of openerp <>
Date: Tue, 23 Apr 2013 06:10:19 +0000
Subject: [PATCH 088/121] Launchpad automatic translations update.

bzr revid: launchpad_translations_on_behalf_of_openerp-20130423060902-2j8xouki50aemi14
bzr revid: launchpad_translations_on_behalf_of_openerp-20130423061017-5os2p9ztugb6jjph
bzr revid: launchpad_translations_on_behalf_of_openerp-20130423061019-n2660taj1o9os75c
---
 addons/account/i18n/fr.po                     |  12 +-
 addons/account/i18n/he.po                     |  35 +-
 addons/account/i18n/pt_BR.po                  |  13 +-
 addons/account/i18n/tr.po                     |   4 +-
 addons/account_analytic_analysis/i18n/hu.po   |  48 ++-
 addons/account_analytic_default/i18n/hu.po    |  26 +-
 .../i18n/de.po                                |  11 +-
 addons/account_budget/i18n/de.po              |  11 +-
 addons/account_cancel/i18n/de.po              |  11 +-
 addons/account_followup/i18n/fr.po            | 225 ++++++++++++-
 addons/account_followup/i18n/pt_BR.po         |  11 +-
 addons/account_payment/i18n/de.po             |  11 +-
 addons/anonymization/i18n/de.po               |  31 +-
 addons/base_calendar/i18n/nl.po               |   8 +-
 addons/base_gengo/i18n/de.po                  |  20 +-
 addons/base_import/i18n/de.po                 |  10 +-
 addons/document_page/i18n/fr.po               |  10 +-
 addons/hr/i18n/de.po                          |  13 +-
 addons/hr_contract/i18n/de.po                 |  11 +-
 addons/mail/i18n/de.po                        |  11 +-
 addons/marketing_campaign_crm_demo/i18n/de.po |  60 +++-
 addons/membership/i18n/de.po                  |  10 +-
 addons/mrp/i18n/fr.po                         |   8 +-
 addons/pad/i18n/de.po                         |  17 +-
 addons/point_of_sale/i18n/de.po               |  66 ++--
 addons/point_of_sale/i18n/pt_BR.po            |  24 +-
 addons/procurement/i18n/de.po                 |  81 +++--
 addons/purchase/i18n/de.po                    |  15 +-
 addons/purchase_requisition/i18n/de.po        |  13 +-
 addons/report_webkit/i18n/de.po               |  10 +-
 addons/sale/i18n/de.po                        |  12 +-
 addons/sale/i18n/fr.po                        | 109 ++++++-
 addons/share/i18n/tr.po                       |  24 +-
 addons/stock/i18n/de.po                       |  10 +-
 addons/stock/i18n/fr.po                       |  93 +++---
 addons/stock/i18n/tr.po                       |  46 ++-
 addons/web_calendar/i18n/de.po                |  12 +-
 addons/web_kanban/i18n/de.po                  |  15 +-
 openerp/addons/base/i18n/de.po                | 303 +++++++++++++-----
 openerp/addons/base/i18n/he.po                |  64 ++--
 openerp/addons/base/i18n/zh_CN.po             |  10 +-
 41 files changed, 1104 insertions(+), 430 deletions(-)

diff --git a/addons/account/i18n/fr.po b/addons/account/i18n/fr.po
index d6676248e19..372175a1f18 100644
--- a/addons/account/i18n/fr.po
+++ b/addons/account/i18n/fr.po
@@ -8,15 +8,15 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2013-03-07 08:37+0000\n"
-"PO-Revision-Date: 2013-04-15 08:33+0000\n"
+"PO-Revision-Date: 2013-04-22 08:47+0000\n"
 "Last-Translator: Frederic Clementi - Camptocamp.com "
 "<frederic.clementi@camptocamp.com>\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: 2013-04-16 05:27+0000\n"
-"X-Generator: Launchpad (build 16564)\n"
+"X-Launchpad-Export-Date: 2013-04-23 06:09+0000\n"
+"X-Generator: Launchpad (build 16580)\n"
 
 #. module: account
 #: model:process.transition,name:account.process_transition_supplierreconcilepaid0
@@ -2937,7 +2937,7 @@ msgstr "Coordonnées bancaires"
 #. module: account
 #: view:account.bank.statement:0
 msgid "Cancel CashBox"
-msgstr ""
+msgstr "Annulation Caisse"
 
 #. module: account
 #: help:account.invoice,payment_term:0
@@ -3039,7 +3039,7 @@ msgstr "Erreur de paramétrage !"
 #: code:addons/account/account_bank_statement.py:433
 #, python-format
 msgid "Statement %s confirmed, journal items were created."
-msgstr ""
+msgstr "Relevé %s confirmé, écritures comptables créées"
 
 #. module: account
 #: field:account.invoice.report,price_average:0
@@ -4410,7 +4410,7 @@ msgstr "Compte fournisseur"
 #: code:addons/account/wizard/account_fiscalyear_close.py:88
 #, python-format
 msgid "The periods to generate opening entries cannot be found."
-msgstr ""
+msgstr "Aucune période d'ouverture n'a été trouvée"
 
 #. module: account
 #: model:process.node,name:account.process_node_supplierpaymentorder0
diff --git a/addons/account/i18n/he.po b/addons/account/i18n/he.po
index ba61f13a873..674a126f0c0 100644
--- a/addons/account/i18n/he.po
+++ b/addons/account/i18n/he.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2013-03-07 08:37+0000\n"
-"PO-Revision-Date: 2012-12-21 23:00+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"PO-Revision-Date: 2013-04-22 20:44+0000\n"
+"Last-Translator: omer pines <omerpines@gmail.com>\n"
 "Language-Team: Hebrew <he@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: 2013-03-28 05:23+0000\n"
-"X-Generator: Launchpad (build 16546)\n"
+"X-Launchpad-Export-Date: 2013-04-23 06:09+0000\n"
+"X-Generator: Launchpad (build 16580)\n"
 
 #. module: account
 #: model:process.transition,name:account.process_transition_supplierreconcilepaid0
@@ -45,28 +45,28 @@ msgstr ""
 #: view:account.bank.statement:0
 #: view:account.move.line:0
 msgid "Account Statistics"
-msgstr ""
+msgstr "סטטיסטיקות של החשבון"
 
 #. module: account
 #: view:account.invoice:0
 msgid "Proforma/Open/Paid Invoices"
-msgstr ""
+msgstr "פְּרוֹ-פוֹרְמָה/פתוח/חשבוניות ששולמו"
 
 #. module: account
 #: field:report.invoice.created,residual:0
 msgid "Residual"
-msgstr ""
+msgstr "שארית"
 
 #. module: account
 #: code:addons/account/account_bank_statement.py:368
 #, python-format
 msgid "Journal item \"%s\" is not valid."
-msgstr ""
+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
@@ -79,13 +79,13 @@ msgstr ""
 #: code:addons/account/account_move_line.py:1213
 #, python-format
 msgid "Bad Account!"
-msgstr ""
+msgstr "חשבון שגוי!"
 
 #. module: account
 #: view:account.move:0
 #: view:account.move.line:0
 msgid "Total Debit"
-msgstr ""
+msgstr "סה\"כ חיוב"
 
 #. module: account
 #: constraint:account.account.template:0
@@ -93,6 +93,8 @@ msgid ""
 "Error!\n"
 "You cannot create recursive account templates."
 msgstr ""
+"שגיאה!\n"
+"לא ניתן לייצר תבניות חשבון רקורסיביות."
 
 #. module: account
 #. openerp-web
@@ -123,6 +125,7 @@ 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.py:641
@@ -145,7 +148,7 @@ msgstr ""
 #: code:addons/account/wizard/account_validate_account_move.py:61
 #, python-format
 msgid "Warning!"
-msgstr ""
+msgstr "אזהרה!"
 
 #. module: account
 #: code:addons/account/account.py:3159
@@ -161,12 +164,14 @@ msgid ""
 "which is set after generating opening entries from 'Generate Opening "
 "Entries'."
 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 ""
+msgstr "מקור החשבון"
 
 #. module: account
 #: model:ir.actions.act_window,help:account.action_account_period
@@ -183,7 +188,7 @@ msgstr ""
 #. module: account
 #: model:ir.actions.act_window,name:account.action_view_created_invoice_dashboard
 msgid "Invoices Created Within Past 15 Days"
-msgstr ""
+msgstr "חשבוניות שנוצרו במהלך 15 הימים האחרונים"
 
 #. module: account
 #: field:accounting.report,label_filter:0
@@ -276,7 +281,7 @@ msgstr ""
 #. module: account
 #: view:account.analytic.chart:0
 msgid "Select the Period for Analysis"
-msgstr ""
+msgstr "בחירת תקופה לניתוח"
 
 #. module: account
 #: model:ir.actions.act_window,help:account.action_invoice_tree3
diff --git a/addons/account/i18n/pt_BR.po b/addons/account/i18n/pt_BR.po
index e8fb05c6d66..3722a023ed1 100644
--- a/addons/account/i18n/pt_BR.po
+++ b/addons/account/i18n/pt_BR.po
@@ -8,15 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2013-03-07 08:37+0000\n"
-"PO-Revision-Date: 2013-03-16 04:18+0000\n"
-"Last-Translator: Fábio Martinelli - http://zupy.com.br "
-"<webmaster@guaru.net>\n"
+"PO-Revision-Date: 2013-04-22 03:12+0000\n"
+"Last-Translator: Thiago Tognoli <Unknown>\n"
 "Language-Team: Brazilian Portuguese <pt_BR@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: 2013-03-28 05:26+0000\n"
-"X-Generator: Launchpad (build 16546)\n"
+"X-Launchpad-Export-Date: 2013-04-23 06:09+0000\n"
+"X-Generator: Launchpad (build 16580)\n"
 
 #. module: account
 #: model:process.transition,name:account.process_transition_supplierreconcilepaid0
@@ -437,7 +436,7 @@ msgstr "Cancelar fatura"
 #. module: account
 #: selection:account.journal,type:0
 msgid "Purchase Refund"
-msgstr "Devolução da Venda"
+msgstr "Devolução de Compra"
 
 #. module: account
 #: selection:account.journal,type:0
@@ -9991,7 +9990,7 @@ msgstr "Situação do fechamento de Ano Fiscal e períodos"
 #. module: account
 #: field:account.config.settings,purchase_refund_journal_id:0
 msgid "Purchase refund journal"
-msgstr "Diário de Devolução de Vendas"
+msgstr "Diário de Devolução de Compras"
 
 #. module: account
 #: view:account.analytic.line:0
diff --git a/addons/account/i18n/tr.po b/addons/account/i18n/tr.po
index 29c22bdb47c..4784dd9d075 100644
--- a/addons/account/i18n/tr.po
+++ b/addons/account/i18n/tr.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: 2013-04-21 05:32+0000\n"
-"X-Generator: Launchpad (build 16567)\n"
+"X-Launchpad-Export-Date: 2013-04-23 06:09+0000\n"
+"X-Generator: Launchpad (build 16580)\n"
 "Language: tr\n"
 
 #. module: account
diff --git a/addons/account_analytic_analysis/i18n/hu.po b/addons/account_analytic_analysis/i18n/hu.po
index bd8b3ee9255..825c56382f8 100644
--- a/addons/account_analytic_analysis/i18n/hu.po
+++ b/addons/account_analytic_analysis/i18n/hu.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2013-03-07 08:37+0000\n"
-"PO-Revision-Date: 2013-04-01 18:12+0000\n"
-"Last-Translator: Herczeg Péter <hp@erp-cloud.hu>\n"
+"PO-Revision-Date: 2013-04-21 23:19+0000\n"
+"Last-Translator: krnkris <Unknown>\n"
 "Language-Team: Hungarian <hu@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: 2013-04-02 05:47+0000\n"
-"X-Generator: Launchpad (build 16546)\n"
+"X-Launchpad-Export-Date: 2013-04-23 06:09+0000\n"
+"X-Generator: Launchpad (build 16580)\n"
 
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
@@ -50,7 +50,7 @@ msgstr "Valós fedezeti hányad (%)"
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
 msgid "End date passed or prepaid unit consumed"
-msgstr ""
+msgstr "Határidő túllépett vagy az előre kifizetett egységek elfogytak"
 
 #. module: account_analytic_analysis
 #: field:account.analytic.account,last_worked_date:0
@@ -116,7 +116,7 @@ msgstr "Ennek a szerződéshez tartozó időkimutatás számlázott sorai."
 #. module: account_analytic_analysis
 #: model:email.template,subject:account_analytic_analysis.account_analytic_cron_email_template
 msgid "Contract expiration reminder ${user.company_id.name}"
-msgstr ""
+msgstr "Figyelmeztetés a szerződés lejártára ${user.company_id.name}"
 
 #. module: account_analytic_analysis
 #: code:addons/account_analytic_analysis/account_analytic_analysis.py:466
@@ -127,7 +127,7 @@ msgstr "Megrendelés sorok ebből %s"
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
 msgid "End date is in the next month"
-msgstr ""
+msgstr "A lejárat dátuma a következő hónapban lesz"
 
 #. module: account_analytic_analysis
 #: help:account.analytic.account,revenue_per_hour:0
@@ -169,6 +169,20 @@ msgid ""
 "              </p>\n"
 "            "
 msgstr ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Kattintson új szerződés létrehozásához.\n"
+"              </p><p>\n"
+"                Itt találhatók a frissítendő szerződések, melyeknek a "
+"lejárati\n"
+"                ideje túllépett, vagy a belelőlt energia nagyobb mint a\n"
+"                maximum megengedett.\n"
+"              </p><p>\n"
+"                OpenERP automatikusan frissítésre állítja a függőben\n"
+"                lévőket. A tárgyalás után, az értékesítőnek le kell zárnia "
+"vagy meg \n"
+"                kell újítania a fügőben lévő szerződéseket.\n"
+"              </p>\n"
+"            "
 
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
@@ -251,7 +265,7 @@ msgstr "Nincs mit számlázni, hozzon létre"
 #. module: account_analytic_analysis
 #: model:res.groups,name:account_analytic_analysis.group_template_required
 msgid "Mandatory use of templates in contracts"
-msgstr ""
+msgstr "Kizárólag sablonok használhatóak a szerződésekhez"
 
 #. module: account_analytic_analysis
 #: help:account.analytic.account,last_worked_invoiced_date:0
@@ -310,7 +324,7 @@ msgstr "Gyűjtő főkönyvi szla."
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
 msgid "Units Consumed"
-msgstr ""
+msgstr "Elfogyasztott egységek"
 
 #. module: account_analytic_analysis
 #: field:account.analytic.account,month_ids:0
@@ -425,6 +439,8 @@ msgid ""
 "Number of time (hours/days) (from journal of type 'general') that can be "
 "invoiced if you invoice based on analytic account."
 msgstr ""
+"Idő mennyisége (órák/napok) (Az 'általános' típusú naplóból) melyek "
+"számlázhatóak, ha a számlázás a gyüjtőkódon alapszik."
 
 #. module: account_analytic_analysis
 #: field:account.analytic.account,is_overdue_quantity:0
@@ -485,7 +501,7 @@ msgstr "Felhasználó"
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
 msgid "Cancelled contracts"
-msgstr ""
+msgstr "Visszavont szerződések"
 
 #. module: account_analytic_analysis
 #: model:ir.actions.act_window,help:account_analytic_analysis.template_of_contract_action
@@ -500,6 +516,16 @@ msgid ""
 "                </p>\n"
 "            "
 msgstr ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                    Kattintson szerződés sablon létrehozásához.\n"
+"                </p><p>\n"
+"                    Sablonokat használ a szerződések/projektek "
+"elképzelésénak kialakításához, \n"
+"                    melyeket az értékesítő kiválaszthat és gyorsan "
+"beállíthat a szerződés\n"
+"                    feltételeihez és részleteihez.\n"
+"                </p>\n"
+"            "
 
 #. module: account_analytic_analysis
 #: model:ir.model,name:account_analytic_analysis.model_account_analytic_analysis_summary_user
@@ -536,7 +562,7 @@ msgstr "Bevétel per idő (valós)"
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
 msgid "Expired or consumed"
-msgstr ""
+msgstr "Lejárt vagy elfogyasztott"
 
 #. module: account_analytic_analysis
 #: model:ir.actions.act_window,help:account_analytic_analysis.action_account_analytic_overdue_all
diff --git a/addons/account_analytic_default/i18n/hu.po b/addons/account_analytic_default/i18n/hu.po
index f3d9f7396b2..9b0ba8772e7 100644
--- a/addons/account_analytic_default/i18n/hu.po
+++ b/addons/account_analytic_default/i18n/hu.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2013-03-07 08:37+0000\n"
-"PO-Revision-Date: 2012-12-21 23:00+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"PO-Revision-Date: 2013-04-21 23:02+0000\n"
+"Last-Translator: krnkris <Unknown>\n"
 "Language-Team: Hungarian <hu@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: 2013-03-28 05:28+0000\n"
-"X-Generator: Launchpad (build 16546)\n"
+"X-Launchpad-Export-Date: 2013-04-23 06:09+0000\n"
+"X-Generator: Launchpad (build 16580)\n"
 
 #. module: account_analytic_default
 #: model:ir.actions.act_window,name:account_analytic_default.analytic_rule_action_partner
@@ -32,7 +32,7 @@ msgstr "Csoportosítás"
 #. module: account_analytic_default
 #: help:account.analytic.default,date_stop:0
 msgid "Default end date for this Analytic Account."
-msgstr ""
+msgstr "Alapértelmezett befejező dátum ehhez a gyüjtőkódhoz."
 
 #. module: account_analytic_default
 #: help:account.analytic.default,product_id:0
@@ -41,6 +41,10 @@ msgid ""
 "default (e.g. create new customer invoice or Sales order if we select this "
 "product, it will automatically take this as an analytic account)"
 msgstr ""
+"Válasszon terméket ami az alapértelmezett gyüjttőkódban meghatározott "
+"gyűjtőkódot fogja használni (pl. ennek a terméknek a kiválasztásakor "
+"létrehoz új vevői számlát vagy megrendelést, amit automatikusan mint "
+"gyűjtókódot vesz figyelembe)"
 
 #. module: account_analytic_default
 #: model:ir.model,name:account_analytic_default.model_stock_picking
@@ -65,6 +69,10 @@ msgid ""
 "default (e.g. create new customer invoice or Sales order if we select this "
 "partner, it will automatically take this as an analytic account)"
 msgstr ""
+"Válasszon partnert aki az alapértelmezett gyüjttőkódban meghatározott "
+"gyűjtőkódot fogja használni (pl. ennek a terméknek a kiválasztásakor "
+"létrehoz új vevői számlát vagy megrendelést, amit automatikusan mint "
+"gyűjtókódot vesz figyelembe)"
 
 #. module: account_analytic_default
 #: view:account.analytic.default:0
@@ -105,6 +113,8 @@ msgstr "Sorszám"
 msgid ""
 "Select a user which will use analytic account specified in analytic default."
 msgstr ""
+"Válasszon felhasználót aki az alapértelmezett gyüjttőkódban meghatározott "
+"gyűjtőkódot fogja használni"
 
 #. module: account_analytic_default
 #: model:ir.model,name:account_analytic_default.model_account_invoice_line
@@ -118,6 +128,10 @@ msgid ""
 "default (e.g. create new customer invoice or Sales order if we select this "
 "company, it will automatically take this as an analytic account)"
 msgstr ""
+"Válasszon vállalatot aki az alapértelmezett gyüjttőkódban meghatározott "
+"gyűjtőkódot fogja használni (pl. ennek a terméknek a kiválasztásakor "
+"létrehoz új vevői számlát vagy megrendelést, amit automatikusan mint "
+"gyűjtókódot vesz figyelembe)"
 
 #. module: account_analytic_default
 #: view:account.analytic.default:0
@@ -133,7 +147,7 @@ msgstr "Analitikus felosztás"
 #. module: account_analytic_default
 #: help:account.analytic.default,date_start:0
 msgid "Default start date for this Analytic Account."
-msgstr ""
+msgstr "Alapértelmezett indulási dátum ehhez a gyüjtőkódhoz."
 
 #. module: account_analytic_default
 #: view:account.analytic.default:0
diff --git a/addons/account_bank_statement_extensions/i18n/de.po b/addons/account_bank_statement_extensions/i18n/de.po
index 2b7f25807c6..0a725636b83 100644
--- a/addons/account_bank_statement_extensions/i18n/de.po
+++ b/addons/account_bank_statement_extensions/i18n/de.po
@@ -8,19 +8,20 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2013-03-07 08:37+0000\n"
-"PO-Revision-Date: 2012-12-21 23:00+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"PO-Revision-Date: 2013-04-21 18:55+0000\n"
+"Last-Translator: Thorsten Vocks (OpenBig.org) <thorsten.vocks@big-"
+"consulting.net>\n"
 "Language-Team: German <de@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: 2013-03-28 05:29+0000\n"
-"X-Generator: Launchpad (build 16546)\n"
+"X-Launchpad-Export-Date: 2013-04-23 06:09+0000\n"
+"X-Generator: Launchpad (build 16580)\n"
 
 #. module: account_bank_statement_extensions
 #: help:account.bank.statement.line.global,name:0
 msgid "Originator to Beneficiary Information"
-msgstr ""
+msgstr "Auftrageber oder Begünstigter"
 
 #. module: account_bank_statement_extensions
 #: view:account.bank.statement.line:0
diff --git a/addons/account_budget/i18n/de.po b/addons/account_budget/i18n/de.po
index 6e59b458f17..67b67ba387f 100644
--- a/addons/account_budget/i18n/de.po
+++ b/addons/account_budget/i18n/de.po
@@ -8,14 +8,15 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2013-03-07 08:37+0000\n"
-"PO-Revision-Date: 2012-12-21 23:00+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"PO-Revision-Date: 2013-04-21 18:55+0000\n"
+"Last-Translator: Thorsten Vocks (OpenBig.org) <thorsten.vocks@big-"
+"consulting.net>\n"
 "Language-Team: German <de@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: 2013-03-28 05:29+0000\n"
-"X-Generator: Launchpad (build 16546)\n"
+"X-Launchpad-Export-Date: 2013-04-23 06:09+0000\n"
+"X-Generator: Launchpad (build 16580)\n"
 
 #. module: account_budget
 #: view:account.budget.analytic:0
@@ -344,7 +345,7 @@ msgstr "oder"
 #. module: account_budget
 #: view:crossovered.budget:0
 msgid "Cancel Budget"
-msgstr ""
+msgstr "Abbrechen Budgetierung"
 
 #. module: account_budget
 #: report:account.budget:0
diff --git a/addons/account_cancel/i18n/de.po b/addons/account_cancel/i18n/de.po
index e1630b269ab..4d8923f7670 100644
--- a/addons/account_cancel/i18n/de.po
+++ b/addons/account_cancel/i18n/de.po
@@ -8,19 +8,20 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2013-03-07 08:37+0000\n"
-"PO-Revision-Date: 2012-12-21 23:00+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"PO-Revision-Date: 2013-04-21 18:56+0000\n"
+"Last-Translator: Thorsten Vocks (OpenBig.org) <thorsten.vocks@big-"
+"consulting.net>\n"
 "Language-Team: German <de@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: 2013-03-28 05:29+0000\n"
-"X-Generator: Launchpad (build 16546)\n"
+"X-Launchpad-Export-Date: 2013-04-23 06:09+0000\n"
+"X-Generator: Launchpad (build 16580)\n"
 
 #. module: account_cancel
 #: view:account.invoice:0
 msgid "Cancel Invoice"
-msgstr ""
+msgstr "Rechnung abbrechen"
 
 #~ msgid "Cancel"
 #~ msgstr "Abbrechen"
diff --git a/addons/account_followup/i18n/fr.po b/addons/account_followup/i18n/fr.po
index 8cb170b10ca..aad2508b673 100644
--- a/addons/account_followup/i18n/fr.po
+++ b/addons/account_followup/i18n/fr.po
@@ -8,15 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2013-03-07 08:37+0000\n"
-"PO-Revision-Date: 2013-02-22 12:54+0000\n"
-"Last-Translator: Maxime Chambreuil (http://www.savoirfairelinux.com) "
-"<maxime.chambreuil@savoirfairelinux.com>\n"
+"PO-Revision-Date: 2013-04-22 15:39+0000\n"
+"Last-Translator: Bertrand Rétif <Unknown>\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: 2013-03-28 05:30+0000\n"
-"X-Generator: Launchpad (build 16546)\n"
+"X-Launchpad-Export-Date: 2013-04-23 06:09+0000\n"
+"X-Generator: Launchpad (build 16580)\n"
 
 #. module: account_followup
 #: model:email.template,subject:account_followup.email_template_account_followup_default
@@ -107,7 +106,7 @@ msgstr "Étapes de relance"
 #: code:addons/account_followup/account_followup.py:262
 #, python-format
 msgid "Due Date"
-msgstr ""
+msgstr "Date d'échéance"
 
 #. module: account_followup
 #: model:ir.actions.act_window,name:account_followup.action_account_followup_print
@@ -120,7 +119,7 @@ msgstr "Envoyer les relances"
 #: code:addons/account_followup/report/account_followup_print.py:86
 #, python-format
 msgid "Error!"
-msgstr ""
+msgstr "Erreur !"
 
 #. module: account_followup
 #: report:account_followup.followup.print:0
@@ -167,6 +166,24 @@ msgid ""
 "\n"
 "Best Regards,\n"
 msgstr ""
+"\n"
+"Cher %(partner_name)s,\n"
+"\n"
+"Nous constatons avec regret que malgré notre précédent rappel, votre compte "
+"est toujours débiteur.\n"
+"\n"
+" Nous vous mettons donc en demeure de nous régler sous huitaine "
+"l’intégralité de la somme. Passé ce délai, nous bloquerons votre compte ce "
+"qui signifie que vous ne pourrez plus passer de commandes auprès de notre "
+"société (articles/services).\n"
+"\n"
+"Si pour une raison qui nous est inconnue vous ne pouvez régler ces factures, "
+"n'hésitez pas à prendre contact avec notre service comptable afin que nous "
+"trouvions une solution rapide à ce problème.\n"
+"\n"
+"Le détail des factures impayées est listé ci-dessous.\n"
+"\n"
+"Veuillez agréer nos salutations distinguées,\n"
 
 #. module: account_followup
 #: model:email.template,body_html:account_followup.email_template_account_followup_level0
@@ -204,12 +221,46 @@ msgid ""
 "</div>\n"
 "            "
 msgstr ""
+"\n"
+"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
+"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
+"255, 255); \">\n"
+"\n"
+"    <p>Cher ${object.name},</p>\n"
+"    <p>\n"
+"    A l'examen de votre compte, nous constatons que sauf erreur ou omission "
+"de notre part, nous n'avons toujours pas reçu à ce jour de règlement des "
+"factures reprises sur le relevé ci-dessous. Nous vous remercions de bien "
+"vouloir régulariser cette situation sous huitaine.\n"
+"\n"
+"\n"
+"Au cas où votre règlement se serait croisé avec la présente, nous vous "
+"prions de ne pas en tenir compte. N'hésitez pas à contacter notre service "
+"comptable.\n"
+"\n"
+"    </p>\n"
+"<br/>\n"
+"Veuillez agréer nos salutations distinguées,\n"
+"<br/>\n"
+"   <br/>\n"
+"${user.name}\n"
+"\n"
+"<br/>\n"
+"<br/>\n"
+"\n"
+"\n"
+"${object.get_followup_table_html() | safe}\n"
+"\n"
+"    <br/>\n"
+"\n"
+"</div>\n"
+"            "
 
 #. module: account_followup
 #: code:addons/account_followup/account_followup.py:261
 #, python-format
 msgid "Reference"
-msgstr ""
+msgstr "Référence"
 
 #. module: account_followup
 #: view:account_followup.stat.by.partner:0
@@ -310,7 +361,7 @@ msgstr "Échéance la plus en retard"
 #. module: account_followup
 #: view:account_followup.stat:0
 msgid "Not Litigation"
-msgstr "Non contentieux"
+msgstr "Pas de litige"
 
 #. module: account_followup
 #: view:account_followup.print:0
@@ -367,6 +418,43 @@ msgid ""
 "</div>\n"
 "            "
 msgstr ""
+"\n"
+"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
+"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
+"255, 255); \">\n"
+"    \n"
+"    <p>Cher ${object.name},</p>\n"
+"   <p>\n"
+"    Nous constatons avec regret que malgré notre précédent rappel, votre "
+"compte est toujours débiteur.\n"
+"Nous vous mettons donc en demeure de nous régler sous huitaine l’intégralité "
+"de la somme. Passé ce délai,\n"
+"nous bloquerons votre compte ce qui signifie que vous ne pourrez plus passer "
+"de commandes\n"
+"auprès de notre société (articles/services).\n"
+"Si pour une raison qui nous est inconnue vous ne pouvez régler ces factures, "
+"n'hésitez pas à prendre contact\n"
+"avec notre service comptable afin que nous trouvions une solution rapide à "
+"ce problème.\n"
+"\n"
+"Le détail des factures impayées est listé ci-dessous.\n"
+" </p>\n"
+"<br/>\n"
+"Veuillez agréer nos salutations distinguées,\n"
+"    \n"
+"<br/>\n"
+"<br/>\n"
+"${user.name}\n"
+"    \n"
+"<br/>\n"
+"<br/>\n"
+"\n"
+"${object.get_followup_table_html() | safe}\n"
+"\n"
+"    <br/>\n"
+"\n"
+"</div>\n"
+"            "
 
 #. module: account_followup
 #: field:account_followup.stat,debit:0
@@ -424,6 +512,8 @@ msgid ""
 "The followup plan defined for the current company does not have any followup "
 "action."
 msgstr ""
+"Les niveaux de relances définis pour la société actuelle ne contiennent "
+"aucune action de relance."
 
 #. module: account_followup
 #: field:account_followup.followup.line,delay:0
@@ -495,7 +585,7 @@ msgstr "Imprimer le Message"
 #. module: account_followup
 #: view:res.partner:0
 msgid "Responsible of credit collection"
-msgstr ""
+msgstr "Responsable du recouvrement"
 
 #. module: account_followup
 #: code:addons/account_followup/wizard/account_followup_print.py:155
@@ -590,6 +680,8 @@ msgid ""
 "He said the problem was temporary and promised to pay 50% before 15th of "
 "May, balance before 1st of July."
 msgstr ""
+"Il dit que le problème n'est que passager et il a promis de payer 50% avant "
+"le 15 mai, et le solde avant le 1er juilet."
 
 #. module: account_followup
 #: view:res.partner:0
@@ -631,6 +723,7 @@ msgstr "Analyse des relances"
 #: view:res.partner:0
 msgid "Action to be taken e.g. Give a phonecall, Check if it's paid, ..."
 msgstr ""
+"Action à lancer. Par ex: Appeler, vérifier si le paiement est arrivé, ..."
 
 #. module: account_followup
 #: help:res.partner,payment_next_action_date:0
@@ -645,6 +738,7 @@ msgstr ""
 #: view:res.partner:0
 msgid "Print overdue payments report independent of follow-up line"
 msgstr ""
+"Imprimer les relances de paiement indépendamment de la ligne de relance"
 
 #. module: account_followup
 #: help:account_followup.print,date:0
@@ -699,6 +793,38 @@ msgid ""
 "</div>\n"
 "            "
 msgstr ""
+"\n"
+"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
+"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
+"255, 255); \">\n"
+"    \n"
+"    <p>Cher ${object.name},</p>\n"
+"    <p>\n"
+"    Malgré plusieurs rappels, votre compte est toujours débiteur.\n"
+"Nous vous mettons donc en demeure de nous régler sous huitaine l’intégralité "
+"de la somme. Passé ce délai,\n"
+"nous mettrons en œuvre toutes les démarches légales nécessaires au "
+"recouvrement de notre créance sans nouvelle notification.\n"
+"J'espère que ces actions ne seront pas nécessaires et vous trouverez le "
+"détail des factures impayées ci-dessous.\n"
+"Pour toutes questions concernant ce sujet. n'hésitez pas à prendre contact "
+"avec notre service comptable.\n"
+"</p>\n"
+"<br/>\n"
+"Veuillez agréer nos salutations distinguées,\n"
+"<br/>\n"
+"<br/>\n"
+"${user.name}\n"
+"<br/>\n"
+"<br/>\n"
+"\n"
+"\n"
+"${object.get_followup_table_html() | safe}\n"
+"\n"
+"    <br/>\n"
+"\n"
+"</div>\n"
+"            "
 
 #. module: account_followup
 #: report:account_followup.followup.print:0
@@ -731,6 +857,24 @@ msgid ""
 "Best Regards,\n"
 "            "
 msgstr ""
+"\n"
+"Cher %(partner_name)s,\n"
+"\n"
+"Malgré plusieurs rappels, votre compte est toujours débiteur.\n"
+"\n"
+"Nous vous mettons donc en demeure de nous régler sous huitaine l’intégralité "
+"de la somme. Passé ce délai,\n"
+"nous mettrons en œuvre toutes les démarches légales nécessaires au "
+"recouvrement de notre créance sans nouvelle notification.\n"
+"\n"
+"J'espère que ces actions ne seront pas nécessaires et vous trouverez le "
+"détail des factures impayées ci-dessous.\n"
+"\n"
+"Pour toutes questions concernant ce sujet. n'hésitez pas à prendre contact "
+"avec notre service comptable.\n"
+"\n"
+"Veuillez agréer nos salutations distinguées,\n"
+"            "
 
 #. module: account_followup
 #: field:res.partner,payment_amount_due:0
@@ -765,6 +909,7 @@ msgstr "Imprimer le rapport des retards de paiement"
 msgid ""
 "You became responsible to do the next action for the payment follow-up of"
 msgstr ""
+"Vous êtes maintenant en charge de la prochaine relance de paiement de"
 
 #. module: account_followup
 #: help:account_followup.followup.line,manual_action:0
@@ -781,6 +926,10 @@ msgid ""
 "                            order to exclude it from the next follow-up "
 "actions."
 msgstr ""
+"Ci-dessous se trouve l'historique des transactions de ce \n"
+"                            client.  Vous pouvez sélectionner \"Aucun "
+"suivi\" afin \n"
+"                            de le retirer de la prochaine action de relance."
 
 #. module: account_followup
 #: code:addons/account_followup/wizard/account_followup_print.py:171
@@ -797,7 +946,7 @@ msgstr "Lignes d'écriture"
 #: code:addons/account_followup/account_followup.py:281
 #, python-format
 msgid "Amount due"
-msgstr ""
+msgstr "Montant dû"
 
 #. module: account_followup
 #: report:account_followup.followup.print:0
@@ -834,7 +983,7 @@ msgstr "Montant en retard"
 #: code:addons/account_followup/account_followup.py:264
 #, python-format
 msgid "Lit."
-msgstr ""
+msgstr "Lit."
 
 #. module: account_followup
 #: help:res.partner,latest_followup_level_id_without_lit:0
@@ -842,6 +991,7 @@ msgid ""
 "The maximum follow-up level without taking into account the account move "
 "lines with litigation"
 msgstr ""
+"Le degré maximal de relance sans prendre en compte les écritures en litige"
 
 #. module: account_followup
 #: view:account_followup.stat:0
@@ -880,6 +1030,34 @@ msgid ""
 "</div>\n"
 "            "
 msgstr ""
+"\n"
+"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
+"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
+"255, 255); \">\n"
+"    \n"
+"    <p>Dear ${object.name},</p>\n"
+"    <p>\n"
+"    A l'examen de votre compte, nous constatons que sauf erreur ou omission "
+"de notre part, nous n'avons toujours pas reçu à ce jour de règlement des "
+"factures reprises sur le relevé ci-dessous. Nous vous remercions de bien "
+"vouloir régulariser cette situation sous huitaine.\n"
+"Au cas où votre règlement se serait croisé avec ce courriel, nous vous "
+"prions de ne pas en tenir compte. N'hésitez pas à contacter notre service "
+"comptable. \n"
+"    </p>\n"
+"<br/>\n"
+"Veuillez agréer nos salutations distinguées,\n"
+"<br/>\n"
+"<br/>\n"
+"${user.name}\n"
+"<br/>\n"
+"<br/>\n"
+"\n"
+"${object.get_followup_table_html() | safe}\n"
+"\n"
+"<br/>\n"
+"</div>\n"
+"            "
 
 #. module: account_followup
 #: field:account.move.line,result:0
@@ -920,6 +1098,19 @@ msgid ""
 "\n"
 "Best Regards,\n"
 msgstr ""
+"\n"
+"Cher %(partner_name)s,\n"
+"\n"
+"A l'examen de votre compte, nous constatons que sauf erreur ou omission de "
+"notre part, nous n'avons toujours pas reçu à ce jour de règlement des "
+"factures reprises sur le relevé ci-dessous. Nous vous remercions de bien "
+"vouloir régulariser cette situation dans les 8 jours.\n"
+"\n"
+"Au cas où votre règlement se serait croisé avec la présente, nous vous "
+"prions de ne pas en tenir compte. N'hésitez pas à contacter notre service "
+"comptable.\n"
+"\n"
+"Veuillez agréer nos salutations distinguées,\n"
 
 #. module: account_followup
 #: field:account_followup.stat,date_move_last:0
@@ -941,7 +1132,7 @@ msgstr "%s partenaire(s) n'a/ont pas de crédit, donc l'action est effacée."
 #. module: account_followup
 #: model:ir.actions.report.xml,name:account_followup.account_followup_followup_report
 msgid "Follow-up Report"
-msgstr ""
+msgstr "Rapport du suivi des paiements"
 
 #. module: account_followup
 #: view:res.partner:0
@@ -1042,7 +1233,7 @@ msgstr "Exercice comptable"
 #. module: account_followup
 #: field:res.partner,latest_followup_level_id_without_lit:0
 msgid "Latest Follow-up Level without litigation"
-msgstr "Dernière relance avant action en justice"
+msgstr "Dernier niveau de suivi sans litige"
 
 #. module: account_followup
 #: view:res.partner:0
@@ -1142,7 +1333,7 @@ msgstr " lettres dans le rapport"
 #: model:ir.actions.act_window,name:account_followup.action_customer_my_followup
 #: model:ir.ui.menu,name:account_followup.menu_sale_followup
 msgid "My Follow-Ups"
-msgstr ""
+msgstr "Mes relances de paiement"
 
 #. module: account_followup
 #: view:res.partner:0
@@ -1211,7 +1402,7 @@ msgstr "Réf. Client"
 #. module: account_followup
 #: report:account_followup.followup.print:0
 msgid "Maturity Date"
-msgstr "Date de Maturité"
+msgstr "Date d'échéance"
 
 #. module: account_followup
 #: help:account_followup.followup.line,delay:0
@@ -1260,6 +1451,8 @@ msgstr ""
 #, python-format
 msgid "There is no followup plan defined for the current company."
 msgstr ""
+"Il n'y a aucun plan de suivi des paiements défini pour la société utilisée "
+"actuellement."
 
 #. module: account_followup
 #: field:res.partner,payment_note:0
diff --git a/addons/account_followup/i18n/pt_BR.po b/addons/account_followup/i18n/pt_BR.po
index 10db49e0943..1903ff2ff64 100644
--- a/addons/account_followup/i18n/pt_BR.po
+++ b/addons/account_followup/i18n/pt_BR.po
@@ -8,15 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2013-03-07 08:37+0000\n"
-"PO-Revision-Date: 2013-03-16 05:17+0000\n"
-"Last-Translator: Fábio Martinelli - http://zupy.com.br "
-"<webmaster@guaru.net>\n"
+"PO-Revision-Date: 2013-04-22 03:25+0000\n"
+"Last-Translator: Thiago Tognoli <Unknown>\n"
 "Language-Team: Brazilian Portuguese <pt_BR@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: 2013-03-28 05:30+0000\n"
-"X-Generator: Launchpad (build 16546)\n"
+"X-Launchpad-Export-Date: 2013-04-23 06:09+0000\n"
+"X-Generator: Launchpad (build 16580)\n"
 
 #. module: account_followup
 #: model:email.template,subject:account_followup.email_template_account_followup_default
@@ -993,7 +992,7 @@ msgstr "Valor em Atraso"
 #: code:addons/account_followup/account_followup.py:264
 #, python-format
 msgid "Lit."
-msgstr ""
+msgstr "Lit."
 
 #. module: account_followup
 #: help:res.partner,latest_followup_level_id_without_lit:0
diff --git a/addons/account_payment/i18n/de.po b/addons/account_payment/i18n/de.po
index 76deac5f038..b80744bf56d 100644
--- a/addons/account_payment/i18n/de.po
+++ b/addons/account_payment/i18n/de.po
@@ -8,14 +8,15 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2013-03-07 08:37+0000\n"
-"PO-Revision-Date: 2012-12-21 23:00+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"PO-Revision-Date: 2013-04-21 18:57+0000\n"
+"Last-Translator: Thorsten Vocks (OpenBig.org) <thorsten.vocks@big-"
+"consulting.net>\n"
 "Language-Team: German <de@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: 2013-03-28 05:30+0000\n"
-"X-Generator: Launchpad (build 16546)\n"
+"X-Launchpad-Export-Date: 2013-04-23 06:09+0000\n"
+"X-Generator: Launchpad (build 16580)\n"
 
 #. module: account_payment
 #: model:ir.actions.act_window,help:account_payment.action_payment_order_tree
@@ -681,7 +682,7 @@ msgstr "Auftrag"
 #. module: account_payment
 #: view:payment.order:0
 msgid "Cancel Payments"
-msgstr ""
+msgstr "Abbrechen Zahlung"
 
 #. module: account_payment
 #: field:payment.order,total:0
diff --git a/addons/anonymization/i18n/de.po b/addons/anonymization/i18n/de.po
index 16c30ff6b2b..7bea39e929e 100644
--- a/addons/anonymization/i18n/de.po
+++ b/addons/anonymization/i18n/de.po
@@ -8,14 +8,15 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2013-03-07 08:37+0000\n"
-"PO-Revision-Date: 2012-12-21 23:00+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"PO-Revision-Date: 2013-04-21 19:08+0000\n"
+"Last-Translator: Thorsten Vocks (OpenBig.org) <thorsten.vocks@big-"
+"consulting.net>\n"
 "Language-Team: German <de@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: 2013-03-28 05:32+0000\n"
-"X-Generator: Launchpad (build 16546)\n"
+"X-Launchpad-Export-Date: 2013-04-23 06:09+0000\n"
+"X-Generator: Launchpad (build 16580)\n"
 
 #. module: anonymization
 #: model:ir.model,name:anonymization.model_ir_model_fields_anonymize_wizard
@@ -50,6 +51,9 @@ msgid ""
 "are anonymized, while some fields are not anonymized. You should try to "
 "solve this problem before trying to create, write or delete fields."
 msgstr ""
+"Die Datenbank Anonymisierung ist aktuell in einem Beta Stadium. Einige "
+"Felder werden korrekt anonymisiert, andere hingegen nicht. Sie sollten das "
+"Problem vor einer weiteren Bearbeitung oder Erstellung von Feldern lösen."
 
 #. module: anonymization
 #: field:ir.model.fields.anonymization,field_name:0
@@ -65,7 +69,7 @@ msgstr "Feld"
 #. module: anonymization
 #: selection:ir.model.fields.anonymization,state:0
 msgid "New"
-msgstr ""
+msgstr "Neu"
 
 #. module: anonymization
 #: field:ir.model.fields.anonymize.wizard,file_import:0
@@ -84,6 +88,7 @@ msgid ""
 "Before executing the anonymization process, you should make a backup of your "
 "database."
 msgstr ""
+"Vor der Anonymisierung der Datenbank sollten Sie ein Backup erstellen."
 
 #. module: anonymization
 #: field:ir.model.fields.anonymization.history,state:0
@@ -128,7 +133,7 @@ msgstr "unbekannt"
 #: code:addons/anonymization/anonymization.py:448
 #, python-format
 msgid "Anonymized value is None. This cannot happens."
-msgstr ""
+msgstr "Es wurde keine Eintrag anonymisiert. Bitte prüfen Sie dieses."
 
 #. module: anonymization
 #: field:ir.model.fields.anonymization.history,filepath:0
@@ -166,6 +171,8 @@ msgid ""
 "Cannot anonymize fields of these types: binary, many2many, many2one, "
 "one2many, reference."
 msgstr ""
+"Folgende Felder können nicht anonymisiert werden: Binärfelder, many2many, "
+"many2one, one2many, Referenzen."
 
 #. module: anonymization
 #: view:ir.model.fields.anonymize.wizard:0
@@ -201,6 +208,8 @@ msgid ""
 "It is not possible to reverse the anonymization process without supplying "
 "the anonymization export file."
 msgstr ""
+"Ohne die exportierte Datei  ist es nicht möglich eine Anonymisierung "
+"rückgängig zu machen."
 
 #. module: anonymization
 #: field:ir.model.fields.anonymize.wizard,summary:0
@@ -221,6 +230,9 @@ msgid ""
 "are anonymized, while some fields are not anonymized. You should try to "
 "solve this problem before trying to do anything."
 msgstr ""
+"Die Datenbank Anonymisierung ist aktuell in einem Beta Stadium. Einige "
+"Felder werden korrekt anonymisiert, andere hingegen nicht. Sie sollten das "
+"Problem vor einer weiteren Bearbeitung oder Erstellung von Feldern lösen."
 
 #. module: anonymization
 #: selection:ir.model.fields.anonymize.wizard,state:0
@@ -267,13 +279,16 @@ msgid ""
 "are anonymized, while some fields are not anonymized. You should try to "
 "solve this problem before trying to do anything else."
 msgstr ""
+"Die Datenbank Anonymisierung ist aktuell in einem Beta Stadium. Einige "
+"Felder werden korrekt anonymisiert, andere hingegen nicht. Sie sollten das "
+"Problem vor einer weiteren Bearbeitung oder Erstellung von Feldern lösen."
 
 #. module: anonymization
 #: code:addons/anonymization/anonymization.py:389
 #: code:addons/anonymization/anonymization.py:448
 #, python-format
 msgid "Error !"
-msgstr ""
+msgstr "Fehler !"
 
 #. module: anonymization
 #: model:ir.actions.act_window,name:anonymization.action_ir_model_fields_anonymize_wizard
@@ -306,6 +321,8 @@ msgstr "Begonnen"
 #, python-format
 msgid "The database is currently anonymized, you cannot anonymize it again."
 msgstr ""
+"Die Datenbank ist bereits anonymisiert. Dieses kann nicht noch einmal "
+"erfolgen."
 
 #. module: anonymization
 #: selection:ir.model.fields.anonymization.history,state:0
diff --git a/addons/base_calendar/i18n/nl.po b/addons/base_calendar/i18n/nl.po
index b752058f615..dda56a4bd9d 100644
--- a/addons/base_calendar/i18n/nl.po
+++ b/addons/base_calendar/i18n/nl.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2013-03-07 08:37+0000\n"
-"PO-Revision-Date: 2013-04-12 20:59+0000\n"
+"PO-Revision-Date: 2013-04-22 14:12+0000\n"
 "Last-Translator: Erwin van der Ploeg (Endian Solutions) <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: 2013-04-13 06:31+0000\n"
-"X-Generator: Launchpad (build 16564)\n"
+"X-Launchpad-Export-Date: 2013-04-23 06:09+0000\n"
+"X-Generator: Launchpad (build 16580)\n"
 
 #. module: base_calendar
 #: selection:calendar.alarm,trigger_related:0
@@ -592,7 +592,7 @@ msgstr "don"
 #. module: base_calendar
 #: view:crm.meeting:0
 msgid "Meeting Details"
-msgstr "Afspraak tdetails"
+msgstr "Afspraak details"
 
 #. module: base_calendar
 #: field:calendar.attendee,child_ids:0
diff --git a/addons/base_gengo/i18n/de.po b/addons/base_gengo/i18n/de.po
index 85912282ea4..f6d0276f3cf 100644
--- a/addons/base_gengo/i18n/de.po
+++ b/addons/base_gengo/i18n/de.po
@@ -8,14 +8,15 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2013-03-07 08:37+0000\n"
-"PO-Revision-Date: 2012-12-21 23:00+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"PO-Revision-Date: 2013-04-21 21:55+0000\n"
+"Last-Translator: Thorsten Vocks (OpenBig.org) <thorsten.vocks@big-"
+"consulting.net>\n"
 "Language-Team: German <de@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: 2013-03-28 05:33+0000\n"
-"X-Generator: Launchpad (build 16546)\n"
+"X-Launchpad-Export-Date: 2013-04-23 06:09+0000\n"
+"X-Generator: Launchpad (build 16580)\n"
 
 #. module: base_gengo
 #: view:res.company:0
@@ -48,11 +49,12 @@ msgstr "Gengo Privater Schlüssel"
 msgid ""
 "The Gengo translation service selected is not supported for this language."
 msgstr ""
+"Der Gengo Übersetzungsservice wird für diese Sprache nicht unterstützt"
 
 #. module: base_gengo
 #: view:res.company:0
 msgid "Add Gengo login Public Key..."
-msgstr ""
+msgstr "Hinzufügen Gengo Login Public Key"
 
 #. module: base_gengo
 #: model:ir.model,name:base_gengo.model_base_gengo_translations
@@ -62,7 +64,7 @@ msgstr "base.gengo.translations"
 #. module: base_gengo
 #: view:ir.translation:0
 msgid "Gengo Comments & Activity..."
-msgstr ""
+msgstr "Gengo Kommentare & Aktivitäten"
 
 #. module: base_gengo
 #: help:res.company,gengo_auto_approve:0
@@ -104,7 +106,7 @@ msgstr "Maschinelle Vorhersage"
 #. module: base_gengo
 #: view:res.company:0
 msgid "Add Gengo login Private Key..."
-msgstr ""
+msgstr "Gengo Login privater Schlüssel"
 
 #. module: base_gengo
 #: code:addons/base_gengo/wizard/base_gengo_translations.py:155
@@ -128,7 +130,7 @@ msgstr "Gengo Übersetzungssergvice"
 #. module: base_gengo
 #: view:res.company:0
 msgid "Add your comments here for translator...."
-msgstr ""
+msgstr "Hier Kommentare für den Übersetzer hinzufügen"
 
 #. module: base_gengo
 #: selection:ir.translation,gengo_translation:0
@@ -237,7 +239,7 @@ msgstr "Senden"
 #. module: base_gengo
 #: selection:ir.translation,gengo_translation:0
 msgid "Ultra"
-msgstr ""
+msgstr "Ultra"
 
 #. module: base_gengo
 #: model:ir.model,name:base_gengo.model_ir_translation
diff --git a/addons/base_import/i18n/de.po b/addons/base_import/i18n/de.po
index 4946ecfc12f..22f76d73774 100644
--- a/addons/base_import/i18n/de.po
+++ b/addons/base_import/i18n/de.po
@@ -8,15 +8,15 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2013-03-07 08:37+0000\n"
-"PO-Revision-Date: 2013-01-06 00:06+0000\n"
+"PO-Revision-Date: 2013-04-21 19:09+0000\n"
 "Last-Translator: Thorsten Vocks (OpenBig.org) <thorsten.vocks@big-"
 "consulting.net>\n"
 "Language-Team: German <de@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: 2013-03-28 05:33+0000\n"
-"X-Generator: Launchpad (build 16546)\n"
+"X-Launchpad-Export-Date: 2013-04-23 06:09+0000\n"
+"X-Generator: Launchpad (build 16580)\n"
 
 #. module: base_import
 #. openerp-web
@@ -407,7 +407,7 @@ msgstr ""
 #: code:addons/base_import/static/src/js/import.js:174
 #, python-format
 msgid "Semicolon"
-msgstr ""
+msgstr "Semikolon"
 
 #. module: base_import
 #. openerp-web
@@ -482,7 +482,7 @@ msgstr ""
 #: code:addons/base_import/static/src/js/import.js:175
 #, python-format
 msgid "Tab"
-msgstr ""
+msgstr "Tabulator"
 
 #. module: base_import
 #: field:base_import.tests.models.preview,othervalue:0
diff --git a/addons/document_page/i18n/fr.po b/addons/document_page/i18n/fr.po
index 82562d56cf6..fdaa455e8f4 100644
--- a/addons/document_page/i18n/fr.po
+++ b/addons/document_page/i18n/fr.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2013-03-07 08:38+0000\n"
-"PO-Revision-Date: 2013-02-12 08:21+0000\n"
+"PO-Revision-Date: 2013-04-22 15:40+0000\n"
 "Last-Translator: WANTELLET Sylvain <Swantellet@tetra-info.com>\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: 2013-03-28 05:38+0000\n"
-"X-Generator: Launchpad (build 16546)\n"
+"X-Launchpad-Export-Date: 2013-04-23 06:09+0000\n"
+"X-Generator: Launchpad (build 16580)\n"
 
 #. module: document_page
 #: view:document.page:0
@@ -163,7 +163,7 @@ msgstr "Catégories"
 #. module: document_page
 #: view:document.page:0
 msgid "Name"
-msgstr ""
+msgstr "Nom"
 
 #. module: document_page
 #: field:document.page.create.menu,menu_parent_id:0
@@ -196,7 +196,7 @@ msgstr "Sommaire"
 #. module: document_page
 #: view:document.page:0
 msgid "e.g. Once upon a time..."
-msgstr ""
+msgstr "Ex: Il était une fois..."
 
 #. module: document_page
 #: model:ir.actions.act_window,help:document_page.action_page
diff --git a/addons/hr/i18n/de.po b/addons/hr/i18n/de.po
index aba36b15c78..1dbaa0ee602 100644
--- a/addons/hr/i18n/de.po
+++ b/addons/hr/i18n/de.po
@@ -8,14 +8,15 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2013-03-07 08:37+0000\n"
-"PO-Revision-Date: 2013-01-28 17:40+0000\n"
-"Last-Translator: Felix Schubert <Unknown>\n"
+"PO-Revision-Date: 2013-04-21 19:12+0000\n"
+"Last-Translator: Thorsten Vocks (OpenBig.org) <thorsten.vocks@big-"
+"consulting.net>\n"
 "Language-Team: German <de@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: 2013-03-28 05:39+0000\n"
-"X-Generator: Launchpad (build 16546)\n"
+"X-Launchpad-Export-Date: 2013-04-23 06:09+0000\n"
+"X-Generator: Launchpad (build 16580)\n"
 
 #. module: hr
 #: model:process.node,name:hr.process_node_openerpuser0
@@ -148,7 +149,7 @@ msgstr "Freie Stellen"
 #. module: hr
 #: view:hr.employee:0
 msgid "Other Information ..."
-msgstr ""
+msgstr "Weitere Informationen"
 
 #. module: hr
 #: constraint:hr.employee.category:0
@@ -410,7 +411,7 @@ msgstr "Mitarbeiter Kontakt"
 #. module: hr
 #: view:hr.employee:0
 msgid "e.g. Part Time"
-msgstr ""
+msgstr "z.B. Teilzeit"
 
 #. module: hr
 #: model:ir.actions.act_window,help:hr.action_hr_job
diff --git a/addons/hr_contract/i18n/de.po b/addons/hr_contract/i18n/de.po
index 15cfaabc13d..f78d3e845c6 100644
--- a/addons/hr_contract/i18n/de.po
+++ b/addons/hr_contract/i18n/de.po
@@ -8,14 +8,15 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2013-03-07 08:38+0000\n"
-"PO-Revision-Date: 2012-12-21 23:00+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"PO-Revision-Date: 2013-04-21 19:14+0000\n"
+"Last-Translator: Thorsten Vocks (OpenBig.org) <thorsten.vocks@big-"
+"consulting.net>\n"
 "Language-Team: German <de@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: 2013-03-28 05:40+0000\n"
-"X-Generator: Launchpad (build 16546)\n"
+"X-Launchpad-Export-Date: 2013-04-23 06:09+0000\n"
+"X-Generator: Launchpad (build 16580)\n"
 
 #. module: hr_contract
 #: field:hr.contract,wage:0
@@ -45,7 +46,7 @@ msgstr "Gruppierung..."
 #. module: hr_contract
 #: view:hr.contract:0
 msgid "Advantages..."
-msgstr ""
+msgstr "Zusatzvergütungen"
 
 #. module: hr_contract
 #: field:hr.contract,department_id:0
diff --git a/addons/mail/i18n/de.po b/addons/mail/i18n/de.po
index d61aafab979..fb0d2911e05 100644
--- a/addons/mail/i18n/de.po
+++ b/addons/mail/i18n/de.po
@@ -8,15 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2013-03-07 08:37+0000\n"
-"PO-Revision-Date: 2013-03-17 12:20+0000\n"
-"Last-Translator: Thorsten Vocks (OpenBig.org) <thorsten.vocks@big-"
-"consulting.net>\n"
+"PO-Revision-Date: 2013-04-21 19:15+0000\n"
+"Last-Translator: Robert Farr <service@computergalerie.com>\n"
 "Language-Team: German <de@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: 2013-03-28 05:47+0000\n"
-"X-Generator: Launchpad (build 16546)\n"
+"X-Launchpad-Export-Date: 2013-04-23 06:09+0000\n"
+"X-Generator: Launchpad (build 16580)\n"
 
 #. module: mail
 #: view:mail.followers:0
@@ -47,7 +46,7 @@ msgstr "Empfänger der Nachricht"
 #. module: mail
 #: help:mail.message.subtype,default:0
 msgid "Activated by default when subscribing."
-msgstr "Standardmässig aktiviert, wenn Sie folgen."
+msgstr "Standardmässig aktiviert, wenn Sie bestätigen."
 
 #. module: mail
 #: view:mail.message:0
diff --git a/addons/marketing_campaign_crm_demo/i18n/de.po b/addons/marketing_campaign_crm_demo/i18n/de.po
index 6d80fa4edc0..07e1843f057 100644
--- a/addons/marketing_campaign_crm_demo/i18n/de.po
+++ b/addons/marketing_campaign_crm_demo/i18n/de.po
@@ -8,14 +8,15 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2013-03-07 08:38+0000\n"
-"PO-Revision-Date: 2012-12-21 23:00+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"PO-Revision-Date: 2013-04-21 19:26+0000\n"
+"Last-Translator: Thorsten Vocks (OpenBig.org) <thorsten.vocks@big-"
+"consulting.net>\n"
 "Language-Team: German <de@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: 2013-03-28 05:48+0000\n"
-"X-Generator: Launchpad (build 16546)\n"
+"X-Launchpad-Export-Date: 2013-04-23 06:09+0000\n"
+"X-Generator: Launchpad (build 16580)\n"
 
 #. module: marketing_campaign_crm_demo
 #: model:email.template,body_html:marketing_campaign_crm_demo.email_template_8
@@ -29,6 +30,14 @@ msgid ""
 "reply to this message.</p>\n"
 "            <p>Regards,OpenERP Team,</p>"
 msgstr ""
+"<p>Hallo,</p>\n"
+"            <p>Vielen Dank für Ihr Interesse an einem Technischen "
+"Training.</p>\n"
+"            Bei weiteren Fragen, kontaktieren Sie uns gerne. Wir freuen uns "
+"auf die Zusammenarbeit mit Ihnen.</p>\n"
+"            <p>Sollten Sie weitere Infos benötigen, können Sie uns ebenfalls "
+"gerne anschreiben.</p>\n"
+"            <p>Viele Grüsse von Ihrem OpenERP Team</p>"
 
 #. module: marketing_campaign_crm_demo
 #: model:ir.actions.report.xml,name:marketing_campaign_crm_demo.mc_crm_lead_demo_report
@@ -50,6 +59,12 @@ msgid ""
 "reply to this message.</p>\n"
 "            <p>Regards,OpenERP Team,</p>"
 msgstr ""
+"<p>Hallo,</p>\n"
+"            <p>Vielen Dank für Ihre Anfrage zur Teilnahme am OpenERP "
+"Discovery Day.</p>\n"
+"            <p>Sollten Sie weitere Infos benötigen, können Sie uns gerne "
+"kontaktieren.</p>\n"
+"            <p>Viele Grüsse von Ihrem OpenERP Team</p>"
 
 #. module: marketing_campaign_crm_demo
 #: report:crm.lead.demo:0
@@ -72,6 +87,13 @@ msgid ""
 "reply to this message.</p>\n"
 "            <p>Regards,OpenERP Team,</p>"
 msgstr ""
+"<p>Hallo,</p>\n"
+"            <p>wir haben ein interessantes Angebot für Silberpartner.</p>\n"
+"            Wir laden Sie zu einem kostenfreien technischen Training "
+"ein.</p>\n"
+"            <p>Sollten Sie weitere Infos benötigen, können Sie uns ebenfalls "
+"gerne anschreiben.</p>\n"
+"            <p>Viele Grüsse von Ihrem OpenERP Team</p>"
 
 #. module: marketing_campaign_crm_demo
 #: model:email.template,subject:marketing_campaign_crm_demo.email_template_1
@@ -99,6 +121,13 @@ msgid ""
 "reply to this message.</p>\n"
 "            <p>Regards,OpenERP Team,</p>"
 msgstr ""
+"<p>Hallo,</p>\n"
+"            <p>wir haben ein neues interessantes Angebot.</p>\n"
+"            Wir bieten Ihnen eine kostenfreie Anmeldung zu den Discovery "
+"Days an.</p>\n"
+"            <p>Sollten Sie weitere Infos benötigen, können Sie uns ebenfalls "
+"gerne anschreiben.</p>\n"
+"            <p>Viele Grüsse von Ihrem OpenERP Team</p>"
 
 #. module: marketing_campaign_crm_demo
 #: model:email.template,body_html:marketing_campaign_crm_demo.email_template_5
@@ -111,6 +140,13 @@ msgid ""
 "reply to this message.</p>\n"
 "            <p>Regards,OpenERP Team,</p>"
 msgstr ""
+"<p>Hallo,</p>\n"
+"            <p>wir haben ein exklusives Angebot für Goldpartner.</p>\n"
+"            Wir laden Sie zu einem kostenfreien technischen Training für "
+"Fortgeschrittene ein.</p>\n"
+"            <p>Sollten Sie weitere Infos benötigen, können Sie uns ebenfalls "
+"gerne anschreiben.</p>\n"
+"            <p>Viele Grüsse von Ihrem OpenERP Team</p>"
 
 #. module: marketing_campaign_crm_demo
 #: model:email.template,subject:marketing_campaign_crm_demo.email_template_2
@@ -141,6 +177,11 @@ msgid ""
 "            If any further information required kindly revert back.\n"
 "            <p>Regards,OpenERP Team,</p>"
 msgstr ""
+"<p>Hallo,</p>\n"
+"            <p>vielen Dank für den Kauf des OpenERP Buchs.</p>\n"
+"            <p>Sollten Sie weitere Infos benötigen, können Sie uns ebenfalls "
+"gerne anschreiben.</p>\n"
+"            <p>Viele Grüsse von Ihrem OpenERP Team</p>"
 
 #. module: marketing_campaign_crm_demo
 #: model:email.template,body_html:marketing_campaign_crm_demo.email_template_7
@@ -152,6 +193,12 @@ msgid ""
 "reply to this message.</p>\n"
 "            <p>Regards,OpenERP Team,</p>"
 msgstr ""
+"<p>Hallo,</p>\n"
+"            <p>wir haben ein exklusives Angebot für Silberpartner.</p>\n"
+"            Sie können zu Vorzugskonditionen Goldpartner werden.</p>\n"
+"            <p>Sollten Sie weitere Infos benötigen, können Sie uns ebenfalls "
+"gerne anschreiben.</p>\n"
+"            <p>Viele Grüsse von Ihrem OpenERP Team</p>"
 
 #. module: marketing_campaign_crm_demo
 #: model:email.template,subject:marketing_campaign_crm_demo.email_template_5
@@ -168,3 +215,8 @@ msgid ""
 "reply to this message.</p>\n"
 "            <p>Regards,OpenERP Team,</p>"
 msgstr ""
+"<p>Hallo,</p>\n"
+"            <p>vielen Dank für Ihr Interesse an OpenERP Lösungen.</p>\n"
+"            <p>Sollten Sie weitere Infos benötigen, können Sie uns ebenfalls "
+"gerne anschreiben.</p>\n"
+"            <p>Viele Grüsse von Ihrem OpenERP Team</p>"
diff --git a/addons/membership/i18n/de.po b/addons/membership/i18n/de.po
index 382fab6a667..f52123af394 100644
--- a/addons/membership/i18n/de.po
+++ b/addons/membership/i18n/de.po
@@ -8,15 +8,15 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2013-03-07 08:38+0000\n"
-"PO-Revision-Date: 2013-01-06 21:28+0000\n"
+"PO-Revision-Date: 2013-04-21 19:27+0000\n"
 "Last-Translator: Thorsten Vocks (OpenBig.org) <thorsten.vocks@big-"
 "consulting.net>\n"
 "Language-Team: German <de@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: 2013-03-28 05:48+0000\n"
-"X-Generator: Launchpad (build 16546)\n"
+"X-Launchpad-Export-Date: 2013-04-23 06:09+0000\n"
+"X-Generator: Launchpad (build 16580)\n"
 
 #. module: membership
 #: model:process.transition,name:membership.process_transition_invoicetoassociate0
@@ -149,7 +149,7 @@ msgstr "Alle Mitglieder"
 #. module: membership
 #: view:product.product:0
 msgid "This note will be displayed on quotations..."
-msgstr ""
+msgstr "Dieser Hinweis erscheint auf den Angeboten"
 
 #. module: membership
 #: code:addons/membership/membership.py:410
@@ -339,7 +339,7 @@ msgstr "Aktueller Mitgliedsschaftsstatus"
 #. module: membership
 #: view:product.product:0
 msgid "Add a description..."
-msgstr ""
+msgstr "Ergänzen einer Beschreibung..."
 
 #. module: membership
 #: field:membership.membership_line,date:0
diff --git a/addons/mrp/i18n/fr.po b/addons/mrp/i18n/fr.po
index 5b9d63a9362..e4caf7b95a7 100644
--- a/addons/mrp/i18n/fr.po
+++ b/addons/mrp/i18n/fr.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2013-03-07 08:37+0000\n"
-"PO-Revision-Date: 2013-04-15 08:07+0000\n"
+"PO-Revision-Date: 2013-04-22 08:18+0000\n"
 "Last-Translator: WANTELLET Sylvain <Swantellet@tetra-info.com>\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: 2013-04-16 05:27+0000\n"
-"X-Generator: Launchpad (build 16564)\n"
+"X-Launchpad-Export-Date: 2013-04-23 06:09+0000\n"
+"X-Generator: Launchpad (build 16580)\n"
 
 #. module: mrp
 #: help:mrp.config.settings,module_mrp_repair:0
@@ -1203,7 +1203,7 @@ msgstr "Ordres de fabrication"
 #. module: mrp
 #: selection:mrp.production,state:0
 msgid "Awaiting Raw Materials"
-msgstr ""
+msgstr "Attente de matières premières"
 
 #. module: mrp
 #: field:mrp.bom,position:0
diff --git a/addons/pad/i18n/de.po b/addons/pad/i18n/de.po
index 5f63647bea4..c4bdba49d4e 100644
--- a/addons/pad/i18n/de.po
+++ b/addons/pad/i18n/de.po
@@ -8,14 +8,15 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2013-03-07 08:38+0000\n"
-"PO-Revision-Date: 2012-12-21 23:00+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"PO-Revision-Date: 2013-04-21 19:31+0000\n"
+"Last-Translator: Thorsten Vocks (OpenBig.org) <thorsten.vocks@big-"
+"consulting.net>\n"
 "Language-Team: German <de@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: 2013-03-28 05:51+0000\n"
-"X-Generator: Launchpad (build 16546)\n"
+"X-Launchpad-Export-Date: 2013-04-23 06:09+0000\n"
+"X-Generator: Launchpad (build 16580)\n"
 
 #. module: pad
 #. openerp-web
@@ -32,16 +33,18 @@ msgid ""
 "You must configure the etherpad through the menu Settings > Companies > "
 "Companies, in the configuration tab of your company."
 msgstr ""
+"Sie müssen zuerst Etherpad über das Menü Einstellungen > Unternehmen > "
+"Unternehmen im Konfiguration Aktenreiter konfigurieren."
 
 #. module: pad
 #: help:res.company,pad_key:0
 msgid "Etherpad lite api key."
-msgstr ""
+msgstr "Etherpad lite api key"
 
 #. module: pad
 #: view:res.company:0
 msgid "e.g. beta.primarypad.com"
-msgstr ""
+msgstr "z.B. beta.primarypad.com"
 
 #. module: pad
 #: model:ir.model,name:pad.model_res_company
@@ -71,4 +74,4 @@ msgstr ""
 #. module: pad
 #: help:res.company,pad_server:0
 msgid "Etherpad lite server. Example: beta.primarypad.com"
-msgstr ""
+msgstr "Etherpad lite Server. Beispiel: beta.primarypad.com"
diff --git a/addons/point_of_sale/i18n/de.po b/addons/point_of_sale/i18n/de.po
index fc3b47d9082..3a2043f16dd 100644
--- a/addons/point_of_sale/i18n/de.po
+++ b/addons/point_of_sale/i18n/de.po
@@ -8,15 +8,15 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2013-03-07 08:37+0000\n"
-"PO-Revision-Date: 2013-01-06 21:51+0000\n"
+"PO-Revision-Date: 2013-04-21 21:38+0000\n"
 "Last-Translator: Thorsten Vocks (OpenBig.org) <thorsten.vocks@big-"
 "consulting.net>\n"
 "Language-Team: German <de@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: 2013-03-28 05:51+0000\n"
-"X-Generator: Launchpad (build 16546)\n"
+"X-Launchpad-Export-Date: 2013-04-23 06:09+0000\n"
+"X-Generator: Launchpad (build 16580)\n"
 
 #. module: point_of_sale
 #: field:report.transaction.pos,product_nb:0
@@ -147,7 +147,7 @@ msgstr "Produktbezeichnung"
 #. module: point_of_sale
 #: model:product.template,name:point_of_sale.pamplemousse_rouge_pamplemousse_product_template
 msgid "Red grapefruit"
-msgstr ""
+msgstr "Rote Pampelmuse"
 
 #. module: point_of_sale
 #: code:addons/point_of_sale/point_of_sale.py:1343
@@ -235,7 +235,7 @@ msgstr "Abwiegen"
 #. module: point_of_sale
 #: model:product.template,name:point_of_sale.fenouil_fenouil_product_template
 msgid "Fennel"
-msgstr ""
+msgstr "Fenchel"
 
 #. module: point_of_sale
 #. openerp-web
@@ -284,7 +284,7 @@ msgstr "Finanzbuchhaltung Info"
 #: code:addons/point_of_sale/static/src/xml/pos.xml:427
 #, python-format
 msgid "0.00€"
-msgstr ""
+msgstr "0.00€"
 
 #. module: point_of_sale
 #: field:pos.session.opening,show_config:0
@@ -510,7 +510,7 @@ msgstr ") ist \""
 #. module: point_of_sale
 #: model:product.template,name:point_of_sale.Onions_product_template
 msgid "Onions"
-msgstr ""
+msgstr "Zwiebeln"
 
 #. module: point_of_sale
 #: view:pos.session:0
@@ -572,7 +572,7 @@ msgstr "Sprudel"
 #. module: point_of_sale
 #: view:account.bank.statement:0
 msgid "Search Cash Statements"
-msgstr "Suche Kassenauszug"
+msgstr "Suche Kassenbuch"
 
 #. module: point_of_sale
 #: view:account.bank.statement:0
@@ -774,7 +774,7 @@ msgstr "Barcode Lesegerät"
 #. module: point_of_sale
 #: model:product.template,name:point_of_sale.pomme_granny_smith_product_template
 msgid "Granny Smith apples"
-msgstr ""
+msgstr "Granny Smith Äpfel"
 
 #. module: point_of_sale
 #: help:product.product,expense_pdt:0
@@ -932,7 +932,7 @@ msgstr ""
 #. module: point_of_sale
 #: model:pos.category,name:point_of_sale.rouges_noyau_fruits
 msgid "Berries"
-msgstr ""
+msgstr "Beeren"
 
 #. module: point_of_sale
 #: view:pos.ean_wizard:0
@@ -971,7 +971,7 @@ msgstr "Datum Abschluss"
 #. module: point_of_sale
 #: model:product.template,name:point_of_sale.pomme_jonagold_product_template
 msgid "Jonagold apples"
-msgstr ""
+msgstr "Jonagold Äpfel"
 
 #. module: point_of_sale
 #: view:account.bank.statement:0
@@ -1058,7 +1058,7 @@ msgstr "Produkte des Benutzers"
 #: code:addons/point_of_sale/point_of_sale.py:984
 #, python-format
 msgid "The POS order must have lines when calling this method"
-msgstr ""
+msgstr "Der POS Auftrag muss zur Ausführung Positionen aufweisen"
 
 #. module: point_of_sale
 #: code:addons/point_of_sale/point_of_sale.py:1143
@@ -1135,7 +1135,7 @@ msgstr "Restbetrag:"
 #. module: point_of_sale
 #: model:pos.category,name:point_of_sale.legumes
 msgid "Fresh vegetables"
-msgstr ""
+msgstr "Frisches Gemüse"
 
 #. module: point_of_sale
 #: view:pos.session:0
@@ -1411,7 +1411,7 @@ msgstr "Monatliche Verkäufe nach Marge"
 #. module: point_of_sale
 #: model:product.template,name:point_of_sale.poivron_jaunes_product_template
 msgid "Yellow Peppers"
-msgstr ""
+msgstr "Gelbe Pepperoni"
 
 #. module: point_of_sale
 #: view:pos.order:0
@@ -1706,7 +1706,7 @@ msgstr "Bitte scannen Sie einen Artikel oder eine Mitgliedskarte ein"
 #. module: point_of_sale
 #: model:product.template,name:point_of_sale.poivron_verts_product_template
 msgid "Green Peppers"
-msgstr ""
+msgstr "Grüner Pfeffer"
 
 #. module: point_of_sale
 #: model:product.template,name:point_of_sale.timmermans_faro_37,5cl_product_template
@@ -1782,7 +1782,7 @@ msgstr "Verkauf (Summen)"
 #. module: point_of_sale
 #: model:product.template,name:point_of_sale.nectarine_product_template
 msgid "Peach"
-msgstr ""
+msgstr "Pfirsich"
 
 #. module: point_of_sale
 #: model:product.template,name:point_of_sale.timmermans_kriek_37,5cl_product_template
@@ -1923,7 +1923,7 @@ msgstr "Nicht löschbar!"
 #. module: point_of_sale
 #: model:pos.category,name:point_of_sale.autres_agrumes
 msgid "Other Citrus"
-msgstr ""
+msgstr "Citrone"
 
 #. module: point_of_sale
 #: report:pos.details:0
@@ -2103,7 +2103,7 @@ msgstr "Keine Preisliste!"
 #. module: point_of_sale
 #: model:product.template,name:point_of_sale.poivron_rouges_product_template
 msgid "Red Pepper"
-msgstr ""
+msgstr "Roter Pfeffer"
 
 #. module: point_of_sale
 #. openerp-web
@@ -2138,7 +2138,7 @@ msgstr "Sonstige"
 #. module: point_of_sale
 #: model:pos.category,name:point_of_sale.autres_legumes_frais
 msgid "Other fresh vegetables"
-msgstr ""
+msgstr "Anderes frisches Gemüse"
 
 #. module: point_of_sale
 #: code:addons/point_of_sale/wizard/pos_open_statement.py:49
@@ -2158,7 +2158,7 @@ msgstr ""
 #. module: point_of_sale
 #: model:pos.category,name:point_of_sale.oignons_ail_echalotes
 msgid "Onions / Garlic / Shallots"
-msgstr ""
+msgstr "Zwiebeln / Knoblauch / Kleine Zwiebeln"
 
 #. module: point_of_sale
 #: model:product.template,name:point_of_sale.evian_50cl_product_template
@@ -2217,7 +2217,7 @@ msgstr ""
 #. module: point_of_sale
 #: model:product.template,name:point_of_sale.tomate_en_grappe_product_template
 msgid "In Cluster Tomatoes"
-msgstr ""
+msgstr "Tomatenstrang"
 
 #. module: point_of_sale
 #: model:ir.actions.client,name:point_of_sale.action_pos_pos
@@ -2256,7 +2256,7 @@ msgstr "Point Of Sale Verkäufe"
 #. module: point_of_sale
 #: model:product.template,name:point_of_sale.spa_et_fruit_50cl_product_template
 msgid "Spa Fruit and Orange 50cl"
-msgstr ""
+msgstr "Spa Fruchtsaft und Orange 50cl"
 
 #. module: point_of_sale
 #: view:pos.config:0
@@ -2551,7 +2551,7 @@ msgstr "Öffne Registerkassen"
 #. module: point_of_sale
 #: model:pos.category,name:point_of_sale.poire
 msgid "Pears"
-msgstr ""
+msgstr "Pfirsiche"
 
 #. module: point_of_sale
 #: field:report.transaction.pos,journal_id:0
@@ -2577,7 +2577,7 @@ msgstr "Anbindung an Kassenschublade"
 #. module: point_of_sale
 #: model:pos.category,name:point_of_sale.tomates
 msgid "Tomatos"
-msgstr ""
+msgstr "Tomaten"
 
 #. module: point_of_sale
 #: view:report.pos.order:0
@@ -2592,7 +2592,7 @@ msgstr ""
 #. module: point_of_sale
 #: model:pos.category,name:point_of_sale.oranges
 msgid "Oranges"
-msgstr ""
+msgstr "Orangen"
 
 #. module: point_of_sale
 #: model:ir.actions.act_window,name:point_of_sale.action_pos_all_sales_lines
@@ -2602,7 +2602,7 @@ msgstr "Alle Verkäufe"
 #. module: point_of_sale
 #: model:pos.category,name:point_of_sale.beers
 msgid "Beers"
-msgstr ""
+msgstr "Beeren"
 
 #. module: point_of_sale
 #: help:pos.config,name:0
@@ -2707,7 +2707,7 @@ msgstr "Zwischensumme"
 #. module: point_of_sale
 #: model:product.template,name:point_of_sale.carotte_product_template
 msgid "Carrots"
-msgstr ""
+msgstr "Karotten"
 
 #. module: point_of_sale
 #: view:pos.open.statement:0
@@ -2953,7 +2953,7 @@ msgstr "Gesamt Umsatz Transaktionen"
 #: model:pos.category,name:point_of_sale.pommes_de_terre
 #: model:product.template,name:point_of_sale.pomme_de_terre_product_template
 msgid "Potatoes"
-msgstr ""
+msgstr "Kartoffeln"
 
 #. module: point_of_sale
 #: view:pos.session.opening:0
@@ -2981,7 +2981,7 @@ msgstr ""
 #. module: point_of_sale
 #: model:pos.category,name:point_of_sale.pomme
 msgid "Apples"
-msgstr ""
+msgstr "Äpfel"
 
 #. module: point_of_sale
 #: report:pos.details:0
@@ -3495,7 +3495,7 @@ msgstr ""
 #. module: point_of_sale
 #: model:pos.category,name:point_of_sale.fruits
 msgid "Fresh Fruits"
-msgstr ""
+msgstr "Frische Früchte"
 
 #. module: point_of_sale
 #: model:product.template,name:point_of_sale.lindemans_pecheresse_37,,5cl_product_template
@@ -3921,6 +3921,10 @@ msgid ""
 "maximum is reached, the user will have an error message at the closing of "
 "his session saying that he needs to contact his manager."
 msgstr ""
+"Diese Feld zeigt die maximale erlaubte Differenz zwischen Schlussbestand und "
+"errechnetem Kassenabschluss Bestand. Wenn dieses Maximum erreicht wurde, "
+"erscheint eine Fehlermeldung mit dem Hinweis den Kassenmanager zu "
+"kontaktieren."
 
 #. module: point_of_sale
 #: report:pos.invoice:0
@@ -4152,7 +4156,7 @@ msgstr "Jahr"
 #: code:addons/point_of_sale/static/src/xml/pos.xml:505
 #, python-format
 msgid "at"
-msgstr ""
+msgstr "am"
 
 #. module: point_of_sale
 #: model:ir.model,name:point_of_sale.model_cash_box_in
diff --git a/addons/point_of_sale/i18n/pt_BR.po b/addons/point_of_sale/i18n/pt_BR.po
index e64faffb898..5921c414d67 100644
--- a/addons/point_of_sale/i18n/pt_BR.po
+++ b/addons/point_of_sale/i18n/pt_BR.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2013-03-07 08:37+0000\n"
-"PO-Revision-Date: 2013-04-20 22:44+0000\n"
+"PO-Revision-Date: 2013-04-22 03:34+0000\n"
 "Last-Translator: Thiago Tognoli <Unknown>\n"
 "Language-Team: Brazilian Portuguese <pt_BR@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: 2013-04-21 05:32+0000\n"
-"X-Generator: Launchpad (build 16567)\n"
+"X-Launchpad-Export-Date: 2013-04-23 06:09+0000\n"
+"X-Generator: Launchpad (build 16580)\n"
 
 #. module: point_of_sale
 #: field:report.transaction.pos,product_nb:0
@@ -492,6 +492,7 @@ msgid ""
 "Difference between the counted cash control at the closing and the computed "
 "balance."
 msgstr ""
+"Diferença entre o controle do dinheiro contado e o balanço computado."
 
 #. module: point_of_sale
 #: view:pos.session.opening:0
@@ -747,7 +748,7 @@ msgstr "Scanner de Código de Barras"
 #. module: point_of_sale
 #: model:product.template,name:point_of_sale.pomme_granny_smith_product_template
 msgid "Granny Smith apples"
-msgstr ""
+msgstr "Maçãs Granny Smith"
 
 #. module: point_of_sale
 #: help:product.product,expense_pdt:0
@@ -841,7 +842,7 @@ msgstr "Recibo"
 #: field:report.sales.by.margin.pos,net_margin_per_qty:0
 #: field:report.sales.by.margin.pos.month,net_margin_per_qty:0
 msgid "Net margin per Qty"
-msgstr ""
+msgstr "Margem líquida por Qtd."
 
 #. module: point_of_sale
 #: view:pos.confirm:0
@@ -1019,7 +1020,7 @@ msgstr "Produto do Usuário"
 #: code:addons/point_of_sale/point_of_sale.py:984
 #, python-format
 msgid "The POS order must have lines when calling this method"
-msgstr ""
+msgstr "Este pedido do PDV deve ter linhas quando chamar este método"
 
 #. module: point_of_sale
 #: code:addons/point_of_sale/point_of_sale.py:1143
@@ -1209,7 +1210,7 @@ msgstr "Iniciar Ponto de Venda"
 #. module: point_of_sale
 #: model:pos.category,name:point_of_sale.pils
 msgid "Pils"
-msgstr ""
+msgstr "Pils"
 
 #. module: point_of_sale
 #: help:pos.session,cash_register_balance_end_real:0
@@ -1292,6 +1293,8 @@ msgid ""
 "You do not have any open cash register. You must create a payment method or "
 "open a cash register."
 msgstr ""
+"Você não tem uma caixa registrador aberta. Você deve criar um método de "
+"pagamento ou abrir uma caixa registradora."
 
 #. module: point_of_sale
 #: view:report.sales.by.margin.pos:0
@@ -1677,6 +1680,9 @@ msgid ""
 "Your ending balance is too different from the theorical cash closing (%.2f), "
 "the maximum allowed is: %.2f. You can contact your manager to force it."
 msgstr ""
+"Seu saldo final é muito diferente do fechamento de caixa teórico (%.2f), o "
+"máximo permitido é: %.2f. Você pode contatar seu gerente para forçar o "
+"fechamento."
 
 #. module: point_of_sale
 #: view:pos.session:0
@@ -1875,7 +1881,7 @@ msgstr "Não foi possível Excluir!"
 #. module: point_of_sale
 #: model:pos.category,name:point_of_sale.autres_agrumes
 msgid "Other Citrus"
-msgstr ""
+msgstr "Other Citrus"
 
 #. module: point_of_sale
 #: report:pos.details:0
@@ -1942,7 +1948,7 @@ msgstr "IJsboerke Mocha 2.5L"
 #. module: point_of_sale
 #: field:pos.session,cash_control:0
 msgid "Has Cash Control"
-msgstr ""
+msgstr "Tem Controle de Caixa"
 
 #. module: point_of_sale
 #: model:ir.actions.act_window,name:point_of_sale.action_report_pos_order_all
diff --git a/addons/procurement/i18n/de.po b/addons/procurement/i18n/de.po
index 0ca164ec2a8..a5f15b0f9b3 100644
--- a/addons/procurement/i18n/de.po
+++ b/addons/procurement/i18n/de.po
@@ -8,14 +8,15 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2013-03-07 08:38+0000\n"
-"PO-Revision-Date: 2013-04-17 08:53+0000\n"
-"Last-Translator: Iyasu Beraki <iberaki@elegosoft.com>\n"
+"PO-Revision-Date: 2013-04-21 20:05+0000\n"
+"Last-Translator: Thorsten Vocks (OpenBig.org) <thorsten.vocks@big-"
+"consulting.net>\n"
 "Language-Team: German <de@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: 2013-04-18 06:05+0000\n"
-"X-Generator: Launchpad (build 16567)\n"
+"X-Launchpad-Export-Date: 2013-04-23 06:09+0000\n"
+"X-Generator: Launchpad (build 16580)\n"
 
 #. module: procurement
 #: model:ir.ui.menu,name:procurement.menu_stock_sched
@@ -74,7 +75,7 @@ msgstr ""
 #. module: procurement
 #: view:procurement.order:0
 msgid "External note..."
-msgstr ""
+msgstr "Externer Hinweis..."
 
 #. module: procurement
 #: view:product.product:0
@@ -183,7 +184,7 @@ msgstr "Nachrichten"
 #. module: procurement
 #: view:procurement.order:0
 msgid "Cancel Procurement"
-msgstr ""
+msgstr "Abbrechen Disposition"
 
 #. module: procurement
 #: view:product.product:0
@@ -262,6 +263,21 @@ msgid ""
 "                </p>\n"
 "            "
 msgstr ""
+"<p>\n"
+"                Beschaffungsaufträge repräsentieren den Bedarf einer "
+"bestimmte Menge an Produkten, zu einem bestimmten Zeitpunkt, an einem "
+"bestimmten Ort. Verkaufsaufträge sind dabei eine typische Quelle der "
+"Beschaffung (sind aber verschiedene Dokumente). Je nach Beschaffung "
+"Parameter und Produkt-Konfiguration, versucht die Engine der "
+"Beschaffungsdisposition, die Notwendigkeit durch die Reservierung von "
+"Produkten ab Lager, Bestellung von Produkten durch einen Lieferanten oder "
+"die Übergabe eines Produktionsauftrag zu befriedigen, etc. Ein Beschaffung "
+"Ausnahmefehler tritt auf, wenn das System keinen Weg finden kann, um eine "
+"Beschaffung vorzuschlagen. Einige Ausnahmen werden sich dabei automatisch "
+"lösen lassen, andere erfordern allerdings manuelle Eingriffe (die durch eine "
+"spezielle Fehlermeldung identifiziert).\n"
+"                </p>\n"
+"            "
 
 #. module: procurement
 #: selection:procurement.order,state:0
@@ -287,7 +303,7 @@ msgstr "Bestätige"
 #. module: procurement
 #: view:stock.warehouse.orderpoint:0
 msgid "Quantity Multiple"
-msgstr ""
+msgstr "Vielfaches"
 
 #. module: procurement
 #: help:procurement.order,origin:0
@@ -520,7 +536,7 @@ msgstr "Berechne Bestand"
 #. module: procurement
 #: view:procurement.order:0
 msgid "e.g. SO005"
-msgstr ""
+msgstr "z.B. SO005"
 
 #. module: procurement
 #: field:stock.warehouse.orderpoint,procurement_draft_ids:0
@@ -578,7 +594,7 @@ msgstr ""
 #. module: procurement
 #: view:procurement.order:0
 msgid "Internal note..."
-msgstr ""
+msgstr "Interner Hinweis..."
 
 #. module: procurement
 #: help:procurement.orderpoint.compute,automatic:0
@@ -591,7 +607,7 @@ msgstr ""
 #: field:procurement.order,product_uom:0
 #: field:stock.warehouse.orderpoint,product_uom:0
 msgid "Product Unit of Measure"
-msgstr ""
+msgstr "Mengen Einheit"
 
 #. module: procurement
 #: constraint:stock.warehouse.orderpoint:0
@@ -599,6 +615,8 @@ msgid ""
 "You have to select a product unit of measure in the same category than the "
 "default unit of measure of the product"
 msgstr ""
+"Sie sollten eine Mengeneinheit für ein Produkt immer aus der gleichen "
+"Kategorie auswählen."
 
 #. module: procurement
 #: view:procurement.order:0
@@ -611,6 +629,8 @@ msgid ""
 "as it's a consumable (as a result of this, the quantity\n"
 "                           on hand may become negative)."
 msgstr ""
+"da es Verbrauchsware ist  (als unmittelbares Resultat kann die verfügbare "
+"Menge negativ sein)."
 
 #. module: procurement
 #: field:procurement.order,note:0
@@ -624,6 +644,9 @@ msgid ""
 "OpenERP generates a procurement to bring the forecasted quantity to the Max "
 "Quantity."
 msgstr ""
+"Wenn der virtuelle Lagerbestand unter die Mindestmenge für dieses Produkt "
+"fällt, generiert OpenERP einen Bestellvorschlag, um die prognostizierte "
+"Menge wieder auf den Wiederauffüllbestand aufzufüllen."
 
 #. module: procurement
 #: selection:procurement.order,state:0
@@ -656,7 +679,7 @@ msgstr ""
 #. module: procurement
 #: view:product.product:0
 msgid "for the delivery order."
-msgstr ""
+msgstr "für die Lieferung."
 
 #. module: procurement
 #: selection:procurement.order,priority:0
@@ -670,16 +693,20 @@ msgid ""
 "will be generated, depending on the product type. \n"
 "Buy: When procuring the product, a purchase order will be generated."
 msgstr ""
+"Fertigung: Durch die Disposition eines Produkts wird entweder ein "
+"Fertigungsauftrag oder ein Bestellvorschlag generiert, in Abhängigkeit vom "
+"Produkttyp. Buy: Wenn das Produkt disponiert wird, sollte dann ein "
+"Beschaffungsauftrag erstellt werden."
 
 #. module: procurement
 #: field:stock.warehouse.orderpoint,product_max_qty:0
 msgid "Maximum Quantity"
-msgstr ""
+msgstr "Maximale Menge"
 
 #. module: procurement
 #: field:procurement.order,message_is_follower:0
 msgid "Is a Follower"
-msgstr ""
+msgstr "Ist bereits Follower"
 
 #. module: procurement
 #: code:addons/procurement/procurement.py:367
@@ -704,6 +731,8 @@ msgid ""
 "Please check the quantity in procurement order(s) for the product \"%s\", it "
 "should not be 0 or less!"
 msgstr ""
+"Bitte prüfen Sie die Menge in dem Dispositionsvorschlag für das Produkt "
+"\"%s\", es sollte nicht 0 oder weniger sein!"
 
 #. module: procurement
 #: field:procurement.order,date_planned:0
@@ -721,6 +750,8 @@ msgid ""
 "When you sell this product, a delivery order will be created.\n"
 "                           OpenERP will consider that the"
 msgstr ""
+"Wenn Sie das Produkt verkaufen, wird ein Ausgangslieferschein erstellt.\n"
+"                                  OpenERP wird annehmen , dass"
 
 #. module: procurement
 #: code:addons/procurement/schedulers.py:133
@@ -746,6 +777,9 @@ msgid ""
 "procurement method as\n"
 "                           'Make to Stock'."
 msgstr ""
+"Wenn Sie diesen Service verkaufen, wird nichts spezielles angestossen,\n"
+"                      um diesen Kunden zu beliefern, außer dass die "
+"Beschaffungsmethode auf \"Beschaffe an Lager\" verändert wurde."
 
 #. module: procurement
 #: help:stock.warehouse.orderpoint,qty_multiple:0
@@ -765,7 +799,7 @@ msgstr "Extra Informationen"
 #. module: procurement
 #: field:procurement.order,message_summary:0
 msgid "Summary"
-msgstr ""
+msgstr "Zusammenfassung"
 
 #. module: procurement
 #: sql_constraint:stock.warehouse.orderpoint:0
@@ -785,7 +819,7 @@ msgstr "Datum Ende"
 #. module: procurement
 #: view:res.company:0
 msgid "Logistics"
-msgstr ""
+msgstr "Logistik"
 
 #. module: procurement
 #: help:product.template,procure_method:0
@@ -794,6 +828,10 @@ msgid ""
 "for replenishment. \n"
 "Make to Order: When needed, the product is purchased or produced."
 msgstr ""
+"Beschaffe an Lager (MtS): Bei Bedarf wird die Ware entweder direkt vom Lager "
+"entnommen, ansonsten wird auf die Wiederbefüllung des gewartet.\n"
+"Beschaffe von Auftrag: Bei Bedarf wird das Produkt entweder eingekauft oder "
+"produziert."
 
 #. module: procurement
 #: field:mrp.property,composition:0
@@ -872,6 +910,9 @@ msgid ""
 "procurement to bring the forecasted quantity to the Quantity specified as "
 "Max Quantity."
 msgstr ""
+"Wenn der verfügbare Bestand unterhalb die minimale  Bestellmenge sinkt, "
+"erstellt OpenERP hierdurch direkt eine Bestellung, um hierdurch auch den "
+"Bestand auszugleichen."
 
 #. module: procurement
 #: model:ir.model,name:procurement.model_procurement_order_compute_all
@@ -892,7 +933,7 @@ msgstr "Aufträge in Fehlerliste"
 #: model:ir.actions.act_window,name:procurement.product_open_orderpoint
 #: view:product.product:0
 msgid "Orderpoints"
-msgstr ""
+msgstr "Bestellzeitpunkte"
 
 #. module: procurement
 #: field:product.product,orderpoint_ids:0
@@ -909,6 +950,9 @@ msgid ""
 "order or\n"
 "                        a new task."
 msgstr ""
+"Wieder auffüllen ist für die Erstellung eine Beschaffungsvorschlags "
+"vorgesehen.In Abhängigkeit von der Produktkonfiguration kann dieses entweder "
+"eine Bestellung, einen Fertigungsauftrag oder eine neue Aufgabe erstellen."
 
 #. module: procurement
 #: field:procurement.order,close_move:0
@@ -978,7 +1022,7 @@ msgstr ""
 #. module: procurement
 #: view:product.product:0
 msgid "When you sell this product, OpenERP will"
-msgstr ""
+msgstr "Wenn Sie dieses Produkt verkaufen, wird OpenERP"
 
 #. module: procurement
 #: view:procurement.order:0
@@ -1010,6 +1054,7 @@ msgstr "Meldebestände"
 #, python-format
 msgid "Cannot delete Procurement Order(s) which are in %s state."
 msgstr ""
+"Es kann keine Beschaffung für Aufträge im %s Stadium vorgenommen werden."
 
 #. module: procurement
 #: field:procurement.order,product_uos:0
@@ -1081,7 +1126,7 @@ msgstr "DISPOSITION"
 #. module: procurement
 #: view:product.product:0
 msgid "Request Procurement"
-msgstr ""
+msgstr "Anfrage zur Beschaffung"
 
 #. module: procurement
 #: code:addons/procurement/schedulers.py:87
diff --git a/addons/purchase/i18n/de.po b/addons/purchase/i18n/de.po
index d135350d948..09a4ad4f265 100644
--- a/addons/purchase/i18n/de.po
+++ b/addons/purchase/i18n/de.po
@@ -8,14 +8,15 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2013-03-07 08:37+0000\n"
-"PO-Revision-Date: 2013-04-17 08:22+0000\n"
-"Last-Translator: Iyasu Beraki <iberaki@elegosoft.com>\n"
+"PO-Revision-Date: 2013-04-21 21:46+0000\n"
+"Last-Translator: Thorsten Vocks (OpenBig.org) <thorsten.vocks@big-"
+"consulting.net>\n"
 "Language-Team: German <de@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: 2013-04-18 06:06+0000\n"
-"X-Generator: Launchpad (build 16567)\n"
+"X-Launchpad-Export-Date: 2013-04-23 06:09+0000\n"
+"X-Generator: Launchpad (build 16580)\n"
 
 #. module: purchase
 #: model:res.groups,name:purchase.group_analytic_accounting
@@ -77,7 +78,7 @@ msgstr "Tag"
 #. module: purchase
 #: view:purchase.order:0
 msgid "Cancel Order"
-msgstr ""
+msgstr "Storno Bestellung"
 
 #. module: purchase
 #: view:purchase.report:0
@@ -839,7 +840,7 @@ msgstr "Angebotsanfrage"
 #. module: purchase
 #: view:purchase.order:0
 msgid "Send by Email"
-msgstr ""
+msgstr "Email senden"
 
 #. module: purchase
 #: report:purchase.order:0
@@ -1692,7 +1693,7 @@ msgstr "Datum der Auftragsannahme"
 #: view:purchase.order:0
 #: selection:purchase.report,state:0
 msgid "Approved"
-msgstr "Auftrag angenommen"
+msgstr "Genehmigt"
 
 #. module: purchase
 #: selection:purchase.order,state:0
diff --git a/addons/purchase_requisition/i18n/de.po b/addons/purchase_requisition/i18n/de.po
index 89fa686087e..ae58b9582a9 100644
--- a/addons/purchase_requisition/i18n/de.po
+++ b/addons/purchase_requisition/i18n/de.po
@@ -8,14 +8,15 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2013-03-07 08:38+0000\n"
-"PO-Revision-Date: 2012-12-21 23:00+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"PO-Revision-Date: 2013-04-21 21:47+0000\n"
+"Last-Translator: Thorsten Vocks (OpenBig.org) <thorsten.vocks@big-"
+"consulting.net>\n"
 "Language-Team: German <de@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: 2013-03-28 05:59+0000\n"
-"X-Generator: Launchpad (build 16546)\n"
+"X-Launchpad-Export-Date: 2013-04-23 06:10+0000\n"
+"X-Generator: Launchpad (build 16580)\n"
 
 #. module: purchase_requisition
 #: view:purchase.requisition:0
@@ -73,7 +74,7 @@ msgstr "Verantwortlich"
 #. module: purchase_requisition
 #: view:purchase.requisition:0
 msgid "Cancel Requisition"
-msgstr ""
+msgstr "Abbrechen Anforderung"
 
 #. module: purchase_requisition
 #: view:purchase.requisition:0
@@ -198,7 +199,7 @@ msgstr "Erfasse Angebot"
 #. module: purchase_requisition
 #: view:purchase.requisition:0
 msgid "e.g. PO0025"
-msgstr ""
+msgstr "z.B. PO0025"
 
 #. module: purchase_requisition
 #: help:purchase.requisition,message_ids:0
diff --git a/addons/report_webkit/i18n/de.po b/addons/report_webkit/i18n/de.po
index ec8764f4b8a..b63d10fb493 100644
--- a/addons/report_webkit/i18n/de.po
+++ b/addons/report_webkit/i18n/de.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2013-03-07 08:38+0000\n"
-"PO-Revision-Date: 2012-12-21 23:00+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"PO-Revision-Date: 2013-04-21 21:51+0000\n"
+"Last-Translator: Simeon <Unknown>\n"
 "Language-Team: German <de@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: 2013-03-28 05:59+0000\n"
-"X-Generator: Launchpad (build 16546)\n"
+"X-Launchpad-Export-Date: 2013-04-23 06:10+0000\n"
+"X-Generator: Launchpad (build 16580)\n"
 
 #. module: report_webkit
 #: view:ir.actions.report.xml:0
@@ -413,7 +413,7 @@ msgstr "B10    16  31 x 44 mm"
 #. module: report_webkit
 #: view:report.webkit.actions:0
 msgid "Cancel"
-msgstr "Abrechen"
+msgstr "Abbrechen"
 
 #. module: report_webkit
 #: field:ir.header_webkit,css:0
diff --git a/addons/sale/i18n/de.po b/addons/sale/i18n/de.po
index cb97ae9060b..8e6cd31c8a6 100644
--- a/addons/sale/i18n/de.po
+++ b/addons/sale/i18n/de.po
@@ -8,15 +8,15 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2013-03-07 08:37+0000\n"
-"PO-Revision-Date: 2013-03-17 12:00+0000\n"
+"PO-Revision-Date: 2013-04-21 21:49+0000\n"
 "Last-Translator: Thorsten Vocks (OpenBig.org) <thorsten.vocks@big-"
 "consulting.net>\n"
 "Language-Team: German <de@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: 2013-03-28 06:00+0000\n"
-"X-Generator: Launchpad (build 16546)\n"
+"X-Launchpad-Export-Date: 2013-04-23 06:10+0000\n"
+"X-Generator: Launchpad (build 16580)\n"
 
 #. module: sale
 #: model:res.groups,name:sale.group_analytic_accounting
@@ -248,7 +248,7 @@ msgstr "Fehlerhafte Daten"
 #. module: sale
 #: view:sale.order.line:0
 msgid "Cancel Line"
-msgstr ""
+msgstr "Abbrechen Auftragszeile"
 
 #. module: sale
 #: help:sale.config.settings,group_discount_per_so_line:0
@@ -407,7 +407,7 @@ msgstr "Ungültig"
 #. module: sale
 #: view:sale.order:0
 msgid "Terms and conditions..."
-msgstr ""
+msgstr "Geschäftsbedingungen..."
 
 #. module: sale
 #: help:sale.advance.payment.inv,advance_payment_method:0
@@ -1735,6 +1735,8 @@ msgstr ""
 #, python-format
 msgid "There is no default shop for the current user's company!"
 msgstr ""
+"Es existiert noch kein Standard Shop für das Unternehmen des aktuellen "
+"Benutzers!"
 
 #. module: sale
 #: model:ir.model,name:sale.model_sale_advance_payment_inv
diff --git a/addons/sale/i18n/fr.po b/addons/sale/i18n/fr.po
index ad022e0e9d5..0a883c03d72 100644
--- a/addons/sale/i18n/fr.po
+++ b/addons/sale/i18n/fr.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2013-03-07 08:37+0000\n"
-"PO-Revision-Date: 2013-03-21 16:32+0000\n"
+"PO-Revision-Date: 2013-04-22 15:04+0000\n"
 "Last-Translator: WANTELLET Sylvain <Swantellet@tetra-info.com>\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: 2013-03-28 06:00+0000\n"
-"X-Generator: Launchpad (build 16546)\n"
+"X-Launchpad-Export-Date: 2013-04-23 06:10+0000\n"
+"X-Generator: Launchpad (build 16580)\n"
 
 #. module: sale
 #: model:res.groups,name:sale.group_analytic_accounting
@@ -465,6 +465,8 @@ msgid ""
 "Holds the Chatter summary (number of messages, ...). This summary is "
 "directly in html format in order to be inserted in kanban views."
 msgstr ""
+"Contient le résumé de la discussion (nombre de messages, ...). Ce résumé est "
+"au format HTML pour permettre son utilisation dans la vue kanban."
 
 #. module: sale
 #: help:sale.order.line,sequence:0
@@ -1204,7 +1206,7 @@ msgstr "Analyse des ventes"
 #. module: sale
 #: field:sale.order,message_is_follower:0
 msgid "Is a Follower"
-msgstr ""
+msgstr "Est abonné"
 
 #. module: sale
 #: view:sale.order.line:0
@@ -1566,7 +1568,7 @@ msgstr "Annuler le devis"
 #. module: sale
 #: field:sale.order,message_follower_ids:0
 msgid "Followers"
-msgstr ""
+msgstr "Abonnés"
 
 #. module: sale
 #: code:addons/sale/sale.py:944
@@ -1593,7 +1595,7 @@ msgstr "Recherche des lignes non-facturées"
 #. module: sale
 #: model:ir.model,name:sale.model_account_config_settings
 msgid "account.config.settings"
-msgstr ""
+msgstr "account.config.settings"
 
 #. module: sale
 #: sql_constraint:sale.order:0
@@ -1712,7 +1714,7 @@ msgstr "Prix unitaire"
 #. module: sale
 #: selection:sale.advance.payment.inv,advance_payment_method:0
 msgid "Percentage"
-msgstr ""
+msgstr "Pourcentage"
 
 #. module: sale
 #: view:sale.order:0
@@ -1807,6 +1809,91 @@ msgid ""
 "</div>\n"
 "            "
 msgstr ""
+"\n"
+"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
+"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: #FFF; \">\n"
+"\n"
+"    <p>Bonjour ${object.partner_id.name},</p>\n"
+"    \n"
+"    <p>Veuillez trouver ci-joint votre ${object.state in ('draft', 'sent') "
+"and 'devis' or 'confirmation de commande'} de la part de  "
+"${object.company_id.name}: </p>\n"
+"\n"
+"    <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
+"       &nbsp;&nbsp;<strong>RÉFÉRENCES</strong><br />\n"
+"       &nbsp;&nbsp;Numéro: <strong>${object.name}</strong><br />\n"
+"       &nbsp;&nbsp;Montant total: <strong>${object.amount_total} "
+"${object.pricelist_id.currency_id.name}</strong><br />\n"
+"       &nbsp;&nbsp;Date: ${object.date_order}<br />\n"
+"       % if object.origin:\n"
+"       &nbsp;&nbsp;Référence: ${object.origin}<br />\n"
+"       % endif\n"
+"       % if object.client_order_ref:\n"
+"       &nbsp;&nbsp;Votre référence: ${object.client_order_ref}<br />\n"
+"       % endif\n"
+"       % if object.user_id:\n"
+"       &nbsp;&nbsp;Votre contact: <a href=\"mailto:${object.user_id.email or "
+"''}?subject=Order%20${object.name}\">${object.user_id.name}</a>\n"
+"       % endif\n"
+"    </p>\n"
+"\n"
+"    % if object.paypal_url:\n"
+"    <br/>\n"
+"    <p>Il vous est possible de payer directement avec Paypal:</p>\n"
+"        <a style=\"margin-left: 120px;\" href=\"${object.paypal_url}\">\n"
+"            <img class=\"oe_edi_paypal_button\" "
+"src=\"https://www.paypal.com/en_US/i/btn/btn_paynowCC_LG.gif\"/>\n"
+"        </a>\n"
+"    % endif\n"
+"\n"
+"    <br/>\n"
+"    <p>Si vous avez des questions, n'hésitez pas à nous contacter.</p>\n"
+"    <p>Merci d'avoir choisi ${object.company_id.name or 'us'}!</p>\n"
+"    <br/>\n"
+"    <br/>\n"
+"    <div style=\"width: 375px; margin: 0px; padding: 0px; background-color: "
+"#8E0000; border-top-left-radius: 5px 5px; border-top-right-radius: 5px 5px; "
+"background-repeat: repeat no-repeat;\">\n"
+"        <h3 style=\"margin: 0px; padding: 2px 14px; font-size: 12px; color: "
+"#DDD;\">\n"
+"            <strong style=\"text-"
+"transform:uppercase;\">${object.company_id.name}</strong></h3>\n"
+"    </div>\n"
+"    <div style=\"width: 347px; margin: 0px; padding: 5px 14px; line-height: "
+"16px; background-color: #F2F2F2;\">\n"
+"        <span style=\"color: #222; margin-bottom: 5px; display: block; \">\n"
+"        % if object.company_id.street:\n"
+"            ${object.company_id.street}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.street2:\n"
+"            ${object.company_id.street2}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.city or object.company_id.zip:\n"
+"            ${object.company_id.zip} ${object.company_id.city}<br/>\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 ''}<br/>\n"
+"        % endif\n"
+"        </span>\n"
+"        % if object.company_id.phone:\n"
+"            <div style=\"margin-top: 0px; margin-right: 0px; margin-bottom: "
+"0px; margin-left: 0px; padding-top: 0px; padding-right: 0px; padding-bottom: "
+"0px; padding-left: 0px; \">\n"
+"                Tél:&nbsp; ${object.company_id.phone}\n"
+"            </div>\n"
+"        % endif\n"
+"        % if object.company_id.website:\n"
+"            <div>\n"
+"                Web :&nbsp;<a "
+"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
+"            </div>\n"
+"        %endif\n"
+"        <p></p>\n"
+"    </div>\n"
+"</div>\n"
+"            "
 
 #. module: sale
 #: view:sale.order.line:0
@@ -2006,7 +2093,7 @@ msgstr "Prix ​​fixe (dépôt)"
 #. module: sale
 #: model:ir.model,name:sale.model_sale_config_settings
 msgid "sale.config.settings"
-msgstr ""
+msgstr "sale.config.settings"
 
 #. module: sale
 #: selection:sale.report,month:0
@@ -2053,7 +2140,7 @@ msgstr "Manuelle en cours"
 #: code:addons/sale/wizard/sale_make_invoice.py:43
 #, python-format
 msgid "Warning!"
-msgstr ""
+msgstr "Attention !"
 
 #. module: sale
 #: model:ir.actions.act_window,name:sale.action_order_tree
@@ -2089,7 +2176,7 @@ msgstr ""
 #. module: sale
 #: help:sale.order,message_ids:0
 msgid "Messages and communication history"
-msgstr ""
+msgstr "Historique des messages et des communications"
 
 #. module: sale
 #: view:sale.order:0
@@ -2178,7 +2265,7 @@ msgstr "Générer les factures à partir des lignes de commande"
 #: view:sale.make.invoice:0
 #: view:sale.order.line.make.invoice:0
 msgid "or"
-msgstr ""
+msgstr "ou"
 
 #. module: sale
 #: model:ir.actions.act_window,name:sale.action_order_line_product_tree
diff --git a/addons/share/i18n/tr.po b/addons/share/i18n/tr.po
index 09c58210faa..ec013b8167f 100644
--- a/addons/share/i18n/tr.po
+++ b/addons/share/i18n/tr.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2013-03-07 08:39+0000\n"
-"PO-Revision-Date: 2013-04-04 19:14+0000\n"
+"PO-Revision-Date: 2013-04-22 19:06+0000\n"
 "Last-Translator: Ayhan KIZILTAN <Unknown>\n"
 "Language-Team: Turkish <tr@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: 2013-04-05 06:23+0000\n"
-"X-Generator: Launchpad (build 16550)\n"
+"X-Launchpad-Export-Date: 2013-04-23 06:10+0000\n"
+"X-Generator: Launchpad (build 16580)\n"
 
 #. module: share
 #: code:addons/share/wizard/share_wizard.py:841
@@ -48,13 +48,13 @@ msgstr "Erişim Verildi!"
 #. module: share
 #: field:share.wizard,record_name:0
 msgid "Record name"
-msgstr ""
+msgstr "Kayıt adı"
 
 #. module: share
 #: help:share.wizard,message:0
 msgid ""
 "An optional personal message, to be included in the email notification."
-msgstr ""
+msgstr "Seçmeli bir kişisel mesaj, eposta bildiriminde kullanılmak üzere."
 
 #. module: share
 #: field:share.wizard,user_type:0
@@ -76,6 +76,10 @@ msgid ""
 "    %s\n"
 "\n"
 msgstr ""
+"Belgeler ekli değildir, onları doğrudan my OpenERP sunucusunda buradan "
+"görebilirsiniz:\n"
+"    %s\n"
+"\n"
 
 #. module: share
 #: model:ir.module.category,name:share.module_category_share
@@ -90,6 +94,8 @@ msgid ""
 "Hello,\n"
 "\n"
 msgstr ""
+"Merhaba,\n"
+"\n"
 
 #. module: share
 #: field:share.wizard,share_root_url:0
@@ -101,7 +107,7 @@ msgstr "Erişim Adresini (URL) Paylaş"
 #: field:share.wizard,email_2:0
 #: field:share.wizard,email_3:0
 msgid "New user email"
-msgstr ""
+msgstr "Yeni kullanıcı epostası"
 
 #. module: share
 #: code:addons/share/wizard/share_wizard.py:886
@@ -126,7 +132,7 @@ msgstr ""
 #: code:addons/share/static/src/js/share.js:63
 #, python-format
 msgid "Embed"
-msgstr ""
+msgstr "Göm"
 
 #. module: share
 #: code:addons/share/wizard/share_wizard.py:598
@@ -207,7 +213,7 @@ msgstr "Paylaşım Seçenekleri"
 #: code:addons/share/static/src/xml/share.xml:9
 #, python-format
 msgid "Invite"
-msgstr ""
+msgstr "Davet et"
 
 #. module: share
 #: view:share.wizard:0
@@ -217,7 +223,7 @@ msgstr ""
 #. module: share
 #: view:share.wizard:0
 msgid "Configuration"
-msgstr ""
+msgstr "Yapılandırma"
 
 #. module: share
 #: view:share.wizard:0
diff --git a/addons/stock/i18n/de.po b/addons/stock/i18n/de.po
index bb0cbaab1ab..66a91c36821 100644
--- a/addons/stock/i18n/de.po
+++ b/addons/stock/i18n/de.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2013-03-07 08:37+0000\n"
-"PO-Revision-Date: 2013-03-12 21:37+0000\n"
-"Last-Translator: Felix Schubert <Unknown>\n"
+"PO-Revision-Date: 2013-04-21 21:56+0000\n"
+"Last-Translator: Iyasu Beraki <iberaki@elegosoft.com>\n"
 "Language-Team: German <de@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: 2013-03-28 06:02+0000\n"
-"X-Generator: Launchpad (build 16546)\n"
+"X-Launchpad-Export-Date: 2013-04-23 06:10+0000\n"
+"X-Generator: Launchpad (build 16580)\n"
 
 #. module: stock
 #: field:stock.inventory.line.split,line_exist_ids:0
@@ -3016,7 +3016,7 @@ msgstr "Bestände nach Seriennumer"
 #. module: stock
 #: view:stock.picking:0
 msgid "Cancel Transfer"
-msgstr ""
+msgstr "Lieferung abbrechen"
 
 #. module: stock
 #: selection:report.stock.inventory,month:0
diff --git a/addons/stock/i18n/fr.po b/addons/stock/i18n/fr.po
index 55b7369ec20..4b9984c9044 100644
--- a/addons/stock/i18n/fr.po
+++ b/addons/stock/i18n/fr.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2013-03-07 08:37+0000\n"
-"PO-Revision-Date: 2013-01-31 10:21+0000\n"
-"Last-Translator: Jean-Bruno <redb68@gmail.com>\n"
+"PO-Revision-Date: 2013-04-21 15:45+0000\n"
+"Last-Translator: Bertrand Rétif <Unknown>\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: 2013-03-28 06:02+0000\n"
-"X-Generator: Launchpad (build 16546)\n"
+"X-Launchpad-Export-Date: 2013-04-23 06:10+0000\n"
+"X-Generator: Launchpad (build 16580)\n"
 
 #. module: stock
 #: field:stock.inventory.line.split,line_exist_ids:0
@@ -1347,6 +1347,8 @@ msgstr "Auteur"
 msgid ""
 "You are moving %.2f %s but only %.2f %s available for this serial number."
 msgstr ""
+"Vous transférez %.2f %s mais il y a seulement %.2f %s de disponible pour ce "
+"numéro de série."
 
 #. module: stock
 #: report:stock.picking.list:0
@@ -1452,6 +1454,15 @@ msgid ""
 "* Available: When products are reserved, it is set to 'Available'.\n"
 "* Done: When the shipment is processed, the state is 'Done'."
 msgstr ""
+"* Nouveau : Quand le mouvement est crée mais pas encore confirmé.\n"
+"* Attente d'un autre mouvement : Cet état est visible quand un mouvement est "
+"en attente d'au autre, par exemple pour des transferts qui s'enchainent.\n"
+"* En attente de disponibilité : Cet état est atteint lorsque la résolution "
+"de l'approvisionnement n'est pas finie. Le lancement du planificateur peut "
+"être nécessaire, ou la fabrication d'un composant...\n"
+"* Disponible : Quand les produits sont disponibles, l'état est "
+"'Disponible'.\n"
+"* Terminé : Quand le bon d'expédition est traité, l'état est 'Terminé'."
 
 #. module: stock
 #: model:stock.location,name:stock.stock_location_locations_partner
@@ -1567,7 +1578,7 @@ msgstr ""
 #: code:addons/stock/stock.py:1890
 #, python-format
 msgid "Warning: No Back Order"
-msgstr ""
+msgstr "Attention : Pas de reliquats"
 
 #. module: stock
 #: model:ir.model,name:stock.model_stock_move
@@ -1622,7 +1633,7 @@ msgstr "Brouillon"
 #. module: stock
 #: field:product.template,sale_delay:0
 msgid "Customer Lead Time"
-msgstr ""
+msgstr "Délai de livraison au client"
 
 #. module: stock
 #: view:stock.picking:0
@@ -1633,7 +1644,7 @@ msgstr "Informations complémentaires."
 #: code:addons/stock/stock.py:2648
 #, python-format
 msgid "Missing partial picking data for move #%s."
-msgstr ""
+msgstr "Données manquantes pour le mouvement #%s."
 
 #. module: stock
 #: field:stock.location.product,from_date:0
@@ -1872,7 +1883,7 @@ msgstr "Merci de saisir une quantité positive à mettre au rebut"
 #. module: stock
 #: model:stock.location,name:stock.stock_location_shop1
 msgid "Your Company, Birmingham shop"
-msgstr ""
+msgstr "Votre société, Magasin de Birmingham"
 
 #. module: stock
 #: view:product.product:0
@@ -1935,7 +1946,7 @@ msgstr "Livraison entrante :"
 #. module: stock
 #: field:stock.location,valuation_out_account_id:0
 msgid "Stock Valuation Account (Outgoing)"
-msgstr ""
+msgstr "Compte de valorisation des stocks (sortant)"
 
 #. module: stock
 #: view:stock.return.picking.memory:0
@@ -2131,7 +2142,7 @@ msgstr "Emplacement de Stock"
 #: code:addons/stock/wizard/stock_partial_picking.py:97
 #, python-format
 msgid "_Deliver"
-msgstr ""
+msgstr "_Livrer"
 
 #. module: stock
 #: code:addons/stock/wizard/stock_inventory_merge.py:64
@@ -2317,6 +2328,7 @@ msgstr "Prix"
 #: field:stock.config.settings,module_stock_invoice_directly:0
 msgid "Create and open the invoice when the user finish a delivery order"
 msgstr ""
+"Créer et ouvrir la facture lorsque l'utilisateur a fini le bon de livraison"
 
 #. module: stock
 #: model:ir.model,name:stock.model_stock_return_picking_memory
@@ -2326,7 +2338,7 @@ msgstr "stock.return.picking.memory"
 #. module: stock
 #: field:stock.config.settings,group_stock_inventory_valuation:0
 msgid "Generate accounting entries per stock movement"
-msgstr ""
+msgstr "Générer une écriture comptable pour chaque mouvement de stock"
 
 #. module: stock
 #: code:addons/stock/product.py:449
@@ -2372,7 +2384,7 @@ msgstr "Nom"
 #. module: stock
 #: report:stock.picking.list:0
 msgid "Supplier Address :"
-msgstr ""
+msgstr "Adresse du fournisseur :"
 
 #. module: stock
 #: field:stock.config.settings,group_product_variant:0
@@ -2414,7 +2426,7 @@ msgstr "Erreur utilisateur !"
 #. module: stock
 #: view:stock.partial.picking:0
 msgid "Stock partial Picking"
-msgstr ""
+msgstr "Préparation partielle"
 
 #. module: stock
 #: view:stock.picking:0
@@ -2426,7 +2438,7 @@ msgstr "Créer facture/avoir"
 #: help:stock.picking.in,message_ids:0
 #: help:stock.picking.out,message_ids:0
 msgid "Messages and communication history"
-msgstr ""
+msgstr "Historique des messages et des communications"
 
 #. module: stock
 #: view:report.stock.inventory:0
@@ -2617,7 +2629,7 @@ msgstr "Lots"
 #. module: stock
 #: view:stock.partial.picking:0
 msgid "_Transfer"
-msgstr ""
+msgstr "_Transférer"
 
 #. module: stock
 #: selection:report.stock.move,type:0
@@ -2923,6 +2935,8 @@ msgid ""
 "By changing the quantity here, you accept the new quantity as complete: "
 "OpenERP will not automatically generate a Back Order."
 msgstr ""
+"En changeant la quantité, vous acceptez la nouvelle quantité comme "
+"définitive : OpenERP ne générera pas de commande de reliquat."
 
 #. module: stock
 #: report:stock.inventory.move:0
@@ -3198,7 +3212,7 @@ msgstr ""
 #. module: stock
 #: view:stock.partial.move.line:0
 msgid "Stock Partial Move Line"
-msgstr ""
+msgstr "Mouvement de stock partiel"
 
 #. module: stock
 #: field:stock.move,product_uos_qty:0
@@ -3228,7 +3242,7 @@ msgstr ""
 #: code:addons/stock/wizard/stock_partial_picking.py:95
 #, python-format
 msgid "_Receive"
-msgstr ""
+msgstr "_Recevoir"
 
 #. module: stock
 #: field:stock.incoterms,active:0
@@ -3559,7 +3573,7 @@ msgstr "Stock"
 #: code:addons/stock/wizard/stock_return_picking.py:222
 #, python-format
 msgid "Returned Picking"
-msgstr ""
+msgstr "Bon de retour"
 
 #. module: stock
 #: model:ir.model,name:stock.model_product_product
@@ -3708,7 +3722,7 @@ msgstr "Assistant"
 #. module: stock
 #: view:report.stock.move:0
 msgid "Completed Stock-Moves"
-msgstr ""
+msgstr "Mouvements de stock terminés"
 
 #. module: stock
 #: model:ir.actions.act_window,name:stock.action_view_stock_location_product
@@ -3719,7 +3733,7 @@ msgstr "Articles par emplacement"
 #. module: stock
 #: view:stock.config.settings:0
 msgid "Logistic"
-msgstr ""
+msgstr "Logistique"
 
 #. module: stock
 #: model:ir.actions.act_window,help:stock.action_location_form
@@ -3765,7 +3779,7 @@ msgstr "Étagère 1"
 #: help:stock.picking.in,date:0
 #: help:stock.picking.out,date:0
 msgid "Creation time, usually the time of the order."
-msgstr ""
+msgstr "Date de création, habituellement la date de la commande."
 
 #. module: stock
 #: field:stock.tracking,name:0
@@ -3982,7 +3996,7 @@ msgstr "Numéro de série"
 #. module: stock
 #: model:ir.model,name:stock.model_stock_partial_picking
 msgid "Partial Picking Processing Wizard"
-msgstr ""
+msgstr "Assistant de livraison partielle"
 
 #. module: stock
 #: field:stock.location,icon:0
@@ -4077,7 +4091,7 @@ msgstr "Annulée"
 #. module: stock
 #: view:stock.picking:0
 msgid "Confirmed Delivery Orders"
-msgstr ""
+msgstr "Bons de livraison confirmés"
 
 #. module: stock
 #: view:stock.move:0
@@ -4103,7 +4117,7 @@ msgstr ""
 #. module: stock
 #: model:stock.location,name:stock.stock_location_shop0
 msgid "Your Company, Chicago shop"
-msgstr ""
+msgstr "Votre société, Magasin de Chicago"
 
 #. module: stock
 #: selection:report.stock.move,type:0
@@ -4164,7 +4178,7 @@ msgstr "Bons de livraisons"
 #. module: stock
 #: view:stock.picking:0
 msgid "Delivery orders already processed"
-msgstr ""
+msgstr "Bons de livraison déjà traités"
 
 #. module: stock
 #: field:product.template,loc_case:0
@@ -4278,7 +4292,7 @@ msgstr "Configuration"
 #. module: stock
 #: model:res.groups,name:stock.group_locations
 msgid "Manage Multiple Locations and Warehouses"
-msgstr ""
+msgstr "Gérer les emplacements multiples et les entrepôts"
 
 #. module: stock
 #: help:stock.change.standard.price,new_price:0
@@ -4425,6 +4439,7 @@ msgstr ""
 #: help:stock.production.lot,name:0
 msgid "Unique Serial Number, will be displayed as: PREFIX/SERIAL [INT_REF]"
 msgstr ""
+"Numéro de série unique, sera affiché comme suit : PREFIX / SERIE [INT_REF]"
 
 #. module: stock
 #: code:addons/stock/product.py:142
@@ -4443,7 +4458,7 @@ msgstr "Articles entrants"
 #. module: stock
 #: view:product.product:0
 msgid "update"
-msgstr ""
+msgstr "mettre à jour"
 
 #. module: stock
 #: view:stock.change.product.qty:0
@@ -4482,7 +4497,7 @@ msgstr "Information"
 #: code:addons/stock/stock.py:1199
 #, python-format
 msgid "You cannot remove the picking which is in %s state!"
-msgstr ""
+msgstr "Vous ne pouvez pas supprimer une opération dans l'état %s!"
 
 #. module: stock
 #: help:res.partner,property_stock_customer:0
@@ -4609,6 +4624,8 @@ msgid ""
 "Adds a Claim link to the delivery order.\n"
 "                This installs the module claim_from_delivery."
 msgstr ""
+"Ajoute un lien Réclamation au bon de livraison.\n"
+"                 Cela installe le module Réclamation (claim_from_delivery)."
 
 #. module: stock
 #: code:addons/stock/wizard/stock_return_picking.py:208
@@ -4809,7 +4826,7 @@ msgstr "Emplacement de Dest."
 #. module: stock
 #: model:ir.actions.report.xml,name:stock.report_picking_list
 msgid "Picking Slip"
-msgstr ""
+msgstr "Bordereau de transfert"
 
 #. module: stock
 #: help:stock.move,product_packaging:0
@@ -4827,7 +4844,7 @@ msgstr "Délais"
 #. module: stock
 #: report:stock.picking.list:0
 msgid "Schedule Date"
-msgstr ""
+msgstr "Date prévue"
 
 #. module: stock
 #: field:stock.location.product,to_date:0
@@ -4848,12 +4865,12 @@ msgstr "Eclater le mouvement"
 #. module: stock
 #: selection:stock.move,state:0
 msgid "New"
-msgstr ""
+msgstr "Nouveau"
 
 #. module: stock
 #: view:report.stock.move:0
 msgid "Future Stock-Moves"
-msgstr ""
+msgstr "Mouvements de stock à venir"
 
 #. module: stock
 #: view:report.stock.inventory:0
@@ -4878,7 +4895,7 @@ msgstr "Mai"
 #: code:addons/stock/product.py:110
 #, python-format
 msgid "No difference between standard price and new price!"
-msgstr ""
+msgstr "Aucune différence entre le prix standard et le nouveau prix!"
 
 #. module: stock
 #: view:stock.picking.out:0
@@ -4893,7 +4910,7 @@ msgstr "Livraison"
 #. module: stock
 #: view:stock.fill.inventory:0
 msgid "Import the current inventory"
-msgstr ""
+msgstr "Importer l'inventaire actuel"
 
 #. module: stock
 #: model:ir.actions.act_window,name:stock.action5
@@ -4974,7 +4991,7 @@ msgstr ""
 #. module: stock
 #: view:stock.picking.in:0
 msgid "Date of Reception"
-msgstr ""
+msgstr "Date de réception"
 
 #. module: stock
 #: help:stock.config.settings,group_stock_multiple_locations:0
@@ -4986,7 +5003,7 @@ msgstr ""
 #. module: stock
 #: view:stock.picking:0
 msgid "Confirm & Transfer"
-msgstr ""
+msgstr "Confirmer et transférer"
 
 #. module: stock
 #: field:stock.location,scrap_location:0
@@ -5077,7 +5094,7 @@ msgstr "Optionnel : mouvement de stock suivant quand il est enchainé."
 #. module: stock
 #: view:stock.picking.out:0
 msgid "Print Delivery Slip"
-msgstr ""
+msgstr "Imprimer le bordereau de livraison"
 
 #. module: stock
 #: view:report.stock.inventory:0
@@ -5100,7 +5117,7 @@ msgstr "Prêt"
 #. module: stock
 #: report:stock.picking.list:0
 msgid "Warehouse Address :"
-msgstr ""
+msgstr "Adresse de l'entrepôt :"
 
 #~ msgid "_Cancel"
 #~ msgstr "_Annuler"
diff --git a/addons/stock/i18n/tr.po b/addons/stock/i18n/tr.po
index b6c6d5a223c..44337f5b311 100644
--- a/addons/stock/i18n/tr.po
+++ b/addons/stock/i18n/tr.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2013-03-07 08:37+0000\n"
-"PO-Revision-Date: 2013-04-13 18:25+0000\n"
+"PO-Revision-Date: 2013-04-22 19:01+0000\n"
 "Last-Translator: Ayhan KIZILTAN <Unknown>\n"
 "Language-Team: Turkish <tr@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: 2013-04-14 05:50+0000\n"
-"X-Generator: Launchpad (build 16564)\n"
+"X-Launchpad-Export-Date: 2013-04-23 06:10+0000\n"
+"X-Generator: Launchpad (build 16580)\n"
 
 #. module: stock
 #: field:stock.inventory.line.split,line_exist_ids:0
@@ -3801,6 +3801,24 @@ msgid ""
 "              </p>\n"
 "            "
 msgstr ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Bir konum eklemek için tıklayın.\n"
+"              </p><p>\n"
+"                Deponuzu yapısını ve düzeninin yansıtacak konumları\n"
+"                tanımlayın. OpenERP fiziksel konumları (depolar, raflar,\n"
+"                kutular, vb.), iş ortağı konumları (müşteriler, "
+"tedarikçiler)\n"
+"                ve stok işlemlerinin benzeri olan üretim emirleri\n"
+"                harcamaları, sayımlar vb. gibi sanal konumları\n"
+"                yönetebilir.\n"
+"              </p><p>  \n"
+"                OpenERP de her stok işlemi ürünleri bir konumdan diğerine\n"
+"                taşır.  Örneğin, eğer bir tedarikçiden ürün alırsanız\n"
+"                OpenERP ürünleri Tedarikçi konumundan Stok konumuna\n"
+"                taşıyacaktır. Her rapor fiziksel, iş ortağı ya da sanal\n"
+"                konumlarda yapılabilir.\n"
+"              </p>\n"
+"            "
 
 #. module: stock
 #: field:stock.fill.inventory,recursive:0
@@ -4297,6 +4315,9 @@ msgid ""
 "As an example, a decimal precision of 2 will allow weights like: 9.99 kg, "
 "whereas a decimal precision of 4 will allow weights like:  0.0231 kg."
 msgstr ""
+"Bir örnek olarak, 2 ondalık hassasiyeti vereceği ağırlık değeri: 9.99 kg "
+"olacağı gibi 4 ondalık hassasiyetinin de vereceği ağırlık değeri: 0.0231 kg "
+"olur."
 
 #. module: stock
 #: view:report.stock.move:0
@@ -4749,6 +4770,9 @@ msgid ""
 "a serial number on product moves, you can get the upstream or downstream "
 "traceability of that product."
 msgstr ""
+"Bu sizin ürünlerinizi seri numarası seçerek yönetmenizi sağlar. Ürün "
+"hareketlerinde seri numarası seçerseniz, o ürünün aşağı doğru ya da yukarı "
+"doğru izlenebilirliğini elde edebilirsiniz."
 
 #. module: stock
 #: code:addons/stock/wizard/stock_fill_inventory.py:124
@@ -5045,6 +5069,20 @@ msgid ""
 "              </p>\n"
 "            "
 msgstr ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Bir seri numarası eklemek için tıklayın.\n"
+"              </p><p>\n"
+"                Bu kayıt ettiğiniz bütün partilerin listesidir. Bir parti\n"
+"                seçtiğinizde, partinin içerdiği ürünlerin aşağı doğru ve "
+"yukarı\n"
+"                doğru izlenebilirliğini elde edebilirsiniz. Varsayılan "
+"olarak, liste\n"
+"                deponuzda bulunan seri numaralarına göre süzülür ama siz\n"
+"                'Mevcut' düğmesine basarak ürettiğiniz, aldığınız ya da\n"
+"                müşterilerinize teslim ettiğiniz tüm partileri elde\n"
+"                edebilirsiniz.\n"
+"              </p>\n"
+"            "
 
 #. module: stock
 #: view:stock.picking.in:0
@@ -5057,6 +5095,8 @@ msgid ""
 "This allows to configure and use multiple stock locations and warehouses,\n"
 "                instead of having a single default one."
 msgstr ""
+"Bu, varsayılan olarak tek bir yerine çoklu stok konumları\n"
+"                ve depoları yapılandırmanızı ve kullanmanızı sağlar."
 
 #. module: stock
 #: view:stock.picking:0
diff --git a/addons/web_calendar/i18n/de.po b/addons/web_calendar/i18n/de.po
index d464de70625..fe1cda84be4 100644
--- a/addons/web_calendar/i18n/de.po
+++ b/addons/web_calendar/i18n/de.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openerp-web\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2013-03-07 08:39+0000\n"
-"PO-Revision-Date: 2012-12-21 23:00+0000\n"
-"Last-Translator: Ferdinand @ Camptocamp <Unknown>\n"
+"PO-Revision-Date: 2013-04-21 17:10+0000\n"
+"Last-Translator: Boris Skegin <boris.skegin.de@gmail.com>\n"
 "Language-Team: German <de@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: 2013-03-29 05:10+0000\n"
-"X-Generator: Launchpad (build 16546)\n"
+"X-Launchpad-Export-Date: 2013-04-23 06:10+0000\n"
+"X-Generator: Launchpad (build 16580)\n"
 
 #. module: web_calendar
 #. openerp-web
@@ -36,7 +36,7 @@ msgstr "Details"
 #: code:addons/web_calendar/static/src/js/calendar.js:487
 #, python-format
 msgid "Edit: %s"
-msgstr ""
+msgstr "Editieren: %s"
 
 #. module: web_calendar
 #. openerp-web
@@ -160,7 +160,7 @@ msgstr "Agenda"
 #: code:addons/web_calendar/static/src/js/calendar.js:450
 #, python-format
 msgid "Create: %s"
-msgstr ""
+msgstr "Anlegen: %s"
 
 #. module: web_calendar
 #. openerp-web
diff --git a/addons/web_kanban/i18n/de.po b/addons/web_kanban/i18n/de.po
index 6c3f321ede6..c442a73ffa2 100644
--- a/addons/web_kanban/i18n/de.po
+++ b/addons/web_kanban/i18n/de.po
@@ -8,14 +8,15 @@ msgstr ""
 "Project-Id-Version: openerp-web\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2013-03-07 08:39+0000\n"
-"PO-Revision-Date: 2012-12-21 23:00+0000\n"
-"Last-Translator: Felix Schubert <Unknown>\n"
+"PO-Revision-Date: 2013-04-21 17:16+0000\n"
+"Last-Translator: Thorsten Vocks (OpenBig.org) <thorsten.vocks@big-"
+"consulting.net>\n"
 "Language-Team: German <de@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: 2013-03-29 05:10+0000\n"
-"X-Generator: Launchpad (build 16546)\n"
+"X-Launchpad-Export-Date: 2013-04-23 06:10+0000\n"
+"X-Generator: Launchpad (build 16580)\n"
 
 #. module: web_kanban
 #. openerp-web
@@ -86,7 +87,7 @@ msgstr "Eine neue Spalte hinzufügen"
 #: code:addons/web_kanban/static/src/xml/web_kanban.xml:45
 #, python-format
 msgid "Fold"
-msgstr ""
+msgstr "Schließen"
 
 #. module: web_kanban
 #. openerp-web
@@ -114,7 +115,7 @@ msgstr "Wollen Sie diesen Datensatz wirklich löschen?"
 #: code:addons/web_kanban/static/src/js/kanban.js:677
 #, python-format
 msgid "Unfold"
-msgstr ""
+msgstr "Öffnen"
 
 #. module: web_kanban
 #. openerp-web
@@ -135,7 +136,7 @@ msgstr "verbleibend)"
 #: code:addons/web_kanban/static/src/js/kanban.js:421
 #, python-format
 msgid "An error has occured while moving the record to this group: "
-msgstr ""
+msgstr "Fehler beim Versuch den Datensatz dieser Gruppe zuzuweisen: "
 
 #. module: web_kanban
 #. openerp-web
diff --git a/openerp/addons/base/i18n/de.po b/openerp/addons/base/i18n/de.po
index 484e24bacf5..b3945a47131 100644
--- a/openerp/addons/base/i18n/de.po
+++ b/openerp/addons/base/i18n/de.po
@@ -8,14 +8,15 @@ msgstr ""
 "Project-Id-Version: openobject-server\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2013-03-07 08:36+0000\n"
-"PO-Revision-Date: 2013-03-24 15:20+0000\n"
-"Last-Translator: Felix Schubert <Unknown>\n"
+"PO-Revision-Date: 2013-04-22 22:24+0000\n"
+"Last-Translator: Thorsten Vocks (OpenBig.org) <thorsten.vocks@big-"
+"consulting.net>\n"
 "Language-Team: German <de@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: 2013-03-25 05:23+0000\n"
-"X-Generator: Launchpad (build 16540)\n"
+"X-Launchpad-Export-Date: 2013-04-23 06:08+0000\n"
+"X-Generator: Launchpad (build 16580)\n"
 
 #. module: base
 #: model:ir.module.module,description:base.module_account_check_writing
@@ -102,7 +103,7 @@ msgstr "Touchscreen Oberfläche für Shops"
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_l10n_in_hr_payroll
 msgid "Indian Payroll"
-msgstr "Indische Lohnkonten"
+msgstr "Indische Lohnabrechnung"
 
 #. module: base
 #: help:ir.cron,model:0
@@ -133,8 +134,10 @@ msgid ""
 "    "
 msgstr ""
 "\n"
-"A module that adds manufacturers and attributes on the product form.\n"
-"====================================================================\n"
+"Ein Modul durch das Hersteller und Attribute direkt auf der Produktseite "
+"ergänzt werden: \n"
+"==========================================================================\n"
+"\n"
 "\n"
 "Sie können jetzt die folgenden Produktparameter definieren:\n"
 "-----------------------------------------------\n"
@@ -222,7 +225,7 @@ msgstr ""
 "Modul zur Erzeugung von Rechnung auf Basis von Personalkosten "
 "(Zeiterfassungseinträge, Spesen, ...).\n"
 "\n"
-"Sie können Preislisten im Analytischen Account definieren und Auswertungen\n"
+"Sie können Preislisten für eine Kostestelle definieren und Auswertungen "
 "erzeugen."
 
 #. module: base
@@ -231,7 +234,7 @@ msgstr ""
 #: code:addons/base/res/res_users.py:473
 #, python-format
 msgid "Warning!"
-msgstr "Achtung!"
+msgstr "Warnung !"
 
 #. module: base
 #: code:addons/base/ir/ir_model.py:406
@@ -2169,6 +2172,11 @@ msgid ""
 "Please keep in mind that you should review and adapt it with your "
 "Accountant, before using it in a live Environment.\n"
 msgstr ""
+"\n"
+"Dieses Modul repräsentiert den Standard Kontenplan für Österreich auf Basis "
+"der Vorlage des BMF.gv.at.\n"
+"Bitte beachten Sie, daß dieser Kontenplan generell vor Inbetriebnahme "
+"geprüft und möglicherweise auch angepasst werden sollte.\n"
 
 #. module: base
 #: model:res.country,name:base.kg
@@ -2381,6 +2389,17 @@ msgid ""
 "with the effect of creating, editing and deleting either ways.\n"
 "    "
 msgstr ""
+"\n"
+"Synchronisation der erledigten Projektaufgaben mit der persönlichen "
+"Zeiterfassung.\n"
+"====================================================================\n"
+"\n"
+"Diese Anwendung ermöglicht den Transfer der dokumentierten Zeiten von "
+"erledigten Aufgaben zu den\n"
+"Zeiterfassungspositionen der Mitarbeiter unter Berücksichtigung des Datums "
+"der Durchführung, als alternative Möglichkeit zur Aufgaben- und "
+"Zeiterfassung.\n"
+"    "
 
 #. module: base
 #: model:ir.model,name:base.model_ir_model_access
@@ -3506,6 +3525,20 @@ msgid ""
 "    * Unlimited \"Group By\" levels (not stacked), two cross level analysis "
 "(stacked)\n"
 msgstr ""
+"\n"
+"Grafik Ansichten im Web Client\n"
+"==========================\n"
+"     * Erstellt eine <Graph> Ansicht und ermöglicht eine dynamische "
+"Anpassung der Präsentation\n"
+"     * Folgende Diagrammtypen werden unterstützt: Torte, Linien, Flächen, "
+"Balken, Radardiagramme\n"
+"     * Gestapelte / Nicht gestapelte  Diagramm Ansicht für Flächen und "
+"Balken\n"
+"     * Legende: oben, innen (oben / links), versteckt\n"
+"     * Features: Download als PNG-oder CSV-, Daten-Browser, dynamischer "
+"Perspektivenwechsel\n"
+"     * Unlimitierte \"Gruppierung\" Ebenen (nicht gestapelt), zweifache "
+"Kreuzanalyse (gestapelt)\n"
 
 #. module: base
 #: view:res.groups:0
@@ -3602,6 +3635,13 @@ msgid ""
 "    * ``base_stage``: stage management\n"
 "    "
 msgstr ""
+"\n"
+"Dieses Modul berücksichtigt Status und Stufe. Es ist eine Anpassung der "
+"crm_base und crm_case Klassen aus dem CRM.\n"
+"\n"
+"    * \"base_state\": Status Management\n"
+"    * \"base_stage\": Fortschritt Management\n"
+"    "
 
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_web_linkedin
@@ -3747,7 +3787,7 @@ msgstr ""
 #. module: base
 #: view:res.company:0
 msgid "e.g. Global Business Solutions"
-msgstr ""
+msgstr "z.B. Global Business Solutions"
 
 #. module: base
 #: field:res.company,rml_header1:0
@@ -4866,6 +4906,25 @@ msgid ""
 "      and iban account numbers\n"
 "    "
 msgstr ""
+"\n"
+"Diese Anwendung erweitert das Standard account_bank_statement_line Objekt "
+"zur verbesserten e-banking Unterstützung.\n"
+"============================================================================="
+"=======================\n"
+"\n"
+"Das Module ergänzt:\n"
+"    - Wertstellungsdatum\n"
+"    - Stapel Zahlungen\n"
+"    - Nachvollziehbarkeit der Kontobewegungen\n"
+"    - Bankauszug Anzeige der einzelnen Positionen\n"
+"    - Bankkonto Saldo\n"
+"    - Verbesserte Verarbeitungsgeschwindigkeit beim Import von Auszügen "
+"(durch\n"
+"        den ebanking_import Kontext Schalter)\n"
+"    - name_search in res.partner.bank ermöglicht effektive Suche nach Banken "
+"\n"
+"        und Iban Kontounterstützung\n"
+"    "
 
 #. module: base
 #: selection:ir.module.module,state:0
@@ -4901,7 +4960,7 @@ msgstr "Ltd"
 #. module: base
 #: model:ir.actions.server,name:base.action_run_ir_action_todo
 msgid "Run Remaining Action Todo"
-msgstr ""
+msgstr "Starte noch offene Aktionen"
 
 #. module: base
 #: field:res.partner,ean13:0
@@ -5276,6 +5335,17 @@ msgid ""
 "    * Number Padding\n"
 "    "
 msgstr ""
+"\n"
+"Dieses Modul verwaltet die interne Nummernreihenfolge für die Buchhaltung.\n"
+"================================================================\n"
+"\n"
+"Es ist möglich die folgenden Attribute für diese Sequenz anzupassen:\n"
+"    *Präfix\n"
+"    *Suffix\n"
+"    *Nächste Nummer\n"
+"    *Fortlaufende Nummer\n"
+"    * Stellenanzahl der Anzeige\n"
+"    "
 
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_project_timesheet
@@ -5782,7 +5852,7 @@ msgstr ""
 #. module: base
 #: view:base.language.export:0
 msgid "This file was generated using the universal"
-msgstr ""
+msgstr "Die Dateianzeige wurde von der Standard Sprache generiert"
 
 #. module: base
 #: model:res.partner.category,name:base.res_partner_category_7
@@ -6064,7 +6134,7 @@ msgstr "Vollständiger Zugriff"
 #. module: base
 #: model:ir.module.module,description:base.module_l10n_pt
 msgid "Plano de contas SNC para Portugal"
-msgstr ""
+msgstr "Kontenplan der SNC für Portugal."
 
 #. module: base
 #: view:ir.actions.act_window:0
@@ -6093,7 +6163,7 @@ msgstr "Nur, wenn dieses Bankkonto zu Ihrem Unternehmen gehört"
 #: code:addons/base/ir/ir_fields.py:337
 #, python-format
 msgid "Unknown sub-field '%s'"
-msgstr ""
+msgstr "Unbekanntes Sub-Feld '%s'"
 
 #. module: base
 #: model:res.country,name:base.za
@@ -6132,6 +6202,11 @@ msgid ""
 "Collects web application usage with Google Analytics.\n"
 "    "
 msgstr ""
+"\n"
+"Google Analytics.\n"
+"==============\n"
+"Zusammenfassung von Webanwendungen durch Google Analytics.\n"
+"    "
 
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_hr_recruitment
@@ -6230,7 +6305,7 @@ msgstr "Datum"
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_event_moodle
 msgid "Event Moodle"
-msgstr ""
+msgstr "Moodle Veranstaltungen"
 
 #. module: base
 #: model:ir.module.module,description:base.module_email_template
@@ -6323,7 +6398,7 @@ msgstr ""
 #. module: base
 #: model:ir.ui.menu,name:base.menu_partner_category_form
 msgid "Partner Tags"
-msgstr ""
+msgstr "Partner Tags"
 
 #. module: base
 #: view:res.company:0
@@ -6363,12 +6438,12 @@ msgstr "Dezimalzeichen"
 #: code:addons/orm.py:5319
 #, python-format
 msgid "Missing required value for the field '%s'."
-msgstr ""
+msgstr "Es fehlt der verantwortliche Wert für das Feld '%s'."
 
 #. module: base
 #: view:ir.rule:0
 msgid "Write Access Right"
-msgstr ""
+msgstr "Schreib Zugangsberechtigung"
 
 #. module: base
 #: model:ir.actions.act_window,help:base.action_res_groups
@@ -6408,7 +6483,7 @@ msgstr "Isle of Man"
 #. module: base
 #: help:ir.actions.client,res_model:0
 msgid "Optional model, mostly used for needactions."
-msgstr ""
+msgstr "Dieses ist ein optionales Krokodil"
 
 #. module: base
 #: code:addons/base/module/module.py:306
@@ -6448,6 +6523,9 @@ msgid ""
 "wizard if the delivery is to be invoiced.\n"
 "    "
 msgstr ""
+"\n"
+"Rechnungsassistenz für Teillieferungen\n"
+"    "
 
 #. module: base
 #: selection:ir.translation,type:0
@@ -7176,7 +7254,7 @@ msgstr "USA kleinere amerikanische Überseeinseln"
 #. module: base
 #: view:base.language.import:0
 msgid "e.g. English"
-msgstr ""
+msgstr "z.B. Englisch"
 
 #. module: base
 #: help:ir.cron,numbercall:0
@@ -7268,7 +7346,7 @@ msgstr "Ist ein Unternehmen"
 #: view:res.partner:0
 #: view:res.users:0
 msgid "e.g. www.openerp.com"
-msgstr ""
+msgstr "z.B. www.openerp.com"
 
 #. module: base
 #: selection:ir.cron,interval_type:0
@@ -7320,13 +7398,15 @@ msgstr ""
 #: code:addons/base/ir/ir_fields.py:182
 #, python-format
 msgid "'%s' does not seem to be a number for field '%%(field)s'"
-msgstr ""
+msgstr "'%s' scheint keine Nummer für das Feld '%%(field)s zu sein."
 
 #. module: base
 #: help:res.country.state,name:0
 msgid ""
 "Administrative divisions of a country. E.g. Fed. State, Departement, Canton"
 msgstr ""
+"Administrative Aufteilung eines Landes. Z.B. in Bundesstaaten, Länder, "
+"Regionen"
 
 #. module: base
 #: view:res.partner.bank:0
@@ -7346,7 +7426,7 @@ msgstr "Objekt, dass von dieser Regel betroffen ist."
 #. module: base
 #: selection:ir.actions.act_window,target:0
 msgid "Inline View"
-msgstr ""
+msgstr "Inline Anzeige"
 
 #. module: base
 #: field:ir.filters,is_default:0
@@ -7760,7 +7840,7 @@ msgstr "ir.cron"
 #. module: base
 #: model:ir.ui.menu,name:base.menu_sales_followup
 msgid "Payment Follow-up"
-msgstr ""
+msgstr "Mahnwesen"
 
 #. module: base
 #: model:res.country,name:base.cw
@@ -7836,6 +7916,7 @@ msgstr "Nachweis der Veränderungen in der Datenbank"
 #, python-format
 msgid "Value '%s' not found in selection field '%%(field)s'"
 msgstr ""
+"Der Wert '%s' konnte nicht in Auswahlfeld '%%(field)s' entdeckt werden."
 
 #. module: base
 #: model:res.country,name:base.sd
@@ -8655,7 +8736,7 @@ msgstr "Benutzername"
 #. module: base
 #: view:ir.filters:0
 msgid "Filters created by myself"
-msgstr ""
+msgstr "Eigene Filter"
 
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_l10n_hn
@@ -8916,7 +8997,7 @@ msgstr "Nächste Nummer dieser Sequenz"
 #: view:res.partner:0
 #: view:res.users:0
 msgid "Tags..."
-msgstr ""
+msgstr "Tags..."
 
 #. module: base
 #: view:res.partner:0
@@ -8936,7 +9017,7 @@ msgstr "Dieses Fenster"
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_portal_anonymous
 msgid "Anonymous portal"
-msgstr ""
+msgstr "Anonymer Gastportalzugang"
 
 #. module: base
 #: field:base.language.export,format:0
@@ -8946,7 +9027,7 @@ msgstr "Dateiformat"
 #. module: base
 #: view:ir.filters:0
 msgid "My filters"
-msgstr ""
+msgstr "Eigene Filter"
 
 #. module: base
 #: field:res.lang,iso_code:0
@@ -9623,7 +9704,7 @@ msgstr "Aktion der Anwendungsprogramme"
 #. module: base
 #: field:res.partner.bank.type,field_ids:0
 msgid "Type Fields"
-msgstr ""
+msgstr "Typ Felder"
 
 #. module: base
 #: model:ir.module.module,summary:base.module_hr_recruitment
@@ -9655,7 +9736,7 @@ msgstr "Legt fest, ob die Währung vor oder hinter dem Betrag gedruckt wird."
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_pad_project
 msgid "Pad on tasks"
-msgstr ""
+msgstr "Anzeigetafel für Aufgaben"
 
 #. module: base
 #: model:ir.model,name:base.model_base_update_translations
@@ -9680,7 +9761,7 @@ msgstr "Finnland"
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_web_shortcuts
 msgid "Web Shortcuts"
-msgstr ""
+msgstr "Web Schnellzugriff"
 
 #. module: base
 #: view:res.partner:0
@@ -9733,7 +9814,7 @@ msgstr "Diagramm Ansichten"
 #. module: base
 #: help:ir.model.relation,name:0
 msgid "PostgreSQL table name implementing a many2many relation."
-msgstr ""
+msgstr "PostgreSQL Tabelle implementiert eine many2many Beziehung."
 
 #. module: base
 #: model:ir.module.module,description:base.module_base
@@ -9768,13 +9849,13 @@ msgstr "Kuwait"
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_account_followup
 msgid "Payment Follow-up Management"
-msgstr ""
+msgstr "Management der Zahlungserinnerungen"
 
 #. module: base
 #: code:addons/orm.py:5334
 #, python-format
 msgid "The value for the field '%s' already exists."
-msgstr ""
+msgstr "Der Wert für dieses Feld '%s' existiert bereits."
 
 #. module: base
 #: field:workflow.workitem,inst_id:0
@@ -10062,7 +10143,7 @@ msgstr ""
 #. module: base
 #: field:ir.module.module,description_html:0
 msgid "Description HTML"
-msgstr ""
+msgstr "HTML Beschreibung"
 
 #. module: base
 #: help:res.groups,implied_ids:0
@@ -10255,7 +10336,7 @@ msgstr "Slovenian / slovenščina"
 #. module: base
 #: field:res.currency,position:0
 msgid "Symbol Position"
-msgstr ""
+msgstr "Position des Symbols"
 
 #. module: base
 #: model:ir.module.module,description:base.module_l10n_de
@@ -10297,6 +10378,10 @@ msgid ""
 "\n"
 "(Document type: %s)"
 msgstr ""
+"Für diese Art Dokument, kann es sinnvoll sein, nur auf die selbst erstellten "
+"Dokumente zuzugreifen.\n"
+"\n"
+"(Dokumententyp: %s)"
 
 #. module: base
 #: view:base.language.export:0
@@ -10356,7 +10441,7 @@ msgstr ""
 #. module: base
 #: constraint:ir.rule:0
 msgid "Rules can not be applied on the Record Rules model."
-msgstr ""
+msgstr "Regeln können nicht einfach aufgezeichnet und angewendet werden."
 
 #. module: base
 #: field:res.partner,supplier:0
@@ -11060,7 +11145,7 @@ msgstr "Partner Ref."
 #: code:addons/base/static/src/js/apps.js:103
 #, python-format
 msgid "OpenERP Apps Unreachable"
-msgstr ""
+msgstr "OpenERP Apps können nicht erreicht werden"
 
 #. module: base
 #: field:ir.attachment,create_date:0
@@ -11405,7 +11490,7 @@ msgstr ""
 #: code:addons/base/ir/ir_fields.py:316
 #, python-format
 msgid "external id"
-msgstr ""
+msgstr "Externe ID"
 
 #. module: base
 #: view:ir.model:0
@@ -11637,7 +11722,7 @@ msgstr "Felder Beschreibung"
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_analytic_contract_hr_expense
 msgid "Contracts Management: hr_expense link"
-msgstr ""
+msgstr "Vertragsmanagement: hr_expense Link"
 
 #. module: base
 #: code:addons/base/module/module.py:670
@@ -11646,6 +11731,8 @@ msgid ""
 "The `%s` module appears to be unavailable at the moment, please try again "
 "later."
 msgstr ""
+"Das '%s' Modul scheint nicht mehr erreichbar zu sein, bitte versuchen Sie es "
+"später erneut."
 
 #. module: base
 #: view:ir.attachment:0
@@ -11685,7 +11772,7 @@ msgstr ""
 #. module: base
 #: field:ir.attachment,store_fname:0
 msgid "Stored Filename"
-msgstr ""
+msgstr "Abgespeicherter Dateiname"
 
 #. module: base
 #: field:res.partner,use_parent_address:0
@@ -11917,7 +12004,7 @@ msgstr "Beispiel einer Marketing-Kampagne"
 #, python-format
 msgid ""
 "Can not create Many-To-One records indirectly, import the field separately"
-msgstr ""
+msgstr "Es können keine Many-To-One Daten indirekt eingegeben werden"
 
 #. module: base
 #: field:ir.cron,interval_type:0
@@ -11927,7 +12014,7 @@ msgstr "Intervall in Minuten"
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_portal_stock
 msgid "Portal Stock"
-msgstr ""
+msgstr "Portal Lager"
 
 #. module: base
 #: field:workflow.activity,kind:0
@@ -12057,7 +12144,7 @@ msgstr ""
 #: view:res.partner:0
 #: view:res.users:0
 msgid "Street..."
-msgstr ""
+msgstr "Straße..."
 
 #. module: base
 #: constraint:res.users:0
@@ -12157,7 +12244,7 @@ msgstr ""
 #. module: base
 #: help:ir.model.constraint,name:0
 msgid "PostgreSQL constraint or foreign key name."
-msgstr ""
+msgstr "PostGreSQL Konditionen und Fremdschlüssel"
 
 #. module: base
 #: view:res.company:0
@@ -12197,7 +12284,7 @@ msgstr "Icon URL"
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_note_pad
 msgid "Memos pad"
-msgstr ""
+msgstr "Notiz Pad"
 
 #. module: base
 #: model:ir.module.module,description:base.module_pad
@@ -12326,7 +12413,7 @@ msgstr "Zu erledigen"
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_portal_hr_employees
 msgid "Portal HR employees"
-msgstr ""
+msgstr "Portal HR Mitarbeiter"
 
 #. module: base
 #: selection:base.language.install,lang:0
@@ -12354,6 +12441,8 @@ msgid ""
 "Insufficient fields to generate a Calendar View for %s, missing a date_stop "
 "or a date_delay"
 msgstr ""
+"Ungültige Felder für die Erzeugung eines Kalenders für %s, es fehlt ein Ende "
+"Datum oder ein Ende Verzögerung Datum"
 
 #. module: base
 #: field:workflow.activity,action:0
@@ -12754,7 +12843,7 @@ msgstr "Folgenart"
 #. module: base
 #: view:res.partner:0
 msgid "Mobile:"
-msgstr ""
+msgstr "Mobile:"
 
 #. module: base
 #: code:addons/base/res/res_bank.py:195
@@ -12907,7 +12996,7 @@ msgstr "Bürobedarf"
 #. module: base
 #: field:ir.attachment,res_model:0
 msgid "Resource Model"
-msgstr ""
+msgstr "Datenmodell"
 
 #. module: base
 #: code:addons/custom.py:555
@@ -12981,7 +13070,7 @@ msgstr "workflow"
 #. module: base
 #: view:ir.rule:0
 msgid "Read Access Right"
-msgstr ""
+msgstr "Schreibe Benutzerrecht"
 
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_analytic_user_function
@@ -13085,7 +13174,7 @@ msgstr "Bundesland Bezeichnung"
 #. module: base
 #: help:ir.attachment,type:0
 msgid "Binary File or URL"
-msgstr ""
+msgstr "Binärdatei oder URL"
 
 #. module: base
 #: code:addons/base/ir/ir_fields.py:313
@@ -13207,6 +13296,9 @@ msgid ""
 "Allow users to sign up through OAuth2 Provider.\n"
 "===============================================\n"
 msgstr ""
+"\n"
+"Erlauben Sie Benutzern, sich immer über einen OAuth2 Anbieter "
+"einzuschreiben.\n"
 
 #. module: base
 #: field:change.password.user,user_id:0
@@ -13230,7 +13322,7 @@ msgstr "Puerto Rico"
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_web_tests_demo
 msgid "Demonstration of web/javascript tests"
-msgstr ""
+msgstr "Demonstration der web/javasript Tests"
 
 #. module: base
 #: field:workflow.transition,signal:0
@@ -13301,7 +13393,7 @@ msgstr ""
 #. module: base
 #: field:res.users,partner_id:0
 msgid "Related Partner"
-msgstr ""
+msgstr "zugehöriger Partner"
 
 #. module: base
 #: code:addons/osv.py:172
@@ -13338,13 +13430,13 @@ msgstr "Fertigungsabläufe"
 #. module: base
 #: view:base.language.export:0
 msgid "Here is the exported translation file:"
-msgstr ""
+msgstr "Hier finden Sie die exportierte Übersetzung:"
 
 #. module: base
 #: field:ir.actions.report.xml,report_rml_content:0
 #: field:ir.actions.report.xml,report_rml_content_data:0
 msgid "RML Content"
-msgstr ""
+msgstr "RML Inhalte"
 
 #. module: base
 #: view:res.lang:0
@@ -13602,7 +13694,7 @@ msgstr "DIN A4"
 #. module: base
 #: view:res.config.installer:0
 msgid "Configuration Installer"
-msgstr ""
+msgstr "Konfiguration Installer"
 
 #. module: base
 #: field:res.partner,customer:0
@@ -13613,7 +13705,7 @@ msgstr "Kunde"
 #: view:res.partner:0
 #: view:res.users:0
 msgid "e.g. +32.81.81.37.00"
-msgstr ""
+msgstr "z.B. +49.4471.84090000"
 
 #. module: base
 #: selection:base.language.install,lang:0
@@ -13628,6 +13720,16 @@ msgid ""
 "===================================================\n"
 "    "
 msgstr ""
+"\n"
+"Diese Anwendung ergänzt ein PAD in allen Projekt Kanban Ansichten.\n"
+"==========================================================\n"
+"    \n"
+" repräsentiert einen Zeilenumbruch. Starten Sie hierzu einfach eine neue "
+"Zeile in Ihrer Übersetzung.\n"
+" repräsentiert ein Leerzeichen. Geben Sie einfach an der passenden Position "
+"der Übersetzung ein \n"
+"Leezeichen ein.\n"
+"    "
 
 #. module: base
 #: field:ir.actions.act_window,context:0
@@ -13669,7 +13771,7 @@ msgstr "Monat: %(month)s"
 #: model:ir.actions.client,name:base.modules_updates_act_cl
 #: model:ir.ui.menu,name:base.menu_module_updates
 msgid "Updates"
-msgstr ""
+msgstr "Aktualisierungen"
 
 #. module: base
 #: field:ir.actions.act_window.view,sequence:0
@@ -13740,7 +13842,7 @@ msgstr ""
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_account_check_writing
 msgid "Check Writing"
-msgstr ""
+msgstr "Scheck ausstellen"
 
 #. module: base
 #: model:ir.module.module,description:base.module_plugin_outlook
@@ -14090,6 +14192,7 @@ msgstr "Benutzer Referenz"
 #, python-format
 msgid "'%s' does not seem to be a valid datetime for field '%%(field)s'"
 msgstr ""
+"'%s' scheint kein gültiges Datum/Zeit für das Feld '%%(field)s' zu sein"
 
 #. module: base
 #: model:res.partner.bank.type.field,name:base.bank_normal_field_bic
@@ -14460,7 +14563,7 @@ msgstr "Der Name der Gruppe muss eindeutig sein!"
 #. module: base
 #: help:ir.translation,module:0
 msgid "Module this term belongs to"
-msgstr ""
+msgstr "Anwendung zu der diese Ausdrucksweise dazu gehört"
 
 #. module: base
 #: model:ir.module.module,description:base.module_web_view_editor
@@ -14471,6 +14574,11 @@ msgid ""
 "\n"
 "        "
 msgstr ""
+"\n"
+"OpenERP Web zur Bearbeitung von Ansichten\n"
+"=======================================\n"
+"\n"
+"        "
 
 #. module: base
 #: view:ir.sequence:0
@@ -14615,7 +14723,7 @@ msgstr "Adressenformat"
 #. module: base
 #: model:ir.model,name:base.model_change_password_user
 msgid "Change Password Wizard User"
-msgstr ""
+msgstr "Passwortänderung Assistent"
 
 #. module: base
 #: model:res.groups,name:base.group_no_one
@@ -14684,7 +14792,7 @@ msgstr "Externe Identifikationen"
 #: code:addons/base/static/src/js/apps.js:103
 #, python-format
 msgid "Showing locally available modules"
-msgstr ""
+msgstr "Anzeige der lokal verfügbaren Module"
 
 #. module: base
 #: selection:base.language.install,lang:0
@@ -14755,7 +14863,7 @@ msgstr "Bank"
 #: model:ir.module.category,name:base.module_category_point_of_sale
 #: model:ir.module.module,shortdesc:base.module_point_of_sale
 msgid "Point of Sale"
-msgstr ""
+msgstr "Point of Sale"
 
 #. module: base
 #: model:ir.module.module,description:base.module_mail
@@ -15016,7 +15124,7 @@ msgstr "Filter für meine Dokumente"
 #. module: base
 #: model:ir.module.module,summary:base.module_project_gtd
 msgid "Personal Tasks, Contexts, Timeboxes"
-msgstr ""
+msgstr "Persönliche Aufgaben, Kontext, Zeitkonten"
 
 #. module: base
 #: model:ir.module.module,description:base.module_l10n_cr
@@ -15119,7 +15227,7 @@ msgstr "Neukaledonien (franz.)"
 #. module: base
 #: field:ir.model,osv_memory:0
 msgid "Transient Model"
-msgstr ""
+msgstr "Übergabemodelle"
 
 #. module: base
 #: model:res.country,name:base.cy
@@ -15445,7 +15553,7 @@ msgstr ""
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_account_test
 msgid "Accounting Consistency Tests"
-msgstr ""
+msgstr "Buchhaltung Konsistenzprüfungen"
 
 #. module: base
 #: model:ir.module.module,description:base.module_purchase_double_validation
@@ -15509,6 +15617,9 @@ msgid ""
 "128x128px image, with aspect ratio preserved. Use this field in form views "
 "or some kanban views."
 msgstr ""
+"mittlere Bildgröße dieses Kontakts. Es wird vermutlich auf 128x128px Image "
+"verändert unter Beibehaltung der Formate. Benutzen Sie das Feld in einfachen "
+"Formularanzeigen oder Kanban Ansichten."
 
 #. module: base
 #: view:base.update.translations:0
@@ -15547,7 +15658,7 @@ msgstr "Startaktion"
 #: field:ir.model,modules:0
 #: field:ir.model.fields,modules:0
 msgid "In Modules"
-msgstr ""
+msgstr "In Anwendungen"
 
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_contacts
@@ -15758,6 +15869,9 @@ msgid ""
 "The user this filter is private to. When left empty the filter is public and "
 "available to all users."
 msgstr ""
+"Der eingestellte Benutzer für diesen Filter ist nicht öffentlich. Wenn "
+"dieses Feld leer bleibt,  ist der Filter öffentlich und für alle Benutzer "
+"verfügbar."
 
 #. module: base
 #: field:ir.actions.act_window,auto_refresh:0
@@ -15811,7 +15925,7 @@ msgstr ""
 #. module: base
 #: view:res.partner:0
 msgid "Fax:"
-msgstr ""
+msgstr "Fax:"
 
 #. module: base
 #: selection:ir.ui.view,type:0
@@ -16573,7 +16687,7 @@ msgstr "Thailand"
 #. module: base
 #: model:ir.model,name:base.model_change_password_wizard
 msgid "Change Password Wizard"
-msgstr ""
+msgstr "Passwort ändern"
 
 #. module: base
 #: model:ir.module.module,summary:base.module_account_voucher
@@ -16717,7 +16831,7 @@ msgstr ""
 #. module: base
 #: field:ir.ui.menu,parent_left:0
 msgid "Parent Left"
-msgstr ""
+msgstr "Oberkonto Links"
 
 #. module: base
 #: model:ir.module.module,description:base.module_document_page
@@ -16728,6 +16842,11 @@ msgid ""
 "Web pages\n"
 "    "
 msgstr ""
+"\n"
+"Seiten\n"
+"=====\n"
+"Homepages\n"
+"    "
 
 #. module: base
 #: help:ir.actions.server,code:0
@@ -16818,7 +16937,7 @@ msgstr "Autom. Öffnen des Ansichtsformulars"
 #. module: base
 #: view:res.country:0
 msgid "Address format..."
-msgstr ""
+msgstr "Adressformat"
 
 #. module: base
 #: model:ir.module.module,description:base.module_l10n_et
@@ -16888,7 +17007,7 @@ msgstr "Export Einstellungen"
 #. module: base
 #: field:ir.actions.act_window,src_model:0
 msgid "Source Model"
-msgstr ""
+msgstr "Quelle"
 
 #. module: base
 #: view:ir.sequence:0
@@ -16946,12 +17065,12 @@ msgstr ""
 "Schneller und einfacher Verkaufsprozess\n"
 "=================================\n"
 "\n"
-"Diese Anwendung ermöglicht es Ihnen, Ihren Shop Verkäufe sehr einfach "
-"mithilfe einer vollständig web-basierte Touchscreen-Schnittstelle zu "
-"verwalten. Sie ist kompatibel mit allen Tablett PCs und dem iPad und bietet "
-"mehrere Zahlungsmöglichkeiten. \n"
+"Diese Anwendung ermöglicht Shop Verkäufe über eine vollständig web-basierte "
+"Touchscreen-Benutzeroberfläche . \n"
+"Sie ist kompatibel mit allen Tablett PCs und dem iPad und bietet mehrere "
+"Zahlungsmöglichkeiten. \n"
 "\n"
-"Produktauswahl kann auf verschiedene Weise erfolgen: \n"
+"Eine Produktauswahl kann auf verschiedene Weise erfolgen: \n"
 "\n"
 "* Mit einem Barcode-Leser\n"
 "* Durchsuchen der Kategorien von Produkten oder über eine Volltextsuche\n"
@@ -16959,12 +17078,12 @@ msgstr ""
 "Hauptfunktionen\n"
 "---------------------------\n"
 "* Schnelle Kodierung des Verkaufs\n"
-"* Wählen Sie eine Zahlungsmethode (der schnelle Weg) oder teilen Sie die "
-"Zahlung zwischen mehreren Zahlungsarten\n"
-"* Berechnung der Menge an Geld, um zurückzugeben\n"
+"* Wählen Sie eine Zahlungsmethode (z.B. Bar) oder teilen Sie die Zahlung auf "
+"mehrere Zahlungsarten auf\n"
+"* Berechnung des Wechselgeldes\n"
 "* automatische Erstellung und Bestätigung der Kommissionierung Liste\n"
-"* Ermöglicht es dem Benutzer automatisch eine Rechnung zu erstellen\n"
-"* Rückerstattung bisherigen Umsätze\n"
+"* Automatische Rechnungserstellung\n"
+"* Rückerstattung von bisherigen Umsätzen\n"
 "    "
 
 #. module: base
@@ -16977,6 +17096,10 @@ msgid ""
 "\n"
 "(Document type: %s, Operation: %s)"
 msgstr ""
+"Der gewünschte Vorgang kann aufgrund Sicherheitsbeschränkungen nicht "
+"ausgeführt werden. Bitte kontaktieren Sie den System Administrator.\n"
+"\n"
+"(Dokumenten Typ: %s, Vorgang: %s)"
 
 #. module: base
 #: model:ir.module.module,description:base.module_idea
@@ -17016,6 +17139,8 @@ msgid ""
 "%s This might be '%s' in the current model, or a field of the same name in "
 "an o2m."
 msgstr ""
+"%s Dieses kann '%s' aus dem aktuellen Modell sein, oder ein Feld des "
+"gleichen Namens in einerm o2m Szenario."
 
 #. module: base
 #: model:ir.module.module,description:base.module_account_payment
@@ -17356,7 +17481,7 @@ msgstr ""
 #: code:addons/base/ir/ir_model.py:165
 #, python-format
 msgid "Model '%s' contains module data and cannot be removed!"
-msgstr ""
+msgstr "Modell '%s' beinhaltet Daten und kann nicht verschoben werden"
 
 #. module: base
 #: model:res.country,name:base.az
@@ -17394,7 +17519,7 @@ msgstr "Parameter"
 #. module: base
 #: view:res.partner:0
 msgid "e.g. Sales Director"
-msgstr ""
+msgstr "z.B. Verkaufsleiter"
 
 #. module: base
 #: selection:base.language.install,lang:0
@@ -17590,7 +17715,7 @@ msgstr "Automatische Installation"
 #. module: base
 #: view:base.language.import:0
 msgid "e.g. en_US"
-msgstr ""
+msgstr "z.B. en_US"
 
 #. module: base
 #: model:ir.module.module,description:base.module_l10n_hn
@@ -17827,7 +17952,7 @@ msgstr "Zustand"
 #: code:addons/base/module/module.py:669
 #, python-format
 msgid "Module not found"
-msgstr ""
+msgstr "Anwendung wurde nicht gefunden"
 
 #. module: base
 #: help:res.currency,rate:0
@@ -17940,7 +18065,7 @@ msgstr "SXW Inhalt"
 #. module: base
 #: field:ir.attachment,file_size:0
 msgid "File Size"
-msgstr ""
+msgstr "Datei Grösse"
 
 #. module: base
 #: help:ir.sequence,prefix:0
@@ -17982,12 +18107,12 @@ msgstr "Allgemeine Informationen"
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_l10n_pt
 msgid "Portugal - Chart of Accounts"
-msgstr ""
+msgstr "Portugal - Kontenpläne"
 
 #. module: base
 #: field:ir.model.data,complete_name:0
 msgid "Complete ID"
-msgstr ""
+msgstr "Vollständige ID"
 
 #. module: base
 #: model:ir.module.module,description:base.module_stock
diff --git a/openerp/addons/base/i18n/he.po b/openerp/addons/base/i18n/he.po
index 4d38b47ac82..f0aaa9ef36a 100644
--- a/openerp/addons/base/i18n/he.po
+++ b/openerp/addons/base/i18n/he.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-server\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2013-03-07 08:36+0000\n"
-"PO-Revision-Date: 2013-04-19 12:49+0000\n"
+"PO-Revision-Date: 2013-04-21 10:53+0000\n"
 "Last-Translator: sef <Unknown>\n"
 "Language-Team: Hebrew <he@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: 2013-04-20 06:48+0000\n"
-"X-Generator: Launchpad (build 16567)\n"
+"X-Launchpad-Export-Date: 2013-04-23 06:08+0000\n"
+"X-Generator: Launchpad (build 16580)\n"
 
 #. module: base
 #: model:ir.module.module,description:base.module_account_check_writing
@@ -100,7 +100,7 @@ msgstr "ממשק מסך מגע לחנויות"
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_l10n_in_hr_payroll
 msgid "Indian Payroll"
-msgstr ""
+msgstr "משכורות הודיות"
 
 #. module: base
 #: help:ir.cron,model:0
@@ -143,7 +143,7 @@ msgstr ""
 #. module: base
 #: field:ir.actions.client,params:0
 msgid "Supplementary arguments"
-msgstr ""
+msgstr "טיעונים\\משתנים משלימים"
 
 #. module: base
 #: model:ir.module.module,description:base.module_google_base_account
@@ -152,11 +152,14 @@ msgid ""
 "The module adds google user in res user.\n"
 "========================================\n"
 msgstr ""
+"\n"
+"רכיב זה מוסיף משתמש גוגל in res user.\n"
+"========================================\n"
 
 #. module: base
 #: help:res.partner,employee:0
 msgid "Check this box if this contact is an Employee."
-msgstr ""
+msgstr "נא לסמן את התיבה אם אשת\\איש קשר זו עובד\\ת בחברה"
 
 #. module: base
 #: help:ir.model.fields,domain:0
@@ -237,7 +240,7 @@ msgstr ""
 #: code:addons/osv.py:151
 #, python-format
 msgid "Constraint Error"
-msgstr ""
+msgstr "שגיאת אילוץ"
 
 #. module: base
 #: model:ir.model,name:base.model_ir_ui_view_custom
@@ -408,6 +411,14 @@ msgid ""
 "invoices from picking, OpenERP is able to add and compute the shipping "
 "line.\n"
 msgstr ""
+"\n"
+"מאפשר הוספת שיטות משלוח להזמנה ובחירתן\n"
+"==============================================================\n"
+"\n"
+"You can define your own carrier and delivery grids for prices. When creating "
+"\n"
+"invoices from picking, OpenERP is able to add and compute the shipping "
+"line.\n"
 
 #. module: base
 #: code:addons/base/ir/ir_filters.py:80
@@ -485,7 +496,7 @@ msgstr "קבוצה"
 msgid ""
 "Invalid date/time format directive specified. Please refer to the list of "
 "allowed directives, displayed when you edit a language."
-msgstr ""
+msgstr "פורמט תאריך\\שעה לא תקין. נא להיעזר בהנחיות המוצגות בעריכת שפה."
 
 #. module: base
 #: code:addons/orm.py:4153
@@ -507,7 +518,7 @@ msgstr ""
 #. module: base
 #: field:ir.model.relation,name:0
 msgid "Relation Name"
-msgstr ""
+msgstr "שם היחס"
 
 #. module: base
 #: view:ir.rule:0
@@ -578,6 +589,16 @@ msgid ""
 "that have no counterpart in the general financial accounts.\n"
 "    "
 msgstr ""
+"\n"
+"רכיב להגדרת עצמים לחישובי עלות (Analytic Accounts).\n"
+"===============================================\n"
+"\n"
+"In OpenERP, analytic accounts are linked to general accounts but are "
+"treated\n"
+"totally independently. So, you can enter various different analytic "
+"operations\n"
+"that have no counterpart in the general financial accounts.\n"
+"    "
 
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_idea
@@ -850,7 +871,7 @@ msgstr ""
 #. module: base
 #: model:res.country,name:base.jo
 msgid "Jordan"
-msgstr "Jordan"
+msgstr "ירדן"
 
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_l10n_hr
@@ -870,7 +891,7 @@ msgstr "ir.ui.view"
 #. module: base
 #: model:res.country,name:base.er
 msgid "Eritrea"
-msgstr "Eritrea"
+msgstr "אריתריאה"
 
 #. module: base
 #: sql_constraint:res.company:0
@@ -989,7 +1010,7 @@ msgstr ""
 #. module: base
 #: model:ir.ui.menu,name:base.menu_crm_config_opportunity
 msgid "Opportunities"
-msgstr ""
+msgstr "הזדמנויות"
 
 #. module: base
 #: model:ir.model,name:base.model_base_language_export
@@ -1005,6 +1026,7 @@ msgstr "Papua New Guinea"
 #: help:ir.actions.report.xml,report_type:0
 msgid "Report Type, e.g. pdf, html, raw, sxw, odt, html2html, mako2html, ..."
 msgstr ""
+"סוג (פורמט) הדו\"ח, כגון: pdf, html, raw, sxw, odt, html2html, mako2html..."
 
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_document_webdav
@@ -1025,7 +1047,7 @@ msgstr ""
 #. module: base
 #: view:res.partner:0
 msgid "My Partners"
-msgstr ""
+msgstr "השותפים שלי"
 
 #. module: base
 #: model:res.country,name:base.zw
@@ -1041,7 +1063,7 @@ msgstr ""
 #. module: base
 #: view:ir.actions.report.xml:0
 msgid "XML Report"
-msgstr ""
+msgstr "דו\"ח XML"
 
 #. module: base
 #: model:res.country,name:base.es
@@ -1057,7 +1079,7 @@ msgstr ""
 #. module: base
 #: model:ir.model,name:base.model_base_module_upgrade
 msgid "Module Upgrade"
-msgstr ""
+msgstr "שדרוג הרכיב"
 
 #. module: base
 #: view:res.bank:0
@@ -1308,6 +1330,8 @@ msgid ""
 "Language with code \"%s\" is not defined in your system !\n"
 "Define it through the Administration menu."
 msgstr ""
+"שפה עם קוד \"%s\" אינה מוגדרת במערכת שלך!\n"
+"הגדר אותה באמצעות תפריט הניהול."
 
 #. module: base
 #: model:res.country,name:base.gu
@@ -1344,7 +1368,7 @@ msgstr "מדומה"
 #. module: base
 #: constraint:ir.ui.view:0
 msgid "Invalid XML for View Architecture!"
-msgstr "XML לא בתוקף להצגת ארכיטקטורה"
+msgstr "XML לא חוקי להצגת ארכיטקטורה"
 
 #. module: base
 #: model:res.country,name:base.ky
@@ -2661,7 +2685,7 @@ msgstr "שער נוכחי"
 #. module: base
 #: selection:base.language.install,lang:0
 msgid "Greek / Ελληνικά"
-msgstr ""
+msgstr "יוונית / Ελληνικά"
 
 #. module: base
 #: field:res.company,custom_footer:0
@@ -5752,7 +5776,7 @@ msgstr ""
 #. module: base
 #: model:ir.model,name:base.model_base_language_import
 msgid "Language Import"
-msgstr ""
+msgstr "ייבוא שפה"
 
 #. module: base
 #: help:workflow.transition,act_from:0
@@ -8003,7 +8027,7 @@ msgstr ""
 #: code:addons/base/res/res_users.py:473
 #, python-format
 msgid "Setting empty passwords is not allowed for security reasons!"
-msgstr ""
+msgstr "לא ניתן להגדיר סיסמה ריקה מטעמי אבטחה !"
 
 #. module: base
 #: help:ir.mail_server,smtp_pass:0
@@ -11139,7 +11163,7 @@ msgstr "הערה"
 #: field:ir.rule,domain_force:0
 #: field:res.partner.title,domain:0
 msgid "Domain"
-msgstr "מתחם"
+msgstr "שם-מתחם (דומיין)"
 
 #. module: base
 #: code:addons/base/ir/ir_fields.py:166
diff --git a/openerp/addons/base/i18n/zh_CN.po b/openerp/addons/base/i18n/zh_CN.po
index 3220b27287c..339e5bc7599 100644
--- a/openerp/addons/base/i18n/zh_CN.po
+++ b/openerp/addons/base/i18n/zh_CN.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-server\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2013-03-07 08:36+0000\n"
-"PO-Revision-Date: 2013-04-20 06:45+0000\n"
-"Last-Translator: Qian Jin <chian.jin@gmail.com>\n"
+"PO-Revision-Date: 2013-04-22 08:15+0000\n"
+"Last-Translator: Joshua Jan(SHINEIT) <popkar77@gmail.com>\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: 2013-04-21 05:32+0000\n"
-"X-Generator: Launchpad (build 16567)\n"
+"X-Launchpad-Export-Date: 2013-04-23 06:09+0000\n"
+"X-Generator: Launchpad (build 16580)\n"
 
 #. module: base
 #: model:ir.module.module,description:base.module_account_check_writing
@@ -12341,7 +12341,7 @@ msgstr "报表类型"
 #: view:res.partner.bank:0
 #: view:res.users:0
 msgid "State"
-msgstr "状态"
+msgstr "省"
 
 #. module: base
 #: selection:base.language.install,lang:0

From 200257ab895e993bfc6815eaf15d1968b1839c28 Mon Sep 17 00:00:00 2001
From: "Quentin (OpenERP)" <qdp-launchpad@openerp.com>
Date: Tue, 23 Apr 2013 11:16:26 +0200
Subject: [PATCH 089/121] [FIX] hr_payroll: do not crash when duplicating a
 payroll structure (because of both classes with same name in the .py) + added
 recursion check

bzr revid: qdp-launchpad@openerp.com-20130423091626-02475bdw67wdmhd1
---
 addons/hr_payroll/hr_payroll.py | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

diff --git a/addons/hr_payroll/hr_payroll.py b/addons/hr_payroll/hr_payroll.py
index b711ed1a9c4..5fd74ff9fe0 100644
--- a/addons/hr_payroll/hr_payroll.py
+++ b/addons/hr_payroll/hr_payroll.py
@@ -51,6 +51,7 @@ class hr_payroll_structure(osv.osv):
         'note': fields.text('Description'),
         'parent_id':fields.many2one('hr.payroll.structure', 'Parent'),
         'children_ids':fields.one2many('hr.payroll.structure', 'parent_id', 'Children'),
+        'rule_ids':fields.many2many('hr.salary.rule', 'hr_structure_salary_rule_rel', 'struct_id', 'rule_id', 'Salary Rules'),
     }
 
     def _get_parent(self, cr, uid, context=None):
@@ -68,6 +69,10 @@ class hr_payroll_structure(osv.osv):
         'parent_id': _get_parent,
     }
 
+    _constraints = [
+        (osv.osv._check_recursion, 'Error ! You cannot create a recursive Salary Structure.', ['parent_id']) 
+    ]
+        
     def copy(self, cr, uid, id, default=None, context=None):
         """
         Create a new record in hr_payroll_structure model from existing one
@@ -951,14 +956,6 @@ class hr_payslip_line(osv.osv):
 
 hr_payslip_line()
 
-class hr_payroll_structure(osv.osv):
-
-    _inherit = 'hr.payroll.structure'
-    _columns = {
-        'rule_ids':fields.many2many('hr.salary.rule', 'hr_structure_salary_rule_rel', 'struct_id', 'rule_id', 'Salary Rules'),
-    }
-
-hr_payroll_structure()
 
 class hr_employee(osv.osv):
     '''

From a98ae1d75397dbc94264155c1299eb46fd0d3d90 Mon Sep 17 00:00:00 2001
From: "Quentin (OpenERP)" <qdp-launchpad@openerp.com>
Date: Tue, 23 Apr 2013 12:37:06 +0200
Subject: [PATCH 090/121] [IMP/FIX] ir_model_data: added
 check_object_reference() in order to return a value only if the uid has read
 access on the targeted object. It avoids raising access rights errors further
 in the process and prevents duplicating that same code in all addons

bzr revid: qdp-launchpad@openerp.com-20130423103706-u4wk2y65kam587c6
---
 openerp/addons/base/ir/ir_model.py | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/openerp/addons/base/ir/ir_model.py b/openerp/addons/base/ir/ir_model.py
index 9e7697c1bbb..6edb5a70d0a 100644
--- a/openerp/addons/base/ir/ir_model.py
+++ b/openerp/addons/base/ir/ir_model.py
@@ -866,11 +866,22 @@ class ir_model_data(osv.osv):
     def get_object_reference(self, cr, uid, module, xml_id):
         """Returns (model, res_id) corresponding to a given module and xml_id (cached) or raise ValueError if not found"""
         data_id = self._get_id(cr, uid, module, xml_id)
+        #assuming data_id is not False, as it was checked upstream
         res = self.read(cr, uid, data_id, ['model', 'res_id'])
         if not res['res_id']:
             raise ValueError('No such external ID currently defined in the system: %s.%s' % (module, xml_id))
         return res['model'], res['res_id']
 
+    def check_object_reference(self, cr, uid, module, xml_id):
+        """Returns (model, res_id) corresponding to a given module and xml_id (cached), if and only if the user has the necessary access rights
+        to see that object, otherwise raise ValueError"""
+        model, res_id = self.get_object_reference(cr, uid, module, xml_id)
+        #search on id found in result to check if current user has read access right
+        check_right = self.pool.get(model).search(cr, uid, [('id', '=', res_id)])
+        if check_right:
+            return model, res_id
+        raise ValueError('Not enough access rights on the external ID: %s.%s' % (module, xml_id))
+
     def get_object(self, cr, uid, module, xml_id, context=None):
         """Returns a browsable record for the given module name and xml_id or raise ValueError if not found"""
         res_model, res_id = self.get_object_reference(cr, uid, module, xml_id)

From 6d9ae761cdc5b5b4599c0fbe1a63265f930ff8b9 Mon Sep 17 00:00:00 2001
From: "Quentin (OpenERP)" <qdp-launchpad@openerp.com>
Date: Tue, 23 Apr 2013 14:28:20 +0200
Subject: [PATCH 091/121] [FIX] hr_timesheet: return default values for journal
 and product only if the uid has the read access on it (multi-company) thanks
 to a new method on ir.model.data: check_object_reference()

bzr revid: qdp-launchpad@openerp.com-20130423122820-9gf2i4iic5bqr8g6
---
 addons/hr_timesheet/hr_timesheet.py | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/addons/hr_timesheet/hr_timesheet.py b/addons/hr_timesheet/hr_timesheet.py
index 6a538e5d09c..461507f9e41 100644
--- a/addons/hr_timesheet/hr_timesheet.py
+++ b/addons/hr_timesheet/hr_timesheet.py
@@ -37,8 +37,8 @@ class hr_employee(osv.osv):
     def _getAnalyticJournal(self, cr, uid, context=None):
         md = self.pool.get('ir.model.data')
         try:
-            result = md.get_object_reference(cr, uid, 'hr_timesheet', 'analytic_journal')
-            return result[1]
+            dummy, res_id = md.check_object_reference(cr, uid, 'hr_timesheet', 'analytic_journal')
+            return res_id
         except ValueError:
             pass
         return False
@@ -46,8 +46,8 @@ class hr_employee(osv.osv):
     def _getEmployeeProduct(self, cr, uid, context=None):
         md = self.pool.get('ir.model.data')
         try:
-            result = md.get_object_reference(cr, uid, 'product', 'product_product_consultant')
-            return result[1]
+            dummy, res_id = md.check_object_reference(cr, uid, 'product', 'product_product_consultant')
+            return res_id
         except ValueError:
             pass
         return False

From e5736828f9eaa9de22360b52f6c31267cc2ee892 Mon Sep 17 00:00:00 2001
From: Christophe Simonis <chs@openerp.com>
Date: Tue, 23 Apr 2013 14:41:51 +0200
Subject: [PATCH 092/121] [REVERT] revert commit
 fme@openerp.com-20130418171750-7oldgiewo1eewxk7: do not break stable API !!!

bzr revid: chs@openerp.com-20130423124151-h025b891xp77flg3
---
 addons/web/controllers/main.py         |  24 +-
 addons/web/http.py                     |  60 +---
 addons/web/tests/__init__.py           |   3 +-
 addons/web/tests/test_dispatch.py      | 373 -------------------------
 addons/web_diagram/controllers/main.py |   7 +-
 5 files changed, 22 insertions(+), 445 deletions(-)
 delete mode 100644 addons/web/tests/test_dispatch.py

diff --git a/addons/web/controllers/main.py b/addons/web/controllers/main.py
index 47498752c24..01126694059 100644
--- a/addons/web/controllers/main.py
+++ b/addons/web/controllers/main.py
@@ -1,9 +1,11 @@
 # -*- coding: utf-8 -*-
+
 import ast
 import base64
 import csv
 import glob
 import itertools
+import logging
 import operator
 import datetime
 import hashlib
@@ -28,6 +30,7 @@ except ImportError:
     xlwt = None
 
 import openerp
+import openerp.modules.registry
 from openerp.tools.translate import _
 
 from .. import http
@@ -1436,8 +1439,7 @@ class Action(openerpweb.Controller):
         else:
             return False
 
-
-class Export(openerpweb.Controller):
+class Export(View):
     _cp_path = "/web/export"
 
     @openerpweb.jsonrequest
@@ -1578,13 +1580,7 @@ class Export(openerpweb.Controller):
             (prefix + '/' + k, prefix_string + '/' + v)
             for k, v in self.fields_info(req, model, export_fields).iteritems())
 
-
-class ExportFormat(object):
-    """
-    Superclass for export formats, should probably be an abc and have a way to
-    generate _cp_path from fmt but it's a pain to deal with conflicts with
-    ControllerType
-    """
+    #noinspection PyPropertyDefinition
     @property
     def content_type(self):
         """ Provides the format's content type """
@@ -1625,14 +1621,14 @@ class ExportFormat(object):
         else:
             columns_headers = [val['label'].strip() for val in fields]
 
+
         return req.make_response(self.from_data(columns_headers, import_data),
             headers=[('Content-Disposition',
                             content_disposition(self.filename(model), req)),
                      ('Content-Type', self.content_type)],
             cookies={'fileToken': int(token)})
 
-
-class CSVExport(ExportFormat, http.Controller):
+class CSVExport(Export):
     _cp_path = '/web/export/csv'
     fmt = {'tag': 'csv', 'label': 'CSV'}
 
@@ -1667,8 +1663,7 @@ class CSVExport(ExportFormat, http.Controller):
         fp.close()
         return data
 
-
-class ExcelExport(ExportFormat, http.Controller):
+class ExcelExport(Export):
     _cp_path = '/web/export/xls'
     fmt = {
         'tag': 'xls',
@@ -1707,8 +1702,7 @@ class ExcelExport(ExportFormat, http.Controller):
         fp.close()
         return data
 
-
-class Reports(openerpweb.Controller):
+class Reports(View):
     _cp_path = "/web/report"
     POLLING_DELAY = 0.25
     TYPES_MAPPING = {
diff --git a/addons/web/http.py b/addons/web/http.py
index 7f99d27bd04..d12cdfb13a1 100644
--- a/addons/web/http.py
+++ b/addons/web/http.py
@@ -355,64 +355,18 @@ def httprequest(f):
 #----------------------------------------------------------
 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)
-        # Only for root "Controller"
-        if bases == (object,):
-            assert name == 'Controller'
-            return
-
-        path = attrs.get('_cp_path')
-        if Controller in bases:
-            assert path, "Controller subclass %s missing a _cp_path" % name
-        else:
-            parent_paths = set(base._cp_path for base in bases
-                               if issubclass(base, Controller))
-            assert len(parent_paths) == 1,\
-                "%s inheriting from multiple controllers is not supported" % (
-                    name)
-            [parent_path] = parent_paths
-            [parent] = [
-                controller for controller in controllers_class.itervalues()
-                if controller._cp_path == parent_path]
-
-            # inherit from a Controller subclass
-            if path:
-                # if extending in place with same URL, ignore URL
-                if parent_path == path:
-                    _logger.warn(
-                        "Controller %s extending %s in-place should not "
-                        "explicitly specify URL", name, parent)
-                    return
-                _logger.warn("Re-exposing %s at %s.\n"
-                             "\tThis usage is unsupported.",
-                             parent.__name__,
-                             attrs['_cp_path'])
-
-        if path:
-            assert path not in controllers_class,\
-                "Trying to expose %s at the same URL as %s" % (
-                    name, controllers_class[path])
-            controllers_class[path] = cls
-
+        controllers_class.append(("%s.%s" % (cls.__module__, cls.__name__), cls))
 
 class Controller(object):
     __metaclass__ = ControllerType
 
-    def __new__(cls, *args, **kwargs):
-        subclasses = [c for c in cls.__subclasses__()
-                      if c._cp_path == cls._cp_path]
-        if subclasses:
-            name = "%s (+%s)" % (
-                cls.__name__,
-                '+'.join(sub.__name__ for sub in subclasses))
-            cls = type(name, tuple(reversed(subclasses)), {})
-        return object.__new__(cls)
-
 #----------------------------------------------------------
 # Session context manager
 #----------------------------------------------------------
@@ -612,8 +566,12 @@ class Root(object):
                         addons_manifest[module] = manifest
                         self.statics['/%s/static' % module] = path_static
 
-        for c in controllers_class.itervalues():
-            controllers_path[c._cp_path] = c()
+        for k, v in controllers_class:
+            if k not in controllers_object:
+                o = v()
+                controllers_object[k] = o
+                if hasattr(o, '_cp_path'):
+                    controllers_path[o._cp_path] = o
 
         app = werkzeug.wsgi.SharedDataMiddleware(self.dispatch, self.statics)
         self.dispatch = DisableCacheMiddleware(app)
diff --git a/addons/web/tests/__init__.py b/addons/web/tests/__init__.py
index 2734bd45ddb..d7abb8e5a8c 100644
--- a/addons/web/tests/__init__.py
+++ b/addons/web/tests/__init__.py
@@ -1,10 +1,9 @@
 # -*- coding: utf-8 -*-
-from . import test_dataset, test_menu, test_serving_base, test_js, test_dispatch
+from . import test_dataset, test_menu, test_serving_base, test_js
 
 fast_suite = []
 checks = [
     test_dataset,
     test_menu,
     test_serving_base,
-    test_dispatch,
 ]
diff --git a/addons/web/tests/test_dispatch.py b/addons/web/tests/test_dispatch.py
deleted file mode 100644
index b532cebac44..00000000000
--- a/addons/web/tests/test_dispatch.py
+++ /dev/null
@@ -1,373 +0,0 @@
-# -*- coding: utf-8 -*-
-import contextlib
-import json
-import logging
-import logging.handlers
-import types
-import unittest2
-
-from .. import http
-import werkzeug.test
-
-
-def setUpModule():
-    """
-    Force load_addons once to import all the crap we don't care for as this
-    thing is full of side-effects
-    """
-    http.Root().load_addons()
-
-class DispatchCleanup(unittest2.TestCase):
-    """
-    Cleans up controllers registries in the web client so it's possible to
-    test controllers registration and dispatching in isolation.
-    """
-    def setUp(self):
-        self.classes = http.controllers_class
-        self.paths = http.controllers_path
-
-        http.controllers_class = {}
-        http.controllers_path = {}
-
-    def tearDown(self):
-        http.controllers_path = self.paths
-        http.controllers_class = self.classes
-
-
-def jsonrpc_body(params=None):
-    """
-    Builds and dumps the body of a JSONRPC request with params ``params``
-    """
-    return json.dumps({
-        'jsonrpc': '2.0',
-        'method': 'call',
-        'id': None,
-        'params': params or {},
-    })
-
-
-def jsonrpc_response(result=None):
-    """
-    Builds a JSONRPC response (as a Python dict) with result ``result``
-    """
-    return {
-        u'jsonrpc': u'2.0',
-        u'id': None,
-        u'result': result,
-    }
-
-
-class TestHandler(logging.handlers.BufferingHandler):
-    def __init__(self):
-        logging.handlers.BufferingHandler.__init__(self, 0)
-
-    def shouldFlush(self, record):
-        return False
-
-@contextlib.contextmanager
-def capture_logging(logger, level=logging.DEBUG):
-    logger = logging.getLogger(logger)
-    old_level = logger.level
-    old_handlers = logger.handlers
-    old_propagate = logger.propagate
-
-    test_handler = TestHandler()
-    logger.handlers = [test_handler]
-    logger.setLevel(level)
-    logger.propagate = False
-
-    try:
-        yield test_handler
-    finally:
-        logger.propagate = old_propagate
-        logger.setLevel(old_level)
-        logger.handlers = old_handlers
-
-
-class TestDispatching(DispatchCleanup):
-    def setUp(self):
-        super(TestDispatching, self).setUp()
-        self.app = http.Root()
-        self.client = werkzeug.test.Client(self.app)
-
-    def test_not_exposed(self):
-        class CatController(http.Controller):
-            _cp_path = '/cat'
-
-            def index(self):
-                return 'Blessid iz da feline'
-
-        self.app.load_addons()
-
-        body, status, headers = self.client.get('/cat')
-        self.assertEqual('404 NOT FOUND', status)
-
-    def test_basic_http(self):
-        class CatController(http.Controller):
-            _cp_path = '/cat'
-
-            @http.httprequest
-            def index(self, req):
-                return 'no walk in counsil of wickid,'
-
-        self.app.load_addons()
-
-        body, status, headers = self.client.get('/cat')
-        self.assertEqual('200 OK', status)
-        self.assertEqual('no walk in counsil of wickid,', ''.join(body))
-
-    def test_basic_jsonrpc(self):
-        class CatController(http.Controller):
-            _cp_path = '/cat'
-
-            @http.jsonrequest
-            def index(self, req):
-                return 'no place paws in path of da sinnerz,'
-        self.app.load_addons()
-
-        body, status, headers = self.client.post('/cat', data=jsonrpc_body())
-
-        self.assertEqual('200 OK', status)
-        self.assertEqual(
-            jsonrpc_response('no place paws in path of da sinnerz,'),
-            json.loads(''.join(body)))
-
-
-class TestSubclassing(DispatchCleanup):
-    def setUp(self):
-        super(TestSubclassing, self).setUp()
-        self.app = http.Root()
-        self.client = werkzeug.test.Client(self.app)
-
-    def test_add_method(self):
-        class CatController(http.Controller):
-            _cp_path = '/cat'
-
-            @http.httprequest
-            def index(self, req):
-                return 'no sit and purr with da mockerz.'
-
-        class CeilingController(CatController):
-            @http.httprequest
-            def lol(self, req):
-                return 'But der delightz in lawz of Ceiling Cat,'
-
-        self.app.load_addons()
-
-        body, status, headers = self.client.get('/cat')
-        self.assertEqual('200 OK', status)
-        self.assertEqual('no sit and purr with da mockerz.', ''.join(body))
-        body, status, headers = self.client.get('/cat/lol')
-        self.assertEqual('200 OK', status)
-        self.assertEqual('But der delightz in lawz of Ceiling Cat,',
-                         ''.join(body))
-
-    def test_override_method(self):
-        class CatController(http.Controller):
-            _cp_path = '/cat'
-
-            @http.httprequest
-            def index(self, req):
-                return 'an ponderz'
-
-        class CeilingController(CatController):
-            @http.httprequest
-            def index(self, req):
-                return '%s much.' % super(CeilingController, self).index(req)
-
-        self.app.load_addons()
-
-        body, status, headers = self.client.get('/cat')
-        self.assertEqual('200 OK', status)
-        self.assertEqual('an ponderz much.', ''.join(body))
-
-    def test_make_invisible(self):
-        class CatController(http.Controller):
-            _cp_path = '/cat'
-
-            @http.httprequest
-            def index(self, req):
-                return 'Tehy liek treez bai teh waterz,'
-
-        class CeilingController(CatController):
-            def index(self, req):
-                return super(CeilingController, self).index(req)
-
-        self.app.load_addons()
-
-        body, status, headers = self.client.get('/cat')
-        self.assertEqual('404 NOT FOUND', status)
-
-    def test_make_json_invisible(self):
-        class CatController(http.Controller):
-            _cp_path = '/cat'
-
-            @http.jsonrequest
-            def index(self, req):
-                return 'Tehy liek treez bai teh waterz,'
-
-        class CeilingController(CatController):
-            def index(self, req):
-                return super(CeilingController, self).index(req)
-
-        self.app.load_addons()
-
-        body, status, headers = self.client.post('/cat')
-        self.assertEqual('404 NOT FOUND', status)
-
-    def test_extends(self):
-        """
-        When subclassing an existing Controller new classes are "merged" into
-        the base one
-        """
-        class A(http.Controller):
-            _cp_path = '/foo'
-            @http.httprequest
-            def index(self, req):
-                return '1'
-
-        class B(A):
-            @http.httprequest
-            def index(self, req):
-                return "%s 2" % super(B, self).index(req)
-
-        class C(A):
-            @http.httprequest
-            def index(self, req):
-                return "%s 3" % super(C, self).index(req)
-
-        self.app.load_addons()
-
-        body, status, headers = self.client.get('/foo')
-        self.assertEqual('200 OK', status)
-        self.assertEqual('1 2 3', ''.join(body))
-
-    def test_extends_same_path(self):
-        """
-        When subclassing an existing Controller and specifying the same
-        _cp_path as the parent, ???
-        """
-        class A(http.Controller):
-            _cp_path = '/foo'
-            @http.httprequest
-            def index(self, req):
-                return '1'
-
-        class B(A):
-            _cp_path = '/foo'
-            @http.httprequest
-            def index(self, req):
-                return '2'
-
-        self.app.load_addons()
-
-        body, status, headers = self.client.get('/foo')
-        self.assertEqual('200 OK', status)
-        self.assertEqual('2', ''.join(body))
-
-    def test_re_expose(self):
-        """
-        An existing Controller should not be extended with a new cp_path
-        (re-exposing somewhere else)
-        """
-        class CatController(http.Controller):
-            _cp_path = '/cat'
-
-            @http.httprequest
-            def index(self, req):
-                return '[%s]' % self.speak()
-
-            def speak(self):
-                return 'Yu ordered cheezburgerz,'
-
-        with capture_logging('openerp.addons.web.http') as handler:
-            class DogController(CatController):
-                _cp_path = '/dog'
-
-                def speak(self):
-                    return 'Woof woof woof woof'
-
-            [record] = handler.buffer
-            self.assertEqual(logging.WARN, record.levelno)
-            self.assertEqual("Re-exposing CatController at /dog.\n"
-                             "\tThis usage is unsupported.",
-                             record.getMessage())
-
-    def test_fail_redefine(self):
-        """
-        An existing Controller can't be overwritten by a new one on the same
-        path (? or should this generate a warning and still work as if it was
-        an extend?)
-        """
-        class FooController(http.Controller):
-            _cp_path = '/foo'
-
-        with self.assertRaises(AssertionError):
-            class BarController(http.Controller):
-                _cp_path = '/foo'
-
-    def test_fail_no_path(self):
-        """
-        A Controller must have a path (and thus be exposed)
-        """
-        with self.assertRaises(AssertionError):
-            class FooController(http.Controller):
-                pass
-
-    def test_mixin(self):
-        """
-        Can mix "normal" python classes into a controller directly
-        """
-        class Mixin(object):
-            @http.httprequest
-            def index(self, req):
-                return 'ok'
-
-        class FooController(http.Controller, Mixin):
-            _cp_path = '/foo'
-
-        class BarContoller(Mixin, http.Controller):
-            _cp_path = '/bar'
-
-        self.app.load_addons()
-
-        body, status, headers = self.client.get('/foo')
-        self.assertEqual('200 OK', status)
-        self.assertEqual('ok', ''.join(body))
-
-        body, status, headers = self.client.get('/bar')
-        self.assertEqual('200 OK', status)
-        self.assertEqual('ok', ''.join(body))
-
-    def test_mixin_extend(self):
-        """
-        Can mix "normal" python class into a controller by extension
-        """
-        class FooController(http.Controller):
-            _cp_path = '/foo'
-
-        class M1(object):
-            @http.httprequest
-            def m1(self, req):
-                return 'ok 1'
-
-        class M2(object):
-            @http.httprequest
-            def m2(self, req):
-                return 'ok 2'
-
-        class AddM1(FooController, M1):
-            pass
-
-        class AddM2(M2, FooController):
-            pass
-
-        self.app.load_addons()
-
-        body, status, headers = self.client.get('/foo/m1')
-        self.assertEqual('200 OK', status)
-        self.assertEqual('ok 1', ''.join(body))
-
-        body, status, headers = self.client.get('/foo/m2')
-        self.assertEqual('200 OK', status)
-        self.assertEqual('ok 2', ''.join(body))
diff --git a/addons/web_diagram/controllers/main.py b/addons/web_diagram/controllers/main.py
index 2efaab7183d..c598a7e4652 100644
--- a/addons/web_diagram/controllers/main.py
+++ b/addons/web_diagram/controllers/main.py
@@ -1,10 +1,9 @@
-from openerp.addons.web.http import Controller, jsonrequest
+import openerp
 
-
-class Diagram(Controller):
+class DiagramView(openerp.addons.web.controllers.main.View):
     _cp_path = "/web_diagram/diagram"
 
-    @jsonrequest
+    @openerp.addons.web.http.jsonrequest
     def get_diagram_info(self, req, id, model, node, connector,
                          src_node, des_node, label, **kw):
 

From 7e462604747f4f9bd8668732b9cdae72d8613fd2 Mon Sep 17 00:00:00 2001
From: "Quentin (OpenERP)" <qdp-launchpad@openerp.com>
Date: Tue, 23 Apr 2013 14:57:31 +0200
Subject: [PATCH 093/121] [FIX] account: modified the constraint on
 account.move.reconcile in order to allow the reconciliation to be made on
 different partners if it doesn't concern a payable or receivable account

bzr revid: qdp-launchpad@openerp.com-20130423125731-dblhpx7zz4q9x464
---
 addons/account/account.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/account/account.py b/addons/account/account.py
index 9cc6023375e..58c4cf447ef 100644
--- a/addons/account/account.py
+++ b/addons/account/account.py
@@ -1680,7 +1680,7 @@ class account_move_reconcile(osv.osv):
                 elif reconcile.line_partial_ids:
                     first_partner = reconcile.line_partial_ids[0].partner_id.id
                     move_lines = reconcile.line_partial_ids
-                if any([line.partner_id.id != first_partner for line in move_lines]):
+                if any([(line.account_id.type in ('receivable', 'payable') and line.partner_id.id != first_partner) for line in move_lines]):
                     return False
         return True
 

From 2e4aafa7dc26981066df7f7fa648241e6d13fd5e Mon Sep 17 00:00:00 2001
From: Olivier Dony <odo@openerp.com>
Date: Tue, 23 Apr 2013 15:06:56 +0200
Subject: [PATCH 094/121] [FIX] res.partner: proper store trigger for display
 name field

That was a stupid oversight, sorry!

bzr revid: odo@openerp.com-20130423130656-celrtr352yht19ro
---
 addons/account_report_company/account_report_company.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/account_report_company/account_report_company.py b/addons/account_report_company/account_report_company.py
index 0c102fcc4e1..eacee60e13c 100644
--- a/addons/account_report_company/account_report_company.py
+++ b/addons/account_report_company/account_report_company.py
@@ -30,7 +30,7 @@ class res_partner(osv.Model):
 
     _display_name_store_triggers = {
         'res.partner': (lambda self,cr,uid,ids,context=None: self.search(cr, uid, [('id','child_of',ids)]),
-                        ['parent_id', 'is_company'], 10)
+                        ['parent_id', 'is_company', 'name'], 10)
     }
 
     # indirection to avoid passing a copy of the overridable method when declaring the function field

From 2bc4260c545dca24a1ea4f92dd52ac548a577b0e Mon Sep 17 00:00:00 2001
From: "Quentin (OpenERP)" <qdp-launchpad@openerp.com>
Date: Tue, 23 Apr 2013 15:50:28 +0200
Subject: [PATCH 095/121] [FIX] account_voucher: fix in amount_currency
 computation when the rate is specified on the voucher and the voucher is in
 the company currency

bzr revid: qdp-launchpad@openerp.com-20130423135028-70887smme8mxv0tn
---
 addons/account_voucher/account_voucher.py | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/addons/account_voucher/account_voucher.py b/addons/account_voucher/account_voucher.py
index dd8bb157067..9e0e7e5b167 100644
--- a/addons/account_voucher/account_voucher.py
+++ b/addons/account_voucher/account_voucher.py
@@ -1167,8 +1167,13 @@ class account_voucher(osv.osv):
                         amount_currency = sign * (line.amount)
                     elif line.move_line_id.currency_id.id == voucher_brw.payment_rate_currency_id.id:
                         # if the rate is specified on the voucher, we must use it
-                        voucher_rate = currency_obj.browse(cr, uid, voucher_currency, context=ctx).rate
-                        amount_currency = (move_line['debit'] - move_line['credit']) * voucher_brw.payment_rate * voucher_rate
+                        payment_rate = voucher_brw.payment_rate
+                        if voucher_currency != company_currency:
+                            #if the voucher currency is not the company currency, we need to consider the rate of the line's currency
+                            voucher_rate = currency_obj.browse(cr, uid, voucher_currency, context=ctx).rate
+                            payment_rate = voucher_rate * payment_rate
+                        amount_currency = (move_line['debit'] - move_line['credit']) * payment_rate
+
                     else:
                         # otherwise we use the rates of the system (giving the voucher date in the context)
                         amount_currency = currency_obj.compute(cr, uid, company_currency, line.move_line_id.currency_id.id, move_line['debit']-move_line['credit'], context=ctx)

From e13dc082e5f58f1bbaed3625e53ff1afb422562a Mon Sep 17 00:00:00 2001
From: "Quentin (OpenERP)" <qdp-launchpad@openerp.com>
Date: Tue, 23 Apr 2013 16:49:48 +0200
Subject: [PATCH 096/121] [REV] revert revision 9056 that was deleting a whole
 wizard. The patch is good but not applicable as it in the v7

bzr revid: qdp-launchpad@openerp.com-20130423144948-unekni1ztjwv71fb
---
 .../account_analytic_analysis.py              | 32 +++-------
 .../account_analytic_analysis_view.xml        |  4 +-
 addons/hr_timesheet_invoice/__openerp__.py    |  1 +
 .../test/test_hr_timesheet_invoice.yml        | 17 ++++-
 .../test_hr_timesheet_invoice_no_prod_tax.yml | 17 ++++-
 .../hr_timesheet_invoice/wizard/__init__.py   |  1 +
 .../hr_timesheet_final_invoice_create.py      | 63 +++++++++++++++++++
 ...hr_timesheet_invoice_create_final_view.xml | 52 +++++++++++++++
 8 files changed, 160 insertions(+), 27 deletions(-)
 create mode 100644 addons/hr_timesheet_invoice/wizard/hr_timesheet_final_invoice_create.py
 create mode 100644 addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create_final_view.xml

diff --git a/addons/account_analytic_analysis/account_analytic_analysis.py b/addons/account_analytic_analysis/account_analytic_analysis.py
index 89e39c71660..a187f9452f5 100644
--- a/addons/account_analytic_analysis/account_analytic_analysis.py
+++ b/addons/account_analytic_analysis/account_analytic_analysis.py
@@ -206,14 +206,17 @@ class account_analytic_account(osv.osv):
             return res
 
         if child_ids:
-            #Search all invoice lines not in cancelled state that refer to this analytic account
-            inv_line_obj = self.pool.get("account.invoice.line")
-            inv_lines = inv_line_obj.search(cr, uid, ['&', ('account_analytic_id', 'in', child_ids), ('invoice_id.state', '!=', 'cancel')], context=context)
-            for line in inv_line_obj.browse(cr, uid, inv_lines, context=context):
-                res[line.account_analytic_id.id] += line.price_subtotal
+            cr.execute("SELECT account_analytic_line.account_id, COALESCE(SUM(amount), 0.0) \
+                    FROM account_analytic_line \
+                    JOIN account_analytic_journal \
+                        ON account_analytic_line.journal_id = account_analytic_journal.id  \
+                    WHERE account_analytic_line.account_id IN %s \
+                        AND account_analytic_journal.type = 'sale' \
+                    GROUP BY account_analytic_line.account_id", (child_ids,))
+            for account_id, sum in cr.fetchall():
+                res[account_id] = round(sum,2)
         for acc in self.browse(cr, uid, res.keys(), context=context):
             res[acc.id] = res[acc.id] - (acc.timesheet_ca_invoiced or 0.0)
-
         res_final = res
         return res_final
 
@@ -540,23 +543,6 @@ class account_analytic_account(osv.osv):
             pass
         return result
 
-
-    def hr_to_invoice_timesheets(self, cr, uid, ids, context=None):
-        domain = [('invoice_id','=',False),('to_invoice','!=',False), ('journal_id.type', '=', 'general'), ('account_id', 'in', ids)]
-        names = [record.name for record in self.browse(cr, uid, ids, context=context)]
-        name = _('Timesheets to Invoice of %s') % ','.join(names)
-        return {
-            'type': 'ir.actions.act_window',
-            'name': name,
-            'view_type': 'form',
-            'view_mode': 'tree,form',
-            'domain' : domain,
-            'res_model': 'account.analytic.line',
-            'nodestroy': True,
-        }
-
-
-
 class account_analytic_account_summary_user(osv.osv):
     _name = "account_analytic_analysis.summary.user"
     _description = "Hours Summary by User"
diff --git a/addons/account_analytic_analysis/account_analytic_analysis_view.xml b/addons/account_analytic_analysis/account_analytic_analysis_view.xml
index c70a2493be9..8d7a89e4622 100644
--- a/addons/account_analytic_analysis/account_analytic_analysis_view.xml
+++ b/addons/account_analytic_analysis/account_analytic_analysis_view.xml
@@ -98,8 +98,8 @@
                                 <field class="oe_inline" name="ca_to_invoice" attrs="{'invisible': [('invoice_on_timesheets','=',False)]}"/>
                             </td><td class="oe_timesheet_action" attrs="{'invisible': ['|',('invoice_on_timesheets','=',False),('type','=','template')]}">
                                 <span attrs="{'invisible': [('ca_to_invoice','=',0.0)]}" class="oe_grey">
-                                    <button name="hr_to_invoice_timesheets"
-                                        type="object"
+                                    <button name="%(hr_timesheet_invoice.action_hr_timesheet_invoice_create_final)d"
+                                        type="action"
                                         class="oe_link"
                                         string="⇒ Invoice"/>
                                     or view 
diff --git a/addons/hr_timesheet_invoice/__openerp__.py b/addons/hr_timesheet_invoice/__openerp__.py
index 888902e1484..d15dd3b0e3b 100644
--- a/addons/hr_timesheet_invoice/__openerp__.py
+++ b/addons/hr_timesheet_invoice/__openerp__.py
@@ -46,6 +46,7 @@ reports.""",
         'report/hr_timesheet_invoice_report_view.xml',
         'wizard/hr_timesheet_analytic_profit_view.xml',
         'wizard/hr_timesheet_invoice_create_view.xml',
+        'wizard/hr_timesheet_invoice_create_final_view.xml',
     ],
     'demo': ['hr_timesheet_invoice_demo.xml'],
     'test': ['test/test_hr_timesheet_invoice.yml',
diff --git a/addons/hr_timesheet_invoice/test/test_hr_timesheet_invoice.yml b/addons/hr_timesheet_invoice/test/test_hr_timesheet_invoice.yml
index 05326bb19c1..de19ea8fb3a 100644
--- a/addons/hr_timesheet_invoice/test/test_hr_timesheet_invoice.yml
+++ b/addons/hr_timesheet_invoice/test/test_hr_timesheet_invoice.yml
@@ -102,4 +102,19 @@
     assert aline.invoice_id, "Invoice created, but analytic line wasn't updated."
     assert aline.invoice_id == invoice_id, "Invoice doesn't match the one at analytic line"
     assert invoice_id.amount_untaxed == 187.5, "Invoice amount mismatch: %s" % invoice_id.amount_untaxed
-    assert invoice_id.amount_tax == 50, "Invoice tax mismatch: %s" %  invoice_id.amount_tax
\ No newline at end of file
+    assert invoice_id.amount_tax == 50, "Invoice tax mismatch: %s" %  invoice_id.amount_tax
+-
+  I create final invoice for this analytic account.
+-
+  !record {model: hr.timesheet.invoice.create.final, id: hr_timesheet_invoice_create_final_0}:
+    date: 1
+    name: 1
+    price: 1
+    time: 1
+-
+  I click on "Create Invoice" button to create Invoice and validate the invoice.
+-
+  !python {model: hr.timesheet.invoice.create.final}: |
+    import netsvc
+    wkf_service = netsvc.LocalService("workflow")
+    res = self.do_create(cr, uid, [ref("hr_timesheet_invoice_create_final_0")], {"active_ids": [ref("account.analytic_agrolait")]})
diff --git a/addons/hr_timesheet_invoice/test/test_hr_timesheet_invoice_no_prod_tax.yml b/addons/hr_timesheet_invoice/test/test_hr_timesheet_invoice_no_prod_tax.yml
index 88675f3042f..68e827e79f1 100644
--- a/addons/hr_timesheet_invoice/test/test_hr_timesheet_invoice_no_prod_tax.yml
+++ b/addons/hr_timesheet_invoice/test/test_hr_timesheet_invoice_no_prod_tax.yml
@@ -101,4 +101,19 @@
     assert aline.invoice_id, "Invoice created, but analytic line wasn't updated."
     assert aline.invoice_id == invoice_id, "Invoice doesn't match the one at analytic line"
     assert invoice_id.amount_untaxed == 187.5, "Invoice amount mismatch: %s" % invoice_id.amount_untaxed
-    assert invoice_id.amount_tax == 40, "Invoice tax mismatch: %s" %  invoice_id.amount_tax
\ No newline at end of file
+    assert invoice_id.amount_tax == 40, "Invoice tax mismatch: %s" %  invoice_id.amount_tax
+-
+  I create final invoice for this analytic account.
+-
+  !record {model: hr.timesheet.invoice.create.final, id: hr_timesheet_invoice_create_final_0}:
+    date: 1
+    name: 1
+    price: 1
+    time: 1
+-
+  I click on "Create Invoice" button to create Invoice and validate the invoice.
+-
+  !python {model: hr.timesheet.invoice.create.final}: |
+    import netsvc
+    wkf_service = netsvc.LocalService("workflow")
+    res = self.do_create(cr, uid, [ref("hr_timesheet_invoice_create_final_0")], {"active_ids": [ref("account.analytic_agrolait")]})
diff --git a/addons/hr_timesheet_invoice/wizard/__init__.py b/addons/hr_timesheet_invoice/wizard/__init__.py
index 092ea8bbd7b..b718be1acbb 100644
--- a/addons/hr_timesheet_invoice/wizard/__init__.py
+++ b/addons/hr_timesheet_invoice/wizard/__init__.py
@@ -21,6 +21,7 @@
 
 import hr_timesheet_invoice_create
 import hr_timesheet_analytic_profit
+import hr_timesheet_final_invoice_create
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
diff --git a/addons/hr_timesheet_invoice/wizard/hr_timesheet_final_invoice_create.py b/addons/hr_timesheet_invoice/wizard/hr_timesheet_final_invoice_create.py
new file mode 100644
index 00000000000..1977d6cccc5
--- /dev/null
+++ b/addons/hr_timesheet_invoice/wizard/hr_timesheet_final_invoice_create.py
@@ -0,0 +1,63 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+import time
+
+from openerp.osv import fields, osv
+from openerp.tools.translate import _
+
+#
+# Create an final invoice based on selected timesheet lines
+#
+
+#
+# TODO: check unit of measure !!!
+#
+class final_invoice_create(osv.osv_memory):
+    _name = 'hr.timesheet.invoice.create.final'
+    _description = 'Create invoice from timesheet final'
+    _columns = {
+        'date': fields.boolean('Date', help='Display date in the history of works'),
+        'time': fields.boolean('Time Spent', help='Display time in the history of works'),
+        'name': fields.boolean('Log of Activity', help='Display detail of work in the invoice line.'),
+        'price': fields.boolean('Cost', help='Display cost of the item you reinvoice'),
+        'product': fields.many2one('product.product', 'Product', help='The product that will be used to invoice the remaining amount'),
+    }
+
+    def do_create(self, cr, uid, ids, context=None):
+        data = self.read(cr, uid, ids, [], context=context)[0]
+        # hack for fixing small issue (context should not propagate implicitly between actions)
+        if 'default_type' in context:
+            del context['default_type']
+        ids = self.pool.get('account.analytic.line').search(cr, uid, [('invoice_id','=',False),('to_invoice','<>', False), ('account_id', 'in', context['active_ids'])], context=context)
+        invs = self.pool.get('account.analytic.line').invoice_cost_create(cr, uid, ids, data, context=context)
+        mod_obj = self.pool.get('ir.model.data')
+        act_obj = self.pool.get('ir.actions.act_window')
+        mod_ids = mod_obj.search(cr, uid, [('name', '=', 'action_invoice_tree1')], context=context)[0]
+        res_id = mod_obj.read(cr, uid, mod_ids, ['res_id'], context=context)['res_id']
+        act_win = act_obj.read(cr, uid, res_id, [], context=context)
+        act_win['domain'] = [('id','in',invs),('type','=','out_invoice')]
+        act_win['name'] = _('Invoices')
+        return act_win
+
+final_invoice_create()
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create_final_view.xml b/addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create_final_view.xml
new file mode 100644
index 00000000000..d1c95212139
--- /dev/null
+++ b/addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create_final_view.xml
@@ -0,0 +1,52 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+        <record id="action_hr_timesheet_invoice_create_final" model="ir.actions.act_window">
+            <field name="name">Create Invoice</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="res_model">hr.timesheet.invoice.create.final</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">form</field>
+            <field name="target">new</field>
+            <field name="multi" eval="1"/>
+        </record>
+
+        <record model="ir.values" id="hr_timesheet_invoice_create_final_values">
+            <field name="model_id" ref="model_account_analytic_account" />
+            <field name="name">Invoice</field>
+            <field name="key2">client_action_multi</field>
+            <field name="value" eval="'ir.actions.act_window,' + str(ref('action_hr_timesheet_invoice_create_final'))" />
+            <field name="key">action</field>
+            <field name="model">account.analytic.account</field>
+        </record>
+
+
+        <record id="view_hr_timesheet_invoice_create_final" model="ir.ui.view">
+            <field name="name">hr.timesheet.invoice.create.final.form</field>
+            <field name="model">hr.timesheet.invoice.create.final</field>
+            <field name="arch" type="xml">
+            <form string="Invoice contract" version="7.0">
+                    <p>Do you want to show details of each activity to your customer?</p>
+                    <group>
+                        <group>
+                            <field name="date"/>
+                            <field name="time"/>
+                        </group><group>
+                            <field name="name"/>
+                            <field name="price"/>
+                        </group>
+                    </group>
+                    <group string="Force to use a special product" groups="base.group_no_one">
+                        <field name="product"/>
+                    </group>
+                <footer>
+                    <button name="do_create" string="Create Invoice" type="object" class="oe_highlight"/>
+                    or
+                    <button string="Cancel" class="oe_link" special="cancel" />
+                </footer>
+            </form>
+            </field>
+        </record>
+
+    </data>
+</openerp>

From 1e344dbc538d46e94744e983fbb0a5449186b4a4 Mon Sep 17 00:00:00 2001
From: "Quentin (OpenERP)" <qdp-launchpad@openerp.com>
Date: Tue, 23 Apr 2013 17:18:10 +0200
Subject: [PATCH 097/121] [FIX] account_analytic_analysis,
 hr_timesheet_invoice: partial replay of the fix made in revno 9056. The fix
 effect is the same, but more appropriate to a stable version (the wizard will
 be removed in v8 only)

bzr revid: qdp-launchpad@openerp.com-20130423151810-lcwo7abivbaoog0s
---
 .../account_analytic_analysis.py              | 32 +++++++++++++------
 .../account_analytic_analysis_view.xml        |  4 +--
 .../test/test_hr_timesheet_invoice.yml        | 17 +---------
 .../test_hr_timesheet_invoice_no_prod_tax.yml | 17 +---------
 4 files changed, 27 insertions(+), 43 deletions(-)

diff --git a/addons/account_analytic_analysis/account_analytic_analysis.py b/addons/account_analytic_analysis/account_analytic_analysis.py
index a187f9452f5..89e39c71660 100644
--- a/addons/account_analytic_analysis/account_analytic_analysis.py
+++ b/addons/account_analytic_analysis/account_analytic_analysis.py
@@ -206,17 +206,14 @@ class account_analytic_account(osv.osv):
             return res
 
         if child_ids:
-            cr.execute("SELECT account_analytic_line.account_id, COALESCE(SUM(amount), 0.0) \
-                    FROM account_analytic_line \
-                    JOIN account_analytic_journal \
-                        ON account_analytic_line.journal_id = account_analytic_journal.id  \
-                    WHERE account_analytic_line.account_id IN %s \
-                        AND account_analytic_journal.type = 'sale' \
-                    GROUP BY account_analytic_line.account_id", (child_ids,))
-            for account_id, sum in cr.fetchall():
-                res[account_id] = round(sum,2)
+            #Search all invoice lines not in cancelled state that refer to this analytic account
+            inv_line_obj = self.pool.get("account.invoice.line")
+            inv_lines = inv_line_obj.search(cr, uid, ['&', ('account_analytic_id', 'in', child_ids), ('invoice_id.state', '!=', 'cancel')], context=context)
+            for line in inv_line_obj.browse(cr, uid, inv_lines, context=context):
+                res[line.account_analytic_id.id] += line.price_subtotal
         for acc in self.browse(cr, uid, res.keys(), context=context):
             res[acc.id] = res[acc.id] - (acc.timesheet_ca_invoiced or 0.0)
+
         res_final = res
         return res_final
 
@@ -543,6 +540,23 @@ class account_analytic_account(osv.osv):
             pass
         return result
 
+
+    def hr_to_invoice_timesheets(self, cr, uid, ids, context=None):
+        domain = [('invoice_id','=',False),('to_invoice','!=',False), ('journal_id.type', '=', 'general'), ('account_id', 'in', ids)]
+        names = [record.name for record in self.browse(cr, uid, ids, context=context)]
+        name = _('Timesheets to Invoice of %s') % ','.join(names)
+        return {
+            'type': 'ir.actions.act_window',
+            'name': name,
+            'view_type': 'form',
+            'view_mode': 'tree,form',
+            'domain' : domain,
+            'res_model': 'account.analytic.line',
+            'nodestroy': True,
+        }
+
+
+
 class account_analytic_account_summary_user(osv.osv):
     _name = "account_analytic_analysis.summary.user"
     _description = "Hours Summary by User"
diff --git a/addons/account_analytic_analysis/account_analytic_analysis_view.xml b/addons/account_analytic_analysis/account_analytic_analysis_view.xml
index 8d7a89e4622..c70a2493be9 100644
--- a/addons/account_analytic_analysis/account_analytic_analysis_view.xml
+++ b/addons/account_analytic_analysis/account_analytic_analysis_view.xml
@@ -98,8 +98,8 @@
                                 <field class="oe_inline" name="ca_to_invoice" attrs="{'invisible': [('invoice_on_timesheets','=',False)]}"/>
                             </td><td class="oe_timesheet_action" attrs="{'invisible': ['|',('invoice_on_timesheets','=',False),('type','=','template')]}">
                                 <span attrs="{'invisible': [('ca_to_invoice','=',0.0)]}" class="oe_grey">
-                                    <button name="%(hr_timesheet_invoice.action_hr_timesheet_invoice_create_final)d"
-                                        type="action"
+                                    <button name="hr_to_invoice_timesheets"
+                                        type="object"
                                         class="oe_link"
                                         string="⇒ Invoice"/>
                                     or view 
diff --git a/addons/hr_timesheet_invoice/test/test_hr_timesheet_invoice.yml b/addons/hr_timesheet_invoice/test/test_hr_timesheet_invoice.yml
index de19ea8fb3a..05326bb19c1 100644
--- a/addons/hr_timesheet_invoice/test/test_hr_timesheet_invoice.yml
+++ b/addons/hr_timesheet_invoice/test/test_hr_timesheet_invoice.yml
@@ -102,19 +102,4 @@
     assert aline.invoice_id, "Invoice created, but analytic line wasn't updated."
     assert aline.invoice_id == invoice_id, "Invoice doesn't match the one at analytic line"
     assert invoice_id.amount_untaxed == 187.5, "Invoice amount mismatch: %s" % invoice_id.amount_untaxed
-    assert invoice_id.amount_tax == 50, "Invoice tax mismatch: %s" %  invoice_id.amount_tax
--
-  I create final invoice for this analytic account.
--
-  !record {model: hr.timesheet.invoice.create.final, id: hr_timesheet_invoice_create_final_0}:
-    date: 1
-    name: 1
-    price: 1
-    time: 1
--
-  I click on "Create Invoice" button to create Invoice and validate the invoice.
--
-  !python {model: hr.timesheet.invoice.create.final}: |
-    import netsvc
-    wkf_service = netsvc.LocalService("workflow")
-    res = self.do_create(cr, uid, [ref("hr_timesheet_invoice_create_final_0")], {"active_ids": [ref("account.analytic_agrolait")]})
+    assert invoice_id.amount_tax == 50, "Invoice tax mismatch: %s" %  invoice_id.amount_tax
\ No newline at end of file
diff --git a/addons/hr_timesheet_invoice/test/test_hr_timesheet_invoice_no_prod_tax.yml b/addons/hr_timesheet_invoice/test/test_hr_timesheet_invoice_no_prod_tax.yml
index 68e827e79f1..88675f3042f 100644
--- a/addons/hr_timesheet_invoice/test/test_hr_timesheet_invoice_no_prod_tax.yml
+++ b/addons/hr_timesheet_invoice/test/test_hr_timesheet_invoice_no_prod_tax.yml
@@ -101,19 +101,4 @@
     assert aline.invoice_id, "Invoice created, but analytic line wasn't updated."
     assert aline.invoice_id == invoice_id, "Invoice doesn't match the one at analytic line"
     assert invoice_id.amount_untaxed == 187.5, "Invoice amount mismatch: %s" % invoice_id.amount_untaxed
-    assert invoice_id.amount_tax == 40, "Invoice tax mismatch: %s" %  invoice_id.amount_tax
--
-  I create final invoice for this analytic account.
--
-  !record {model: hr.timesheet.invoice.create.final, id: hr_timesheet_invoice_create_final_0}:
-    date: 1
-    name: 1
-    price: 1
-    time: 1
--
-  I click on "Create Invoice" button to create Invoice and validate the invoice.
--
-  !python {model: hr.timesheet.invoice.create.final}: |
-    import netsvc
-    wkf_service = netsvc.LocalService("workflow")
-    res = self.do_create(cr, uid, [ref("hr_timesheet_invoice_create_final_0")], {"active_ids": [ref("account.analytic_agrolait")]})
+    assert invoice_id.amount_tax == 40, "Invoice tax mismatch: %s" %  invoice_id.amount_tax
\ No newline at end of file

From 630f1eb42d44985e7eca04ff69158ff576019683 Mon Sep 17 00:00:00 2001
From: Cedric Snauwaert <csn@openerp.com>
Date: Tue, 23 Apr 2013 17:24:39 +0200
Subject: [PATCH 098/121] [FIX]account_voucher: change payment view to add some
 field and currency when it is the same than company. Also add some missing
 field in account voucher sale form

bzr revid: csn@openerp.com-20130423152439-ixdfgasutdv1pj62
---
 addons/account_voucher/account_voucher.py     |  2 ++
 .../voucher_payment_receipt_view.xml          | 27 +++++++++++--------
 .../voucher_sales_purchase_view.xml           |  6 +++++
 3 files changed, 24 insertions(+), 11 deletions(-)

diff --git a/addons/account_voucher/account_voucher.py b/addons/account_voucher/account_voucher.py
index dd8bb157067..2e041b694f9 100644
--- a/addons/account_voucher/account_voucher.py
+++ b/addons/account_voucher/account_voucher.py
@@ -826,6 +826,8 @@ class account_voucher(osv.osv):
         currency_id = False
         if journal.currency:
             currency_id = journal.currency.id
+        else:
+            currency_id = journal.company_id.currency_id.id
         vals['value'].update({'currency_id': currency_id})
         res = self.onchange_partner_id(cr, uid, ids, partner_id, journal_id, amount, currency_id, ttype, date, context)
         for key in res.keys():
diff --git a/addons/account_voucher/voucher_payment_receipt_view.xml b/addons/account_voucher/voucher_payment_receipt_view.xml
index 109c2f9aec9..3cdd93c8d20 100644
--- a/addons/account_voucher/voucher_payment_receipt_view.xml
+++ b/addons/account_voucher/voucher_payment_receipt_view.xml
@@ -305,6 +305,7 @@
                                 on_change="onchange_journal(journal_id, line_cr_ids, False, partner_id, date, amount, type, company_id, context)"
                                 string="Payment Method"/>
                         </group>
+                        
                         <group>
                             <field name="date" invisible="context.get('line_type', False)" on_change="onchange_date(date, currency_id, payment_rate_currency_id, amount, company_id, context)"/>
                             <field name="period_id"/>
@@ -319,6 +320,21 @@
                             <field name="type" invisible="True"/>
                         </group>
                     </group>
+                    <group>
+                        <group>
+                                <field name="writeoff_amount" widget="monetary" options="{'currency_field': 'currency_id'}"/>
+                                <field name="payment_option" required="1"/>
+                                <field name="writeoff_acc_id"
+                                        attrs="{'invisible':[('payment_option','!=','with_writeoff')], 'required':[('payment_option','=','with_writeoff')]}"
+                                        domain="[('type','=','other')]"/>
+                                <field name="comment"
+                                        attrs="{'invisible':[('payment_option','!=','with_writeoff')]}"/>
+                                <field name="analytic_id"
+                                        groups="analytic.group_analytic_accounting"/>
+                            </group>
+                            <group>
+                        </group>
+                    </group>
                     <notebook invisible="1">
                         <page string="Payment Information" groups="base.group_user">
                             <label for="line_cr_ids"/>
@@ -364,17 +380,6 @@
                                     <field name="payment_rate_currency_id" colspan="1" nolabel="1" on_change="onchange_payment_rate_currency(currency_id, payment_rate, payment_rate_currency_id, date, amount, company_id, context)" groups="base.group_multi_currency"/>
                                     <field name="paid_amount_in_company_currency" colspan="4" invisible="1"/>
                                 </group>
-                                <group>
-                                    <field name="writeoff_amount" widget="monetary" options="{'currency_field': 'currency_id'}"/>
-                                    <field name="payment_option" required="1"/>
-                                    <field name="writeoff_acc_id"
-                                           attrs="{'invisible':[('payment_option','!=','with_writeoff')], 'required':[('payment_option','=','with_writeoff')]}"
-                                           domain="[('type','=','other')]"/>
-                                    <field name="comment"
-                                           attrs="{'invisible':[('payment_option','!=','with_writeoff')]}"/>
-                                    <field name="analytic_id"
-                                           groups="analytic.group_analytic_accounting"/>
-                                </group>
                             </group>
                         </page>
                     </notebook>
diff --git a/addons/account_voucher/voucher_sales_purchase_view.xml b/addons/account_voucher/voucher_sales_purchase_view.xml
index 6a84a09d5e6..ca7e46053b4 100644
--- a/addons/account_voucher/voucher_sales_purchase_view.xml
+++ b/addons/account_voucher/voucher_sales_purchase_view.xml
@@ -145,6 +145,12 @@
                             </field>
                         </page>
                     </notebook>
+                    <group col="4" invisible="1">
+                                    <field name="is_multi_currency" invisible="1"/>
+                                    <field name="payment_rate" required="1" on_change="onchange_rate(payment_rate, amount, currency_id, payment_rate_currency_id, company_id, context)" colspan="3" invisible="1"/>
+                                    <field name="payment_rate_currency_id" colspan="1" nolabel="1" on_change="onchange_payment_rate_currency(currency_id, payment_rate, payment_rate_currency_id, date, amount, company_id, context)" groups="base.group_multi_currency" invisible="1"/>
+                                    <field name="paid_amount_in_company_currency" colspan="4" invisible="1"/>
+                    </group>
                     </sheet>
                     <div class="oe_chatter">
                         <field name="message_follower_ids" widget="mail_followers"/>

From 06746ad25b4e010d869f3ae19d07e372908fea84 Mon Sep 17 00:00:00 2001
From: Christophe Simonis <chs@openerp.com>
Date: Tue, 23 Apr 2013 19:20:13 +0200
Subject: [PATCH 099/121] [FIX] note: be tolerant to unknow stages when
 creating users

bzr revid: chs@openerp.com-20130423172013-lzi0gyo81m101fbm
---
 addons/note/note.py | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/addons/note/note.py b/addons/note/note.py
index 90c2cb9bc54..eb9a6397d18 100644
--- a/addons/note/note.py
+++ b/addons/note/note.py
@@ -195,8 +195,11 @@ class res_users(osv.Model):
         group_id = model_id and model_id[1] or False
         if group_id in [x.id for x in user.groups_id]:
             for note_xml_id in ['note_stage_00','note_stage_01','note_stage_02','note_stage_03','note_stage_04']:
-                data_id = data_obj._get_id(cr, uid, 'note', note_xml_id)
+                try:
+                    data_id = data_obj._get_id(cr, uid, 'note', note_xml_id)
+                except ValueError:
+                    continue
                 stage_id  = data_obj.browse(cr, uid, data_id, context=context).res_id
                 note_obj.copy(cr, uid, stage_id, default = { 
                                         'user_id': user_id}, context=context)
-        return user_id
\ No newline at end of file
+        return user_id

From 60f0bd08eec2d1b513549f5714f6c1c3e2a06045 Mon Sep 17 00:00:00 2001
From: Christophe Simonis <chs@openerp.com>
Date: Tue, 23 Apr 2013 20:19:26 +0200
Subject: [PATCH 100/121] [FIX] expression: allow creating child_of expression
 even if "id" field has been redefined, courtesy of Gustavo Adrian Marino

lp bug: https://launchpad.net/bugs/1030942 fixed
lp bug: https://launchpad.net/bugs/1131992 fixed

bzr revid: chs@openerp.com-20130423181926-yk628txd6yiybtko
---
 openerp/osv/expression.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/openerp/osv/expression.py b/openerp/osv/expression.py
index ba00c2caa91..8d0e9376277 100644
--- a/openerp/osv/expression.py
+++ b/openerp/osv/expression.py
@@ -791,7 +791,7 @@ class expression(object):
                 leaf.add_join_context(next_model, working_model._inherits[next_model._name], 'id', working_model._inherits[next_model._name])
                 push(leaf)
 
-            elif not field and left == 'id' and operator == 'child_of':
+            elif left == 'id' and operator == 'child_of':
                 ids2 = to_ids(right, working_model, context)
                 dom = child_of_domain(left, ids2, working_model)
                 for dom_leaf in reversed(dom):

From 44569c06a2ccee306825468c27d789c7eeb9e1fe Mon Sep 17 00:00:00 2001
From: Antony Lesuisse <al@openerp.com>
Date: Tue, 23 Apr 2013 23:06:44 +0200
Subject: [PATCH 101/121] [FIX] http controllers inheritance minimalist and
 backward compatible implementation

bzr revid: al@openerp.com-20130423210644-hmvglhh10zlrwp9q
---
 addons/web/controllers/main.py         | 10 +++++-----
 addons/web/http.py                     | 25 ++++++++++++++++++++-----
 addons/web_diagram/controllers/main.py |  2 +-
 3 files changed, 26 insertions(+), 11 deletions(-)

diff --git a/addons/web/controllers/main.py b/addons/web/controllers/main.py
index 01126694059..01624ceb1ce 100644
--- a/addons/web/controllers/main.py
+++ b/addons/web/controllers/main.py
@@ -1439,7 +1439,7 @@ class Action(openerpweb.Controller):
         else:
             return False
 
-class Export(View):
+class Export(openerpweb.Controller):
     _cp_path = "/web/export"
 
     @openerpweb.jsonrequest
@@ -1580,7 +1580,7 @@ class Export(View):
             (prefix + '/' + k, prefix_string + '/' + v)
             for k, v in self.fields_info(req, model, export_fields).iteritems())
 
-    #noinspection PyPropertyDefinition
+class ExportFormat(object):
     @property
     def content_type(self):
         """ Provides the format's content type """
@@ -1628,7 +1628,7 @@ class Export(View):
                      ('Content-Type', self.content_type)],
             cookies={'fileToken': int(token)})
 
-class CSVExport(Export):
+class CSVExport(ExportFormat, http.Controller):
     _cp_path = '/web/export/csv'
     fmt = {'tag': 'csv', 'label': 'CSV'}
 
@@ -1663,7 +1663,7 @@ class CSVExport(Export):
         fp.close()
         return data
 
-class ExcelExport(Export):
+class ExcelExport(ExportFormat, http.Controller):
     _cp_path = '/web/export/xls'
     fmt = {
         'tag': 'xls',
@@ -1702,7 +1702,7 @@ class ExcelExport(Export):
         fp.close()
         return data
 
-class Reports(View):
+class Reports(openerpweb.Controller):
     _cp_path = "/web/report"
     POLLING_DELAY = 0.25
     TYPES_MAPPING = {
diff --git a/addons/web/http.py b/addons/web/http.py
index d12cdfb13a1..f56778ea1ba 100644
--- a/addons/web/http.py
+++ b/addons/web/http.py
@@ -356,17 +356,31 @@ def httprequest(f):
 addons_module = {}
 addons_manifest = {}
 controllers_class = []
+controllers_class_path = {}
 controllers_object = {}
+controllers_object_path = {}
 controllers_path = {}
 
 class ControllerType(type):
     def __init__(cls, name, bases, attrs):
         super(ControllerType, cls).__init__(name, bases, attrs)
-        controllers_class.append(("%s.%s" % (cls.__module__, cls.__name__), cls))
+        name_class = ("%s.%s" % (cls.__module__, cls.__name__), cls)
+        controllers_class.append(name_class)
+        path = attrs.get('_cp_path')
+        if path not in controllers_class_path:
+            controllers_class_path[path] = name_class
 
 class Controller(object):
     __metaclass__ = ControllerType
 
+    def __new__(cls, *args, **kwargs):
+        subclasses = [c for c in cls.__subclasses__() if c._cp_path == cls._cp_path]
+        if subclasses:
+            name = "%s (extended by %s)" % (cls.__name__, ', '.join(sub.__name__ for sub in subclasses))
+            cls = type(name, tuple(reversed(subclasses)), {})
+
+        return object.__new__(cls)
+
 #----------------------------------------------------------
 # Session context manager
 #----------------------------------------------------------
@@ -566,10 +580,11 @@ class Root(object):
                         addons_manifest[module] = manifest
                         self.statics['/%s/static' % module] = path_static
 
-        for k, v in controllers_class:
-            if k not in controllers_object:
-                o = v()
-                controllers_object[k] = o
+        for k, v in controllers_class_path.items():
+            if k not in controllers_object_path and hasattr(v[1], '_cp_path'):
+                o = v[1]()
+                controllers_object[v[0]] = o
+                controllers_object_path[k] = o
                 if hasattr(o, '_cp_path'):
                     controllers_path[o._cp_path] = o
 
diff --git a/addons/web_diagram/controllers/main.py b/addons/web_diagram/controllers/main.py
index c598a7e4652..3f3c1065504 100644
--- a/addons/web_diagram/controllers/main.py
+++ b/addons/web_diagram/controllers/main.py
@@ -1,6 +1,6 @@
 import openerp
 
-class DiagramView(openerp.addons.web.controllers.main.View):
+class DiagramView(openerp.addons.web.http.Controller):
     _cp_path = "/web_diagram/diagram"
 
     @openerp.addons.web.http.jsonrequest

From 6a2e96bf902b6307c3eb7f28697fec40adf857bf Mon Sep 17 00:00:00 2001
From: Antony Lesuisse <al@openerp.com>
Date: Wed, 24 Apr 2013 00:22:45 +0200
Subject: [PATCH 102/121] [FIX] workers, listen backlog based on the number of
 workers

bzr revid: al@openerp.com-20130423222245-i3gw87v7rktsb23y
---
 openerp/service/workers.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/openerp/service/workers.py b/openerp/service/workers.py
index 1ff81c5e537..39a7255a3e9 100644
--- a/openerp/service/workers.py
+++ b/openerp/service/workers.py
@@ -177,7 +177,7 @@ class Multicorn(object):
         self.socket.setsockopt(socket.SOL_SOCKET, socket.SO_REUSEADDR, 1)
         self.socket.setblocking(0)
         self.socket.bind(self.address)
-        self.socket.listen(8)
+        self.socket.listen(8*self.population)
 
     def stop(self, graceful=True):
         if graceful:

From 26e488f2fbe3a5915e650668ff81c3f750031186 Mon Sep 17 00:00:00 2001
From: Launchpad Translations on behalf of openerp <>
Date: Wed, 24 Apr 2013 05:28:45 +0000
Subject: [PATCH 103/121] Launchpad automatic translations update.

bzr revid: launchpad_translations_on_behalf_of_openerp-20130424052821-pkggcy9qr4rmhl53
bzr revid: launchpad_translations_on_behalf_of_openerp-20130424052845-9nzv2aje2g99c9eq
---
 addons/account/i18n/fr.po        |  22 ++-
 addons/account_budget/i18n/fr.po |  13 +-
 addons/base_gengo/i18n/fr.po     |  10 +-
 addons/hr_holidays/i18n/fr.po    |   8 +-
 addons/mail/i18n/fr.po           |  14 +-
 addons/stock/i18n/pt_BR.po       |  11 +-
 openerp/addons/base/i18n/de.po   | 289 ++++++++++++++++---------------
 openerp/addons/base/i18n/fr.po   |  39 ++---
 8 files changed, 213 insertions(+), 193 deletions(-)

diff --git a/addons/account/i18n/fr.po b/addons/account/i18n/fr.po
index 372175a1f18..b3bc2f57408 100644
--- a/addons/account/i18n/fr.po
+++ b/addons/account/i18n/fr.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2013-03-07 08:37+0000\n"
-"PO-Revision-Date: 2013-04-22 08:47+0000\n"
+"PO-Revision-Date: 2013-04-23 12:11+0000\n"
 "Last-Translator: Frederic Clementi - Camptocamp.com "
 "<frederic.clementi@camptocamp.com>\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: 2013-04-23 06:09+0000\n"
+"X-Launchpad-Export-Date: 2013-04-24 05:28+0000\n"
 "X-Generator: Launchpad (build 16580)\n"
 
 #. module: account
@@ -1326,6 +1326,20 @@ msgid ""
 "              </p>\n"
 "            "
 msgstr ""
+"< class=\"oe_view_nocontent_create\">\n"
+"                Cliquer pour créer un nouvel historique de trésorerie\n"
+"                </p><p>\n"
+"                Un registre de trésorerie vous permet de gérer les entrées "
+"de trésorerie dans votre journal de \n"
+"                trésorerie. Cette fonctionnalité vous permet de suivre "
+"facilement les paiements\n"
+"                en espèce de façon journalière. Vous pouvez y enregistrer "
+"les pièces \n"
+"                qui sont dans votre caisse, et ensuite écrire les entrées "
+"lorsque l'argent rentre ou\n"
+"                sort de votre caisse.\n"
+"                </p>\n"
+"            "
 
 #. module: account
 #: model:account.account.type,name:account.data_account_type_bank
@@ -2848,7 +2862,7 @@ msgstr "Lettrage par partenaire"
 #. module: account
 #: view:account.analytic.line:0
 msgid "Fin. Account"
-msgstr ""
+msgstr "Compte financier"
 
 #. module: account
 #: field:account.tax,tax_code_id:0
@@ -3238,7 +3252,7 @@ msgstr ""
 #: code:addons/account/account.py:1062
 #, python-format
 msgid "You should choose the periods that belong to the same company."
-msgstr ""
+msgstr "Veuillez choisir des périodes qui appartiennent à la même société"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_report_account_sales_tree_all
diff --git a/addons/account_budget/i18n/fr.po b/addons/account_budget/i18n/fr.po
index 1d70bf32e35..fb651a72c8f 100644
--- a/addons/account_budget/i18n/fr.po
+++ b/addons/account_budget/i18n/fr.po
@@ -8,14 +8,15 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2013-03-07 08:37+0000\n"
-"PO-Revision-Date: 2013-03-06 15:44+0000\n"
-"Last-Translator: Numérigraphe <Unknown>\n"
+"PO-Revision-Date: 2013-04-23 12:55+0000\n"
+"Last-Translator: Frederic Clementi - Camptocamp.com "
+"<frederic.clementi@camptocamp.com>\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: 2013-03-28 05:29+0000\n"
-"X-Generator: Launchpad (build 16546)\n"
+"X-Launchpad-Export-Date: 2013-04-24 05:28+0000\n"
+"X-Generator: Launchpad (build 16580)\n"
 
 #. module: account_budget
 #: view:account.budget.analytic:0
@@ -39,7 +40,7 @@ msgstr "Confirmé"
 #: model:ir.actions.act_window,name:account_budget.open_budget_post_form
 #: model:ir.ui.menu,name:account_budget.menu_budget_post_form
 msgid "Budgetary Positions"
-msgstr "Positions budgétaires"
+msgstr "Postes Budgétaires"
 
 #. module: account_budget
 #: report:account.budget:0
@@ -291,7 +292,7 @@ msgstr "À approuver"
 #: field:crossovered.budget.lines,general_budget_id:0
 #: model:ir.model,name:account_budget.model_account_budget_post
 msgid "Budgetary Position"
-msgstr "Position budgétaire"
+msgstr "Poste Budgétaire"
 
 #. module: account_budget
 #: field:account.budget.analytic,date_from:0
diff --git a/addons/base_gengo/i18n/fr.po b/addons/base_gengo/i18n/fr.po
index bab9eef22d7..4f9ff9eed3c 100644
--- a/addons/base_gengo/i18n/fr.po
+++ b/addons/base_gengo/i18n/fr.po
@@ -8,25 +8,25 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2013-03-07 08:37+0000\n"
-"PO-Revision-Date: 2013-03-21 01:50+0000\n"
+"PO-Revision-Date: 2013-04-23 12:12+0000\n"
 "Last-Translator: Maxime Chambreuil (http://www.savoirfairelinux.com) "
 "<maxime.chambreuil@savoirfairelinux.com>\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: 2013-03-28 05:33+0000\n"
-"X-Generator: Launchpad (build 16546)\n"
+"X-Launchpad-Export-Date: 2013-04-24 05:28+0000\n"
+"X-Generator: Launchpad (build 16580)\n"
 
 #. module: base_gengo
 #: view:res.company:0
 msgid "Comments for Translator"
-msgstr ""
+msgstr "Commentaires pour traducteur"
 
 #. module: base_gengo
 #: field:ir.translation,job_id:0
 msgid "Gengo Job ID"
-msgstr ""
+msgstr "Identifiant de la tâche Gengo"
 
 #. module: base_gengo
 #: code:addons/base_gengo/wizard/base_gengo_translations.py:114
diff --git a/addons/hr_holidays/i18n/fr.po b/addons/hr_holidays/i18n/fr.po
index 22f8c3ebfee..dbae71680ce 100644
--- a/addons/hr_holidays/i18n/fr.po
+++ b/addons/hr_holidays/i18n/fr.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2013-03-07 08:37+0000\n"
-"PO-Revision-Date: 2013-04-10 03:12+0000\n"
+"PO-Revision-Date: 2013-04-23 12:12+0000\n"
 "Last-Translator: Bertrand Rétif <Unknown>\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: 2013-04-11 14:43+0000\n"
-"X-Generator: Launchpad (build 16550)\n"
+"X-Launchpad-Export-Date: 2013-04-24 05:28+0000\n"
+"X-Generator: Launchpad (build 16580)\n"
 
 #. module: hr_holidays
 #: selection:hr.holidays.status,color_name:0
@@ -126,7 +126,7 @@ msgstr "Attribution"
 #. module: hr_holidays
 #: xsl:holidays.summary:0
 msgid "to"
-msgstr ""
+msgstr "au"
 
 #. module: hr_holidays
 #: selection:hr.holidays.status,color_name:0
diff --git a/addons/mail/i18n/fr.po b/addons/mail/i18n/fr.po
index ce67a7dd9d4..99208756505 100644
--- a/addons/mail/i18n/fr.po
+++ b/addons/mail/i18n/fr.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2013-03-07 08:37+0000\n"
-"PO-Revision-Date: 2013-01-30 10:32+0000\n"
-"Last-Translator: WANTELLET Sylvain <Swantellet@tetra-info.com>\n"
+"PO-Revision-Date: 2013-04-23 12:15+0000\n"
+"Last-Translator: Gilles Major (OpenERP) <gim@openerp.com>\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: 2013-03-28 05:47+0000\n"
-"X-Generator: Launchpad (build 16546)\n"
+"X-Launchpad-Export-Date: 2013-04-24 05:28+0000\n"
+"X-Generator: Launchpad (build 16580)\n"
 
 #. module: mail
 #: view:mail.followers:0
@@ -1180,7 +1180,7 @@ msgstr ""
 #. module: mail
 #: selection:mail.group,public:0
 msgid "Selected Group Only"
-msgstr ""
+msgstr "Groupe sélectionné uniquement"
 
 #. module: mail
 #: field:mail.group,message_is_follower:0
@@ -1262,7 +1262,7 @@ msgstr "Marqué comme 'À faire'"
 #. module: mail
 #: help:mail.message.subtype,parent_id:0
 msgid "Parent subtype, used for automatic subscription."
-msgstr ""
+msgstr "Sous-type parent, utilisé pour l'abonnement automatique."
 
 #. module: mail
 #: field:mail.group,message_summary:0
@@ -1555,7 +1555,7 @@ msgstr ""
 #: help:mail.compose.message,to_read:0
 #: help:mail.message,to_read:0
 msgid "Current user has an unread notification linked to this message"
-msgstr ""
+msgstr "L'utilisateur actuel a une notification non-lue liée à ce message."
 
 #. module: mail
 #: help:res.partner,notification_email_send:0
diff --git a/addons/stock/i18n/pt_BR.po b/addons/stock/i18n/pt_BR.po
index 3ac957f9394..ac87ca0c1b5 100644
--- a/addons/stock/i18n/pt_BR.po
+++ b/addons/stock/i18n/pt_BR.po
@@ -8,15 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2013-03-07 08:37+0000\n"
-"PO-Revision-Date: 2013-03-16 14:51+0000\n"
-"Last-Translator: Fábio Martinelli - http://zupy.com.br "
-"<webmaster@guaru.net>\n"
+"PO-Revision-Date: 2013-04-24 03:18+0000\n"
+"Last-Translator: Thiago Tognoli <Unknown>\n"
 "Language-Team: Brazilian Portuguese <pt_BR@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: 2013-03-28 06:03+0000\n"
-"X-Generator: Launchpad (build 16546)\n"
+"X-Launchpad-Export-Date: 2013-04-24 05:28+0000\n"
+"X-Generator: Launchpad (build 16580)\n"
 
 #. module: stock
 #: field:stock.inventory.line.split,line_exist_ids:0
@@ -207,7 +206,7 @@ msgstr "Dia"
 #: model:ir.actions.act_window,name:stock.action_inventory_form
 #: model:ir.ui.menu,name:stock.menu_action_inventory_form
 msgid "Physical Inventories"
-msgstr "Inventários físicos"
+msgstr "Inventários Físicos"
 
 #. module: stock
 #: selection:stock.location.product,type:0
diff --git a/openerp/addons/base/i18n/de.po b/openerp/addons/base/i18n/de.po
index b3945a47131..cda978f6242 100644
--- a/openerp/addons/base/i18n/de.po
+++ b/openerp/addons/base/i18n/de.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-server\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2013-03-07 08:36+0000\n"
-"PO-Revision-Date: 2013-04-22 22:24+0000\n"
+"PO-Revision-Date: 2013-04-23 20:34+0000\n"
 "Last-Translator: Thorsten Vocks (OpenBig.org) <thorsten.vocks@big-"
 "consulting.net>\n"
 "Language-Team: German <de@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: 2013-04-23 06:08+0000\n"
+"X-Launchpad-Export-Date: 2013-04-24 05:28+0000\n"
 "X-Generator: Launchpad (build 16580)\n"
 
 #. module: base
@@ -864,7 +864,7 @@ msgstr ""
 "Finanzbuchhaltung\n"
 "===============\n"
 "\n"
-"Finanz-und Rechnungswesen-Modul, welches umfasst:\n"
+"Das Finanz- und Rechnungswesen umfasst:\n"
 "--------------------------------------------------------------------------\n"
 "    * Finanzbuchhaltung\n"
 "    * Kostenrechnung\n"
@@ -875,17 +875,17 @@ msgstr ""
 "    * Kontoauszüge\n"
 "    * Abgleich offener Posten bei Partnern\n"
 "\n"
-"Anzeigetafel für Buchhalter, die folgendes beinhaltet:\n"
+"Die Anzeigetafel für Buchhalter beinhaltet:\n"
 "-----------------------------------------------------------------------------"
 "----------\n"
 "    * Liste der Kundenrechnung, die noch gebucht werden müssen\n"
-"    * Unternehmensanalyse\n"
-"    * Grafik zur Liquidität\n"
+"    * Kennzahlen zur Unternehmensanalyse\n"
+"    * Grafische Auswertung zur Liquidität\n"
 "\n"
 "Die Buchführung für ein bestimmtes Geschäftsjahr erfolgt in Journalen "
 "(Chronologische Aufzeichung und sachliche Gruppierung zusammengehöriger "
-"Buchungssätze), für die Buchung von Belegen gibt es ein Modul namens "
-"account_voucher.\n"
+"Buchungssätze). Für die Buchung von einzelnen Belegen gibt es ein Modul "
+"namens account_voucher was zu diesem Zweck vorgesehen ist.\n"
 "    "
 
 #. module: base
@@ -2725,29 +2725,33 @@ msgid ""
 "    "
 msgstr ""
 "\n"
-"Leichtes Erfassen und bestätigen der Zeiterfassung und Anwesenheiten\n"
-"=========================================================\n"
+"Benutzerfreundliche Eingabe und Bestätigung von Anwesenheit und Arbeitszeit\n"
+"=================================================================\n"
 "\n"
-"Diese Anwendung liefert ein neues Fenster, das Ihnen ermöglicht, sowohl "
-"Anwesenheiten (Anmelden / Abmelden) und Ihre Arbeit Codierung "
-"(Zeiterfassung) im Zeitraum zu verwalten. Einträge für die Zeiterfassung "
-"werden durch die Mitarbeiter täglich gemacht. Am Ende des definierten "
-"Zeitraums, bestätigen die Mitarbeiter Zeiterfassung und der Vorgesetzte muss "
-"diese dann genehmigen. Die Perioden werden in bei der Firma durch Formulare "
-"definiert und können festgelegt werden auf monatlich oder wöchentlich "
-"Laufzeit.\n"
+"Diese Anwendung ermöglicht sowohl die Eingabe der täglichen Anwesenheit "
+"(Anmelden / Abmelden) als auch die Eingabe der geleisteten Arbeitszeit "
+"innerhalb eines bestimmten Zeitraums. Die Einträge für die Zeiterfassung "
+"erfolgen dabei durch die Mitarbeiter selbst. Am Ende des definierten "
+"Zeitraums, bestätigen zunächst die Mitarbeiter Ihre eingegebenen Zeiten, "
+"damit anschließend der Vorgesetzte diese Zeiteingabe genehmigen kann. Die "
+"Periodendauer wird als Firmeneinstellung definiert, \n"
+"wobei zwischen einer monatlichen oder wöchentlichen Laufzeit gewählt werden "
+"kann.\n"
 "\n"
-"Der komplette Validierungsprozess der Zeiterfassung:\n"
-"---------------------------------------------------------------------------\n"
-"* Entwurfs Datenblatt\n"
+"Wie sieht ein kompletter Vorgang für die Validierung der Zeiterfassung aus:\n"
+"-----------------------------------------------------------------------------"
+"-----------------------------------\n"
+"* Entwurfs Eingabeformular für die Arbeitszeit eines Mitarbeiters\n"
 "* Bestätigung am Ende des Zeitraums durch den Arbeitnehmer\n"
 "* Bestätigung durch den Projektmanager\n"
 "\n"
-"Die Bestätigung kann durch das Unternehmen konfiguriert werden:\n"
+"Die Bestätigung kann dabei durch die Firmeneinstellungen konfiguriert "
+"werden:\n"
 "-----------------------------------------------------------------------------"
-"----------------\n"
+"-------------------\n"
 "* Zeitraum (Tag, Woche, Monat)\n"
-"* Maximale Differenz zwischen Zeiterfassung und Anwesenheiten\n"
+"* Maximale Differenz zwischen erfassten Arbeitszeiten und  der errechneten "
+"Anwesenheitszeit\n"
 "    "
 
 #. module: base
@@ -3266,16 +3270,15 @@ msgstr ""
 "Verwaltet Angebote und Aufträge\n"
 "==================================\n"
 "\n"
-"Diese Anwendung ermöglicht ihnen die effektie und effiziente Verwaltung "
-"Ihrer Verkaufsziele mittels Verfolgung aller Ihrer Aufträge und Ihrer "
-"Historie.\n"
+"Diese Anwendung ermöglicht ihnen die effiziente Verwaltung Ihrer Ihrer "
+"Angebote und Aufträge mitsamt der Historie.\n"
 "\n"
-"Sie stellt den kompletten Verkaufsworkflow bereit:\n"
+"Folgendermassen sieht der einfache Verkaufsworkflow aus:\n"
 "\n"
-"* **Angebot**->**Auftrag**->**Rechnung**  \n"
+"Angebot->Auftrag->Rechnung \n"
 "\n"
 "Voreinstellungen (wenn das Lagerverwaltungsmodul installiert ist)\n"
-"------------------------------------------------------\n"
+"-----------------------------------------------------------\n"
 "\n"
 "Wenn Sie auch das Lagerverwaltungsmodul installiert haben, können Sie "
 "folgende Voreinstellungen verwalten:\n"
@@ -4317,35 +4320,37 @@ msgid ""
 "    "
 msgstr ""
 "\n"
-"Verwalten des Fertigungsprozesses in OpenERP\n"
-"======================================\n"
+"Management des Fertigungsprozesses in OpenERP\n"
+"==========================================\n"
 "\n"
 "Die Fertigungsanwendung ermöglicht es Ihnen die Planung, Bestellung, "
-"Lagererung und Fertigung oder Montage von Produkten von Rohstoffen und "
-"Komponenten abzudecken. Es verwaltet den Verbrauch und die Produktion an "
-"Hand einer Stückliste und die notwendigen Vorgänge an Maschinen, durch die "
-"Benutzung von Werkzeugen oder menschlicher Arbeitszeit anhand der angelegten "
-"Arbeitspläne.\n"
+"Lagererung und Fertigung oder Montage von Produkten mittels Beschaffung von "
+"Rohstoffen und Komponenten abzudecken. Das Modul verwaltet den Verbrauch und "
+"die Produktionsmeldungen an Hand einer Stückliste und der definierten "
+"notwendigen Vorgänge an Maschinen, speziellen Werkzeugen sowie der "
+"menschlichen Arbeitszeit anhand der hinterlegten Arbeitspläne.\n"
 "\n"
 "Die Anwendung unterstützt die vollständige Integration und Planbarkeit der "
-"lagerfähigen Waren, Verbrauchsmaterialien und Dienstleistungen. "
-"Dienstleistungen werden vollständig in den Rest der Software integriert. Zum "
-"Beispiel können Sie eine Untervergabe in einer Stückliste einrichten, um "
-"automatisch die Montage Ihrer Produktion zu erwerben. \n"
+"Lagerprodukte, Verbrauchsmaterialien und Dienstleistungen. Dienstleistungen "
+"sind dabei vollständig über andere Anwendungen integriert. Zum Beispiel "
+"können Sie eine Fremdvergabe von Tätigkeiten auch in einer Stückliste "
+"einrichten, um automatisch die externen Montageservices einzukaufen.\n"
 "\n"
-"Hauptmerkmale\n"
-"---------------------------\n"
+"Wesentliche Funktionen der Anwendung\n"
+"------------------------------------------------------------------\n"
 "* Lagerfertigung / Auftragsfertigung\n"
-"* Multi-Level Stückliste, keine Begrenzung\n"
-"* Multi-Level Arbeitsplan, keine Begrenzung\n"
-"* Arbeitsplan und Arbeitsplatz integriert in Kostenrechnung\n"
-"* regelmäßige Planungsberechnung\n"
-"* Durchsuchen von Stücklisten in einer kompletten Struktur, die Unter- und \n"
-"Phantom- Stücklisten beinhaltet\n"
+"* Multi-Level Stückliste, ohne Limitierung bei der Stücklistentiefe\n"
+"* Multi-Level Arbeitsplan, ohne Limitierung der Arbeitsplantiefe\n"
+"* Arbeitspläne und Arbeitsplatz sind vollständig integriert in die "
+"Kostenrechnung\n"
+"* regelmäßige Planungsberechnungen werden über Assistenten automatisch "
+"gestartet\n"
+"* Durchsuchen von Stücklisten innerhalb seiner kompletten Struktur, die "
+"Unter- und Phantom- Stücklisten beinhalten kann\n"
 "\n"
-"Die Statistik / Bericht für MPR beinhaltet folgende Auswertungen:\n"
+"Die Anzeigetafel / Berichtswesen beinhaltet folgende Auswertungen:\n"
 "-----------------------------------------------------------------------------"
-"-------------------------------\n"
+"--------------------------------\n"
 "* Beschaffungen Ausnahmefehler (Grafik)\n"
 "* Lagerbestand Entwicklung (Grafik)\n"
 "* Statistik der Fertigungsaufträge\n"
@@ -10232,36 +10237,39 @@ msgstr ""
 "Regelmäßige Mitarbeiter Bewertung und Beurteilungen\n"
 "=============================================\n"
 "\n"
-"Durch die Nutzung dieser Anwendung erhalten Sie den Motivationsprozess, "
-"indem Sie regelmäßige Auswertungen der Leistungsfähigkeit Ihrer Mitarbeiter "
-"durchführen. Von der regelmäßigen Beurteilung der personellen Ressourcen "
-"können sowohl Ihre Mitarbeiter als auch Ihr Unternehmen profitieren.  \n"
+"Durch die Nutzung dieser Anwendung erhalten Sie die erforderliche "
+"Hilfestellung, die Sie für regelmäßige Auswertungen der Leistungsfähigkeit "
+"Ihrer Mitarbeiter benötigen. Von der regelmäßigen Beurteilung der internen "
+"und externen Mitarbeiter können sowohl die Mitarbeiter als auch Ihr "
+"Unternehmen profitieren.  \n"
 "\n"
-"Eine Bewertungsplan kann jedem Mitarbeiter zugeordnet werden. Diese Pläne "
-"definieren die Häufigkeit und die Art und Weise, \n"
-"wie Sie Ihre regelmäßigen persönlichen Auswertungen verwalten. Sie werden in "
-"der Lage sein, Maßnahmen zu definieren und Fragebögen zu jedem Schritt "
-"anzuhängen. \n"
+"Eine Bewertungsplan kann hierzu jedem Mitarbeiter zugeordnet werden. Diese "
+"Pläne definieren die Häufigkeit und die Art und Weise, wie Sie Ihre "
+"regelmäßigen persönlichen Auswertungen verwalten. Sie werden in der Lage "
+"sein, Maßnahmen zur Personalentwicklung zu definieren und Fragebögen zu "
+"jedem einzelnen Schritt anzuhängen. \n"
 "\n"
-"Verwalten Sie mehrere Arten von Auswertungen: von unten nach oben, von oben "
-"nach unten, Selbsteinschätzungen und die abschließende Bewertung durch den "
-"Manager.\n"
+"Verwalten Sie dabei Mitarbeiterbewertungen in bi-direktionaler Weise: In der "
+"Mitarbeiterhierachie von unten nach oben, von oben nach unten, "
+"Selbsteinschätzungen, sowie die abschließende Bewertung durch den Manager "
+"oder Vorgesetzten.\n"
 "\n"
-"Hauptmerkmale\n"
-"------------\n"
-"* Möglichkeit Mitarbeiter Auswertungen zu erstellen.\n"
-"* Eine Auswertung kann von einem Mitarbeiter für die Untergeordneten, "
-"Junioren sowie seinem Manager erstellt werden.\n"
-"* Die Auswertung erfolgt nach einem Plan bei dem verschiedene Umfragen "
-"erzeugt werden können. Jede Umfrage kann von einer bestimmten "
+"Wesentliche Funktionen der Anwendung\n"
+"-------------------------------------------------\n"
+"* Möglichkeit Mitarbeiter Bewertungen zu erstellen.\n"
+"* Eine Bewertung kann dabei von einem Mitarbeiter für dessen untergeordnete "
+"Kollegen oder Auszubildende sowie seinem entgegengesetzt in Richtung seines "
+"vorgesetzten Managers erstellt werden.\n"
+"* Die Bewertung erfolgt nach einem definierten  Plan, bei dem verschiedene "
+"Umfragen erzeugt werden können. Jede Umfrage kann dabei von einer bestimmten "
 "Hierarchieebene der Mitarbeiter beantwortet werden. Die abschließende "
 "Überprüfung und Bewertung wird durch den Geschäftsführer durchgeführt.\n"
-"* Jede Bewertung, die von Mitarbeitern ausgefüllt wurde, kann in einem PDF-"
-"Formular angezeigt werden.\n"
+"* Jede Bewertung, die von Mitarbeitern ausgefüllt wurde, kann generell in "
+"einem PDF-Formular angezeigt werden.\n"
 "* Fragebögen werden automatisch von OpenERP entsprechend den "
-"Bewertungsplänen der Mitarbeiter generiert. Jeder Nutzer erhält automatisch "
-"E-Mails und Anfragen um eine periodische Bewertung seiner Kollegen "
-"durchzuführen.\n"
+"Bewertungsplänen der Mitarbeiter generiert. Jeder Nutzer erhält dadurch "
+"automatisch E-Mails und Anfragen, um in der Praxis eine periodische "
+"Bewertung seiner Kollegen durchzuführen.\n"
 
 #. module: base
 #: model:ir.ui.menu,name:base.menu_view_base_module_update
@@ -12752,18 +12760,20 @@ msgstr ""
 "Verwalten Sie Arbeitsplätze und den Einstellungsprozess\n"
 "==============================================\n"
 "\n"
-"Diese Anwendung ermöglicht Ihnen die leichte Verfolgung von Arbeitsplätzen, "
-"Stellenangeboten, Bewerbern,  Vorstellungsgesprächen,...\n"
+"Diese Anwendung ermöglicht Ihnen die Planung, Eingabe und Ihrer "
+"Arbeitsplätze und Stellenangebote, sowie die Rückverfolgung Ihrer Bewerber, "
+"Planung und Durchführung von  Vorstellungsgesprächen etc.\n"
 "\n"
-"Es ist in der E-Mail Schnittstellen integriert um automatisch gesendete E-"
-"Mails an <jobs@yourcompany.com> in der Liste der Bewerber abzuholen. Es ist "
-"auch in das System der Dokumentenverwaltung integriert, um in der Datenbank "
-"mit den Lebensläufe zu speichern und zu suchen und den Kandidaten zu finden, "
-"den Sie suchen. Ebenso ist es in die Anwendung mit den Umfragen integriert, "
-"um Ihnen die Möglichkeit zu bieten, Gespräche für verschiedene Arbeitsplätze "
-"zu definieren. \n"
-"Sie können die verschiedenen Phasen des Gespräches festlegen und einfach den "
-"Bewerber aus der Kanbanansicht bewerten.\n"
+"Die Anwendung ist vollständig in das E-Mail und Nachrichtensystem "
+"integriert, um automatisch und regelmässig gesendete E-Mails an "
+"<jobs@yourcompany.com> in die Liste der neuen Bewerber zu importieren. "
+"Ebenfalls ist diese Anwendung nahtlos in das System der Dokumentenverwaltung "
+"integriert, um in der Datenbank Lebensläufe zu speichern, sowie nach "
+"bestimmten Kandidaten zu suchen. Nicht zuletzt ist die Umfragen Anwendung "
+"komplett eingebunden, um Ihnen die Möglichkeit zu bieten, die Vorstellungs- "
+"oder Einstellungsgespräche für die verschiedene Arbeitsplätze zu definieren. "
+"Sie können sehr einfach die verschiedenen Phasen des Gespräches festlegen "
+"Ihre Bewerber dann aus der Kanbanansicht bewerten.\n"
 
 #. module: base
 #: field:ir.model.fields,model:0
@@ -14837,14 +14847,13 @@ msgid ""
 "    "
 msgstr ""
 "\n"
-"Management der Finanz- und Rechnungswesen der Vermögenswerte\n"
-"========================================================\n"
+"Management der Anlagenbuchhaltung\n"
+"================================\n"
 "\n"
-"Diese Anwendung verwaltet die Vermögenswerte von einem Unternehemen oder "
-"einer Person. Sie behält\n"
-"immer eine Übersicht über die Abschreibungen dieser Vermögenswerte. "
-"Weiterhin ermöglicht es die\n"
-"Bewegungen der Abschreibungslinien zu erstellen.\n"
+"Diese Anwendung verwaltet das Anlagevermögen Ihres Unternehmens. Sie können "
+"zu jeder Zeit eine Übersicht über die Abschreibungen Ihrer Vermögenswerte "
+"erhalten. Weiterhin ermöglicht es die Buchung von Abschreibungen für Ihre "
+"Buchhaltung.\n"
 "\n"
 "    "
 
@@ -17293,16 +17302,16 @@ msgid ""
 "    "
 msgstr ""
 "\n"
-"Allgemeines Abrechnungssystem.\n"
-"===========================\n"
+"Allgemeine Lohn- und Gehaltsabrechnung\n"
+"===================================\n"
 "\n"
-"    * Mitarbeiter Einzelheiten\n"
-"    * Mitarbeiter Verträge\n"
-"    * Pass basierder Vertrag\n"
-"    * Zuschläge / Abzüge\n"
-"    * Möglichkeit zur Konfiguration des Basic / Brutto / Netto Gehalts\n"
-"    * Mitarbeiter Gehaltsabrechnung\n"
-"    * Monatliche Abrechnung Auflistung\n"
+"    * Mitarbeiter Stammdaten\n"
+"    * Mitarbeiter Vertragsdaten\n"
+"    * Sozialversicherungsdaten\n"
+"    * Verwalten von Zuschlägen / Abzüge\n"
+"    * Möglichkeit zur Konfiguration des Grundlohns / Brutto- / Netto Gehalt\n"
+"    * Mitarbeiter Lohn- und Gehaltsabrechnung\n"
+"    * Monatliche Lohn- und Gehaltsabrechnung\n"
 "    * Integration mit der Urlaubsverwaltung\n"
 "    "
 
@@ -17864,23 +17873,23 @@ msgstr ""
 "=======================================================\n"
 "Das spezielle und einfach zu benutzende Fakturierungssystem in OpenERP "
 "ermöglicht Ihnen Ihre Buchhaltung zu verfolgen, sogar wenn Sie kein "
-"Buchhalter sind. Es bietet Ihnen einen einfachen Weg, Ihre Lieferanten- und "
-"Kundenangelegenheiten zu verfolgen. \n"
+"Buchhaltungsexperte sind. Es bietet Ihnen einen einfachen Weg, Ihre "
+"Lieferanten- und Kundenabrechnungen zu verfolgen. \n"
 "\n"
-"Sie können diese vereinfachte Buchhaltung verwenden, wenn Sie mit einem "
-"(externen) Buchhalter zusammenarbeiten, um Ihre Bücher zu führen und Sie "
-"dennoch den Überblick über Ihre Zahlungen behalten wollen. \n"
+"Sie können zum Beispiel diese vereinfachte Buchhaltung verwenden, wenn Sie "
+"mit einem (externen) Buchhalter zusammenarbeiten, der Ihre Bücher führt, Sie "
+"aber dennoch zeitnahe Ihre Zahlungen verfolgen möchtet. \n"
 "\n"
 "Das Fakturierungssystem beinhaltet Belege und Quittungen (ein einfacher Weg, "
 "um den Überblick über Verkäufe und Einkäufe zu behalten). Es ermöglicht "
-"Ihnen eine einfache Methode, um Zahlungen zu registrieren, ohne dass Sie "
-"komplett abstrakte Konten kodieren.\n"
+"Ihnen ebenfalls eine einfache Methode, um Zahlungen zu registrieren, ohne "
+"dass Sie dabei komplett abstrakte Konten kodieren.\n"
 "\n"
 "Diese Anwendung verwaltet:\n"
 "\n"
-"* Belege Einträge\n"
-"* Belege Eingänge (Verkäufe & Einkäufe)\n"
-"* Belege Zahlung (Kunden & Lieferanten)\n"
+"* Eingabe von Quittungen\n"
+"* Erfassung von Rechnungsbelegen (Verkäufe & Einkäufe)\n"
+"* Erfassung von Zahlungen (Kunden & Lieferanten)\n"
 "    "
 
 #. module: base
@@ -18156,32 +18165,32 @@ msgstr ""
 "\n"
 "Das Lager- und Bestandsmanagement basiert auf einer hierarchischen "
 "Lagerstruktur, von Lager bis zu Lagerplätzen.  Die\n"
-"doppelte Buchführung ermöglicht es Ihnen, sowohl Kunden und Lieferanten als "
-"auch Bestände der Fertigprodukte zu verwalten. \n"
+"doppelte Buchführung ermöglicht es Ihnen, sowohl Kunden- und "
+"Lieferantenlager als auch die Bestände der Fertigprodukte zu verwalten. \n"
 "\n"
-"OpenERP hat die Eigenschaft, Losgrößen- und Seriennummern zu verwalten, um "
-"die Rückverfolgbarkeit zu gewährleisten, die von der Mehrheit der "
-"Indstrieunternehmen auferlegt wird. \n"
+"OpenERP bietet die Möglichkeit, Losgrößen- und Seriennummern zu verwalten, "
+"um die vollständige Rückverfolgbarkeit zu gewährleisten, die für "
+"Industriebetriebe und andere Branchen zwingend erforderlich ist. \n"
 "\n"
-"Hauptmerkmale\n"
-"------------------------\n"
-"* Bewegungsverlauf und Planung\n"
+"Wesentliche Funktionen\n"
+"---------------------------------------\n"
+"* Historie und Planung von Lieferungen\n"
 "* Bestandsbewertung (Standard oder durchschnittlicher Preis,...) \n"
-"* Robustheit konfrontiert mit Inventurdifferenzen\n"
-"* Automatische Neuerungsregelungen\n"
+"* Nachvollziehbarkeit von Inventurdifferenzen\n"
+"* Automatische Wiederbeschaffung\n"
 "* Unterstützung für Barcodes\n"
 "* Schnelle Erkennung von Fehlern durch das System der doppelten Buchführung\n"
-"* Rückverfolgbarkeit (Flussaufwärts / Flussabwärts, Seriennummern, ...) \n"
+"* Rückverfolgbarkeit (Upstream/ Downstream, Seriennummern, ...) \n"
 "\n"
-"Die Übersicht / das Berichtswesen für die Lagerverwaltung enthält:\n"
+"Das Berichtswesen für die Lagerverwaltung beinhaltet:\n"
 "-----------------------------------------------------------------------------"
-"---------------------------------------\n"
+"-------------\n"
 "* Eingehende Produkte (Graphik)\n"
 "* Ausgehende Produkte (Graphik)\n"
 "* Bestellungen in Ausnahmefällen\n"
 "* Inventuranalyse\n"
-"* Letzte Produktvorräte\n"
-"* Bewegungsanalysen\n"
+"* Letzte Inventuren\n"
+"* Analyse der Lieferungen\n"
 "    "
 
 #. module: base
@@ -18313,24 +18322,22 @@ msgid ""
 "    "
 msgstr ""
 "\n"
-"Verfolgen Sie mehrstufige Projekte, Aufgaben, erledigte Arbeit für Aufgaben\n"
-"=====================================================\n"
-"\n"
+"Verfolgen Sie mehrstufige Projekte sowie neue, noch offene und erledigte "
+"Aufgaben. \n"
+"======================================================================\n"
 "Diese Anwendung ergmöglicht ein operatives Projektverwaltungssystem, um Ihre "
-"Aktivitäten in Aufgaben zu organisieren und die Arbeit zu planen, die zu "
-"machen ist, um die Aufgabe abzuschließen.\n"
+"Aktivitäten in Aufgaben zu organisieren und die Arbeit zu planen, die "
+"erforderlich ist, um die Aufgabe abzuschließen. \n"
 "\n"
-"Gantt-Diagramme geben Ihnen in einer graphischen Darstellung Ihre "
-"Projektpläne, sowie die Verfügbarkeit von Ressourcen und die "
-"Arbeitsbelastung. \n"
+"Gantt-Diagramme geben Ihnen dabei in einer graphischen Darstellung Ihre "
+"Projektpläne, sowie die Verfügbarkeit von Ressourcen und die zeitliche "
+"Arbeitsbelastung.\n"
 "\n"
 "Die Übersichten / das Berichtswesen für die Projektverwaltung enthält:\n"
-"-----------------------------------------------------------------------------"
-"----------------------------------------------\n"
-"* Meine Aufgaben\n"
-"* Offene Aufgaebn\n"
-"* Aufgabenanalyse\n"
-"* Summendurchfluss\n"
+" \tMeine Aufgaben\n"
+" \tOffene Aufgaben\n"
+" \tAufgabenanalyse\n"
+" \tErledigte Aufgaben\n"
 "    "
 
 #. module: base
diff --git a/openerp/addons/base/i18n/fr.po b/openerp/addons/base/i18n/fr.po
index 6150dd9ead6..8f906b7c04d 100644
--- a/openerp/addons/base/i18n/fr.po
+++ b/openerp/addons/base/i18n/fr.po
@@ -8,15 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-server\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2013-03-07 08:36+0000\n"
-"PO-Revision-Date: 2013-04-10 02:40+0000\n"
-"Last-Translator: Maxime Chambreuil (http://www.savoirfairelinux.com) "
-"<maxime.chambreuil@savoirfairelinux.com>\n"
+"PO-Revision-Date: 2013-04-23 13:12+0000\n"
+"Last-Translator: Christophe Chauvet - http://www.syleam.fr/ <Unknown>\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: 2013-04-11 14:43+0000\n"
-"X-Generator: Launchpad (build 16550)\n"
+"X-Launchpad-Export-Date: 2013-04-24 05:28+0000\n"
+"X-Generator: Launchpad (build 16580)\n"
 
 #. module: base
 #: model:ir.module.module,description:base.module_account_check_writing
@@ -4954,7 +4953,7 @@ msgstr "Nauru"
 #: code:addons/base/res/res_company.py:166
 #, python-format
 msgid "Reg"
-msgstr ""
+msgstr "Reg"
 
 #. module: base
 #: model:ir.model,name:base.model_ir_property
@@ -5641,7 +5640,7 @@ msgstr "Charger une traduction"
 #. module: base
 #: field:ir.module.module,latest_version:0
 msgid "Installed Version"
-msgstr ""
+msgstr "Version installée"
 
 #. module: base
 #: model:ir.module.module,description:base.module_account_test
@@ -5934,7 +5933,7 @@ msgstr ""
 #. module: base
 #: model:res.country,name:base.ps
 msgid "Palestinian Territory, Occupied"
-msgstr ""
+msgstr "Territoire palestinien, occupé"
 
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_l10n_ch
@@ -6111,7 +6110,7 @@ msgstr "Workflows"
 #. module: base
 #: model:ir.ui.menu,name:base.next_id_73
 msgid "Purchase"
-msgstr ""
+msgstr "Achat"
 
 #. module: base
 #: selection:base.language.install,lang:0
@@ -6152,7 +6151,7 @@ msgstr "L'objet de la base de données auquel cet attachement sera attaché"
 #: code:addons/base/ir/ir_fields.py:327
 #, python-format
 msgid "name"
-msgstr ""
+msgstr "nom"
 
 #. module: base
 #: model:ir.module.module,description:base.module_mrp_operations
@@ -6227,7 +6226,7 @@ msgstr "Ignorer"
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_event_sale
 msgid "Events Sales"
-msgstr ""
+msgstr "Événements des ventes"
 
 #. module: base
 #: model:res.country,name:base.ls
@@ -6304,7 +6303,7 @@ msgstr "Mettre NULL"
 #. module: base
 #: view:res.users:0
 msgid "Save"
-msgstr ""
+msgstr "Sauvegarder"
 
 #. module: base
 #: field:ir.actions.report.xml,report_xml:0
@@ -6515,7 +6514,7 @@ msgstr "Taux"
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_email_template
 msgid "Email Templates"
-msgstr ""
+msgstr "Modèles de courriels"
 
 #. module: base
 #: model:res.country,name:base.sy
@@ -7052,7 +7051,7 @@ msgstr "Configuration de la précision décimale"
 #: model:ir.model,name:base.model_ir_actions_act_url
 #: selection:ir.ui.menu,action:0
 msgid "ir.actions.act_url"
-msgstr ""
+msgstr "ir.actions.act_url"
 
 #. module: base
 #: model:ir.ui.menu,name:base.menu_translation_app
@@ -7309,7 +7308,7 @@ msgstr "titre"
 #: code:addons/base/ir/ir_fields.py:146
 #, python-format
 msgid "true"
-msgstr ""
+msgstr "vrai"
 
 #. module: base
 #: model:ir.model,name:base.model_base_language_install
@@ -7319,7 +7318,7 @@ msgstr "Installation de langue"
 #. module: base
 #: model:res.partner.category,name:base.res_partner_category_11
 msgid "Services"
-msgstr ""
+msgstr "Services"
 
 #. module: base
 #: view:ir.translation:0
@@ -7459,7 +7458,7 @@ msgstr ""
 #: code:addons/base/ir/workflow/workflow.py:99
 #, python-format
 msgid "Operation forbidden"
-msgstr ""
+msgstr "Opération interdite"
 
 #. module: base
 #: view:ir.actions.server:0
@@ -7595,7 +7594,7 @@ msgstr "Sans catégorie"
 #. module: base
 #: view:res.partner:0
 msgid "Phone:"
-msgstr ""
+msgstr "Téléphone:"
 
 #. module: base
 #: field:res.partner,is_company:0
@@ -8149,12 +8148,12 @@ msgstr "ir.cron"
 #. module: base
 #: model:ir.ui.menu,name:base.menu_sales_followup
 msgid "Payment Follow-up"
-msgstr ""
+msgstr "Relance de paiement"
 
 #. module: base
 #: model:res.country,name:base.cw
 msgid "Curaçao"
-msgstr ""
+msgstr "Curaçao"
 
 #. module: base
 #: view:ir.sequence:0

From e6902869edf7f45f403fccdea985a0b9b066e65e Mon Sep 17 00:00:00 2001
From: niv-openerp <nicolas.vanhoren@openerp.com>
Date: Wed, 24 Apr 2013 09:46:38 +0200
Subject: [PATCH 104/121] [FIX] pad: regression that caused a stack trace

bzr revid: nicolas.vanhoren@openerp.com-20130424074638-aq3o08v7z9j1asz0
---
 addons/pad/static/src/js/pad.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/addons/pad/static/src/js/pad.js b/addons/pad/static/src/js/pad.js
index 1a2de41745b..ba5ee3a3037 100644
--- a/addons/pad/static/src/js/pad.js
+++ b/addons/pad/static/src/js/pad.js
@@ -9,6 +9,7 @@ openerp.pad = function(instance) {
             this.on("change:configured", this, this.switch_configured);
         },
         initialize_content: function() {
+            var self = this;
             this.switch_configured();
             this.$('.oe_pad_switch').click(function() {
                 self.$el.toggleClass('oe_pad_fullscreen');

From 616f705ef9dfce3616f220c9d1ab9e99684ff093 Mon Sep 17 00:00:00 2001
From: niv-openerp <nicolas.vanhoren@openerp.com>
Date: Wed, 24 Apr 2013 09:54:06 +0200
Subject: [PATCH 105/121] [FIX] pad: display problem due to wrong css selectors

bzr revid: nicolas.vanhoren@openerp.com-20130424075406-eemkxc7eyyvgiywi
---
 addons/pad/static/src/css/etherpad.css | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/addons/pad/static/src/css/etherpad.css b/addons/pad/static/src/css/etherpad.css
index ad47be32b02..a0002ebe97c 100644
--- a/addons/pad/static/src/css/etherpad.css
+++ b/addons/pad/static/src/css/etherpad.css
@@ -43,7 +43,7 @@
     z-index: 1000;
 }
 
-.oe_pad.oe_configured .oe_pad_content.oe_editing{
+.oe_pad .oe_pad_content.oe_editing{
     border: solid 1px #c4c4c4;
     height:500px;
     -webkit-box-shadow: 0 5px 10px rgba(0,0,0,0.1);
@@ -53,7 +53,7 @@
             box-shadow: 0 5px 10px rgba(0,0,0,0.1);
 }
 
-.oe_pad.oe_configured.oe_pad_fullscreen .oe_pad_content {
+.oe_pad.oe_pad_fullscreen .oe_pad_content {
     height: 100%;
     border: none;
     -webkit-box-shadow: none;
@@ -63,7 +63,7 @@
             box-shadow: none;
 }
 
-.oe_pad.oe_unconfigured > p {
+.oe_pad .oe_unconfigured {
     text-align: center;
     opacity: 0.75;
 }

From 2b89c192f2c76d103aa5bbad1bbc54760e0ae507 Mon Sep 17 00:00:00 2001
From: "Quentin (OpenERP)" <qdp-launchpad@openerp.com>
Date: Wed, 24 Apr 2013 11:23:26 +0200
Subject: [PATCH 106/121] [REV] revert of commit 9058, that was not appropriate
 for a stable version (again). :-s

bzr revid: qdp-launchpad@openerp.com-20130424092326-tec7siywgg4pbfu4
---
 addons/hr_timesheet/hr_timesheet.py | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/addons/hr_timesheet/hr_timesheet.py b/addons/hr_timesheet/hr_timesheet.py
index 461507f9e41..6a538e5d09c 100644
--- a/addons/hr_timesheet/hr_timesheet.py
+++ b/addons/hr_timesheet/hr_timesheet.py
@@ -37,8 +37,8 @@ class hr_employee(osv.osv):
     def _getAnalyticJournal(self, cr, uid, context=None):
         md = self.pool.get('ir.model.data')
         try:
-            dummy, res_id = md.check_object_reference(cr, uid, 'hr_timesheet', 'analytic_journal')
-            return res_id
+            result = md.get_object_reference(cr, uid, 'hr_timesheet', 'analytic_journal')
+            return result[1]
         except ValueError:
             pass
         return False
@@ -46,8 +46,8 @@ class hr_employee(osv.osv):
     def _getEmployeeProduct(self, cr, uid, context=None):
         md = self.pool.get('ir.model.data')
         try:
-            dummy, res_id = md.check_object_reference(cr, uid, 'product', 'product_product_consultant')
-            return res_id
+            result = md.get_object_reference(cr, uid, 'product', 'product_product_consultant')
+            return result[1]
         except ValueError:
             pass
         return False

From 01a3c6718306fe73e949d01ec6d2a7ba615693d5 Mon Sep 17 00:00:00 2001
From: "Quentin (OpenERP)" <qdp-launchpad@openerp.com>
Date: Wed, 24 Apr 2013 11:34:03 +0200
Subject: [PATCH 107/121] [REV] revert of commit 4953 that was not appropriate
 for a stable version. Will be back in trunk

bzr revid: qdp-launchpad@openerp.com-20130424093403-9dk8yap427kbndzi
---
 openerp/addons/base/ir/ir_model.py | 11 -----------
 1 file changed, 11 deletions(-)

diff --git a/openerp/addons/base/ir/ir_model.py b/openerp/addons/base/ir/ir_model.py
index 6edb5a70d0a..9e7697c1bbb 100644
--- a/openerp/addons/base/ir/ir_model.py
+++ b/openerp/addons/base/ir/ir_model.py
@@ -866,22 +866,11 @@ class ir_model_data(osv.osv):
     def get_object_reference(self, cr, uid, module, xml_id):
         """Returns (model, res_id) corresponding to a given module and xml_id (cached) or raise ValueError if not found"""
         data_id = self._get_id(cr, uid, module, xml_id)
-        #assuming data_id is not False, as it was checked upstream
         res = self.read(cr, uid, data_id, ['model', 'res_id'])
         if not res['res_id']:
             raise ValueError('No such external ID currently defined in the system: %s.%s' % (module, xml_id))
         return res['model'], res['res_id']
 
-    def check_object_reference(self, cr, uid, module, xml_id):
-        """Returns (model, res_id) corresponding to a given module and xml_id (cached), if and only if the user has the necessary access rights
-        to see that object, otherwise raise ValueError"""
-        model, res_id = self.get_object_reference(cr, uid, module, xml_id)
-        #search on id found in result to check if current user has read access right
-        check_right = self.pool.get(model).search(cr, uid, [('id', '=', res_id)])
-        if check_right:
-            return model, res_id
-        raise ValueError('Not enough access rights on the external ID: %s.%s' % (module, xml_id))
-
     def get_object(self, cr, uid, module, xml_id, context=None):
         """Returns a browsable record for the given module name and xml_id or raise ValueError if not found"""
         res_model, res_id = self.get_object_reference(cr, uid, module, xml_id)

From e18a85f261d0c4b863f5ab300e84984374422954 Mon Sep 17 00:00:00 2001
From: "Vishmita Jadeja (openerp)" <vja@tinyerp.com>
Date: Wed, 24 Apr 2013 18:04:25 +0530
Subject: [PATCH 108/121] [IMP]False return when there is no email address in
 recipient in chatter

bzr revid: vja@tinyerp.com-20130424123425-jo6i7jg8albrbhi2
---
 addons/mail/static/src/xml/mail.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/mail/static/src/xml/mail.xml b/addons/mail/static/src/xml/mail.xml
index 7e7d772397a..e969aebe4ac 100644
--- a/addons/mail/static/src/xml/mail.xml
+++ b/addons/mail/static/src/xml/mail.xml
@@ -144,7 +144,7 @@
             <t t-foreach='widget.recipients' t-as='recipient'>
                 <label t-attf-title="Add as recipient and follower (reason: #{recipient.reason})">
                     <input type="checkbox" t-att-checked="recipient.checked ? 'checked' : undefined" t-att-data="recipient.email_address"/>
-                    <t t-raw="recipient.name"/> (<t t-raw="recipient.email_address"/>)
+                    <t t-raw="recipient.name"/> <t t-if="recipient.email_address">(<t t-raw="recipient.email_address"/>)</t>
                 </label>
             </t>
         </div>

From 217835114508c3d2a30e8327d5554020a9a789ba Mon Sep 17 00:00:00 2001
From: "Vishmita Jadeja (openerp)" <vja@tinyerp.com>
Date: Wed, 24 Apr 2013 18:42:41 +0530
Subject: [PATCH 109/121] [IMP]Improve code

bzr revid: vja@tinyerp.com-20130424131241-m9katp6tlbbnr9kd
---
 addons/mail/static/src/xml/mail.xml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/addons/mail/static/src/xml/mail.xml b/addons/mail/static/src/xml/mail.xml
index e969aebe4ac..ab82d650f30 100644
--- a/addons/mail/static/src/xml/mail.xml
+++ b/addons/mail/static/src/xml/mail.xml
@@ -144,7 +144,9 @@
             <t t-foreach='widget.recipients' t-as='recipient'>
                 <label t-attf-title="Add as recipient and follower (reason: #{recipient.reason})">
                     <input type="checkbox" t-att-checked="recipient.checked ? 'checked' : undefined" t-att-data="recipient.email_address"/>
-                    <t t-raw="recipient.name"/> <t t-if="recipient.email_address">(<t t-raw="recipient.email_address"/>)</t>
+                    <t t-raw="recipient.name"/> 
+                    <t t-if="recipient.email_address">(<t t-raw="recipient.email_address"/>)</t>
+                    <t t-if="!recipient.email_address">(no email address)</t>
                 </label>
             </t>
         </div>

From 0ee404c05470098043eace3167bdf9b9e2a0fd2f Mon Sep 17 00:00:00 2001
From: Olivier Dony <odo@openerp.com>
Date: Wed, 24 Apr 2013 15:16:25 +0200
Subject: [PATCH 110/121] [FIX] res.partner: always call write() with a list of
 IDs, a single ID is not valid! (even if it works sometimes)

bzr revid: odo@openerp.com-20130424131625-aeljtyo5yuiyrlcz
---
 openerp/addons/base/res/res_company.py | 2 +-
 openerp/addons/base/res/res_partner.py | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/openerp/addons/base/res/res_company.py b/openerp/addons/base/res/res_company.py
index c8ea8d7856e..cd17f6da3d9 100644
--- a/openerp/addons/base/res/res_company.py
+++ b/openerp/addons/base/res/res_company.py
@@ -253,7 +253,7 @@ class res_company(osv.osv):
         vals.update({'partner_id': partner_id})
         self.cache_restart(cr)
         company_id = super(res_company, self).create(cr, uid, vals, context=context)
-        obj_partner.write(cr, uid, partner_id, {'company_id': company_id}, context=context)
+        obj_partner.write(cr, uid, [partner_id], {'company_id': company_id}, context=context)
         return company_id
 
     def write(self, cr, uid, ids, values, context=None):
diff --git a/openerp/addons/base/res/res_partner.py b/openerp/addons/base/res/res_partner.py
index 2637b922f8c..7bd7587a8d9 100644
--- a/openerp/addons/base/res/res_partner.py
+++ b/openerp/addons/base/res/res_partner.py
@@ -433,7 +433,7 @@ class res_partner(osv.osv, format_address):
             commercial_fields = self._commercial_fields(cr, uid, context=context)
             sync_vals = self._update_fields_values(cr, uid, partner.commercial_partner_id,
                                                         commercial_fields, context=context)
-            return self.write(cr, uid, partner.id, sync_vals, context=context)
+            partner.write(sync_vals)
 
     def _commercial_sync_to_children(self, cr, uid, partner, context=None):
         """ Handle sync of commercial fields to descendants """
@@ -459,7 +459,7 @@ class res_partner(osv.osv, format_address):
                                                       use_parent_address=partner.use_parent_address,
                                                       parent_id=partner.parent_id.id,
                                                       context=context).get('value', {})
-                self.update_address(cr, uid, partner.id, onchange_vals, context=context)
+                partner.update_address(onchange_vals)
 
         # 2. To DOWNSTREAM: sync children 
         if partner.child_ids:

From 83fb6fbf02622ca12d9ac639a835526504b05e9c Mon Sep 17 00:00:00 2001
From: Launchpad Translations on behalf of openerp <>
Date: Thu, 25 Apr 2013 06:06:09 +0000
Subject: [PATCH 111/121] Launchpad automatic translations update.

bzr revid: launchpad_translations_on_behalf_of_openerp-20130425060541-r1eqpc1djb3vy953
bzr revid: launchpad_translations_on_behalf_of_openerp-20130425060609-9otf0125cci1hjvi
---
 addons/account/i18n/es_MX.po         |    8 +-
 addons/account_accountant/i18n/lt.po |   10 +-
 addons/account_cancel/i18n/lt.po     |   10 +-
 addons/auth_crypt/i18n/lt.po         |   28 +
 addons/auth_oauth_signup/i18n/lt.po  |   23 +
 addons/base_calendar/i18n/es_MX.po   | 1563 ++++++++++++--------------
 addons/contacts/i18n/lt.po           |   45 +
 addons/decimal_precision/i18n/lt.po  |   12 +-
 addons/delivery/i18n/nl.po           |    8 +-
 addons/hr_timesheet_sheet/i18n/it.po |   45 +-
 addons/mrp/i18n/nl.po                |    8 +-
 addons/note_pad/i18n/lt.po           |   28 +
 addons/pad_project/i18n/lt.po        |   39 +
 addons/plugin/i18n/lt.po             |   23 +
 addons/portal_anonymous/i18n/lt.po   |   25 +
 addons/portal_sale/i18n/fr.po        |  222 +++-
 addons/sale/i18n/tr.po               |   10 +-
 addons/stock/i18n/pt_BR.po           |    2 +-
 addons/web_shortcuts/i18n/lt.po      |   25 +
 openerp/addons/base/i18n/de.po       |   77 +-
 openerp/addons/base/i18n/tr.po       |   62 +-
 21 files changed, 1333 insertions(+), 940 deletions(-)
 create mode 100644 addons/auth_crypt/i18n/lt.po
 create mode 100644 addons/auth_oauth_signup/i18n/lt.po
 create mode 100644 addons/contacts/i18n/lt.po
 create mode 100644 addons/note_pad/i18n/lt.po
 create mode 100644 addons/pad_project/i18n/lt.po
 create mode 100644 addons/plugin/i18n/lt.po
 create mode 100644 addons/portal_anonymous/i18n/lt.po
 create mode 100644 addons/web_shortcuts/i18n/lt.po

diff --git a/addons/account/i18n/es_MX.po b/addons/account/i18n/es_MX.po
index bf5d970bd61..dbf386fa704 100644
--- a/addons/account/i18n/es_MX.po
+++ b/addons/account/i18n/es_MX.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2013-03-07 08:37+0000\n"
-"PO-Revision-Date: 2013-03-26 18:06+0000\n"
+"PO-Revision-Date: 2013-04-25 00:10+0000\n"
 "Last-Translator: Antonio Fregoso <antonio.fregoso.mx@gmail.com>\n"
 "Language-Team: Spanish (Mexico) <es_MX@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: 2013-03-28 05:27+0000\n"
-"X-Generator: Launchpad (build 16546)\n"
+"X-Launchpad-Export-Date: 2013-04-25 06:05+0000\n"
+"X-Generator: Launchpad (build 16580)\n"
 
 #. module: account
 #: model:process.transition,name:account.process_transition_supplierreconcilepaid0
@@ -4987,7 +4987,7 @@ msgstr ""
 #: model:account.account.type,name:account.conf_account_type_chk
 #: selection:account.bank.accounts.wizard,account_type:0
 msgid "Check"
-msgstr ""
+msgstr "Cheque"
 
 #. module: account
 #: view:account.aged.trial.balance:0
diff --git a/addons/account_accountant/i18n/lt.po b/addons/account_accountant/i18n/lt.po
index df1844b3347..e105a419419 100644
--- a/addons/account_accountant/i18n/lt.po
+++ b/addons/account_accountant/i18n/lt.po
@@ -8,16 +8,16 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2013-03-07 08:37+0000\n"
-"PO-Revision-Date: 2012-12-21 23:00+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"PO-Revision-Date: 2013-04-24 18:15+0000\n"
+"Last-Translator: Giedrius Slavinskas - inovera.lt <giedrius@inovera.lt>\n"
 "Language-Team: Lithuanian <lt@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: 2013-03-28 05:28+0000\n"
-"X-Generator: Launchpad (build 16546)\n"
+"X-Launchpad-Export-Date: 2013-04-25 06:05+0000\n"
+"X-Generator: Launchpad (build 16580)\n"
 
 #. module: account_accountant
 #: model:ir.actions.client,name:account_accountant.action_client_account_menu
 msgid "Open Accounting Menu"
-msgstr ""
+msgstr "Atverti apskaitos meniu"
diff --git a/addons/account_cancel/i18n/lt.po b/addons/account_cancel/i18n/lt.po
index b081d88d9ff..704123202c6 100644
--- a/addons/account_cancel/i18n/lt.po
+++ b/addons/account_cancel/i18n/lt.po
@@ -8,19 +8,19 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2013-03-07 08:37+0000\n"
-"PO-Revision-Date: 2012-12-21 23:00+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"PO-Revision-Date: 2013-04-24 18:25+0000\n"
+"Last-Translator: Giedrius Slavinskas - inovera.lt <giedrius@inovera.lt>\n"
 "Language-Team: Lithuanian <lt@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: 2013-03-28 05:29+0000\n"
-"X-Generator: Launchpad (build 16546)\n"
+"X-Launchpad-Export-Date: 2013-04-25 06:05+0000\n"
+"X-Generator: Launchpad (build 16580)\n"
 
 #. module: account_cancel
 #: view:account.invoice:0
 msgid "Cancel Invoice"
-msgstr ""
+msgstr "Atšaukti sąskaita-faktūrą"
 
 #~ msgid "Cancel"
 #~ msgstr "Atšaukti"
diff --git a/addons/auth_crypt/i18n/lt.po b/addons/auth_crypt/i18n/lt.po
new file mode 100644
index 00000000000..38b74cd4290
--- /dev/null
+++ b/addons/auth_crypt/i18n/lt.po
@@ -0,0 +1,28 @@
+# Lithuanian translation for openobject-addons
+# Copyright (c) 2013 Rosetta Contributors and Canonical Ltd 2013
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2013.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2013-03-07 08:37+0000\n"
+"PO-Revision-Date: 2013-04-24 18:24+0000\n"
+"Last-Translator: Giedrius Slavinskas - inovera.lt <giedrius@inovera.lt>\n"
+"Language-Team: Lithuanian <lt@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: 2013-04-25 06:05+0000\n"
+"X-Generator: Launchpad (build 16580)\n"
+
+#. module: auth_crypt
+#: field:res.users,password_crypt:0
+msgid "Encrypted Password"
+msgstr "Užšifruotas slaptažodis"
+
+#. module: auth_crypt
+#: model:ir.model,name:auth_crypt.model_res_users
+msgid "Users"
+msgstr "Naudotojai"
diff --git a/addons/auth_oauth_signup/i18n/lt.po b/addons/auth_oauth_signup/i18n/lt.po
new file mode 100644
index 00000000000..f62272fe46d
--- /dev/null
+++ b/addons/auth_oauth_signup/i18n/lt.po
@@ -0,0 +1,23 @@
+# Lithuanian translation for openobject-addons
+# Copyright (c) 2013 Rosetta Contributors and Canonical Ltd 2013
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2013.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2013-03-07 08:37+0000\n"
+"PO-Revision-Date: 2013-04-24 18:21+0000\n"
+"Last-Translator: Giedrius Slavinskas - inovera.lt <giedrius@inovera.lt>\n"
+"Language-Team: Lithuanian <lt@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: 2013-04-25 06:05+0000\n"
+"X-Generator: Launchpad (build 16580)\n"
+
+#. module: auth_oauth_signup
+#: model:ir.model,name:auth_oauth_signup.model_res_users
+msgid "Users"
+msgstr "Naudotojai"
diff --git a/addons/base_calendar/i18n/es_MX.po b/addons/base_calendar/i18n/es_MX.po
index fcb00c6d478..15aace97c60 100644
--- a/addons/base_calendar/i18n/es_MX.po
+++ b/addons/base_calendar/i18n/es_MX.po
@@ -1,929 +1,879 @@
-# Spanish translation for openobject-addons
-# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010
+# Spanish (Mexico) translation for openobject-addons
+# Copyright (c) 2013 Rosetta Contributors and Canonical Ltd 2013
 # This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2010.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2013.
 #
 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: 2011-01-18 01:17+0000\n"
-"Last-Translator: Jordi Esteve (www.zikzakmedia.com) "
-"<jesteve@zikzakmedia.com>\n"
-"Language-Team: Spanish <es@li.org>\n"
+"POT-Creation-Date: 2013-03-07 08:37+0000\n"
+"PO-Revision-Date: 2013-04-24 15:25+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Spanish (Mexico) <es_MX@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: 2011-09-05 05:52+0000\n"
-"X-Generator: Launchpad (build 13830)\n"
+"X-Launchpad-Export-Date: 2013-04-25 06:05+0000\n"
+"X-Generator: Launchpad (build 16580)\n"
 
 #. module: base_calendar
 #: selection:calendar.alarm,trigger_related:0
 #: selection:res.alarm,trigger_related:0
 msgid "The event starts"
-msgstr "El evento comienza"
+msgstr ""
 
 #. module: base_calendar
-#: selection:base.calendar.set.exrule,freq:0
-msgid "Hourly"
-msgstr "Cada hora"
-
-#. module: base_calendar
-#: view:calendar.attendee:0
-msgid "Required to Join"
-msgstr "Requerido para unirse"
+#: view:calendar.event:0
+msgid "My Events"
+msgstr ""
 
 #. module: base_calendar
 #: help:calendar.event,exdate:0
 #: help:calendar.todo,exdate:0
+#: help:crm.meeting,exdate:0
 msgid ""
 "This property defines the list of date/time exceptions for a recurring "
 "calendar component."
 msgstr ""
-"Esta propiedad define la lista de excepciones de fecha/hora para un evento "
-"de calendario recurrente."
 
 #. module: base_calendar
-#: constraint:res.users:0
-msgid "The chosen company is not in the allowed companies for this user"
-msgstr ""
-"La compañía seleccionada no está en las compañías permitidas para este "
-"usuario"
-
-#. module: base_calendar
-#: field:calendar.event.edit.all,name:0
-msgid "Title"
-msgstr "Título"
-
-#. module: base_calendar
-#: selection:base.calendar.set.exrule,freq:0
 #: selection:calendar.event,rrule_type:0
 #: selection:calendar.todo,rrule_type:0
-msgid "Monthly"
-msgstr "Mensual"
+#: selection:crm.meeting,rrule_type:0
+msgid "Week(s)"
+msgstr ""
 
 #. module: base_calendar
-#: view:calendar.attendee:0
-msgid "Invited User"
-msgstr "Usuario invitado"
+#: field:calendar.event,we:0
+#: field:calendar.todo,we:0
+#: field:crm.meeting,we:0
+msgid "Wed"
+msgstr ""
 
 #. module: base_calendar
-#: view:calendar.attendee:0
-msgid "Invitation"
-msgstr "Invitación"
+#: selection:calendar.attendee,cutype:0
+msgid "Unknown"
+msgstr ""
 
 #. module: base_calendar
 #: help:calendar.event,recurrency:0
 #: help:calendar.todo,recurrency:0
+#: help:crm.meeting,recurrency:0
 msgid "Recurrent Meeting"
-msgstr "Reunión periódica"
+msgstr ""
+
+#. module: base_calendar
+#: model:crm.meeting.type,name:base_calendar.categ_meet5
+msgid "Feedback Meeting"
+msgstr ""
 
 #. module: base_calendar
 #: model:ir.actions.act_window,name:base_calendar.action_res_alarm_view
 #: model:ir.ui.menu,name:base_calendar.menu_crm_meeting_avail_alarm
 msgid "Alarms"
-msgstr "Alarmas"
+msgstr ""
 
 #. module: base_calendar
-#: selection:base.calendar.set.exrule,week_list:0
 #: selection:calendar.event,week_list:0
 #: selection:calendar.todo,week_list:0
+#: selection:crm.meeting,week_list:0
 msgid "Sunday"
-msgstr "Domingo"
+msgstr ""
 
 #. module: base_calendar
-#: view:calendar.attendee:0
 #: field:calendar.attendee,role:0
 msgid "Role"
-msgstr "Rol"
+msgstr ""
 
 #. module: base_calendar
-#: view:calendar.attendee:0
 #: view:calendar.event:0
+#: view:crm.meeting:0
 msgid "Invitation details"
-msgstr "Detalles de la invitación"
+msgstr ""
 
 #. module: base_calendar
-#: selection:base.calendar.set.exrule,byday:0
 #: selection:calendar.event,byday:0
 #: selection:calendar.todo,byday:0
+#: selection:crm.meeting,byday:0
 msgid "Fourth"
-msgstr "Cuarto"
+msgstr ""
 
 #. module: base_calendar
-#: field:calendar.event,show_as:0
-#: field:calendar.todo,show_as:0
-msgid "Show as"
-msgstr "Mostrar como"
-
-#. module: base_calendar
-#: field:base.calendar.set.exrule,day:0
-#: selection:base.calendar.set.exrule,select1:0
 #: field:calendar.event,day:0
 #: selection:calendar.event,select1:0
 #: field:calendar.todo,day:0
 #: selection:calendar.todo,select1:0
+#: field:crm.meeting,day:0
+#: selection:crm.meeting,select1:0
 msgid "Date of month"
-msgstr "Día del mes"
+msgstr ""
 
 #. module: base_calendar
 #: selection:calendar.event,class:0
 #: selection:calendar.todo,class:0
+#: selection:crm.meeting,class:0
 msgid "Public"
-msgstr "Público"
+msgstr ""
 
 #. module: base_calendar
-#: view:calendar.event:0
-msgid " "
-msgstr " "
+#: selection:calendar.alarm,trigger_interval:0
+#: selection:res.alarm,trigger_interval:0
+msgid "Hours"
+msgstr ""
 
 #. module: base_calendar
-#: selection:base.calendar.set.exrule,month_list:0
 #: selection:calendar.event,month_list:0
 #: selection:calendar.todo,month_list:0
+#: selection:crm.meeting,month_list:0
 msgid "March"
-msgstr "Marzo"
+msgstr ""
 
 #. module: base_calendar
-#: code:addons/base_calendar/base_calendar.py:414
-#: code:addons/base_calendar/wizard/base_calendar_set_exrule.py:90
-#, python-format
-msgid "Warning !"
-msgstr "¡Aviso!"
+#: help:calendar.attendee,cutype:0
+msgid "Specify the type of Invitation"
+msgstr ""
+
+#. module: base_calendar
+#: view:crm.meeting:0
+#: field:crm.meeting,message_unread:0
+msgid "Unread Messages"
+msgstr ""
 
 #. module: base_calendar
-#: selection:base.calendar.set.exrule,week_list:0
 #: selection:calendar.event,week_list:0
 #: selection:calendar.todo,week_list:0
+#: selection:crm.meeting,week_list:0
 msgid "Friday"
-msgstr "Viernes"
+msgstr ""
 
 #. module: base_calendar
 #: field:calendar.event,allday:0
 #: field:calendar.todo,allday:0
+#: field:crm.meeting,allday:0
 msgid "All Day"
-msgstr "Todo el día"
+msgstr ""
 
 #. module: base_calendar
-#: field:base.calendar.set.exrule,select1:0
-#: field:calendar.event,select1:0
-#: field:calendar.todo,select1:0
-msgid "Option"
-msgstr "Opción"
+#: field:calendar.event,vtimezone:0
+#: field:calendar.todo,vtimezone:0
+#: field:crm.meeting,vtimezone:0
+msgid "Timezone"
+msgstr ""
 
 #. module: base_calendar
 #: selection:calendar.attendee,availability:0
 #: selection:calendar.event,show_as:0
 #: selection:calendar.todo,show_as:0
-#: selection:res.users,availability:0
+#: selection:crm.meeting,show_as:0
 msgid "Free"
-msgstr "Libre"
+msgstr ""
+
+#. module: base_calendar
+#: help:crm.meeting,message_unread:0
+msgid "If checked new messages require your attention."
+msgstr ""
 
 #. module: base_calendar
 #: help:calendar.attendee,rsvp:0
 msgid "Indicats whether the favor of a reply is requested"
-msgstr "Indica si es requerida la confirmación de una respuesta."
+msgstr ""
 
 #. module: base_calendar
-#: model:ir.model,name:base_calendar.model_ir_attachment
-msgid "ir.attachment"
-msgstr "ir.adjunto"
+#: field:calendar.alarm,alarm_id:0
+msgid "Basic Alarm"
+msgstr ""
 
 #. module: base_calendar
 #: help:calendar.attendee,delegated_to:0
 msgid "The users that the original request was delegated to"
-msgstr "Los usuarios a los que les fue delegado la petición original"
+msgstr ""
 
 #. module: base_calendar
 #: field:calendar.attendee,ref:0
 msgid "Event Ref"
-msgstr "Ref. evento"
+msgstr ""
 
 #. module: base_calendar
-#: field:base.calendar.set.exrule,we:0
-#: field:calendar.event,we:0
-#: field:calendar.todo,we:0
-msgid "Wed"
-msgstr "Mié"
-
-#. module: base_calendar
-#: view:calendar.event:0
-msgid "Show Time as"
-msgstr "Mostrar hora como"
-
-#. module: base_calendar
-#: field:base.calendar.set.exrule,tu:0
 #: field:calendar.event,tu:0
 #: field:calendar.todo,tu:0
+#: field:crm.meeting,tu:0
 msgid "Tue"
-msgstr "Mar"
+msgstr ""
 
 #. module: base_calendar
-#: selection:base.calendar.set.exrule,freq:0
-#: selection:calendar.event,rrule_type:0
-#: selection:calendar.todo,rrule_type:0
-msgid "Yearly"
-msgstr "Anualmente"
+#: selection:calendar.event,byday:0
+#: selection:calendar.todo,byday:0
+#: selection:crm.meeting,byday:0
+msgid "Third"
+msgstr ""
 
 #. module: base_calendar
 #: selection:calendar.alarm,trigger_related:0
 #: selection:res.alarm,trigger_related:0
 msgid "The event ends"
-msgstr "El evento finaliza"
+msgstr ""
 
 #. module: base_calendar
-#: selection:base.calendar.set.exrule,byday:0
 #: selection:calendar.event,byday:0
 #: selection:calendar.todo,byday:0
+#: selection:crm.meeting,byday:0
 msgid "Last"
-msgstr "Última"
+msgstr ""
 
 #. module: base_calendar
-#: help:calendar.attendee,state:0
-msgid "Status of the attendee's participation"
-msgstr "Estado de la participación de los asistentes"
+#: help:crm.meeting,message_ids:0
+msgid "Messages and communication history"
+msgstr ""
 
 #. module: base_calendar
-#: selection:calendar.attendee,cutype:0
-msgid "Room"
-msgstr "Sala"
+#: field:crm.meeting,message_ids:0
+msgid "Messages"
+msgstr ""
 
 #. module: base_calendar
 #: selection:calendar.alarm,trigger_interval:0
-#: selection:calendar.event,freq:0
-#: selection:calendar.todo,freq:0
 #: selection:res.alarm,trigger_interval:0
 msgid "Days"
-msgstr "Días"
+msgstr ""
 
 #. module: base_calendar
-#: view:calendar.attendee:0
 #: view:calendar.event:0
-msgid "Invitation Detail"
-msgstr "Detalle de la invitación"
+msgid "To"
+msgstr ""
 
 #. module: base_calendar
-#: code:addons/base_calendar/base_calendar.py:1355
-#: code:addons/base_calendar/wizard/base_calendar_invite_attendee.py:96
-#: code:addons/base_calendar/wizard/base_calendar_invite_attendee.py:143
-#: code:addons/base_calendar/wizard/base_calendar_set_exrule.py:128
-#: code:addons/base_calendar/wizard/base_calendar_set_exrule.py:136
+#: code:addons/base_calendar/base_calendar.py:1260
 #, python-format
 msgid "Error!"
-msgstr "¡Error!"
+msgstr ""
 
 #. module: base_calendar
 #: selection:calendar.attendee,role:0
 msgid "Chair Person"
-msgstr "Presidente"
+msgstr ""
+
+#. module: base_calendar
+#: view:crm.meeting:0
+msgid "My Meetings"
+msgstr ""
 
 #. module: base_calendar
 #: selection:calendar.alarm,action:0
 msgid "Procedure"
-msgstr "Procedimiento"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.event,recurrent_id:0
+#: field:calendar.todo,recurrent_id:0
+#: field:crm.meeting,recurrent_id:0
+msgid "Recurrent ID"
+msgstr ""
 
 #. module: base_calendar
 #: selection:calendar.event,state:0
 #: selection:calendar.todo,state:0
 msgid "Cancelled"
-msgstr "Cancelada"
+msgstr ""
 
 #. module: base_calendar
 #: selection:calendar.alarm,trigger_interval:0
 #: selection:res.alarm,trigger_interval:0
 msgid "Minutes"
-msgstr "Minutos"
+msgstr ""
 
 #. module: base_calendar
 #: selection:calendar.alarm,action:0
 msgid "Display"
-msgstr "Mostrar"
+msgstr ""
 
 #. module: base_calendar
-#: view:calendar.event.edit.all:0
-msgid "Edit all Occurrences"
-msgstr "Editar todas las ocurrencias"
+#: help:calendar.attendee,state:0
+msgid "Status of the attendee's participation"
+msgstr ""
 
 #. module: base_calendar
-#: view:calendar.attendee:0
-msgid "Invitation type"
-msgstr "Tipo de invitación"
+#: view:crm.meeting:0
+msgid "Mail To"
+msgstr ""
 
 #. module: base_calendar
-#: selection:base.calendar.set.exrule,freq:0
-msgid "Secondly"
-msgstr "En segundo lugar"
+#: field:crm.meeting,name:0
+msgid "Meeting Subject"
+msgstr ""
 
 #. module: base_calendar
-#: field:calendar.alarm,event_date:0
-#: field:calendar.attendee,event_date:0
 #: view:calendar.event:0
-msgid "Event Date"
-msgstr "Fecha evento"
+msgid "End of Recurrence"
+msgstr ""
 
 #. module: base_calendar
-#: view:calendar.attendee:0
 #: view:calendar.event:0
 msgid "Group By..."
-msgstr "Agrupar por..."
-
-#. module: base_calendar
-#: help:base_calendar.invite.attendee,email:0
-msgid "Provide external email address who will receive this invitation."
 msgstr ""
-"Proporcione las direcciones de correo externas de quienes recibiran esta "
-"invitacion."
 
 #. module: base_calendar
-#: model:ir.module.module,description:base_calendar.module_meta_information
-msgid ""
-"Full featured calendar system that supports:\n"
-"    - Calendar of events\n"
-"    - Alerts (create requests)\n"
-"    - Recurring events\n"
-"    - Invitations to people"
+#: view:calendar.event:0
+msgid "Recurrency Option"
 msgstr ""
-"Completo sistema de calendario que soporta:\n"
-"    - Calendario de eventos\n"
-"    - Alertas (crea peticiones)\n"
-"    - Eventos recursivos\n"
-"    - Invitación de personas"
 
 #. module: base_calendar
-#: help:calendar.attendee,cutype:0
-msgid "Specify the type of Invitation"
-msgstr "Especifique el tipo de invitación"
+#: view:calendar.event:0
+msgid "Choose day where repeat the meeting"
+msgstr ""
 
 #. module: base_calendar
-#: selection:calendar.event,freq:0
-#: selection:calendar.todo,freq:0
-msgid "Years"
-msgstr "Años"
+#: view:crm.meeting:0
+#: model:ir.actions.act_window,name:base_calendar.action_crm_meeting
+msgid "Meetings"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.event,recurrent_id_date:0
+#: field:calendar.todo,recurrent_id_date:0
+#: field:crm.meeting,recurrent_id_date:0
+msgid "Recurrent ID date"
+msgstr ""
 
 #. module: base_calendar
 #: field:calendar.alarm,event_end_date:0
 #: field:calendar.attendee,event_end_date:0
 msgid "Event End Date"
-msgstr "Fecha del final del evento"
+msgstr ""
 
 #. module: base_calendar
 #: selection:calendar.attendee,role:0
 msgid "Optional Participation"
-msgstr "Participación opcional"
+msgstr ""
 
 #. module: base_calendar
-#: field:calendar.event,date_deadline:0
-#: field:calendar.todo,date_deadline:0
-msgid "Deadline"
-msgstr "Fecha límite"
+#: help:crm.meeting,message_summary:0
+msgid ""
+"Holds the Chatter summary (number of messages, ...). This summary is "
+"directly in html format in order to be inserted in kanban views."
+msgstr ""
 
 #. module: base_calendar
-#: code:addons/base_calendar/base_calendar.py:385
-#: code:addons/base_calendar/base_calendar.py:1088
-#: code:addons/base_calendar/base_calendar.py:1090
+#: code:addons/base_calendar/base_calendar.py:399
+#: code:addons/base_calendar/base_calendar.py:441
+#: code:addons/base_calendar/base_calendar.py:1013
+#: code:addons/base_calendar/base_calendar.py:1015
+#: code:addons/base_calendar/base_calendar.py:1460
 #, python-format
 msgid "Warning!"
-msgstr "¡Aviso!"
+msgstr ""
 
 #. module: base_calendar
 #: help:calendar.event,active:0
 #: help:calendar.todo,active:0
+#: 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 ""
-"Si el campo activo se establece a verdadero, se omitirá la alarma del "
-"evento, sin embargo no se eliminará."
 
 #. module: base_calendar
-#: model:ir.module.module,shortdesc:base_calendar.module_meta_information
-msgid "Basic Calendar Functionality"
-msgstr "Funcionalidad básica del calendario"
+#: field:calendar.alarm,repeat:0
+#: field:calendar.event,count:0
+#: field:calendar.todo,count:0
+#: field:crm.meeting,count:0
+#: field:res.alarm,repeat:0
+msgid "Repeat"
+msgstr ""
 
 #. module: base_calendar
 #: field:calendar.event,organizer:0
 #: field:calendar.event,organizer_id:0
 #: field:calendar.todo,organizer:0
 #: field:calendar.todo,organizer_id:0
+#: field:crm.meeting,organizer:0
+#: field:crm.meeting,organizer_id:0
 msgid "Organizer"
-msgstr "Organizador"
+msgstr ""
 
 #. module: base_calendar
-#: view:calendar.attendee:0
 #: view:calendar.event:0
 #: field:calendar.event,user_id:0
 #: field:calendar.todo,user_id:0
+#: field:crm.meeting,user_id:0
 msgid "Responsible"
-msgstr "Responsable"
+msgstr ""
 
 #. module: base_calendar
 #: view:calendar.event:0
-#: model:res.request.link,name:base_calendar.request_link_meeting
+#: model:res.request.link,name:base_calendar.request_link_event
 msgid "Event"
-msgstr "Evento"
-
-#. module: base_calendar
-#: help:calendar.event,edit_all:0
-#: help:calendar.todo,edit_all:0
-msgid "Edit all Occurrences  of recurrent Meeting."
-msgstr "Editar todas las ocurrencias de la reunión recurrente."
+msgstr ""
 
 #. module: base_calendar
 #: selection:calendar.alarm,trigger_occurs:0
 #: selection:res.alarm,trigger_occurs:0
 msgid "Before"
-msgstr "Antes de"
+msgstr ""
 
 #. module: base_calendar
 #: view:calendar.event:0
 #: selection:calendar.event,state:0
 #: selection:calendar.todo,state:0
+#: field:crm.meeting,date_open:0
+#: selection:crm.meeting,state:0
 msgid "Confirmed"
-msgstr "Confirmada"
-
-#. module: base_calendar
-#: model:ir.actions.act_window,name:base_calendar.action_calendar_event_edit_all
-msgid "Edit all events"
-msgstr "Editar todos los eventos"
+msgstr ""
 
 #. module: base_calendar
 #: field:calendar.alarm,attendee_ids:0
 #: field:calendar.event,attendee_ids:0
+#: field:calendar.event,partner_ids:0
 #: field:calendar.todo,attendee_ids:0
+#: field:calendar.todo,partner_ids:0
+#: field:crm.meeting,attendee_ids:0
+#: field:crm.meeting,partner_ids:0
 msgid "Attendees"
-msgstr "Asistentes"
+msgstr ""
 
 #. module: base_calendar
 #: view:calendar.event:0
 msgid "Confirm"
-msgstr "Confirmar"
+msgstr ""
 
 #. module: base_calendar
 #: model:ir.model,name:base_calendar.model_calendar_todo
 msgid "Calendar Task"
-msgstr "Calendario de tareas"
+msgstr ""
 
 #. module: base_calendar
-#: field:base.calendar.set.exrule,su:0
 #: field:calendar.event,su:0
 #: field:calendar.todo,su:0
+#: field:crm.meeting,su:0
 msgid "Sun"
-msgstr "Dom"
+msgstr ""
 
 #. module: base_calendar
 #: field:calendar.attendee,cutype:0
 msgid "Invite Type"
-msgstr "Tipo de invitación"
-
-#. module: base_calendar
-#: help:calendar.attendee,partner_id:0
-msgid "Partner related to contact"
-msgstr "Partner relacionado con el contacto"
+msgstr ""
 
 #. module: base_calendar
 #: view:res.alarm:0
 msgid "Reminder details"
-msgstr "Detalles del recordatorio"
+msgstr ""
 
 #. module: base_calendar
 #: field:calendar.attendee,parent_ids:0
 msgid "Delegrated From"
-msgstr "Delegado desde"
+msgstr ""
 
 #. module: base_calendar
-#: selection:base.calendar.set.exrule,select1:0
 #: selection:calendar.event,select1:0
 #: selection:calendar.todo,select1:0
+#: selection:crm.meeting,select1:0
 msgid "Day of month"
-msgstr "Día del mes"
-
-#. module: base_calendar
-#: view:calendar.event:0
-#: field:calendar.event,location:0
-#: field:calendar.event.edit.all,location:0
-#: field:calendar.todo,location:0
-msgid "Location"
-msgstr "Lugar"
-
-#. module: base_calendar
-#: field:base_calendar.invite.attendee,send_mail:0
-msgid "Send mail?"
-msgstr "¿Enviar email?"
-
-#. module: base_calendar
-#: field:base_calendar.invite.attendee,email:0
-#: selection:calendar.alarm,action:0
-#: field:calendar.attendee,email:0
-msgid "Email"
-msgstr "Correo electrónico"
-
-#. module: base_calendar
-#: view:calendar.attendee:0
-msgid "Event Detail"
-msgstr "Detalles del evento"
-
-#. module: base_calendar
-#: selection:calendar.alarm,state:0
-msgid "Run"
-msgstr "Ejecutar"
-
-#. module: base_calendar
-#: field:calendar.event,exdate:0
-#: field:calendar.todo,exdate:0
-msgid "Exception Date/Times"
-msgstr "Fecha/horas excepción"
-
-#. module: base_calendar
-#: selection:calendar.event,class:0
-#: selection:calendar.todo,class:0
-msgid "Confidential"
-msgstr "Confidencial"
-
-#. module: base_calendar
-#: field:base.calendar.set.exrule,end_date:0
-#: field:calendar.event,end_date:0
-#: field:calendar.todo,end_date:0
-msgid "Repeat Until"
-msgstr "Repetir hasta"
-
-#. module: base_calendar
-#: model:ir.actions.act_window,help:base_calendar.action_res_alarm_view
-msgid ""
-"Create specific calendar alarms that may be assigned to calendar events or "
-"meetings."
 msgstr ""
-"Crear alarmas específicas que puedan ser asignadas a eventos de calendario o "
-"reuniones."
 
 #. module: base_calendar
-#: view:calendar.event:0
-msgid "Visibility"
-msgstr "Visibilidad"
+#: field:crm.meeting,message_follower_ids:0
+msgid "Followers"
+msgstr ""
 
 #. module: base_calendar
-#: field:calendar.attendee,rsvp:0
-msgid "Required Reply?"
-msgstr "¿Respuesta requerida?"
-
-#. module: base_calendar
-#: field:calendar.event,base_calendar_url:0
-#: field:calendar.todo,base_calendar_url:0
-msgid "Caldav URL"
-msgstr "URL de caldav"
-
-#. module: base_calendar
-#: view:base.calendar.set.exrule:0
-msgid "Select range to Exclude"
-msgstr "Elija el rango a excluir"
-
-#. module: base_calendar
-#: field:calendar.event,recurrent_uid:0
-#: field:calendar.todo,recurrent_uid:0
-msgid "Recurrent ID"
-msgstr "ID recurrente"
-
-#. module: base_calendar
-#: selection:base.calendar.set.exrule,month_list:0
-#: selection:calendar.event,month_list:0
-#: selection:calendar.todo,month_list:0
-msgid "July"
-msgstr "Julio"
-
-#. module: base_calendar
-#: view:calendar.attendee:0
-#: selection:calendar.attendee,state:0
-msgid "Accepted"
-msgstr "Aceptada"
-
-#. module: base_calendar
-#: field:base.calendar.set.exrule,th:0
-#: field:calendar.event,th:0
-#: field:calendar.todo,th:0
-msgid "Thu"
-msgstr "Jue"
-
-#. module: base_calendar
-#: field:calendar.attendee,child_ids:0
-msgid "Delegrated To"
-msgstr "Delegada en"
-
-#. module: base_calendar
-#: view:calendar.attendee:0
-msgid "Required Reply"
-msgstr "Respuesta requerida"
-
-#. module: base_calendar
-#: selection:calendar.event,end_type:0
-#: selection:calendar.todo,end_type:0
-msgid "Forever"
-msgstr "Siempre"
+#: field:calendar.event,location:0
+#: field:calendar.todo,location:0
+#: field:crm.meeting,location:0
+msgid "Location"
+msgstr ""
 
 #. module: base_calendar
 #: selection:calendar.attendee,role:0
 msgid "Participation required"
-msgstr "Participación  requerida"
+msgstr ""
 
 #. module: base_calendar
-#: view:base.calendar.set.exrule:0
-msgid "_Cancel"
-msgstr "_Cancelar"
+#: view:calendar.event:0
+#: field:calendar.event,show_as:0
+#: field:calendar.todo,show_as:0
+#: field:crm.meeting,show_as:0
+msgid "Show Time as"
+msgstr ""
+
+#. module: base_calendar
+#: selection:calendar.alarm,action:0
+#: field:calendar.attendee,email:0
+msgid "Email"
+msgstr ""
+
+#. module: base_calendar
+#: selection:calendar.attendee,cutype:0
+msgid "Room"
+msgstr ""
+
+#. module: base_calendar
+#: selection:calendar.alarm,state:0
+msgid "Run"
+msgstr ""
+
+#. module: base_calendar
+#: model:ir.model,name:base_calendar.model_calendar_alarm
+msgid "Event alarm information"
+msgstr ""
+
+#. module: base_calendar
+#: code:addons/base_calendar/base_calendar.py:1015
+#, python-format
+msgid "Count cannot be negative or 0."
+msgstr ""
+
+#. module: base_calendar
+#: field:crm.meeting,create_date:0
+msgid "Creation Date"
+msgstr ""
+
+#. module: base_calendar
+#: view:crm.meeting:0
+#: model:ir.model,name:base_calendar.model_crm_meeting
+#: model:res.request.link,name:base_calendar.request_link_meeting
+msgid "Meeting"
+msgstr ""
+
+#. module: base_calendar
+#: selection:calendar.event,rrule_type:0
+#: selection:calendar.todo,rrule_type:0
+#: selection:crm.meeting,rrule_type:0
+msgid "Month(s)"
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.event:0
+msgid "Visibility"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.attendee,rsvp:0
+msgid "Required Reply?"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.event,base_calendar_url:0
+#: field:calendar.todo,base_calendar_url:0
+#: field:crm.meeting,base_calendar_url:0
+msgid "Caldav URL"
+msgstr ""
+
+#. module: base_calendar
+#: model:ir.model,name:base_calendar.model_mail_wizard_invite
+msgid "Invite wizard"
+msgstr ""
+
+#. module: base_calendar
+#: selection:calendar.event,month_list:0
+#: selection:calendar.todo,month_list:0
+#: selection:crm.meeting,month_list:0
+msgid "July"
+msgstr ""
+
+#. module: base_calendar
+#: selection:calendar.attendee,state:0
+msgid "Accepted"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.event,th:0
+#: field:calendar.todo,th:0
+#: field:crm.meeting,th:0
+msgid "Thu"
+msgstr ""
+
+#. module: base_calendar
+#: view:crm.meeting:0
+msgid "Meeting Details"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.attendee,child_ids:0
+msgid "Delegrated To"
+msgstr ""
+
+#. module: base_calendar
+#: code:addons/base_calendar/crm_meeting.py:102
+#, python-format
+msgid "The following contacts have no email address :"
+msgstr ""
+
+#. module: base_calendar
+#: selection:calendar.event,rrule_type:0
+#: selection:calendar.todo,rrule_type:0
+#: selection:crm.meeting,rrule_type:0
+msgid "Year(s)"
+msgstr ""
+
+#. module: base_calendar
+#: view:crm.meeting.type:0
+#: model:ir.actions.act_window,name:base_calendar.action_crm_meeting_type
+#: model:ir.ui.menu,name:base_calendar.menu_crm_meeting_type
+msgid "Meeting Types"
+msgstr ""
 
 #. module: base_calendar
 #: field:calendar.event,create_date:0
 #: field:calendar.todo,create_date:0
 msgid "Created"
-msgstr "Creada"
+msgstr ""
 
 #. module: base_calendar
 #: selection:calendar.event,class:0
 #: selection:calendar.todo,class:0
-msgid "Private"
-msgstr "Privada"
+#: selection:crm.meeting,class:0
+msgid "Public for Employees"
+msgstr ""
 
 #. module: base_calendar
-#: selection:base.calendar.set.exrule,freq:0
-#: selection:calendar.event,rrule_type:0
-#: selection:calendar.todo,rrule_type:0
-msgid "Daily"
-msgstr "Diariamente"
+#: view:crm.meeting:0
+msgid "hours"
+msgstr ""
 
 #. module: base_calendar
-#: code:addons/base_calendar/base_calendar.py:385
-#, python-format
-msgid "Can not Duplicate"
-msgstr "No se puede duplicar"
-
-#. module: base_calendar
-#: field:calendar.event,class:0
-#: field:calendar.todo,class:0
-msgid "Mark as"
-msgstr "Marcar como"
-
-#. module: base_calendar
-#: view:calendar.attendee:0
-#: field:calendar.attendee,partner_address_id:0
-msgid "Contact"
-msgstr "Contacto"
-
-#. module: base_calendar
-#: help:calendar.event,rrule_type:0
-#: help:calendar.todo,rrule_type:0
-msgid "Let the event automatically repeat at that interval"
-msgstr "Permite que el evento se repita automáticamente en ese intervalo"
-
-#. module: base_calendar
-#: view:calendar.attendee:0
 #: view:calendar.event:0
-msgid "Delegate"
-msgstr "Delegar"
+msgid "Cancel Event"
+msgstr ""
 
 #. module: base_calendar
-#: field:base_calendar.invite.attendee,partner_id:0
-#: view:calendar.attendee:0
 #: field:calendar.attendee,partner_id:0
-msgid "Partner"
-msgstr "Empresa"
+msgid "Contact"
+msgstr ""
 
 #. module: base_calendar
-#: view:base_calendar.invite.attendee:0
-#: selection:base_calendar.invite.attendee,type:0
-msgid "Partner Contacts"
-msgstr "Contactos de la empresa"
+#: field:calendar.attendee,language:0
+msgid "Language"
+msgstr ""
 
 #. module: base_calendar
-#: view:base.calendar.set.exrule:0
-msgid "_Ok"
-msgstr "_Aceptar"
+#: field:calendar.event,end_date:0
+#: field:calendar.todo,end_date:0
+#: field:crm.meeting,end_date:0
+msgid "Repeat Until"
+msgstr ""
+
+#. module: base_calendar
+#: view:crm.meeting:0
+msgid "Options"
+msgstr ""
 
 #. module: base_calendar
-#: selection:base.calendar.set.exrule,byday:0
 #: selection:calendar.event,byday:0
 #: selection:calendar.todo,byday:0
+#: selection:crm.meeting,byday:0
 msgid "First"
-msgstr "Primera"
-
-#. module: base_calendar
-#: view:calendar.event:0
-msgid "Privacy"
-msgstr "Privacidad"
-
-#. module: base_calendar
-#: field:calendar.event,vtimezone:0
-#: field:calendar.todo,vtimezone:0
-msgid "Timezone"
-msgstr "Zona horaria"
+msgstr ""
 
 #. module: base_calendar
 #: view:calendar.event:0
+#: view:crm.meeting:0
 msgid "Subject"
-msgstr "Asunto"
+msgstr ""
 
 #. module: base_calendar
-#: selection:base.calendar.set.exrule,month_list:0
 #: selection:calendar.event,month_list:0
 #: selection:calendar.todo,month_list:0
+#: selection:crm.meeting,month_list:0
 msgid "September"
-msgstr "Septiembre"
+msgstr ""
 
 #. module: base_calendar
-#: selection:base.calendar.set.exrule,month_list:0
 #: selection:calendar.event,month_list:0
 #: selection:calendar.todo,month_list:0
+#: selection:crm.meeting,month_list:0
 msgid "December"
-msgstr "Diciembre"
+msgstr ""
 
 #. module: base_calendar
-#: help:base_calendar.invite.attendee,send_mail:0
-msgid "Check this if you want to send an Email to Invited Person"
-msgstr "Marque aquí si quiere enviar un correo a la persona invitada"
+#: selection:calendar.event,week_list:0
+#: selection:calendar.todo,week_list:0
+#: selection:crm.meeting,week_list:0
+msgid "Tuesday"
+msgstr ""
+
+#. module: base_calendar
+#: field:crm.meeting,categ_ids:0
+msgid "Tags"
+msgstr ""
 
 #. module: base_calendar
 #: view:calendar.event:0
 msgid "Availability"
-msgstr "Disponibilidad"
-
-#. module: base_calendar
-#: view:calendar.event.edit.all:0
-msgid "_Save"
-msgstr "_Guardar"
+msgstr ""
 
 #. module: base_calendar
 #: selection:calendar.attendee,cutype:0
 msgid "Individual"
-msgstr "Individual"
+msgstr ""
 
 #. module: base_calendar
 #: help:calendar.event,count:0
 #: help:calendar.todo,count:0
+#: help:crm.meeting,count:0
 msgid "Repeat x times"
-msgstr "Repetir x veces"
+msgstr ""
 
 #. module: base_calendar
 #: field:calendar.alarm,user_id:0
 msgid "Owner"
-msgstr "Dueño"
+msgstr ""
 
 #. module: base_calendar
-#: view:calendar.attendee:0
-msgid "Delegation Info"
-msgstr "Información delegación"
+#: help:calendar.event,rrule_type:0
+#: help:calendar.todo,rrule_type:0
+#: help:crm.meeting,rrule_type:0
+msgid "Let the event automatically repeat at that interval"
+msgstr ""
 
 #. module: base_calendar
-#: view:calendar.event:0
-#: field:calendar.event.edit.all,date:0
-msgid "Start Date"
-msgstr "Fecha inicio"
+#: model:ir.ui.menu,name:base_calendar.mail_menu_calendar
+msgid "Calendar"
+msgstr ""
 
 #. module: base_calendar
 #: field:calendar.attendee,cn:0
 msgid "Common name"
-msgstr "Nombre común"
+msgstr ""
 
 #. module: base_calendar
-#: view:calendar.attendee:0
 #: selection:calendar.attendee,state:0
 msgid "Declined"
-msgstr "Rechazada"
+msgstr ""
 
 #. module: base_calendar
-#: view:calendar.attendee:0
-msgid "My Role"
-msgstr "Mi rol"
+#: code:addons/base_calendar/base_calendar.py:1460
+#, python-format
+msgid "Group by date is not supported, use the calendar view instead."
+msgstr ""
 
 #. module: base_calendar
 #: view:calendar.event:0
-msgid "My Events"
-msgstr "Mis eventos"
-
-#. module: base_calendar
-#: view:calendar.attendee:0
-#: view:calendar.event:0
+#: view:crm.meeting:0
 msgid "Decline"
-msgstr "Rechazar"
-
-#. module: base_calendar
-#: selection:calendar.event,freq:0
-#: selection:calendar.todo,freq:0
-msgid "Weeks"
-msgstr "Semanas"
+msgstr ""
 
 #. module: base_calendar
 #: selection:calendar.attendee,cutype:0
 msgid "Group"
-msgstr "Grupo"
+msgstr ""
 
 #. module: base_calendar
-#: field:calendar.event,edit_all:0
-#: field:calendar.todo,edit_all:0
-msgid "Edit All"
-msgstr "Editar todo"
+#: selection:calendar.event,class:0
+#: selection:calendar.todo,class:0
+#: selection:crm.meeting,class:0
+msgid "Private"
+msgstr ""
 
 #. module: base_calendar
-#: field:base_calendar.invite.attendee,contact_ids:0
-msgid "Contacts"
-msgstr "Contactos"
+#: view:calendar.event:0
+#: field:calendar.event,class:0
+#: field:calendar.todo,class:0
+#: field:crm.meeting,class:0
+msgid "Privacy"
+msgstr ""
 
 #. module: base_calendar
 #: model:ir.model,name:base_calendar.model_res_alarm
 msgid "Basic Alarm Information"
-msgstr "Información sobre la alarma básica"
+msgstr ""
 
 #. module: base_calendar
-#: field:base.calendar.set.exrule,fr:0
 #: field:calendar.event,fr:0
 #: field:calendar.todo,fr:0
+#: field:crm.meeting,fr:0
 msgid "Fri"
-msgstr "Vie"
+msgstr ""
 
 #. module: base_calendar
-#: selection:calendar.alarm,trigger_interval:0
-#: selection:calendar.event,freq:0
-#: selection:calendar.todo,freq:0
-#: selection:res.alarm,trigger_interval:0
-msgid "Hours"
-msgstr "Horas"
-
-#. module: base_calendar
-#: code:addons/base_calendar/base_calendar.py:1090
-#, python-format
-msgid "Count can not be Negative"
-msgstr "La cuenta no puede ser negativa"
+#: view:calendar.event:0
+msgid "Invitation Detail"
+msgstr ""
 
 #. module: base_calendar
 #: field:calendar.attendee,member:0
 msgid "Member"
-msgstr "Miembro"
+msgstr ""
 
 #. module: base_calendar
 #: help:calendar.event,location:0
 #: help:calendar.todo,location:0
+#: help:crm.meeting,location:0
 msgid "Location of Event"
-msgstr "Ubicación del evento"
+msgstr ""
 
 #. module: base_calendar
 #: field:calendar.event,rrule:0
 #: field:calendar.todo,rrule:0
+#: field:crm.meeting,rrule:0
 msgid "Recurrent Rule"
-msgstr "Regla recurrente"
+msgstr ""
 
 #. module: base_calendar
 #: selection:calendar.alarm,state:0
 msgid "Draft"
-msgstr "Borrador"
+msgstr ""
 
 #. module: base_calendar
 #: field:calendar.alarm,attach:0
 msgid "Attachment"
-msgstr "Adjunto"
+msgstr ""
 
 #. module: base_calendar
-#: view:calendar.attendee:0
-msgid "Invitation From"
-msgstr "Invitación desde"
+#: field:crm.meeting,date_closed:0
+msgid "Closed"
+msgstr ""
 
 #. module: base_calendar
 #: view:calendar.event:0
-msgid "End of Recurrency"
-msgstr "Fin de recurrencia"
+msgid "From"
+msgstr ""
 
 #. module: base_calendar
 #: view:calendar.event:0
-#: field:calendar.event.edit.all,alarm_id:0
+#: field:calendar.event,alarm_id:0
+#: field:calendar.todo,alarm_id:0
+#: field:crm.meeting,alarm_id:0
 msgid "Reminder"
-msgstr "Recordatorio"
+msgstr ""
 
 #. module: base_calendar
-#: view:base.calendar.set.exrule:0
-#: model:ir.model,name:base_calendar.model_base_calendar_set_exrule
-msgid "Set Exrule"
-msgstr "Establecer Exregla"
+#: selection:calendar.event,end_type:0
+#: selection:calendar.todo,end_type:0
+#: selection:crm.meeting,end_type:0
+msgid "Number of repetitions"
+msgstr ""
+
+#. module: base_calendar
+#: model:crm.meeting.type,name:base_calendar.categ_meet2
+msgid "Internal Meeting"
+msgstr ""
 
 #. module: base_calendar
 #: view:calendar.event:0
 #: model:ir.actions.act_window,name:base_calendar.action_view_event
 #: model:ir.ui.menu,name:base_calendar.menu_events
 msgid "Events"
-msgstr "Eventos"
+msgstr ""
 
 #. module: base_calendar
-#: model:ir.actions.act_window,name:base_calendar.action_view_calendar_invite_attendee_wizard
-#: model:ir.model,name:base_calendar.model_base_calendar_invite_attendee
-msgid "Invite Attendees"
-msgstr "Invitar asistentes"
+#: field:calendar.alarm,state:0
+#: field:calendar.attendee,state:0
+#: view:calendar.event:0
+#: field:calendar.event,state:0
+#: field:calendar.todo,state:0
+#: field:crm.meeting,state:0
+msgid "Status"
+msgstr ""
 
 #. module: base_calendar
 #: help:calendar.attendee,email:0
 msgid "Email of Invited Person"
-msgstr "Email del invitado"
+msgstr ""
 
 #. module: base_calendar
-#: field:calendar.alarm,repeat:0
-#: field:calendar.event,count:0
-#: field:calendar.todo,count:0
-#: field:res.alarm,repeat:0
-msgid "Repeat"
-msgstr "Repetir"
+#: model:crm.meeting.type,name:base_calendar.categ_meet1
+msgid "Customer Meeting"
+msgstr ""
 
 #. module: base_calendar
 #: help:calendar.attendee,dir:0
@@ -931,186 +881,193 @@ msgid ""
 "Reference to the URIthat points to the directory information corresponding "
 "to the attendee."
 msgstr ""
-"La referencia a la URI que apunta a la información del directorio "
-"correspondiente al participante."
 
 #. module: base_calendar
-#: selection:base.calendar.set.exrule,month_list:0
 #: selection:calendar.event,month_list:0
 #: selection:calendar.todo,month_list:0
+#: selection:crm.meeting,month_list:0
 msgid "August"
-msgstr "Agosto"
+msgstr ""
 
 #. module: base_calendar
-#: selection:base.calendar.set.exrule,week_list:0
 #: selection:calendar.event,week_list:0
 #: selection:calendar.todo,week_list:0
+#: selection:crm.meeting,week_list:0
 msgid "Monday"
-msgstr "Lunes"
+msgstr ""
 
 #. module: base_calendar
-#: selection:base.calendar.set.exrule,byday:0
-#: selection:calendar.event,byday:0
-#: selection:calendar.todo,byday:0
-msgid "Third"
-msgstr "Tercero"
+#: model:crm.meeting.type,name:base_calendar.categ_meet4
+msgid "Open Discussion"
+msgstr ""
+
+#. module: base_calendar
+#: model:ir.model,name:base_calendar.model_ir_model
+msgid "Models"
+msgstr ""
 
 #. module: base_calendar
-#: selection:base.calendar.set.exrule,month_list:0
 #: selection:calendar.event,month_list:0
 #: selection:calendar.todo,month_list:0
+#: selection:crm.meeting,month_list:0
 msgid "June"
-msgstr "Junio"
+msgstr ""
 
 #. module: base_calendar
-#: field:calendar.alarm,alarm_id:0
-msgid "Basic Alarm"
-msgstr "Alarma básica"
-
-#. module: base_calendar
-#: view:base.calendar.set.exrule:0
+#: field:calendar.alarm,event_date:0
+#: field:calendar.attendee,event_date:0
 #: view:calendar.event:0
-msgid "The"
-msgstr "El"
+msgid "Event Date"
+msgstr ""
+
+#. module: base_calendar
+#: view:crm.meeting:0
+msgid "Invitations"
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.event:0
+#: view:crm.meeting:0
+msgid "The"
+msgstr ""
+
+#. module: base_calendar
+#: field:crm.meeting,write_date:0
+msgid "Write Date"
+msgstr ""
 
 #. module: base_calendar
-#: view:calendar.attendee:0
 #: field:calendar.attendee,delegated_from:0
 msgid "Delegated From"
-msgstr "Delegado desde"
+msgstr ""
+
+#. module: base_calendar
+#: field:crm.meeting,message_is_follower:0
+msgid "Is a Follower"
+msgstr ""
 
 #. module: base_calendar
 #: field:calendar.attendee,user_id:0
 msgid "User"
-msgstr "Usuario"
+msgstr ""
 
 #. module: base_calendar
 #: view:calendar.event:0
 #: field:calendar.event,date:0
+#: field:crm.meeting,date:0
 msgid "Date"
-msgstr "Fecha"
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.event:0
+msgid "Start Date"
+msgstr ""
 
 #. module: base_calendar
-#: selection:base.calendar.set.exrule,month_list:0
 #: selection:calendar.event,month_list:0
 #: selection:calendar.todo,month_list:0
+#: selection:crm.meeting,month_list:0
 msgid "November"
-msgstr "Noviembre"
+msgstr ""
 
 #. module: base_calendar
 #: help:calendar.attendee,member:0
 msgid "Indicate the groups that the attendee belongs to"
-msgstr "Indicar los grupos a los que pertenece el asistente"
+msgstr ""
 
 #. module: base_calendar
-#: view:base_calendar.invite.attendee:0
-msgid "Data"
-msgstr "Datos"
-
-#. module: base_calendar
-#: field:base.calendar.set.exrule,mo:0
 #: field:calendar.event,mo:0
 #: field:calendar.todo,mo:0
+#: field:crm.meeting,mo:0
 msgid "Mon"
-msgstr "Lun"
+msgstr ""
 
 #. module: base_calendar
-#: field:base.calendar.set.exrule,count:0
-msgid "Count"
-msgstr "Total"
-
-#. module: base_calendar
-#: selection:base.calendar.set.exrule,freq:0
-#: selection:calendar.event,freq:0
-#: selection:calendar.todo,freq:0
-msgid "No Repeat"
-msgstr "No repetir"
-
-#. module: base_calendar
-#: selection:base.calendar.set.exrule,month_list:0
 #: selection:calendar.event,month_list:0
 #: selection:calendar.todo,month_list:0
+#: selection:crm.meeting,month_list:0
 msgid "October"
-msgstr "Octubre"
+msgstr ""
 
 #. module: base_calendar
-#: view:calendar.attendee:0
+#: selection:calendar.attendee,state:0
 #: view:calendar.event:0
+#: selection:calendar.event,state:0
+#: selection:calendar.todo,state:0
+#: view:crm.meeting:0
 msgid "Uncertain"
-msgstr "Incierto"
+msgstr ""
 
 #. module: base_calendar
-#: field:calendar.attendee,language:0
-msgid "Language"
-msgstr "Idioma"
+#: constraint:calendar.event:0
+#: constraint:calendar.todo:0
+#: constraint:crm.meeting:0
+msgid "Error ! End date cannot be set before start date."
+msgstr ""
 
 #. module: base_calendar
 #: field:calendar.alarm,trigger_occurs:0
 #: field:res.alarm,trigger_occurs:0
 msgid "Triggers"
-msgstr "Disparadores"
+msgstr ""
 
 #. module: base_calendar
-#: selection:base.calendar.set.exrule,month_list:0
 #: selection:calendar.event,month_list:0
 #: selection:calendar.todo,month_list:0
+#: selection:crm.meeting,month_list:0
 msgid "January"
-msgstr "Enero"
+msgstr ""
 
 #. module: base_calendar
 #: field:calendar.alarm,trigger_related:0
 #: field:res.alarm,trigger_related:0
 msgid "Related to"
-msgstr "Relacionado con"
+msgstr ""
 
 #. module: base_calendar
-#: field:base.calendar.set.exrule,interval:0
 #: field:calendar.alarm,trigger_interval:0
 #: field:res.alarm,trigger_interval:0
 msgid "Interval"
-msgstr "Intervalo"
+msgstr ""
 
 #. module: base_calendar
-#: selection:base.calendar.set.exrule,week_list:0
 #: selection:calendar.event,week_list:0
 #: selection:calendar.todo,week_list:0
+#: selection:crm.meeting,week_list:0
 msgid "Wednesday"
-msgstr "Miércoles"
-
-#. module: base_calendar
-#: code:addons/base_calendar/base_calendar.py:1088
-#, python-format
-msgid "Interval can not be Negative"
-msgstr "El intervalo no puede ser negativo"
+msgstr ""
 
 #. module: base_calendar
 #: field:calendar.alarm,name:0
 #: view:calendar.event:0
+#: field:crm.meeting,message_summary:0
 msgid "Summary"
-msgstr "Resumen"
+msgstr ""
 
 #. module: base_calendar
 #: field:calendar.alarm,active:0
 #: field:calendar.event,active:0
 #: field:calendar.todo,active:0
+#: field:crm.meeting,active:0
 #: field:res.alarm,active:0
 msgid "Active"
-msgstr "Activo"
+msgstr ""
+
+#. module: base_calendar
+#: code:addons/base_calendar/base_calendar.py:399
+#, python-format
+msgid "You cannot duplicate a calendar attendee."
+msgstr ""
 
 #. module: base_calendar
 #: view:calendar.event:0
 msgid "Choose day in the month where repeat the meeting"
-msgstr "Elija el día del mes en que se repetirá la reunión"
+msgstr ""
 
 #. module: base_calendar
 #: field:calendar.alarm,action:0
 msgid "Action"
-msgstr "Acción"
-
-#. module: base_calendar
-#: help:base_calendar.invite.attendee,type:0
-msgid "Select whom you want to Invite"
-msgstr "Seleccione a quien quiere invitar"
+msgstr ""
 
 #. module: base_calendar
 #: help:calendar.alarm,duration:0
@@ -1119,52 +1076,38 @@ msgid ""
 "Duration' and 'Repeat' are both optional, but if one occurs, so MUST the "
 "other"
 msgstr ""
-"Duración' y 'Repetir' son ambos opcionales, pero si uno está activo también "
-"debe estarlo el otro"
-
-#. module: base_calendar
-#: model:ir.model,name:base_calendar.model_calendar_event_edit_all
-msgid "Calendar Edit all event"
-msgstr "Editar todos los eventos del calendario"
 
 #. module: base_calendar
 #: help:calendar.attendee,role:0
 msgid "Participation role for the calendar user"
-msgstr "Rol de participación para el usuario del calendario."
+msgstr ""
 
 #. module: base_calendar
-#: view:calendar.attendee:0
 #: field:calendar.attendee,delegated_to:0
 msgid "Delegated To"
-msgstr "Delegado a"
+msgstr ""
 
 #. module: base_calendar
 #: help:calendar.alarm,action:0
 msgid "Defines the action to be invoked when an alarm is triggered"
-msgstr "Define la acción a invocar cuando salte la alarma"
+msgstr ""
+
+#. module: base_calendar
+#: view:crm.meeting:0
+msgid "Starting at"
+msgstr ""
 
 #. module: base_calendar
 #: selection:calendar.event,end_type:0
 #: selection:calendar.todo,end_type:0
+#: selection:crm.meeting,end_type:0
 msgid "End date"
-msgstr "Fecha de fin"
+msgstr ""
 
 #. module: base_calendar
 #: view:calendar.event:0
 msgid "Search Events"
-msgstr "Buscar eventos"
-
-#. module: base_calendar
-#: view:calendar.event:0
-msgid "Recurrency Option"
-msgstr "Opción de recurrencia"
-
-#. module: base_calendar
-#: selection:base.calendar.set.exrule,freq:0
-#: selection:calendar.event,rrule_type:0
-#: selection:calendar.todo,rrule_type:0
-msgid "Weekly"
-msgstr "Semanal"
+msgstr ""
 
 #. module: base_calendar
 #: help:calendar.alarm,active:0
@@ -1173,87 +1116,65 @@ msgid ""
 "If the active field is set to true, it will allow you to hide the event "
 "alarm information without removing it."
 msgstr ""
-"Si el campo activo es verdadero, le permitirá ocultar la notificación de "
-"aviso del evento sin eliminarlo."
 
 #. module: base_calendar
-#: field:calendar.event,recurrent_id:0
-#: field:calendar.todo,recurrent_id:0
-msgid "Recurrent ID date"
-msgstr "ID fecha recurrente"
+#: field:calendar.event,end_type:0
+#: field:calendar.todo,end_type:0
+#: field:crm.meeting,end_type:0
+msgid "Recurrence Termination"
+msgstr ""
 
 #. module: base_calendar
-#: sql_constraint:res.users:0
-msgid "You can not have two users with the same login !"
-msgstr "¡No puede tener dos usuarios con el mismo identificador de usuario!"
-
-#. module: base_calendar
-#: field:calendar.alarm,state:0
-#: view:calendar.attendee:0
-#: field:calendar.attendee,state:0
-#: view:calendar.event:0
-#: field:calendar.event,state:0
-#: field:calendar.todo,state:0
-msgid "State"
-msgstr "Estado"
+#: view:crm.meeting:0
+msgid "Until"
+msgstr ""
 
 #. module: base_calendar
 #: view:res.alarm:0
 msgid "Reminder Details"
-msgstr "Detalles del recordatorio"
+msgstr ""
 
 #. module: base_calendar
-#: view:calendar.attendee:0
-msgid "To Review"
-msgstr "A revisar"
+#: model:crm.meeting.type,name:base_calendar.categ_meet3
+msgid "Off-site Meeting"
+msgstr ""
 
 #. module: base_calendar
-#: field:base.calendar.set.exrule,freq:0
-#: field:calendar.event,freq:0
-#: field:calendar.todo,freq:0
-msgid "Frequency"
-msgstr "Frecuencia"
+#: view:crm.meeting:0
+msgid "Day of Month"
+msgstr ""
 
 #. module: base_calendar
 #: selection:calendar.alarm,state:0
 msgid "Done"
-msgstr "Hecho"
+msgstr ""
 
 #. module: base_calendar
 #: help:calendar.event,interval:0
 #: help:calendar.todo,interval:0
+#: help:crm.meeting,interval:0
 msgid "Repeat every (Days/Week/Month/Year)"
-msgstr "Repetir cada (días/semana/mes/año)"
+msgstr ""
 
 #. module: base_calendar
-#: view:base_calendar.invite.attendee:0
-#: field:base_calendar.invite.attendee,user_ids:0
-msgid "Users"
-msgstr "Usuarios"
+#: view:crm.meeting:0
+msgid "All Day?"
+msgstr ""
 
 #. module: base_calendar
-#: view:base.calendar.set.exrule:0
-msgid "of"
-msgstr "de"
-
-#. module: base_calendar
-#: view:base_calendar.invite.attendee:0
-#: view:calendar.event:0
-#: view:calendar.event.edit.all:0
-msgid "Cancel"
-msgstr "Cancelar"
-
-#. module: base_calendar
-#: model:ir.model,name:base_calendar.model_res_users
-msgid "res.users"
-msgstr "res.usuarios"
-
-#. module: base_calendar
-#: selection:base.calendar.set.exrule,week_list:0
-#: selection:calendar.event,week_list:0
-#: selection:calendar.todo,week_list:0
-msgid "Tuesday"
-msgstr "Martes"
+#: model:ir.actions.act_window,help:base_calendar.action_crm_meeting
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"            Click to schedule a new meeting.\n"
+"          </p><p>\n"
+"            The calendar is shared between employees and fully integrated "
+"with\n"
+"            other applications such as the employee holidays or the "
+"business\n"
+"            opportunities.\n"
+"          </p>\n"
+"        "
+msgstr ""
 
 #. module: base_calendar
 #: help:calendar.alarm,description:0
@@ -1262,129 +1183,103 @@ msgid ""
 "calendar component, than that                             provided by the "
 "\"SUMMARY\" property"
 msgstr ""
-"Facilita una descripción más completa del componente del calendario que la "
-"facilitada por la propiedad \"RESUMEN\""
 
 #. module: base_calendar
 #: view:calendar.event:0
 msgid "Responsible User"
-msgstr "Usuario responsable"
+msgstr ""
 
 #. module: base_calendar
+#: view:crm.meeting:0
+msgid "Select Weekdays"
+msgstr ""
+
+#. module: base_calendar
+#: code:addons/base_calendar/base_calendar.py:1519
 #: selection:calendar.attendee,availability:0
 #: selection:calendar.event,show_as:0
 #: selection:calendar.todo,show_as:0
-#: selection:res.users,availability:0
+#: selection:crm.meeting,show_as:0
+#, python-format
 msgid "Busy"
-msgstr "Ocupado"
+msgstr ""
 
 #. module: base_calendar
 #: model:ir.model,name:base_calendar.model_calendar_event
 msgid "Calendar Event"
-msgstr "Evento de calendario"
-
-#. module: base_calendar
-#: selection:calendar.attendee,state:0
-#: selection:calendar.event,state:0
-#: selection:calendar.todo,state:0
-msgid "Tentative"
-msgstr "Provisional"
-
-#. module: base_calendar
-#: field:calendar.event,interval:0
-#: field:calendar.todo,interval:0
-msgid "Repeat every"
-msgstr "Repetir cada"
-
-#. module: base_calendar
-#: selection:calendar.event,end_type:0
-#: selection:calendar.todo,end_type:0
-msgid "Fix amout of times"
-msgstr "Cantidad fija de veces"
+msgstr ""
 
 #. module: base_calendar
 #: field:calendar.event,recurrency:0
 #: field:calendar.todo,recurrency:0
+#: field:crm.meeting,recurrency:0
 msgid "Recurrent"
-msgstr "Recurrente"
+msgstr ""
 
 #. module: base_calendar
 #: field:calendar.event,rrule_type:0
 #: field:calendar.todo,rrule_type:0
+#: field:crm.meeting,rrule_type:0
 msgid "Recurrency"
-msgstr "Recurrencia"
+msgstr ""
 
 #. module: base_calendar
-#: model:ir.actions.act_window,name:base_calendar.action_view_attendee_form
-#: model:ir.ui.menu,name:base_calendar.menu_attendee_invitations
-msgid "Event Invitations"
-msgstr "Invitaciones al evento"
-
-#. module: base_calendar
-#: selection:base.calendar.set.exrule,week_list:0
 #: selection:calendar.event,week_list:0
 #: selection:calendar.todo,week_list:0
+#: selection:crm.meeting,week_list:0
 msgid "Thursday"
-msgstr "Jueves"
+msgstr ""
 
 #. module: base_calendar
 #: field:calendar.event,exrule:0
 #: field:calendar.todo,exrule:0
+#: field:crm.meeting,exrule:0
 msgid "Exception Rule"
-msgstr "Regla de excepción"
+msgstr ""
 
 #. module: base_calendar
 #: help:calendar.attendee,language:0
 msgid ""
 "To specify the language for text values in aproperty or property parameter."
 msgstr ""
-"Para indicar el idioma de los valores de texto en una propiedad o parámetro "
-"de propiedad."
 
 #. module: base_calendar
 #: view:calendar.event:0
 msgid "Details"
-msgstr "Detalles"
+msgstr ""
 
 #. module: base_calendar
 #: help:calendar.event,exrule:0
 #: help:calendar.todo,exrule:0
+#: help:crm.meeting,exrule:0
 msgid ""
 "Defines a rule or repeating pattern of time to exclude from the recurring "
 "rule."
 msgstr ""
-"Define una regla o patrón de repetición de tiempo a excluir de la regla "
-"recurrente."
 
 #. module: base_calendar
-#: field:base.calendar.set.exrule,month_list:0
 #: field:calendar.event,month_list:0
 #: field:calendar.todo,month_list:0
+#: field:crm.meeting,month_list:0
 msgid "Month"
-msgstr "Mes"
-
-#. module: base_calendar
-#: view:base_calendar.invite.attendee:0
-#: view:calendar.event:0
-msgid "Invite People"
-msgstr "Invitar personas"
-
-#. module: base_calendar
-#: help:calendar.event,rrule:0
-#: help:calendar.todo,rrule:0
-msgid ""
-"Defines a rule or repeating pattern for recurring events\n"
-"e.g.: Every other month on the last Sunday of the month for 10 occurrences:  "
-"      FREQ=MONTHLY;INTERVAL=2;COUNT=10;BYDAY=-1SU"
 msgstr ""
-"Define una regla o patrón repetitivo para eventos recurrentes.\n"
-"Por ejemplo: Para 10 ocurrencias cada último domingo de cada dos meses : "
-"FREQ=MONTHLY;INTERVAL=2;COUNT=10;BYDAY=-1SU"
+
+#. module: base_calendar
+#: selection:calendar.event,rrule_type:0
+#: selection:calendar.todo,rrule_type:0
+#: selection:crm.meeting,rrule_type:0
+msgid "Day(s)"
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.event:0
+msgid "Confirmed Events"
+msgstr ""
 
 #. module: base_calendar
 #: field:calendar.attendee,dir:0
 msgid "URI Reference"
-msgstr "Referencia URI"
+msgstr ""
 
 #. module: base_calendar
 #: field:calendar.alarm,description:0
@@ -1393,110 +1288,115 @@ msgstr "Referencia URI"
 #: field:calendar.event,name:0
 #: field:calendar.todo,description:0
 #: field:calendar.todo,name:0
+#: field:crm.meeting,description:0
 msgid "Description"
-msgstr "Descripción"
+msgstr ""
 
 #. module: base_calendar
-#: selection:base.calendar.set.exrule,month_list:0
 #: selection:calendar.event,month_list:0
 #: selection:calendar.todo,month_list:0
+#: selection:crm.meeting,month_list:0
 msgid "May"
-msgstr "Mayo"
-
-#. module: base_calendar
-#: field:base_calendar.invite.attendee,type:0
-#: view:calendar.attendee:0
-msgid "Type"
-msgstr "Tipo"
-
-#. module: base_calendar
-#: view:calendar.attendee:0
-msgid "Search Invitations"
-msgstr "Buscar invitaciones"
+msgstr ""
 
 #. module: base_calendar
 #: selection:calendar.alarm,trigger_occurs:0
 #: selection:res.alarm,trigger_occurs:0
 msgid "After"
-msgstr "Después de"
+msgstr ""
 
 #. module: base_calendar
 #: selection:calendar.alarm,state:0
 msgid "Stop"
-msgstr "Parar"
+msgstr ""
 
 #. module: base_calendar
 #: model:ir.model,name:base_calendar.model_ir_values
 msgid "ir.values"
-msgstr "ir.valores"
+msgstr ""
 
 #. module: base_calendar
-#: model:ir.model,name:base_calendar.model_ir_model
-msgid "Objects"
-msgstr "Objetos"
+#: view:crm.meeting:0
+msgid "Search Meetings"
+msgstr ""
+
+#. module: base_calendar
+#: model:ir.model,name:base_calendar.model_ir_attachment
+msgid "ir.attachment"
+msgstr ""
+
+#. module: base_calendar
+#: model:ir.model,name:base_calendar.model_crm_meeting_type
+msgid "Meeting Type"
+msgstr ""
 
 #. module: base_calendar
-#: view:calendar.attendee:0
 #: selection:calendar.attendee,state:0
 msgid "Delegated"
-msgstr "Delegada"
+msgstr ""
 
 #. module: base_calendar
-#: field:base.calendar.set.exrule,sa:0
 #: field:calendar.event,sa:0
 #: field:calendar.todo,sa:0
+#: field:crm.meeting,sa:0
 msgid "Sat"
-msgstr "Sáb"
+msgstr ""
 
 #. module: base_calendar
-#: view:calendar.event:0
-msgid "Choose day where repeat the meeting"
-msgstr "Eligir día en el que repetir la cita"
+#: model:ir.actions.act_window,help:base_calendar.action_res_alarm_view
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to setup a new alarm type.\n"
+"              </p><p>\n"
+"                You can define a customized type of calendar alarm that may "
+"be\n"
+"                assigned to calendar events or meetings.\n"
+"              </p>\n"
+"            "
+msgstr ""
 
 #. module: base_calendar
-#: selection:base.calendar.set.exrule,freq:0
-msgid "Minutely"
-msgstr "Cada minuto"
+#: selection:crm.meeting,state:0
+msgid "Unconfirmed"
+msgstr ""
 
 #. module: base_calendar
 #: help:calendar.attendee,sent_by:0
 msgid "Specify the user that is acting on behalf of the calendar user"
 msgstr ""
-"Indique el usuario que está actuando en nombre del usuario del calendario."
 
 #. module: base_calendar
 #: view:calendar.event:0
-#: field:calendar.event.edit.all,date_deadline:0
+#: field:calendar.event,date_deadline:0
+#: field:calendar.todo,date_deadline:0
+#: field:crm.meeting,date_deadline:0
 msgid "End Date"
-msgstr "Fecha final"
+msgstr ""
 
 #. module: base_calendar
-#: selection:base.calendar.set.exrule,month_list:0
 #: selection:calendar.event,month_list:0
 #: selection:calendar.todo,month_list:0
+#: selection:crm.meeting,month_list:0
 msgid "February"
-msgstr "Febrero"
-
-#. module: base_calendar
-#: selection:calendar.event,freq:0
-#: selection:calendar.todo,freq:0
-msgid "Months"
-msgstr "Meses"
+msgstr ""
 
 #. module: base_calendar
 #: selection:calendar.attendee,cutype:0
 msgid "Resource"
-msgstr "Recurso"
+msgstr ""
 
 #. module: base_calendar
+#: field:crm.meeting.type,name:0
 #: field:res.alarm,name:0
 msgid "Name"
-msgstr "Nombre"
+msgstr ""
 
 #. module: base_calendar
-#: model:ir.model,name:base_calendar.model_calendar_alarm
-msgid "Event alarm information"
-msgstr "Información del aviso del evento"
+#: field:calendar.event,exdate:0
+#: field:calendar.todo,exdate:0
+#: field:crm.meeting,exdate:0
+msgid "Exception Date/Times"
+msgstr ""
 
 #. module: base_calendar
 #: help:calendar.alarm,name:0
@@ -1504,154 +1404,162 @@ msgid ""
 "Contains the text to be                      used as the message subject for "
 "email                      or contains the text to be used for display"
 msgstr ""
-"Contiene el texto a usar como asunto del mensaje para correos electrónicos, "
-"o contiene el texto a mostrar"
 
 #. module: base_calendar
-#: field:calendar.event,alarm_id:0
-#: field:calendar.event,base_calendar_alarm_id:0
-#: field:calendar.todo,alarm_id:0
-#: field:calendar.todo,base_calendar_alarm_id:0
-msgid "Alarm"
-msgstr "Alarma"
-
-#. module: base_calendar
-#: code:addons/base_calendar/wizard/base_calendar_set_exrule.py:90
-#, python-format
-msgid "Please Apply Recurrency before applying Exception Rule."
+#: model:ir.model,name:base_calendar.model_mail_message
+msgid "Message"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.event,base_calendar_alarm_id:0
+#: field:calendar.todo,base_calendar_alarm_id:0
+#: field:crm.meeting,base_calendar_alarm_id:0
+msgid "Alarm"
 msgstr ""
-"Por favor, aplique la repetición antes de aplicar la excepción de la regla"
 
 #. module: base_calendar
 #: field:calendar.attendee,sent_by_uid:0
 msgid "Sent By User"
-msgstr "Enviado por usuario"
+msgstr ""
 
 #. module: base_calendar
-#: selection:base.calendar.set.exrule,month_list:0
 #: selection:calendar.event,month_list:0
 #: selection:calendar.todo,month_list:0
+#: selection:crm.meeting,month_list:0
 msgid "April"
-msgstr "Abril"
+msgstr ""
+
+#. module: base_calendar
+#: code:addons/base_calendar/crm_meeting.py:106
+#, python-format
+msgid "Email addresses not found"
+msgstr ""
 
 #. module: base_calendar
 #: view:calendar.event:0
 msgid "Recurrency period"
-msgstr "Periodo de recurrencia"
+msgstr ""
 
 #. module: base_calendar
-#: field:base.calendar.set.exrule,week_list:0
 #: field:calendar.event,week_list:0
 #: field:calendar.todo,week_list:0
+#: field:crm.meeting,week_list:0
 msgid "Weekday"
-msgstr "Día de la semana"
+msgstr ""
+
+#. module: base_calendar
+#: code:addons/base_calendar/base_calendar.py:1013
+#, python-format
+msgid "Interval cannot be negative."
+msgstr ""
 
 #. module: base_calendar
-#: field:base.calendar.set.exrule,byday:0
 #: field:calendar.event,byday:0
 #: field:calendar.todo,byday:0
+#: field:crm.meeting,byday:0
 msgid "By day"
-msgstr "Por día"
+msgstr ""
+
+#. module: base_calendar
+#: code:addons/base_calendar/base_calendar.py:441
+#, python-format
+msgid "First you have to specify the date of the invitation."
+msgstr ""
 
 #. module: base_calendar
 #: field:calendar.alarm,model_id:0
 msgid "Model"
-msgstr "Modelo"
+msgstr ""
 
 #. module: base_calendar
 #: selection:calendar.alarm,action:0
 msgid "Audio"
-msgstr "Audio"
+msgstr ""
 
 #. module: base_calendar
 #: field:calendar.event,id:0
 #: field:calendar.todo,id:0
+#: field:crm.meeting,id:0
 msgid "ID"
-msgstr "ID"
+msgstr ""
 
 #. module: base_calendar
 #: selection:calendar.attendee,role:0
 msgid "For information Purpose"
-msgstr "Con propósito informativo"
+msgstr ""
 
 #. module: base_calendar
-#: view:base_calendar.invite.attendee:0
-msgid "Invite"
-msgstr "Invitar"
+#: field:calendar.event,select1:0
+#: field:calendar.todo,select1:0
+#: field:crm.meeting,select1:0
+msgid "Option"
+msgstr ""
 
 #. module: base_calendar
 #: model:ir.model,name:base_calendar.model_calendar_attendee
 msgid "Attendee information"
-msgstr "Información asistentes"
+msgstr ""
 
 #. module: base_calendar
 #: field:calendar.alarm,res_id:0
 msgid "Resource ID"
-msgstr "ID del registro"
+msgstr ""
 
 #. module: base_calendar
 #: selection:calendar.attendee,state:0
 msgid "Needs Action"
-msgstr "Necesita acción"
+msgstr ""
 
 #. module: base_calendar
 #: field:calendar.attendee,sent_by:0
 msgid "Sent By"
-msgstr "Enviado por"
+msgstr ""
 
 #. module: base_calendar
 #: field:calendar.event,sequence:0
 #: field:calendar.todo,sequence:0
+#: field:crm.meeting,sequence:0
 msgid "Sequence"
-msgstr "Secuencia"
+msgstr ""
 
 #. module: base_calendar
 #: help:calendar.event,alarm_id:0
 #: help:calendar.todo,alarm_id:0
+#: help:crm.meeting,alarm_id:0
 msgid "Set an alarm at this time, before the event occurs"
-msgstr "Configure una alarma en este momento, antes de que ocurra el evento"
+msgstr ""
 
 #. module: base_calendar
-#: selection:base_calendar.invite.attendee,type:0
-msgid "Internal User"
-msgstr "Usuario interno"
-
-#. module: base_calendar
-#: view:calendar.attendee:0
 #: view:calendar.event:0
+#: view:crm.meeting:0
 msgid "Accept"
-msgstr "Aceptar"
+msgstr ""
 
 #. module: base_calendar
-#: selection:base.calendar.set.exrule,week_list:0
 #: selection:calendar.event,week_list:0
 #: selection:calendar.todo,week_list:0
+#: selection:crm.meeting,week_list:0
 msgid "Saturday"
-msgstr "Sábado"
+msgstr ""
 
 #. module: base_calendar
-#: view:calendar.attendee:0
-msgid "Invitation To"
-msgstr "Invitación a"
+#: field:calendar.event,interval:0
+#: field:calendar.todo,interval:0
+#: field:crm.meeting,interval:0
+msgid "Repeat Every"
+msgstr ""
 
 #. module: base_calendar
-#: selection:base.calendar.set.exrule,byday:0
 #: selection:calendar.event,byday:0
 #: selection:calendar.todo,byday:0
+#: selection:crm.meeting,byday:0
 msgid "Second"
-msgstr "Segundo"
+msgstr ""
 
 #. module: base_calendar
 #: field:calendar.attendee,availability:0
-#: field:res.users,availability:0
 msgid "Free/Busy"
-msgstr "Libre/Ocupado"
-
-#. module: base_calendar
-#: field:calendar.event,end_type:0
-#: field:calendar.todo,end_type:0
-msgid "Way to end reccurency"
-msgstr "Forma de terminar recurrencia"
+msgstr ""
 
 #. module: base_calendar
 #: field:calendar.alarm,duration:0
@@ -1659,20 +1567,16 @@ msgstr "Forma de terminar recurrencia"
 #: field:calendar.event,duration:0
 #: field:calendar.todo,date:0
 #: field:calendar.todo,duration:0
+#: field:crm.meeting,duration:0
 #: field:res.alarm,duration:0
 #: field:res.alarm,trigger_duration:0
 msgid "Duration"
-msgstr "Duración"
-
-#. module: base_calendar
-#: selection:base_calendar.invite.attendee,type:0
-msgid "External Email"
-msgstr "Email externo"
+msgstr ""
 
 #. module: base_calendar
 #: field:calendar.alarm,trigger_date:0
 msgid "Trigger Date"
-msgstr "Fecha activación"
+msgstr ""
 
 #. module: base_calendar
 #: help:calendar.alarm,attach:0
@@ -1684,19 +1588,10 @@ msgid ""
 "                    * Points to a procedure resource, which is invoked when  "
 "                    the alarm is triggered for procedure."
 msgstr ""
-"* Apunta a un recurso de sonido, que se escucha cuando la alarma se activa "
-"por audio.\n"
-"* El archivo que está intentando ser enviado como adjunto en el correo "
-"electrónico.\n"
-"* Apunta a un recurso de procedimiento, que se invoca cuando la alarma se "
-"activa por procedimiento."
 
 #. module: base_calendar
-#: selection:base.calendar.set.exrule,byday:0
 #: selection:calendar.event,byday:0
 #: selection:calendar.todo,byday:0
+#: selection:crm.meeting,byday:0
 msgid "Fifth"
-msgstr "Quinto"
-
-#~ msgid "Set Exclude range"
-#~ msgstr "Fijar el rango de exclusión"
+msgstr ""
diff --git a/addons/contacts/i18n/lt.po b/addons/contacts/i18n/lt.po
new file mode 100644
index 00000000000..c8e0c022368
--- /dev/null
+++ b/addons/contacts/i18n/lt.po
@@ -0,0 +1,45 @@
+# Lithuanian translation for openobject-addons
+# Copyright (c) 2013 Rosetta Contributors and Canonical Ltd 2013
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2013.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2013-03-07 08:38+0000\n"
+"PO-Revision-Date: 2013-04-24 18:23+0000\n"
+"Last-Translator: Giedrius Slavinskas - inovera.lt <giedrius@inovera.lt>\n"
+"Language-Team: Lithuanian <lt@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: 2013-04-25 06:05+0000\n"
+"X-Generator: Launchpad (build 16580)\n"
+
+#. module: contacts
+#: model:ir.actions.act_window,help:contacts.action_contacts
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"            Click to add a contact in your address book.\n"
+"          </p><p>\n"
+"            OpenERP helps you easily track all activities related to\n"
+"            a customer; discussions, history of business opportunities,\n"
+"            documents, etc.\n"
+"          </p>\n"
+"        "
+msgstr ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"Spauskite, kad sukurtumėte kontaktą adresų knygoje.\n"
+"</p><p>\n"
+"OpenERP pagalba galima stebėti visus veiksmus susijusius su\n"
+"kontaktu; bendravimas, pardavimų galimybių istorija,\n"
+"dokumentai, ir t.t.\n"
+"</p>\n"
+"        "
+
+#. module: contacts
+#: model:ir.actions.act_window,name:contacts.action_contacts
+#: model:ir.ui.menu,name:contacts.menu_contacts
+msgid "Contacts"
+msgstr "Kontaktai"
diff --git a/addons/decimal_precision/i18n/lt.po b/addons/decimal_precision/i18n/lt.po
index 578c87299ef..3b2b467fb6a 100644
--- a/addons/decimal_precision/i18n/lt.po
+++ b/addons/decimal_precision/i18n/lt.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2013-03-07 08:38+0000\n"
-"PO-Revision-Date: 2012-12-21 23:00+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"PO-Revision-Date: 2013-04-24 18:20+0000\n"
+"Last-Translator: Giedrius Slavinskas - inovera.lt <giedrius@inovera.lt>\n"
 "Language-Team: Lithuanian <lt@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: 2013-03-28 05:37+0000\n"
-"X-Generator: Launchpad (build 16546)\n"
+"X-Launchpad-Export-Date: 2013-04-25 06:05+0000\n"
+"X-Generator: Launchpad (build 16580)\n"
 
 #. module: decimal_precision
 #: field:decimal.precision,digits:0
@@ -26,7 +26,7 @@ msgstr "Skaitmenys"
 #: 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 "Dešimtainis tikslumas"
+msgstr "Skaičiai po kableliu"
 
 #. module: decimal_precision
 #: field:decimal.precision,name:0
@@ -36,7 +36,7 @@ msgstr "Naudojimas"
 #. module: decimal_precision
 #: sql_constraint:decimal.precision:0
 msgid "Only one value can be defined for each given usage!"
-msgstr ""
+msgstr "Tik po vieną reikšmę galima priskirti kiekvienam panaudojimo atvejui"
 
 #. module: decimal_precision
 #: view:decimal.precision:0
diff --git a/addons/delivery/i18n/nl.po b/addons/delivery/i18n/nl.po
index d2f1aa13685..c0292981813 100644
--- a/addons/delivery/i18n/nl.po
+++ b/addons/delivery/i18n/nl.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2013-03-07 08:38+0000\n"
-"PO-Revision-Date: 2012-12-25 14:40+0000\n"
+"PO-Revision-Date: 2013-04-24 07:47+0000\n"
 "Last-Translator: Erwin van der Ploeg (Endian Solutions) <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: 2013-03-28 05:37+0000\n"
-"X-Generator: Launchpad (build 16546)\n"
+"X-Launchpad-Export-Date: 2013-04-25 06:05+0000\n"
+"X-Generator: Launchpad (build 16580)\n"
 
 #. module: delivery
 #: report:sale.shipping:0
@@ -615,7 +615,7 @@ msgstr "Verkoopprijs"
 #. module: delivery
 #: view:stock.picking.out:0
 msgid "Print Delivery Order"
-msgstr "Afdrukken leveringsbon"
+msgstr "Verzamellijst afdrukken"
 
 #. module: delivery
 #: view:delivery.grid:0
diff --git a/addons/hr_timesheet_sheet/i18n/it.po b/addons/hr_timesheet_sheet/i18n/it.po
index b0f4e0c2b30..541ef70d118 100644
--- a/addons/hr_timesheet_sheet/i18n/it.po
+++ b/addons/hr_timesheet_sheet/i18n/it.po
@@ -8,14 +8,15 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2013-03-07 08:37+0000\n"
-"PO-Revision-Date: 2012-12-21 23:00+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"PO-Revision-Date: 2013-04-24 07:44+0000\n"
+"Last-Translator: Leonardo Pistone - Agile BG - Domsense "
+"<leonardo.pistone@agilebg.com>\n"
 "Language-Team: Italian <it@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: 2013-03-28 05:43+0000\n"
-"X-Generator: Launchpad (build 16546)\n"
+"X-Launchpad-Export-Date: 2013-04-25 06:05+0000\n"
+"X-Generator: Launchpad (build 16580)\n"
 
 #. module: hr_timesheet_sheet
 #: field:hr.analytic.timesheet,sheet_id:0
@@ -43,6 +44,8 @@ msgid ""
 "                computation for one sheet. Set this to 0 if you do not want "
 "any control."
 msgstr ""
+"Differenza consentita tra le ore di presenza e le ore segnate sul timesheet, "
+"in ore per ogni timesheet. Imposta a 0 per disattivare il controllo."
 
 #. module: hr_timesheet_sheet
 #: view:hr.timesheet.report:0
@@ -77,6 +80,8 @@ msgid ""
 "In order to create a timesheet for this employee, you must assign an "
 "analytic journal to the employee, like 'Timesheet Journal'."
 msgstr ""
+"Per creare un timesheet per questo dipendente, bisogna assegnare un "
+"Sezionale Analitico al dipendente. Ad esempio, 'Sezionale Timesheet'."
 
 #. module: hr_timesheet_sheet
 #: selection:hr.timesheet.report,month:0
@@ -93,7 +98,7 @@ msgstr "# Costo"
 #. module: hr_timesheet_sheet
 #: field:hr_timesheet_sheet.sheet,message_unread:0
 msgid "Unread Messages"
-msgstr ""
+msgstr "Messaggi Non Letti"
 
 #. module: hr_timesheet_sheet
 #: view:hr.timesheet.report:0
@@ -113,7 +118,7 @@ msgstr "Azienda"
 #: model:process.node,name:hr_timesheet_sheet.process_node_timesheet0
 #: view:timesheet.report:0
 msgid "Timesheet"
-msgstr "Orario di Lavoro"
+msgstr "Timesheet"
 
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet:0
@@ -134,7 +139,7 @@ msgstr "Fino a"
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet:0
 msgid "to"
-msgstr ""
+msgstr "a"
 
 #. module: hr_timesheet_sheet
 #: model:process.node,note:hr_timesheet_sheet.process_node_invoiceonwork0
@@ -146,7 +151,7 @@ msgstr "Basato su timesheet"
 #: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:397
 #, python-format
 msgid "You cannot modify an entry in a confirmed timesheet."
-msgstr ""
+msgstr "Non è possibile modificare le righe di un timesheet confermato."
 
 #. module: hr_timesheet_sheet
 #: view:hr.timesheet.report:0
@@ -157,7 +162,7 @@ msgstr ""
 #. module: hr_timesheet_sheet
 #: model:ir.ui.menu,name:hr_timesheet_sheet.menu_act_hr_timesheet_sheet_form_my_current
 msgid "My Current Timesheet"
-msgstr "I Miei Orari di Lavoro attuali"
+msgstr "Il mio Timesheet corrente"
 
 #. module: hr_timesheet_sheet
 #: model:process.transition.action,name:hr_timesheet_sheet.process_transition_action_validatetimesheet0
@@ -167,7 +172,7 @@ msgstr "Convalida"
 #. module: hr_timesheet_sheet
 #: selection:hr_timesheet_sheet.sheet,state:0
 msgid "Approved"
-msgstr ""
+msgstr "Approvato"
 
 #. module: hr_timesheet_sheet
 #: selection:hr_timesheet_sheet.sheet,state_attendance:0
@@ -195,7 +200,7 @@ msgstr ""
 #: code:addons/hr_timesheet_sheet/wizard/hr_timesheet_current.py:38
 #, python-format
 msgid "Please create an employee and associate it with this user."
-msgstr ""
+msgstr "Crea un dipendente e associalo a questo utente."
 
 #. module: hr_timesheet_sheet
 #: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:401
@@ -209,7 +214,7 @@ msgstr ""
 #: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:205
 #, python-format
 msgid "Week "
-msgstr ""
+msgstr "Settimana "
 
 #. module: hr_timesheet_sheet
 #: model:ir.actions.act_window,help:hr_timesheet_sheet.action_hr_timesheet_current_open
@@ -225,7 +230,7 @@ msgstr ""
 #. module: hr_timesheet_sheet
 #: field:hr_timesheet_sheet.sheet,message_ids:0
 msgid "Messages"
-msgstr ""
+msgstr "Messaggi"
 
 #. module: hr_timesheet_sheet
 #: help:hr_timesheet_sheet.sheet,state:0
@@ -251,7 +256,7 @@ msgstr ""
 #: code:addons/hr_timesheet_sheet/wizard/hr_timesheet_current.py:38
 #, python-format
 msgid "Error!"
-msgstr ""
+msgstr "Errore!"
 
 #. module: hr_timesheet_sheet
 #: field:hr.config.settings,timesheet_max_difference:0
@@ -275,7 +280,7 @@ msgstr ""
 #. module: hr_timesheet_sheet
 #: field:hr_timesheet_sheet.sheet.account,name:0
 msgid "Project / Analytic Account"
-msgstr ""
+msgstr "Progetto / Conto Analitico"
 
 #. module: hr_timesheet_sheet
 #: model:process.transition,name:hr_timesheet_sheet.process_transition_validatetimesheet0
@@ -314,7 +319,7 @@ msgstr ""
 #: view:timesheet.report:0
 #: field:timesheet.report,account_id:0
 msgid "Analytic Account"
-msgstr "Contabilità Analitica"
+msgstr "Conto Analitico"
 
 #. module: hr_timesheet_sheet
 #: help:hr_timesheet_sheet.sheet,message_summary:0
@@ -340,7 +345,7 @@ msgstr "Data Da"
 #: model:ir.actions.act_window,name:hr_timesheet_sheet.act_hr_employee_2_hr_timesheet
 #: view:res.company:0
 msgid "Timesheets"
-msgstr "Orari di Lavoro"
+msgstr "Timesheet"
 
 #. module: hr_timesheet_sheet
 #: model:process.node,name:hr_timesheet_sheet.process_node_confirmedtimesheet0
@@ -364,7 +369,7 @@ msgstr "Conferma"
 #. module: hr_timesheet_sheet
 #: field:hr_timesheet_sheet.sheet,timesheet_ids:0
 msgid "Timesheet lines"
-msgstr "Righe Orari di Lavoro"
+msgstr "Righe Timesheet"
 
 #. module: hr_timesheet_sheet
 #: field:hr_timesheet_sheet.sheet,message_follower_ids:0
@@ -379,7 +384,7 @@ msgstr "Lo stato è \"Confermato\"."
 #. module: hr_timesheet_sheet
 #: field:hr_timesheet_sheet.sheet,employee_id:0
 msgid "Employee"
-msgstr "Impiegato"
+msgstr "Dipendente"
 
 #. module: hr_timesheet_sheet
 #: selection:hr_timesheet_sheet.sheet,state:0
@@ -401,7 +406,7 @@ msgstr "Durata totale"
 #: model:ir.actions.act_window,name:hr_timesheet_sheet.act_hr_timesheet_sheet_form
 #: model:ir.ui.menu,name:hr_timesheet_sheet.menu_act_hr_timesheet_sheet_form
 msgid "Timesheets to Validate"
-msgstr ""
+msgstr "Timesheet da validare"
 
 #. module: hr_timesheet_sheet
 #: view:hr.timesheet.report:0
diff --git a/addons/mrp/i18n/nl.po b/addons/mrp/i18n/nl.po
index ffe4c42466b..cbbcb7de57b 100644
--- a/addons/mrp/i18n/nl.po
+++ b/addons/mrp/i18n/nl.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2013-03-07 08:37+0000\n"
-"PO-Revision-Date: 2013-04-14 19:20+0000\n"
+"PO-Revision-Date: 2013-04-24 07:33+0000\n"
 "Last-Translator: Erwin van der Ploeg (Endian Solutions) <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: 2013-04-15 06:07+0000\n"
-"X-Generator: Launchpad (build 16564)\n"
+"X-Launchpad-Export-Date: 2013-04-25 06:05+0000\n"
+"X-Generator: Launchpad (build 16580)\n"
 
 #. module: mrp
 #: help:mrp.config.settings,module_mrp_repair:0
@@ -967,7 +967,7 @@ msgstr ""
 #. module: mrp
 #: view:mrp.production:0
 msgid "Mark as Started"
-msgstr "Markeert als gestart"
+msgstr "Markeer als gestart"
 
 #. module: mrp
 #: view:mrp.production:0
diff --git a/addons/note_pad/i18n/lt.po b/addons/note_pad/i18n/lt.po
new file mode 100644
index 00000000000..04f8fb30b0a
--- /dev/null
+++ b/addons/note_pad/i18n/lt.po
@@ -0,0 +1,28 @@
+# Lithuanian translation for openobject-addons
+# Copyright (c) 2013 Rosetta Contributors and Canonical Ltd 2013
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2013.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2013-03-07 08:38+0000\n"
+"PO-Revision-Date: 2013-04-24 18:32+0000\n"
+"Last-Translator: Giedrius Slavinskas - inovera.lt <giedrius@inovera.lt>\n"
+"Language-Team: Lithuanian <lt@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: 2013-04-25 06:06+0000\n"
+"X-Generator: Launchpad (build 16580)\n"
+
+#. module: note_pad
+#: model:ir.model,name:note_pad.model_note_note
+msgid "Note"
+msgstr "Užrašinė"
+
+#. module: note_pad
+#: field:note.note,note_pad_url:0
+msgid "Pad Url"
+msgstr "Nuorodą į užrašinę"
diff --git a/addons/pad_project/i18n/lt.po b/addons/pad_project/i18n/lt.po
new file mode 100644
index 00000000000..bbfc4e4a786
--- /dev/null
+++ b/addons/pad_project/i18n/lt.po
@@ -0,0 +1,39 @@
+# Lithuanian translation for openobject-addons
+# Copyright (c) 2013 Rosetta Contributors and Canonical Ltd 2013
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2013.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2013-03-07 08:38+0000\n"
+"PO-Revision-Date: 2013-04-24 18:35+0000\n"
+"Last-Translator: Giedrius Slavinskas - inovera.lt <giedrius@inovera.lt>\n"
+"Language-Team: Lithuanian <lt@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: 2013-04-25 06:06+0000\n"
+"X-Generator: Launchpad (build 16580)\n"
+
+#. module: pad_project
+#: constraint:project.task:0
+msgid "Error ! Task end-date must be greater then task start-date"
+msgstr ""
+"Klaida! Užduotės pabaigos data negali būti ankstesnė nei pradžios data"
+
+#. module: pad_project
+#: field:project.task,description_pad:0
+msgid "Description PAD"
+msgstr ""
+
+#. module: pad_project
+#: model:ir.model,name:pad_project.model_project_task
+msgid "Task"
+msgstr "Užduotis"
+
+#. module: pad_project
+#: constraint:project.task:0
+msgid "Error ! You cannot create recursive tasks."
+msgstr "Klaida! Negalima sukurti rekursinių užduočių."
diff --git a/addons/plugin/i18n/lt.po b/addons/plugin/i18n/lt.po
new file mode 100644
index 00000000000..5132c60d58c
--- /dev/null
+++ b/addons/plugin/i18n/lt.po
@@ -0,0 +1,23 @@
+# Lithuanian translation for openobject-addons
+# Copyright (c) 2013 Rosetta Contributors and Canonical Ltd 2013
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2013.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2013-03-07 08:38+0000\n"
+"PO-Revision-Date: 2013-04-24 18:14+0000\n"
+"Last-Translator: Giedrius Slavinskas - inovera.lt <giedrius@inovera.lt>\n"
+"Language-Team: Lithuanian <lt@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: 2013-04-25 06:06+0000\n"
+"X-Generator: Launchpad (build 16580)\n"
+
+#. module: plugin
+#: model:ir.model,name:plugin.model_plugin_handler
+msgid "plugin.handler"
+msgstr "plugin.handler"
diff --git a/addons/portal_anonymous/i18n/lt.po b/addons/portal_anonymous/i18n/lt.po
new file mode 100644
index 00000000000..b0c95087319
--- /dev/null
+++ b/addons/portal_anonymous/i18n/lt.po
@@ -0,0 +1,25 @@
+# Lithuanian translation for openobject-addons
+# Copyright (c) 2013 Rosetta Contributors and Canonical Ltd 2013
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2013.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2013-03-07 08:38+0000\n"
+"PO-Revision-Date: 2013-04-24 18:34+0000\n"
+"Last-Translator: Giedrius Slavinskas - inovera.lt <giedrius@inovera.lt>\n"
+"Language-Team: Lithuanian <lt@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: 2013-04-25 06:06+0000\n"
+"X-Generator: Launchpad (build 16580)\n"
+
+#. module: portal_anonymous
+#. openerp-web
+#: code:addons/portal_anonymous/static/src/xml/portal_anonymous.xml:8
+#, python-format
+msgid "Login"
+msgstr "Prisijungti"
diff --git a/addons/portal_sale/i18n/fr.po b/addons/portal_sale/i18n/fr.po
index 6ed3e5dd179..bf65092f4d7 100644
--- a/addons/portal_sale/i18n/fr.po
+++ b/addons/portal_sale/i18n/fr.po
@@ -8,24 +8,24 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2013-03-07 08:38+0000\n"
-"PO-Revision-Date: 2012-12-21 23:00+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"PO-Revision-Date: 2013-04-24 10:19+0000\n"
+"Last-Translator: WANTELLET Sylvain <Swantellet@tetra-info.com>\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: 2013-03-28 05:53+0000\n"
-"X-Generator: Launchpad (build 16546)\n"
+"X-Launchpad-Export-Date: 2013-04-25 06:06+0000\n"
+"X-Generator: Launchpad (build 16580)\n"
 
 #. module: portal_sale
 #: model:ir.model,name:portal_sale.model_account_config_settings
 msgid "account.config.settings"
-msgstr ""
+msgstr "account.config.settings"
 
 #. module: portal_sale
 #: view:account.invoice:0
 msgid "[('share','=', False)]"
-msgstr ""
+msgstr "[('share','=', False)]"
 
 #. module: portal_sale
 #: model:ir.actions.act_window,help:portal_sale.portal_action_invoices
@@ -38,6 +38,8 @@ msgid ""
 "${(object.name or '').replace('/','_')}_${object.state == 'draft' and "
 "'draft' or ''}"
 msgstr ""
+"${(object.name or '').replace('/','_')}_${object.state == 'draft' and "
+"'draft' or ''}"
 
 #. module: portal_sale
 #: model:res.groups,name:portal_sale.group_payment_options
@@ -55,6 +57,8 @@ msgid ""
 "${object.company_id.name} ${object.state in ('draft', 'sent') and "
 "'Quotation' or 'Order'} (Ref ${object.name or 'n/a' })"
 msgstr ""
+"${object.company_id.name} ${object.state in ('draft', 'sent') and 'Devis' or "
+"'Commande'} (Réf. ${object.name or 'n/a' })"
 
 #. module: portal_sale
 #: model:ir.actions.act_window,help:portal_sale.action_quotations_portal
@@ -179,6 +183,108 @@ msgid ""
 "</div>\n"
 "            "
 msgstr ""
+"\n"
+"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
+"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
+"255, 255); \">\n"
+"\n"
+"    <p>Bonjour ${object.partner_id.name},</p>\n"
+"    \n"
+"    <p>Veuillez trouver ci-joint votre ${object.state in ('draft', 'sent') "
+"and 'devis' or 'confirmation de commande'} de la part de "
+"${object.company_id.name} : </p>\n"
+"\n"
+"    <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
+"       &nbsp;&nbsp;<strong>RÉFÉRENCES</strong><br />\n"
+"       &nbsp;&nbsp;Numéro: <strong>${object.name}</strong><br />\n"
+"       &nbsp;&nbsp;Montant total: <strong>${object.amount_total} "
+"${object.pricelist_id.currency_id.name}</strong><br />\n"
+"       &nbsp;&nbsp;Date: ${object.date_order}<br />\n"
+"       % if object.origin:\n"
+"       &nbsp;&nbsp;Référence: ${object.origin}<br />\n"
+"       % endif\n"
+"       % if object.client_order_ref:\n"
+"       &nbsp;&nbsp;Votre référence: ${object.client_order_ref}<br />\n"
+"       % endif\n"
+"       % if object.user_id:\n"
+"       &nbsp;&nbsp;Votre contact: <a href=\"mailto:${object.user_id.email or "
+"''}?subject=Order%20${object.name}\">${object.user_id.name}</a>\n"
+"       % endif\n"
+"    </p>\n"
+"\n"
+"    <% set signup_url = object.get_signup_url() %>\n"
+"    % if signup_url:\n"
+"    <p>\n"
+"    Vous pouvez accéder à ce document et payer en ligne grâce à votre "
+"portail client:\n"
+"    </p>\n"
+"        <a style=\"display:block; width: 150px; height:20px; margin-left: "
+"120px; color: #DDD; font-family: 'Lucida Grande', Helvetica, Arial, sans-"
+"serif; font-size: 13px; font-weight: bold; text-align: center; text-"
+"decoration: none !important; line-height: 1; padding: 5px 0px 0px 0px; "
+"background-color: #8E0000; border-radius: 5px 5px; background-repeat: repeat "
+"no-repeat;\"\n"
+"           href=\"${signup_url}\">Voir ${object.state in ('draft', 'sent') "
+"and 'le devis' or 'la commande'}</a>\n"
+"    % endif\n"
+"\n"
+"    % if object.paypal_url:\n"
+"    <br/>\n"
+"    <p>Il vous est également possible de payer directement avec Paypal:</p>\n"
+"        <a style=\"margin-left: 120px;\" href=\"${object.paypal_url}\">\n"
+"            <img class=\"oe_edi_paypal_button\" "
+"src=\"https://www.paypal.com/en_US/i/btn/btn_paynowCC_LG.gif\"/>\n"
+"        </a>\n"
+"    % endif\n"
+"\n"
+"    <br/>\n"
+"    <p>Si vous avez des questions, n'hésitez pas à nous contacter.</p>\n"
+"    <p>Merci d'avoir choisi ${object.company_id.name or 'us'} !</p>\n"
+"    <br/>\n"
+"    <br/>\n"
+"    <div style=\"width: 375px; margin: 0px; padding: 0px; background-color: "
+"#8E0000; border-top-left-radius: 5px 5px; border-top-right-radius: 5px 5px; "
+"background-repeat: repeat no-repeat;\">\n"
+"        <h3 style=\"margin: 0px; padding: 2px 14px; font-size: 12px; color: "
+"#DDD;\">\n"
+"            <strong style=\"text-"
+"transform:uppercase;\">${object.company_id.name}</strong></h3>\n"
+"    </div>\n"
+"    <div style=\"width: 347px; margin: 0px; padding: 5px 14px; line-height: "
+"16px; background-color: #F2F2F2;\">\n"
+"        <span style=\"color: #222; margin-bottom: 5px; display: block; \">\n"
+"        % if object.company_id.street:\n"
+"            ${object.company_id.street}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.street2:\n"
+"            ${object.company_id.street2}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.city or object.company_id.zip:\n"
+"            ${object.company_id.zip} ${object.company_id.city}<br/>\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 ''}<br/>\n"
+"        % endif\n"
+"        </span>\n"
+"        % if object.company_id.phone:\n"
+"            <div style=\"margin-top: 0px; margin-right: 0px; margin-bottom: "
+"0px; margin-left: 0px; padding-top: 0px; padding-right: 0px; padding-bottom: "
+"0px; padding-left: 0px; \">\n"
+"                Tél:&nbsp; ${object.company_id.phone}\n"
+"            </div>\n"
+"        % endif\n"
+"        % if object.company_id.website:\n"
+"            <div>\n"
+"                Web :&nbsp;<a "
+"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
+"            </div>\n"
+"        % endif\n"
+"        <p></p>\n"
+"    </div>\n"
+"</div>\n"
+"            "
 
 #. module: portal_sale
 #: model:email.template,report_name:portal_sale.email_template_edi_invoice
@@ -186,11 +292,13 @@ msgid ""
 "Invoice_${(object.number or '').replace('/','_')}_${object.state == 'draft' "
 "and 'draft' or ''}"
 msgstr ""
+"Invoice_${(object.number or '').replace('/','_')}_${object.state == 'draft' "
+"and 'draft' or ''}"
 
 #. module: portal_sale
 #: model:email.template,subject:portal_sale.email_template_edi_invoice
 msgid "${object.company_id.name} Invoice (Ref ${object.number or 'n/a' })"
-msgstr ""
+msgstr "${object.company_id.name} Facture (Ref ${object.number or 'n/a' })"
 
 #. module: portal_sale
 #: model:ir.model,name:portal_sale.model_mail_mail
@@ -201,7 +309,7 @@ msgstr ""
 #: model:ir.actions.act_window,name:portal_sale.action_quotations_portal
 #: model:ir.ui.menu,name:portal_sale.portal_quotations
 msgid "Quotations"
-msgstr ""
+msgstr "Devis"
 
 #. module: portal_sale
 #: model:ir.model,name:portal_sale.model_sale_order
@@ -225,7 +333,7 @@ msgstr ""
 #: model:ir.actions.act_window,name:portal_sale.portal_action_invoices
 #: model:ir.ui.menu,name:portal_sale.portal_invoices
 msgid "Invoices"
-msgstr ""
+msgstr "Factures"
 
 #. module: portal_sale
 #: view:account.config.settings:0
@@ -332,6 +440,102 @@ msgid ""
 "</div>\n"
 "            "
 msgstr ""
+"\n"
+"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
+"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
+"255, 255); \">\n"
+"\n"
+"    <p>Bonjour ${object.partner_id.name},</p>\n"
+"\n"
+"    <p>Une nouvelle facture est mise à votre disposition: </p>\n"
+"    \n"
+"    <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
+"       &nbsp;&nbsp;<strong>RÉFÉRENCES</strong><br />\n"
+"       &nbsp;&nbsp;Facture n°: <strong>${object.number}</strong><br />\n"
+"       &nbsp;&nbsp;Montant total: <strong>${object.amount_total} "
+"${object.currency_id.name}</strong><br />\n"
+"       &nbsp;&nbsp;Date de facture: ${object.date_invoice}<br />\n"
+"       % if object.origin:\n"
+"       &nbsp;&nbsp;Référence commande: ${object.origin}<br />\n"
+"       % endif\n"
+"       % if object.user_id:\n"
+"       &nbsp;&nbsp;Votre contact: <a href=\"mailto:${object.user_id.email or "
+"''}?subject=Facture%20${object.number}\">${object.user_id.name}</a>\n"
+"       % endif\n"
+"    </p>  \n"
+"\n"
+"    <% set signup_url = object.get_signup_url() %>\n"
+"    % if signup_url:\n"
+"    <p>\n"
+"    Vous pouvez accéder à ce document et payer en ligne grâce à votre "
+"portail client:\n"
+"    </p>\n"
+"        <a style=\"display:block; width: 150px; height:20px; margin-left: "
+"120px; color: #DDD; font-family: 'Lucida Grande', Helvetica, Arial, sans-"
+"serif; font-size: 13px; font-weight: bold; text-align: center; text-"
+"decoration: none !important; line-height: 1; padding: 5px 0px 0px 0px; "
+"background-color: #8E0000; border-radius: 5px 5px; background-repeat: repeat "
+"no-repeat;\"\n"
+"           href=\"${signup_url}\">Voir la facture</a>\n"
+"    % endif\n"
+"    \n"
+"    % if object.paypal_url:\n"
+"    <br/>\n"
+"    <p>Il vous est également possible de payer directement avec Paypal:</p>\n"
+"        <a style=\"margin-left: 120px;\" href=\"${object.paypal_url}\">\n"
+"            <img class=\"oe_edi_paypal_button\" "
+"src=\"https://www.paypal.com/en_US/i/btn/btn_paynowCC_LG.gif\"/>\n"
+"        </a>\n"
+"    % endif\n"
+"    \n"
+"    <br/>\n"
+"    <p>Si vous avez des questions, n'hésitez pas à nous contacter.</p>\n"
+"    <p>Merci d'avoir choisi ${object.company_id.name or 'us'} !</p>\n"
+"    <br/>\n"
+"    <br/>\n"
+"    <div style=\"width: 375px; margin: 0px; padding: 0px; background-color: "
+"#8E0000; border-top-left-radius: 5px 5px; border-top-right-radius: 5px 5px; "
+"background-repeat: repeat no-repeat;\">\n"
+"        <h3 style=\"margin: 0px; padding: 2px 14px; font-size: 12px; color: "
+"#DDD;\">\n"
+"            <strong style=\"text-"
+"transform:uppercase;\">${object.company_id.name}</strong></h3>\n"
+"    </div>\n"
+"    <div style=\"width: 347px; margin: 0px; padding: 5px 14px; line-height: "
+"16px; background-color: #F2F2F2;\">\n"
+"        <span style=\"color: #222; margin-bottom: 5px; display: block; \">\n"
+"        % if object.company_id.street:\n"
+"            ${object.company_id.street}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.street2:\n"
+"            ${object.company_id.street2}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.city or object.company_id.zip:\n"
+"            ${object.company_id.zip} ${object.company_id.city}<br/>\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 ''}<br/>\n"
+"        % endif\n"
+"        </span>\n"
+"        % if object.company_id.phone:\n"
+"            <div style=\"margin-top: 0px; margin-right: 0px; margin-bottom: "
+"0px; margin-left: 0px; padding-top: 0px; padding-right: 0px; padding-bottom: "
+"0px; padding-left: 0px; \">\n"
+"                Tél:&nbsp; ${object.company_id.phone}\n"
+"            </div>\n"
+"        % endif\n"
+"        % if object.company_id.website:\n"
+"            <div>\n"
+"                Web :&nbsp;<a "
+"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
+"            </div>\n"
+"        % endif\n"
+"        <p></p>\n"
+"    </div>\n"
+"</div>\n"
+"            "
 
 #. module: portal_sale
 #: model:ir.actions.act_window,help:portal_sale.action_orders_portal
diff --git a/addons/sale/i18n/tr.po b/addons/sale/i18n/tr.po
index 6d13ec40ea8..c00d049b955 100644
--- a/addons/sale/i18n/tr.po
+++ b/addons/sale/i18n/tr.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2013-03-07 08:37+0000\n"
-"PO-Revision-Date: 2013-04-13 18:22+0000\n"
+"PO-Revision-Date: 2013-04-24 21:14+0000\n"
 "Last-Translator: Ayhan KIZILTAN <Unknown>\n"
 "Language-Team: Turkish <tr@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: 2013-04-14 05:50+0000\n"
-"X-Generator: Launchpad (build 16564)\n"
+"X-Launchpad-Export-Date: 2013-04-25 06:06+0000\n"
+"X-Generator: Launchpad (build 16580)\n"
 
 #. module: sale
 #: model:res.groups,name:sale.group_analytic_accounting
@@ -992,7 +992,7 @@ msgstr "Aralık"
 #. module: sale
 #: view:sale.config.settings:0
 msgid "Contracts Management"
-msgstr "Şözleşmelerin Yönetimi"
+msgstr "Şözleşme Yönetimi"
 
 #. module: sale
 #: view:sale.order.line:0
@@ -2277,7 +2277,7 @@ msgid ""
 msgstr ""
 "Sözleşmeyi kullanarak hizmetlerinizi, müşterinizle olan\n"
 "                        aynı sözleşmenizin bir kısmı olarak çok faturalı\n"
-"                        olan yürütün."
+"                        olarak yürütün."
 
 #. module: sale
 #: view:sale.report:0
diff --git a/addons/stock/i18n/pt_BR.po b/addons/stock/i18n/pt_BR.po
index ac87ca0c1b5..5fb5fa2f5c2 100644
--- a/addons/stock/i18n/pt_BR.po
+++ b/addons/stock/i18n/pt_BR.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: 2013-04-24 05:28+0000\n"
+"X-Launchpad-Export-Date: 2013-04-25 06:06+0000\n"
 "X-Generator: Launchpad (build 16580)\n"
 
 #. module: stock
diff --git a/addons/web_shortcuts/i18n/lt.po b/addons/web_shortcuts/i18n/lt.po
new file mode 100644
index 00000000000..b75eb2d7801
--- /dev/null
+++ b/addons/web_shortcuts/i18n/lt.po
@@ -0,0 +1,25 @@
+# Lithuanian translation for openobject-addons
+# Copyright (c) 2013 Rosetta Contributors and Canonical Ltd 2013
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2013.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2013-03-07 08:39+0000\n"
+"PO-Revision-Date: 2013-04-24 18:29+0000\n"
+"Last-Translator: Giedrius Slavinskas - inovera.lt <giedrius@inovera.lt>\n"
+"Language-Team: Lithuanian <lt@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: 2013-04-25 06:06+0000\n"
+"X-Generator: Launchpad (build 16580)\n"
+
+#. module: web_shortcuts
+#. openerp-web
+#: code:addons/web_shortcuts/static/src/xml/web_shortcuts.xml:21
+#, python-format
+msgid "Add / Remove Shortcut..."
+msgstr "Pridėti / pašalinti trumpinį..."
diff --git a/openerp/addons/base/i18n/de.po b/openerp/addons/base/i18n/de.po
index cda978f6242..f72bd84d5c1 100644
--- a/openerp/addons/base/i18n/de.po
+++ b/openerp/addons/base/i18n/de.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-server\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2013-03-07 08:36+0000\n"
-"PO-Revision-Date: 2013-04-23 20:34+0000\n"
+"PO-Revision-Date: 2013-04-24 12:39+0000\n"
 "Last-Translator: Thorsten Vocks (OpenBig.org) <thorsten.vocks@big-"
 "consulting.net>\n"
 "Language-Team: German <de@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: 2013-04-24 05:28+0000\n"
+"X-Launchpad-Export-Date: 2013-04-25 06:05+0000\n"
 "X-Generator: Launchpad (build 16580)\n"
 
 #. module: base
@@ -3472,24 +3472,25 @@ msgid ""
 "    "
 msgstr ""
 "\n"
-"Verwaltet Ihre Beschaffungsaufträge\n"
+"Management  Ihrer Beschaffungsaufträge\n"
 "==================================================\n"
 "\n"
-"Die Beschaffungsverwaltung erlaubt Ihnen die Verfolgung von Angebotsanfragen "
-"und ermöglicht die Konvertierung in einen Beschaffungsauftrag, falls "
-"erforderlich.\n"
-"OpenERP stellt diverse Verfahren zur Rechnugsüberwachung und Verfolgung "
-"Ihrer Lieferscheine zur Verfügung. Sie können Teillieferungen verarbeiten "
-"und so den Verlauf der Lieferungen überwachen, sowie bei Bedarf automatische "
-"Erinnerungen erzeugen.\n"
+"Das Beschaffungsmanagement  ermöglicht die Rückverfolgung von "
+"Angebotsanfragen und die anschließende Konvertierung in einen "
+"Beschaffungsauftrag. OpenERP stellt diverse Verfahren zur "
+"Rechnungsüberwachung und Verfolgung Ihrer Lieferscheine zur Verfügung. Sie "
+"können Teillieferungen verarbeiten und so den Verlauf der Lieferungen "
+"überwachen, sowie bei Bedarf automatische Erinnerungen an Lieferanten "
+"erzeugen.\n"
 "\n"
 "OpenERP's Regeln zur Mindestmengenverwaltung ermöglichen die Erzeugung von "
 "Beschaffungsauftragsentwürfen oder Sie können einen schlanken "
 "Beschaffungsprozess zur bedarfsorientierten Beschaffung basierend auf Ihrer "
 "Auslastung konfigurieren.\n"
 "\n"
-"Dashboard/Berichte für die Beschaffungsverwaltung enthalten:\n"
-"---------------------------------------------------------\n"
+"Die Anzeigetafel / Berichte für die Beschaffung enthalten:\n"
+"-----------------------------------------------------------------------------"
+"--------\n"
 "* Angebotsanfrage\n"
 "* Beschaffungsaufträge, die auf die Freigabe warten\n"
 "* Monatliche Beschaffungen nach Kategorie\n"
@@ -14909,35 +14910,37 @@ msgid ""
 "    "
 msgstr ""
 "\n"
-"Geschäftsorientiertes Soziales Netzwerk\n"
+"Soziales Netzwerk für Unternehmen\n"
 "=================================\n"
-"Die Anwendung Soziales Netzwerk ermöglicht eine einheitliche soziale "
-"Netzwerk Abstraktionsebene, welches Bewerbern eine komplette "
-"Kommunikationshistorie anzeigt, mit einem voll integrierten E-Mail und "
-"Nachrichten Management System. \n"
+"Die Anwendung Soziales Netzwerk ermöglicht allen Anwendungen in OpenERP die "
+"Nutzung eines voll integrierten E-Mail und Nachrichten Management System und "
+"realisiert damit eine einheitliche, übergreifende und zusätzliche generische "
+"Kommunikationsplattform für alle OpenERP Anwendungen. \n"
 "\n"
 "Es ermöglicht dem Benutzer Nachrichten ebenso wie E-Mails zu lesen und zu "
-"senden. Weiterhin bietet es eine Feeds-Seite gemeinsam mit einem Abonnement-"
-"Mechanismus an, um Dokumente zu verfolgen und stets über aktuelle "
-"Nachrichten auf dem Laufenden gehalten werden zu können.\n"
+"senden. Weiterhin bietet es eine zentrale Feeds-Seite gemeinsam mit einem "
+"Abonnement-Mechanismus an, um hierdurch gezielt Dokumente zu verfolgen und "
+"somit stets über aktuelle Nachrichten zu diesen Geschäftsvorfällen Bescheid "
+"zu wissen.\n"
 "\n"
-"Hauptmerkmale\n"
-"--------------------------\n"
-"* Saubere und erneute Kommunikations-Historie für jedes OpenERP Dokument, "
-"das als Diskussionsthema fungieren können\n"
-"* Abonnement-Mechanismus, um über neue Nachrichten bezüglich interessanter "
-"Dokumente auf dem Laufenden gehalten zu  werden\n"
-"* vereinheitlichte Feeds-Seiten, um neuste Nachrichten und Aktivitäten von "
-"verfolgten Dokumenten zu sehen\n"
-"* Benutzer Kommunikation über die Feeds-Seite\n"
-"* Themenbezogene Diskussion auf Dokumente bezogen\n"
-"* Beruht auf dem globalen Postausgangsserver - ein integriertes E-Mail-"
-"Management-System - ermöglicht es, E-Mails mit einem konfigurierbaren, "
-"planungsbasierenden Bearbeitungswerkzeug zu senden\n"
-"* Beinhaltet einen erweiterbaren allgemeinen E-Mail Aufbauassistenten, der "
-"zu einem Massen-Email Assistenten werden kann und fähig ist, die "
-"Interpretation von einfachen *Platzhalter Ausdrücken* mit dynamischen Daten "
-"zu ersetzen, sobald jede Mail tatsächlich gesendet wird.\n"
+"Wesentliche Funktionen:\n"
+"-----------------------------------\n"
+"* Verbesserte Kommunikations-Historie für OpenERP Geschäftsvorfälle, die "
+"auch Thema einer EMail sein können\n"
+"* Abonnement-Mechanismus, um über neue Nachrichten zu interessanten "
+"Vorfällen auf dem Laufenden gehalten zu  werden\n"
+"* Einheitlichte und zentrale Feeds-Seite, um die neusten Nachrichten und "
+"Aktivitäten in Echtzeit zu empfangen\n"
+"* Benutzer Mailversand über die  zentrale Startseite\n"
+"* Mailversand im Kontext von Geschäftsvorfällen\n"
+"* Nutzung des globalen Postausgangsserver - ein integriertes E-Mail-"
+"Management-System - das die koordinierte Steuerung des E-Mail Versands in "
+"vordefinierten Zeitabständen ermöglicht\n"
+"* Benutzerfreundlicher und einfacher E-Mail Editor,  der auch als "
+"Konfigurationsassistent für Marketing-Email Aktivitäten genutzt werden kann "
+"und fähig ist, die Interpretation von einfachen *Platzhalter Ausdrücken* mit "
+"dynamischen Daten aus OpenERP zu ersetzen, sobald Mails tatsächlich durch "
+"Kampagnen gesendet werden.\n"
 "    "
 
 #. module: base
diff --git a/openerp/addons/base/i18n/tr.po b/openerp/addons/base/i18n/tr.po
index 117555be34e..e5d238d3d70 100644
--- a/openerp/addons/base/i18n/tr.po
+++ b/openerp/addons/base/i18n/tr.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-server\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2013-03-07 08:36+0000\n"
-"PO-Revision-Date: 2013-04-18 16:28+0000\n"
-"Last-Translator: Ediz Duman <neps1192@gmail.com>\n"
+"PO-Revision-Date: 2013-04-24 19:22+0000\n"
+"Last-Translator: Ayhan KIZILTAN <Unknown>\n"
 "Language-Team: Turkish <tr@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: 2013-04-19 06:17+0000\n"
-"X-Generator: Launchpad (build 16567)\n"
+"X-Launchpad-Export-Date: 2013-04-25 06:05+0000\n"
+"X-Generator: Launchpad (build 16580)\n"
 
 #. module: base
 #: model:ir.module.module,description:base.module_account_check_writing
@@ -431,6 +431,8 @@ msgid ""
 "There is already a shared filter set as default for %(model)s, delete or "
 "change it before setting a new default"
 msgstr ""
+"Zaten %(model)s için varsayılan bir paylaşımlı süzgeç var, yeni bir "
+"varsayılan ayarlamadan önce onu silin ya da değiştirin"
 
 #. module: base
 #: code:addons/orm.py:2649
@@ -499,6 +501,8 @@ msgid ""
 "Invalid date/time format directive specified. Please refer to the list of "
 "allowed directives, displayed when you edit a language."
 msgstr ""
+"Geçersiz tarih/zaman yönergesi belirlenmiş. Lütfen bir dil düzenlerken "
+"görüntülenen izin verilen yönerge listesine bakın."
 
 #. module: base
 #: code:addons/orm.py:4153
@@ -652,6 +656,20 @@ msgid ""
 "    A + B + C -> D + E\n"
 "    "
 msgstr ""
+"\n"
+"Bu modül, bir üretim emrinden birçok ürün üretmenizi sağlar.\n"
+"==============================================================\n"
+"\n"
+"Ürün ağaçlarında yan ürünler tanımlayabilirsiniz.\n"
+"\n"
+"Bu modül olmadan:\n"
+"--------------------\n"
+"    A + B + C -> D\n"
+"\n"
+"Bu modül ile:\n"
+"-----------------\n"
+"    A + B + C -> D + E\n"
+"    "
 
 #. module: base
 #: selection:base.language.install,lang:0
@@ -793,6 +811,32 @@ msgid ""
 "module named account_voucher.\n"
 "    "
 msgstr ""
+"\n"
+"Muhasebe ve Mali Yönetim.\n"
+"==============================\n"
+"\n"
+"Mali ve muhasebe modülünün içeriği:\n"
+"--------------------------------------------\n"
+"    * Genel Muhasebe\n"
+"    * Maliyet/Analitik muhasebe\n"
+"    * Üçüncü parti muhasebesi\n"
+"    * Vergi yönetimi\n"
+"    * Bütçeler\n"
+"    * Müşteri ve Tedarikçi Faturaları\n"
+"    * Banka hesap özetleri\n"
+"    * İş Ortağına göre Uzlaşma işlemi\n"
+"\n"
+"Hesaplar için aşağıdakileri içeren bir pano oluşturur:\n"
+"--------------------------------------------------\n"
+"    * Onaylanacak Müşteri Faturası listesi\n"
+"    * Firma İncelemesi\n"
+"    * Hazine Grafiği\n"
+"\n"
+"Büyük defterin bakım işlemleri gibi işler tanımlı mali günlükler yoluyla "
+"yapılır (kalem hareket kaydı ya da gruplama günlükler yoluyla yapılır) \n"
+"belirli mali yıl için ve fişlerin hazırlanması için account_voucher adlı bir "
+"modül vardır.\n"
+"    "
 
 #. module: base
 #: view:ir.model:0
@@ -810,6 +854,12 @@ msgid ""
 "Contains the installer for marketing-related modules.\n"
 "    "
 msgstr ""
+"\n"
+"Pazarlama Menüsü.\n"
+"===================\n"
+"\n"
+"Pazarlama-ilişkili modülleri kurar.\n"
+"    "
 
 #. module: base
 #: model:ir.module.module,description:base.module_web_linkedin
@@ -845,7 +895,7 @@ msgstr "Ürdün"
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_l10n_hr
 msgid "Croatia - RRIF 2012 COA"
-msgstr ""
+msgstr "Hırvatistan - RRIF 2012 COA"
 
 #. module: base
 #: help:ir.cron,nextcall:0
@@ -3228,7 +3278,7 @@ msgstr ""
 #. module: base
 #: view:res.company:0
 msgid "e.g. Global Business Solutions"
-msgstr ""
+msgstr "e.g. Global İş Çözümleri"
 
 #. module: base
 #: field:res.company,rml_header1:0

From 92e09ed8c4959f7e3072ae29ea5ff0f1e78eb491 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Thu, 25 Apr 2013 11:12:56 +0200
Subject: [PATCH 112/121] [FIX] hr: welcome message translatable.

bzr revid: tde@openerp.com-20130425091256-qan1jkw1875zhthh
---
 addons/hr/hr.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/addons/hr/hr.py b/addons/hr/hr.py
index 2f09d165005..2cdb964f45f 100644
--- a/addons/hr/hr.py
+++ b/addons/hr/hr.py
@@ -22,7 +22,9 @@
 from openerp import addons
 import logging
 from openerp.osv import fields, osv
+from openerp.tools.translate import _
 from openerp import tools
+
 _logger = logging.getLogger(__name__)
 
 class hr_employee_category(osv.osv):
@@ -216,7 +218,7 @@ class hr_employee(osv.osv):
             (model, mail_group_id) = self.pool.get('ir.model.data').get_object_reference(cr, uid, 'mail', 'group_all_employees')
             employee = self.browse(cr, uid, employee_id, context=context)
             self.pool.get('mail.group').message_post(cr, uid, [mail_group_id],
-                body='Welcome to %s! Please help him/her take the first steps with OpenERP!' % (employee.name),
+                body=_('Welcome to %s! Please help him/her take the first steps with OpenERP!') % (employee.name),
                 subtype='mail.mt_comment', context=context)
         except:
             pass # group deleted: do not push a message

From ca4ccafb37b352c4caa74b3b28e50c99f0cd5e06 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Thu, 25 Apr 2013 10:52:56 +0200
Subject: [PATCH 113/121] [FIX] mail: invite: avoid sendign a void invite
 message; but cleditor produces <br> instead of a void message when deleting
 the widget content.

bzr revid: tde@openerp.com-20130425085256-6jpfesyhbo7qgis3
---
 addons/mail/wizard/invite.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/mail/wizard/invite.py b/addons/mail/wizard/invite.py
index 091f8c3b569..fe75e45c6b8 100644
--- a/addons/mail/wizard/invite.py
+++ b/addons/mail/wizard/invite.py
@@ -59,8 +59,8 @@ class invite_wizard(osv.osv_memory):
             new_follower_ids = [p.id for p in wizard.partner_ids if p.id not in document.message_follower_ids]
             model_obj.message_subscribe(cr, uid, [wizard.res_id], new_follower_ids, context=context)
 
-            # send an email
-            if wizard.message:
+            # send an email only if a personal message exists
+            if wizard.message and not wizard.message == '<br>':  # when deleting the message, cleditor keeps a <br>
                 # add signature
                 user_id = self.pool.get("res.users").read(cr, uid, [uid], fields=["signature"], context=context)[0]
                 signature = user_id and user_id["signature"] or ''

From b507941664709dbd1f8da15e5d5944d1fb2342c2 Mon Sep 17 00:00:00 2001
From: "Quentin (OpenERP)" <qdp-launchpad@openerp.com>
Date: Thu, 25 Apr 2013 14:44:04 +0200
Subject: [PATCH 114/121] [FIX] account_voucher: usability improvement related
 to multi currency

bzr revid: qdp-launchpad@openerp.com-20130425124404-t22dzpv0rtohoh9y
---
 addons/account_voucher/account_voucher.py     | 19 +++++++------------
 .../voucher_payment_receipt_view.xml          |  6 +++---
 2 files changed, 10 insertions(+), 15 deletions(-)

diff --git a/addons/account_voucher/account_voucher.py b/addons/account_voucher/account_voucher.py
index 6d0e8c6130b..d65b7ee2bb1 100644
--- a/addons/account_voucher/account_voucher.py
+++ b/addons/account_voucher/account_voucher.py
@@ -225,24 +225,19 @@ class account_voucher(osv.osv):
     def onchange_line_ids(self, cr, uid, ids, line_dr_ids, line_cr_ids, amount, voucher_currency, type, context=None):
         context = context or {}
         if not line_dr_ids and not line_cr_ids:
-            return {'value':{}}
+            return {'value':{'writeoff_amount': 0.0, 'is_multi_currency': False}}
         line_osv = self.pool.get("account.voucher.line")
         line_dr_ids = resolve_o2m_operations(cr, uid, line_osv, line_dr_ids, ['amount'], context)
         line_cr_ids = resolve_o2m_operations(cr, uid, line_osv, line_cr_ids, ['amount'], context)
 
         #compute the field is_multi_currency that is used to hide/display options linked to secondary currency on the voucher
         is_multi_currency = False
-        if voucher_currency:
-            # if the voucher currency is not False, it means it is different than the company currency and we need to display the options
-            is_multi_currency = True
-        else:
-            #loop on the voucher lines to see if one of these has a secondary currency. If yes, we need to define the options
-            for voucher_line in line_dr_ids+line_cr_ids:
-                company_currency = False
-                company_currency = voucher_line.get('move_line_id', False) and self.pool.get('account.move.line').browse(cr, uid, voucher_line.get('move_line_id'), context=context).company_id.currency_id.id
-                if voucher_line.get('currency_id', company_currency) != company_currency:
-                    is_multi_currency = True
-                    break
+        #loop on the voucher lines to see if one of these has a secondary currency. If yes, we need to see the options
+        for voucher_line in line_dr_ids+line_cr_ids:
+            line_currency = voucher_line.get('move_line_id', False) and self.pool.get('account.move.line').browse(cr, uid, voucher_line.get('move_line_id'), context=context).currency_id
+            if line_currency:
+                is_multi_currency = True
+                break
         return {'value': {'writeoff_amount': self._compute_writeoff_amount(cr, uid, line_dr_ids, line_cr_ids, amount, type), 'is_multi_currency': is_multi_currency}}
 
     def _get_writeoff_amount(self, cr, uid, ids, name, args, context=None):
diff --git a/addons/account_voucher/voucher_payment_receipt_view.xml b/addons/account_voucher/voucher_payment_receipt_view.xml
index 3cdd93c8d20..a16730098c9 100644
--- a/addons/account_voucher/voucher_payment_receipt_view.xml
+++ b/addons/account_voucher/voucher_payment_receipt_view.xml
@@ -157,7 +157,7 @@
                     <notebook>
                         <page string="Payment Information">
                         	<label for="line_dr_ids"/>
-                            <field name="line_dr_ids" context="{'journal_id':journal_id, 'type':type, 'partner_id':partner_id}">
+                            <field name="line_dr_ids" context="{'journal_id':journal_id, 'type':type, 'partner_id':partner_id}" on_change="onchange_line_ids(line_dr_ids, line_cr_ids, amount, currency_id, type, context)">
                                 <tree string="Supplier Invoices and Outstanding transactions" editable="bottom" colors="gray:amount==0">
                                     <field name="move_line_id" context="{'journal_id':parent.journal_id, 'partner_id':parent.partner_id}"
                                         on_change="onchange_move_line_id(move_line_id)"
@@ -173,7 +173,7 @@
                                 </tree>
                             </field>
                             <label for="line_cr_ids" attrs="{'invisible': [('pre_line','=',False)]}"/>
-                            <field name="line_cr_ids" attrs="{'invisible': [('pre_line','=',False)]}" context="{'journal_id':journal_id, 'partner_id':partner_id}">
+                            <field name="line_cr_ids" attrs="{'invisible': [('pre_line','=',False)]}" context="{'journal_id':journal_id, 'partner_id':partner_id}" on_change="onchange_line_ids(line_dr_ids, line_cr_ids, amount, currency_id, type, context)">
                                 <tree string="Credits" editable="bottom" colors="gray:amount==0">
                                     <field name="move_line_id" context="{'journal_id':parent.journal_id, 'partner_id':parent.partner_id}"
                                         on_change="onchange_move_line_id(move_line_id)"
@@ -193,7 +193,7 @@
                                     <field name="narration" colspan="2" nolabel="1"/>
                                 </group>
                                 <group>
-                                    <group col="4" attrs="{'invisible':[('currency_id','=',False),('is_multi_currency','=',False)]}">
+                                    <group col="4" attrs="{'invisible':[('is_multi_currency','=',False)]}">
                                         <separator string="Currency Options" colspan="4"/>
                                         <field name="is_multi_currency" invisible="1"/>
                                         <field name="payment_rate" required="1" on_change="onchange_rate(payment_rate, amount, currency_id, payment_rate_currency_id, company_id, context)" colspan="3"/>

From 2ae76572ea11c9bc637843a66ab9f318ab038662 Mon Sep 17 00:00:00 2001
From: "Quentin (OpenERP)" <qdp-launchpad@openerp.com>
Date: Thu, 25 Apr 2013 14:44:53 +0200
Subject: [PATCH 115/121] [FIX] account: fixed bad constraint message

bzr revid: qdp-launchpad@openerp.com-20130425124453-gc42mimtn6dfec3u
---
 addons/account/account_move_line.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/account/account_move_line.py b/addons/account/account_move_line.py
index 58c4cc583b9..f681825491d 100644
--- a/addons/account/account_move_line.py
+++ b/addons/account/account_move_line.py
@@ -626,7 +626,7 @@ class account_move_line(osv.osv):
         (_check_date, 'The date of your Journal Entry is not in the defined period! You should change the date or remove this constraint from the journal.', ['date']),
         (_check_currency, '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.', ['currency_id']),
         (_check_currency_and_amount, "You cannot create journal items with a secondary currency without recording both 'currency' and 'amount currency' field.", ['currency_id','amount_currency']),
-        (_check_currency_amount, 'The amount expressed in the secondary currency must be positif when journal item are debit and negatif when journal item are credit.', ['amount_currency']),
+        (_check_currency_amount, 'The amount expressed in the secondary currency must be positive when the journal item is a debit and negative when if it is a credit.', ['amount_currency']),
         (_check_currency_company, "You cannot provide a secondary currency if it is the same than the company one." , ['currency_id']),
     ]
 

From dc51b7a4650954200afa6f8c59fe267ed42337a2 Mon Sep 17 00:00:00 2001
From: "Quentin (OpenERP)" <qdp-launchpad@openerp.com>
Date: Thu, 25 Apr 2013 14:49:33 +0200
Subject: [PATCH 116/121] [FIX] stock: fixed stock valuation bookings made in
 multi currency

bzr revid: qdp-launchpad@openerp.com-20130425124933-s7a7724si9lenpsp
---
 addons/stock/stock.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/addons/stock/stock.py b/addons/stock/stock.py
index e05cc77e585..6d9cb1aae84 100644
--- a/addons/stock/stock.py
+++ b/addons/stock/stock.py
@@ -2423,14 +2423,14 @@ class stock_move(osv.osv):
         # or if it's the same as that of the secondary amount being posted.
         account_obj = self.pool.get('account.account')
         src_acct, dest_acct = account_obj.browse(cr, uid, [src_account_id, dest_account_id], context=context)
-        src_main_currency_id = src_acct.company_id.currency_id.id
-        dest_main_currency_id = dest_acct.company_id.currency_id.id
+        src_main_currency_id = src_acct.currency_id and src_acct.currency_id.id or src_acct.company_id.currency_id.id
+        dest_main_currency_id = dest_acct.currency_id and dest_acct.currency_id.id or dest_acct.company_id.currency_id.id
         cur_obj = self.pool.get('res.currency')
         if reference_currency_id != src_main_currency_id:
             # fix credit line:
             credit_line_vals['credit'] = cur_obj.compute(cr, uid, reference_currency_id, src_main_currency_id, reference_amount, context=context)
             if (not src_acct.currency_id) or src_acct.currency_id.id == reference_currency_id:
-                credit_line_vals.update(currency_id=reference_currency_id, amount_currency=reference_amount)
+                credit_line_vals.update(currency_id=reference_currency_id, amount_currency=-reference_amount)
         if reference_currency_id != dest_main_currency_id:
             # fix debit line:
             debit_line_vals['debit'] = cur_obj.compute(cr, uid, reference_currency_id, dest_main_currency_id, reference_amount, context=context)

From 5cf3622148352d32f78edf9ca4b59153526b233a Mon Sep 17 00:00:00 2001
From: "Quentin (OpenERP)" <qdp-launchpad@openerp.com>
Date: Thu, 25 Apr 2013 14:52:44 +0200
Subject: [PATCH 117/121] [FIX] account_voucher: usability changes related to
 multi currency use cases. Display the options when needed only

bzr revid: qdp-launchpad@openerp.com-20130425125244-nnqv127m0gc70e4s
---
 addons/account_voucher/voucher_payment_receipt_view.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/account_voucher/voucher_payment_receipt_view.xml b/addons/account_voucher/voucher_payment_receipt_view.xml
index a16730098c9..766fa36e135 100644
--- a/addons/account_voucher/voucher_payment_receipt_view.xml
+++ b/addons/account_voucher/voucher_payment_receipt_view.xml
@@ -374,7 +374,7 @@
                                 <group>
                                     <field name="narration" colspan="2" nolabel="1"/>
                                 </group>
-                                <group col="4" attrs="{'invisible':[('currency_id','=',False),('is_multi_currency','=',False)]}">
+                                <group col="4" attrs="{'invisible':[('is_multi_currency','=',False)]}">
                                     <field name="is_multi_currency" invisible="1"/>
                                     <field name="payment_rate" required="1" on_change="onchange_rate(payment_rate, amount, currency_id, payment_rate_currency_id, company_id, context)" colspan="3"/>
                                     <field name="payment_rate_currency_id" colspan="1" nolabel="1" on_change="onchange_payment_rate_currency(currency_id, payment_rate, payment_rate_currency_id, date, amount, company_id, context)" groups="base.group_multi_currency"/>
@@ -472,7 +472,7 @@
                                 <group>
                                     <field name="narration" colspan="2" nolabel="1"/>
                                 </group>
-                                <group col="4" attrs="{'invisible':[('currency_id','=',False),('is_multi_currency','=',False)]}">
+                                <group col="4" attrs="{'invisible':[('is_multi_currency','=',False)]}">
                                     <field name="is_multi_currency" invisible="1"/>
                                     <field name="payment_rate" required="1" on_change="onchange_rate(payment_rate, amount, currency_id, payment_rate_currency_id, company_id, context)" colspan="3"/>
                                     <field name="payment_rate_currency_id" colspan="1" nolabel="1" on_change="onchange_payment_rate_currency(currency_id, payment_rate, payment_rate_currency_id, date, amount, company_id, context)" groups="base.group_multi_currency"/>

From c8e8860d080aa0e7005a3dc5680cf1be25311a82 Mon Sep 17 00:00:00 2001
From: Olivier Dony <odo@openerp.com>
Date: Thu, 25 Apr 2013 18:39:16 +0200
Subject: [PATCH 118/121] [FIX] res.partner: make use_parent_address field
 visible if set, even if parent is missing

This should not be needed but in the initial 7.0 branch
the default for use_parent_address was True so it was
set even on partners that had no parent company.
Now that the fields are read-only when that option
is enabled, it makes the address impossible to
edit. At least by making it visible we give the
user the opportunity of fixing it manually.

Can also be fixed at once with a single SQL
query:
UPDATE res_partner set use_parent_address = false
       WHERE parent_id IS NULL;

bzr revid: odo@openerp.com-20130425163916-ou7jjr6xbopfwvrc
---
 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 741b6eb5cdd..e02bf863ded 100644
--- a/openerp/addons/base/res/res_partner_view.xml
+++ b/openerp/addons/base/res/res_partner_view.xml
@@ -157,8 +157,8 @@
                             <div>
                                 <field name="use_parent_address" class="oe_edit_only oe_inline"
                                        on_change="onchange_address(use_parent_address, parent_id)"
-                                       attrs="{'invisible': [('parent_id','=', False)]}"/>
-                                <label for="use_parent_address" class="oe_edit_only" attrs="{'invisible': [('parent_id','=', False)]}"/>
+                                       attrs="{'invisible': [('parent_id','=', False),('use_parent_address','=',False)]}"/>
+                                <label for="use_parent_address" class="oe_edit_only" attrs="{'invisible': [('parent_id','=', False),('use_parent_address','=',False)]}"/>
                                 <button name="open_parent" type="object" string="(edit company address)" class="oe_link oe_edit_only"
                                         attrs="{'invisible': ['|',('parent_id','=', False),('use_parent_address','=',False)]}"/>
                                 <field name="street" placeholder="Street..."  attrs="{'readonly': [('use_parent_address','=',True)]}"/>

From 20020a76470555cc6e831d6dbd8eaa1fb20634a5 Mon Sep 17 00:00:00 2001
From: Olivier Dony <odo@openerp.com>
Date: Thu, 25 Apr 2013 19:12:38 +0200
Subject: [PATCH 119/121] [FIX] res.partner: typo would prevent contact from
 using company address correctly if flag changed without changing/setting
 company + updated tests to cover this

bzr revid: odo@openerp.com-20130425171238-dhgpqbi9nio12vxk
---
 openerp/addons/base/res/res_partner.py |  2 +-
 openerp/addons/base/tests/test_base.py | 18 ++++++++++++++++++
 2 files changed, 19 insertions(+), 1 deletion(-)

diff --git a/openerp/addons/base/res/res_partner.py b/openerp/addons/base/res/res_partner.py
index 7bd7587a8d9..fb4387fb3ae 100644
--- a/openerp/addons/base/res/res_partner.py
+++ b/openerp/addons/base/res/res_partner.py
@@ -449,7 +449,7 @@ class res_partner(osv.osv, format_address):
         """ Sync commercial fields and address fields from company and to children after create/update,
         just as if those were all modeled as fields.related to the parent """
         # 1. From UPSTREAM: sync from parent
-        if update_values.get('parent_id') or update_values.get('use_company_address'):
+        if update_values.get('parent_id') or update_values.get('use_parent_address'):
             # 1a. Commercial fields: sync if parent changed
             if update_values.get('parent_id'):
                 self._commercial_sync_from_company(cr, uid, partner, context=context)
diff --git a/openerp/addons/base/tests/test_base.py b/openerp/addons/base/tests/test_base.py
index ec192f2667e..345973526c5 100644
--- a/openerp/addons/base/tests/test_base.py
+++ b/openerp/addons/base/tests/test_base.py
@@ -61,6 +61,24 @@ class test_base(common.TransactionCase):
         self.assertEqual(p1.phone, p1phone, 'Phone should be preserved after address sync')
         self.assertEqual(p1.type, 'contact', 'Type should be preserved after address sync')
         self.assertEqual(p1.email, 'denis.bladesmith@ghoststep.com', 'Email should be preserved after sync')
+
+        # turn off sync
+        p1street = 'Different street, 42'
+        p1.write({'street': p1street,
+                  'use_parent_address': False})
+        p1.refresh(), ghoststep.refresh() 
+        self.assertEqual(p1.street, p1street, 'Address fields must not be synced after turning sync off')
+        self.assertNotEqual(ghoststep.street, p1street, 'Parent address must never be touched')
+
+        # turn on sync again       
+        p1.write({'use_parent_address': True})
+        p1.refresh()
+        self.assertEqual(p1.street, ghoststep.street, 'Address fields must be synced again')
+        self.assertEqual(p1.phone, p1phone, 'Phone should be preserved after address sync')
+        self.assertEqual(p1.type, 'contact', 'Type should be preserved after address sync')
+        self.assertEqual(p1.email, 'denis.bladesmith@ghoststep.com', 'Email should be preserved after sync')
+
+        # Modify parent, sync to children
         ghoststreet = 'South Street, 25'
         ghoststep.write({'street': ghoststreet})
         p1.refresh()

From 4e50f6861f9119167b005e9d208d3595fb80ecdf Mon Sep 17 00:00:00 2001
From: Launchpad Translations on behalf of openerp <>
Date: Fri, 26 Apr 2013 06:23:50 +0000
Subject: [PATCH 120/121] Launchpad automatic translations update.

bzr revid: launchpad_translations_on_behalf_of_openerp-20130426062350-ld4zwiqlk38jvfw1
---
 openerp/addons/base/i18n/et.po | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/openerp/addons/base/i18n/et.po b/openerp/addons/base/i18n/et.po
index 8c36410cd28..1fccb19092f 100644
--- a/openerp/addons/base/i18n/et.po
+++ b/openerp/addons/base/i18n/et.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-server\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2013-03-07 08:36+0000\n"
-"PO-Revision-Date: 2012-12-26 19:26+0000\n"
-"Last-Translator: Ahti Hinnov <sipelgas@gmail.com>\n"
+"PO-Revision-Date: 2013-04-25 15:21+0000\n"
+"Last-Translator: Illimar Saatväli <is@hot.ee>\n"
 "Language-Team: Estonian <et@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: 2013-03-08 05:17+0000\n"
-"X-Generator: Launchpad (build 16523)\n"
+"X-Launchpad-Export-Date: 2013-04-26 06:23+0000\n"
+"X-Generator: Launchpad (build 16580)\n"
 
 #. module: base
 #: model:ir.module.module,description:base.module_account_check_writing
@@ -39,7 +39,7 @@ msgstr "Saint Helena"
 #. module: base
 #: view:ir.actions.report.xml:0
 msgid "Other Configuration"
-msgstr ""
+msgstr "Muu Konfiguratsioon"
 
 #. module: base
 #: selection:ir.property,type:0
@@ -90,7 +90,7 @@ msgstr ""
 #. module: base
 #: model:ir.module.module,summary:base.module_point_of_sale
 msgid "Touchscreen Interface for Shops"
-msgstr ""
+msgstr "Puutetundlik liides kauplustele"
 
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_l10n_in_hr_payroll
@@ -106,7 +106,7 @@ msgstr ""
 #. module: base
 #: view:ir.module.module:0
 msgid "Created Views"
-msgstr "Loodud vaated"
+msgstr "Loodud Vaated"
 
 #. module: base
 #: model:ir.module.module,description:base.module_product_manufacturer
@@ -127,7 +127,7 @@ msgstr ""
 #. module: base
 #: field:ir.actions.client,params:0
 msgid "Supplementary arguments"
-msgstr ""
+msgstr "Täiendavad argumendid"
 
 #. module: base
 #: model:ir.module.module,description:base.module_google_base_account

From 7561f48578199a242da052401318055130752c12 Mon Sep 17 00:00:00 2001
From: Launchpad Translations on behalf of openerp <>
Date: Fri, 26 Apr 2013 06:24:16 +0000
Subject: [PATCH 121/121] Launchpad automatic translations update.

bzr revid: launchpad_translations_on_behalf_of_openerp-20130426062412-awemubat7ag9ji19
bzr revid: launchpad_translations_on_behalf_of_openerp-20130426062416-6321y5y98sute3k0
---
 addons/account/i18n/es_MX.po      |  2 +-
 addons/mail/i18n/fr.po            |  8 ++--
 addons/sale/i18n/hu.po            | 60 +++++++++++++--------------
 addons/stock/i18n/tr.po           |  8 +++-
 addons/web/i18n/et.po             | 68 +++++++++++++++----------------
 addons/web_calendar/i18n/et.po    | 10 ++---
 addons/web_diagram/i18n/et.po     | 17 ++++----
 addons/web_graph/i18n/et.po       | 12 +++---
 addons/web_kanban/i18n/et.po      | 28 +++++++------
 addons/web_view_editor/i18n/et.po | 10 ++---
 10 files changed, 117 insertions(+), 106 deletions(-)

diff --git a/addons/account/i18n/es_MX.po b/addons/account/i18n/es_MX.po
index dbf386fa704..0fa44286eec 100644
--- a/addons/account/i18n/es_MX.po
+++ b/addons/account/i18n/es_MX.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: 2013-04-25 06:05+0000\n"
+"X-Launchpad-Export-Date: 2013-04-26 06:23+0000\n"
 "X-Generator: Launchpad (build 16580)\n"
 
 #. module: account
diff --git a/addons/mail/i18n/fr.po b/addons/mail/i18n/fr.po
index 99208756505..ff0bc16325e 100644
--- a/addons/mail/i18n/fr.po
+++ b/addons/mail/i18n/fr.po
@@ -8,13 +8,13 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2013-03-07 08:37+0000\n"
-"PO-Revision-Date: 2013-04-23 12:15+0000\n"
-"Last-Translator: Gilles Major (OpenERP) <gim@openerp.com>\n"
+"PO-Revision-Date: 2013-04-25 15:46+0000\n"
+"Last-Translator: WANTELLET Sylvain <Swantellet@tetra-info.com>\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: 2013-04-24 05:28+0000\n"
+"X-Launchpad-Export-Date: 2013-04-26 06:24+0000\n"
 "X-Generator: Launchpad (build 16580)\n"
 
 #. module: mail
@@ -551,7 +551,7 @@ msgstr "ce document"
 #: view:mail.compose.message:0
 #, python-format
 msgid "Send"
-msgstr "Envoyé"
+msgstr "Envoyer"
 
 #. module: mail
 #. openerp-web
diff --git a/addons/sale/i18n/hu.po b/addons/sale/i18n/hu.po
index 7de1afd677e..c79b5073772 100644
--- a/addons/sale/i18n/hu.po
+++ b/addons/sale/i18n/hu.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2013-03-07 08:37+0000\n"
-"PO-Revision-Date: 2013-04-11 23:17+0000\n"
+"PO-Revision-Date: 2013-04-25 06:59+0000\n"
 "Last-Translator: Krisztian Eyssen <krisz@eyssen.hu>\n"
 "Language-Team: Hungarian <hu@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: 2013-04-12 06:05+0000\n"
-"X-Generator: Launchpad (build 16564)\n"
+"X-Launchpad-Export-Date: 2013-04-26 06:24+0000\n"
+"X-Generator: Launchpad (build 16580)\n"
 
 #. module: sale
 #: model:ir.model,name:sale.model_mail_compose_message
@@ -249,7 +249,7 @@ msgstr "Árajánlat megerősítve"
 #: selection:sale.order,state:0
 #: selection:sale.report,state:0
 msgid "Invoice Exception"
-msgstr "Számlázási hiba"
+msgstr "Számlázási kivétel"
 
 #. module: sale
 #: view:sale.order:0
@@ -259,7 +259,7 @@ msgstr "Árajánlat "
 #. module: sale
 #: selection:sale.order,state:0
 msgid "Draft Quotation"
-msgstr "Árajánlat sablon"
+msgstr "Árajánlat tervezet"
 
 #. module: sale
 #: field:sale.order,partner_shipping_id:0
@@ -281,7 +281,7 @@ msgstr "Engedélyezi a köteg számlázást a megrendeléseken a naplók alapjá
 #. module: sale
 #: field:sale.order.line,price_subtotal:0
 msgid "Subtotal"
-msgstr "Részösszeg"
+msgstr "Nettó érték"
 
 #. module: sale
 #: view:sale.report:0
@@ -334,12 +334,12 @@ msgstr "Lehetővé teszi a megrendelés soraihoz árengedmény alkalmazását"
 #. module: sale
 #: view:sale.order.line:0
 msgid "Sales Order Lines that are in 'done' state"
-msgstr "Megrendelés sorai melyek 'elvégezve' állapotúak"
+msgstr "'Elvégzett' állapotú megrendelési sorok"
 
 #. module: sale
 #: selection:sale.order.line,type:0
 msgid "on order"
-msgstr "Megendelésre"
+msgstr "megrendelésre"
 
 #. module: sale
 #: field:sale.order,message_ids:0
@@ -360,12 +360,12 @@ msgstr "Adók"
 #. module: sale
 #: field:sale.order,amount_untaxed:0
 msgid "Untaxed Amount"
-msgstr "Nettó érték"
+msgstr "Nettó összeg"
 
 #. module: sale
 #: field:sale.config.settings,module_project:0
 msgid "Project"
-msgstr "Projekt"
+msgstr ""
 
 #. module: sale
 #: code:addons/sale/sale.py:185
@@ -381,7 +381,7 @@ msgstr "Hiba!"
 #. module: sale
 #: report:sale.order:0
 msgid "Net Total :"
-msgstr "Nettó ár:"
+msgstr "Nettó érték :"
 
 #. module: sale
 #: help:sale.order.line,type:0
@@ -390,9 +390,9 @@ msgid ""
 "replenishment.\n"
 "On order: When needed, the product is purchased or produced."
 msgstr ""
-"Raktárról: Ha kell, a terméket a raktárról vesszük vagy várunk az alkatrész "
-"feltöltésre.\n"
-"Megrendelve: Ha kell, a terméket megvásároljuk vagy legyártjuk."
+"Raktárról: Ha szükség van rá, a terméket a raktárról vesszük vagy várunk az "
+"alkatrész feltöltésre.\n"
+"Megrendelve: Ha szükség van rá, a terméket megvásároljuk vagy legyártjuk."
 
 #. module: sale
 #: help:sale.config.settings,module_analytic_user_function:0
@@ -419,7 +419,7 @@ msgstr ""
 #: selection:sale.order.line,state:0
 #: selection:sale.report,state:0
 msgid "Cancelled"
-msgstr "Visszavonva"
+msgstr "Érvénytelenített"
 
 #. module: sale
 #: view:sale.order.line:0
@@ -491,11 +491,11 @@ msgid ""
 msgstr ""
 "Használja mindet a végszámla elkészítéséhez.\n"
 "                Használjon százalékot a teljes mennyiség bizonyos "
-"százalékának szálázásához.\n"
+"százalékának számlázásához.\n"
 "                Használjon fix árat egy bizonyos mennyiség díjbekérőjéhez / "
 "előlegéhez.\n"
 "                Használjon egyes megrendelés sorokat a kiválasztott "
-"megrendelés sorainak számlázásáahoz."
+"megrendelés sorainak számlázásához."
 
 #. module: sale
 #: view:sale.make.invoice:0
@@ -506,7 +506,7 @@ msgstr "Számlák létrehozása"
 #. module: sale
 #: report:sale.order:0
 msgid "Tax"
-msgstr "ÁFA"
+msgstr "Adó"
 
 #. module: sale
 #: code:addons/sale/sale.py:278
@@ -531,7 +531,7 @@ msgstr ""
 "elvégzésekkor               egy számla érvényesítésekor (Számla kizárás) "
 "vagy a kiválogatási lista műveletekben (Szállítási kizárás).\n"
 "A 'Ütemezésre várakozás' állapot lesz beállítva, ha a számla megerősített    "
-"                        de vár egy, a megrendelés dátumára futó ütemezésre."
+"                        de vár egy, a megrendelés dátumán futó ütemezésre."
 
 #. module: sale
 #: field:sale.report,date_confirm:0
@@ -542,7 +542,7 @@ msgstr "Megerősítés dátuma"
 #: view:sale.report:0
 #: field:sale.report,nbr:0
 msgid "# of Lines"
-msgstr "Sorok száma"
+msgstr "# sorok száma"
 
 #. module: sale
 #: help:sale.order,message_summary:0
@@ -557,7 +557,7 @@ msgstr ""
 #: help:sale.order.line,sequence:0
 msgid "Gives the sequence order when displaying a list of sales order lines."
 msgstr ""
-"A megrendelés sorrendet adja ha a megrendelési sorok listáját jelzi ki."
+"A megrendelés sorrendet adja a megrendelési sorok listájának kijelzésekor."
 
 #. module: sale
 #: view:sale.report:0
@@ -582,7 +582,7 @@ msgstr ""
 #. module: sale
 #: view:sale.order:0
 msgid "(update)"
-msgstr "(Frissítés)"
+msgstr "(frissítés)"
 
 #. module: sale
 #: model:ir.model,name:sale.model_res_partner
@@ -608,7 +608,7 @@ msgstr "Szerződés tulajdonságai"
 #: selection:sale.order,state:0
 #, python-format
 msgid "Sales Order"
-msgstr "Értékesítési megbízás"
+msgstr "Vevői megrendelés"
 
 #. module: sale
 #: model:res.groups,name:sale.group_invoice_so_lines
@@ -618,7 +618,7 @@ msgstr "Megrendelés sorai számlázásának engedélyezése"
 #. module: sale
 #: model:ir.model,name:sale.model_sale_order_line
 msgid "Sales Order Line"
-msgstr "Értékesítési megbízási sor"
+msgstr "Vevői megrendelés sor"
 
 #. module: sale
 #: field:sale.advance.payment.inv,amount:0
@@ -628,7 +628,7 @@ msgstr "Előleg összege"
 #. module: sale
 #: help:sale.order,invoice_exists:0
 msgid "It indicates that sales order has at least one invoice."
-msgstr "Ez mutatja, hogy a megrendelének legalább egy számlája van."
+msgstr "Ez mutatja, hogy a megrendelésnek legalább egy számlája van."
 
 #. module: sale
 #: help:sale.config.settings,group_sale_pricelist:0
@@ -643,7 +643,7 @@ msgstr ""
 #. module: sale
 #: field:sale.config.settings,module_analytic_user_function:0
 msgid "One employee can have different roles per contract"
-msgstr "Egy munkavállalónak különböző funkciója lehet egy szerződésen belül"
+msgstr "Egy alkalmazottnak különböző funkciója lehet egy szerződésen belül"
 
 #. module: sale
 #: selection:sale.advance.payment.inv,advance_payment_method:0
@@ -658,19 +658,19 @@ msgstr "Alapértelmezett fizetési feltétel"
 #. module: sale
 #: model:process.transition.action,name:sale.process_transition_action_confirm0
 msgid "Confirm"
-msgstr "Megerősítés"
+msgstr "Jóváhagyás"
 
 #. module: sale
 #: field:sale.config.settings,timesheet:0
 msgid "Prepare invoices based on timesheets"
-msgstr "Az időkimutatások alapján készítsen elő számlát"
+msgstr "Az időkimutatások alapján készítsen elő,  számlát"
 
 #. module: sale
 #: code:addons/sale/sale.py:820
 #, python-format
 msgid "You cannot cancel a sales order line that has already been invoiced."
 msgstr ""
-"Nem tud olyan megrendelési sort visszavonni amelyik már számlázva volt."
+"Nem tud olyan vevői megrendelési sort visszavonni amelyik már számlázva volt."
 
 #. module: sale
 #: view:account.invoice.report:0
@@ -719,7 +719,7 @@ msgstr "Megrendelés száma"
 #: view:sale.order:0
 #: field:sale.order,order_line:0
 msgid "Order Lines"
-msgstr "Megrendelési tételek"
+msgstr "Megrendelés sorok"
 
 #. module: sale
 #: report:sale.order:0
diff --git a/addons/stock/i18n/tr.po b/addons/stock/i18n/tr.po
index 44337f5b311..1e5da83fd8a 100644
--- a/addons/stock/i18n/tr.po
+++ b/addons/stock/i18n/tr.po
@@ -8,13 +8,13 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2013-03-07 08:37+0000\n"
-"PO-Revision-Date: 2013-04-22 19:01+0000\n"
+"PO-Revision-Date: 2013-04-25 14:31+0000\n"
 "Last-Translator: Ayhan KIZILTAN <Unknown>\n"
 "Language-Team: Turkish <tr@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: 2013-04-23 06:10+0000\n"
+"X-Launchpad-Export-Date: 2013-04-26 06:24+0000\n"
 "X-Generator: Launchpad (build 16580)\n"
 
 #. module: stock
@@ -4096,6 +4096,10 @@ msgid ""
 "default value for all products in this category. It can also directly be set "
 "on each product"
 msgstr ""
+"Gerçek-zamanlı envanter değerlemesi yaparken, hedef konuma özel bir "
+"değerleme hesabı ayarlanmadıkça, çıkan tüm stok hareketlerinin günlük "
+"öğeleri bu hesaba işlenecektir. Bu, bu kategorideki tüm ürünler için "
+"varsayılan değerdir. Aynı zamanda her ürünü de doğrudan ayarlanabilir."
 
 #. module: stock
 #: field:stock.picking,message_ids:0
diff --git a/addons/web/i18n/et.po b/addons/web/i18n/et.po
index 604ca8af8bc..34cce36cad7 100644
--- a/addons/web/i18n/et.po
+++ b/addons/web/i18n/et.po
@@ -8,28 +8,38 @@ msgstr ""
 "Project-Id-Version: openerp-web\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2013-03-07 08:39+0000\n"
-"PO-Revision-Date: 2013-01-06 20:00+0000\n"
-"Last-Translator: Ahti Hinnov <sipelgas@gmail.com>\n"
+"PO-Revision-Date: 2013-04-25 14:18+0000\n"
+"Last-Translator: Illimar Saatväli <is@hot.ee>\n"
 "Language-Team: Estonian <et@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: 2013-03-29 05:09+0000\n"
-"X-Generator: Launchpad (build 16546)\n"
+"X-Launchpad-Export-Date: 2013-04-26 06:24+0000\n"
+"X-Generator: Launchpad (build 16580)\n"
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/view_form.js:4168
+#: code:addons/web/static/src/js/view_form.js:4329
+#: code:addons/web/static/src/xml/base.xml:1416
+#: code:addons/web/static/src/xml/base.xml:1703
+#, python-format
+msgid "Add"
+msgstr "Lisa"
 
 #. module: web
 #. openerp-web
 #: code:addons/web/static/src/xml/base.xml:133
 #, python-format
 msgid "Default language:"
-msgstr "Vaikimisi keel"
+msgstr "Vaikimisi keel:"
 
 #. module: web
 #. openerp-web
 #: code:addons/web/static/src/js/coresetup.js:588
 #, python-format
 msgid "%d minutes ago"
-msgstr "%d minuti eest"
+msgstr "%d minutit tagasi"
 
 #. module: web
 #. openerp-web
@@ -75,7 +85,7 @@ msgstr "Ülemsalasõna"
 #: code:addons/web/static/src/xml/base.xml:274
 #, python-format
 msgid "Change Master Password"
-msgstr "Ülemsalasõna Muutmine"
+msgstr "Muuda ülemsalasõna"
 
 #. module: web
 #. openerp-web
@@ -126,7 +136,7 @@ msgstr "Andmebaasi Varundamine"
 #: code:addons/web/static/src/js/views.js:507
 #, python-format
 msgid "%(view_type)s view"
-msgstr ""
+msgstr "%(view_type)s vaade"
 
 #. module: web
 #. openerp-web
@@ -141,7 +151,7 @@ msgstr "%s ei ole kehtiv kuupäev"
 #: code:addons/web/static/src/xml/base.xml:1835
 #, python-format
 msgid "Here is a preview of the file we could not import:"
-msgstr ""
+msgstr "Siin on ülevaade failist mida me ei saa importida:"
 
 #. module: web
 #. openerp-web
@@ -213,14 +223,14 @@ msgstr "Viimase muudatuse kuupäev:"
 #: code:addons/web/static/src/js/search.js:1558
 #, python-format
 msgid "M2O search fields do not currently handle multiple default values"
-msgstr ""
+msgstr "M2O otsing väljad ei saa hetkel hakkama mitme vaikeväärtused"
 
 #. module: web
 #. openerp-web
 #: code:addons/web/static/src/js/view_form.js:1227
 #, python-format
 msgid "Widget type '%s' is not implemented"
-msgstr ""
+msgstr "Vidina tüüp '% s' ei ole rakendatud"
 
 #. module: web
 #. openerp-web
@@ -249,7 +259,7 @@ msgstr ""
 #: code:addons/web/static/src/js/formats.js:286
 #, python-format
 msgid "'%s' is not a correct time"
-msgstr ""
+msgstr "'% s' ei ole õige aeg"
 
 #. module: web
 #. openerp-web
@@ -277,7 +287,7 @@ msgstr "Manus:"
 #: code:addons/web/static/src/xml/base.xml:1689
 #, python-format
 msgid "Fields to export"
-msgstr ""
+msgstr "Väljad eksportimiseks"
 
 #. module: web
 #. openerp-web
@@ -305,7 +315,7 @@ msgstr "umbes kuu eest"
 #: code:addons/web/static/src/xml/base.xml:1598
 #, python-format
 msgid "Custom Filters"
-msgstr ""
+msgstr "Kohandatud Filtrid"
 
 #. module: web
 #. openerp-web
@@ -355,7 +365,7 @@ msgstr "Muuda Salasõna"
 #: code:addons/web/static/src/js/view_form.js:3445
 #, python-format
 msgid "View type '%s' is not supported in One2Many."
-msgstr ""
+msgstr "Vaate tüüp '% s' ei ole toetatud One2Manys."
 
 #. module: web
 #. openerp-web
@@ -363,7 +373,7 @@ msgstr ""
 #: code:addons/web/static/src/js/view_list.js:2209
 #, python-format
 msgid "Download"
-msgstr ""
+msgstr "Lae alla"
 
 #. module: web
 #. openerp-web
@@ -384,7 +394,7 @@ msgstr "Grupp"
 #: code:addons/web/static/src/xml/base.xml:930
 #, python-format
 msgid "Unhandled widget"
-msgstr ""
+msgstr "Töötlemata vidin"
 
 #. module: web
 #. openerp-web
@@ -418,7 +428,7 @@ msgstr "...Toimub üleslaadimine..."
 #: code:addons/web/static/src/xml/base.xml:1766
 #, python-format
 msgid "Import"
-msgstr "Import"
+msgstr "Impordi"
 
 #. module: web
 #. openerp-web
@@ -439,7 +449,7 @@ msgstr "Faili üleslaadimine"
 #: code:addons/web/static/src/js/view_form.js:3838
 #, python-format
 msgid "Action Button"
-msgstr ""
+msgstr "Tegevus Nupp"
 
 #. module: web
 #. openerp-web
@@ -503,7 +513,7 @@ msgstr "Vaata Logi (perm_read)"
 #: code:addons/web/static/src/js/view_form.js:1057
 #, python-format
 msgid "Set Default"
-msgstr ""
+msgstr "Määra vaikimisi"
 
 #. module: web
 #. openerp-web
@@ -573,7 +583,7 @@ msgstr ""
 #: code:addons/web/static/src/js/view_form.js:2359
 #, python-format
 msgid "Resource error"
-msgstr ""
+msgstr "Ressurss vigane"
 
 #. module: web
 #. openerp-web
@@ -587,7 +597,7 @@ msgstr "ei ole"
 #: code:addons/web/static/src/xml/base.xml:553
 #, python-format
 msgid "Print Workflow"
-msgstr ""
+msgstr "Trüki Töövoog"
 
 #. module: web
 #. openerp-web
@@ -647,7 +657,7 @@ msgstr ""
 #: code:addons/web/static/src/js/search.js:2137
 #, python-format
 msgid "is set"
-msgstr ""
+msgstr "on määratud"
 
 #. module: web
 #. openerp-web
@@ -846,17 +856,7 @@ msgstr "Filtri nimi"
 #: code:addons/web/static/src/xml/base.xml:1471
 #, python-format
 msgid "-- Actions --"
-msgstr ""
-
-#. module: web
-#. openerp-web
-#: code:addons/web/static/src/js/view_form.js:4168
-#: code:addons/web/static/src/js/view_form.js:4329
-#: code:addons/web/static/src/xml/base.xml:1416
-#: code:addons/web/static/src/xml/base.xml:1703
-#, python-format
-msgid "Add"
-msgstr "Lisa"
+msgstr "-- Toimingud --"
 
 #. module: web
 #. openerp-web
diff --git a/addons/web_calendar/i18n/et.po b/addons/web_calendar/i18n/et.po
index dbf900dfc91..1dc1ceb4017 100644
--- a/addons/web_calendar/i18n/et.po
+++ b/addons/web_calendar/i18n/et.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openerp-web\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2013-03-07 08:39+0000\n"
-"PO-Revision-Date: 2012-12-21 23:00+0000\n"
-"Last-Translator: Ahti Hinnov <sipelgas@gmail.com>\n"
+"PO-Revision-Date: 2013-04-25 12:51+0000\n"
+"Last-Translator: Illimar Saatväli <is@hot.ee>\n"
 "Language-Team: Estonian <et@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: 2013-03-29 05:10+0000\n"
-"X-Generator: Launchpad (build 16546)\n"
+"X-Launchpad-Export-Date: 2013-04-26 06:24+0000\n"
+"X-Generator: Launchpad (build 16580)\n"
 
 #. module: web_calendar
 #. openerp-web
@@ -36,7 +36,7 @@ msgstr "Üksikasjad"
 #: code:addons/web_calendar/static/src/js/calendar.js:487
 #, python-format
 msgid "Edit: %s"
-msgstr ""
+msgstr "Muuda: %s"
 
 #. module: web_calendar
 #. openerp-web
diff --git a/addons/web_diagram/i18n/et.po b/addons/web_diagram/i18n/et.po
index d025ca77d25..e6bf80357b4 100644
--- a/addons/web_diagram/i18n/et.po
+++ b/addons/web_diagram/i18n/et.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openerp-web\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2013-03-07 08:39+0000\n"
-"PO-Revision-Date: 2012-12-21 23:00+0000\n"
-"Last-Translator: Ahti Hinnov <sipelgas@gmail.com>\n"
+"PO-Revision-Date: 2013-04-25 14:34+0000\n"
+"Last-Translator: Illimar Saatväli <is@hot.ee>\n"
 "Language-Team: Estonian <et@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: 2013-03-29 05:10+0000\n"
-"X-Generator: Launchpad (build 16546)\n"
+"X-Launchpad-Export-Date: 2013-04-26 06:24+0000\n"
+"X-Generator: Launchpad (build 16580)\n"
 
 #. module: web_diagram
 #. openerp-web
@@ -23,7 +23,7 @@ msgstr ""
 #: code:addons/web_diagram/static/src/js/diagram.js:317
 #, python-format
 msgid "Open: "
-msgstr ""
+msgstr "Avatud: "
 
 #. module: web_diagram
 #. openerp-web
@@ -49,7 +49,7 @@ msgstr "Uus sõlm"
 #: code:addons/web_diagram/static/src/js/diagram.js:329
 #, python-format
 msgid "Transition"
-msgstr ""
+msgstr "Üleminek"
 
 #. module: web_diagram
 #. openerp-web
@@ -64,7 +64,7 @@ msgstr "Diagramm"
 #: code:addons/web_diagram/static/src/js/diagram.js:278
 #, python-format
 msgid "Activity"
-msgstr ""
+msgstr "Tegevus"
 
 #. module: web_diagram
 #. openerp-web
@@ -97,3 +97,6 @@ msgid ""
 "\n"
 "Are you sure ?"
 msgstr ""
+"Peale kustutamist ei saa seda tagasi võtta.\n"
+"\n"
+"Oled sa kindel?"
diff --git a/addons/web_graph/i18n/et.po b/addons/web_graph/i18n/et.po
index 30a7fd6c7eb..7a6dd250f5d 100644
--- a/addons/web_graph/i18n/et.po
+++ b/addons/web_graph/i18n/et.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openerp-web\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2013-03-07 08:39+0000\n"
-"PO-Revision-Date: 2012-12-21 23:00+0000\n"
-"Last-Translator: Ahti Hinnov <sipelgas@gmail.com>\n"
+"PO-Revision-Date: 2013-04-25 14:41+0000\n"
+"Last-Translator: Illimar Saatväli <is@hot.ee>\n"
 "Language-Team: Estonian <et@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: 2013-03-29 05:10+0000\n"
-"X-Generator: Launchpad (build 16546)\n"
+"X-Launchpad-Export-Date: 2013-04-26 06:24+0000\n"
+"X-Generator: Launchpad (build 16580)\n"
 
 #. module: web_graph
 #. openerp-web
@@ -64,7 +64,7 @@ msgstr "Sektor"
 #: code:addons/web_graph/static/src/xml/web_graph.xml:28
 #, python-format
 msgid "Actions"
-msgstr "Toimingud"
+msgstr "Tegevused"
 
 #. module: web_graph
 #. openerp-web
@@ -92,7 +92,7 @@ msgstr "Lae alla PNG"
 #: code:addons/web_graph/static/src/xml/web_graph.xml:26
 #, python-format
 msgid "Top"
-msgstr "Üleval"
+msgstr "Üles"
 
 #. module: web_graph
 #. openerp-web
diff --git a/addons/web_kanban/i18n/et.po b/addons/web_kanban/i18n/et.po
index 7984ff53852..f39dd6c8625 100644
--- a/addons/web_kanban/i18n/et.po
+++ b/addons/web_kanban/i18n/et.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openerp-web\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2013-03-07 08:39+0000\n"
-"PO-Revision-Date: 2012-12-21 23:00+0000\n"
-"Last-Translator: Ahti Hinnov <sipelgas@gmail.com>\n"
+"PO-Revision-Date: 2013-04-25 14:53+0000\n"
+"Last-Translator: Illimar Saatväli <is@hot.ee>\n"
 "Language-Team: Estonian <et@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: 2013-03-29 05:10+0000\n"
-"X-Generator: Launchpad (build 16546)\n"
+"X-Launchpad-Export-Date: 2013-04-26 06:24+0000\n"
+"X-Generator: Launchpad (build 16580)\n"
 
 #. module: web_kanban
 #. openerp-web
@@ -29,7 +29,7 @@ msgstr "Muuda veergu"
 #: code:addons/web_kanban/static/src/xml/web_kanban.xml:80
 #, python-format
 msgid "Show more... ("
-msgstr ""
+msgstr "Näita rohkem ... ("
 
 #. module: web_kanban
 #. openerp-web
@@ -50,7 +50,7 @@ msgstr "Määramata"
 #: code:addons/web_kanban/static/src/js/kanban.js:705
 #, python-format
 msgid "Are you sure to remove this column ?"
-msgstr ""
+msgstr "Kas oled kindel, et soovid seda veergu eemaldada ?"
 
 #. module: web_kanban
 #. openerp-web
@@ -86,7 +86,7 @@ msgstr "Lisa uus veerg"
 #: code:addons/web_kanban/static/src/xml/web_kanban.xml:45
 #, python-format
 msgid "Fold"
-msgstr ""
+msgstr "Voldi"
 
 #. module: web_kanban
 #. openerp-web
@@ -100,21 +100,21 @@ msgstr "Lisa"
 #: code:addons/web_kanban/static/src/xml/web_kanban.xml:35
 #, python-format
 msgid "Quick create"
-msgstr ""
+msgstr "Kiirloomine"
 
 #. module: web_kanban
 #. openerp-web
 #: code:addons/web_kanban/static/src/js/kanban.js:918
 #, python-format
 msgid "Are you sure you want to delete this record ?"
-msgstr ""
+msgstr "Kas oled kindel, et soovd selle kirje kustutada?"
 
 #. module: web_kanban
 #. openerp-web
 #: code:addons/web_kanban/static/src/js/kanban.js:677
 #, python-format
 msgid "Unfold"
-msgstr ""
+msgstr "Voldi lahti"
 
 #. module: web_kanban
 #. openerp-web
@@ -128,14 +128,14 @@ msgstr "Loobu"
 #: code:addons/web_kanban/static/src/xml/web_kanban.xml:80
 #, python-format
 msgid "remaining)"
-msgstr ""
+msgstr "ülejäänud)"
 
 #. module: web_kanban
 #. openerp-web
 #: code:addons/web_kanban/static/src/js/kanban.js:421
 #, python-format
 msgid "An error has occured while moving the record to this group: "
-msgstr ""
+msgstr "Tekkis viga selle kirje kolimisel sellesse gruppi: "
 
 #. module: web_kanban
 #. openerp-web
@@ -159,3 +159,7 @@ msgstr "99+"
 #, python-format
 msgid "Delete"
 msgstr "Eemalda"
+
+#, python-format
+#~ msgid "An error has occured while moving the record to this group."
+#~ msgstr "Tekkis viga selle kirje kolimisel sellesse gruppi."
diff --git a/addons/web_view_editor/i18n/et.po b/addons/web_view_editor/i18n/et.po
index 3474e7e195e..0c01a5becf5 100644
--- a/addons/web_view_editor/i18n/et.po
+++ b/addons/web_view_editor/i18n/et.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openerp-web\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2013-03-07 08:39+0000\n"
-"PO-Revision-Date: 2012-12-21 23:00+0000\n"
-"Last-Translator: Ahti Hinnov <sipelgas@gmail.com>\n"
+"PO-Revision-Date: 2013-04-25 15:00+0000\n"
+"Last-Translator: Illimar Saatväli <is@hot.ee>\n"
 "Language-Team: Estonian <et@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: 2013-03-29 05:10+0000\n"
-"X-Generator: Launchpad (build 16546)\n"
+"X-Launchpad-Export-Date: 2013-04-26 06:24+0000\n"
+"X-Generator: Launchpad (build 16580)\n"
 
 #. module: web_view_editor
 #. openerp-web
@@ -122,7 +122,7 @@ msgstr "Muuda"
 #: code:addons/web_view_editor/static/src/js/view_editor.js:14
 #, python-format
 msgid "Could not find current view declaration"
-msgstr ""
+msgstr "Ei leia praeguse vaate deklaratsiooni"
 
 #. module: web_view_editor
 #. openerp-web