From 28c4e5530f062cc7c618c67810220e5126330d5e Mon Sep 17 00:00:00 2001
From: Stuart Longland <me@vk4msl.yi.org>
Date: Fri, 23 Mar 2012 15:21:46 +1000
Subject: [PATCH 001/110] faces: Fix 24-hour and end-at-midnight timespans

In cases where a working day either:
- Spans 24 hours
or
- ends at midnight

the time span calculation code incorrectly calculates the time of that
day, either stating that the day is 0 minutes long, or worse, is
negative.

The following patch addresses this.  Non-working days are specified
using the Python 'None', or 'False' values, rather than specifying the
same start and end time, as the latter will now be interpreted as a
24-hour period.

bzr revid: me@vk4msl.yi.org-20120323052146-vosvz50lg12n7e1i
---
 addons/resource/faces/pcalendar.py | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/addons/resource/faces/pcalendar.py b/addons/resource/faces/pcalendar.py
index c82c49d4816..4b023911b1e 100644
--- a/addons/resource/faces/pcalendar.py
+++ b/addons/resource/faces/pcalendar.py
@@ -895,7 +895,16 @@ class Calendar(object):
     def _recalc_working_time(self):
         def slot_sum_time(day):
             slots = self.working_times.get(day, DEFAULT_WORKING_DAYS[day])
-            return sum(map(lambda slot: slot[1] - slot[0], slots))
+            def time_diff(times):
+                (start, end) = times
+                if end == start:
+                    return 24*60    # 24 hours
+
+                diff = end - start
+                if end < start:
+                    diff += (24*60)
+                return diff
+            return sum(map(time_diff, slots))
 
         self.day_times = map(slot_sum_time, range(0, 7))
         self.week_time = sum(self.day_times)

From 5c4dba40f74f09d5ff0856fb9904f61ff792656e Mon Sep 17 00:00:00 2001
From: Stuart Longland <me@vk4msl.yi.org>
Date: Fri, 23 Mar 2012 15:22:50 +1000
Subject: [PATCH 002/110] resource: Convert working hours to UTC

Faces assumes that all times are given in the same timezone.  OpenERP
uses UTC internally, and uses UTC when communicating task and project
start/end times to faces.

It unfortunately gives the working hours in local time.  The following
converts the time zone to UTC, assuming that the working hours are in
the time zone of the currently logged-in user.  (This will have to be
fixed to convert each resources' calendar from the resource's local time
zone to UTC.)

bzr revid: me@vk4msl.yi.org-20120323052250-m03bth2dy755hw1p
---
 addons/resource/resource.py | 145 ++++++++++++++++++++++++------------
 1 file changed, 99 insertions(+), 46 deletions(-)

diff --git a/addons/resource/resource.py b/addons/resource/resource.py
index fb3d8c0980e..b3bfcea9664 100644
--- a/addons/resource/resource.py
+++ b/addons/resource/resource.py
@@ -19,7 +19,7 @@
 #
 ##############################################################################
 
-from datetime import datetime, timedelta
+from datetime import datetime, timedelta, time, date
 import math
 from faces import *
 from osv import fields, osv
@@ -28,6 +28,7 @@ from tools.translate import _
 from itertools import groupby
 from operator import itemgetter
 
+import pytz
 
 class resource_calendar(osv.osv):
     _name = "resource.calendar"
@@ -279,8 +280,9 @@ def convert_timeformat(time_string):
     hour_part = split_list[0]
     mins_part = split_list[1]
     round_mins = int(round(float(mins_part) * 60,-2))
-    converted_string = hour_part + ':' + str(round_mins)[0:2]
-    return converted_string
+    return time(int(hour_part), round_mins)
+    #converted_string = hour_part + ':' + str(round_mins)[0:2]
+    #return converted_string
 
 class resource_resource(osv.osv):
     _name = "resource.resource"
@@ -366,51 +368,102 @@ class resource_resource(osv.osv):
         Change the format of working calendar from 'Openerp' format to bring it into 'Faces' format.
         @param calendar_id : working calendar of the project
         """
+        tz = pytz.utc
+        if context and ('tz' in context):
+            tz = pytz.timezone(context['tz'])
+
+        wktime_local = None
+        week_days = ['mon', 'tue', 'wed', 'thu', 'fri', 'sat', 'sun']
         if not calendar_id:
-            # Calendar is not specified: working days: 24/7
-            return [('fri', '8:0-12:0','13:0-17:0'), ('thu', '8:0-12:0','13:0-17:0'), ('wed', '8:0-12:0','13:0-17:0'), 
-                   ('mon', '8:0-12:0','13:0-17:0'), ('tue', '8:0-12:0','13:0-17:0')]
-        resource_attendance_pool = self.pool.get('resource.calendar.attendance')
-        time_range = "8:00-8:00"
-        non_working = ""
-        week_days = {"0": "mon", "1": "tue", "2": "wed","3": "thu", "4": "fri", "5": "sat", "6": "sun"}
-        wk_days = {}
-        wk_time = {}
-        wktime_list = []
+            # Calendar is not specified: working days: some sane default
+            wktime_local = [
+                (0,     time(8,0),     time(12,0)),
+                (0,     time(13,0),    time(17,0)),
+                (1,     time(8,0),     time(12,0)),
+                (1,     time(13,0),    time(17,0)),
+                (2,     time(8,0),     time(12,0)),
+                (2,     time(13,0),    time(17,0)),
+                (3,     time(8,0),     time(12,0)),
+                (3,     time(13,0),    time(17,0)),
+                (4,     time(8,0),     time(12,0)),
+                (4,     time(13,0),    time(17,0)),
+            ]
+            #return [('fri', '8:0-12:0','13:0-17:0'), ('thu', '8:0-12:0','13:0-17:0'), ('wed', '8:0-12:0','13:0-17:0'), 
+            #       ('mon', '8:0-12:0','13:0-17:0'), ('tue', '8:0-12:0','13:0-17:0')]
+        else:
+            resource_attendance_pool = self.pool.get('resource.calendar.attendance')
+            non_working = ""
+            wktime_local = []
+
+            week_ids = resource_attendance_pool.search(cr, uid, [('calendar_id', '=', calendar_id)], context=context)
+            weeks = resource_attendance_pool.read(cr, uid, week_ids, ['dayofweek', 'hour_from', 'hour_to'], context=context)
+            # Convert time formats into appropriate format required
+            # and create lists inside wktime_local.
+            for week in weeks:
+                res_str = ""
+                day = None
+                if week['dayofweek']:
+                    day = int(week['dayofweek'])
+                else:
+                    raise osv.except_osv(_('Configuration Error!'),_('Make sure the Working time has been configured with proper week days!'))
+                hour_from = convert_timeformat(week['hour_from'])
+                hour_to = convert_timeformat(week['hour_to'])
+                wktime_local.append((day, hour_from, hour_to))
+
+        # We now have working hours _in local time_.  Non-working days are an
+        # empty list, while working days are a list of tuples, consisting of a
+        # start time and an end time.  We will convert these to UTC for time
+        # calculation purposes.
+
+        # We need to get this into a dict
+        # which will be in the following format:
+        #   {   'day':  [(time(9,0), time(17,0)), ...], ... }
+        wktime_utc = {}
+
+        # NOTE: This may break with regards to DST!
+        for (day, start, end) in wktime_local:
+            # Convert start time to UTC
+            start_dt_local = datetime.combine(date.today(), start.replace(tzinfo=tz))
+            start_dt_utc = start_dt_local.astimezone(pytz.utc)
+            start_dt_day = (day + (start_dt_utc.date() - start_dt_local.date()).days) % 7
+
+            # Convert end time to UTC
+            end_dt_local = datetime.combine(date.today(), end.replace(tzinfo=tz))
+            end_dt_utc = end_dt_local.astimezone(pytz.utc)
+            end_dt_day = (day + (end_dt_utc.date() - end_dt_local.date()).days) % 7
+
+            # Are start and end still on the same day?
+            if start_dt_day == end_dt_day:
+                day_name = week_days[start_dt_day]
+                if day_name not in wktime_utc:
+                    wktime_utc[day_name] = []
+                wktime_utc[day_name].append((start_dt_utc.time(), end_dt_utc.time()))
+            else:
+                day_start_name = week_days[start_dt_day]
+                if day_start_name not in wktime_utc:
+                    wktime_utc[day_start_name] = []
+                # We go until midnight that day
+                wktime_utc[day_start_name].append((start_dt_utc.time(), time(0,0)))
+
+                day_end_name = week_days[end_dt_day]
+                if day_end_name not in wktime_utc:
+                    wktime_utc[day_end_name] = []
+                # Then resume from midnight that day
+                wktime_utc[day_end_name].append((time(0,0), end_dt_utc.time()))
+
+        # Now having gotten a list of times together, generate the final output
         wktime_cal = []
-        week_ids = resource_attendance_pool.search(cr, uid, [('calendar_id', '=', calendar_id)], context=context)
-        weeks = resource_attendance_pool.read(cr, uid, week_ids, ['dayofweek', 'hour_from', 'hour_to'], context=context)
-        # Convert time formats into appropriate format required
-        # and create a list like [('mon', '8:00-12:00'), ('mon', '13:00-18:00')]
-        for week in weeks:
-            res_str = ""
-            day = None
-            if week_days.get(week['dayofweek'],False):
-                day = week_days[week['dayofweek']]
-                wk_days[week['dayofweek']] = week_days[week['dayofweek']]
-            else:
-                raise osv.except_osv(_('Configuration Error!'),_('Make sure the Working time has been configured with proper week days!'))
-            hour_from_str = convert_timeformat(week['hour_from'])
-            hour_to_str = convert_timeformat(week['hour_to'])
-            res_str = hour_from_str + '-' + hour_to_str
-            wktime_list.append((day, res_str))
-        # Convert into format like [('mon', '8:00-12:00', '13:00-18:00')]
-        for item in wktime_list:
-            if wk_time.has_key(item[0]):
-                wk_time[item[0]].append(item[1])
-            else:
-                wk_time[item[0]] = [item[0]]
-                wk_time[item[0]].append(item[1])
-        for k,v in wk_time.items():
-            wktime_cal.append(tuple(v))
-        # Add for the non-working days like: [('sat, sun', '8:00-8:00')]
-        for k, v in wk_days.items():
-            if week_days.has_key(k):
-                week_days.pop(k)
-        for v in week_days.itervalues():
-            non_working += v + ','
-        if non_working:
-            wktime_cal.append((non_working[:-1], time_range))
+        for day, times in wktime_utc.iteritems():
+            # Sort the times
+            times.sort()
+            wktime = ['{0}-{1}'.format(s.strftime('%H:%M'), e.strftime('%H:%M')) for (s, e) in times]
+            wktime.insert(0, day)
+            wktime_cal.append(tuple(wktime))
+        # Finally, add in non-working days
+        for day in week_days:
+            if day not in wktime_utc:
+                wktime_cal.append((day, None))
+
         return wktime_cal
 
 resource_resource()

From 67bb69500a43330dc604039e8d8f51d0e4b4870e Mon Sep 17 00:00:00 2001
From: "Khushboo Bhatt (Open ERP)" <kbh@tinyerp.com>
Date: Tue, 28 Aug 2012 17:45:45 +0530
Subject: [PATCH 003/110] [FIX]CRM:creating phone calls from lead sets
 partner,phone,mobile and sales team

bzr revid: kbh@tinyerp.com-20120828121545-6vqvirfa99f3fnhe
---
 addons/crm/crm_lead.py       | 51 ++++++++++++++++++++++++++++++++++++
 addons/crm/crm_lead_view.xml | 12 ++-------
 2 files changed, 53 insertions(+), 10 deletions(-)

diff --git a/addons/crm/crm_lead.py b/addons/crm/crm_lead.py
index 25a47ecbadc..8e31b17b189 100644
--- a/addons/crm/crm_lead.py
+++ b/addons/crm/crm_lead.py
@@ -717,6 +717,57 @@ class crm_lead(base_stage, osv.osv):
                 self.write(cr, uid, [lead_id], value, context=context)
         return True
 
+    def phonecall_view(self, cr, uid, ids, call_summary, user_id=False, section_id=False, categ_id=False, context=None):
+        #Open the View for the Phone call for the leads
+        """
+        This opens Phone Call views
+        @return :Dictionary value for Phone Call view
+        """
+        if context is None:
+            context = {}
+        value = {}
+        data_obj = self.pool.get('ir.model.data')
+        if not categ_id:
+            res_id = data_obj._get_id(cr, uid, 'crm', 'categ_phone2')
+            if res_id:
+                categ_id = data_obj.browse(cr, uid, res_id, context=context).res_id
+        for lead in self.browse(cr, uid, ids, context=context):
+            if not section_id:
+                section_id = lead.section_id and lead.section_id.id or False
+            if not user_id:
+                user_id = lead.user_id and lead.user_id.id or False
+            # Get Phone Call views
+            tree_view = data_obj.get_object_reference(cr, uid, 'crm', 'crm_case_phone_tree_view')
+            form_view = data_obj.get_object_reference(cr, uid, 'crm', 'crm_case_phone_form_view')
+            search_view = data_obj.get_object_reference(cr, uid, 'crm', 'view_crm_case_phonecalls_filter')
+            context.update({
+                'default_duration': 1.0,
+                'default_opportunity_id': lead.id,
+                'default_user_id': user_id or False,
+                'default_categ_id' : categ_id or False,
+                'default_lead_id': lead.id,
+                'default_name': lead.name,
+                'default_partner_id': lead.partner_id and lead.partner_id.id or False,
+                'default_partner_mobile': lead.mobile or (lead.partner_id and lead.partner_id.mobile or False),
+                'default_section_id': section_id or False,
+                'default_description': lead.description or False,
+                'default_partner_phone': lead.phone or (lead.partner_id and lead.partner_id.phone or False),
+            })
+            value = {
+                'name': _('Phone Call'),
+                'context': context,
+                'view_type': 'form',
+                'view_mode': 'form,tree',
+                'res_model': 'crm.phonecall',
+                'view_id': False,
+                'context': context,
+                'views': [(form_view and form_view[1] or False, 'form'),(tree_view and tree_view[1] or False, 'tree')],
+                'type': 'ir.actions.act_window',
+                'search_view_id': search_view and search_view[1] or False,
+                'nodestroy': True
+            }
+        return value
+
     def schedule_phonecall(self, cr, uid, ids, schedule_time, call_summary, desc, phone, contact_name, user_id=False, section_id=False, categ_id=False, action='schedule', context=None):
         """
         action :('schedule','Schedule a call'), ('log','Log a call')
diff --git a/addons/crm/crm_lead_view.xml b/addons/crm/crm_lead_view.xml
index 6a715893a17..049aa74fb75 100644
--- a/addons/crm/crm_lead_view.xml
+++ b/addons/crm/crm_lead_view.xml
@@ -105,14 +105,6 @@
         <!--
             LEADS
         -->
-        <act_window
-                id="act_crm_opportunity_crm_phonecall_new"
-                name="Phone calls"
-                groups="base.group_sale_salesman"
-                res_model="crm.phonecall"
-                view_mode="tree,calendar,form"
-                context="{'default_duration': 1.0 ,'default_opportunity_id': active_id}"
-                view_type="form"/>
 
         <act_window
                 id="act_crm_opportunity_crm_meeting_new"
@@ -143,8 +135,8 @@
                 </header>
                 <sheet>
                     <div class="oe_right oe_button_box" name="buttons">
-                        <button type="action"
-                            name="%(act_crm_opportunity_crm_phonecall_new)d"
+                        <button type="object"
+                            name="phonecall_view"
                             string="Phone Calls" />
                     </div>
                     <div class="oe_title">

From 149800235092a70d8694bd1836d68c8f67d759b2 Mon Sep 17 00:00:00 2001
From: "Quentin (OpenERP)" <qdp-launchpad@openerp.com>
Date: Tue, 23 Oct 2012 13:13:01 +0200
Subject: [PATCH 004/110] [ADD] account_test

bzr revid: qdp-launchpad@openerp.com-20121023111301-c41qvtxm1l5p0nq0
---
 addons/account_test/__init__.py               |   2 +
 addons/account_test/__terp__.py               |  42 +++
 addons/account_test/account_test.py           |  65 +++++
 addons/account_test/account_test_data.xml     | 175 ++++++++++++
 addons/account_test/account_test_demo.xml     |  29 ++
 addons/account_test/account_test_report.xml   |  14 +
 addons/account_test/account_test_view.xml     |  56 ++++
 addons/account_test/i18n/fr_FR.po             | 264 ++++++++++++++++++
 addons/account_test/report/__init__.py        |   1 +
 addons/account_test/report/account_test.rml   |  78 ++++++
 .../report/account_test_report.py             | 105 +++++++
 .../account_test/security/ir.model.access.csv |   3 +
 12 files changed, 834 insertions(+)
 create mode 100644 addons/account_test/__init__.py
 create mode 100644 addons/account_test/__terp__.py
 create mode 100644 addons/account_test/account_test.py
 create mode 100644 addons/account_test/account_test_data.xml
 create mode 100644 addons/account_test/account_test_demo.xml
 create mode 100644 addons/account_test/account_test_report.xml
 create mode 100644 addons/account_test/account_test_view.xml
 create mode 100644 addons/account_test/i18n/fr_FR.po
 create mode 100644 addons/account_test/report/__init__.py
 create mode 100644 addons/account_test/report/account_test.rml
 create mode 100644 addons/account_test/report/account_test_report.py
 create mode 100644 addons/account_test/security/ir.model.access.csv

diff --git a/addons/account_test/__init__.py b/addons/account_test/__init__.py
new file mode 100644
index 00000000000..106682f4a12
--- /dev/null
+++ b/addons/account_test/__init__.py
@@ -0,0 +1,2 @@
+import account_test
+import report
diff --git a/addons/account_test/__terp__.py b/addons/account_test/__terp__.py
new file mode 100644
index 00000000000..5578f0339ae
--- /dev/null
+++ b/addons/account_test/__terp__.py
@@ -0,0 +1,42 @@
+# -*- encoding: utf-8 -*-
+##############################################################################
+#    
+#    OpenERP, Open Source Management Solution
+#    Copyright (c) 2011 CCI Connect asbl (http://www.cciconnect.be) All Rights Reserved.
+#                       Philmer <philmer@cciconnect.be>
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.     
+#
+##############################################################################
+{
+    "name" : "OpenERP",
+    "version" : "1.0",
+    "author" : "OpenERP",
+    "category" : "Test accounting",
+    "website": "http://www.openerp.com",
+    "description": "Asserts on accounting",
+    "depends" : ["account"],
+    "update_xml" : [
+        "account_test_view.xml",
+        "account_test_report.xml",
+        "security/ir.model.access.csv",
+        "account_test_data.xml",
+    ],
+    'demo_xml': [
+        "account_test_demo.xml",
+    ],
+    "active": False,
+    "installable": True
+}
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/account_test/account_test.py b/addons/account_test/account_test.py
new file mode 100644
index 00000000000..069ba6601e4
--- /dev/null
+++ b/addons/account_test/account_test.py
@@ -0,0 +1,65 @@
+# -*- encoding: utf-8 -*-
+##############################################################################
+#
+# Copyright (c) 2005-2006 TINY SPRL. (http://tiny.be) All Rights Reserved.
+#
+# $Id: product_expiry.py 4304 2006-10-25 09:54:51Z ged $
+#
+# WARNING: This program as such is intended to be used by professional
+# programmers who take the whole responsability of assessing all potential
+# consequences resulting from its eventual inadequacies and bugs
+# End users who are looking for a ready-to-use solution with commercial
+# garantees and support are strongly adviced to contract a Free Software
+# Service Company
+#
+# This program is Free Software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+#
+##############################################################################
+
+from osv import fields,osv
+import pooler
+import netsvc
+import time
+from xml import dom
+
+
+CODE_EXEC_DEFAULT = '''\
+res = []
+cr.execute("select id, code from account_journal")
+for record in cr.dictfetchall():
+    res.append(record['code'])
+result = res
+'''
+
+class accounting_assert_test(osv.osv):
+    _name = "accounting.assert.test"
+    _order = "sequence"
+
+    _columns = {
+        'name': fields.char('Test Name', size=256, required=True, select=True, translate=True),
+        'desc': fields.text('Test Description', select=True, translate=True),
+        'code_exec': fields.text('Python code or SQL query', required=True),
+        'active': fields.boolean('Active'),
+        'sequence': fields.integer('Sequence'),
+    }
+
+    _defaults = {
+        'code_exec': lambda *a: CODE_EXEC_DEFAULT,
+        'active': lambda *a: True,
+        'sequence': lambda *a: 10,
+    }
+
+accounting_assert_test()
+
diff --git a/addons/account_test/account_test_data.xml b/addons/account_test/account_test_data.xml
new file mode 100644
index 00000000000..453d8184b9e
--- /dev/null
+++ b/addons/account_test/account_test_data.xml
@@ -0,0 +1,175 @@
+<?xml version="1.0"?>
+<openerp>
+<data>
+
+    <record model="accounting.assert.test" id="account_test_01">
+        <field name="sequence">1</field>
+        <field name="name">Test 1: General balance</field>
+        <field name="desc">Check the balance: Debit sum = Credit sum</field>
+        <field name="code_exec"><![CDATA[sql="""SELECT
+sum(debit)-sum(credit) as balance
+FROM  account_move_line 
+"""
+cr.execute(sql)
+result= cr.dictfetchall()
+cr.execute(sql)
+result=[]
+res= cr.dictfetchall()
+if res[0]['balance']!=0.0:
+  result=res
+  result.insert(0,_('* The difference of the balance is: '))
+]]></field>
+    </record>
+
+    <record model="accounting.assert.test" id="account_test_02">
+        <field name="sequence">2</field>
+        <field name="name">Test 2: Opening a fiscal year</field>
+        <field name="desc">Check if the balance of the new opened fiscal year matches with last year's balance</field>
+        <field name="code_exec"><![CDATA[res = []
+cr.execute("select coalesce(sum(debit),0) as debit_new_fyear,coalesce(sum(credit),0) as credit_new_fyear from account_move_line where period_id in (select id from account_period where state='draft' and special order by id desc limit 1);")
+rec =  cr.dictfetchall()
+cr.execute("select coalesce(sum(debit),0) as debit_last_fyear,coalesce(sum(credit),0) as credit_last_fyear from account_move_line where period_id in (select period_id from account_fiscalyear where state='done' order by id desc limit 1);")
+rec2= cr.dictfetchall()
+if (rec2[0]['credit_last_fyear']-rec[0]['credit_new_fyear']!=0) or (rec2[0]['dedit_last_fyear']-rec[0]['dedit_new_fyear']!=0) :
+   res.append(rec[0])
+   res.insert(0,_('* New fiscalyear debit and credit are:'))
+   res.append(rec2[0])
+   res.insert(2,_('* Last year debit and credit are:'))
+result = res
+]]></field>
+    </record>
+
+    <record model="accounting.assert.test" id="account_test_03">
+        <field name="sequence">3</field>
+        <field name="name">Test 3: Movement lines</field>
+        <field name="desc">Check if movement lines are balanced and have the same date and period</field>
+        <field name="code_exec"><![CDATA[order_columns=['am_date','ml_date','am.period_id','ml.period_id','am.id']
+sql="""SELECT
+  am.id as move_id,
+  sum(debit)-sum(credit) as balance,
+  am.period_id,
+  ml.period_id,
+  am.date as am_date,
+  ml.date as ml_date
+FROM account_move am, account_move_line ml
+WHERE
+  ml.move_id = am.id
+GROUP BY am.name, am.id, am.state, am.period_id, ml.period_id,am.period_id, ml.period_id,am.date, ml.date
+HAVING abs(sum(ml.debit-ml.credit)) <> 0 or am.period_id!=ml.period_id or (am.date!=ml.date)
+"""
+cr.execute(sql)
+res = cr.dictfetchall()
+if res:
+    res.insert(0,_('* The test failed for these movement lines:'))
+    result = res
+
+]]></field>
+    </record>
+
+    <record model="accounting.assert.test" id="account_test_04">
+        <field name="sequence">4</field>
+        <field name="name">Test 4: Totally reconciled mouvements</field>
+        <field name="desc">Check if the totally reconciled movements are balanced</field>
+        <field name="code_exec"><![CDATA[res = []
+cr.execute("SELECT distinct reconcile_id from account_move_line where reconcile_id is not null")
+rec_ids = cr.dictfetchall()
+for record in rec_ids :
+  cr.execute("SELECT distinct r.name,r.id from account_journal j,account_period p, account_move_reconcile r,account_move m, account_move_line ml where m.journal_id=j.id and m.period_id=p.id and ml.reconcile_id=%s and ml.move_id=m.id and ml.reconcile_id=r.id group by r.id,r.name having sum(ml.debit)-sum(ml.credit)<>0", (record['reconcile_id'],))
+  reconcile_ids=cr.dictfetchall()
+  if reconcile_ids:
+    res.append(', '.join(["Reconcile name: %(name)s, id=%(id)s " % r for r in reconcile_ids]))
+result = res
+if result:
+    res.insert(0,_('* The test failed for these reconciled items(id/name):'))
+]]></field>
+    </record>
+
+    <record model="accounting.assert.test" id="account_test_05">
+        <field name="sequence">5</field>
+        <field name="name">Test 5.1 : Payable and Receivable accountant lines of reconciled invoices</field>
+        <field name="desc">Check that reconciled invoice for Sales/Purchases has reconciled entries for Payable and Receivable Accounts</field>
+        <field name="code_exec"><![CDATA[res = []
+cr.execute("SELECT distinct inv.number,inv.id from account_invoice inv, account_move m, account_move_line ml, account_account a where m.id=ml.move_id and ml.account_id=a.id and a.type in ('receivable','payable') and inv.move_id=m.id and ml.reconcile_id is not null;")
+records= cr.dictfetchall()
+rec = [r['id'] for r in records]
+res = reconciled_inv()
+invoices = set(rec).difference(set(res))
+groups = group(list(records),'number')
+result = [rec for rec in records if rec['id'] in invoices]
+if result:
+    result.insert(0,_('* Invoices that need to be checked: '))
+]]></field>
+    </record>
+
+
+    <record model="accounting.assert.test" id="account_test_05_2">
+        <field name="sequence">6</field>
+        <field name="name">Test 5.2 : Reconcilied invoices and Payable/Receivable accounts</field>
+        <field name="desc">Check that reconciled account moves, that define Payable and Receivable accounts, are belonging to reconciled invoices</field>
+        <field name="code_exec"><![CDATA[res = reconciled_inv()
+cr.execute("SELECT distinct inv.number,inv.id from account_invoice inv, account_move_line ml, account_account a, account_move m where m.id=ml.move_id and inv.move_id=m.id and inv.id=inv.move_id and ml.reconcile_id is null and a.type in ('receivable','payable')  and ml.account_id=a.id and inv.id in %s",(tuple(res),))
+records = cr.dictfetchall()
+groups = group(list(records),'number')
+result = [rec for rec in records]
+if result:
+    result.insert(0,_('* Invoices that need to be checked: '))
+]]></field>
+    </record>
+
+    <record model="accounting.assert.test" id="account_test_06">
+        <field name="sequence">7</field>
+        <field name="name">Test 6 : Invoices status</field>
+        <field name="desc">Check that paid/reconciled invoices are not in 'Open' state</field>
+        <field name="code_exec"><![CDATA[
+res = []
+column_order = ['number','id','name','state']
+if reconciled_inv():
+  cr.execute("select inv.name,inv.state,inv.id,inv.number from account_invoice inv where inv.state!='paid' and id in %s", (tuple(reconciled_inv()),))
+  res = cr.dictfetchall()
+result = res
+if result:
+    result.insert(0,_('* Invoices that need to be checked: '))
+]]></field>
+    </record>
+
+
+    <record model="accounting.assert.test" id="account_test_06_1">
+        <field name="sequence">8</field>
+        <field name="name">Test 7: « View  » account type</field>
+        <field name="desc">Check that there's no move for any account with « View » account type</field>
+        <field name="code_exec"><![CDATA[column_order=['name','ref','id','date']
+sql = "select id, name, ref, date from account_move_line where account_id in (select id from account_account where type = 'view')"
+cr.execute(sql)
+result = cr.dictfetchall()
+if result:
+    result.insert(0,_('* Movement lines that need to be checked: '))
+]]></field>
+    </record>
+
+    <record model="accounting.assert.test" id="account_test_07">
+        <field name="sequence">9</field>
+        <field name="name">Test 8 : Closing balance on bank statements</field>
+        <field name="desc">Check on bank statement that the Closing Balance = Starting Balance + sum of statement lines</field>
+        <field name="code_exec"><![CDATA[column_order = ['name','difference']
+cr.execute("SELECT s.balance_start+sum(m.amount)-s.balance_end_real as difference, s.name from account_bank_statement s inner join account_bank_statement_line m on m.statement_id=s.id group by s.id, s.balance_start, s.balance_end_real,s.name having abs(s.balance_start+sum(m.amount)-s.balance_end_real) > 0.000000001;")
+result = cr.dictfetchall()
+if result:
+    result.insert(0,_('* Unbalanced bank statement that need to be checked: '))
+]]></field>
+    </record>
+
+    <record model="accounting.assert.test" id="account_test_08">
+        <field name="sequence">10</field>
+        <field name="name">Test 9 : Accounts and partners on account moves</field>
+        <field name="desc">Check that general accounts and partners on account moves are active</field>
+        <field name="code_exec"><![CDATA[column_order=['partner_name','partner_active','account_name','move_line_id','period']
+res = []
+cr.execute("SELECT l.id as move_line_id,a.name as account_name,a.code as account_code,r.name as partner_name,r.active as partner_active,p.name as period from account_period p,res_partner r, account_account a,account_move_line l where l.account_id=a.id and l.partner_id=r.id and (not r.active or not a.active) and l.period_id=p.id")
+res = cr.dictfetchall()
+result = res
+if result:
+  result.insert(0,_('* Here is the list of inactive partners and movement lines that are not correct: '))
+]]></field>
+    </record>
+</data>
+</openerp>
diff --git a/addons/account_test/account_test_demo.xml b/addons/account_test/account_test_demo.xml
new file mode 100644
index 00000000000..d10182f61b8
--- /dev/null
+++ b/addons/account_test/account_test_demo.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0"?>
+<openerp>
+<data>
+
+    <record model="accounting.assert.test" id="account_test_demo_01">
+        <field name="name">Test 1</field>
+        <field name="desc">Test 1</field>
+        <field name="domain_exec"></field>
+        <field name="code_exec"><![CDATA[sql="""SELECT
+    sum(debit) as sum_debit,
+    sum(credit) as sum_credit,
+    sum(debit-credit) as balance,
+    am.id as move_id,
+    am.state,
+    am.period_id
+  FROM account_move am, account_move_line ml
+  WHERE
+       ml.move_id = am.id
+     AND
+       ml.state = 'valid'
+  GROUP BY am.name, am.id, am.state, am.period_id
+  HAVING abs(sum(ml.debit-ml.credit)) <> 0"""
+cr.execute(sql)
+result = cr.dictfetchall()
+]]></field>
+    </record>
+
+</data>
+</openerp>
diff --git a/addons/account_test/account_test_report.xml b/addons/account_test/account_test_report.xml
new file mode 100644
index 00000000000..480507b6072
--- /dev/null
+++ b/addons/account_test/account_test_report.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+<data>
+
+    <report
+        id="account_assert_test_report"
+        model="accounting.assert.test"
+        name="account.test.assert.print"
+        rml="account_test/report/account_test.rml"
+        header="False"
+        string="Accounting Tests"/>
+
+</data>
+</openerp>
diff --git a/addons/account_test/account_test_view.xml b/addons/account_test/account_test_view.xml
new file mode 100644
index 00000000000..8351cb0687a
--- /dev/null
+++ b/addons/account_test/account_test_view.xml
@@ -0,0 +1,56 @@
+<?xml version="1.0"?>
+<openerp>
+    <data>
+
+    <record model="ir.ui.view" id="account_assert_tree">
+        <field name="name">Tests</field>
+        <field name="model">accounting.assert.test</field>
+            <field name="type">tree</field>
+            <field name="arch" type="xml">
+                <tree string="Tests">
+                    <field name="sequence"/>
+                    <field name="name"/>
+                    <field name="desc"/>
+                </tree>
+            </field>
+        </record>
+
+    <record model="ir.ui.view" id="account_assert_form">
+        <field name="name">Tests</field>
+        <field name="model">accounting.assert.test</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Tests">
+                <group colspan="4" col="4">
+                    <field name="name"/>
+                    <field name="active"/>
+                    <field name="sequence"/>
+                    <newline/>
+                    <field name="desc" colspan="4" height="50" /> 
+                </group>
+                <separator string="Expression to evaluate" colspan="4"/>
+                <group colspan="4" col="4">
+                    <separator string="Python Code" colspan="4" />
+                    <newline />
+                    <field colspan="4" name="code_exec" nolabel="1" width="100" height="400" />
+                    <separator string="Code Help" colspan="4"/>
+                    <newline />
+                    <label colspan="4"><![CDATA[Example:
+sql = "select id, name, ref, date from account_move_line where account_id in (select id from account_account where type = 'view')"
+cr.execute(sql)
+result = cr.dictfetchall()]]></label>
+                </group>
+                </form>
+            </field>
+        </record>
+
+    <record model="ir.actions.act_window" id="action_accounting_assert">
+        <field name="name">Accounting Tests</field>
+        <field name="res_model">accounting.assert.test</field>
+        <field name="view_mode">tree,form</field>
+    </record>
+
+    <menuitem name="Accounting Tests" parent="account.menu_finance_reporting" id="menu_action_license" action="action_accounting_assert"/>
+
+</data>
+</openerp>
diff --git a/addons/account_test/i18n/fr_FR.po b/addons/account_test/i18n/fr_FR.po
new file mode 100644
index 00000000000..6266ff9fa54
--- /dev/null
+++ b/addons/account_test/i18n/fr_FR.po
@@ -0,0 +1,264 @@
+# Translation of OpenERP Server.
+# This file contains the translation of the following modules:
+#	* account_test
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: OpenERP Server 5.0.16\n"
+"Report-Msgid-Bugs-To: support@openerp.com\n"
+"POT-Creation-Date: 2011-11-13 15:05:26+0000\n"
+"PO-Revision-Date: 2011-11-13 15:05:26+0000\n"
+"Last-Translator: <>\n"
+"Language-Team: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: \n"
+"Plural-Forms: \n"
+
+#. module: account_test
+#: field:accounting.assert.test,desc:0
+msgid "Test Description"
+msgstr "Test Description"
+
+#. module: account_test
+#: constraint:ir.model:0
+msgid "The Object name must start with x_ and not contain any special character !"
+msgstr "Le nom de l'object doit commencer par x_ et ne doit pas contenir de caractères spéciaux !"
+
+#. module: account_test
+#: model:accounting.assert.test,name:account_test.account_test_02
+msgid "Test 2: Opening a fiscal year"
+msgstr "Test 2: Ouverture d'une année fiscale"
+
+#. module: account_test
+#: model:accounting.assert.test,desc:account_test.account_test_03
+msgid "Check if movement lines are balanced and have the same date and period"
+msgstr "Vérifier que les lignes d'un même mouvement sont balancées, avec la même période et la même date"
+
+#. module: account_test
+#: model:accounting.assert.test,name:account_test.account_test_09_1
+msgid "Test 9.1 : Gap in Invoices sequence"
+msgstr "Test 9: Trous dans la numérotation des factures"
+
+#. module: account_test
+#: model:ir.actions.report.xml,name:account_test.account_assert_test_report
+msgid "Accounting Tests"
+msgstr "Tests Comptables"
+
+#. module: account_test
+#: field:accounting.assert.test,name:0
+msgid "Test Name"
+msgstr "Nom du test"
+
+#. module: account_test
+#: constraint:ir.actions.act_window:0
+msgid "Invalid model name in the action definition."
+msgstr "Modèle non valide pour le définition de l'action"
+
+#. module: account_test
+#: field:accounting.assert.test,code_exec:0
+msgid "Python code or SQL query"
+msgstr "Code Python ou requête SQL"
+
+#. module: account_test
+#: rml:account.test.assert.print:0
+msgid "Accouting tests on"
+msgstr "Tests comptables sur"
+
+#. module: account_test
+#: model:accounting.assert.test,desc:account_test.account_test_06
+msgid "Check that paid/reconciled invoices are not in 'Open' state"
+msgstr "Vérifier que les factures paid/reconcilied ne sont pas 'open'"
+
+#. module: account_test
+#: model:accounting.assert.test,name:account_test.account_test_11_2
+msgid "Test 11.2: Analytical moves"
+msgstr "Test 11.2: Lignes analytiques"
+
+#. module: account_test
+#: model:accounting.assert.test,desc:account_test.account_test_09_2
+msgid "Check that there's no gap in Bank Stetement sequence"
+msgstr "Test 9: Trous dans la numérotation des extraits de comptes"
+
+#. module: account_test
+#: view:accounting.assert.test:0
+msgid "Tests"
+msgstr "Tests"
+
+#. module: account_test
+#: view:accounting.assert.test:0
+msgid "Expression to evaluate"
+msgstr "Expression à évaluer"
+
+#. module: account_test
+#: model:accounting.assert.test,desc:account_test.account_test_06_1
+msgid "Check that there's no move for any account with « View » account type"
+msgstr "Vérifier qu'il n'y a pas de mouvements sur des comptes de type 'vue'"
+
+#. module: account_test
+#: model:ir.actions.act_window,name:account_test.action_accounting_assert
+#: model:ir.ui.menu,name:account_test.menu_action_license
+msgid "Accounting Tests"
+msgstr "Tests Comptables"
+
+#. module: account_test
+#: model:accounting.assert.test,name:account_test.account_test_09_2
+msgid "Test 9.2 : Gap in Bank Statement sequence"
+msgstr "Test 9.2 : Trous dans la numérotation des extraits de comptes"
+
+#. module: account_test
+#: model:accounting.assert.test,name:account_test.account_test_01
+msgid "Test 1: General balance"
+msgstr "Test 1: Balance Générale"
+
+#. module: account_test
+#: model:ir.module.module,description:account_test.module_meta_information
+msgid "Asserts on accounting"
+msgstr "Asserts on accounting"
+
+#. module: account_test
+#: code:addons/account_test/report/account_test_report.py:0
+#, python-format
+msgid "The test was passed successfully"
+msgstr "Le test est passé avec succès"
+
+#. module: account_test
+#: field:accounting.assert.test,active:0
+msgid "Active"
+msgstr "Active"
+
+#. module: account_test
+#: model:accounting.assert.test,name:account_test.account_test_06
+msgid "Test 6 : Invoices status"
+msgstr "Test 6: vérifier les factures"
+
+#. module: account_test
+#: model:ir.model,name:account_test.model_accounting_assert_test
+msgid "accounting.assert.test"
+msgstr "accounting.assert.test"
+
+#. module: account_test
+#: model:accounting.assert.test,desc:account_test.account_test_05_2
+msgid "Check that reconciled account moves, that define Payable and Receivable accounts, are belonging to reconciled invoices"
+msgstr "Vérifier que les lignes de factures d'achat/vente réconciliées ont des écritures pour les comptes payables et recevables réconciliées"
+
+#. module: account_test
+#: model:accounting.assert.test,desc:account_test.account_test_11_2
+msgid "Check that amounts by analytical plan are equals to the amount of account move line"
+msgstr "Vérifier que les montants par plan analytique sont égaux au montant de la ligne du mouvement comptable"
+
+#. module: account_test
+#: model:accounting.assert.test,desc:account_test.account_test_11_1
+msgid "Check that each account move line has at least 3 analytical moves"
+msgstr "Vérifier que chaque ligne d'un mouvement comptable a au moins 3 lignes analytiques"
+
+#. module: account_test
+#: model:accounting.assert.test,name:account_test.account_test_07
+msgid "Test 8 : Closing balance on bank statements"
+msgstr "Test 8 : Vérification des lignes financières des extraits de comptes"
+
+#. module: account_test
+#: model:accounting.assert.test,desc:account_test.account_test_07
+msgid "Check on bank statement that the Closing Balance = Starting Balance + sum of statement lines"
+msgstr "Vérifier que le solde de fin est égal au solde de début + la somme des mouvements"
+
+#. module: account_test
+#: model:accounting.assert.test,name:account_test.account_test_05
+msgid "Test 5.1 : Payable and Receivable lines accounts of reconciled invoices"
+msgstr "Test 5.1 : Vérification des lignes des comptes payables et recevables des factures réconciliées"
+
+#. module: account_test
+#: model:accounting.assert.test,name:account_test.account_test_03
+msgid "Test 3: Movement lines"
+msgstr "Test 3: Mouvements comptables"
+
+#. module: account_test
+#: constraint:ir.ui.view:0
+msgid "Invalid XML for View Architecture!"
+msgstr "XML Invalide pour cette vue"
+
+#. module: account_test
+#: model:accounting.assert.test,name:account_test.account_test_11_1
+msgid "Test 11.1: Analytical moves"
+msgstr "Test 11.1: Mouvements analytiques"
+
+#. module: account_test
+#: model:accounting.assert.test,name:account_test.account_test_05_2
+msgid "Test 5.2 : Reconcilied invoices and Payable/Receivable accounts"
+msgstr "Test 5.2 : Factures réconciliées et les lignes des comptes payables et recevables non réconciliées "
+
+#. module: account_test
+#: model:accounting.assert.test,name:account_test.account_test_15
+msgid "Test 15 : Analytical moves for Analytic multi plan"
+msgstr "Test 15 : Mouvements analytiques"
+
+#. module: account_test
+#: model:accounting.assert.test,desc:account_test.account_test_15
+msgid "Check that analytic accounts used on lines are present in analytic sections of different plans"
+msgstr "Vérifier que les centres de coûts présents dans les lignes sont bien présents dans les sections analytiques des différents plans"
+
+#. module: account_test
+#: model:accounting.assert.test,name:account_test.account_test_04
+msgid "Test 4: Totally reconciled mouvements"
+msgstr "Test 4: Vérification des reconcile complets"
+
+#. module: account_test
+#: model:accounting.assert.test,desc:account_test.account_test_04
+msgid "Check if the totally reconciled movements are balanced"
+msgstr "Vérification des reconcile complets"
+
+#. module: account_test
+#: field:accounting.assert.test,sequence:0
+msgid "Sequence"
+msgstr "Séquence"
+
+#. module: account_test
+#: model:accounting.assert.test,desc:account_test.account_test_02
+msgid "Check if the balance of the new opened fiscal year matches with last year's balance"
+msgstr "Vérifier que l'ouverture d'une année fiscale correspond au solde de l'année passée"
+
+#. module: account_test
+#: view:accounting.assert.test:0
+msgid "Python Code"
+msgstr "Code Python"
+
+#. module: account_test
+#: model:accounting.assert.test,name:account_test.account_test_08
+msgid "Test 9 : Accounts and partners on account moves"
+msgstr "Test 9 : Comptes et partenaires sur les mouvements comptables"
+
+#. module: account_test
+#: model:accounting.assert.test,name:account_test.account_test_06_1
+msgid "Test 7: « View  » account type"
+msgstr "Test 7: mouvements sur comptes type 'vue'"
+
+#. module: account_test
+#: model:ir.module.module,shortdesc:account_test.module_meta_information
+msgid "OpenERP"
+msgstr "OpenERP"
+
+#. module: account_test
+#: model:accounting.assert.test,desc:account_test.account_test_05
+msgid "Check that reconciled invoice for Sales/Purchases has reconciled entries for Payable and Receivable Accounts"
+msgstr "Vérifier que les factures réconcilées ont des écritures comptables sur les comptes payables ou recevables réconciliées"
+
+#. module: account_test
+#: model:accounting.assert.test,desc:account_test.account_test_09_1
+msgid "Check that there's no gap in invoices sequence"
+msgstr "Vérifier que les factures n'ont pas de trous dans leur numérotation"
+
+#. module: account_test
+#: model:accounting.assert.test,desc:account_test.account_test_01
+msgid "Check the balance: Debit sum = Credit sum"
+msgstr "Vérifier la balance générale: somme débit = somme crédit"
+
+#. module: account_test
+#: model:accounting.assert.test,desc:account_test.account_test_14
+msgid "Check that general accounts and partners on account moves are active"
+msgstr "Vérifier que les comptes généraux ainsi que les partenaires renseignés sur les mouvements comptables sont actifs"
+
+#. module: account_test
+#: view:accounting.assert.test:0
+msgid "Code Help"
+msgstr "Code Help"
+
diff --git a/addons/account_test/report/__init__.py b/addons/account_test/report/__init__.py
new file mode 100644
index 00000000000..21a4929330b
--- /dev/null
+++ b/addons/account_test/report/__init__.py
@@ -0,0 +1 @@
+import account_test_report
diff --git a/addons/account_test/report/account_test.rml b/addons/account_test/report/account_test.rml
new file mode 100644
index 00000000000..1efa12fd5cb
--- /dev/null
+++ b/addons/account_test/report/account_test.rml
@@ -0,0 +1,78 @@
+<?xml version="1.0"?>
+<document filename="test.pdf">
+  <template pageSize="(595.0,842.0)" title="Test" author="Martin Simon" allowSplitting="20">
+    <pageTemplate id="first">
+      <frame id="first" x1="57.0" y1="57.0" width="481" height="728"/>
+    </pageTemplate>
+  </template>
+  <stylesheet>
+    <blockTableStyle id="Standard_Outline">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+    </blockTableStyle>
+    <blockTableStyle id="Tableau1">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="0,0" stop="0,0"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="1,0" stop="1,0"/>
+    </blockTableStyle>
+    <blockTableStyle id="Table1">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="0,0" stop="0,0"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="1,0" stop="1,0"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="0,1" stop="1,1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#000000" start="0,0" stop="0,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#000000" start="0,1" stop="0,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#000000" start="1,0" stop="1,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#000000" start="1,1" stop="1,-1"/>
+      <lineStyle kind="LINEAFTER" colorName="#000000" start="1,0" stop="1,-1"/>
+      <lineStyle kind="LINEAFTER" colorName="#000000" start="1,1" stop="1,-1"/>
+    </blockTableStyle>
+    <initialize>
+      <paraStyle name="all" alignment="justify"/>
+    </initialize>
+    <paraStyle name="Standard" fontName="Times-Roman"/>
+    <paraStyle name="Heading" fontName="Times-Roman" fontSize="16.0" leading="20" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="P10" fontName="Times-Roman" fontSize="16.0" leading="20" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="Text body" fontName="Times-Roman" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="List" fontName="Times-Roman" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="Caption" fontName="Times-Roman" fontSize="12.0" leading="15" spaceBefore="6.0" spaceAfter="6.0"/>
+    <paraStyle name="Index" fontName="Times-Roman"/>
+    <paraStyle name="Table Contents" fontName="Times-Roman"/>
+    <images/>
+  </stylesheet>
+  <story>
+    <para style="Heading">Accouting tests on [[ datetime.datetime.now().strftime("%Y-%m-%d %H:%M:%S") ]]</para>
+    <para style="Standard">
+      <font color="white"> </font>
+    </para>
+    <section>
+        <para style="Standard">[[repeatIn(objects,'o')]]</para>
+        <blockTable colWidths="482.0" style="Table1">
+          <tr>
+            <td>
+              <para style="Table Contents">[[ o.name ]]</para>
+            </td>
+          </tr>
+          <tr>
+            <td>
+              <para style="Table Contents"><i>[[ o.desc or '' ]]</i></para>
+            </td>
+          </tr>
+        </blockTable>
+        <blockTable colWidths="482.0" style="Tableau1">
+          <tr>
+            <td>
+              <para style="Table Contents">[[ repeatIn(execute_code(o.code_exec), 'test_result') ]]</para>
+              <para style="Table Contents">[[ test_result ]] </para>
+            </td>
+          </tr>
+        </blockTable>
+        <para style="Standard">
+            <font color="white"> </font>
+        </para>
+    </section>
+
+  </story>
+</document>
diff --git a/addons/account_test/report/account_test_report.py b/addons/account_test/report/account_test_report.py
new file mode 100644
index 00000000000..79a52611756
--- /dev/null
+++ b/addons/account_test/report/account_test_report.py
@@ -0,0 +1,105 @@
+# -*- encoding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution	
+#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>). All Rights Reserved
+#    $Id$
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU General Public License as published by
+#    the Free Software Foundation, either version 3 of the License, or
+#    (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU General Public License for more details.
+#
+#    You should have received a copy of the GNU General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+import datetime
+import time
+import re
+from report import report_sxw
+from itertools import groupby
+from operator import itemgetter
+from tools.translate import _
+#
+# Use period and Journal for selection or resources
+#
+class report_assert_account(report_sxw.rml_parse):
+    def __init__(self, cr, uid, name, context):
+        super(report_assert_account, self).__init__(cr, uid, name, context=context)
+        self.localcontext.update( {
+            'time': time,
+            'datetime': datetime,
+            'execute_code': self.execute_code,
+        })
+
+    def execute_code(self, code_exec):
+        def group(lst, col):
+            return dict((k, [v for v in itr]) for k, itr in groupby(sorted(lst, key=lambda x: x[col]), itemgetter(col)))
+
+        def sort_by_intified_num(a, b):
+            if a is None:
+                return -1
+            elif b is None:
+                return 1
+            else:
+                #if a is not None and b is not None:
+                return cmp(int(a), int(b))
+
+        def reconciled_inv():
+            reconciled_inv_ids = self.pool.get('account.invoice').search(self.cr, self.uid, [('reconciled','=',True)])
+            return reconciled_inv_ids
+
+
+        def get_parent(acc_id):
+            acc_an_id = self.pool.get('account.analytic.account').browse(self.cr, self.uid, acc_id).parent_id
+            while acc_an_id.parent_id:
+                acc_an_id = acc_an_id.parent_id
+            return acc_an_id.id
+
+        def order_columns(item, cols=None):
+            if cols is None:
+                cols = item.keys()
+            return [(col, item.get(col)) for col in cols if col in item.keys()]
+
+        localdict = {
+            'cr': self.cr,
+            '_': _,
+            'reconciled_inv' : reconciled_inv,
+            'group' : group,
+            'get_parent' : get_parent,
+            'now': datetime.datetime.now(),
+            'result': None,
+            'column_order': None,
+        }
+
+        exec code_exec in localdict
+
+        result = localdict['result']
+        column_order = localdict.get('column_order', None)
+
+        if not isinstance(result, (tuple, list, set)):
+            result = [result]
+
+        if not result:
+            result = [_('The test was passed successfully')]
+        elif all([isinstance(x, dict) for x in result]):
+            result = [', '.join(["%s: %s" % (k, v) for k, v in order_columns(rec, column_order)]) for rec in result]
+        else:
+            def _format(a):
+                if isinstance(a, dict):
+                    return ', '.join(["%s: %s" % (tup[0], tup[1]) for tup in order_columns(a, column_order)])
+                else:
+                    return a
+            result = [_format(rec) for rec in result]
+
+        return result
+
+report_sxw.report_sxw('report.account.test.assert.print', 'accounting.assert.test', 'addons/account_test/report/account_test.rml', parser=report_assert_account, header=False)
+
diff --git a/addons/account_test/security/ir.model.access.csv b/addons/account_test/security/ir.model.access.csv
new file mode 100644
index 00000000000..fb90ba43825
--- /dev/null
+++ b/addons/account_test/security/ir.model.access.csv
@@ -0,0 +1,3 @@
+"id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
+"access_accounting_assert_test","accounting.assert.test","model_accounting_assert_test",base.group_system,1,1,1,1
+"access_accounting_assert_test","accounting.assert.test","model_accounting_assert_test",account.group_account_manager,1,0,0,0

From 5815b2c2e4be4f915ec892cb808334e9c37e9125 Mon Sep 17 00:00:00 2001
From: "Bharat Devnani (OpenERP)" <bde@tinyerp.com>
Date: Thu, 1 Nov 2012 13:02:08 +0530
Subject: [PATCH 005/110] [IMP] made compatible to version 7.0

bzr revid: bde@tinyerp.com-20121101073208-i1s4m2jca2qvraik
---
 .../{__terp__.py => __openerp__.py}           |  0
 addons/account_test/account_test_view.xml     | 76 +++++++++----------
 2 files changed, 38 insertions(+), 38 deletions(-)
 rename addons/account_test/{__terp__.py => __openerp__.py} (100%)

diff --git a/addons/account_test/__terp__.py b/addons/account_test/__openerp__.py
similarity index 100%
rename from addons/account_test/__terp__.py
rename to addons/account_test/__openerp__.py
diff --git a/addons/account_test/account_test_view.xml b/addons/account_test/account_test_view.xml
index 8351cb0687a..5f0d7f45090 100644
--- a/addons/account_test/account_test_view.xml
+++ b/addons/account_test/account_test_view.xml
@@ -2,10 +2,9 @@
 <openerp>
     <data>
 
-    <record model="ir.ui.view" id="account_assert_tree">
-        <field name="name">Tests</field>
-        <field name="model">accounting.assert.test</field>
-            <field name="type">tree</field>
+        <record model="ir.ui.view" id="account_assert_tree">
+            <field name="name">Tests</field>
+            <field name="model">accounting.assert.test</field>
             <field name="arch" type="xml">
                 <tree string="Tests">
                     <field name="sequence"/>
@@ -14,43 +13,44 @@
                 </tree>
             </field>
         </record>
-
-    <record model="ir.ui.view" id="account_assert_form">
-        <field name="name">Tests</field>
-        <field name="model">accounting.assert.test</field>
-            <field name="type">form</field>
+            
+        <record model="ir.ui.view" id="account_assert_form">
+            <field name="name">Tests</field>
+            <field name="model">accounting.assert.test</field>
             <field name="arch" type="xml">
-                <form string="Tests">
-                <group colspan="4" col="4">
-                    <field name="name"/>
-                    <field name="active"/>
-                    <field name="sequence"/>
-                    <newline/>
-                    <field name="desc" colspan="4" height="50" /> 
-                </group>
-                <separator string="Expression to evaluate" colspan="4"/>
-                <group colspan="4" col="4">
-                    <separator string="Python Code" colspan="4" />
-                    <newline />
-                    <field colspan="4" name="code_exec" nolabel="1" width="100" height="400" />
-                    <separator string="Code Help" colspan="4"/>
-                    <newline />
-                    <label colspan="4"><![CDATA[Example:
-sql = "select id, name, ref, date from account_move_line where account_id in (select id from account_account where type = 'view')"
-cr.execute(sql)
-result = cr.dictfetchall()]]></label>
-                </group>
+                <form string="Tests" version="7.0">
+                    <sheet>
+                        <group>
+                            <group>
+                                <field name="sequence"/>
+                                <field name="active"/>
+                            </group>
+                            <group>
+                                <field name="name"/>
+                            </group>
+                            <separator string="Test Description"/>
+                            <div colspan="4">
+                                <field name="desc"/>
+                            </div>
+                            <separator string="Expression to evaluate"/>
+                            <newline/>
+                            <separator string="Python Code"/>
+                            <div colspan="4">
+                                <field colspan="4" name="code_exec"/>
+                            </div>
+                        </group>
+                    </sheet>
                 </form>
             </field>
         </record>
+    
+        <record model="ir.actions.act_window" id="action_accounting_assert">
+            <field name="name">Accounting Tests</field>
+            <field name="res_model">accounting.assert.test</field>
+            <field name="view_mode">tree,form</field>
+        </record>
+    
+        <menuitem name="Accounting Tests" parent="account.menu_finance_reporting" id="menu_action_license" action="action_accounting_assert"/>
 
-    <record model="ir.actions.act_window" id="action_accounting_assert">
-        <field name="name">Accounting Tests</field>
-        <field name="res_model">accounting.assert.test</field>
-        <field name="view_mode">tree,form</field>
-    </record>
-
-    <menuitem name="Accounting Tests" parent="account.menu_finance_reporting" id="menu_action_license" action="action_accounting_assert"/>
-
-</data>
+    </data>
 </openerp>

From d73ccce5ba6c15e1a93b3da4f8478b77ea58ee35 Mon Sep 17 00:00:00 2001
From: "Bharat Devnani (OpenERP)" <bde@tinyerp.com>
Date: Thu, 1 Nov 2012 15:15:56 +0530
Subject: [PATCH 006/110] [IMP] improved module according to version 7
 conventions

bzr revid: bde@tinyerp.com-20121101094556-s05h6ymbrxdgjfk1
---
 addons/account_test/__openerp__.py        | 31 ++++++++++-----------
 addons/account_test/account_test_view.xml | 33 ++++++++++++++---------
 2 files changed, 37 insertions(+), 27 deletions(-)

diff --git a/addons/account_test/__openerp__.py b/addons/account_test/__openerp__.py
index 5578f0339ae..13328cddcb4 100644
--- a/addons/account_test/__openerp__.py
+++ b/addons/account_test/__openerp__.py
@@ -20,23 +20,24 @@
 #
 ##############################################################################
 {
-    "name" : "OpenERP",
-    "version" : "1.0",
-    "author" : "OpenERP",
-    "category" : "Test accounting",
-    "website": "http://www.openerp.com",
-    "description": "Asserts on accounting",
-    "depends" : ["account"],
-    "update_xml" : [
-        "account_test_view.xml",
-        "account_test_report.xml",
-        "security/ir.model.access.csv",
-        "account_test_data.xml",
+    'name' : 'Accounting Consistency Tests',
+    'version' : '1.0',
+    'author' : 'OpenERP',
+    'category' : 'Test accounting',
+    'website': 'http://www.openerp.com',
+    'description': """Asserts on accounting
+                      =====================""",
+    'depends' : ['account'],
+    'data' : [
+        'security/ir.model.access.csv',
+        'account_test_view.xml',
+        'account_test_report.xml',
+        'account_test_data.xml',
     ],
     'demo_xml': [
-        "account_test_demo.xml",
+        'account_test_demo.xml',
     ],
-    "active": False,
-    "installable": True
+    'active': False,
+    'installable': True
 }
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/account_test/account_test_view.xml b/addons/account_test/account_test_view.xml
index 5f0d7f45090..c6fc0c8294b 100644
--- a/addons/account_test/account_test_view.xml
+++ b/addons/account_test/account_test_view.xml
@@ -22,23 +22,32 @@
                     <sheet>
                         <group>
                             <group>
+                                <field name="name"/>
                                 <field name="sequence"/>
-                                <field name="active"/>
                             </group>
                             <group>
-                                <field name="name"/>
+                                <field name="active"/>
                             </group>
-                            <separator string="Test Description"/>
-                            <div colspan="4">
-                                <field name="desc"/>
-                            </div>
-                            <separator string="Expression to evaluate"/>
-                            <newline/>
-                            <separator string="Python Code"/>
-                            <div colspan="4">
-                                <field colspan="4" name="code_exec"/>
-                            </div>
                         </group>
+                        <notebook colspan="4">
+                            <page string="Description">
+                                <field name="desc" nolabel="1"/>
+                            </page>
+                            <page string="Expression">
+                                <group string="Python Code">
+                                    <field colspan="4" name="code_exec" nolabel="1"/>
+                                </group>
+                                <group string="Code Help">
+                                    <pre>
+Example: 
+sql = 'select id, name, ref, date from account_move_line where account_id in 
+(select id from account_account where type = 'view')'
+cr.execute(sql)
+result = cr.dictfetchall()
+                                    </pre>
+                                </group>
+                            </page>
+                        </notebook>
                     </sheet>
                 </form>
             </field>

From f3377ee338daf8863ef1e0add8dc1f9eb7fc1c27 Mon Sep 17 00:00:00 2001
From: "Pinakin Nayi (OpenERP)" <pna@tinyerp.com>
Date: Fri, 9 Nov 2012 12:09:12 +0530
Subject: [PATCH 007/110] [IMP] improve module

bzr revid: pna@tinyerp.com-20121109063912-7g5jy22j3fx2vxu8
---
 addons/account_test/__openerp__.py                | 2 +-
 addons/account_test/account_test_view.xml         | 7 ++++++-
 addons/account_test/report/__init__.py            | 2 ++
 addons/account_test/report/account_test_report.py | 1 +
 addons/account_test/security/ir.model.access.csv  | 2 +-
 5 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/addons/account_test/__openerp__.py b/addons/account_test/__openerp__.py
index 13328cddcb4..b755d4aa872 100644
--- a/addons/account_test/__openerp__.py
+++ b/addons/account_test/__openerp__.py
@@ -34,7 +34,7 @@
         'account_test_report.xml',
         'account_test_data.xml',
     ],
-    'demo_xml': [
+    'demo': [
         'account_test_demo.xml',
     ],
     'active': False,
diff --git a/addons/account_test/account_test_view.xml b/addons/account_test/account_test_view.xml
index c6fc0c8294b..bcedebf0eeb 100644
--- a/addons/account_test/account_test_view.xml
+++ b/addons/account_test/account_test_view.xml
@@ -29,7 +29,7 @@
                                 <field name="active"/>
                             </group>
                         </group>
-                        <notebook colspan="4">
+                        <notebook>
                             <page string="Description">
                                 <field name="desc" nolabel="1"/>
                             </page>
@@ -57,6 +57,11 @@ result = cr.dictfetchall()
             <field name="name">Accounting Tests</field>
             <field name="res_model">accounting.assert.test</field>
             <field name="view_mode">tree,form</field>
+            <field name="help" type="html">
+              <p class="oe_view_nocontent_create">
+                Click to create Accounting Test.
+              </p>
+            </field>
         </record>
     
         <menuitem name="Accounting Tests" parent="account.menu_finance_reporting" id="menu_action_license" action="action_accounting_assert"/>
diff --git a/addons/account_test/report/__init__.py b/addons/account_test/report/__init__.py
index 21a4929330b..0e4fbf07082 100644
--- a/addons/account_test/report/__init__.py
+++ b/addons/account_test/report/__init__.py
@@ -1 +1,3 @@
 import account_test_report
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/account_test/report/account_test_report.py b/addons/account_test/report/account_test_report.py
index 79a52611756..66d5043412f 100644
--- a/addons/account_test/report/account_test_report.py
+++ b/addons/account_test/report/account_test_report.py
@@ -103,3 +103,4 @@ class report_assert_account(report_sxw.rml_parse):
 
 report_sxw.report_sxw('report.account.test.assert.print', 'accounting.assert.test', 'addons/account_test/report/account_test.rml', parser=report_assert_account, header=False)
 
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/account_test/security/ir.model.access.csv b/addons/account_test/security/ir.model.access.csv
index fb90ba43825..95f2336f80b 100644
--- a/addons/account_test/security/ir.model.access.csv
+++ b/addons/account_test/security/ir.model.access.csv
@@ -1,3 +1,3 @@
 "id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
 "access_accounting_assert_test","accounting.assert.test","model_accounting_assert_test",base.group_system,1,1,1,1
-"access_accounting_assert_test","accounting.assert.test","model_accounting_assert_test",account.group_account_manager,1,0,0,0
+"access_accounting_assert_test_manager","accounting.assert.test","model_accounting_assert_test",account.group_account_manager,1,0,0,0

From 87d7129447683964bcd0baada807829506d5ed6f Mon Sep 17 00:00:00 2001
From: "Bharat Devnani (OpenERP)" <bde@tinyerp.com>
Date: Mon, 19 Nov 2012 11:53:46 +0530
Subject: [PATCH 008/110] [IMP] improved description in  __openerp__.py

bzr revid: bde@tinyerp.com-20121119062346-no2y4123ravq2abu
---
 addons/account_test/__openerp__.py | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/addons/account_test/__openerp__.py b/addons/account_test/__openerp__.py
index b755d4aa872..c3261797c26 100644
--- a/addons/account_test/__openerp__.py
+++ b/addons/account_test/__openerp__.py
@@ -25,8 +25,15 @@
     'author' : 'OpenERP',
     'category' : 'Test accounting',
     'website': 'http://www.openerp.com',
-    'description': """Asserts on accounting
-                      =====================""",
+    'description': """
+Asserts on accounting.
+======================
+With this module you can manually check consistencies and inconsistencies of accounting module.
+
+How to perform Consistency Tests:
+---------------------------------
+Reporting/Accounting/Accounting Tests
+""",
     'depends' : ['account'],
     'data' : [
         'security/ir.model.access.csv',

From 4bf8dbc14d31c54ce13709cb822d635278ae31de Mon Sep 17 00:00:00 2001
From: "Bharat Devnani (OpenERP)" <bde@tinyerp.com>
Date: Mon, 19 Nov 2012 14:19:42 +0530
Subject: [PATCH 009/110] [IMP] improved module description

bzr revid: bde@tinyerp.com-20121119084942-fa7ctfz7wd9pd2zm
---
 addons/account_test/__openerp__.py | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/addons/account_test/__openerp__.py b/addons/account_test/__openerp__.py
index c3261797c26..ae65eb4b4c8 100644
--- a/addons/account_test/__openerp__.py
+++ b/addons/account_test/__openerp__.py
@@ -28,11 +28,7 @@
     'description': """
 Asserts on accounting.
 ======================
-With this module you can manually check consistencies and inconsistencies of accounting module.
-
-How to perform Consistency Tests:
----------------------------------
-Reporting/Accounting/Accounting Tests
+With this module you can manually check consistencies and inconsistencies of accounting module from menu Reporting/Accounting/Accounting Tests.
 """,
     'depends' : ['account'],
     'data' : [

From 982223b577a9f3db01a2a993247f244f6fec92b7 Mon Sep 17 00:00:00 2001
From: "Bharat Devnani (OpenERP)" <bde@tinyerp.com>
Date: Mon, 19 Nov 2012 14:26:36 +0530
Subject: [PATCH 010/110] [IMP] changed module category

bzr revid: bde@tinyerp.com-20121119085636-a9otys3xhcth94yj
---
 addons/account_test/__openerp__.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/account_test/__openerp__.py b/addons/account_test/__openerp__.py
index ae65eb4b4c8..3e98734fe72 100644
--- a/addons/account_test/__openerp__.py
+++ b/addons/account_test/__openerp__.py
@@ -23,7 +23,7 @@
     'name' : 'Accounting Consistency Tests',
     'version' : '1.0',
     'author' : 'OpenERP',
-    'category' : 'Test accounting',
+    'category' : 'Accounting & Finance',
     'website': 'http://www.openerp.com',
     'description': """
 Asserts on accounting.

From d9c266eeb4be9d31a27055ae907e0788f054585c Mon Sep 17 00:00:00 2001
From: Cedric Snauwaert <csn@openerp.com>
Date: Tue, 20 Nov 2012 17:29:30 +0100
Subject: [PATCH 011/110] [FIX]some minor corrections and TODO comments

bzr revid: csn@openerp.com-20121120162930-hwj1ilshe99uvyau
---
 addons/account_test/account_test.py           |  6 +++---
 addons/account_test/account_test_data.xml     | 21 ++++++++++---------
 addons/account_test/account_test_view.xml     |  2 ++
 .../report/account_test_report.py             |  3 ++-
 4 files changed, 18 insertions(+), 14 deletions(-)

diff --git a/addons/account_test/account_test.py b/addons/account_test/account_test.py
index 069ba6601e4..dc7442b1247 100644
--- a/addons/account_test/account_test.py
+++ b/addons/account_test/account_test.py
@@ -56,9 +56,9 @@ class accounting_assert_test(osv.osv):
     }
 
     _defaults = {
-        'code_exec': lambda *a: CODE_EXEC_DEFAULT,
-        'active': lambda *a: True,
-        'sequence': lambda *a: 10,
+        'code_exec': CODE_EXEC_DEFAULT,
+        'active': True,
+        'sequence': 10,
     }
 
 accounting_assert_test()
diff --git a/addons/account_test/account_test_data.xml b/addons/account_test/account_test_data.xml
index 453d8184b9e..5b82fb82350 100644
--- a/addons/account_test/account_test_data.xml
+++ b/addons/account_test/account_test_data.xml
@@ -30,7 +30,7 @@ cr.execute("select coalesce(sum(debit),0) as debit_new_fyear,coalesce(sum(credit
 rec =  cr.dictfetchall()
 cr.execute("select coalesce(sum(debit),0) as debit_last_fyear,coalesce(sum(credit),0) as credit_last_fyear from account_move_line where period_id in (select period_id from account_fiscalyear where state='done' order by id desc limit 1);")
 rec2= cr.dictfetchall()
-if (rec2[0]['credit_last_fyear']-rec[0]['credit_new_fyear']!=0) or (rec2[0]['dedit_last_fyear']-rec[0]['dedit_new_fyear']!=0) :
+if (rec2[0]['credit_last_fyear']-rec[0]['credit_new_fyear']!=0) or (rec2[0]['debit_last_fyear']-rec[0]['debit_new_fyear']!=0) :
    res.append(rec[0])
    res.insert(0,_('* New fiscalyear debit and credit are:'))
    res.append(rec2[0])
@@ -61,7 +61,7 @@ cr.execute(sql)
 res = cr.dictfetchall()
 if res:
     res.insert(0,_('* The test failed for these movement lines:'))
-    result = res
+result = res
 
 ]]></field>
     </record>
@@ -80,7 +80,7 @@ for record in rec_ids :
     res.append(', '.join(["Reconcile name: %(name)s, id=%(id)s " % r for r in reconcile_ids]))
 result = res
 if result:
-    res.insert(0,_('* The test failed for these reconciled items(id/name):'))
+    result.insert(0,_('* The test failed for these reconciled items(id/name):'))
 ]]></field>
     </record>
 
@@ -101,18 +101,19 @@ if result:
 ]]></field>
     </record>
 
-
     <record model="accounting.assert.test" id="account_test_05_2">
         <field name="sequence">6</field>
         <field name="name">Test 5.2 : Reconcilied invoices and Payable/Receivable accounts</field>
         <field name="desc">Check that reconciled account moves, that define Payable and Receivable accounts, are belonging to reconciled invoices</field>
         <field name="code_exec"><![CDATA[res = reconciled_inv()
-cr.execute("SELECT distinct inv.number,inv.id from account_invoice inv, account_move_line ml, account_account a, account_move m where m.id=ml.move_id and inv.move_id=m.id and inv.id=inv.move_id and ml.reconcile_id is null and a.type in ('receivable','payable')  and ml.account_id=a.id and inv.id in %s",(tuple(res),))
-records = cr.dictfetchall()
-groups = group(list(records),'number')
-result = [rec for rec in records]
-if result:
-    result.insert(0,_('* Invoices that need to be checked: '))
+result=[]
+if res:
+    cr.execute("SELECT distinct inv.number,inv.id from account_invoice inv, account_move_line ml, account_account a, account_move m where m.id=ml.move_id and inv.move_id=m.id and inv.id=inv.move_id and ml.reconcile_id is null and a.type in ('receivable','payable') and ml.account_id=a.id and inv.id in %s",(tuple(res),))
+    records = cr.dictfetchall()
+    groups = group(list(records),'number')
+    result = [rec for rec in records]
+    if result:
+        result.insert(0,_('* Invoices that need to be checked: '))
 ]]></field>
     </record>
 
diff --git a/addons/account_test/account_test_view.xml b/addons/account_test/account_test_view.xml
index bcedebf0eeb..ea8572554ed 100644
--- a/addons/account_test/account_test_view.xml
+++ b/addons/account_test/account_test_view.xml
@@ -38,6 +38,8 @@
                                     <field colspan="4" name="code_exec" nolabel="1"/>
                                 </group>
                                 <group string="Code Help">
+                                    <!--TODO : better explanation on how to write those test, especially on variable result that must be present or
+                                    we won't see the result of the tests good or bad -->
                                     <pre>
 Example: 
 sql = 'select id, name, ref, date from account_move_line where account_id in 
diff --git a/addons/account_test/report/account_test_report.py b/addons/account_test/report/account_test_report.py
index 66d5043412f..5c274773cd4 100644
--- a/addons/account_test/report/account_test_report.py
+++ b/addons/account_test/report/account_test_report.py
@@ -43,6 +43,7 @@ class report_assert_account(report_sxw.rml_parse):
         def group(lst, col):
             return dict((k, [v for v in itr]) for k, itr in groupby(sorted(lst, key=lambda x: x[col]), itemgetter(col)))
 
+        #TODO what is this method used for, name unclear and doesn't seem to be used
         def sort_by_intified_num(a, b):
             if a is None:
                 return -1
@@ -56,7 +57,6 @@ class report_assert_account(report_sxw.rml_parse):
             reconciled_inv_ids = self.pool.get('account.invoice').search(self.cr, self.uid, [('reconciled','=',True)])
             return reconciled_inv_ids
 
-
         def get_parent(acc_id):
             acc_an_id = self.pool.get('account.analytic.account').browse(self.cr, self.uid, acc_id).parent_id
             while acc_an_id.parent_id:
@@ -89,6 +89,7 @@ class report_assert_account(report_sxw.rml_parse):
 
         if not result:
             result = [_('The test was passed successfully')]
+        #TODO: not sure this condition is needed, it is only a subcategory of the final else
         elif all([isinstance(x, dict) for x in result]):
             result = [', '.join(["%s: %s" % (k, v) for k, v in order_columns(rec, column_order)]) for rec in result]
         else:

From 3b3c32f58f4900508b7dc730f0c1453c43bac84e Mon Sep 17 00:00:00 2001
From: Cedric Snauwaert <csn@openerp.com>
Date: Wed, 21 Nov 2012 15:06:43 +0100
Subject: [PATCH 012/110] [REF]some minor changes in code and add list of TODO
 in commentaries

bzr revid: csn@openerp.com-20121121140643-5aary4uc9hp6xuk2
---
 addons/account_test/account_test_data.xml | 21 ++++++++++-----------
 addons/account_test/account_test_demo.xml |  1 +
 addons/account_test/account_test_view.xml |  3 ++-
 3 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/addons/account_test/account_test_data.xml b/addons/account_test/account_test_data.xml
index 5b82fb82350..415664b9653 100644
--- a/addons/account_test/account_test_data.xml
+++ b/addons/account_test/account_test_data.xml
@@ -11,31 +11,30 @@ sum(debit)-sum(credit) as balance
 FROM  account_move_line 
 """
 cr.execute(sql)
-result= cr.dictfetchall()
-cr.execute(sql)
 result=[]
 res= cr.dictfetchall()
-if res[0]['balance']!=0.0:
-  result=res
-  result.insert(0,_('* The difference of the balance is: '))
+if res[0]['balance']!=0.0 and res[0]['balance'] is not None:
+  result.append(_('* The difference of the balance is: '))
+  result.append(res)
 ]]></field>
     </record>
 
     <record model="accounting.assert.test" id="account_test_02">
         <field name="sequence">2</field>
         <field name="name">Test 2: Opening a fiscal year</field>
+        <!--TODO : bad description of the test, does not really match what the SQL querry does, should adapt description name -->
         <field name="desc">Check if the balance of the new opened fiscal year matches with last year's balance</field>
-        <field name="code_exec"><![CDATA[res = []
+        <field name="code_exec"><![CDATA[result = []
 cr.execute("select coalesce(sum(debit),0) as debit_new_fyear,coalesce(sum(credit),0) as credit_new_fyear from account_move_line where period_id in (select id from account_period where state='draft' and special order by id desc limit 1);")
 rec =  cr.dictfetchall()
 cr.execute("select coalesce(sum(debit),0) as debit_last_fyear,coalesce(sum(credit),0) as credit_last_fyear from account_move_line where period_id in (select period_id from account_fiscalyear where state='done' order by id desc limit 1);")
 rec2= cr.dictfetchall()
 if (rec2[0]['credit_last_fyear']-rec[0]['credit_new_fyear']!=0) or (rec2[0]['debit_last_fyear']-rec[0]['debit_new_fyear']!=0) :
-   res.append(rec[0])
-   res.insert(0,_('* New fiscalyear debit and credit are:'))
-   res.append(rec2[0])
-   res.insert(2,_('* Last year debit and credit are:'))
-result = res
+   result.append(_('* New fiscalyear debit and credit are:'))
+   result.append(rec[0])
+   result.append(_('* Last year debit and credit are:'))
+   result.append(rec2[0])
+
 ]]></field>
     </record>
 
diff --git a/addons/account_test/account_test_demo.xml b/addons/account_test/account_test_demo.xml
index d10182f61b8..a342040683b 100644
--- a/addons/account_test/account_test_demo.xml
+++ b/addons/account_test/account_test_demo.xml
@@ -3,6 +3,7 @@
 <data>
 
     <record model="accounting.assert.test" id="account_test_demo_01">
+      <!-- TODO : change name and desc -->
         <field name="name">Test 1</field>
         <field name="desc">Test 1</field>
         <field name="domain_exec"></field>
diff --git a/addons/account_test/account_test_view.xml b/addons/account_test/account_test_view.xml
index ea8572554ed..848d04c7188 100644
--- a/addons/account_test/account_test_view.xml
+++ b/addons/account_test/account_test_view.xml
@@ -39,7 +39,8 @@
                                 </group>
                                 <group string="Code Help">
                                     <!--TODO : better explanation on how to write those test, especially on variable result that must be present or
-                                    we won't see the result of the tests good or bad -->
+                                    we won't see the result of the tests good or bad, give detail on function that can be used, like 
+                                    'group(a,b)' 'reconciled_inv()' 'get_parent(a)' 'now()' ... -->
                                     <pre>
 Example: 
 sql = 'select id, name, ref, date from account_move_line where account_id in 

From cd7181d76f7e627bc0ae262b4a206b8f8801f2ae Mon Sep 17 00:00:00 2001
From: "Rajesh Prajapati (OpenERP)" <rpr@tinyerp.com>
Date: Fri, 23 Nov 2012 15:19:18 +0530
Subject: [PATCH 013/110] [IMP] account_check_writing : improvements on
 account_check_writing as per requirement

bzr revid: rpr@tinyerp.com-20121123094918-wrj9sli48tp95n1p
---
 addons/account_check_writing/__openerp__.py   |  2 +
 .../account_check_sequence.xml                | 15 +++++
 .../account_check_writing/wizard/__init__.py  | 24 ++++++++
 .../wizard/account_check.py                   | 61 +++++++++++++++++++
 .../wizard/account_check_view.xml             | 28 +++++++++
 5 files changed, 130 insertions(+)
 create mode 100644 addons/account_check_writing/account_check_sequence.xml
 create mode 100644 addons/account_check_writing/wizard/__init__.py
 create mode 100644 addons/account_check_writing/wizard/account_check.py
 create mode 100644 addons/account_check_writing/wizard/account_check_view.xml

diff --git a/addons/account_check_writing/__openerp__.py b/addons/account_check_writing/__openerp__.py
index f5a2355b002..292215044fb 100644
--- a/addons/account_check_writing/__openerp__.py
+++ b/addons/account_check_writing/__openerp__.py
@@ -30,10 +30,12 @@ Module for the Check Writing and Check Printing.
     'website': 'http://www.openerp.com',
     'depends' : ['account_voucher'],
     'data': [
+        'wizard/account_check_view.xml',
         'account_check_writing_report.xml',
         'account_view.xml',
         'account_voucher_view.xml',
         'account_check_writing_data.xml',
+        'account_check_sequence.xml'
     ],
     'demo': ['account_demo.xml'],
     'test': [],
diff --git a/addons/account_check_writing/account_check_sequence.xml b/addons/account_check_writing/account_check_sequence.xml
new file mode 100644
index 00000000000..def380bbe8a
--- /dev/null
+++ b/addons/account_check_writing/account_check_sequence.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data noupdate="1">
+        <record forcecreate="1" id="sequence_type_check_number" model="ir.sequence.type">
+            <field name="name">Number</field>
+            <field name="code">account.check.write</field>
+        </record>
+
+        <record id="sequence_check_number" model="ir.sequence">
+            <field name="name">Number</field>
+            <field name="code">account.check.write</field>
+            <field eval="3" name="padding"/>
+        </record>        
+    </data>
+</openerp>
diff --git a/addons/account_check_writing/wizard/__init__.py b/addons/account_check_writing/wizard/__init__.py
new file mode 100644
index 00000000000..74c20e11397
--- /dev/null
+++ b/addons/account_check_writing/wizard/__init__.py
@@ -0,0 +1,24 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+import account_check
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/account_check_writing/wizard/account_check.py b/addons/account_check_writing/wizard/account_check.py
new file mode 100644
index 00000000000..123febf2cfc
--- /dev/null
+++ b/addons/account_check_writing/wizard/account_check.py
@@ -0,0 +1,61 @@
+# -*- 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 datetime
+import time
+import tools
+from osv import fields, osv
+from tools.translate import _
+
+class account_check_write(osv.osv_memory):
+    _name = 'account.check.write'
+    _description = 'Take input as sequence and print report'
+    _columns = {
+        'check_number': fields.char('Check Number', required=True, help="This is the Check Number"),
+    }
+
+    _defaults = {
+        'check_number': lambda obj, cr, uid, context:obj.pool.get('ir.sequence').get(cr, uid, 'account.check.write'),
+   }
+    def print_check_write(self, cr, uid, ids, context=None):
+        if not ids:
+            return  {}
+
+        check_layout_report = {
+            'top' : 'account.print.check.top',
+            'middle' : 'account.print.check.middle',
+            'bottom' : 'account.print.check.bottom',
+        }
+        check_layout = self.pool.get('account.voucher').browse(cr, uid, context['active_ids'], context=context)[0].company_id.check_layout
+        return {
+            'type': 'ir.actions.report.xml', 
+            'report_name':check_layout_report[check_layout],
+            'datas': {
+                    'model':'account.voucher',
+                    'id': context['active_ids'] and context['active_ids'][0] or False,
+                    'ids': context['active_ids'] and context['active_ids'] or [],
+                    'report_type': 'pdf'
+                },
+            'nodestroy': True
+            }
+
+account_check_write()
+
diff --git a/addons/account_check_writing/wizard/account_check_view.xml b/addons/account_check_writing/wizard/account_check_view.xml
new file mode 100644
index 00000000000..a3930540e43
--- /dev/null
+++ b/addons/account_check_writing/wizard/account_check_view.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data noupdate="0">
+
+        <record id="view_account_check_write" model="ir.ui.view">
+            <field name="name">account.check.form</field>
+            <field name="model">account.check.write</field>
+            <field name="arch" type="xml">
+            <form string="Check" version="7.0">
+                <group col="4">
+                    <field name="check_number"/>
+                </group>
+                <footer>
+                    <button name="print_check_write" string="Print Check" type="object" class="oe_highlight"/> or
+                    <button string="Cancel" class="oe_link" special="cancel"/>
+                </footer>
+            </form>
+            </field>
+        </record>
+
+        <act_window id="action_account_check_write"
+            multi="True"
+            name="Check Write"
+            res_model="account.check.write" src_model="account.voucher"
+            view_mode="form" target="new" view_type="form" /> 
+
+    </data>
+</openerp>

From 5757c6d051d329903cf1874227aed4e3b0d9d58b Mon Sep 17 00:00:00 2001
From: "Rajesh Prajapati (OpenERP)" <rpr@tinyerp.com>
Date: Fri, 23 Nov 2012 16:27:51 +0530
Subject: [PATCH 014/110] [IMP] sequence : sequence id changed

bzr revid: rpr@tinyerp.com-20121123105751-31kpg6qcrex2p1tv
---
 addons/account_check_writing/account_check_sequence.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/account_check_writing/account_check_sequence.xml b/addons/account_check_writing/account_check_sequence.xml
index def380bbe8a..f1dd75c5467 100644
--- a/addons/account_check_writing/account_check_sequence.xml
+++ b/addons/account_check_writing/account_check_sequence.xml
@@ -6,7 +6,7 @@
             <field name="code">account.check.write</field>
         </record>
 
-        <record id="sequence_check_number" model="ir.sequence">
+        <record id="sequence_account_check_number" model="ir.sequence">
             <field name="name">Number</field>
             <field name="code">account.check.write</field>
             <field eval="3" name="padding"/>

From debb4c004542d1c51af1aecdbbac56d0dd0469b3 Mon Sep 17 00:00:00 2001
From: "Rajesh Prajapati (OpenERP)" <rpr@tinyerp.com>
Date: Fri, 23 Nov 2012 17:55:46 +0530
Subject: [PATCH 015/110] [IMP] check_writing : method updated for check number
 sequence behaviour

bzr revid: rpr@tinyerp.com-20121123122546-2br0icbjfz75c0vd
---
 .../wizard/account_check.py                   | 31 ++++++++++++-------
 1 file changed, 19 insertions(+), 12 deletions(-)

diff --git a/addons/account_check_writing/wizard/account_check.py b/addons/account_check_writing/wizard/account_check.py
index 123febf2cfc..372a892d19d 100644
--- a/addons/account_check_writing/wizard/account_check.py
+++ b/addons/account_check_writing/wizard/account_check.py
@@ -18,16 +18,12 @@
 #    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
-
-import datetime
-import time
-import tools
 from osv import fields, osv
-from tools.translate import _
 
 class account_check_write(osv.osv_memory):
     _name = 'account.check.write'
     _description = 'Take input as sequence and print report'
+
     _columns = {
         'check_number': fields.char('Check Number', required=True, help="This is the Check Number"),
     }
@@ -35,24 +31,35 @@ class account_check_write(osv.osv_memory):
     _defaults = {
         'check_number': lambda obj, cr, uid, context:obj.pool.get('ir.sequence').get(cr, uid, 'account.check.write'),
    }
+
     def print_check_write(self, cr, uid, ids, context=None):
-        if not ids:
-            return  {}
+        voucher_obj = self.pool.get('account.voucher')
+        if context is None:
+            context = {}
+        voucher_ids = context.get('active_ids', [])
+        number = int(self.browse(cr, uid, ids[0], context=context).check_number)
+        if voucher_ids:
+            checks = voucher_obj.browse(cr, uid, context['active_ids'], context=context)
+            for check in checks:
+                voucher_obj.write(cr, uid, [check.id], {'number': str(number)}, context=context)
+                number += 1
 
         check_layout_report = {
             'top' : 'account.print.check.top',
             'middle' : 'account.print.check.middle',
             'bottom' : 'account.print.check.bottom',
         }
-        check_layout = self.pool.get('account.voucher').browse(cr, uid, context['active_ids'], context=context)[0].company_id.check_layout
+
+        check_layout = voucher_obj.browse(cr, uid, voucher_ids[0], context=context).company_id.check_layout
+        if not check_layout:
+            check_layout = 'top'
         return {
             'type': 'ir.actions.report.xml', 
             'report_name':check_layout_report[check_layout],
             'datas': {
-                    'model':'account.voucher',
-                    'id': context['active_ids'] and context['active_ids'][0] or False,
-                    'ids': context['active_ids'] and context['active_ids'] or [],
-                    'report_type': 'pdf'
+                'model':'account.voucher',
+                'ids': voucher_ids,
+                'report_type': 'pdf'
                 },
             'nodestroy': True
             }

From a15d1ea2e22ca234bf87b5792fb6792288a15ce1 Mon Sep 17 00:00:00 2001
From: "Divyesh Makwana (Open ERP)" <mdi@tinyerp.com>
Date: Fri, 23 Nov 2012 18:20:23 +0530
Subject: [PATCH 016/110] [IMP] account_check_writing : Improved the code.

bzr revid: mdi@tinyerp.com-20121123125023-oqkzividb5lct287
---
 .../wizard/account_check.py                    |  2 +-
 .../wizard/account_check_view.xml              | 18 +++++++++---------
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/addons/account_check_writing/wizard/account_check.py b/addons/account_check_writing/wizard/account_check.py
index 372a892d19d..d9904249154 100644
--- a/addons/account_check_writing/wizard/account_check.py
+++ b/addons/account_check_writing/wizard/account_check.py
@@ -39,7 +39,7 @@ class account_check_write(osv.osv_memory):
         voucher_ids = context.get('active_ids', [])
         number = int(self.browse(cr, uid, ids[0], context=context).check_number)
         if voucher_ids:
-            checks = voucher_obj.browse(cr, uid, context['active_ids'], context=context)
+            checks = voucher_obj.browse(cr, uid, voucher_ids, context=context)
             for check in checks:
                 voucher_obj.write(cr, uid, [check.id], {'number': str(number)}, context=context)
                 number += 1
diff --git a/addons/account_check_writing/wizard/account_check_view.xml b/addons/account_check_writing/wizard/account_check_view.xml
index a3930540e43..0e4121e9f08 100644
--- a/addons/account_check_writing/wizard/account_check_view.xml
+++ b/addons/account_check_writing/wizard/account_check_view.xml
@@ -6,15 +6,15 @@
             <field name="name">account.check.form</field>
             <field name="model">account.check.write</field>
             <field name="arch" type="xml">
-            <form string="Check" version="7.0">
-                <group col="4">
-                    <field name="check_number"/>
-                </group>
-                <footer>
-                    <button name="print_check_write" string="Print Check" type="object" class="oe_highlight"/> or
-                    <button string="Cancel" class="oe_link" special="cancel"/>
-                </footer>
-            </form>
+                <form string="Check" version="7.0">
+                    <group col="4">
+                        <field name="check_number"/>
+                    </group>
+                    <footer>
+                        <button name="print_check_write" string="Print Check" type="object" class="oe_highlight"/> or
+                        <button string="Cancel" class="oe_link" special="cancel"/>
+                    </footer>
+                </form>
             </field>
         </record>
 

From 62e9ffdfb11aa760f4a39eca2028bc2d694b0e0f Mon Sep 17 00:00:00 2001
From: "Divyesh Makwana (Open ERP)" <mdi@tinyerp.com>
Date: Fri, 23 Nov 2012 18:37:55 +0530
Subject: [PATCH 017/110] [IMP] account_check_writing : Removed the unnecessary
 sequence.

bzr revid: mdi@tinyerp.com-20121123130755-ryz3n70j855v4cz1
---
 addons/account_check_writing/__openerp__.py       |  1 -
 .../account_check_sequence.xml                    | 15 ---------------
 .../account_check_writing/wizard/account_check.py |  2 +-
 3 files changed, 1 insertion(+), 17 deletions(-)
 delete mode 100644 addons/account_check_writing/account_check_sequence.xml

diff --git a/addons/account_check_writing/__openerp__.py b/addons/account_check_writing/__openerp__.py
index 292215044fb..c0189a938e7 100644
--- a/addons/account_check_writing/__openerp__.py
+++ b/addons/account_check_writing/__openerp__.py
@@ -35,7 +35,6 @@ Module for the Check Writing and Check Printing.
         'account_view.xml',
         'account_voucher_view.xml',
         'account_check_writing_data.xml',
-        'account_check_sequence.xml'
     ],
     'demo': ['account_demo.xml'],
     'test': [],
diff --git a/addons/account_check_writing/account_check_sequence.xml b/addons/account_check_writing/account_check_sequence.xml
deleted file mode 100644
index f1dd75c5467..00000000000
--- a/addons/account_check_writing/account_check_sequence.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<openerp>
-    <data noupdate="1">
-        <record forcecreate="1" id="sequence_type_check_number" model="ir.sequence.type">
-            <field name="name">Number</field>
-            <field name="code">account.check.write</field>
-        </record>
-
-        <record id="sequence_account_check_number" model="ir.sequence">
-            <field name="name">Number</field>
-            <field name="code">account.check.write</field>
-            <field eval="3" name="padding"/>
-        </record>        
-    </data>
-</openerp>
diff --git a/addons/account_check_writing/wizard/account_check.py b/addons/account_check_writing/wizard/account_check.py
index d9904249154..9691d83f331 100644
--- a/addons/account_check_writing/wizard/account_check.py
+++ b/addons/account_check_writing/wizard/account_check.py
@@ -29,7 +29,7 @@ class account_check_write(osv.osv_memory):
     }
 
     _defaults = {
-        'check_number': lambda obj, cr, uid, context:obj.pool.get('ir.sequence').get(cr, uid, 'account.check.write'),
+        'check_number': lambda obj, cr, uid, context:obj.pool.get('ir.sequence').get(cr, uid, 'check.number'),
    }
 
     def print_check_write(self, cr, uid, ids, context=None):

From e8850d8f64d62bd640737e3f459ddc1e7257a1ad Mon Sep 17 00:00:00 2001
From: "Divyesh Makwana (Open ERP)" <mdi@tinyerp.com>
Date: Mon, 26 Nov 2012 11:32:23 +0530
Subject: [PATCH 018/110] [IMP] account_check_writing : Improved the code.

bzr revid: mdi@tinyerp.com-20121126060223-w9mzzsqv4o7xa4zo
---
 addons/account_check_writing/wizard/account_check.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/account_check_writing/wizard/account_check.py b/addons/account_check_writing/wizard/account_check.py
index 9691d83f331..7d94c6be80f 100644
--- a/addons/account_check_writing/wizard/account_check.py
+++ b/addons/account_check_writing/wizard/account_check.py
@@ -22,10 +22,10 @@ from osv import fields, osv
 
 class account_check_write(osv.osv_memory):
     _name = 'account.check.write'
-    _description = 'Take input as sequence and print report'
+    _description = 'Assign Check Number'
 
     _columns = {
-        'check_number': fields.char('Check Number', required=True, help="This is the Check Number"),
+        'check_number': fields.char('Check Number', required=True, help="The Check Number."),
     }
 
     _defaults = {

From 104af6411bb96345cb4dc94e12378bea6e92596d Mon Sep 17 00:00:00 2001
From: "Rajesh Prajapati (OpenERP)" <rpr@tinyerp.com>
Date: Mon, 26 Nov 2012 18:49:25 +0530
Subject: [PATCH 019/110] [IMP] check_writing : method updated

bzr revid: rpr@tinyerp.com-20121126131925-6hinm1yfv918zyw3
---
 addons/account_check_writing/wizard/account_check.py | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/addons/account_check_writing/wizard/account_check.py b/addons/account_check_writing/wizard/account_check.py
index 7d94c6be80f..8f98a554c66 100644
--- a/addons/account_check_writing/wizard/account_check.py
+++ b/addons/account_check_writing/wizard/account_check.py
@@ -41,8 +41,9 @@ class account_check_write(osv.osv_memory):
         if voucher_ids:
             checks = voucher_obj.browse(cr, uid, voucher_ids, context=context)
             for check in checks:
-                voucher_obj.write(cr, uid, [check.id], {'number': str(number)}, context=context)
-                number += 1
+                if not check.number:
+                    voucher_obj.write(cr, uid, [check.id], {'number': str(number)}, context=context)
+                    number += 1
 
         check_layout_report = {
             'top' : 'account.print.check.top',

From 8705820fd7b3cd99f4a48c7ef86a1eccf1d7bce0 Mon Sep 17 00:00:00 2001
From: dhr <dhr@tinyerp.com>
Date: Tue, 27 Nov 2012 14:48:29 +0530
Subject: [PATCH 020/110] [IMP]Solved the traceback issues of settings:From
 Incoming mail server options open messages

bzr revid: dhr@tinyerp.com-20121127091829-1z7e9fi5lh4icz5c
---
 addons/fetchmail/fetchmail_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/fetchmail/fetchmail_view.xml b/addons/fetchmail/fetchmail_view.xml
index 66c7e5a7f5c..6202701714c 100644
--- a/addons/fetchmail/fetchmail_view.xml
+++ b/addons/fetchmail/fetchmail_view.xml
@@ -117,7 +117,7 @@
       <act_window
             context="{'search_default_server_id': active_id, 'default_fetchmail_server_id': active_id}"
             id="act_server_history" name="Messages" domain="[('email_from', '!=', False), ('fetchmail_server_id', '=', active_id)]"
-            res_model="mail.message" src_model="fetchmail.server"/>
+            res_model="mail.mail" src_model="fetchmail.server"/>
 
     </data>
 </openerp>

From 7722389ade0b6c2b55c11f321b726c0d854075e3 Mon Sep 17 00:00:00 2001
From: "Bharat Devnani (OpenERP)" <bde@tinyerp.com>
Date: Tue, 27 Nov 2012 15:19:11 +0530
Subject: [PATCH 021/110] [IMP] improved description of consistency test, code
 help and removed unused functions and condition

bzr revid: bde@tinyerp.com-20121127094911-rnidlbk1obfc48tm
---
 addons/account_test/account_test_data.xml         |  3 +--
 addons/account_test/account_test_demo.xml         |  6 +++---
 addons/account_test/account_test_view.xml         | 12 +++++++++---
 addons/account_test/report/account_test_report.py | 14 --------------
 4 files changed, 13 insertions(+), 22 deletions(-)

diff --git a/addons/account_test/account_test_data.xml b/addons/account_test/account_test_data.xml
index 415664b9653..2a23c1196f9 100644
--- a/addons/account_test/account_test_data.xml
+++ b/addons/account_test/account_test_data.xml
@@ -22,8 +22,7 @@ if res[0]['balance']!=0.0 and res[0]['balance'] is not None:
     <record model="accounting.assert.test" id="account_test_02">
         <field name="sequence">2</field>
         <field name="name">Test 2: Opening a fiscal year</field>
-        <!--TODO : bad description of the test, does not really match what the SQL querry does, should adapt description name -->
-        <field name="desc">Check if the balance of the new opened fiscal year matches with last year's balance</field>
+        <field name="desc">Displays the debit and credit amount, of closed and newly created fiscal year, if the balance of current and newly created fiscal year mismatch</field>
         <field name="code_exec"><![CDATA[result = []
 cr.execute("select coalesce(sum(debit),0) as debit_new_fyear,coalesce(sum(credit),0) as credit_new_fyear from account_move_line where period_id in (select id from account_period where state='draft' and special order by id desc limit 1);")
 rec =  cr.dictfetchall()
diff --git a/addons/account_test/account_test_demo.xml b/addons/account_test/account_test_demo.xml
index a342040683b..7dd5c0f8938 100644
--- a/addons/account_test/account_test_demo.xml
+++ b/addons/account_test/account_test_demo.xml
@@ -3,9 +3,9 @@
 <data>
 
     <record model="accounting.assert.test" id="account_test_demo_01">
-      <!-- TODO : change name and desc -->
-        <field name="name">Test 1</field>
-        <field name="desc">Test 1</field>
+        <field name="sequence">11</field>
+        <field name="name">Test 11: Consistency check between Account Move and Account Move Line</field>
+        <field name="desc">Checks id of 'account_move' = move_id of 'account_move_line', and state of 'account_move_line' is valid, and having sum(debit-credit) != 0</field>
         <field name="domain_exec"></field>
         <field name="code_exec"><![CDATA[sql="""SELECT
     sum(debit) as sum_debit,
diff --git a/addons/account_test/account_test_view.xml b/addons/account_test/account_test_view.xml
index 848d04c7188..46f02d81d3b 100644
--- a/addons/account_test/account_test_view.xml
+++ b/addons/account_test/account_test_view.xml
@@ -38,10 +38,16 @@
                                     <field colspan="4" name="code_exec" nolabel="1"/>
                                 </group>
                                 <group string="Code Help">
-                                    <!--TODO : better explanation on how to write those test, especially on variable result that must be present or
-                                    we won't see the result of the tests good or bad, give detail on function that can be used, like 
-                                    'group(a,b)' 'reconciled_inv()' 'get_parent(a)' 'now()' ... -->
                                     <pre>
+You can write a query in order to create Consistency Test and you will get the result of the test 
+in PDF format which can be accessed by Menu Reporting -> Accounting Tests, then select the test 
+and print the report from Print button in header area.
+
+You can also use the following functions:
+
+get_parent(acc_id) : return parent id of analytic account(acc_id)
+reconciled_inv() : returns ids of records which are reconciled
+    
 Example: 
 sql = 'select id, name, ref, date from account_move_line where account_id in 
 (select id from account_account where type = 'view')'
diff --git a/addons/account_test/report/account_test_report.py b/addons/account_test/report/account_test_report.py
index 5c274773cd4..f8ba7a47f65 100644
--- a/addons/account_test/report/account_test_report.py
+++ b/addons/account_test/report/account_test_report.py
@@ -43,16 +43,6 @@ class report_assert_account(report_sxw.rml_parse):
         def group(lst, col):
             return dict((k, [v for v in itr]) for k, itr in groupby(sorted(lst, key=lambda x: x[col]), itemgetter(col)))
 
-        #TODO what is this method used for, name unclear and doesn't seem to be used
-        def sort_by_intified_num(a, b):
-            if a is None:
-                return -1
-            elif b is None:
-                return 1
-            else:
-                #if a is not None and b is not None:
-                return cmp(int(a), int(b))
-
         def reconciled_inv():
             reconciled_inv_ids = self.pool.get('account.invoice').search(self.cr, self.uid, [('reconciled','=',True)])
             return reconciled_inv_ids
@@ -86,12 +76,8 @@ class report_assert_account(report_sxw.rml_parse):
 
         if not isinstance(result, (tuple, list, set)):
             result = [result]
-
         if not result:
             result = [_('The test was passed successfully')]
-        #TODO: not sure this condition is needed, it is only a subcategory of the final else
-        elif all([isinstance(x, dict) for x in result]):
-            result = [', '.join(["%s: %s" % (k, v) for k, v in order_columns(rec, column_order)]) for rec in result]
         else:
             def _format(a):
                 if isinstance(a, dict):

From 555c94b81db5d37cb8a8e025d2c21f5f88270e16 Mon Sep 17 00:00:00 2001
From: Jagdish Panchal <jap@tinyerp.com>
Date: Tue, 27 Nov 2012 17:56:06 +0530
Subject: [PATCH 022/110] [IMP] project_issue: remove categ_ids filed from
 group by in search

bzr revid: jap@tinyerp.com-20121127122606-fdbnkeps2egxgwhm
---
 addons/project_issue/project_issue_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/project_issue/project_issue_view.xml b/addons/project_issue/project_issue_view.xml
index e3105127c5d..ff936d1b5bb 100644
--- a/addons/project_issue/project_issue_view.xml
+++ b/addons/project_issue/project_issue_view.xml
@@ -200,12 +200,12 @@
                     <filter string="Unassigned Issues" domain="[('user_id','=',False)]"  help="Unassigned Issues" icon="terp-personal-" />
                     <field name="user_id"/>
                     <field name="project_id"/>
+                    <field name="categ_ids"/>
                     <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'}"/>
                         <filter string="Project"  icon="terp-folder-violet" domain="[]" context="{'group_by':'project_id'}"/>
                         <filter string="Version" icon="terp-gtk-jump-to-rtl" domain="[]" context="{'group_by':'version_id'}"/>
-                        <filter string="Category" icon="terp-stock_symbol-selection" domain="[]" context="{'group_by':'categ_id'}"/>
                         <filter string="Priority" icon="terp-rating-rated" domain="[]" context="{'group_by':'priority'}"/>
                         <filter string="Stage" icon="terp-stage" domain="[]" context="{'group_by':'stage_id'}"/>
                         <filter string="Month" icon="terp-go-month" domain="[]" context="{'group_by':'create_date'}" help="Creation Month"/>

From 2d123cbdc6fc22aa56e2f5a53a4022e0f5aa8e8d Mon Sep 17 00:00:00 2001
From: Cedric Snauwaert <csn@openerp.com>
Date: Tue, 27 Nov 2012 15:03:59 +0100
Subject: [PATCH 023/110] [REF]remove some unused lines and add some tips
 message

bzr revid: csn@openerp.com-20121127140359-pvf025717k4m2wsu
---
 addons/account_test/__openerp__.py        |  7 +++---
 addons/account_test/account_test_data.xml |  4 +--
 addons/account_test/account_test_demo.xml | 30 -----------------------
 addons/account_test/account_test_view.xml | 16 ++++++------
 4 files changed, 13 insertions(+), 44 deletions(-)
 delete mode 100644 addons/account_test/account_test_demo.xml

diff --git a/addons/account_test/__openerp__.py b/addons/account_test/__openerp__.py
index 3e98734fe72..cfd4007fed0 100644
--- a/addons/account_test/__openerp__.py
+++ b/addons/account_test/__openerp__.py
@@ -29,6 +29,10 @@
 Asserts on accounting.
 ======================
 With this module you can manually check consistencies and inconsistencies of accounting module from menu Reporting/Accounting/Accounting Tests.
+
+You can write a query in order to create Consistency Test and you will get the result of the test 
+in PDF format which can be accessed by Menu Reporting -> Accounting Tests, then select the test 
+and print the report from Print button in header area.
 """,
     'depends' : ['account'],
     'data' : [
@@ -37,9 +41,6 @@ With this module you can manually check consistencies and inconsistencies of acc
         'account_test_report.xml',
         'account_test_data.xml',
     ],
-    'demo': [
-        'account_test_demo.xml',
-    ],
     'active': False,
     'installable': True
 }
diff --git a/addons/account_test/account_test_data.xml b/addons/account_test/account_test_data.xml
index 2a23c1196f9..4970bef6a0d 100644
--- a/addons/account_test/account_test_data.xml
+++ b/addons/account_test/account_test_data.xml
@@ -22,7 +22,7 @@ if res[0]['balance']!=0.0 and res[0]['balance'] is not None:
     <record model="accounting.assert.test" id="account_test_02">
         <field name="sequence">2</field>
         <field name="name">Test 2: Opening a fiscal year</field>
-        <field name="desc">Displays the debit and credit amount, of closed and newly created fiscal year, if the balance of current and newly created fiscal year mismatch</field>
+        <field name="desc">Check if the balance of the new opened fiscal year matches with last year's balance</field>
         <field name="code_exec"><![CDATA[result = []
 cr.execute("select coalesce(sum(debit),0) as debit_new_fyear,coalesce(sum(credit),0) as credit_new_fyear from account_move_line where period_id in (select id from account_period where state='draft' and special order by id desc limit 1);")
 rec =  cr.dictfetchall()
@@ -92,7 +92,6 @@ records= cr.dictfetchall()
 rec = [r['id'] for r in records]
 res = reconciled_inv()
 invoices = set(rec).difference(set(res))
-groups = group(list(records),'number')
 result = [rec for rec in records if rec['id'] in invoices]
 if result:
     result.insert(0,_('* Invoices that need to be checked: '))
@@ -108,7 +107,6 @@ result=[]
 if res:
     cr.execute("SELECT distinct inv.number,inv.id from account_invoice inv, account_move_line ml, account_account a, account_move m where m.id=ml.move_id and inv.move_id=m.id and inv.id=inv.move_id and ml.reconcile_id is null and a.type in ('receivable','payable') and ml.account_id=a.id and inv.id in %s",(tuple(res),))
     records = cr.dictfetchall()
-    groups = group(list(records),'number')
     result = [rec for rec in records]
     if result:
         result.insert(0,_('* Invoices that need to be checked: '))
diff --git a/addons/account_test/account_test_demo.xml b/addons/account_test/account_test_demo.xml
deleted file mode 100644
index 7dd5c0f8938..00000000000
--- a/addons/account_test/account_test_demo.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0"?>
-<openerp>
-<data>
-
-    <record model="accounting.assert.test" id="account_test_demo_01">
-        <field name="sequence">11</field>
-        <field name="name">Test 11: Consistency check between Account Move and Account Move Line</field>
-        <field name="desc">Checks id of 'account_move' = move_id of 'account_move_line', and state of 'account_move_line' is valid, and having sum(debit-credit) != 0</field>
-        <field name="domain_exec"></field>
-        <field name="code_exec"><![CDATA[sql="""SELECT
-    sum(debit) as sum_debit,
-    sum(credit) as sum_credit,
-    sum(debit-credit) as balance,
-    am.id as move_id,
-    am.state,
-    am.period_id
-  FROM account_move am, account_move_line ml
-  WHERE
-       ml.move_id = am.id
-     AND
-       ml.state = 'valid'
-  GROUP BY am.name, am.id, am.state, am.period_id
-  HAVING abs(sum(ml.debit-ml.credit)) <> 0"""
-cr.execute(sql)
-result = cr.dictfetchall()
-]]></field>
-    </record>
-
-</data>
-</openerp>
diff --git a/addons/account_test/account_test_view.xml b/addons/account_test/account_test_view.xml
index 46f02d81d3b..1faca55c4d6 100644
--- a/addons/account_test/account_test_view.xml
+++ b/addons/account_test/account_test_view.xml
@@ -39,15 +39,15 @@
                                 </group>
                                 <group string="Code Help">
                                     <pre>
-You can write a query in order to create Consistency Test and you will get the result of the test 
-in PDF format which can be accessed by Menu Reporting -> Accounting Tests, then select the test 
-and print the report from Print button in header area.
+Code should always return a result value. If result is an empty list, it means that
+the test is succesful. Otherwise it will print what is inside result.
+Code must be python with correct indentation (if needed).
+Here is a list of function that you can use in your test :
+ - group(lst, col) : 
+ - reconciled_inv() : return the list of all reconciled invoices
+ - get_parent(acc_id) : get parent analytical account
+ - now() : return current datetime
 
-You can also use the following functions:
-
-get_parent(acc_id) : return parent id of analytic account(acc_id)
-reconciled_inv() : returns ids of records which are reconciled
-    
 Example: 
 sql = 'select id, name, ref, date from account_move_line where account_id in 
 (select id from account_account where type = 'view')'

From 21b1aa529591a54f96ee35c2828106bb23d77f4e Mon Sep 17 00:00:00 2001
From: dhr <dhr@tinyerp.com>
Date: Fri, 30 Nov 2012 11:30:20 +0530
Subject: [PATCH 024/110] [IMP]Get email on change of partner and made
 invitation tab visible to all users

bzr revid: dhr@tinyerp.com-20121130060020-9pn7666r96dag2nc
---
 addons/base_calendar/base_calendar.py     | 19 ++++++++++++++++++-
 addons/base_calendar/crm_meeting_view.xml |  4 ++--
 2 files changed, 20 insertions(+), 3 deletions(-)

diff --git a/addons/base_calendar/base_calendar.py b/addons/base_calendar/base_calendar.py
index d225c3f90d9..4c4e7a16876 100644
--- a/addons/base_calendar/base_calendar.py
+++ b/addons/base_calendar/base_calendar.py
@@ -384,9 +384,26 @@ property or property parameter."),
         'cutype': 'individual',
     }
 
+
     def copy(self, cr, uid, id, default=None, context=None):
         raise osv.except_osv(_('Warning!'), _('You cannot duplicate a calendar attendee.'))
-
+    
+    def onchange_partner_id(self, cr, uid, ids, partner_id,context=None):
+        """
+        Make entry on email and availbility on change of partner_id field.
+        @param cr: the current row, from the database cursor
+        @param uid: the current user's ID for security checks
+        @param ids: list of calendar attendee's IDs
+        @param partner_id: changed value of partner id
+        @param context: a standard dictionary for contextual values
+        @return: dictionary of values which put value in email and availability fields
+        """
+        
+        if not partner_id:
+            return {'value': {'email': ''}}
+        partner = self.pool.get('res.partner').browse(cr, uid, partner_id, context=context)
+        return {'value': {'email': partner.email}}
+    
     def get_ics_file(self, cr, uid, event_obj, context=None):
         """
         Returns iCalendar file for the event invitation.
diff --git a/addons/base_calendar/crm_meeting_view.xml b/addons/base_calendar/crm_meeting_view.xml
index 84c03d68dbd..77018898c84 100644
--- a/addons/base_calendar/crm_meeting_view.xml
+++ b/addons/base_calendar/crm_meeting_view.xml
@@ -171,10 +171,10 @@
                             </group>
                         </group>
                     </page>
-                    <page string="Invitations" groups="base.group_no_one">
+                    <page string="Invitations">
                         <field name="attendee_ids" widget="one2many" mode="tree">
                             <tree string="Invitation details" editable="top">
-                                <field name="partner_id"/>
+                                <field name="partner_id" on_change="onchange_partner_id(partner_id)"/>
                                 <field name="email" string="Mail To"/>
                                 <field name="state"/>
                                 <button name="do_tentative"

From 15226021d236e9b22001660b0d7de3e3370008fb Mon Sep 17 00:00:00 2001
From: "Ajay Chauhan (OpenERP)" <cha@tinyerp.com>
Date: Fri, 30 Nov 2012 11:30:54 +0530
Subject: [PATCH 025/110] [IMP] made supplier visible on customer form

bzr revid: cha@tinyerp.com-20121130060054-tm6x6rc3ko8j28oj
---
 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 a6e722a0b20..5eea2dc8025 100644
--- a/openerp/addons/base/res/res_partner_view.xml
+++ b/openerp/addons/base/res/res_partner_view.xml
@@ -258,7 +258,7 @@
                                 </group>
                                 <group>
                                     <field name="customer"/>
-                                    <field name="supplier" invisible="not context.get('default_supplier')"/>
+                                    <field name="supplier"/>
                                 </group>
                                 <group>
                                     <field name="ref"/>

From af5afb4d7359c34b2981b874a5bd53ecabd12732 Mon Sep 17 00:00:00 2001
From: dhr <dhr@tinyerp.com>
Date: Fri, 30 Nov 2012 11:56:28 +0530
Subject: [PATCH 026/110] [IMP]Renamed the id of crm_meeting_type for sale
 manager

bzr revid: dhr@tinyerp.com-20121130062628-vo4bjw14uau7dzom
---
 addons/base_calendar/security/ir.model.access.csv | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/base_calendar/security/ir.model.access.csv b/addons/base_calendar/security/ir.model.access.csv
index 24af1abf0e5..54ab0590aca 100644
--- a/addons/base_calendar/security/ir.model.access.csv
+++ b/addons/base_calendar/security/ir.model.access.csv
@@ -9,5 +9,5 @@ access_crm_meeting_manager,crm.meeting.manager,model_crm_meeting,base.group_sale
 access_crm_meeting,crm.meeting,model_crm_meeting,base.group_sale_salesman,1,1,1,0
 access_crm_meeting_all,crm.meeting_allll,model_crm_meeting,base.group_user,1,0,0,0
 access_crm_meeting_partner_manager,crm.meeting.partner.manager,model_crm_meeting,base.group_partner_manager,1,1,1,1
-access_crm_meeting_type_manager,crm.meeting.type.manager,model_crm_meeting_type,base.group_sale_manager,1,1,1,0
+access_crm_meeting_type_sale_manager,crm.meeting.type.manager,model_crm_meeting_type,base.group_sale_manager,1,1,1,0
 access_crm_meeting_type_manager,crm.meeting.type.manager,model_crm_meeting_type,base.group_system,1,1,1,1

From 7d968c359059af9a856cab30d8a5f50bbcacd66c Mon Sep 17 00:00:00 2001
From: "Ajay Chauhan (OpenERP)" <cha@tinyerp.com>
Date: Fri, 30 Nov 2012 14:20:46 +0530
Subject: [PATCH 027/110] [IMP] account_analytic_analysis: made changes in
 filters

bzr revid: cha@tinyerp.com-20121130085046-0p4etgeiwdismala
---
 .../account_analytic_analysis_menu.xml                        | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/account_analytic_analysis/account_analytic_analysis_menu.xml b/addons/account_analytic_analysis/account_analytic_analysis_menu.xml
index 9eb8fe90895..368dd7f3b65 100644
--- a/addons/account_analytic_analysis/account_analytic_analysis_menu.xml
+++ b/addons/account_analytic_analysis/account_analytic_analysis_menu.xml
@@ -8,7 +8,7 @@
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
             <field name="domain">[('invoice_id','=',False)]</field>
-            <field name="context">{'search_default_to_invoice': 1}</field>
+            <field name="context">{'search_default_to_invoice': 1, 'search_default_sales': 1}</field>
             <field name="search_view_id" ref="account.view_account_analytic_line_filter"/>
             <field name="help" type="html">
               <p>
@@ -34,7 +34,7 @@
                     <filter icon="terp-go-today" string="To Renew" domain="['|', '&amp;', ('date', '!=', False), ('date', '&lt;=', time.strftime('%%Y-%%m-%%d')), ('is_overdue_quantity', '=', True)]" name="renew"
                         help="The contracts to be renewed because the deadline is passed or the working hours are higher than the allocated hours" />
                     <separator/>
-                    <filter string="Contracts Having a Partner" help="A contract in OpenERP is an analytic account having a partner set on it." name="has_partner" domain="[('partner_id', '!=', False)]" icon="terp-partner" />
+                    <filter string="Customer Contracts" help="A contract in OpenERP is an analytic account having a partner set on it." name="has_partner" domain="[('partner_id', '!=', False)]" icon="terp-partner" />
                     <separator/>
                     <filter string="Contracts not assigned" help="Contracts that are not assigned to an account manager." domain="[('user_id', '=', False)]" icon="terp-personal-" />
                     <field name="partner_id"/>

From 2c130707a7f99ef879e605090f1beda89f821167 Mon Sep 17 00:00:00 2001
From: "Rajesh Prajapati (OpenERP)" <rpr@tinyerp.com>
Date: Fri, 30 Nov 2012 15:22:39 +0530
Subject: [PATCH 028/110] [IMP] General : Mark Read and Mark Unread removed
 from all objects

bzr revid: rpr@tinyerp.com-20121130095239-e60l299dut71x5ng
---
 addons/base_calendar/crm_meeting_view.xml     | 37 ----------
 addons/crm/crm_lead_view.xml                  | 36 ---------
 addons/crm/crm_phonecall_view.xml             | 36 ---------
 addons/event/event_view.xml                   | 73 ------------------
 addons/hr_holidays/hr_holidays_view.xml       | 37 ----------
 addons/hr_recruitment/hr_recruitment_view.xml | 37 ----------
 addons/project/project_view.xml               | 74 -------------------
 addons/project_issue/project_issue_view.xml   | 37 ----------
 addons/purchase/purchase_view.xml             | 37 ----------
 addons/sale/sale_view.xml                     | 37 ----------
 10 files changed, 441 deletions(-)

diff --git a/addons/base_calendar/crm_meeting_view.xml b/addons/base_calendar/crm_meeting_view.xml
index 84c03d68dbd..a6f7ada54ba 100644
--- a/addons/base_calendar/crm_meeting_view.xml
+++ b/addons/base_calendar/crm_meeting_view.xml
@@ -2,43 +2,6 @@
 <openerp>
     <data>
 
-    <!-- Read/Unread actions -->
-
-    <record id="actions_server_crm_meeting_read" model="ir.actions.server">
-        <field name="name">CRM Meeting: Mark read</field>
-        <field name="condition">True</field>
-        <field name="type">ir.actions.server</field>
-        <field name="model_id" ref="model_crm_meeting"/>
-        <field name="state">code</field>
-        <field name="code">self.message_mark_as_read(cr, uid, context.get('active_ids'), context=context)</field>
-    </record>
-    <record id="action_crm_meeting_read" model="ir.values">
-        <field name="name">action_crm_meeting_read</field>
-        <field name="action_id" ref="actions_server_crm_meeting_read"/>
-        <field name="value" eval="'ir.actions.server,' + str(ref('actions_server_crm_meeting_read'))"/>
-        <field name="key">action</field>
-        <field name="model_id" ref="model_crm_meeting"/>
-        <field name="model">crm.meeting</field>
-        <field name="key2">client_action_multi</field>
-    </record>
-
-    <record id="actions_server_crm_meeting_unread" model="ir.actions.server">
-        <field name="name">CRM Meeting: Mark unread</field>
-        <field name="condition">True</field>
-        <field name="type">ir.actions.server</field>
-        <field name="model_id" ref="model_crm_meeting"/>
-        <field name="state">code</field>
-        <field name="code">self.message_mark_as_unread(cr, uid, context.get('active_ids'), context=context)</field>
-    </record>
-    <record id="action_crm_meeting_unread" model="ir.values">
-        <field name="name">action_crm_meeting_unread</field>
-        <field name="action_id" ref="actions_server_crm_meeting_unread"/>
-        <field name="value" eval="'ir.actions.server,' + str(ref('actions_server_crm_meeting_unread'))"/>
-        <field name="key">action</field>
-        <field name="model_id" ref="model_crm_meeting"/>
-        <field name="model">crm.meeting</field>
-        <field name="key2">client_action_multi</field>
-    </record>
 
     <!-- CRM Meetings Types Form View -->
 
diff --git a/addons/crm/crm_lead_view.xml b/addons/crm/crm_lead_view.xml
index c552b1835f2..3bbdf05655e 100644
--- a/addons/crm/crm_lead_view.xml
+++ b/addons/crm/crm_lead_view.xml
@@ -2,42 +2,6 @@
 <openerp>
     <data>
 
-        <!-- Read/Unread actions -->
-        <record id="actions_server_crm_lead_unread" model="ir.actions.server">
-            <field name="name">CRM Lead: Mark unread</field>
-            <field name="condition">True</field>
-            <field name="type">ir.actions.server</field>
-            <field name="model_id" ref="model_crm_lead"/>
-            <field name="state">code</field>
-            <field name="code">self.message_mark_as_unread(cr, uid, context.get('active_ids'), context=context)</field>
-        </record>
-        <record id="action_crm_lead_unread" model="ir.values">
-            <field name="name">action_crm_lead_unread</field>
-            <field name="action_id" ref="actions_server_crm_lead_unread"/>
-            <field name="value" eval="'ir.actions.server,' + str(ref('actions_server_crm_lead_unread'))"/>
-            <field name="key">action</field>
-            <field name="model_id" ref="model_crm_lead"/>
-            <field name="model">crm.lead</field>
-            <field name="key2">client_action_multi</field>
-        </record>
-
-        <record id="actions_server_crm_lead_read" model="ir.actions.server">
-            <field name="name">CRM Lead: Mark read</field>
-            <field name="condition">True</field>
-            <field name="type">ir.actions.server</field>
-            <field name="model_id" ref="model_crm_lead"/>
-            <field name="state">code</field>
-            <field name="code">self.message_mark_as_read(cr, uid, context.get('active_ids'), context=context)</field>
-        </record>
-        <record id="action_crm_lead_read" model="ir.values">
-            <field name="name">action_crm_lead_read</field>
-            <field name="action_id" ref="actions_server_crm_lead_read"/>
-            <field name="value" eval="'ir.actions.server,' + str(ref('actions_server_crm_lead_read'))"/>
-            <field name="key">action</field>
-            <field name="model_id" ref="model_crm_lead"/>
-            <field name="model">crm.lead</field>
-            <field name="key2">client_action_multi</field>
-        </record>
 
         <!--
             CRM CASE STAGE
diff --git a/addons/crm/crm_phonecall_view.xml b/addons/crm/crm_phonecall_view.xml
index a6e8dbe397a..e5848ae130e 100644
--- a/addons/crm/crm_phonecall_view.xml
+++ b/addons/crm/crm_phonecall_view.xml
@@ -2,42 +2,6 @@
 <openerp>
     <data>
 
-    <!-- Read/Unread actions -->
-    <record id="actions_server_crm_phonecall_unread" model="ir.actions.server">
-        <field name="name">CRM Phonecall: Mark unread</field>
-        <field name="condition">True</field>
-        <field name="type">ir.actions.server</field>
-        <field name="model_id" ref="model_crm_phonecall"/>
-        <field name="state">code</field>
-        <field name="code">self.message_mark_as_unread(cr, uid, context.get('active_ids'), context=context)</field>
-    </record>
-    <record id="action_crm_phonecall_unread" model="ir.values">
-        <field name="name">action_crm_phonecall_unread</field>
-        <field name="action_id" ref="actions_server_crm_phonecall_unread"/>
-        <field name="value" eval="'ir.actions.server,' + str(ref('actions_server_crm_phonecall_unread'))"/>
-        <field name="key">action</field>
-        <field name="model_id" ref="model_crm_phonecall"/>
-        <field name="model">crm.phonecall</field>
-        <field name="key2">client_action_multi</field>
-    </record>
-
-    <record id="actions_server_crm_phonecall_read" model="ir.actions.server">
-        <field name="name">CRM Phonecall: Mark read</field>
-        <field name="condition">True</field>
-        <field name="type">ir.actions.server</field>
-        <field name="model_id" ref="model_crm_phonecall"/>
-        <field name="state">code</field>
-        <field name="code">self.message_mark_as_read(cr, uid, context.get('active_ids'), context=context)</field>
-    </record>
-    <record id="action_crm_phonecall_read" model="ir.values">
-        <field name="name">action_crm_phonecall_read</field>
-        <field name="action_id" ref="actions_server_crm_phonecall_read"/>
-        <field name="value" eval="'ir.actions.server,' + str(ref('actions_server_crm_phonecall_read'))"/>
-        <field name="key">action</field>
-        <field name="model_id" ref="model_crm_phonecall"/>
-        <field name="model">crm.phonecall</field>
-        <field name="key2">client_action_multi</field>
-    </record>
 
 <!--  Phonecall Categories Form View  -->
     <record id="crm_phonecall_categ_action" model="ir.actions.act_window">
diff --git a/addons/event/event_view.xml b/addons/event/event_view.xml
index a9a60570735..efdbf1be3b2 100644
--- a/addons/event/event_view.xml
+++ b/addons/event/event_view.xml
@@ -57,43 +57,6 @@
 
         <!-- Events Organisation/CONFIGURATION/EVENTS -->
 
-        <!-- Event Read/Unread actions -->
-        <record id="actions_server_event_event_unread" model="ir.actions.server">
-            <field name="name">Event: Mark unread</field>
-            <field name="condition">True</field>
-            <field name="type">ir.actions.server</field>
-            <field name="model_id" ref="model_event_event"/>
-            <field name="state">code</field>
-            <field name="code">self.message_mark_as_unread(cr, uid, context.get('active_ids'), context=context)</field>
-        </record>
-        <record id="action_event_event_unread" model="ir.values">
-            <field name="name">action_event_event_unread</field>
-            <field name="action_id" ref="actions_server_event_event_unread"/>
-            <field name="value" eval="'ir.actions.server,' + str(ref('actions_server_event_event_unread'))" />
-            <field name="key">action</field>
-            <field name="model_id" ref="model_event_event" />
-            <field name="model">event.event</field>
-            <field name="key2">client_action_multi</field>
-        </record>
-
-        <record id="actions_server_event_event_read" model="ir.actions.server">
-            <field name="name">Event: Mark read</field>
-            <field name="condition">True</field>
-            <field name="type">ir.actions.server</field>
-            <field name="model_id" ref="model_event_event"/>
-            <field name="state">code</field>
-            <field name="code">self.message_mark_as_read(cr, uid, context.get('active_ids'), context=context)</field>
-        </record>
-        <record id="action_event_event_read" model="ir.values">
-            <field name="name">action_event_event_read</field>
-            <field name="action_id" ref="actions_server_event_event_read"/>
-            <field name="value" eval="'ir.actions.server,' + str(ref('actions_server_event_event_read'))" />
-            <field name="key">action</field>
-            <field name="model_id" ref="model_event_event" />
-            <field name="model">event.event</field>
-            <field name="key2">client_action_multi</field>
-        </record>
-
         <record model="ir.ui.view" id="view_event_form">
             <field name="name">Events</field>
             <field name="model">event.event</field>
@@ -375,42 +338,6 @@
 
         <!-- EVENTS/REGISTRATIONS/EVENTS  -->
 
-        <!-- Registration Read/Unread actions -->
-        <record id="actions_server_event_registration_unread" model="ir.actions.server">
-            <field name="name">Event registration : Mark unread</field>
-            <field name="condition">True</field>
-            <field name="type">ir.actions.server</field>
-            <field name="model_id" ref="model_event_registration"/>
-            <field name="state">code</field>
-            <field name="code">self.message_mark_as_unread(cr, uid, context.get('active_ids'), context=context)</field>
-        </record>
-        <record id="action_event_registration_unread" model="ir.values">
-            <field name="name">action_event_registration_unread</field>
-            <field name="action_id" ref="actions_server_event_registration_unread"/>
-            <field name="value" eval="'ir.actions.server,' + str(ref('actions_server_event_registration_unread'))" />
-            <field name="key">action</field>
-            <field name="model_id" ref="model_event_registration" />
-            <field name="model">event.registration</field>
-            <field name="key2">client_action_multi</field>
-        </record>
-
-        <record id="actions_server_event_registration_read" model="ir.actions.server">
-            <field name="name">Event registration : Mark read</field>
-            <field name="condition">True</field>
-            <field name="type">ir.actions.server</field>
-            <field name="model_id" ref="model_event_registration"/>
-            <field name="state">code</field>
-            <field name="code">self.message_mark_as_read(cr, uid, context.get('active_ids'), context=context)</field>
-        </record>
-        <record id="action_event_registration_read" model="ir.values">
-            <field name="name">action_event_registration_read</field>
-            <field name="action_id" ref="actions_server_event_registration_read"/>
-            <field name="value" eval="'ir.actions.server,' + str(ref('actions_server_event_registration_read'))" />
-            <field name="key">action</field>
-            <field name="model_id" ref="model_event_registration" />
-            <field name="model">event.registration</field>
-            <field name="key2">client_action_multi</field>
-        </record>
 
         <record model="ir.ui.view" id="view_event_registration_tree">
             <field name="name">event.registration.tree</field>
diff --git a/addons/hr_holidays/hr_holidays_view.xml b/addons/hr_holidays/hr_holidays_view.xml
index aba6dd36538..0d2e958728d 100644
--- a/addons/hr_holidays/hr_holidays_view.xml
+++ b/addons/hr_holidays/hr_holidays_view.xml
@@ -1,43 +1,6 @@
 <openerp>
     <data>
 
-        <!-- Hr holidays Read/Unread actions -->
-        <record id="actions_server_holidays_unread" model="ir.actions.server">
-            <field name="name">Holidays: Mark unread</field>
-            <field name="condition">True</field>
-            <field name="type">ir.actions.server</field>
-            <field name="model_id" ref="model_hr_holidays"/>
-            <field name="state">code</field>
-            <field name="code">self.message_mark_as_unread(cr, uid, context.get('active_ids'), context=context)</field>
-        </record>
-        <record id="action_holidays_unread" model="ir.values">
-            <field name="name">action_holidays_unread</field>
-            <field name="action_id" ref="actions_server_holidays_unread"/>
-            <field name="value" eval="'ir.actions.server,' + str(ref('actions_server_holidays_unread'))"/>
-            <field name="key">action</field>
-            <field name="model_id" ref="model_hr_holidays"/>
-            <field name="model">hr.holidays</field>
-            <field name="key2">client_action_multi</field>
-        </record>
-
-        <record id="actions_server_holidays_read" model="ir.actions.server">
-            <field name="name">Holidays: Mark read</field>
-            <field name="condition">True</field>
-            <field name="type">ir.actions.server</field>
-            <field name="model_id" ref="model_hr_holidays"/>
-            <field name="state">code</field>
-            <field name="code">self.message_mark_as_read(cr, uid, context.get('active_ids'), context=context)</field>
-        </record>
-        <record id="action_holidays_read" model="ir.values">
-            <field name="name">action_holidays_read</field>
-            <field name="action_id" ref="actions_server_holidays_read"/>
-            <field name="value" eval="'ir.actions.server,' + str(ref('actions_server_holidays_read'))"/>
-            <field name="key">action</field>
-            <field name="model_id" ref="model_hr_holidays"/>
-            <field name="model">hr.holidays</field>
-            <field name="key2">client_action_multi</field>
-        </record>
-
         <record id="view_hr_holidays_filter" model="ir.ui.view">
             <field name="name">hr.holidays.filter</field>
             <field name="model">hr.holidays</field>
diff --git a/addons/hr_recruitment/hr_recruitment_view.xml b/addons/hr_recruitment/hr_recruitment_view.xml
index 8282c5a300c..e686ee32665 100644
--- a/addons/hr_recruitment/hr_recruitment_view.xml
+++ b/addons/hr_recruitment/hr_recruitment_view.xml
@@ -35,43 +35,6 @@
 
 
     <!-- Jobs -->
-    <!-- Applicant Read/Unread actions -->
-    <record id="actions_server_applicant_unread" model="ir.actions.server">
-        <field name="name">HR Applicant: Mark unread</field>
-        <field name="condition">True</field>
-        <field name="type">ir.actions.server</field>
-        <field name="model_id" ref="model_hr_applicant"/>
-        <field name="state">code</field>
-        <field name="code">self.message_mark_as_unread(cr, uid, context.get('active_ids'), context=context)</field>
-    </record>
-    <record id="action_applicant_unread" model="ir.values">
-        <field name="name">action_project_unread</field>
-        <field name="action_id" ref="actions_server_applicant_unread"/>
-        <field name="value" eval="'ir.actions.server,' + str(ref('actions_server_applicant_unread'))"/>
-        <field name="key">action</field>
-        <field name="model_id" ref="model_hr_applicant"/>
-        <field name="model">hr.applicant</field>
-        <field name="key2">client_action_multi</field>
-    </record>
-
-    <record id="actions_server_applicant_read" model="ir.actions.server">
-        <field name="name">HR Applicant: Mark read</field>
-        <field name="condition">True</field>
-        <field name="type">ir.actions.server</field>
-        <field name="model_id" ref="model_hr_applicant"/>
-        <field name="state">code</field>
-        <field name="code">self.message_mark_as_read(cr, uid, context.get('active_ids'), context=context)</field>
-    </record>
-    <record id="action_applicant_read" model="ir.values">
-        <field name="name">action_project_read</field>
-        <field name="action_id" ref="actions_server_applicant_read"/>
-        <field name="value" eval="'ir.actions.server,' + str(ref('actions_server_applicant_read'))"/>
-        <field name="key">action</field>
-        <field name="model_id" ref="model_hr_applicant"/>
-        <field name="model">hr.applicant</field>
-        <field name="key2">client_action_multi</field>
-    </record>
-
     <record model="ir.ui.view" id="crm_case_tree_view_job">
         <field name="name">Applicants</field>
         <field name="model">hr.applicant</field>
diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml
index 840d9b47ae0..07cbbce63d9 100644
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -19,43 +19,6 @@
             <field name="context">{'search_default_project_id': [active_id], 'default_project_id': active_id}</field>
         </record>
 
-        <!-- Project Read/Unread actions -->
-        <record id="actions_server_project_unread" model="ir.actions.server">
-            <field name="name">Project: Mark unread</field>
-            <field name="condition">True</field>
-            <field name="type">ir.actions.server</field>
-            <field name="model_id" ref="model_project_project"/>
-            <field name="state">code</field>
-            <field name="code">self.message_mark_as_unread(cr, uid, context.get('active_ids'), context=context)</field>
-        </record>
-        <record id="action_project_unread" model="ir.values">
-            <field name="name">action_project_unread</field>
-            <field name="action_id" ref="actions_server_project_unread"/>
-            <field name="value" eval="'ir.actions.server,' + str(ref('actions_server_project_unread'))"/>
-            <field name="key">action</field>
-            <field name="model_id" ref="model_project_project"/>
-            <field name="model">project.project</field>
-            <field name="key2">client_action_multi</field>
-        </record>
-
-        <record id="actions_server_project_read" model="ir.actions.server">
-            <field name="name">Project: Mark read</field>
-            <field name="condition">True</field>
-            <field name="type">ir.actions.server</field>
-            <field name="model_id" ref="model_project_project"/>
-            <field name="state">code</field>
-            <field name="code">self.message_mark_as_read(cr, uid, context.get('active_ids'), context=context)</field>
-        </record>
-        <record id="action_project_read" model="ir.values">
-            <field name="name">action_project_read</field>
-            <field name="action_id" ref="actions_server_project_read"/>
-            <field name="value" eval="'ir.actions.server,' + str(ref('actions_server_project_read'))"/>
-            <field name="key">action</field>
-            <field name="model_id" ref="model_project_project"/>
-            <field name="model">project.project</field>
-            <field name="key2">client_action_multi</field>
-        </record>
-
         <!-- Project -->
         <record id="edit_project" model="ir.ui.view">
             <field name="name">project.project.form</field>
@@ -342,43 +305,6 @@
 
         <!-- Task -->
 
-        <!-- Task Read/Unread actions -->
-        <record id="actions_server_project_task_unread" model="ir.actions.server">
-            <field name="name">Task: Mark unread</field>
-            <field name="condition">True</field>
-            <field name="type">ir.actions.server</field>
-            <field name="model_id" ref="model_project_task"/>
-            <field name="state">code</field>
-            <field name="code">self.message_mark_as_unread(cr, uid, context.get('active_ids'), context=context)</field>
-        </record>
-        <record id="action_project_task_unread" model="ir.values">
-            <field name="name">action_project_task_unread</field>
-            <field name="action_id" ref="actions_server_project_task_unread"/>
-            <field name="value" eval="'ir.actions.server,' + str(ref('actions_server_project_task_unread'))"/>
-            <field name="key">action</field>
-            <field name="model_id" ref="model_project_task"/>
-            <field name="model">project.task</field>
-            <field name="key2">client_action_multi</field>
-        </record>
-
-        <record id="actions_server_project_task_read" model="ir.actions.server">
-            <field name="name">Task: Mark read</field>
-            <field name="condition">True</field>
-            <field name="type">ir.actions.server</field>
-            <field name="model_id" ref="model_project_task"/>
-            <field name="state">code</field>
-            <field name="code">self.message_mark_as_read(cr, uid, context.get('active_ids'), context=context)</field>
-        </record>
-        <record id="action_project_task_read" model="ir.values">
-            <field name="name">action_project_task_read</field>
-            <field name="action_id" ref="actions_server_project_task_read"/>
-            <field name="value" eval="'ir.actions.server,' + str(ref('actions_server_project_task_read'))"/>
-            <field name="key">action</field>
-            <field name="model_id" ref="model_project_task"/>
-            <field name="model">project.task</field>
-            <field name="key2">client_action_multi</field>
-        </record>
-
         <record id="view_task_form2" model="ir.ui.view">
             <field name="name">project.task.form</field>
             <field name="model">project.task</field>
diff --git a/addons/project_issue/project_issue_view.xml b/addons/project_issue/project_issue_view.xml
index 60cc6448a46..069f6d8c684 100644
--- a/addons/project_issue/project_issue_view.xml
+++ b/addons/project_issue/project_issue_view.xml
@@ -4,43 +4,6 @@
 
         <menuitem  id="menu_project_confi" name="Issues" parent="base.menu_definitions" sequence="2"/>
 
-        <!-- Project issue Read/Unread actions -->
-        <record id="actions_server_project_issue_unread" model="ir.actions.server">
-            <field name="name">Issue: Mark unread</field>
-            <field name="condition">True</field>
-            <field name="type">ir.actions.server</field>
-            <field name="model_id" ref="model_project_issue"/>
-            <field name="state">code</field>
-            <field name="code">self.message_mark_as_unread(cr, uid, context.get('active_ids'), context=context)</field>
-        </record>
-        <record id="action_project_issue_unread" model="ir.values">
-            <field name="name">action_project_issue_unread</field>
-            <field name="action_id" ref="actions_server_project_issue_unread"/>
-            <field name="value" eval="'ir.actions.server,' + str(ref('actions_server_project_issue_unread'))"/>
-            <field name="key">action</field>
-            <field name="model_id" ref="model_project_issue"/>
-            <field name="model">project.issue</field>
-            <field name="key2">client_action_multi</field>
-        </record>
-
-        <record id="actions_server_project_issue_read" model="ir.actions.server">
-            <field name="name">Issue: Mark read</field>
-            <field name="condition">True</field>
-            <field name="type">ir.actions.server</field>
-            <field name="model_id" ref="model_project_issue"/>
-            <field name="state">code</field>
-            <field name="code">self.message_mark_as_read(cr, uid, context.get('active_ids'), context=context)</field>
-        </record>
-        <record id="action_project_issue_read" model="ir.values">
-            <field name="name">action_project_issue_read</field>
-            <field name="action_id" ref="actions_server_project_issue_read"/>
-            <field name="value" eval="'ir.actions.server,' + str(ref('actions_server_project_issue_read'))"/>
-            <field name="key">action</field>
-            <field name="model_id" ref="model_project_issue"/>
-            <field name="model">project.issue</field>
-            <field name="key2">client_action_multi</field>
-        </record>
-
         <record model="ir.ui.view" id="project_issue_version_search_view">
             <field name="name">Issue Version</field>
             <field name="model">project.issue.version</field>
diff --git a/addons/purchase/purchase_view.xml b/addons/purchase/purchase_view.xml
index f0be9e56dec..39455e36c7e 100644
--- a/addons/purchase/purchase_view.xml
+++ b/addons/purchase/purchase_view.xml
@@ -132,43 +132,6 @@
       <menuitem name="Products" id="menu_procurement_partner_contact_form" action="product.product_normal_action_puchased"
           parent="menu_procurement_management_product"/>
 
-        <!-- Purchase order Read/Unread actions -->
-        <record id="actions_server_purchase_order_unread" model="ir.actions.server">
-            <field name="name">Purchase: Mark unread</field>
-            <field name="condition">True</field>
-            <field name="type">ir.actions.server</field>
-            <field name="model_id" ref="model_purchase_order"/>
-            <field name="state">code</field>
-            <field name="code">self.message_mark_as_unread(cr, uid, context.get('active_ids'), context=context)</field>
-        </record>
-        <record id="action_purchase_order_unread" model="ir.values">
-            <field name="name">action_purchase_order_unread</field>
-            <field name="action_id" ref="actions_server_purchase_order_unread"/>
-            <field name="value" eval="'ir.actions.server,' + str(ref('actions_server_purchase_order_unread'))" />
-            <field name="key">action</field>
-            <field name="model_id" ref="model_purchase_order" />
-            <field name="model">purchase.order</field>
-            <field name="key2">client_action_multi</field>
-        </record>
-
-        <record id="actions_server_purchase_order_read" model="ir.actions.server">
-            <field name="name">Purchase: Mark read</field>
-            <field name="condition">True</field>
-            <field name="type">ir.actions.server</field>
-            <field name="model_id" ref="model_purchase_order"/>
-            <field name="state">code</field>
-            <field name="code">self.message_mark_as_read(cr, uid, context.get('active_ids'), context=context)</field>
-        </record>
-        <record id="action_purchase_order_read" model="ir.values">
-            <field name="name">action_purchase_order_read</field>
-            <field name="action_id" ref="actions_server_purchase_order_read"/>
-            <field name="value" eval="'ir.actions.server,' + str(ref('actions_server_purchase_order_read'))" />
-            <field name="key">action</field>
-            <field name="model_id" ref="model_purchase_order" />
-            <field name="model">purchase.order</field>
-            <field name="key2">client_action_multi</field>
-        </record>
-
         <record model="ir.ui.view" id="purchase_order_calendar">
             <field name="name">purchase.order.calendar</field>
             <field name="model">purchase.order</field>
diff --git a/addons/sale/sale_view.xml b/addons/sale/sale_view.xml
index dd9cfad066a..45dc7a5819d 100644
--- a/addons/sale/sale_view.xml
+++ b/addons/sale/sale_view.xml
@@ -66,43 +66,6 @@
         </record>
 
 
-        <!-- Sale order Read/Unread actions -->
-        <record id="actions_server_sale_order_unread" model="ir.actions.server">
-            <field name="name">Sale: Mark unread</field>
-            <field name="condition">True</field>
-            <field name="type">ir.actions.server</field>
-            <field name="model_id" ref="model_sale_order"/>
-            <field name="state">code</field>
-            <field name="code">self.message_mark_as_unread(cr, uid, context.get('active_ids'), context=context)</field>
-        </record>
-        <record id="action_sale_order_unread" model="ir.values">
-            <field name="name">action_sale_order_unread</field>
-            <field name="action_id" ref="actions_server_sale_order_unread"/>
-            <field name="value" eval="'ir.actions.server,' + str(ref('actions_server_sale_order_unread'))" />
-            <field name="key">action</field>
-            <field name="model_id" ref="model_sale_order" />
-            <field name="model">sale.order</field>
-            <field name="key2">client_action_multi</field>
-        </record>
-
-        <record id="actions_server_sale_order_read" model="ir.actions.server">
-            <field name="name">Sale: Mark read</field>
-            <field name="condition">True</field>
-            <field name="type">ir.actions.server</field>
-            <field name="model_id" ref="model_sale_order"/>
-            <field name="state">code</field>
-            <field name="code">self.message_mark_as_read(cr, uid, context.get('active_ids'), context=context)</field>
-        </record>
-        <record id="action_sale_order_read" model="ir.values">
-            <field name="name">action_sale_order_read</field>
-            <field name="action_id" ref="actions_server_sale_order_read"/>
-            <field name="value" eval="'ir.actions.server,' + str(ref('actions_server_sale_order_read'))" />
-            <field name="key">action</field>
-            <field name="model_id" ref="model_sale_order" />
-            <field name="model">sale.order</field>
-            <field name="key2">client_action_multi</field>
-        </record>
-
         <record id="view_sale_order_calendar" model="ir.ui.view">
             <field name="name">sale.order.calendar</field>
             <field name="model">sale.order</field>

From 4cacdeaeadf259caf102c4887104f5686618ecd3 Mon Sep 17 00:00:00 2001
From: "Sanjay Gohel (Open ERP)" <sgo@tinyerp.com>
Date: Fri, 30 Nov 2012 15:59:48 +0530
Subject: [PATCH 029/110] [IMP]improve filter which are not working

bzr revid: sgo@tinyerp.com-20121130102948-gy5aqp4rffdk4gv5
---
 addons/note/note_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/note/note_view.xml b/addons/note/note_view.xml
index 5aae6204d86..d11ea6f351d 100644
--- a/addons/note/note_view.xml
+++ b/addons/note/note_view.xml
@@ -134,7 +134,7 @@
         <search string="Notes">
           <field name="memo" string="Note"/>
           <field name="tag_ids"/>
-          <filter name="open_true" string="Active" domain="['|',('open', '=', True),('date_done','=',time.strftime('%%Y-%%m-%%d'))]"/>
+          <filter name="open_true" string="Active" domain="[('open', '=', True)]"/>
           <filter name="open_false" string="Archive" domain="[('open', '=', False)]"/>
           <group expand="0" string="Group By...">
             <filter icon="terp-stock_symbol-selection" string="Stage" help="By sticky note Category" context="{'group_by':'stage_id'}"/>

From 72e6e33475675ff650cd34c1605970a036eb1f8c Mon Sep 17 00:00:00 2001
From: "Ajay Chauhan (OpenERP)" <cha@tinyerp.com>
Date: Fri, 30 Nov 2012 16:47:05 +0530
Subject: [PATCH 030/110] [IMP] crm: changed filter string & help

bzr revid: cha@tinyerp.com-20121130111705-gii2q1i5v13f3pfd
---
 addons/crm/crm_phonecall_view.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/crm/crm_phonecall_view.xml b/addons/crm/crm_phonecall_view.xml
index a6e8dbe397a..29e7e961394 100644
--- a/addons/crm/crm_phonecall_view.xml
+++ b/addons/crm/crm_phonecall_view.xml
@@ -220,8 +220,8 @@
                <separator/>
                <filter string="Unassigned Phonecalls" icon="terp-personal-" domain="[('user_id','=',False)]" help="Unassigned Phonecalls"/>
                <separator/>
-               <filter string="Phone Calls Assigned to Me or My Team(s)" icon="terp-personal+" domain="['|', ('section_id.user_id','=',uid), ('section_id.member_ids', 'in', [uid])]"
-                       help="Phone Calls that are assigned to me or to my team(s)"/>
+               <filter string="Phone Calls Assigned to the Teamleader or Members of his Team(s)" icon="terp-personal+" domain="['|', ('section_id.user_id','=',uid), ('section_id.member_ids', 'in', [uid])]"
+                       help="Phone Calls Assigned to the Teamleader or Members of his Team(s)"/>
                <field name="partner_id"/>
                <field name="user_id"/>
                <field name="section_id" string="Sales Team"/>

From 6af43c05f1a2f7d3edc08df1d965485e9f957692 Mon Sep 17 00:00:00 2001
From: Paramjit Singh Sahota <psa@tinyerp.com>
Date: Mon, 3 Dec 2012 14:54:16 +0530
Subject: [PATCH 031/110] [FIX][trunk] Process view broken again. Link to
 object context problems.

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

bzr revid: psa@tinyerp.com-20121203092416-k35t4bf5dq6c20l0
---
 addons/process/static/src/js/process.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/process/static/src/js/process.js b/addons/process/static/src/js/process.js
index 73ca4396ce6..0737bce1522 100644
--- a/addons/process/static/src/js/process.js
+++ b/addons/process/static/src/js/process.js
@@ -228,7 +228,7 @@ instance.web.ViewManager.include({
                     context: dataset.context
                     }).done(function(result) {
                         action_manager.replace(self.$el);
-                        action_manager.do_action(result.result);
+                        action_manager.do_action(result);
                     })
             });
     },

From d316e726230b40c5063a8e838374eb8b50d1564c Mon Sep 17 00:00:00 2001
From: "Hiral Patel (OpenERP)" <hip@tinyerp.com>
Date: Mon, 3 Dec 2012 15:22:09 +0530
Subject: [PATCH 032/110] [FIX][trunk] column id on table sale_order doesn't
 exist after unistall module delivery

bzr revid: hip@tinyerp.com-20121203095209-dryb4c2iews10s4b
---
 addons/delivery/sale.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/addons/delivery/sale.py b/addons/delivery/sale.py
index 24da03bf1d8..3d6139195be 100644
--- a/addons/delivery/sale.py
+++ b/addons/delivery/sale.py
@@ -28,7 +28,6 @@ class sale_order(osv.osv):
     _inherit = 'sale.order'
     _columns = {
         'carrier_id':fields.many2one("delivery.carrier", "Delivery Method", help="Complete this field if you plan to invoice the shipping based on picking."),
-        'id': fields.integer('ID', readonly=True,invisible=True),
     }
 
     def onchange_partner_id(self, cr, uid, ids, part, context=None):

From 2e05f7f6f5cef83115876b629012017236bee587 Mon Sep 17 00:00:00 2001
From: "Vidhin Mehta (OpenERP)" <vme@tinyerp.com>
Date: Mon, 3 Dec 2012 15:57:36 +0530
Subject: [PATCH 033/110] [IMP]lib issue of jquery ui custom.bug already post
 on jquery ui support http://bugs.jqueryui.com/ticket/5466.

bzr revid: vme@tinyerp.com-20121203102736-usb3qcd03sdxkxfi
---
 addons/web/static/lib/jquery.ui/js/jquery-ui-1.9.1.custom.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/web/static/lib/jquery.ui/js/jquery-ui-1.9.1.custom.js b/addons/web/static/lib/jquery.ui/js/jquery-ui-1.9.1.custom.js
index 8ff02b23145..f0fa9c321d4 100644
--- a/addons/web/static/lib/jquery.ui/js/jquery-ui-1.9.1.custom.js
+++ b/addons/web/static/lib/jquery.ui/js/jquery-ui-1.9.1.custom.js
@@ -8952,7 +8952,7 @@ $.extend( $.ui.dialog.overlay, {
 					$( document ).bind( $.ui.dialog.overlay.events, function( event ) {
 						// stop events if the z-index of the target is < the z-index of the overlay
 						// we cannot return true when we don't want to cancel the event (#3523)
-						if ( $( event.target ).zIndex() < $.ui.dialog.overlay.maxZ ) {
+						if ( $(event.target).closest('.ui-dialog').zIndex() < $.ui.dialog.overlay.maxZ ) {
 							return false;
 						}
 					});

From 2d68dd89febe2162c9435afb0a74447e4d0efcc0 Mon Sep 17 00:00:00 2001
From: "Khushboo Bhatt (Open ERP)" <kbh@tinyerp.com>
Date: Tue, 4 Dec 2012 11:30:42 +0530
Subject: [PATCH 034/110] [IMP]crm:onchange method for opportunity to set
 phone,mobile,sales team and partner

bzr revid: kbh@tinyerp.com-20121204060042-dgr2ibddolhk5yzg
---
 addons/crm/crm_phonecall.py       | 12 ++++++++++++
 addons/crm/crm_phonecall_view.xml |  4 ++--
 2 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/addons/crm/crm_phonecall.py b/addons/crm/crm_phonecall.py
index da08f97250a..a0ef56010e5 100644
--- a/addons/crm/crm_phonecall.py
+++ b/addons/crm/crm_phonecall.py
@@ -155,6 +155,18 @@ class crm_phonecall(base_state, osv.osv):
         })
         return partner_id
 
+    def on_change_opportunity(self, cr, uid, ids, opportunity_id, context=None):
+        values = {}
+        if opportunity_id:
+            opportunity = self.pool.get('crm.lead').browse(cr, uid, opportunity_id, context=context)
+            values = {
+                'section_id' : opportunity.section_id and opportunity.section_id.id or False,
+                'partner_phone' : opportunity.phone,
+                'partner_mobile' : opportunity.mobile,
+                'partner_id' : opportunity.partner_id and opportunity.partner_id.id or False,
+            }
+        return {'value' : values}
+
     def _call_set_partner(self, cr, uid, ids, partner_id, context=None):
         write_res = self.write(cr, uid, ids, {'partner_id' : partner_id}, context=context)
         self._call_set_partner_send_note(cr, uid, ids, context)
diff --git a/addons/crm/crm_phonecall_view.xml b/addons/crm/crm_phonecall_view.xml
index 3b5162288a4..896bf8c9ee0 100644
--- a/addons/crm/crm_phonecall_view.xml
+++ b/addons/crm/crm_phonecall_view.xml
@@ -75,7 +75,7 @@
                 <field name="user_id"/>
                 <field name="categ_id" invisible="1"/>
                 <field name="create_date" invisible="1"/>
-                <field name="opportunity_id" invisible="1"/>
+                <field name="opportunity_id" invisible="1" on_change="on_change_opportunity(opportunity_id)"/>
                 <field name="needaction_pending" invisible="1"/>
                 <button string="Convert to Opportunity"
                     name="%(phonecall2opportunity_act)d"
@@ -147,7 +147,7 @@
                         domain="[('object_id.model', '=', 'crm.phonecall')]"/>
                     <field name="partner_mobile"/>
                     <field name="priority"/>
-                    <field name="opportunity_id"/>
+                    <field name="opportunity_id" on_change="on_change_opportunity(opportunity_id)"/>
                 </group>
 
                 <field name="description" placeholder="Description..."/>

From b9140dba3440477f25433c087cb266c7530334e7 Mon Sep 17 00:00:00 2001
From: ggh-openerp <ggh@tinyerp.com>
Date: Tue, 4 Dec 2012 11:52:59 +0530
Subject: [PATCH 035/110] [Fix] Fixed the issue of timesheet activities
 usability problem

bzr revid: ggh@tinyerp.com-20121204062259-t71tb4dn41a52u52
---
 addons/hr_timesheet/hr_timesheet_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/hr_timesheet/hr_timesheet_view.xml b/addons/hr_timesheet/hr_timesheet_view.xml
index ebdd05ed59c..30ea8121823 100644
--- a/addons/hr_timesheet/hr_timesheet_view.xml
+++ b/addons/hr_timesheet/hr_timesheet_view.xml
@@ -6,7 +6,7 @@
             <field name="name">hr.analytic.timesheet.tree</field>
             <field name="model">hr.analytic.timesheet</field>
             <field name="arch" type="xml">
-                <tree editable="bottom" string="Timesheet Activities">
+                <tree editable="top" string="Timesheet Activities">
                     <field name="date" on_change="on_change_date(date)"/>
                     <field name="user_id" on_change="on_change_user_id(user_id)" required="1" options='{"no_open": True}'/>
                     <field name="journal_id" invisible="1"/>

From 4d3e27e478339359f6c631f2387794af1bbff887 Mon Sep 17 00:00:00 2001
From: "Khushboo Bhatt (Open ERP)" <kbh@tinyerp.com>
Date: Tue, 4 Dec 2012 12:54:42 +0530
Subject: [PATCH 036/110] [FIX]crm:onchange added on opportunity_id

bzr revid: kbh@tinyerp.com-20121204072442-bqs25ks3vkn5da0t
---
 addons/crm/crm_lead_view.xml      | 2 +-
 addons/crm/crm_phonecall_view.xml | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/addons/crm/crm_lead_view.xml b/addons/crm/crm_lead_view.xml
index c552b1835f2..c0744d755a5 100644
--- a/addons/crm/crm_lead_view.xml
+++ b/addons/crm/crm_lead_view.xml
@@ -603,4 +603,4 @@
         </record>
 
     </data>
-</openerp>
+</openerp>
\ No newline at end of file
diff --git a/addons/crm/crm_phonecall_view.xml b/addons/crm/crm_phonecall_view.xml
index bc0f40607a8..96eeb623bab 100644
--- a/addons/crm/crm_phonecall_view.xml
+++ b/addons/crm/crm_phonecall_view.xml
@@ -82,7 +82,7 @@
                 <field name="user_id"/>
                 <field name="categ_id" invisible="1"/>
                 <field name="create_date" invisible="1"/>
-                <field name="opportunity_id" invisible="1"/>
+                <field name="opportunity_id" invisible="1" on_change="on_change_opportunity(opportunity_id)"/>
                 <field name="state"/>
                 <button name="case_open" string="Confirm" type="object"
                         states="draft,pending" icon="gtk-go-forward"/>
@@ -236,4 +236,4 @@
     </record>
 
     </data>
-</openerp>
+</openerp>
\ No newline at end of file

From d7b4414f70bb70a2f5b81500f427db0a8e5cca75 Mon Sep 17 00:00:00 2001
From: "Khushboo Bhatt (Open ERP)" <kbh@tinyerp.com>
Date: Tue, 4 Dec 2012 14:26:47 +0530
Subject: [PATCH 037/110] [REM]crm:method of phoncall

bzr revid: kbh@tinyerp.com-20121204085647-2a5x0fin6z6l03lc
---
 addons/crm/crm_lead.py | 51 ------------------------------------------
 1 file changed, 51 deletions(-)

diff --git a/addons/crm/crm_lead.py b/addons/crm/crm_lead.py
index 00adbc1211a..80ac2fa16d3 100644
--- a/addons/crm/crm_lead.py
+++ b/addons/crm/crm_lead.py
@@ -707,57 +707,6 @@ class crm_lead(base_stage, format_address, osv.osv):
                 self.write(cr, uid, [lead_id], value, context=context)
         return True
 
-    def phonecall_view(self, cr, uid, ids, call_summary, user_id=False, section_id=False, categ_id=False, context=None):
-        #Open the View for the Phone call for the leads
-        """
-        This opens Phone Call views
-        @return :Dictionary value for Phone Call view
-        """
-        if context is None:
-            context = {}
-        value = {}
-        data_obj = self.pool.get('ir.model.data')
-        if not categ_id:
-            res_id = data_obj._get_id(cr, uid, 'crm', 'categ_phone2')
-            if res_id:
-                categ_id = data_obj.browse(cr, uid, res_id, context=context).res_id
-        for lead in self.browse(cr, uid, ids, context=context):
-            if not section_id:
-                section_id = lead.section_id and lead.section_id.id or False
-            if not user_id:
-                user_id = lead.user_id and lead.user_id.id or False
-            # Get Phone Call views
-            tree_view = data_obj.get_object_reference(cr, uid, 'crm', 'crm_case_phone_tree_view')
-            form_view = data_obj.get_object_reference(cr, uid, 'crm', 'crm_case_phone_form_view')
-            search_view = data_obj.get_object_reference(cr, uid, 'crm', 'view_crm_case_phonecalls_filter')
-            context.update({
-                'default_duration': 1.0,
-                'default_opportunity_id': lead.id,
-                'default_user_id': user_id or False,
-                'default_categ_id' : categ_id or False,
-                'default_lead_id': lead.id,
-                'default_name': lead.name,
-                'default_partner_id': lead.partner_id and lead.partner_id.id or False,
-                'default_partner_mobile': lead.mobile or (lead.partner_id and lead.partner_id.mobile or False),
-                'default_section_id': section_id or False,
-                'default_description': lead.description or False,
-                'default_partner_phone': lead.phone or (lead.partner_id and lead.partner_id.phone or False),
-            })
-            value = {
-                'name': _('Phone Call'),
-                'context': context,
-                'view_type': 'form',
-                'view_mode': 'form,tree',
-                'res_model': 'crm.phonecall',
-                'view_id': False,
-                'context': context,
-                'views': [(form_view and form_view[1] or False, 'form'),(tree_view and tree_view[1] or False, 'tree')],
-                'type': 'ir.actions.act_window',
-                'search_view_id': search_view and search_view[1] or False,
-                'nodestroy': True
-            }
-        return value
-
     def schedule_phonecall(self, cr, uid, ids, schedule_time, call_summary, desc, phone, contact_name, user_id=False, section_id=False, categ_id=False, action='schedule', context=None):
         """
         action :('schedule','Schedule a call'), ('log','Log a call')

From b7d32d62c0bcd22007d83e4154f385cb5b5ebe58 Mon Sep 17 00:00:00 2001
From: "Khushboo Bhatt (Open ERP)" <kbh@tinyerp.com>
Date: Tue, 4 Dec 2012 15:14:28 +0530
Subject: [PATCH 038/110] [FIX]crm:onchange on tree view

bzr revid: kbh@tinyerp.com-20121204094428-5d4tyllzdwa05o9r
---
 addons/crm/crm_phonecall_view.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/crm/crm_phonecall_view.xml b/addons/crm/crm_phonecall_view.xml
index 96eeb623bab..1089d93e105 100644
--- a/addons/crm/crm_phonecall_view.xml
+++ b/addons/crm/crm_phonecall_view.xml
@@ -82,7 +82,7 @@
                 <field name="user_id"/>
                 <field name="categ_id" invisible="1"/>
                 <field name="create_date" invisible="1"/>
-                <field name="opportunity_id" invisible="1" on_change="on_change_opportunity(opportunity_id)"/>
+                <field name="opportunity_id" invisible="1" />
                 <field name="state"/>
                 <button name="case_open" string="Confirm" type="object"
                         states="draft,pending" icon="gtk-go-forward"/>
@@ -176,7 +176,7 @@
                     invisible="1"/>
                 <field name="state" invisible="1"/>
                 <field name="create_date" invisible="1"/>
-                <field name="opportunity_id" invisible="1"/>
+                <field name="opportunity_id" invisible="1" on_change="on_change_opportunity(opportunity_id)"/>
                 <button string="Schedule Other Call"
                     icon="terp-call-start"
                     name="%(phonecall_to_phonecall_act)d"

From a56f37e6f4b5207fb437db5c5ad08a3ad0e92a62 Mon Sep 17 00:00:00 2001
From: Cedric Snauwaert <csn@openerp.com>
Date: Tue, 4 Dec 2012 17:20:56 +0100
Subject: [PATCH 039/110] [ADD]access rules and groups

bzr revid: csn@openerp.com-20121204162056-cacua9dw1shg5fnv
---
 addons/fleet/__openerp__.py               |   2 +-
 addons/fleet/fleet_board_view.xml         |  11 ++-
 addons/fleet/fleet_view.xml               |  30 +++---
 addons/fleet/security/fleet_security.xml  | 109 ++++++++++++++++++++++
 addons/fleet/security/ir.model.access.csv |  34 ++++---
 5 files changed, 154 insertions(+), 32 deletions(-)
 create mode 100644 addons/fleet/security/fleet_security.xml

diff --git a/addons/fleet/__openerp__.py b/addons/fleet/__openerp__.py
index 3a40e7dfc0a..f1e0d1a8580 100644
--- a/addons/fleet/__openerp__.py
+++ b/addons/fleet/__openerp__.py
@@ -52,7 +52,7 @@ Main Features
         'fleet_data.xml',
         'fleet_board_view.xml',
     ],
-    'update_xml' : ['security/ir.model.access.csv'],
+    'update_xml' : ['security/fleet_security.xml','security/ir.model.access.csv'],
 
     'demo': ['fleet_cars.xml','fleet_demo.xml'],
 
diff --git a/addons/fleet/fleet_board_view.xml b/addons/fleet/fleet_board_view.xml
index 760fc1cf583..41093d2c283 100644
--- a/addons/fleet/fleet_board_view.xml
+++ b/addons/fleet/fleet_board_view.xml
@@ -135,17 +135,20 @@
     <menuitem id="menu_fleet_dashboard" 
               parent="base.menu_reporting_dashboard" 
               action="open_board_fleet" 
-              sequence="50"/>
+              sequence="50"
+              groups="group_fleet_user"/>
     
-    <menuitem name="Fleet" parent="base.menu_reporting" id="menu_fleet_reporting" sequence="50" />
+    <menuitem name="Fleet" parent="base.menu_reporting" id="menu_fleet_reporting" sequence="50" groups="group_fleet_manager"/>
 
     <menuitem id="menu_fleet_reporting_costs" 
               parent="menu_fleet_reporting" 
               action="action_fleet_reporting_costs" 
-              sequence="1"/>
+              sequence="1"
+              groups="group_fleet_manager"/>
     <menuitem id="menu_fleet_reporting_indicative_costs" 
               parent="menu_fleet_reporting" 
               action="action_fleet_reporting_costs_non_effective" 
-              sequence="2"/>
+              sequence="2"
+              groups="group_fleet_manager"/>
 </data>
 </openerp>
diff --git a/addons/fleet/fleet_view.xml b/addons/fleet/fleet_view.xml
index 416ca191a6e..9cceb594884 100644
--- a/addons/fleet/fleet_view.xml
+++ b/addons/fleet/fleet_view.xml
@@ -149,11 +149,11 @@
             </field>
         </record>
 
-        <menuitem name="Fleet" id="menu_root" sequence="110" />
-        <menuitem name="Configuration" parent="menu_root" id="fleet_configuration" sequence="3" />
+        <menuitem name="Fleet" id="menu_root" sequence="110" groups="group_fleet_user"/>
+        <menuitem name="Configuration" parent="menu_root" id="fleet_configuration" sequence="3" groups="group_fleet_manager"/>
         <menuitem action="fleet_vehicle_model_act" parent="fleet_configuration" id="fleet_vehicle_model_menu" groups="base.group_no_one"/>
         <menuitem action="fleet_vehicle_model_brand_act" parent="fleet_configuration" id="fleet_vehicle_model_brand_menu" groups="base.group_no_one"/>
-        <menuitem action="fleet_vehicle_state_act" parent="fleet_configuration" id="fleet_vehicle_state_menu" />
+        <menuitem action="fleet_vehicle_state_act" parent="fleet_configuration" id="fleet_vehicle_state_menu" groups="group_fleet_manager"/>
 
         <record model='ir.ui.view' id='fleet_vehicle_form'>
             <field name="name">fleet.vehicle.form</field>
@@ -179,7 +179,7 @@
                         </div>
                         <div class="oe_right oe_button_box">
                             <button name="return_action_to_open" type="object" context="{'xml_id':'fleet_vehicle_log_contract_act'}" string="Contracts" help="show the contract for this vehicle" />
-                            <button name="act_show_log_cost" type="object" string="Costs" help="show all the costs for this vehicle" />
+                            <button name="act_show_log_cost" type="object" string="Costs" help="show all the costs for this vehicle" groups="fleet.group_fleet_manager"/>
                             <button name="return_action_to_open" type="object" context="{'xml_id':'fleet_vehicle_log_services_act'}" string="Services" help="show the services logs for this vehicle" />
                             <button name="return_action_to_open" type="object" context="{'xml_id':'fleet_vehicle_log_fuel_act'}" string="Fuel Logs" help="show the fuel logs for this vehicle" />
                             <button name="return_action_to_open" type="object" context="{'xml_id':'fleet_vehicle_odometer_act'}" string="Odometer Logs" help="show the odometer logs for this vehicle" />
@@ -347,8 +347,8 @@
             </field>
         </record>
 
-        <menuitem name="Vehicles" parent="menu_root" id="fleet_vehicles" sequence="2" />
-        <menuitem action="fleet_vehicle_act" parent="fleet_vehicles" id="fleet_vehicle_menu" />
+        <menuitem name="Vehicles" parent="menu_root" id="fleet_vehicles" sequence="2" groups="group_fleet_user"/>
+        <menuitem action="fleet_vehicle_act" parent="fleet_vehicles" id="fleet_vehicle_menu" groups="group_fleet_user"/>
 
 
 
@@ -358,10 +358,10 @@
             <field name="arch" type="xml">
                 <form string="Contract logs" version="7.0">
                     <header>
-                        <button modifiers="{'invisible': [['state', '=', 'closed']]}" name="contract_close" states="open" type="object" class="oe_highlight" string="Terminate Contract"/>
-                        <button modifiers="{'invisible': [['state', '=', 'closed']]}" name="contract_close" states="toclose" type="object" class="oe_highlight" string="Terminate Contract"/>
-                        <button modifiers="{'invisible': [['state', 'not in', ['closed']]]}" name="contract_open" states="closed" type="object" class="oe_highlight" string="Set Contract In Progress"/>
-                        <button class="oe_highlight" name="act_renew_contract" type="object" string="Renew Contract" help="Create a new contract automatically with all the same informations except for the date that will start at the end of current contract" />
+                        <button modifiers="{'invisible': [['state', '=', 'closed']]}" name="contract_close" states="open" type="object" class="oe_highlight" string="Terminate Contract" groups="fleet.group_fleet_manager"/>
+                        <button modifiers="{'invisible': [['state', '=', 'closed']]}" name="contract_close" states="toclose" type="object" class="oe_highlight" string="Terminate Contract" groups="fleet.group_fleet_manager"/>
+                        <button modifiers="{'invisible': [['state', 'not in', ['closed']]]}" name="contract_open" states="closed" type="object" class="oe_highlight" string="Set Contract In Progress" groups="fleet.group_fleet_manager"/>
+                        <button class="oe_highlight" name="act_renew_contract" type="object" string="Renew Contract" help="Create a new contract automatically with all the same informations except for the date that will start at the end of current contract" groups="fleet.group_fleet_manager"/>
                         <field name="state" widget="statusbar" />
                     </header>
                     <sheet>
@@ -491,7 +491,7 @@
             </field>
         </record>
 
-        <menuitem action="fleet_vehicle_log_contract_act" parent="fleet_vehicles" id="fleet_vehicle_log_contract_menu" />
+        <menuitem action="fleet_vehicle_log_contract_act" parent="fleet_vehicles" id="fleet_vehicle_log_contract_menu" groups="group_fleet_user"/>
 
        <record model='ir.ui.view' id='fleet_vehicle_odometer_form'>
             <field name="name">fleet.vehicle.odometer.form</field>
@@ -568,7 +568,7 @@
             </field>
         </record>
 
-        <menuitem action="fleet_vehicle_odometer_act" parent="fleet_vehicles" id="fleet_vehicle_odometer_menu" />
+        <menuitem action="fleet_vehicle_odometer_act" parent="fleet_vehicles" id="fleet_vehicle_odometer_menu" groups="group_fleet_user"/>
 
         <record model='ir.ui.view' id='fleet_vehicle_log_fuel_form'>
             <field name="name">fleet.vehicle.log.fuel.form</field>
@@ -657,7 +657,7 @@
             </field>
         </record>
 
-        <menuitem action="fleet_vehicle_log_fuel_act" parent="fleet_vehicles" id="fleet_vehicle_log_fuel_menu" />
+        <menuitem action="fleet_vehicle_log_fuel_act" parent="fleet_vehicles" id="fleet_vehicle_log_fuel_menu" groups="group_fleet_user"/>
 
 
         <record model='ir.ui.view' id='fleet_vehicle_log_services_form'>
@@ -749,7 +749,7 @@
             </field>
         </record>
 
-        <menuitem action="fleet_vehicle_log_services_act" parent="fleet_vehicles" id="fleet_vehicle_log_services_menu" />
+        <menuitem action="fleet_vehicle_log_services_act" parent="fleet_vehicles" id="fleet_vehicle_log_services_menu" groups="group_fleet_user"/>
 
         <record model='ir.ui.view' id='fleet_vehicle_service_types_tree'>
             <field name="name">fleet.service.type.tree</field>
@@ -870,7 +870,7 @@
             </field>
         </record>
 
-        <menuitem action="fleet_vehicle_costs_act" parent="fleet_vehicles" id="fleet_vehicle_costs_menu" />
+        <menuitem action="fleet_vehicle_costs_act" parent="fleet_vehicles" id="fleet_vehicle_costs_menu" groups="group_fleet_manager"/>
 <!--    
         <record model='ir.ui.view' id='fleet_hr_employee_form'>
             <field name="name">fleet.hr.employee.form</field>
diff --git a/addons/fleet/security/fleet_security.xml b/addons/fleet/security/fleet_security.xml
new file mode 100644
index 00000000000..6351d23b55e
--- /dev/null
+++ b/addons/fleet/security/fleet_security.xml
@@ -0,0 +1,109 @@
+<?xml version="1.0" ?>
+<openerp>
+    <data>
+        <record model="ir.module.category" id="module_fleet_category">
+            <field name="name">Fleet</field>
+            <field name="sequence">17</field>
+        </record>
+        <record id="group_fleet_user" model="res.groups">
+            <field name="name">User</field>
+            <field name="category_id" ref="module_fleet_category"/>
+        </record>
+        <record id="group_fleet_manager" model="res.groups">
+            <field name="name">Manager</field>
+            <field name="implied_ids" eval="[(4, ref('group_fleet_user'))]"/>
+            <field name="category_id" ref="module_fleet_category"/>
+        </record>
+        <record id="fleet_user_contract_visibility" model="ir.rule">
+            <field name="name">User can only see his/her contracts</field>
+            <field name="model_id" ref="model_fleet_vehicle_log_contract"/>
+            <field name="groups" eval="[(4, ref('group_fleet_user'))]"/>
+            <field name="perm_read" eval="True"/>
+            <field name="perm_write" eval="False"/>
+            <field name="perm_create" eval="False"/>
+            <field name="perm_unlink" eval="False"/>
+            <field name="domain_force">[('cost_id.vehicle_id.driver.id','=',user.partner_id.id)]</field>
+        </record>
+        <record id="fleet_user_cost_visibility" model="ir.rule">
+            <field name="name">User can only see his/her costs</field>
+            <field name="model_id" ref="model_fleet_vehicle_cost"/>
+            <field name="groups" eval="[(4, ref('group_fleet_user'))]"/>
+            <field name="perm_read" eval="True"/>
+            <field name="perm_write" eval="True"/>
+            <field name="perm_create" eval="True"/>
+            <field name="perm_unlink" eval="False"/>
+            <field name="domain_force">[('vehicle_id.driver.id','=',user.partner_id.id)]</field>
+        </record>
+        <record id="fleet_user_service_visibility" model="ir.rule">
+            <field name="name">User can only see his/her vehicle's services</field>
+            <field name="model_id" ref="model_fleet_vehicle_log_services"/>
+            <field name="groups" eval="[(4, ref('group_fleet_user'))]"/>
+            <field name="perm_read" eval="True"/>
+            <field name="perm_write" eval="False"/>
+            <field name="perm_create" eval="False"/>
+            <field name="perm_unlink" eval="False"/>
+            <field name="domain_force">[('cost_id.vehicle_id.driver.id','=',user.partner_id.id)]</field>
+        </record>
+        <record id="fleet_user_odometer_visibility" model="ir.rule">
+            <field name="name">User can only see his/her vehicle's odometer</field>
+            <field name="model_id" ref="model_fleet_vehicle_odometer"/>
+            <field name="groups" eval="[(4, ref('group_fleet_user'))]"/>
+            <field name="perm_read" eval="True"/>
+            <field name="perm_write" eval="True"/>
+            <field name="perm_create" eval="True"/>
+            <field name="perm_unlink" eval="True"/>
+            <field name="domain_force">[('vehicle_id.driver.id','=',user.partner_id.id)]</field>
+        </record>
+        <record id="fleet_user_fuel_log_visibility" model="ir.rule">
+            <field name="name">User can only see his/her vehicle's fuel log</field>
+            <field name="model_id" ref="model_fleet_vehicle_log_fuel"/>
+            <field name="groups" eval="[(4, ref('group_fleet_user'))]"/>
+            <field name="perm_read" eval="True"/>
+            <field name="perm_write" eval="True"/>
+            <field name="perm_create" eval="True"/>
+            <field name="perm_unlink" eval="True"/>
+            <field name="domain_force">[('cost_id.vehicle_id.driver.id','=',user.partner_id.id)]</field>
+        </record>
+        <record id="fleet_user_vehicle_visibility" model="ir.rule">
+            <field name="name">User can only see his/her vehicle</field>
+            <field name="model_id" ref="model_fleet_vehicle"/>
+            <field name="groups" eval="[(4, ref('group_fleet_user'))]"/>
+            <field name="perm_read" eval="True"/>
+            <field name="perm_write" eval="True"/>
+            <field name="perm_create" eval="False"/>
+            <field name="perm_unlink" eval="False"/>
+            <field name="domain_force">[('driver.id','=',user.partner_id.id)]</field>
+        </record>
+        <record id="fleet_user_contract_visibility_manager" model="ir.rule">
+            <field name="name">Manager has all rights on vehicle's contracts</field>
+            <field name="model_id" ref="model_fleet_vehicle_log_contract"/>
+            <field name="groups" eval="[(4, ref('group_fleet_manager'))]"/>
+        </record>
+        <record id="fleet_user_cost_visibility_manager" model="ir.rule">
+            <field name="name">Manager has all rights on vehicle's costs</field>
+            <field name="model_id" ref="model_fleet_vehicle_cost"/>
+            <field name="groups" eval="[(4, ref('group_fleet_manager'))]"/>
+        </record>
+        <record id="fleet_user_service_visibility_manager" model="ir.rule">
+            <field name="name">Manager has all rights on vehicle's services</field>
+            <field name="model_id" ref="model_fleet_vehicle_log_services"/>
+            <field name="groups" eval="[(4, ref('group_fleet_manager'))]"/>
+        </record>
+        <record id="fleet_user_odometer_visibility_manager" model="ir.rule">
+            <field name="name">Manager has all rights on vehicle's vehicle's odometer</field>
+            <field name="model_id" ref="model_fleet_vehicle_odometer"/>
+            <field name="groups" eval="[(4, ref('group_fleet_manager'))]"/>
+        </record>
+        <record id="fleet_user_fuel_log_visibility_manager" model="ir.rule">
+            <field name="name">Manager has all rights on vehicle's fuel log</field>
+            <field name="model_id" ref="model_fleet_vehicle_log_fuel"/>
+            <field name="groups" eval="[(4, ref('group_fleet_manager'))]"/>
+        </record>
+        <record id="fleet_user_vehicle_visibility_manager" model="ir.rule">
+            <field name="name">Manager has all rights on vehicle</field>
+            <field name="model_id" ref="model_fleet_vehicle"/>
+            <field name="groups" eval="[(4, ref('group_fleet_manager'))]"/>
+        </record>
+
+    </data>
+</openerp>
diff --git a/addons/fleet/security/ir.model.access.csv b/addons/fleet/security/ir.model.access.csv
index 823b3cb2945..ecb8ec307b4 100644
--- a/addons/fleet/security/ir.model.access.csv
+++ b/addons/fleet/security/ir.model.access.csv
@@ -1,13 +1,23 @@
 id,name,model_id/id,group_id/id,perm_read,perm_write,perm_create,perm_unlink
-fleet_vehicle_model_access_right,fleet_vehicle_model_access_right,model_fleet_vehicle_model,,1,1,1,1
-fleet_vehicle_tag_access_right,fleet_vehicle_tag_access_right,model_fleet_vehicle_tag,,1,1,1,1
-fleet_vehicle_state_access_right,fleet_vehicle_state_access_right,model_fleet_vehicle_state,,1,1,1,1
-fleet_vehicle_odometer_access_right,fleet_vehicle_odometer_access_right,model_fleet_vehicle_odometer,,1,1,1,1
-fleet_vehicle_model_brand_access_right,fleet_vehicle_model_brand_access_right,model_fleet_vehicle_model_brand,,1,1,1,1
-fleet_vehicle_access_right,fleet_vehicle_access_right,model_fleet_vehicle,,1,1,1,1
-fleet_vehicle_log_fuel_access_right,fleet_vehicle_log_fuel_access_right,model_fleet_vehicle_log_fuel,,1,1,1,1
-fleet_vehicle_log_services_access_right,fleet_vehicle_log_services_access_right,model_fleet_vehicle_log_services,,1,1,1,1
-fleet_vehicle_log_contract_access_right,fleet_vehicle_log_contract_access_right,model_fleet_vehicle_log_contract,,1,1,1,1
-fleet_service_type_access_right,fleet_service_type_access_right,model_fleet_service_type,,1,1,1,1
-access_fleet_vehicle_cost,access_fleet_vehicle_cost,model_fleet_vehicle_cost,,1,1,1,1
-access_fleet_contract_state,access_fleet_contract_state,model_fleet_contract_state,,1,1,1,1
+fleet_vehicle_model_access_right_user,fleet_vehicle_model_access_right,model_fleet_vehicle_model,group_fleet_user,1,0,0,0
+fleet_vehicle_tag_access_right_user,fleet_vehicle_tag_access_right,model_fleet_vehicle_tag,group_fleet_user,1,0,0,0
+fleet_vehicle_state_access_right_user,fleet_vehicle_state_access_right,model_fleet_vehicle_state,group_fleet_user,1,0,0,0
+fleet_vehicle_model_brand_access_right_user,fleet_vehicle_model_brand_access_right,model_fleet_vehicle_model_brand,group_fleet_user,1,0,0,0
+fleet_vehicle_access_right_user,fleet_vehicle_access_right",model_fleet_vehicle,group_fleet_user,1,1,0,0
+fleet_vehicle_log_services_access_right_user,fleet_vehicle_log_services_access_right,model_fleet_vehicle_log_services,group_fleet_user,1,0,0,0
+fleet_vehicle_log_contract_access_right_user,fleet_vehicle_log_contract_access_right,model_fleet_vehicle_log_contract,group_fleet_user,1,0,0,0
+fleet_service_type_access_right_user,fleet_service_type_access_right,model_fleet_service_type,group_fleet_user,1,0,0,0
+access_fleet_vehicle_cost_user,access_fleet_vehicle_cost,model_fleet_vehicle_cost,group_fleet_user,1,1,1,0
+access_fleet_contract_state_user,access_fleet_contract_state,model_fleet_contract_state,group_fleet_user,1,0,0,0
+fleet_vehicle_model_access_right,fleet_vehicle_model_access_right,model_fleet_vehicle_model,group_fleet_manager,1,1,1,1
+fleet_vehicle_tag_access_right,fleet_vehicle_tag_access_right,model_fleet_vehicle_tag,group_fleet_manager,1,1,1,1
+fleet_vehicle_state_access_right,fleet_vehicle_state_access_right,model_fleet_vehicle_state,group_fleet_manager,1,1,1,1
+fleet_vehicle_odometer_access_right,fleet_vehicle_odometer_access_right,model_fleet_vehicle_odometer,group_fleet_user,1,1,1,1
+fleet_vehicle_model_brand_access_right,fleet_vehicle_model_brand_access_right,model_fleet_vehicle_model_brand,group_fleet_manager,1,1,1,1
+fleet_vehicle_access_right,fleet_vehicle_access_right,model_fleet_vehicle,group_fleet_manager,1,1,1,1
+fleet_vehicle_log_fuel_access_right,fleet_vehicle_log_fuel_access_right,model_fleet_vehicle_log_fuel,group_fleet_user,1,1,1,1
+fleet_vehicle_log_services_access_right,fleet_vehicle_log_services_access_right,model_fleet_vehicle_log_services,group_fleet_manager,1,1,1,1
+fleet_vehicle_log_contract_access_right,fleet_vehicle_log_contract_access_right,model_fleet_vehicle_log_contract,group_fleet_manager,1,1,1,1
+fleet_service_type_access_right,fleet_service_type_access_right,model_fleet_service_type,group_fleet_manager,1,1,1,1
+access_fleet_vehicle_cost,access_fleet_vehicle_cost,model_fleet_vehicle_cost,group_fleet_manager,1,1,1,1
+access_fleet_contract_state,access_fleet_contract_state,model_fleet_contract_state,group_fleet_manager,1,1,1,1
\ No newline at end of file

From 58b44d50824d082aec6ef05742823a8da7a65e14 Mon Sep 17 00:00:00 2001
From: Fabien Meghazi <fme@openerp.com>
Date: Tue, 4 Dec 2012 17:39:48 +0100
Subject: [PATCH 040/110] [IMP] Removed fields_view_get from controllers. Add a
 helper client side.

bzr revid: fme@openerp.com-20121204163948-pctxvy55w34e1pg9
---
 addons/web/controllers/main.py        | 39 ---------------
 addons/web/static/src/js/search.js    |  6 +--
 addons/web/static/src/js/view_tree.js | 14 ++----
 addons/web/static/src/js/views.js     | 71 +++++++++++++++++----------
 4 files changed, 51 insertions(+), 79 deletions(-)

diff --git a/addons/web/controllers/main.py b/addons/web/controllers/main.py
index 3f35b3f44ea..f5710e87218 100644
--- a/addons/web/controllers/main.py
+++ b/addons/web/controllers/main.py
@@ -1121,41 +1121,6 @@ class DataSet(openerpweb.Controller):
 class View(openerpweb.Controller):
     _cp_path = "/web/view"
 
-    def fields_view_get(self, req, model, view_id, view_type,
-                        transform=True, toolbar=False, submenu=False):
-        Model = req.session.model(model)
-        fvg = Model.fields_view_get(view_id, view_type, req.context, toolbar, submenu)
-        # todo fme?: check that we should pass the evaluated context here
-        self.process_view(req.session, fvg, req.context, transform, (view_type == 'kanban'))
-        return fvg
-
-    def process_view(self, session, fvg, context, transform, preserve_whitespaces=False):
-        # depending on how it feels, xmlrpclib.ServerProxy can translate
-        # XML-RPC strings to ``str`` or ``unicode``. ElementTree does not
-        # enjoy unicode strings which can not be trivially converted to
-        # strings, and it blows up during parsing.
-
-        # So ensure we fix this retardation by converting view xml back to
-        # bit strings.
-        if isinstance(fvg['arch'], unicode):
-            arch = fvg['arch'].encode('utf-8')
-        else:
-            arch = fvg['arch']
-        fvg['arch_string'] = arch
-
-        fvg['arch'] = xml2json_from_elementtree(
-            ElementTree.fromstring(arch), preserve_whitespaces)
-
-        if 'id' in fvg['fields']:
-            # Special case for id's
-            id_field = fvg['fields']['id']
-            id_field['original_type'] = id_field['type']
-            id_field['type'] = 'id'
-
-        for field in fvg['fields'].itervalues():
-            for view in field.get("views", {}).itervalues():
-                self.process_view(session, view, None, transform)
-
     @openerpweb.jsonrequest
     def add_custom(self, req, view_id, arch):
         CustomView = req.session.model('ir.ui.view.custom')
@@ -1179,10 +1144,6 @@ class View(openerpweb.Controller):
             return {'result': True}
         return {'result': False}
 
-    @openerpweb.jsonrequest
-    def load(self, req, model, view_id, view_type, toolbar=False):
-        return self.fields_view_get(req, model, view_id, view_type, toolbar=toolbar)
-
 class TreeView(View):
     _cp_path = "/web/treeview"
 
diff --git a/addons/web/static/src/js/search.js b/addons/web/static/src/js/search.js
index 3917f342391..eea8bba726d 100644
--- a/addons/web/static/src/js/search.js
+++ b/addons/web/static/src/js/search.js
@@ -341,12 +341,10 @@ instance.web.SearchView = instance.web.Widget.extend(/** @lends instance.web.Sea
         if (this.headless) {
             this.ready.resolve();
         } else {
-            var load_view = this.rpc("/web/view/load", {
-                model: this.model,
+            var load_view = instance.web.fields_view_get({
+                model: this.dataset._model,
                 view_id: this.view_id,
                 view_type: 'search',
-                context: instance.web.pyeval.eval(
-                    'context', this.dataset.get_context())
             });
 
             $.when(load_view).then(function (r) {
diff --git a/addons/web/static/src/js/view_tree.js b/addons/web/static/src/js/view_tree.js
index 4d08da385fd..a68b92bc33a 100644
--- a/addons/web/static/src/js/view_tree.js
+++ b/addons/web/static/src/js/view_tree.js
@@ -9,6 +9,7 @@ var QWeb = instance.web.qweb,
 instance.web.views.add('tree', 'instance.web.TreeView');
 instance.web.TreeView = instance.web.View.extend(/** @lends instance.web.TreeView# */{
     display_name: _lt('Tree'),
+    view_type: 'tree',
     /**
      * Indicates that this view is not searchable, and thus that no search
      * view should be displayed (if there is one active).
@@ -36,18 +37,9 @@ instance.web.TreeView = instance.web.View.extend(/** @lends instance.web.TreeVie
         this.options = _.extend({}, this.defaults, options || {});
 
         _.bindAll(this, 'color_for');
+        this.on('view_loaded', self, self.load_tree);
     },
 
-    start: function () {
-        return this.rpc("/web/treeview/load", {
-            model: this.model,
-            view_id: this.view_id,
-            view_type: "tree",
-            toolbar: this.view_manager ? !!this.view_manager.sidebar : false,
-            context: instance.web.pyeval.eval(
-                    'context', this.dataset.get_context())
-        }).done(this.on_loaded);
-    },
     /**
      * Returns the list of fields needed to correctly read objects.
      *
@@ -64,7 +56,7 @@ instance.web.TreeView = instance.web.View.extend(/** @lends instance.web.TreeVie
         }
         return fields;
     },
-    on_loaded: function (fields_view) {
+    load_tree: function (fields_view) {
         var self = this;
         var has_toolbar = !!fields_view.arch.attrs.toolbar;
         // field name in OpenERP is kinda stupid: this is the name of the field
diff --git a/addons/web/static/src/js/views.js b/addons/web/static/src/js/views.js
index 939c98015bc..607e8fc7ed8 100644
--- a/addons/web/static/src/js/views.js
+++ b/addons/web/static/src/js/views.js
@@ -1204,13 +1204,11 @@ instance.web.View = instance.web.Widget.extend({
         } else {
             if (! this.view_type)
                 console.warn("view_type is not defined", this);
-            view_loaded = this.rpc("/web/view/load", {
-                "model": this.dataset.model,
+            view_loaded = instance.web.fields_view_get({
+                "model": this.dataset._model,
                 "view_id": this.view_id,
                 "view_type": this.view_type,
-                toolbar: !!this.options.$sidebar,
-                context: instance.web.pyeval.eval(
-                    'context', this.dataset.get_context(context))
+                "toolbar": !!this.options.$sidebar,
             });
         }
         return view_loaded.then(function(r) {
@@ -1385,8 +1383,51 @@ instance.web.View = instance.web.Widget.extend({
     }
 });
 
+/**
+ * Performs a fields_view_get and apply postprocessing.
+ * return a {$.Deferred} resolved with the fvg
+ *
+ * @param {Object} [args]
+ * @param {String|Object} args.model instance.web.Model instance or string repr of the model
+ * @param {null|Object} args.context context if args.model is a string
+ * @param {null|Number} args.view_id id of the view to be loaded, default view if null
+ * @param {null|String} args.view_type type of view to be loaded if view_id is null
+ * @param {Boolean} [args.toolbar=false] get the toolbar definition
+ */
+instance.web.fields_view_get = function(args) {
+    function postprocess(fvg) {
+        fvg.arch_string = fvg.arch;
+        fvg.arch_doc = $.parseXML(fvg.arch);
+        fvg.arch = instance.web.xml_to_json(fvg.arch_doc);
+        if ('id' in fvg.fields) {
+            // Special case for id's
+            var id_field = fvg.fields['id'];
+            id_field.original_type = id_field.type;
+            id_field.type = 'id';
+        }
+        _.each(fvg.fields, function(field) {
+            _.each(field.views || {}, function(view) {
+                postprocess(view);
+            });
+        });
+        return fvg;
+    }
+    args = _.defaults(args, {
+        toolbar: false,
+    });
+    var model = args.model;
+    if (typeof(model) === 'string') {
+        model = new instance.web.Model(args.model, args.context);
+    }
+    return args.model.call('fields_view_get', [args.view_id, args.view_type, model.context(), args.toolbar]).then(function(fvg) {
+        return postprocess(fvg);
+    });
+};
+
 instance.web.xml_to_json = function(node) {
     switch (node.nodeType) {
+        case 9:
+            return instance.web.xml_to_json(node.documentElement);
         case 3:
         case 4:
             return node.data;
@@ -1455,26 +1496,6 @@ instance.web.xml_to_str = function(node) {
         throw new Error(_t("Could not serialize XML"));
     }
 };
-instance.web.str_to_xml = function(s) {
-    if (window.DOMParser) {
-        var dp = new DOMParser();
-        var r = dp.parseFromString(s, "text/xml");
-        if (r.body && r.body.firstChild && r.body.firstChild.nodeName == 'parsererror') {
-            throw new Error(_t("Could not parse string to xml"));
-        }
-        return r;
-    }
-    var xDoc;
-    try {
-        xDoc = new ActiveXObject("MSXML2.DOMDocument");
-    } catch (e) {
-        throw new Error(_.str.sprintf( _t("Could not find a DOM Parser: %s"), e.message));
-    }
-    xDoc.async = false;
-    xDoc.preserveWhiteSpace = true;
-    xDoc.loadXML(s);
-    return xDoc;
-}
 
 /**
  * Registry for all the main views

From c867595eede8608f190e61c37b2467cfc4aa0216 Mon Sep 17 00:00:00 2001
From: Fabien Meghazi <fme@openerp.com>
Date: Tue, 4 Dec 2012 18:02:30 +0100
Subject: [PATCH 041/110] [FIX] Strip whitespace for jsonified fvg.arch

bzr revid: fme@openerp.com-20121204170230-k074c181dt0x920f
---
 addons/web/static/src/js/views.js | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/addons/web/static/src/js/views.js b/addons/web/static/src/js/views.js
index 607e8fc7ed8..b2734525bb5 100644
--- a/addons/web/static/src/js/views.js
+++ b/addons/web/static/src/js/views.js
@@ -1398,7 +1398,7 @@ instance.web.fields_view_get = function(args) {
     function postprocess(fvg) {
         fvg.arch_string = fvg.arch;
         fvg.arch_doc = $.parseXML(fvg.arch);
-        fvg.arch = instance.web.xml_to_json(fvg.arch_doc);
+        fvg.arch = instance.web.xml_to_json(fvg.arch_doc, true);
         if ('id' in fvg.fields) {
             // Special case for id's
             var id_field = fvg.fields['id'];
@@ -1424,14 +1424,13 @@ instance.web.fields_view_get = function(args) {
     });
 };
 
-instance.web.xml_to_json = function(node) {
+instance.web.xml_to_json = function(node, strip_whitespace) {
     switch (node.nodeType) {
         case 9:
-            return instance.web.xml_to_json(node.documentElement);
+            return instance.web.xml_to_json(node.documentElement, strip_whitespace);
         case 3:
         case 4:
-            return node.data;
-        break;
+            return (strip_whitespace && node.data.trim() === '') ? undefined : node.data;
         case 1:
             var attrs = $(node).getAttributes();
             _.each(['domain', 'filter_domain', 'context', 'default_get'], function(key) {
@@ -1444,7 +1443,9 @@ instance.web.xml_to_json = function(node) {
             return {
                 tag: node.tagName.toLowerCase(),
                 attrs: attrs,
-                children: _.map(node.childNodes, instance.web.xml_to_json)
+                children: _.compact(_.map(node.childNodes, function(node) {
+                    return instance.web.xml_to_json(node, strip_whitespace);
+                })),
             }
     }
 }

From 595ba7a79959d66c2c3a819e44770084a1a053e3 Mon Sep 17 00:00:00 2001
From: Fabien Meghazi <fme@openerp.com>
Date: Wed, 5 Dec 2012 10:35:22 +0100
Subject: [PATCH 042/110] [FIX] Remove fvg steps from form view

bzr revid: fme@openerp.com-20121205093522-4mws91b2i14f7j1z
---
 addons/web/static/src/js/view_form.js | 27 +++++----------------------
 1 file changed, 5 insertions(+), 22 deletions(-)

diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js
index 21c3b3f43d9..31fadc789d4 100644
--- a/addons/web/static/src/js/view_form.js
+++ b/addons/web/static/src/js/view_form.js
@@ -1189,36 +1189,19 @@ instance.web.form.FormRenderingEngine = instance.web.form.FormRenderingEngineInt
             });
         }
     },
-    view_arch_to_dom_node: function(arch) {
-        // Historic mess for views arch
-        //
-        // server:
-        //      -> got xml as string
-        //      -> parse to xml and manipulate domains and contexts
-        //      -> convert to json
-        //  client:
-        //      -> got view as json
-        //      -> convert back to xml as string
-        //      -> parse it as xml doc (manipulate button@type for IE)
-        //      -> convert back to string
-        //      -> parse it as dom element with jquery
-        //      -> for each widget, convert node to json
-        //
-        // Wow !!!
-        var xml = instance.web.json_node_to_xml(arch);
-
-        var doc = $.parseXML('<div class="oe_form">' + xml + '</div>');
+    get_arch_fragment: function() {
+        var doc = this.fvg.arch_doc.documentElement.cloneNode(true);
+        // IE won't allow custom button@type and will revert it to spec default : 'submit'
         $('button', doc).each(function() {
             $(this).attr('data-button-type', $(this).attr('type')).attr('type', 'button');
         });
-        xml = instance.web.xml_to_str(doc);
-        return $(xml);
+        return $('<div class="oe_form"/>').append(doc);
     },
     render_to: function($target) {
         var self = this;
         this.$target = $target;
 
-        this.$form = this.view_arch_to_dom_node(this.fvg.arch);
+        this.$form = this.get_arch_fragment();
 
         this.process_version();
 

From 6eb401223a0b0c64a3fecac64fd8aac44ff20c9d Mon Sep 17 00:00:00 2001
From: Arnaud Pineux <api@openerp.com>
Date: Wed, 5 Dec 2012 11:29:19 +0100
Subject: [PATCH 043/110] [FIX] invoice pay customer fixed

bzr revid: api@openerp.com-20121205102919-8mcsv0eos38p85u0
---
 addons/account_voucher/invoice.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/account_voucher/invoice.py b/addons/account_voucher/invoice.py
index 426027f984c..af8405c1ec9 100644
--- a/addons/account_voucher/invoice.py
+++ b/addons/account_voucher/invoice.py
@@ -40,7 +40,7 @@ class invoice(osv.osv):
             'target': 'new',
             'domain': '[]',
             'context': {
-                'default_partner_id': self._find_partner(inv),
+                'default_partner_id': self._find_partner(inv).id,
                 'default_amount': inv.type in ('out_refund', 'in_refund') and -inv.residual or inv.residual,
                 'default_number':inv.name,
                 'close_after_process': True,

From 8d9367a8733e8bf83e0d77fd9aa5cdaf19c93387 Mon Sep 17 00:00:00 2001
From: Fabien Meghazi <fme@openerp.com>
Date: Wed, 5 Dec 2012 11:59:33 +0100
Subject: [PATCH 044/110] [FIX] Do not insert Elements instead of HTMLElements
 in the dom

bzr revid: fme@openerp.com-20121205105933-y3glnms4dnk7k2uz
---
 addons/web/static/src/js/view_form.js | 17 ++++++++++++++++-
 1 file changed, 16 insertions(+), 1 deletion(-)

diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js
index 31fadc789d4..6b6cbb3b58a 100644
--- a/addons/web/static/src/js/view_form.js
+++ b/addons/web/static/src/js/view_form.js
@@ -1190,12 +1190,27 @@ instance.web.form.FormRenderingEngine = instance.web.form.FormRenderingEngineInt
         }
     },
     get_arch_fragment: function() {
+        function removeWhiteSpacesNodes(node) {
+            switch (node.nodeType) {
+                case 3:
+                case 4:
+                    if (node.data.trim() === '') {
+                        node.parentElement.removeChild(node);
+                    }
+                    break;
+                case 1:
+                    for (var i = node.childNodes.length - 1; i >= 0; i--) {
+                        removeWhiteSpacesNodes(node.childNodes[i]);
+                    }
+            }
+        }
         var doc = this.fvg.arch_doc.documentElement.cloneNode(true);
         // IE won't allow custom button@type and will revert it to spec default : 'submit'
         $('button', doc).each(function() {
             $(this).attr('data-button-type', $(this).attr('type')).attr('type', 'button');
         });
-        return $('<div class="oe_form"/>').append(doc);
+        removeWhiteSpacesNodes(doc);
+        return $('<div class="oe_form"/>').append(instance.web.xml_to_str(doc));
     },
     render_to: function($target) {
         var self = this;

From 96d3fbe37b265bbb5ba04957ec3992548947bc3c Mon Sep 17 00:00:00 2001
From: Fabien Meghazi <fme@openerp.com>
Date: Wed, 5 Dec 2012 12:00:39 +0100
Subject: [PATCH 045/110] [IMP] No need to strip whitespaces afterall

bzr revid: fme@openerp.com-20121205110039-o4kt0mpbq2b5zbd2
---
 addons/web/static/src/js/view_form.js | 15 ---------------
 1 file changed, 15 deletions(-)

diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js
index 6b6cbb3b58a..93075a7f7b4 100644
--- a/addons/web/static/src/js/view_form.js
+++ b/addons/web/static/src/js/view_form.js
@@ -1190,26 +1190,11 @@ instance.web.form.FormRenderingEngine = instance.web.form.FormRenderingEngineInt
         }
     },
     get_arch_fragment: function() {
-        function removeWhiteSpacesNodes(node) {
-            switch (node.nodeType) {
-                case 3:
-                case 4:
-                    if (node.data.trim() === '') {
-                        node.parentElement.removeChild(node);
-                    }
-                    break;
-                case 1:
-                    for (var i = node.childNodes.length - 1; i >= 0; i--) {
-                        removeWhiteSpacesNodes(node.childNodes[i]);
-                    }
-            }
-        }
         var doc = this.fvg.arch_doc.documentElement.cloneNode(true);
         // IE won't allow custom button@type and will revert it to spec default : 'submit'
         $('button', doc).each(function() {
             $(this).attr('data-button-type', $(this).attr('type')).attr('type', 'button');
         });
-        removeWhiteSpacesNodes(doc);
         return $('<div class="oe_form"/>').append(instance.web.xml_to_str(doc));
     },
     render_to: function($target) {

From 0c3f9f691b36143bd0efd2f7f683c2a35b76ad09 Mon Sep 17 00:00:00 2001
From: Antony Lesuisse <al@openerp.com>
Date: Wed, 5 Dec 2012 13:42:18 +0100
Subject: [PATCH 046/110] [FIX] chrome template use a template url for the
 logo, needed for demo

bzr revid: al@openerp.com-20121205124218-0qdvqed5td9mh84k
---
 addons/web/static/src/js/chrome.js | 1 -
 addons/web/static/src/xml/base.xml | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/addons/web/static/src/js/chrome.js b/addons/web/static/src/js/chrome.js
index cc7b267c78c..5783afb987a 100644
--- a/addons/web/static/src/js/chrome.js
+++ b/addons/web/static/src/js/chrome.js
@@ -1106,7 +1106,6 @@ instance.web.WebClient = instance.web.Client.extend({
     start: function() {
         var self = this;
         return $.when(this._super()).then(function() {
-            self.$(".oe_logo").attr("href", $.param.fragment("" + window.location, "", 2).slice(0, -1));
             if (jQuery.param !== undefined && jQuery.deparam(jQuery.param.querystring()).kitten !== undefined) {
                 $("body").addClass("kitten-mode-activated");
                 if ($.blockUI) {
diff --git a/addons/web/static/src/xml/base.xml b/addons/web/static/src/xml/base.xml
index 65c96d05323..c272e1f8eb4 100644
--- a/addons/web/static/src/xml/base.xml
+++ b/addons/web/static/src/xml/base.xml
@@ -436,7 +436,7 @@
         </tr>
         <tr>
             <td class="oe_leftbar" valign="top">
-                <a class="oe_logo" href="#"><img t-att-src='_s + "/web/static/src/img/logo.png"'/></a>
+                <a class="oe_logo" t-attf-href="/?ts=#{Date.now()}"><img t-att-src='_s + "/web/static/src/img/logo.png"'/></a>
                 <div class="oe_secondary_menus_container"/>
                 <div class="oe_footer">
                     Powered by <a href="http://www.openerp.com" target="_blank"><span>OpenERP</span></a>

From 4a020ad4d882795411a682f676a83ce6dc6d40cb Mon Sep 17 00:00:00 2001
From: "vta vta@openerp.com" <>
Date: Wed, 5 Dec 2012 14:17:23 +0100
Subject: [PATCH 047/110] [FIX] Bug
 https://bugs.launchpad.net/openobject-addons/+bug/1085787.

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

bzr revid: vta@openerp.com-20121205131723-si0uxh66zop09o7f
---
 addons/hr/hr.py | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/addons/hr/hr.py b/addons/hr/hr.py
index 5f3a5653307..ca165b7e8eb 100644
--- a/addons/hr/hr.py
+++ b/addons/hr/hr.py
@@ -222,15 +222,10 @@ class hr_employee(osv.osv):
         return employee_id
 
     def unlink(self, cr, uid, ids, context=None):
-        resource_obj = self.pool.get('resource.resource')
         resource_ids = []
         for employee in self.browse(cr, uid, ids, context=context):
-            resource = employee.resource_id
-            if resource:
-                resource_ids.append(resource.id)
-        if resource_ids:
-            resource_obj.unlink(cr, uid, resource_ids, context=context)
-        return super(hr_employee, self).unlink(cr, uid, ids, context=context)
+            resource_ids.append(employee.resource_id.id)
+        return self.pool.get('resource.resource').unlink(cr, uid, resource_ids, context=context)
 
     def onchange_address_id(self, cr, uid, ids, address, context=None):
         if address:

From 5122dab978f99566e54b080554d340ed7f8559c0 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Wed, 5 Dec 2012 14:28:54 +0100
Subject: [PATCH 048/110] [ADD] bit o' tutorial for web modules

bzr revid: xmo@openerp.com-20121205132854-j0r8qgh5u2qwlqj1
---
 addons/web/doc/module.rst                     | 281 ++++++++++++++++++
 addons/web/doc/module/__init__.py             |   0
 addons/web/doc/module/__openerp__.py          |   7 +
 addons/web/doc/module/__openerp__.py.1.diff   |  11 +
 addons/web/doc/module/__openerp__.py.2.diff   |  11 +
 addons/web/doc/module/__openerp__.py.3.diff   |  12 +
 addons/web/doc/module/__openerp__.py.4.diff   |  13 +
 addons/web/doc/module/__openerp__.py.5.diff   |  14 +
 .../doc/module/static/src/css/web_example.css |   6 +
 .../static/src/css/web_example.css.1.diff     |  17 ++
 .../doc/module/static/src/js/first_module.js  |   2 +
 .../static/src/js/first_module.js.1.diff      |   8 +
 .../static/src/js/first_module.js.2.diff      |  11 +
 .../static/src/js/first_module.js.3.diff      |  18 ++
 .../static/src/js/first_module.js.4.diff      |  15 +
 .../static/src/js/first_module.js.5.diff      |  23 ++
 .../static/src/js/first_module.js.6.diff      |  55 ++++
 .../doc/module/static/src/xml/web_example.xml |  11 +
 addons/web/doc/module/web_example.xml         |  11 +
 addons/web/doc/widget.rst                     |   2 +
 20 files changed, 528 insertions(+)
 create mode 100644 addons/web/doc/module.rst
 create mode 100644 addons/web/doc/module/__init__.py
 create mode 100644 addons/web/doc/module/__openerp__.py
 create mode 100644 addons/web/doc/module/__openerp__.py.1.diff
 create mode 100644 addons/web/doc/module/__openerp__.py.2.diff
 create mode 100644 addons/web/doc/module/__openerp__.py.3.diff
 create mode 100644 addons/web/doc/module/__openerp__.py.4.diff
 create mode 100644 addons/web/doc/module/__openerp__.py.5.diff
 create mode 100644 addons/web/doc/module/static/src/css/web_example.css
 create mode 100644 addons/web/doc/module/static/src/css/web_example.css.1.diff
 create mode 100644 addons/web/doc/module/static/src/js/first_module.js
 create mode 100644 addons/web/doc/module/static/src/js/first_module.js.1.diff
 create mode 100644 addons/web/doc/module/static/src/js/first_module.js.2.diff
 create mode 100644 addons/web/doc/module/static/src/js/first_module.js.3.diff
 create mode 100644 addons/web/doc/module/static/src/js/first_module.js.4.diff
 create mode 100644 addons/web/doc/module/static/src/js/first_module.js.5.diff
 create mode 100644 addons/web/doc/module/static/src/js/first_module.js.6.diff
 create mode 100644 addons/web/doc/module/static/src/xml/web_example.xml
 create mode 100644 addons/web/doc/module/web_example.xml

diff --git a/addons/web/doc/module.rst b/addons/web/doc/module.rst
new file mode 100644
index 00000000000..1bdb7c14799
--- /dev/null
+++ b/addons/web/doc/module.rst
@@ -0,0 +1,281 @@
+Building an OpenERP Web module
+==============================
+
+There is no significant distinction between an OpenERP Web module and
+an OpenERP module, the web part is mostly additional data and code
+inside a regular OpenERP module. This allows providing more seamless
+features by integrating your module deeper into the web client.
+
+A Basic Module
+--------------
+
+A very basic OpenERP module structure will be our starting point:
+
+.. code-block:: text
+
+    web_example
+    ├── __init__.py
+    └── __openerp__.py
+
+.. literalinclude:: module/__openerp__.py
+    :language: python
+
+This is a sufficient minimal declaration of a valid OpenERP module.
+
+Web Declaration
+---------------
+
+There is no such thing as a "web module" declaration. An OpenERP
+module is automatically recognized as "web-enabled" if it contains a
+``static`` directory at its root, so:
+
+.. code-block:: text
+
+    web_example
+    ├── __init__.py
+    ├── __openerp__.py
+    └── static
+
+is the extent of it. You should also change the dependency to list
+``web``:
+
+.. literalinclude:: module/__openerp__.py.1.diff
+    :language: diff
+
+.. note::
+
+    This does not matter in normal operation so you may not realize
+    it's wrong (the web module does the loading of everything else, so
+    it can only be loaded), but when e.g. testing the loading process
+    is slightly different than normal, and incorrect dependency may
+    lead to broken code.
+
+This makes the "web" discovery system consider the module as having a
+"web part", and check if it has web controllers to mount or javascript
+files to load. The content of the ``static/`` folder is also
+automatically made available to web browser at the URL
+``$module-name/static/$file-path``. This is sufficient to provide
+pictures (of cats, usually) through your module. However there are
+still a few more steps to running javascript code.
+
+Getting Things Done
+-------------------
+
+The first one is to add javascript code. It's customary to put it in
+``static/src/js``, to have room for e.g. other file types, or
+third-party libraries.
+
+.. literalinclude:: module/static/src/js/first_module.js
+    :language: javascript
+
+The client won't load any file unless specified, thus the new file
+should be listed in the module's manifest file, under a new key ``js``
+(a list of file names, or glob patterns):
+
+.. literalinclude:: module/__openerp__.py.2.diff
+    :language: diff
+
+At this point, if the module is installed and the client reloaded the
+message should appear in your browser's development console.
+
+.. note::
+
+    Because the manifest file has been edited, you will have to
+    restart the OpenERP server itself for it to be taken in account.
+
+    You may also want to open your browser's console *before*
+    reloading, depending on the browser messages printed while the
+    console is closed may not work or may not appear after opening it.
+
+.. note::
+
+    If the message does not appear, try cleaning your browser's caches
+    and ensure the file is correctly loaded from the server logs or
+    the "resources" tab of your browser's developers tools.
+
+At this point the code runs, but it runs only once when the module is
+initialized, and it can't get access to the various APIs of the web
+client (such as making RPC requests to the server). This is done by
+providing a `javascript module`_:
+
+.. literalinclude:: module/static/src/js/first_module.js.1.diff
+    :language: diff
+
+If you reload the client, you'll see a message in the console exactly
+as previously. The differences, though invisible at this point, are:
+
+* All javascript files specified in the manifest (only this one so
+  far) have been fully loaded
+* An instance of the web client and a namespace inside that instance
+  (with the same name as the module) have been created and are
+  available for use
+
+The latter point is what the ``instance`` parameter to the function
+provides: an instance of the OpenERP Web client, with the contents of
+all the new module's dependencies loaded in and initialized. These are
+the entry points to the web client's APIs.
+
+To demonstrate, let's build a simple :doc:`client action
+<client_action>`: a stopwatch
+
+First, the action declaration:
+
+.. literalinclude:: module/__openerp__.py.3.diff
+    :language: diff
+
+.. literalinclude:: module/web_example.xml
+    :language: xml
+
+then set up the :doc:`client action hook <client_action>` to register
+a function (for now):
+
+.. literalinclude:: module/static/src/js/first_module.js.2.diff
+    :language: diff
+
+Updating the module (in order to load the XML description) and
+re-starting the server should display a new menu *Example Client
+Action* at the top-level. Opening said menu will make the message
+appear, as usual, in the browser's console.
+
+Paint it black
+--------------
+
+The next step is to take control of the page itself, rather than just
+print little messages in the console. This we can do by replacing our
+client action function by a :doc:`widget`. Our widget will simply use
+its :js:func:`~openerp.web.Widget.start` to add some content to its
+DOM:
+
+.. literalinclude:: module/static/src/js/first_module.js.3.diff
+    :language: diff
+
+after reloading the client (to update the javascript file), instead of
+printing to the console the menu item clears the whole screen and
+displays the specified message in the page.
+
+Since we've added a class on the widget's :ref:`DOM root
+<widget-dom_root>` we can now see how to add a stylesheet to a module:
+first create the stylesheet file:
+
+.. literalinclude:: module/static/src/css/web_example.css
+    :language: css
+
+then add a reference to the stylesheet in the module's manifest (which
+will require restarting the OpenERP Server to see the changes, as
+usual):
+
+.. literalinclude:: module/__openerp__.py.4.diff
+    :language: diff
+
+the text displayed by the menu item should now be huge, and
+white-on-black (instead of small and black-on-white). From there on,
+the world's your canvas.
+
+.. note::
+
+    Prefixing CSS rules with both ``.openerp`` (to ensure the rule
+    will apply only within the confines of the OpenERP Web client) and
+    a class at the root of your own hierarchy of widgets is strongly
+    recommended to avoid "leaking" styles in case the code is running
+    embedded in an other web page, and does not have the whole screen
+    to itself.
+
+So far we haven't built much (any, really) DOM content. It could all
+be done in :js:func:`~openerp.web.Widget.start` but that gets unwieldy
+and hard to maintain fast. It is also very difficult to extend by
+third parties (trying to add or change things in your widgets) unless
+broken up into multiple methods which each perform a little bit of the
+rendering.
+
+The first way to handle this method is to delegate the content to
+plenty of sub-widgets, which can be individually overridden. An other
+method [#DOM-building]_ is to use `a template
+<http://en.wikipedia.org/wiki/Web_template>`_ to render a widget's
+DOM.
+
+OpenERP Web's template language is :doc:`qweb`. Although any
+templating engine can be used (e.g. `mustache
+<http://mustache.github.com/>`_ or `_.template
+<http://underscorejs.org/#template>`_) QWeb has important features
+which other template engines may not provide, and has special
+integration to OpenERP Web widgets.
+
+Adding a template file is similar to adding a style sheet:
+
+.. literalinclude:: module/static/src/xml/web_example.xml
+    :language: xml
+
+.. literalinclude:: module/__openerp__.py.5.diff
+    :language: diff
+
+The template can then easily be hooked in the widget:
+
+.. literalinclude:: module/static/src/js/first_module.js.4.diff
+    :language: diff
+
+And finally the CSS can be altered to style the new (and more complex)
+template-generated DOM, rather than the code-generated one:
+
+.. literalinclude:: module/static/src/css/web_example.css.1.diff
+    :language: diff
+
+.. note::
+
+    The last section of the CSS change is an example of "state
+    classes": a CSS class (or set of classes) on the root of the
+    widget, which is toggled when the state of the widget changes and
+    can perform drastic alterations in rendering (usually
+    showing/hiding various elements).
+
+    This pattern is both fairly simple (to read and understand) and
+    efficient (because most of the hard work is pushed to the
+    browser's CSS engine, which is usually highly optimized, and done
+    in a single repaint after toggling the class).
+
+The last step (until the next one) is to add some behavior and make
+our stopwatch watch. First hook some events on the buttons to toggle
+the widget's state:
+
+.. literalinclude:: module/static/src/js/first_module.js.5.diff
+    :language: diff
+
+This demonstrates the use of the "events hash" and event delegation to
+declaratively handle events on the widget's DOM. And already changes
+the button displayed in the UI. Then comes some actual logic:
+
+.. literalinclude:: module/static/src/js/first_module.js.6.diff
+    :language: diff
+
+* An initializer (the ``init`` method) is introduced to set-up a few
+  internal variables: ``_start`` will hold the start of the timer (as
+  a javascript Date object), and ``_watch`` will hold a ticker to
+  update the interface regularly and display the "current time".
+
+* ``update_counter`` is in charge of taking the time difference
+  between "now" and ``_start``, formatting as ``HH:MM:SS`` and
+  displaying the result on screen.
+
+* ``watch_start`` is augmented to initialize ``_start`` with its value
+  and set-up the update of the counter display every 33ms.
+
+* ``watch_stop`` disables the updater, does a final update of the
+  counter display and resets everything.
+
+* Finally, because javascript Interval and Timeout objects execute
+  "outside" the widget, they will keep going even after the widget has
+  been destroyed (especially an issue with intervals as they repeat
+  indefinitely). So ``_watch`` *must* be cleared when the widget is
+  destroyed (then the ``_super`` must be called as well in order to
+  perform the "normal" widget cleanup).
+
+Starting and stopping the watch now works, and correctly tracks time
+since having started the watch, neatly formatted.
+
+.. [#DOM-building] they are not alternative solutions: they work very
+                   well together. Templates are used to build "just
+                   DOM", sub-widgets are used to build DOM subsections
+                   *and* delegate part of the behavior (e.g. events
+                   handling).
+
+.. _javascript module:
+    http://addyosmani.com/resources/essentialjsdesignpatterns/book/#modulepatternjavascript
diff --git a/addons/web/doc/module/__init__.py b/addons/web/doc/module/__init__.py
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/addons/web/doc/module/__openerp__.py b/addons/web/doc/module/__openerp__.py
new file mode 100644
index 00000000000..d8c23c34f10
--- /dev/null
+++ b/addons/web/doc/module/__openerp__.py
@@ -0,0 +1,7 @@
+# __openerp__.py
+{
+    'name': "Web Example",
+    'description': "Basic example of a (future) web module",
+    'category': 'Hidden',
+    'depends': ['base'],
+}
diff --git a/addons/web/doc/module/__openerp__.py.1.diff b/addons/web/doc/module/__openerp__.py.1.diff
new file mode 100644
index 00000000000..dbab2e65437
--- /dev/null
+++ b/addons/web/doc/module/__openerp__.py.1.diff
@@ -0,0 +1,11 @@
+--- web_example/__openerp__.py
++++ web_example/__openerp__.py
+@@ -1,7 +1,7 @@
+ # __openerp__.py
+ {
+     'name': "Web Example",
+     'description': "Basic example of a (future) web module",
+     'category': 'Hidden',
+-    'depends': ['base'],
++    'depends': ['web'],
+ }
diff --git a/addons/web/doc/module/__openerp__.py.2.diff b/addons/web/doc/module/__openerp__.py.2.diff
new file mode 100644
index 00000000000..77025f11512
--- /dev/null
+++ b/addons/web/doc/module/__openerp__.py.2.diff
@@ -0,0 +1,11 @@
+--- web_example/__openerp__.py
++++ web_example/__openerp__.py
+@@ -1,7 +1,8 @@
+ # __openerp__.py
+ {
+     'name': "Web Example",
+     'description': "Basic example of a (future) web module",
+     'category': 'Hidden',
+     'depends': ['web'],
++    'js': ['static/src/js/first_module.js'],
+ }
diff --git a/addons/web/doc/module/__openerp__.py.3.diff b/addons/web/doc/module/__openerp__.py.3.diff
new file mode 100644
index 00000000000..e100098bce9
--- /dev/null
+++ b/addons/web/doc/module/__openerp__.py.3.diff
@@ -0,0 +1,12 @@
+--- web_example/__openerp__.py
++++ web_example/__openerp__.py
+@@ -1,8 +1,9 @@
+ # __openerp__.py
+ {
+     'name': "Web Example",
+     'description': "Basic example of a (future) web module",
+     'category': 'Hidden',
+     'depends': ['web'],
++    'data': ['web_example.xml'],
+     'js': ['static/src/js/first_module.js'],
+ }
diff --git a/addons/web/doc/module/__openerp__.py.4.diff b/addons/web/doc/module/__openerp__.py.4.diff
new file mode 100644
index 00000000000..78fc90c4b1c
--- /dev/null
+++ b/addons/web/doc/module/__openerp__.py.4.diff
@@ -0,0 +1,13 @@
+--- web_example/__openerp__.py
++++ web_example/__openerp__.py
+@@ -1,9 +1,10 @@
+ # __openerp__.py
+ {
+     'name': "Web Example",
+     'description': "Basic example of a (future) web module",
+     'category': 'Hidden',
+     'depends': ['web'],
+     'data': ['web_example.xml'],
+     'js': ['static/src/js/first_module.js'],
++    'css': ['static/src/css/web_example.css'],
+ }
diff --git a/addons/web/doc/module/__openerp__.py.5.diff b/addons/web/doc/module/__openerp__.py.5.diff
new file mode 100644
index 00000000000..c9492420ee8
--- /dev/null
+++ b/addons/web/doc/module/__openerp__.py.5.diff
@@ -0,0 +1,14 @@
+--- web_example/__openerp__.py
++++ web_example/__openerp__.py
+@@ -1,10 +1,11 @@
+ # __openerp__.py
+ {
+     'name': "Web Example",
+     'description': "Basic example of a (future) web module",
+     'category': 'Hidden',
+     'depends': ['web'],
+     'data': ['web_example.xml'],
+     'js': ['static/src/js/first_module.js'],
+     'css': ['static/src/css/web_example.css'],
++    'qweb': ['static/src/xml/web_example.xml'],
+ }
diff --git a/addons/web/doc/module/static/src/css/web_example.css b/addons/web/doc/module/static/src/css/web_example.css
new file mode 100644
index 00000000000..b861af8d517
--- /dev/null
+++ b/addons/web/doc/module/static/src/css/web_example.css
@@ -0,0 +1,6 @@
+.openerp .oe_web_example {
+    color: white;
+    background-color: black;
+    height: 100%;
+    font-size: 400%;
+}
diff --git a/addons/web/doc/module/static/src/css/web_example.css.1.diff b/addons/web/doc/module/static/src/css/web_example.css.1.diff
new file mode 100644
index 00000000000..442211a252b
--- /dev/null
+++ b/addons/web/doc/module/static/src/css/web_example.css.1.diff
@@ -0,0 +1,17 @@
+--- web_example/static/src/css/web_example.css
++++ web_example/static/src/css/web_example.css
+@@ -1,6 +1,13 @@
+ .openerp .oe_web_example {
+     color: white;
+     background-color: black;
+     height: 100%;
+-    font-size: 400%;
+ }
++.openerp .oe_web_example h4 {
++    margin: 0;
++    font-size: 200%;
++}
++.openerp .oe_web_example.oe_web_example_started .oe_web_example_start button,
++.openerp .oe_web_example.oe_web_example_stopped .oe_web_example_stop button {
++    display: none
++}
diff --git a/addons/web/doc/module/static/src/js/first_module.js b/addons/web/doc/module/static/src/js/first_module.js
new file mode 100644
index 00000000000..74580d1c0ca
--- /dev/null
+++ b/addons/web/doc/module/static/src/js/first_module.js
@@ -0,0 +1,2 @@
+// static/src/js/first_module.js
+console.log("Debug statement: file loaded");
diff --git a/addons/web/doc/module/static/src/js/first_module.js.1.diff b/addons/web/doc/module/static/src/js/first_module.js.1.diff
new file mode 100644
index 00000000000..53c153e1971
--- /dev/null
+++ b/addons/web/doc/module/static/src/js/first_module.js.1.diff
@@ -0,0 +1,8 @@
+--- web_example/static/src/js/first_module.js
++++ web_example/static/src/js/first_module.js
+@@ -1,2 +1,4 @@
+ // static/src/js/first_module.js
+-console.log("Debug statement: file loaded");
++openerp.web_example = function (instance) {
++    console.log("Module loaded");
++};
diff --git a/addons/web/doc/module/static/src/js/first_module.js.2.diff b/addons/web/doc/module/static/src/js/first_module.js.2.diff
new file mode 100644
index 00000000000..88a80f50fff
--- /dev/null
+++ b/addons/web/doc/module/static/src/js/first_module.js.2.diff
@@ -0,0 +1,11 @@
+--- web_example/static/src/js/first_module.js
++++ web_example/static/src/js/first_module.js
+@@ -1,4 +1,7 @@
+ // static/src/js/first_module.js
+ openerp.web_example = function (instance) {
+-    console.log("Module loaded");
++    instance.web.client_actions.add('example.action', 'instance.web_example.action');
++    instance.web_example.action = function (parent, action) {
++        console.log("Executed the action", action);
++    };
+ };
diff --git a/addons/web/doc/module/static/src/js/first_module.js.3.diff b/addons/web/doc/module/static/src/js/first_module.js.3.diff
new file mode 100644
index 00000000000..295e90b6840
--- /dev/null
+++ b/addons/web/doc/module/static/src/js/first_module.js.3.diff
@@ -0,0 +1,18 @@
+--- web_example/static/src/js/first_module.js
++++ web_example/static/src/js/first_module.js
+@@ -1,7 +1,11 @@
+ // static/src/js/first_module.js
+ openerp.web_example = function (instance) {
+-    instance.web.client_actions.add('example.action', 'instance.web_example.action');
+-    instance.web_example.action = function (parent, action) {
+-        console.log("Executed the action", action);
+-    };
++    instance.web.client_actions.add('example.action', 'instance.web_example.Action');
++    instance.web_example.Action = instance.web.Widget.extend({
++        className: 'oe_web_example',
++        start: function () {
++            this.$el.text("Hello, world!");
++            return this._super();
++        }
++    });
+ };
diff --git a/addons/web/doc/module/static/src/js/first_module.js.4.diff b/addons/web/doc/module/static/src/js/first_module.js.4.diff
new file mode 100644
index 00000000000..78a192147e6
--- /dev/null
+++ b/addons/web/doc/module/static/src/js/first_module.js.4.diff
@@ -0,0 +1,15 @@
+--- web_example/static/src/js/first_module.js
++++ web_example/static/src/js/first_module.js
+@@ -1,11 +1,7 @@
+ // static/src/js/first_module.js
+ openerp.web_example = function (instance) {
+     instance.web.client_actions.add('example.action', 'instance.web_example.Action');
+     instance.web_example.Action = instance.web.Widget.extend({
++        template: 'web_example.action'
+-        className: 'oe_web_example',
+-        start: function () {
+-            this.$el.text("Hello, world!");
+-            return this._super();
+-        }
+     });
+ };
diff --git a/addons/web/doc/module/static/src/js/first_module.js.5.diff b/addons/web/doc/module/static/src/js/first_module.js.5.diff
new file mode 100644
index 00000000000..f345ea319ef
--- /dev/null
+++ b/addons/web/doc/module/static/src/js/first_module.js.5.diff
@@ -0,0 +1,23 @@
+--- web_example/static/src/js/first_module.js
++++ web_example/static/src/js/first_module.js
+@@ -1,7 +1,19 @@
+ // static/src/js/first_module.js
+ openerp.web_example = function (instance) {
+     instance.web.client_actions.add('example.action', 'instance.web_example.Action');
+     instance.web_example.Action = instance.web.Widget.extend({
+-        template: 'web_example.action'
++        template: 'web_example.action',
++        events: {
++            'click .oe_web_example_start button': 'watch_start',
++            'click .oe_web_example_stop button': 'watch_stop'
++        },
++        watch_start: function () {
++            this.$el.addClass('oe_web_example_started')
++                    .removeClass('oe_web_example_stopped');
++        },
++        watch_stop: function () {
++            this.$el.removeClass('oe_web_example_started')
++                    .addClass('oe_web_example_stopped');
++        },
+     });
+ };
diff --git a/addons/web/doc/module/static/src/js/first_module.js.6.diff b/addons/web/doc/module/static/src/js/first_module.js.6.diff
new file mode 100644
index 00000000000..7dd17af0e18
--- /dev/null
+++ b/addons/web/doc/module/static/src/js/first_module.js.6.diff
@@ -0,0 +1,55 @@
+--- web_example/static/src/js/first_module.js
++++ web_example/static/src/js/first_module.js
+@@ -1,19 +1,52 @@
+ // static/src/js/first_module.js
+ openerp.web_example = function (instance) {
+     instance.web.client_actions.add('example.action', 'instance.web_example.Action');
+     instance.web_example.Action = instance.web.Widget.extend({
+         template: 'web_example.action',
+         events: {
+             'click .oe_web_example_start button': 'watch_start',
+             'click .oe_web_example_stop button': 'watch_stop'
+         },
++        init: function () {
++            this._super.apply(this, arguments);
++            this._start = null;
++            this._watch = null;
++        },
++        update_counter: function () {
++            var h, m, s;
++            // Subtracting javascript dates returns the difference in milliseconds
++            var diff = new Date() - this._start;
++            s = diff / 1000;
++            m = Math.floor(s / 60);
++            s -= 60*m;
++            h = Math.floor(m / 60);
++            m -= 60*h;
++            this.$('.oe_web_example_timer').text(
++                _.str.sprintf("%02d:%02d:%02d", h, m, s));
++        },
+         watch_start: function () {
+             this.$el.addClass('oe_web_example_started')
+                     .removeClass('oe_web_example_stopped');
++            this._start = new Date();
++            // Update the UI to the current time
++            this.update_counter();
++            // Update the counter at 30 FPS (33ms/frame)
++            this._watch = setInterval(
++                this.proxy('update_counter'),
++                33);
+         },
+         watch_stop: function () {
++            clearInterval(this._watch);
++            this.update_counter();
++            this._start = this._watch = null;
+             this.$el.removeClass('oe_web_example_started')
+                     .addClass('oe_web_example_stopped');
+         },
++        destroy: function () {
++            if (this._watch) {
++                clearInterval(this._watch);
++            }
++            this._super();
++        }
+     });
+ };
diff --git a/addons/web/doc/module/static/src/xml/web_example.xml b/addons/web/doc/module/static/src/xml/web_example.xml
new file mode 100644
index 00000000000..b5a9918f2f0
--- /dev/null
+++ b/addons/web/doc/module/static/src/xml/web_example.xml
@@ -0,0 +1,11 @@
+<templates>
+<div t-name="web_example.action" class="oe_web_example oe_web_example_stopped">
+    <h4 class="oe_web_example_timer">00:00:00</h4>
+    <p class="oe_web_example_start">
+        <button type="button">Start</button>
+    </p>
+    <p class="oe_web_example_stop">
+        <button type="button">Stop</button>
+    </p>
+</div>
+</templates>
diff --git a/addons/web/doc/module/web_example.xml b/addons/web/doc/module/web_example.xml
new file mode 100644
index 00000000000..dfcc1614df4
--- /dev/null
+++ b/addons/web/doc/module/web_example.xml
@@ -0,0 +1,11 @@
+<!-- web_example/web_example.xml -->
+<openerp>
+    <data>
+        <record model="ir.actions.client" id="action_client_example">
+            <field name="name">Example Client Action</field>
+            <field name="tag">example.action</field>
+        </record>
+        <menuitem action="action_client_example"
+                  id="menu_client_example"/>
+    </data>
+</openerp>
diff --git a/addons/web/doc/widget.rst b/addons/web/doc/widget.rst
index 7466ebaf3e8..1ebc0848e88 100644
--- a/addons/web/doc/widget.rst
+++ b/addons/web/doc/widget.rst
@@ -33,6 +33,8 @@ view. It provides a number of services to handle a section of a page:
 
 * Backbone-compatible shortcuts
 
+.. _widget-dom_root:
+
 DOM Root
 --------
 

From f9d8d746e250ce030bf99e1ede920ac094b3ca2a Mon Sep 17 00:00:00 2001
From: Christophe Simonis <chs@openerp.com>
Date: Wed, 5 Dec 2012 15:11:06 +0100
Subject: [PATCH 049/110] [FIX] netsvc.py: ignore ENOTCONN on windows when
 calling shutdown() on sockets

bzr revid: chs@openerp.com-20121205141106-0oynmc3qdvy58owu
---
 openerp/netsvc.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/openerp/netsvc.py b/openerp/netsvc.py
index e2e435a746f..e9b130979e7 100644
--- a/openerp/netsvc.py
+++ b/openerp/netsvc.py
@@ -54,7 +54,7 @@ def close_socket(sock):
         # of the other side (or something), see
         # http://bugs.python.org/issue4397
         # note: stdlib fixed test, not behavior
-        if e.errno != errno.ENOTCONN or platform.system() != 'Darwin':
+        if e.errno != errno.ENOTCONN or platform.system() not in ['Darwin', 'Windows']:
             raise
     sock.close()
 

From 12404525b10f497a6369670abf4d7c532909ef7f Mon Sep 17 00:00:00 2001
From: Christophe Matthieu <chm@openerp.com>
Date: Wed, 5 Dec 2012 15:25:23 +0100
Subject: [PATCH 050/110] [FIX] mail: on_scroll activate expandable message,
 reverse order of messages for the root thread.

bzr revid: chm@openerp.com-20121205142523-3xl8go4stwitwkep
---
 addons/mail/static/src/js/mail.js | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/addons/mail/static/src/js/mail.js b/addons/mail/static/src/js/mail.js
index d1faaff264c..82534d713a3 100644
--- a/addons/mail/static/src/js/mail.js
+++ b/addons/mail/static/src/js/mail.js
@@ -672,8 +672,11 @@ openerp.mail = function (session) {
 
             // read messages
             self.parent_thread.message_fetch(this.domain, this.context, false, function (arg, data) {
-                // insert the message on dom after this message
+                if (self.options.root_thread == self.parent_thread) {
+                    data.reverse();
+                }
                 self.id = false;
+                // insert the message on dom after this message
                 self.parent_thread.switch_new_message( data, self.$el );
                 self.animated_destroy(200);
             });
@@ -1011,8 +1014,6 @@ openerp.mail = function (session) {
                     var bottom = $(window).scrollTop()+$(window).height()+200;
                     if (bottom > pos.top) {
                         val.on_expandable();
-                        // load only one time
-                        val.loading = true;
                     }
                 }
             });

From 8dbee5c4735b381490ee51a66d7cbbbd31ea3f22 Mon Sep 17 00:00:00 2001
From: Christophe Simonis <chs@openerp.com>
Date: Wed, 5 Dec 2012 15:32:22 +0100
Subject: [PATCH 051/110] [FIX] service/__init__.py: do not join() main thread

bzr revid: chs@openerp.com-20121205143222-vrasdnzhdtdr307c
---
 openerp/service/__init__.py | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/openerp/service/__init__.py b/openerp/service/__init__.py
index 491af631202..26740ec363b 100644
--- a/openerp/service/__init__.py
+++ b/openerp/service/__init__.py
@@ -1,8 +1,9 @@
 # -*- coding: utf-8 -*-
 ##############################################################################
-#    
+#
 #    OpenERP, Open Source Management Solution
 #    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    Copyright (C) 2010-2012 OpenERP SA (<http://www.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
@@ -15,7 +16,7 @@
 #    GNU Affero General Public License for more details.
 #
 #    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.     
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
 
@@ -23,10 +24,8 @@ import logging
 import threading
 import time
 
-import http_server
 import netrpc_server
 import web_services
-import websrv_lib
 
 import openerp.cron
 import openerp.modules
@@ -61,6 +60,7 @@ Maybe you forgot to add those addons in your addons_path configuration."""
             _logger.exception('Failed to load server-wide module `%s`.%s', m, msg)
 
 start_internal_done = False
+main_thread_id = threading.currentThread().ident
 
 def start_internal():
     global start_internal_done
@@ -99,7 +99,6 @@ def stop_services():
 
     openerp.netsvc.Server.quitAll()
     openerp.service.wsgi_server.stop_server()
-    config = openerp.tools.config
     _logger.info("Initiating shutdown")
     _logger.info("Hit CTRL-C again or send a second signal to force the shutdown.")
     logging.shutdown()
@@ -107,8 +106,9 @@ def stop_services():
     # Manually join() all threads before calling sys.exit() to allow a second signal
     # to trigger _force_quit() in case some non-daemon threads won't exit cleanly.
     # threading.Thread.join() should not mask signals (at least in python 2.5).
+    me = threading.currentThread()
     for thread in threading.enumerate():
-        if thread != threading.currentThread() and not thread.isDaemon():
+        if thread != me and not thread.isDaemon() and thread.ident != main_thread_id:
             while thread.isAlive():
                 # Need a busyloop here as thread.join() masks signals
                 # and would prevent the forced shutdown.
@@ -119,10 +119,9 @@ def stop_services():
 
 def start_services_workers():
     import openerp.service.workers
-    openerp.multi_process = True # Nah!
+    openerp.multi_process = True
 
     openerp.service.workers.Multicorn(openerp.service.wsgi_server.application).run()
 
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
-

From b838e677ddafd8a1f7c609a2d2dd948f7593c795 Mon Sep 17 00:00:00 2001
From: Josse Colpaert <jco@openerp.com>
Date: Wed, 5 Dec 2012 15:41:47 +0100
Subject: [PATCH 052/110] [IMP] review odo, marc, fp

bzr revid: jco@openerp.com-20121205144147-ii9hwp3omvet68t0
---
 addons/account_followup/account_followup.py   | 154 ++++++++++++-
 .../account_followup_customers.xml            |  38 +---
 .../account_followup_data.xml                 | 211 ++++--------------
 .../account_followup_demo.xml                 |   4 +-
 .../account_followup_view.xml                 |  22 +-
 .../report/account_followup_print.py          |  38 +++-
 6 files changed, 244 insertions(+), 223 deletions(-)

diff --git a/addons/account_followup/account_followup.py b/addons/account_followup/account_followup.py
index 3a09707c4b3..8b6af6cf269 100644
--- a/addons/account_followup/account_followup.py
+++ b/addons/account_followup/account_followup.py
@@ -21,6 +21,7 @@
 
 from osv import fields, osv
 from lxml import etree
+from operator import itemgetter
 
 from tools.translate import _
 
@@ -118,13 +119,54 @@ class account_move_line(osv.osv):
 class email_template(osv.osv):
     _inherit = 'email.template'
 
+    def _get_followup_table_html(self, cr, uid, res_id, context = None):
+        #res_id -> res.partner
+        partner = self.pool.get('res.partner').browse(cr, uid, res_id, context=context)
+        followup_table = ''
+        if partner.unreconciled_aml_ids: 
+            company = self.pool.get('res.users').browse(cr, uid, uid, context=context).company_id
+            current_date = fields.date.context_today(cr, uid, context)
+            from report import account_followup_print
+            rml_parse = account_followup_print.report_rappel(cr, uid, "followup_rml_parser")
+            final_res = rml_parse._lines_get_with_partner(partner, company.id)
+            
+            for currency_dict in final_res:
+                currency_symbol = currency_dict.get('line', [{'currency_id': company.currency_id}])[0]['currency_id'].symbol
+                followup_table += '''
+                <table border="2" width=100%%>
+                <tr>
+                    <td>Invoice date</td>
+                    <td>Reference</td>
+                    <td>Due date</td>
+                    <td>Amount (%s)</td>
+                    <td>Lit.</td>
+                </tr>
+                ''' % (currency_symbol)
+                total = 0
+                for aml in currency_dict['line']:
+                    block = aml['blocked'] and 'X' or ' '
+                    total += aml['balance']
+                    strbegin = "<TD>"
+                    strend = "</TD>"
+                    date = aml['date_maturity'] or aml['date']
+                    if date <= current_date and aml['balance'] > 0:
+                        strbegin = "<TD><B>"
+                        strend = "</B></TD>"
+                    followup_table +="<TR>" + strbegin + str(aml['date']) + strend + strbegin + aml['ref'] + strend + strbegin + str(date) + strend + strbegin + str(aml['balance']) + strend + strbegin + block + strend + "</TR>"
+                total = rml_parse.formatLang(total, dp='Account', currency_obj=partner.company_id.currency_id)
+                followup_table += '''<tr> </tr>
+                                </table>
+                                <center>Amount due: %s </center>''' % (total)
+        return followup_table
+
     # Adds current_date to the context.  That way it can be used to put
     # the account move lines in bold that are overdue in the email
     def render_template(self, cr, uid, template, model, res_id, context=None):
         context['current_date'] = fields.date.context_today(cr, uid, context)
+        if model == 'res.partner': # and 'followup' in context.keys() and context['followup']:
+            context['followup_table'] = self._get_followup_table_html(cr, uid, res_id, context=context)
         return super(email_template, self).render_template(cr, uid, template, model, res_id, context=context)
 
-
 class res_partner(osv.osv):
 
     def fields_view_get(self, cr, uid, view_id=None, view_type=None, context=None, toolbar=False, submenu=False):
@@ -138,7 +180,11 @@ class res_partner(osv.osv):
             root.insert(0, first_node[0])
             res['arch'] = etree.tostring(doc, encoding="utf-8")
         return res
-
+    
+#    def search(self, cr, user, args, offset=0, limit=None, order=None, context=None, count=False, access_rights_uid=None):
+#        if order and order[0] == '':
+#        pass
+    
     def _get_latest(self, cr, uid, ids, names, arg, context=None, company_id=None):
         res={}
         if company_id == None:
@@ -172,6 +218,7 @@ class res_partner(osv.osv):
         for partner in self.browse(cr, uid, partner_ids, context=context):
             #Check action: check if the action was not empty, if not add
             action_text= ""
+            context['followup'] = True
             if partner.payment_next_action:
                 action_text = (partner.payment_next_action or '') + "\n" + (partner.latest_followup_level_id_without_lit.manual_action_note or '')
             else:
@@ -256,6 +303,95 @@ class res_partner(osv.osv):
         }
 
 
+    def _get_amounts_and_date(self, cr, uid, ids, name, arg, context=None, company_id=None):
+        res = {}
+        if company_id == None:
+            company = self.pool.get('res.users').browse(cr, uid, uid, context=context).company_id
+        else:
+            company = self.pool.get('res.company').browse(cr, uid, company_id, context=context)
+        current_date = fields.date.context_today(cr, uid, context)
+        for partner in self.browse(cr, uid, ids, context=context):
+            res[partner.id] = [0.0, 0.0, False]
+            calc_date = False
+            amount_due = 0.0
+            amount_overdue = 0.0
+            for aml in partner.unreconciled_aml_ids:
+                if (aml.company_id == company):
+                    date_maturity = (not aml.date_maturity) and aml.date or aml.date_maturity
+                    if (not calc_date or calc_date > date_maturity): 
+                        calc_date = date_maturity
+                    amount_due += aml.result
+                    if (date_maturity <= current_date):
+                        amount_overdue += aml.result
+            res[partner.id] = {'payment_amount_due': amount_due, 
+                               'payment_amount_overdue': amount_overdue, 
+                               'payment_earliest_due_date': calc_date}
+        return res
+    
+    
+    def _search_unreconciled(self, cr, uid, obj, name, args, field, context=None):
+        pass
+    
+    def _payment_overdue_search(self, cr, uid, obj, name, args, context=None):
+        company = self.pool.get('res.users').browse(cr, uid, uid, context=context).company_id.id
+        if not args:
+                return []
+        having_values = tuple(map(itemgetter(2), args))
+        where = ' AND '.join(
+            map(lambda x: '(SUM(bal2) %(operator)s %%s)' % {
+                                'operator':x[1]},args))
+        query = self.pool.get('account.move.line')._query_get(cr, uid, context=context)
+        cr.execute(('SELECT pid AS partner_id, SUM(bal2) FROM ' \
+                    '(SELECT CASE WHEN bal IS NOT NULL THEN bal ' \
+                    'ELSE 0.0 END AS bal2, p.id as pid ' \
+                    ' FROM ' \
+                    '(SELECT (debit-credit) AS bal, partner_id ' \
+                    'FROM account_move_line l ' \
+                    'WHERE account_id IN ' \
+                            '(SELECT id FROM account_account '\
+                            'WHERE type=\'receivable\' AND active) ' \
+                    'AND date_maturity <= NOW() ' \
+                    'AND l.company_id = %s '
+                    'AND reconcile_id IS NULL ' \
+                    'AND '+query+') AS l ' \
+                    'RIGHT JOIN res_partner p ' \
+                    'ON p.id = partner_id ) AS pl ' \
+                    'GROUP BY pid HAVING ' + where), 
+                     (str(company),) + having_values)
+        res = cr.fetchall()
+        if not res:
+            return [('id','=','0')]
+        return [('id','in',map(itemgetter(0), res))]
+    
+    def _payment_due_search(self, cr, uid, obj, name, args, context=None):
+        company = self.pool.get('res.users').browse(cr, uid, uid, context=context).company_id.id
+        if not args:
+                return []
+        having_values = tuple(map(itemgetter(2), args))
+        where = ' AND '.join(
+            map(lambda x: '(SUM(bal2) %(operator)s %%s)' % {
+                                'operator':x[1]},args))
+        query = self.pool.get('account.move.line')._query_get(cr, uid, context=context)
+        cr.execute(('SELECT pid AS partner_id, SUM(bal2) FROM ' \
+                    '(SELECT CASE WHEN bal IS NOT NULL THEN bal ' \
+                    'ELSE 0.0 END AS bal2, p.id as pid FROM ' \
+                    '(SELECT (debit-credit) AS bal, partner_id ' \
+                    'FROM account_move_line l ' \
+                    'WHERE account_id IN ' \
+                            '(SELECT id FROM account_account '\
+                            'WHERE type=\'receivable\' AND active) ' \
+                    'AND reconcile_id IS NULL ' \
+                    'AND company_id = %s'
+                    'AND '+query+') AS l ' \
+                    'RIGHT JOIN res_partner p ' \
+                    'ON p.id = partner_id ) AS pl ' \
+                    'GROUP BY pid HAVING ' + where), (str(company),) + having_values)
+        res = cr.fetchall()
+        if not res:
+            return [('id','=','0')]
+        return [('id','in',map(itemgetter(0), res))]
+        
+        
     _inherit = "res.partner"
     _columns = {
         'payment_responsible_id':fields.many2one('res.users', ondelete='set null', string='Follow-up Responsible', 
@@ -281,7 +417,19 @@ class res_partner(osv.osv):
             help="The maximum follow-up level without taking into account the account move lines with litigation", 
             store=False, 
             multi="latest"),
-        'payment_amount_due':fields.related('credit', type='float', string="Total amount due", readonly=True),
+        'payment_amount_due':fields.function(_get_amounts_and_date, method = True, 
+                                                 type='float', string="Amount due",
+                                                 store = False, multi="amountsdate", 
+                                                 fnct_search=_payment_due_search),
+        'payment_amount_overdue':fields.function(_get_amounts_and_date, method = True, 
+                                                 type='float', string="Amount overdue",
+                                                 store = False, multi="amountsdate", 
+                                                 fnct_search = _payment_overdue_search),
+        'payment_earliest_due_date':fields.function(_get_amounts_and_date, method=True, 
+                                                    type='date',
+                                                    string = "Most overdue date",
+                                                    multi="amountsdate", 
+                                                    ),
         }
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/account_followup/account_followup_customers.xml b/addons/account_followup/account_followup_customers.xml
index df703773303..129232f475e 100644
--- a/addons/account_followup/account_followup_customers.xml
+++ b/addons/account_followup/account_followup_customers.xml
@@ -16,7 +16,9 @@
                     <field name="user_id" invisible="1"/>
                     <field name="parent_id" invisible="1"/>
                     <field name="payment_responsible_id"/>
-                    <field name="credit"/>
+                    <field name="payment_earliest_due_date"/>
+                    <field name="payment_amount_overdue"/>
+                    <field name="payment_amount_due"/>
                 </tree>
             </field>
         </record>
@@ -28,7 +30,7 @@
             <field name="arch" type="xml">
                 <search string="Search Partner" position="inside">
                     <group string="Follow-up">
-                        <filter string="Partners with Credits" domain="[('credit', '>', 0.0)]" name="credits"/>
+                        <filter string="Partners with Overdue Credits" domain="[('payment_amount_overdue', '>', 0.0)]" name="credits"/>
                         <separator/>
                         <filter string="Follow-ups To Do" domain="[('payment_next_action_date', '&lt;=', time.strftime('%%Y-%%m-%%d')), ('credit', '>', 0.0)]" name="todo"/>
                         <filter string="Future Follow-ups" domain="[('payment_next_action_date', '&gt;', time.strftime('%%Y-%%m-%%d')), ('credit', '>', 0.0)]"/>
@@ -43,29 +45,7 @@
             </field>
         </record>
 
-        <record id="customer_followup_search_view2" model="ir.ui.view">
-            <field name="name">Search</field>
-            <field name="model">res.partner</field>
-            <field name="arch" type="xml">
-                <search string="Search view">
-                    <field name="name"/>
-                    <field name="payment_next_action"/>
-                    <!--<filter string="Actions to be taken with overdue amount" domain="['&amp;', ('payment_amount_outstanding', '>', 0.0), ('payment_next_action_date', '&lt;=', time.strftime('%%Y-%%m-%%d'))]"/>
-                    <separator/>-->
-                    <filter string="Overdue amount" domain="[('credit', '>', 0.0)]"/>
-                    <separator/>
-                    <filter string="Follow-ups to do" domain="[('payment_next_action_date', '&lt;=', time.strftime('%%Y-%%m-%%d'))]"/>
-                    <separator/>
-                    <!--filter string="Future follow-ups" domain="['&', ('payment_next_action', '!=', ''), ('payment_next_action_date', '>', time.strftime('%%Y-%%m-%%d'))]"/>-->
-                    <separator/>
-                    <filter string="Without responsible" domain="[('payment_responsible_id', '=', False)]"/>
-                    <filter string="I am responsible" domain="[('payment_responsible_id','=', uid)]"/>
-                    <group expand="1" string="Group by">
-                        <filter string="Responsible" context="{'group_by':'payment_responsible_id'}"/>
-                    </group>
-                </search>
-            </field>
-        </record>
+
 
         <record id="action_customer_followup" model="ir.actions.act_window">
             <field name="name">Manual Follow-Ups</field>
@@ -73,7 +53,7 @@
             <field name="res_model">res.partner</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
-            <field name="context">{} </field>
+            <field name="domain">[('credit', '>', 0.0)]</field> 
             <field name="context">{'Followupfirst':True, 'search_default_todo': True} </field>
             <field name="search_view_id" ref="customer_followup_search_view"/>
         </record>
@@ -105,11 +85,11 @@
                                      help="Click to mark the action as done." class="oe_link"
                                      attrs="{'invisible':[('payment_next_action_date','=', False)]}"
                                      groups="base.group_partner_manager"/>
-                                <field name="payment_next_action" placeholder="e.g. Give a phonecall, Check if it's paid, ..."/>
+                                <field name="payment_next_action" placeholder="Action to be taken e.g. Give a phonecall, Check if it's paid, ..."/>
                             </div>
                         </group>
                         <label for="payment_note" class="oe_edit_only"/>
-                        <field name="payment_note" placeholder="e.g. 50%% before 15th of May, balance before 1st of July."/>
+                        <field name="payment_note" placeholder="Comments of the user: he promised to 50%% before 15th of May, balance before 1st of July."/>
                         <p class="oe_grey">
                             Below is the history of the transactions of this
                             customer. You can set an invoice in litigation in
@@ -119,12 +99,14 @@
                         <field name="unreconciled_aml_ids">
                             <tree string="Account Move line" editable="bottom" create="false" delete="false" colors="red:(not date_maturity or date_maturity&lt;=current_date) and result&gt;0">
                                 <field name="date" readonly="True"/>
+                                <field name="company_id" groups="base.group_multi_company"/>
                                 <field name="move_id" readonly="True"/>
                                 <field name="blocked" string="Litigation"/>
                                 <field name="date_maturity" readonly="True"/>
                                 <field name="reconcile_partial_id" readonly="True"/>
                                 <field name="result" readonly="True"/>
                                 <field name="followup_line_id" invisible='1'/>
+                                
                             </tree>
                         </field>
                         <group class="oe_subtotal_footer oe_right">
diff --git a/addons/account_followup/account_followup_data.xml b/addons/account_followup/account_followup_data.xml
index ce2df1d03d6..c4a2e2188f4 100644
--- a/addons/account_followup/account_followup_data.xml
+++ b/addons/account_followup/account_followup_data.xml
@@ -6,68 +6,40 @@
 <!--Mail template level 0-->
 		 <record id="email_template_account_followup_level0" model="email.template">
             <field name="name">Follow-up of overdue invoices level 0</field>
-            <field name="email_from">${user.email or ''}</field>
-            <field name="subject">${user.company_id.name} Payment Follow-up</field>
-            <field name="email_to">${object.email}</field>
-            <field name="lang">${object.lang}</field>
+            <field name="email_from">${user.email or '' | h}</field>
+            <field name="subject">${user.company_id.name | h} Payment Reminder</field>
+            <field name="email_to">${object.email | h}</field>
+            <field name="lang">${object.lang | h}</field>
             <field name="model_id" ref="base.model_res_partner"/>
             <field name="auto_delete" eval="True"/>
             <field name="body_html"><![CDATA[
 <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); ">
 
-    <p>Dear ${object.name},</p>
+    <p>Dear ${object.name | h},</p>
     <p>
     Exception made if there was a mistake of ours, it seems that the following amount stays unpaid. Please, take
 appropriate measures in order to carry out this payment in the next 8 days.
 
 Would your payment have been carried out after this mail was sent, please ignore this message. Do not hesitate to
-contact our accounting department at (+32).10.68.94.39.
+contact our accounting department.  
 
     </p>
 <br/>
 Best Regards,
 
    <br/>
-${user.name}
+${user.name | h}
 
 <br/>
 <br/>
+
 <%
     from openerp.addons.account_followup.report import account_followup_print
     rml_parse = account_followup_print.report_rappel(object._cr, user.id, "followup_rml_parser")
-    final_res = rml_parse._lines_get_with_partner(object, user.company_id.id)
-    followup_table = ''
-    for currency_dict in final_res:
-        currency_symbol = currency_dict.get('line', [{'currency_id': user.company_id.currency_id}])[0]['currency_id'].symbol
-        followup_table += '''
-        <table border="2" width=100%%>
-        <tr>
-            <td>Invoice date</td>
-            <td>Reference</td>
-            <td>Due date</td>
-            <td>Amount (%s)</td>
-            <td>Lit.</td>
-        </tr>
-        ''' % (currency_symbol)
-        total = 0
-        for aml in currency_dict['line']:
-            block = aml['blocked'] and 'X' or ' '
-            total += aml['balance']
-            strbegin = "<TD> "
-            strend = "</TD> "
-            date = aml['date_maturity'] or aml['date']
-            if date <= ctx['current_date'] and aml['balance'] > 0:
-                strbegin = "<TD><B>"
-                strend = "</B></TD>"
-            followup_table +="<TR>" + strbegin + str(aml['date']) + strend + strbegin + aml['ref'] + strend + strbegin + str(date) + strend + strbegin + str(aml['balance']) + strend + strbegin + block + strend + "</TR>"
-        total = rml_parse.formatLang(total, dp='Account', currency_obj=object.company_id.currency_id)
-        followup_table += '''<tr> </tr>
-                        </table>
-                        <center>Amount due: %s </center>''' % (total)
-
+    followup_table = rml_parse.get_unreconciled_table(object, user.company_id, ctx)
 %>
 
-${followup_table}
+${followup_table | h}
 
     <br/>
 
@@ -80,71 +52,41 @@ ${followup_table}
 		<!--Mail template level 1 -->
 		 <record id="email_template_account_followup_level1" model="email.template">
             <field name="name">Follow-up of overdue invoices level 1</field>
-            <field name="email_from">${user.email or ''}</field>
-            <field name="subject">${user.company_id.name} Payment Follow-up</field>
-            <field name="email_to">${object.email}</field>
-            <field name="lang">${object.lang}</field>
+            <field name="email_from">${user.email or '' | h}</field>
+            <field name="subject">${user.company_id.name | h} Payment Reminder</field>
+            <field name="email_to">${object.email | h}</field>
+            <field name="lang">${object.lang | h}</field>
             <field name="model_id" ref="base.model_res_partner"/>
             <field name="auto_delete" eval="True"/>
             <field name="body_html"><![CDATA[
 <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); ">
     
-    <p>Dear ${object.name},</p>
+    <p>Dear ${object.name | h},</p>
    <p>
    	We are disappointed to see that despite sending a reminder, that your account is now seriously overdue.
 It is essential that immediate payment is made, otherwise we will have to consider placing a stop on your account
 which means that we will no longer be able to supply your company with (goods/services).
 Please, take appropriate measures in order to carry out this payment in the next 8 days.
 If there is a problem with paying invoice that we are not aware of, do not hesitate to contact our accounting
-department at (+32).10.68.94.39. so that we can resolve the matter quickly.
+department. so that we can resolve the matter quickly.
 Details of due payments is printed below.
  </p>
 <br/>
 Best Regards,
     
 <br/>
-${user.name}
+${user.name | h}
     
 <br/>
 <br/>
 
-   
 <%
     from openerp.addons.account_followup.report import account_followup_print
     rml_parse = account_followup_print.report_rappel(object._cr, user.id, "followup_rml_parser")
-    final_res = rml_parse._lines_get_with_partner(object, user.company_id.id)
-    followup_table = ''
-    for currency_dict in final_res:
-        currency_symbol = currency_dict.get('line', [{'currency_id': user.company_id.currency_id}])[0]['currency_id'].symbol
-        followup_table += '''
-        <table border="2" width=100%%>
-        <tr>
-            <td>Invoice date</td>
-            <td>Reference</td>
-            <td>Due date</td>
-            <td>Amount (%s)</td>
-            <td>Lit.</td>
-        </tr>
-        ''' % (currency_symbol)
-        total = 0
-        for aml in currency_dict['line']:
-            block = aml['blocked'] and 'X' or ' '
-            total += aml['balance']
-            strbegin = "<TD> "
-            strend = "</TD> "
-            date = aml['date_maturity'] or aml['date']
-            if date <= ctx['current_date'] and aml['balance'] > 0:
-                strbegin = "<TD><B>"
-                strend = "</B></TD>"
-            followup_table +="<TR>" + strbegin + str(aml['date']) + strend + strbegin + aml['ref'] + strend + strbegin + str(date) + strend + strbegin + str(aml['balance']) + strend + strbegin + block + strend + "</TR>"
-        total = rml_parse.formatLang(total, dp='Account', currency_obj=object.company_id.currency_id)
-        followup_table += '''<tr> </tr>
-                        </table>
-                        <center>Amount due: %s </center>''' % (total)
-
+    followup_table = rml_parse.get_unreconciled_table(object, user.company_id, ctx)
 %>
 
-${followup_table}
+${followup_table | h}
 
     <br/>
 
@@ -154,70 +96,38 @@ ${followup_table}
         <!--Email template -->
         <record id="email_template_account_followup_level2" model="email.template">
             <field name="name">Follow-up of overdue invoices level 2</field>
-            <field name="email_from">${user.email or ''}</field>
-            <field name="subject">${user.company_id.name} Payment Follow-up</field>
-            <field name="email_to">${object.email}</field>
-            <field name="lang">${object.lang}</field>
+            <field name="email_from">${user.email or '' | h}</field>
+            <field name="subject">${user.company_id.name | h} Payment Reminder</field>
+            <field name="email_to">${object.email | h}</field>
+            <field name="lang">${object.lang | h}</field>
             <field name="model_id" ref="base.model_res_partner"/>
             <field name="auto_delete" eval="True"/>
             <field name="body_html"><![CDATA[
 <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); ">
     
-    <p>Dear ${object.name},</p>
+    <p>Dear ${object.name | h},</p>
     <p>
     Despite several reminders, your account is still not settled.
 Unless full payment is made in next 8 days, legal action for the recovery of the debt will be taken without
 further notice.
 I trust that this action will prove unnecessary and details of due payments is printed below.
-In case of any queries concerning this matter, do not hesitate to contact our accounting department at (+32).10.68.94.39.
+In case of any queries concerning this matter, do not hesitate to contact our accounting department.
 </p>
 <br/>
 Best Regards,
-    
 <br/>
-${user.name}
-    
+${user.name | h}
 <br/>
 <br/>
 
-    
 
 <%
     from openerp.addons.account_followup.report import account_followup_print
     rml_parse = account_followup_print.report_rappel(object._cr, user.id, "followup_rml_parser")
-    final_res = rml_parse._lines_get_with_partner(object, user.company_id.id)
-    followup_table = ''
-    for currency_dict in final_res:
-        currency_symbol = currency_dict.get('line', [{'currency_id': user.company_id.currency_id}])[0]['currency_id'].symbol
-        followup_table += '''
-        <table border="2" width=100%%>
-        <tr>
-            <td>Invoice date</td>
-            <td>Reference</td>
-            <td>Due date</td>
-            <td>Amount (%s)</td>
-            <td>Lit.</td>
-        </tr>
-        ''' % (currency_symbol)
-        total = 0
-        for aml in currency_dict['line']:
-            block = aml['blocked'] and 'X' or ' '
-            total += aml['balance']
-            strbegin = "<TD> "
-            strend = "</TD> "
-            date = aml['date_maturity'] or aml['date']
-            if date <= ctx['current_date'] and aml['balance'] > 0:
-                strbegin = "<TD><B>"
-                strend = "</B></TD>"
-            followup_table +="<TR>" + strbegin + str(aml['date']) + strend + strbegin + aml['ref'] + strend + strbegin + str(date) + strend + strbegin + str(aml['balance']) + strend + strbegin + block + strend + "</TR>"
-        total = rml_parse.formatLang(total, dp='Account', currency_obj=object.company_id.currency_id)
-        followup_table += '''<tr> </tr>
-                        </table>
-                        <center>Amount due: %s </center>''' % (total)
-
+    followup_table = rml_parse.get_unreconciled_table(object, user.company_id, ctx)
 %>
 
-${followup_table}
+${object.followup_table(object, user) | h}
 
     <br/>
 
@@ -229,80 +139,43 @@ ${followup_table}
         
 		 <record id="email_template_account_followup_default" model="email.template">
             <field name="name">Default follow-up of overdue invoices</field>
-            <field name="email_from">${user.email or ''}</field>
-            <field name="subject">${user.company_id.name} Payment Follow-up</field>
-            <field name="email_to">${object.email}</field>
-            <field name="lang">${object.lang}</field>
+            <field name="email_from">${user.email or '' | h}</field>
+            <field name="subject">${user.company_id.name | h} Payment Reminder</field>
+            <field name="email_to">${object.email | h}</field>
+            <field name="lang">${object.lang | h}</field>
             <field name="model_id" ref="base.model_res_partner"/>
             <field name="auto_delete" eval="True"/>
             <field name="body_html"><![CDATA[
 <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); ">
     
-    <p>Dear ${object.name},</p>
+    <p>Dear ${object.name | h},</p>
     <p>
     Exception made if there was a mistake of ours, it seems that the following amount stays unpaid. Please, take
 appropriate measures in order to carry out this payment in the next 8 days.
 Would your payment have been carried out after this mail was sent, please ignore this message. Do not hesitate to
-contact our accounting department at (+32).10.68.94.39.
+contact our accounting department.
     </p>
 <br/>
 Best Regards,
 </br>
 </br>
 <br/>
-${user.name}
-    
+${user.name | h}
 <br/>
 <br/>
 
-   
-
 <%
     from openerp.addons.account_followup.report import account_followup_print
     rml_parse = account_followup_print.report_rappel(object._cr, user.id, "followup_rml_parser")
-    final_res = rml_parse._lines_get_with_partner(object, user.company_id.id)
-    followup_table = ''
-    for currency_dict in final_res:
-        currency_symbol = currency_dict.get('line', [{'currency_id': user.company_id.currency_id}])[0]['currency_id'].symbol
-        followup_table += '''
-        <table border="2" width=100%%>
-        <tr>
-            <td>Invoice date</td>
-            <td>Reference</td>
-            <td>Due date</td>
-            <td>Amount (%s)</td>
-            <td>Lit.</td>
-        </tr>
-        ''' % (currency_symbol)
-        total = 0
-        for aml in currency_dict['line']:
-            block = aml['blocked'] and 'X' or ' '
-            total += aml['balance']
-            strbegin = "<TD> "
-            strend = "</TD> "
-            date = aml['date_maturity'] or aml['date']
-            if date <= ctx['current_date'] and aml['balance'] > 0:
-                strbegin = "<TD><B>"
-                strend = "</B></TD>"
-            followup_table +="<TR>" + strbegin + str(aml['date']) + strend + strbegin + aml['ref'] + strend + strbegin + str(date) + strend + strbegin + str(aml['balance']) + strend + strbegin + block + strend + "</TR>"
-        total = rml_parse.formatLang(total, dp='Account', currency_obj=object.company_id.currency_id)
-        followup_table += '''<tr> </tr>
-                        </table>
-                        <center>Amount due: %s </center>''' % (total)
-
+    followup_table = rml_parse.get_unreconciled_table(object, user.company_id, ctx)
 %>
 
-${followup_table}
-
-    <br/>
+${followup_table | h}
 
+<br/>
 </div>
             ]]></field>
         </record>
-        
-        
-        
-          
 
         <record id="demo_followup1" model="account_followup.followup">
             <field name="company_id" ref="base.main_company"/>
@@ -319,7 +192,7 @@ Dear %(partner_name)s,
 
 Exception made if there was a mistake of ours, it seems that the following amount stays unpaid. Please, take appropriate measures in order to carry out this payment in the next 8 days.
 
-Would your payment have been carried out after this mail was sent, please ignore this message. Do not hesitate to contact our accounting department at (+32).10.68.94.39.
+Would your payment have been carried out after this mail was sent, please ignore this message. Do not hesitate to contact our accounting department.  
 
 Best Regards,
 </field>
@@ -342,15 +215,13 @@ We are disappointed to see that despite sending a reminder, that your account is
 It is essential that immediate payment is made, otherwise we will have to consider placing a stop on your account which means that we will no longer be able to supply your company with (goods/services).
 Please, take appropriate measures in order to carry out this payment in the next 8 days.
 
-If there is a problem with paying invoice that we are not aware of, do not hesitate to contact our accounting department at (+32).10.68.94.39. so that we can resolve the matter quickly.
+If there is a problem with paying invoice that we are not aware of, do not hesitate to contact our accounting department, so that we can resolve the matter quickly.
 
 Details of due payments is printed below.
 
 Best Regards,
         </field>
         </record>
-        
-        
         <record id="demo_followup_line3" model="account_followup.followup.line">
             <field name="name">Call the customer on the phone</field>
             <field name="sequence">3</field>
@@ -369,7 +240,7 @@ Unless full payment is made in next 8 days, then legal action for the recovery o
 
 I trust that this action will prove unnecessary and details of due payments is printed below.
 
-In case of any queries concerning this matter, do not hesitate to contact our accounting department at (+32).10.68.94.39.
+In case of any queries concerning this matter, do not hesitate to contact our accounting department.
 
 Best Regards,
         </field>
diff --git a/addons/account_followup/account_followup_demo.xml b/addons/account_followup/account_followup_demo.xml
index 4f22c18857d..053d611fc08 100644
--- a/addons/account_followup/account_followup_demo.xml
+++ b/addons/account_followup/account_followup_demo.xml
@@ -17,7 +17,7 @@ Unless full payment is made in next 8 days, then legal action for the recovery o
 
 I trust that this action will prove unnecessary and details of due payments is printed below.
 
-In case of any queries concerning this matter, do not hesitate to contact our accounting department at (+32).10.68.94.39.
+In case of any queries concerning this matter, do not hesitate to contact our accounting department at [TEL NUMBER].
 
 Best Regards,
             </field>
@@ -39,7 +39,7 @@ Unless full payment is made in next 8 days, then legal action for the recovery o
 
 I trust that this action will prove unnecessary and details of due payments is printed below.
 
-In case of any queries concerning this matter, do not hesitate to contact our accounting department at (+32).10.68.94.39.
+In case of any queries concerning this matter, do not hesitate to contact our accounting department at [TEL NUMBER].
 
 Best Regards,
             </field>
diff --git a/addons/account_followup/account_followup_view.xml b/addons/account_followup/account_followup_view.xml
index 1df87feac76..c1b79d20369 100644
--- a/addons/account_followup/account_followup_view.xml
+++ b/addons/account_followup/account_followup_view.xml
@@ -69,7 +69,6 @@
         <record id="view_account_followup_followup_form" model="ir.ui.view">
             <field name="name">account_followup.followup.form</field>
             <field name="model">account_followup.followup</field>
-           <!-- <field name="group_ids" groups="base.group_multi_company"/>-->
             <field name="arch" type="xml">
                 <form string="Follow-up" version="7.0">
                     <h1><field name="company_id" widget="selection" class="oe_inline"/></h1>
@@ -79,7 +78,7 @@
                         overdue the customer is. These actions are bundled
                         into folow-up levels that are triggered when the due
                         date of the most overdue invoice has passed a certain
-                        amount of days.
+                        number of days.
                     </p>
                     <field name="followup_line"/>
                 </form>
@@ -91,7 +90,7 @@
             <field name="model">account_followup.followup</field>
             <field name="arch" type="xml">
                 <tree string="Follow-up">
-                    <field name="company_id" /> <!--groups="base.group_multi_company"-->
+                    <field name="company_id" />
                 </tree>
             </field>
         </record>
@@ -168,7 +167,7 @@
                 </tree>
             </field>
         </record>
-
+<!--
         <record id="view_move_line_form" model="ir.ui.view">
             <field name="name">account.move.line.form.followup</field>
             <field name="model">account.move.line</field>
@@ -179,19 +178,6 @@
                     <field name="followup_date"/>
                 </field>
             </field>
-        </record>
-
-        <!-- <record id="view_move_line_tree" model="ir.ui.view">
-            <field name="name">account.move.line.tree.followup</field>
-            <field name="model">account.move.line</field>
-            <field name="inherit_id" ref="account.view_move_line_tree"/>
-            <field name="arch" type="xml">
-                <field name="state" position="before">
-                    <field name="followup_date"/>
-                    <field name="followup_line_id"/>
-                </field>
-            </field>
-        </record> -->
-
+        </record>-->
     </data>
 </openerp>
diff --git a/addons/account_followup/report/account_followup_print.py b/addons/account_followup/report/account_followup_print.py
index 90dd5969d53..2b70f46142c 100644
--- a/addons/account_followup/report/account_followup_print.py
+++ b/addons/account_followup/report/account_followup_print.py
@@ -23,8 +23,10 @@ import time
 
 import pooler
 from report import report_sxw
+from osv import fields
 
 class report_rappel(report_sxw.rml_parse):
+    _name = "account_followup.report.rappel"
     def __init__(self, cr, uid, name, context=None):
         super(report_rappel, self).__init__(cr, uid, name, context=context)
         self.localcontext.update({
@@ -79,7 +81,40 @@ class report_rappel(report_sxw.rml_parse):
                 final_res.append({'line': line_cur[cur]['line']})
         return final_res
 
-
+    def get_unreconciled_table(self, partner, company, context = None):
+        final_res = self._lines_get_with_partner(partner, company.id)
+        followup_table = ''
+        for currency_dict in final_res:
+            currency_symbol = currency_dict.get('line', [{'currency_id': company.currency_id}])[0]['currency_id'].symbol
+            followup_table += '''
+            <table border="2" width=100%%>
+            <tr>
+                <td>Invoice date</td>
+                <td>Reference</td>
+                <td>Due date</td>
+                <td>Amount (%s)</td>
+                <td>Lit.</td>
+            </tr>
+            ''' % (currency_symbol)
+            total = 0
+            ctx = context
+            for aml in currency_dict['line']:
+                block = aml['blocked'] and 'X' or ' '
+                total += aml['balance']
+                strbegin = "<TD>"
+                strend = "</TD>"
+                date = aml['date_maturity'] or aml['date']
+                if date <= ctx['current_date'] and aml['balance'] > 0:
+                    strbegin = "<TD><B>"
+                    strend = "</B></TD>"
+                followup_table +="<TR>" + strbegin + str(aml['date']) + strend + strbegin + aml['ref'] + strend + strbegin + str(date) + strend + strbegin + str(aml['balance']) + strend + strbegin + block + strend + "</TR>"
+            total = self.formatLang(total, dp='Account', currency_obj=partner.company_id.currency_id)
+            followup_table += '''<tr> </tr>
+                            </table>
+                            <center>Amount due: %s </center>''' % (total)
+        return followup_table
+    
+    
     def _get_text(self, stat_line, followup_id, context=None):
         if context is None:
             context = {}
@@ -108,7 +143,6 @@ class report_rappel(report_sxw.rml_parse):
                 'company_name': stat_line.company_id.name,
                 'user_signature': pooler.get_pool(self.cr.dbname).get('res.users').browse(self.cr, self.uid, self.uid, context).signature or '',
             }
-
         return text
 
 report_sxw.report_sxw('report.account_followup.followup.print',

From b4dbebadf6f335195a6c0eef335c4d9b810d66a8 Mon Sep 17 00:00:00 2001
From: Arnaud Pineux <api@openerp.com>
Date: Wed, 5 Dec 2012 16:08:44 +0100
Subject: [PATCH 053/110] [FIX] Purchase Double Validation workflow

bzr revid: api@openerp.com-20121205150844-wooa4k7gzx4tr72s
---
 addons/purchase/purchase_workflow.xml         |  2 ++
 .../purchase_double_validation_installer.py   |  6 +++---
 .../purchase_double_validation_installer.xml  |  2 +-
 .../purchase_double_validation_workflow.xml   | 20 ++++++++++++++++---
 4 files changed, 23 insertions(+), 7 deletions(-)

diff --git a/addons/purchase/purchase_workflow.xml b/addons/purchase/purchase_workflow.xml
index 212ce304e07..aa2de4d17a0 100644
--- a/addons/purchase/purchase_workflow.xml
+++ b/addons/purchase/purchase_workflow.xml
@@ -22,6 +22,7 @@
         <record id="act_confirmed" model="workflow.activity">
             <field name="wkf_id" ref="purchase_order"/>
             <field name="name">confirmed</field>
+            <field name="split_mode">OR</field>
             <field name="kind">function</field>
             <field name="action">wkf_confirm_order()</field>
         </record>
@@ -49,6 +50,7 @@
             <field name="name">router</field>
             <field name="split_mode">OR</field>
             <field name="kind">function</field>
+            <field name="join_mode">AND</field>
             <field name="action">wkf_approve_order()</field>
         </record>
         <record id="act_invoice" model="workflow.activity">
diff --git a/addons/purchase_double_validation/purchase_double_validation_installer.py b/addons/purchase_double_validation/purchase_double_validation_installer.py
index 1e2181fc9f3..1a4b42ee448 100644
--- a/addons/purchase_double_validation/purchase_double_validation_installer.py
+++ b/addons/purchase_double_validation/purchase_double_validation_installer.py
@@ -34,16 +34,16 @@ class purchase_config_settings(osv.osv_memory):
 
     def get_default_limit_amount(self, cr, uid, fields, context=None):
         ir_model_data = self.pool.get('ir.model.data')
-        transition = ir_model_data.get_object(cr, uid, 'purchase_double_validation', 'trans_waiting_confirmed')
+        transition = ir_model_data.get_object(cr, uid, 'purchase_double_validation', 'trans_confirmed_double_app_lt')
         field, value = transition.condition.split('<', 1)
         return {'limit_amount': int(value)}
 
     def set_limit_amount(self, cr, uid, ids, context=None):
         ir_model_data = self.pool.get('ir.model.data')
         config = self.browse(cr, uid, ids[0], context)
-        waiting = ir_model_data.get_object(cr, uid, 'purchase', 'trans_confirmed_router')
+        waiting = ir_model_data.get_object(cr, uid, 'purchase_double_validation', 'trans_confirmed_double_app')
         waiting.write({'condition': 'amount_total >= %s' % config.limit_amount})
-        confirm = ir_model_data.get_object(cr, uid, 'purchase_double_validation', 'trans_waiting_confirmed')
+        confirm = ir_model_data.get_object(cr, uid, 'purchase_double_validation', 'trans_confirmed_double_app_lt')
         confirm.write({'condition': 'amount_total < %s' % config.limit_amount})
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/purchase_double_validation/purchase_double_validation_installer.xml b/addons/purchase_double_validation/purchase_double_validation_installer.xml
index 5ad03705035..f0bed5e99b0 100644
--- a/addons/purchase_double_validation/purchase_double_validation_installer.xml
+++ b/addons/purchase_double_validation/purchase_double_validation_installer.xml
@@ -8,7 +8,7 @@
             <field name="inherit_id" ref="purchase.view_purchase_configuration"/>
             <field name="arch" type="xml">
                 <div name="module_purchase_double_validation" position="inside">
-                    <span attrs="{'invisible': [('module_purchase_double_validation','=',False)]}" class="oe_separate-from-text">
+                    <span class="oe_separate-from-text">
                         <label for="limit_amount"/>
                         <field name="limit_amount" attrs="{'required': [('module_purchase_double_validation','=',True)]}" class="oe_inline"/>
                     </span>
diff --git a/addons/purchase_double_validation/purchase_double_validation_workflow.xml b/addons/purchase_double_validation/purchase_double_validation_workflow.xml
index 61503564246..1db3d3d61e7 100644
--- a/addons/purchase_double_validation/purchase_double_validation_workflow.xml
+++ b/addons/purchase_double_validation/purchase_double_validation_workflow.xml
@@ -1,18 +1,32 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data>
+        <record id="act_double_app" model="workflow.activity">
+            <field name="wkf_id" ref="purchase.purchase_order"/>
+            <field name="name">doubleApproval</field>
+            <field name="split_mode">OR</field>
+            <field name="kind">function</field>
+            <field name="action">wkf_approve_order()</field>
+        </record>
 
-         <record id="purchase.trans_confirmed_router" model="workflow.transition">
+         <record id="trans_confirmed_double_app" model="workflow.transition">
+            <field name="act_from" ref="purchase.act_confirmed"/>
+            <field name="act_to" ref="act_double_app"/>
             <field name="condition">amount_untaxed &gt;= 5000</field>
             <field name="signal">purchase_approve</field>
             <field name="group_id" ref="purchase.group_purchase_manager"/>
         </record>
 
-        <record id="trans_waiting_confirmed" model="workflow.transition">
+        <record id="trans_confirmed_double_app_lt" model="workflow.transition">
             <field name="act_from" ref="purchase.act_confirmed"/>
-            <field name="act_to" ref="purchase.act_router"/>
+            <field name="act_to" ref="act_double_app"/>
             <field name="condition">amount_untaxed &lt; 5000</field>
         </record>
 
+        <record id="trans_double_app_conf" model="workflow.transition">
+            <field name="act_from" ref="act_double_app"/>
+            <field name="act_to" ref="purchase.act_router"/>
+        </record>
+
     </data>
 </openerp>

From f54055bda1a0c3f38f2535ddbd1efea9a341a0a4 Mon Sep 17 00:00:00 2001
From: Antony Lesuisse <al@openerp.com>
Date: Wed, 5 Dec 2012 17:00:15 +0100
Subject: [PATCH 054/110] [IMP] ir_actions add a server action to run config
 wizards

bzr revid: al@openerp.com-20121205160015-lsst6j3218bn4usa
---
 openerp/addons/base/ir/ir_actions.xml | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/openerp/addons/base/ir/ir_actions.xml b/openerp/addons/base/ir/ir_actions.xml
index 2736f3ea252..da118129932 100644
--- a/openerp/addons/base/ir/ir_actions.xml
+++ b/openerp/addons/base/ir/ir_actions.xml
@@ -502,6 +502,19 @@
         <menuitem id="menu_ir_actions_todo" name="Configuration Wizards" parent="menu_custom" sequence="20" groups="base.group_no_one"/>
         <menuitem id="menu_ir_actions_todo_form" action="act_ir_actions_todo_form" parent="menu_ir_actions_todo"/>
 
+        <record id="action_run_ir_action_todo" model="ir.actions.server">
+            <field name="name">Run Remaining Action Todo</field>
+            <field name="condition">True</field>
+            <field name="type">ir.actions.server</field>
+            <field name="model_id" ref="model_res_config"/>
+            <field name="state">code</field>
+            <field name="code">
+config = self.next(cr, uid, [], context=context) or {}
+if config.get('type') not in ('ir.actions.act_window_close',):
+    action = config
+</field>
+        </record>
+
 
     </data>
 </openerp>

From 4c66504f7859bd1851e217e82866c4df56cc2704 Mon Sep 17 00:00:00 2001
From: Fabien Meghazi <fme@openerp.com>
Date: Wed, 5 Dec 2012 17:05:36 +0100
Subject: [PATCH 055/110] [STEP BACK] One step back in the cleaning process.
 Maybe for v8.

bzr revid: fme@openerp.com-20121205160536-p9dm7zdxq2qb9mqs
---
 addons/web/static/src/js/view_form.js | 2 +-
 addons/web/static/src/js/views.js     | 5 ++---
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js
index 93075a7f7b4..1e7d8f6ba81 100644
--- a/addons/web/static/src/js/view_form.js
+++ b/addons/web/static/src/js/view_form.js
@@ -1190,7 +1190,7 @@ instance.web.form.FormRenderingEngine = instance.web.form.FormRenderingEngineInt
         }
     },
     get_arch_fragment: function() {
-        var doc = this.fvg.arch_doc.documentElement.cloneNode(true);
+        var doc = $.parseXML(instance.web.json_node_to_xml(this.fvg.arch)).documentElement;
         // IE won't allow custom button@type and will revert it to spec default : 'submit'
         $('button', doc).each(function() {
             $(this).attr('data-button-type', $(this).attr('type')).attr('type', 'button');
diff --git a/addons/web/static/src/js/views.js b/addons/web/static/src/js/views.js
index b2734525bb5..decad154243 100644
--- a/addons/web/static/src/js/views.js
+++ b/addons/web/static/src/js/views.js
@@ -1396,9 +1396,8 @@ instance.web.View = instance.web.Widget.extend({
  */
 instance.web.fields_view_get = function(args) {
     function postprocess(fvg) {
-        fvg.arch_string = fvg.arch;
-        fvg.arch_doc = $.parseXML(fvg.arch);
-        fvg.arch = instance.web.xml_to_json(fvg.arch_doc, true);
+        var doc = $.parseXML(fvg.arch).documentElement;
+        fvg.arch = instance.web.xml_to_json(doc, (doc.nodeName.toLowerCase() !== 'kanban'));
         if ('id' in fvg.fields) {
             // Special case for id's
             var id_field = fvg.fields['id'];

From bf6bdf017bc67a2ada06826a33a12b50a029a608 Mon Sep 17 00:00:00 2001
From: Fabien Meghazi <fme@openerp.com>
Date: Wed, 5 Dec 2012 17:06:56 +0100
Subject: [PATCH 056/110] [IMP] Changed tests according to new client side
 fields view get

bzr revid: fme@openerp.com-20121205160656-0mg1hnv35vk27adh
---
 addons/web/static/src/js/testing.js     |  2 +-
 addons/web/static/test/list-editable.js | 34 ++++--------------
 addons/web/static/test/list.js          | 11 ++----
 addons/web/static/test/search.js        | 46 ++++++-------------------
 4 files changed, 19 insertions(+), 74 deletions(-)

diff --git a/addons/web/static/src/js/testing.js b/addons/web/static/src/js/testing.js
index 094270ec237..e7aad43ffc7 100644
--- a/addons/web/static/src/js/testing.js
+++ b/addons/web/static/src/js/testing.js
@@ -10,7 +10,7 @@ openerp.testing = {};
         formats: ['coresetup', 'dates'],
         chrome: ['corelib', 'coresetup'],
         views: ['corelib', 'coresetup', 'data', 'chrome'],
-        search: ['data', 'coresetup', 'formats'],
+        search: ['views', 'formats'],
         list: ['views', 'data'],
         form: ['data', 'views', 'list', 'formats'],
         list_editable: ['list', 'form', 'data'],
diff --git a/addons/web/static/test/list-editable.js b/addons/web/static/test/list-editable.js
index b02e8abed96..89907aa16ee 100644
--- a/addons/web/static/test/list-editable.js
+++ b/addons/web/static/test/list-editable.js
@@ -183,7 +183,7 @@ openerp.testing.section('list.edition', {
             }
             return [];
         });
-        mock('/web/view/load', function () {
+        mock('demo:fields_view_get', function () {
             return {
                 type: 'tree',
                 fields: {
@@ -191,15 +191,7 @@ openerp.testing.section('list.edition', {
                     b: {type: 'char', string: "B"},
                     c: {type: 'char', string: "C"}
                 },
-                arch: {
-                    tag: 'tree',
-                    attrs: {},
-                    children: [
-                        {tag: 'field', attrs: {name: 'a'}},
-                        {tag: 'field', attrs: {name: 'b'}},
-                        {tag: 'field', attrs: {name: 'c'}}
-                    ]
-                }
+                arch: '<tree><field name="a"/><field name="b"/><field name="c"/></tree>',
             };
         });
     }
@@ -247,7 +239,7 @@ openerp.testing.section('list.edition.events', {
         mock('demo:read', function () {
             return [{ id: 1, a: 'foo', b: 'bar', c: 'baz' }];
         });
-        mock('/web/view/load', function () {
+        mock('demo:fields_view_get', function () {
             return {
                 type: 'tree',
                 fields: {
@@ -255,15 +247,7 @@ openerp.testing.section('list.edition.events', {
                     b: {type: 'char', string: "B"},
                     c: {type: 'char', string: "C"}
                 },
-                arch: {
-                    tag: 'tree',
-                    attrs: {},
-                    children: [
-                        {tag: 'field', attrs: {name: 'a'}},
-                        {tag: 'field', attrs: {name: 'b'}},
-                        {tag: 'field', attrs: {name: 'c'}}
-                    ]
-                }
+                arch: '<tree><field name="a"/><field name="b"/><field name="c"/></tree>',
             };
         });
     }
@@ -320,19 +304,13 @@ openerp.testing.section('list.edition.onwrite', {
     templates: true,
 }, function (test) {
     test('record-to-read', {asserts: 4}, function (instance, $fix, mock) {
-        mock('/web/view/load', function () {
+        mock('demo:fields_view_get', function () {
             return {
                 type: 'tree',
                 fields: {
                     a: {type: 'char', string: "A"}
                 },
-                arch: {
-                    tag: 'tree',
-                    attrs: { on_write: 'on_write', colors: 'red:a == "foo"' },
-                    children: [
-                        {tag: 'field', attrs: {name: 'a'}}
-                    ]
-                }
+                arch: '<tree on_write="on_write" colors="red:a == \'foo\'"><field name="a"/></tree>',
             };
         });
         mock('demo:read', function (args, kwargs) {
diff --git a/addons/web/static/test/list.js b/addons/web/static/test/list.js
index 22c33ef104a..bb4c4c38640 100644
--- a/addons/web/static/test/list.js
+++ b/addons/web/static/test/list.js
@@ -4,20 +4,13 @@ openerp.testing.section('list.buttons', {
     templates: true
 }, function (test) {
     test('record-deletion', {asserts: 2}, function (instance, $fix, mock) {
-        mock('/web/view/load', function () {
+        mock('demo:fields_view_get', function () {
             return {
                 type: 'tree',
                 fields: {
                     a: {type: 'char', string: "A"}
                 },
-                arch: {
-                    tag: 'tree',
-                    attrs: { },
-                    children: [
-                        {tag: 'field', attrs: {name: 'a'}},
-                        {tag: 'button', attrs: {type: 'object', name: 'foo'}}
-                    ]
-                }
+                arch: '<tree><field name="a"/><button type="object" name="foo"/></tree>',
             };
         });
         mock('demo:read', function (args, kwargs) {
diff --git a/addons/web/static/test/search.js b/addons/web/static/test/search.js
index db9e7aa3ed9..5f177c0a363 100644
--- a/addons/web/static/test/search.js
+++ b/addons/web/static/test/search.js
@@ -152,25 +152,14 @@ var makeSearchView = function (instance, dummy_widget_attributes, defaults) {
     instance.dummy = {};
     instance.dummy.DummyWidget = instance.web.search.Field.extend(
         dummy_widget_attributes || {});
-    if (!('/web/view/load' in instance.session.responses)) {
-        instance.session.responses['/web/view/load'] = function () {
+    if (!('dummy.model:fields_view_get' in instance.session.responses)) {
+        instance.session.responses['dummy.model:fields_view_get'] = function () {
             return {
                 type: 'search',
                 fields: {
                     dummy: {type: 'char', string: "Dummy"}
                 },
-                arch: {
-                    tag: 'search',
-                    attrs: {},
-                    children: [{
-                        tag: 'field',
-                        attrs: {
-                            name: 'dummy',
-                            widget: 'dummy'
-                        },
-                        children: []
-                    }]
-                }
+                arch: '<search><field name="dummy" widget="dummy"/></search>'
             };
         };
     }
@@ -183,7 +172,7 @@ var makeSearchView = function (instance, dummy_widget_attributes, defaults) {
         };
     };
 
-    var dataset = {model: 'dummy.model', get_context: function () { return {}; }};
+    var dataset = new instance.web.DataSet(null, 'dummy.model');
     var view = new instance.web.SearchView(null, dataset, false, defaults);
     var self = this;
     view.on('invalid_search', self, function () {
@@ -926,31 +915,16 @@ openerp.testing.section('filters', {
     rpc: 'mock',
     templates: true,
     setup: function (instance, $s, mock) {
-        mock('/web/view/load', function () {
+        mock('dummy.model:fields_view_get', function () {
             // view with a single group of filters
             return {
                 type: 'search',
                 fields: {},
-                arch: {
-                    tag: 'search',
-                    attrs: {},
-                    children: [{
-                        tag: 'filter',
-                        attrs: { string: "Foo1", domain: [ ['foo', '=', '1'] ] },
-                        children: []
-                    }, {
-                        tag: 'filter',
-                        attrs: {
-                            name: 'foo2',
-                            string: "Foo2",
-                            domain: [ ['foo', '=', '2'] ] },
-                        children: []
-                    }, {
-                        tag: 'filter',
-                        attrs: { string: "Foo3", domain: [ ['foo', '=', '3'] ] },
-                        children: []
-                    }]
-                }
+                arch: '<search>' +
+                        '<filter string="Foo1" domain="[ [\'foo\', \'=\', \'1\'] ]"/>' +
+                        '<filter name="foo2" string="Foo2" domain="[ [\'foo\', \'=\', \'2\'] ]"/>' +
+                        '<filter string="Foo3" domain="[ [\'foo\', \'=\', \'3\'] ]"/>' +
+                        '</search>',
             };
         });
     }

From d65709f68b158a4db4718a565d510ba78f734d69 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Wed, 5 Dec 2012 17:08:47 +0100
Subject: [PATCH 057/110] [IMP] simplify @profile implementation

bzr revid: xmo@openerp.com-20121205160847-8zc8of4grueusbl2
---
 openerp/tools/misc.py | 15 +++++----------
 1 file changed, 5 insertions(+), 10 deletions(-)

diff --git a/openerp/tools/misc.py b/openerp/tools/misc.py
index 4e3db23bc2d..209e4aaebdf 100644
--- a/openerp/tools/misc.py
+++ b/openerp/tools/misc.py
@@ -27,6 +27,7 @@ Miscellaneous tools used by OpenERP.
 """
 
 from functools import wraps
+import cProfile
 import subprocess
 import logging
 import os
@@ -592,16 +593,10 @@ class profile(object):
     def __call__(self, f):
         @wraps(f)
         def wrapper(*args, **kwargs):
-            class profile_wrapper(object):
-                def __init__(self):
-                    self.result = None
-                def __call__(self):
-                    self.result = f(*args, **kwargs)
-            pw = profile_wrapper()
-            import cProfile
-            fname = self.fname or ("%s.cprof" % (f.func_name,))
-            cProfile.runctx('pw()', globals(), locals(), filename=fname)
-            return pw.result
+            profile = cProfile.Profile()
+            result = profile.runcall(f, *args, **kwargs)
+            profile.dump_stats(self.fname or ("%s.cprof" % (f.func_name,)))
+            return result
 
         return wrapper
 

From 19b878ca55bfa22a675f2349e322640eb13243d5 Mon Sep 17 00:00:00 2001
From: Christophe Simonis <chs@openerp.com>
Date: Wed, 5 Dec 2012 17:10:22 +0100
Subject: [PATCH 058/110] [IMP] auth_oauth: allow to redirect to a given action

bzr revid: chs@openerp.com-20121205161022-bsf2el39azao9iqk
---
 addons/auth_oauth/controllers/main.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/addons/auth_oauth/controllers/main.py b/addons/auth_oauth/controllers/main.py
index 4c7c5377184..f461a675a47 100644
--- a/addons/auth_oauth/controllers/main.py
+++ b/addons/auth_oauth/controllers/main.py
@@ -62,7 +62,9 @@ class OAuthController(oeweb.Controller):
                 u = registry.get('res.users')
                 credentials = u.auth_oauth(cr, SUPERUSER_ID, provider, kw, context=context)
                 cr.commit()
-                return login_and_redirect(req, *credentials)
+                action = state.get('a', None)
+                url = '/#action=' + action if action else '/'
+                return login_and_redirect(req, *credentials, redirect_url=url)
             except AttributeError:
                 # auth_signup is not installed
                 _logger.error("auth_signup not installed on database %s: oauth sign up cancelled." % (dbname,))

From 5483836f51639d50dcf74238a4ca548cf2a6d6d7 Mon Sep 17 00:00:00 2001
From: Christophe Simonis <chs@openerp.com>
Date: Wed, 5 Dec 2012 18:17:07 +0100
Subject: [PATCH 059/110] [FIX] do not hardcode ids in tests

bzr revid: chs@openerp.com-20121205171707-r073wdt2eza82qyt
---
 openerp/addons/base/tests/test_ir_values.py | 25 ++++++++++++---------
 1 file changed, 15 insertions(+), 10 deletions(-)

diff --git a/openerp/addons/base/tests/test_ir_values.py b/openerp/addons/base/tests/test_ir_values.py
index b306e1f0929..9f528008e35 100644
--- a/openerp/addons/base/tests/test_ir_values.py
+++ b/openerp/addons/base/tests/test_ir_values.py
@@ -50,15 +50,20 @@ class test_ir_values(common.TransactionCase):
 
         # Create some action bindings for a non-existing model.
 
+        act_id_1 = self.ref('base.act_values_form_action')
+        act_id_2 = self.ref('base.act_values_form_defaults')
+        act_id_3 = self.ref('base.action_res_company_form')
+        act_id_4 = self.ref('base.action_res_company_tree')
+
         ir_values = self.registry('ir.values')
-        ir_values.set(self.cr, self.uid, 'action', 'tree_but_open', 'OnDblClick Action', ['unexisting_model'], 'ir.actions.act_window,10', isobject=True)
-        ir_values.set(self.cr, self.uid, 'action', 'tree_but_open', 'OnDblClick Action 2', ['unexisting_model'], 'ir.actions.act_window,11', isobject=True)
-        ir_values.set(self.cr, self.uid, 'action', 'client_action_multi', 'Side Wizard', ['unexisting_model'], 'ir.actions.act_window,12', isobject=True)
+        ir_values.set(self.cr, self.uid, 'action', 'tree_but_open', 'OnDblClick Action', ['unexisting_model'], 'ir.actions.act_window,%d' % act_id_1, isobject=True)
+        ir_values.set(self.cr, self.uid, 'action', 'tree_but_open', 'OnDblClick Action 2', ['unexisting_model'], 'ir.actions.act_window,%d' % act_id_2, isobject=True)
+        ir_values.set(self.cr, self.uid, 'action', 'client_action_multi', 'Side Wizard', ['unexisting_model'], 'ir.actions.act_window,%d' % act_id_3, isobject=True)
         report_ids = self.registry('ir.actions.report.xml').search(self.cr, self.uid, [], {})
         reports = self.registry('ir.actions.report.xml').browse(self.cr, self.uid, report_ids, {})
-        report_id = [report.id for report in reports if not report.groups_id][0] # assume at least one
-        ir_values.set(self.cr, self.uid, 'action', 'client_print_multi', 'Nice Report', ['unexisting_model'], 'ir.actions.report.xml,%s'%report_id, isobject=True)
-        ir_values.set(self.cr, self.uid, 'action', 'client_action_relate', 'Related Stuff', ['unexisting_model'], 'ir.actions.act_window,14', isobject=True)
+        report_id = [report.id for report in reports if not report.groups_id][0]  # assume at least one
+        ir_values.set(self.cr, self.uid, 'action', 'client_print_multi', 'Nice Report', ['unexisting_model'], 'ir.actions.report.xml,%d' % report_id, isobject=True)
+        ir_values.set(self.cr, self.uid, 'action', 'client_action_relate', 'Related Stuff', ['unexisting_model'], 'ir.actions.act_window,%d' % act_id_4, isobject=True)
 
         # Replace one action binding to set a new name.
 
@@ -73,17 +78,17 @@ class test_ir_values(common.TransactionCase):
         #first action
         assert len(actions[0]) == 3, "Malformed action definition"
         assert actions[0][1] == 'OnDblClick Action 2', 'Bound action does not match definition'
-        assert isinstance(actions[0][2], dict) and actions[0][2]['id'] == 11, 'Bound action does not match definition'
+        assert isinstance(actions[0][2], dict) and actions[0][2]['id'] == act_id_2, 'Bound action does not match definition'
         #second action - this ones comes last because it was re-created with a different name
         assert len(actions[1]) == 3, "Malformed action definition"
         assert actions[1][1] == 'OnDblClick Action New', 'Re-Registering an action should replace it'
-        assert isinstance(actions[1][2], dict) and actions[1][2]['id'] == 10, 'Bound action does not match definition'
+        assert isinstance(actions[1][2], dict) and actions[1][2]['id'] == act_id_1, 'Bound action does not match definition'
 
         actions = ir_values.get(self.cr, self.uid, 'action', 'client_action_multi', ['unexisting_model'])
         assert len(actions) == 1, "Mismatching number of bound actions"
         assert len(actions[0]) == 3, "Malformed action definition"
         assert actions[0][1] == 'Side Wizard', 'Bound action does not match definition'
-        assert isinstance(actions[0][2], dict) and actions[0][2]['id'] == 12, 'Bound action does not match definition'
+        assert isinstance(actions[0][2], dict) and actions[0][2]['id'] == act_id_3, 'Bound action does not match definition'
 
         actions = ir_values.get(self.cr, self.uid, 'action', 'client_print_multi', ['unexisting_model'])
         assert len(actions) == 1, "Mismatching number of bound actions"
@@ -95,7 +100,7 @@ class test_ir_values(common.TransactionCase):
         assert len(actions) == 1, "Mismatching number of bound actions"
         assert len(actions[0]) == 3, "Malformed action definition"
         assert actions[0][1] == 'Related Stuff', 'Bound action does not match definition'
-        assert isinstance(actions[0][2], dict) and actions[0][2]['id'] == 14, 'Bound action does not match definition'
+        assert isinstance(actions[0][2], dict) and actions[0][2]['id'] == act_id_4, 'Bound action does not match definition'
 
 
 if __name__ == '__main__':

From 84aa05b4ccf25698c13d15db35d89131369cd0cf Mon Sep 17 00:00:00 2001
From: Christophe Simonis <chs@openerp.com>
Date: Wed, 5 Dec 2012 18:37:33 +0100
Subject: [PATCH 060/110] [FIX] do not hardcode ids in tests

bzr revid: chs@openerp.com-20121205173733-t686x9m2yylp552w
---
 openerp/addons/base/tests/test_ir_values.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/openerp/addons/base/tests/test_ir_values.py b/openerp/addons/base/tests/test_ir_values.py
index 9f528008e35..ad8dee616b7 100644
--- a/openerp/addons/base/tests/test_ir_values.py
+++ b/openerp/addons/base/tests/test_ir_values.py
@@ -68,7 +68,7 @@ class test_ir_values(common.TransactionCase):
         # Replace one action binding to set a new name.
 
         ir_values = self.registry('ir.values')
-        ir_values.set(self.cr, self.uid, 'action', 'tree_but_open', 'OnDblClick Action New', ['unexisting_model'], 'ir.actions.act_window,10', isobject=True)
+        ir_values.set(self.cr, self.uid, 'action', 'tree_but_open', 'OnDblClick Action New', ['unexisting_model'], 'ir.actions.act_window,%d' % act_id_1, isobject=True)
 
         # Retrieve the action bindings and check they're correct
 

From 9a0c4b115d6a91e150c7a7305543d0d6ff0ee0ea Mon Sep 17 00:00:00 2001
From: Antony Lesuisse <al@openerp.com>
Date: Thu, 6 Dec 2012 00:11:37 +0100
Subject: [PATCH 061/110] [IMP] anonymous login target current

bzr revid: al@openerp.com-20121205231137-rbpmh3qq79k0s15p
---
 addons/auth_anonymous/static/src/js/auth_anonymous.js   | 2 +-
 addons/auth_anonymous/static/src/xml/auth_anonymous.xml | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/addons/auth_anonymous/static/src/js/auth_anonymous.js b/addons/auth_anonymous/static/src/js/auth_anonymous.js
index 6768bc63ff9..ac9feeed0b6 100644
--- a/addons/auth_anonymous/static/src/js/auth_anonymous.js
+++ b/addons/auth_anonymous/static/src/js/auth_anonymous.js
@@ -33,7 +33,7 @@ openerp.auth_anonymous = function(instance) {
                 am.do_action({
                     type:'ir.actions.client',
                     tag:'login',
-                    target: 'new',
+                    target: 'current',
                     params: {
                         login_successful: function() {
                             am.do_action("reload");
diff --git a/addons/auth_anonymous/static/src/xml/auth_anonymous.xml b/addons/auth_anonymous/static/src/xml/auth_anonymous.xml
index 79d7efcbdc8..5ab84c281c7 100644
--- a/addons/auth_anonymous/static/src/xml/auth_anonymous.xml
+++ b/addons/auth_anonymous/static/src/xml/auth_anonymous.xml
@@ -6,7 +6,6 @@
 <t t-name="UserMenu.auth_anonymous">
     <div>
     <a href="#" class="oe_user_menu oe_topbar_item oe_topbar_anonymous_login">
-        <img class="oe_topbar_avatar" t-att-src="_s + '/web/static/src/img/icons/gtk-dialog-authentication.png'"/>
         Login
     </a>
     </div>

From b18b12d1cd519acb00bc8bec2215fa55ae0155fe Mon Sep 17 00:00:00 2001
From: Antony Lesuisse <al@openerp.com>
Date: Thu, 6 Dec 2012 00:41:40 +0100
Subject: [PATCH 062/110] [IMP] portal_anonymous add anonymous to the portal
 group. When both portal and anonymous are installed, anonymous user can see
 the public subset of the portal menu.

bzr revid: al@openerp.com-20121205234140-qkcpthzx5f337n3x
---
 addons/portal_anonymous/__init__.py          |  0
 addons/portal_anonymous/__openerp__.py       | 14 ++++++++++++++
 addons/portal_anonymous/portal_anonymous.xml |  8 ++++++++
 3 files changed, 22 insertions(+)
 create mode 100644 addons/portal_anonymous/__init__.py
 create mode 100644 addons/portal_anonymous/__openerp__.py
 create mode 100644 addons/portal_anonymous/portal_anonymous.xml

diff --git a/addons/portal_anonymous/__init__.py b/addons/portal_anonymous/__init__.py
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/addons/portal_anonymous/__openerp__.py b/addons/portal_anonymous/__openerp__.py
new file mode 100644
index 00000000000..25c35ec5799
--- /dev/null
+++ b/addons/portal_anonymous/__openerp__.py
@@ -0,0 +1,14 @@
+{
+    'name': 'Anonymous portal',
+    'description': """
+Allow anonymous to Access Portal.
+=================================
+ """,
+    'author': 'OpenERP SA',
+    'version': '1.0',
+    'category': 'Hidden',
+    'website': 'http://www.openerp.com',
+    'installable': True,
+    'depends': ['portal', 'auth_anonymous'],
+    'data': ['portal_anonymous.xml'],
+}
diff --git a/addons/portal_anonymous/portal_anonymous.xml b/addons/portal_anonymous/portal_anonymous.xml
new file mode 100644
index 00000000000..599df7933c5
--- /dev/null
+++ b/addons/portal_anonymous/portal_anonymous.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data noupdate="1">
+        <record id="auth_anonymous.anonymous_user" model="res.users">
+            <field name="groups_id" eval="[(4,ref('portal.group_portal'))]"/>
+        </record>
+    </data>
+</openerp>

From 5c53674c2ed7e36cef0aaec2646943f957aba63d Mon Sep 17 00:00:00 2001
From: Antony Lesuisse <al@openerp.com>
Date: Thu, 6 Dec 2012 02:43:34 +0100
Subject: [PATCH 063/110] [FIX] views remove unused session property

bzr revid: al@openerp.com-20121206014334-8a11s1iqysq6v9e1
---
 addons/web/static/src/js/views.js | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/addons/web/static/src/js/views.js b/addons/web/static/src/js/views.js
index 939c98015bc..49096480990 100644
--- a/addons/web/static/src/js/views.js
+++ b/addons/web/static/src/js/views.js
@@ -758,12 +758,6 @@ instance.web.ViewManagerAction = instance.web.ViewManager.extend({
             dataset.index = 0;
         }
         this.dataset = dataset;
-
-        // setup storage for session-wise menu hiding
-        if (this.session.hidden_menutips) {
-            return;
-        }
-        this.session.hidden_menutips = {};
     },
     /**
      * Initializes the ViewManagerAction: sets up the searchview (if the

From 6fb47cf44395208ce837b92054f9be348206b057 Mon Sep 17 00:00:00 2001
From: Launchpad Translations on behalf of openerp <>
Date: Thu, 6 Dec 2012 04:39:33 +0000
Subject: [PATCH 064/110] Launchpad automatic translations update.

bzr revid: launchpad_translations_on_behalf_of_openerp-20121206043933-i6nbcy70edyb04ax
---
 openerp/addons/base/i18n/es.po    |  27 +-
 openerp/addons/base/i18n/es_DO.po | 611 +++++++++++++++++++++---------
 openerp/addons/base/i18n/fr.po    |  72 ++--
 openerp/addons/base/i18n/ru.po    |  20 +-
 openerp/addons/base/i18n/zh_CN.po |  28 +-
 5 files changed, 517 insertions(+), 241 deletions(-)

diff --git a/openerp/addons/base/i18n/es.po b/openerp/addons/base/i18n/es.po
index 29fce787179..4f7618db5c8 100644
--- a/openerp/addons/base/i18n/es.po
+++ b/openerp/addons/base/i18n/es.po
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2012-12-03 16:01+0000\n"
-"PO-Revision-Date: 2012-08-20 15:29+0000\n"
-"Last-Translator: OpenERP Administrators <Unknown>\n"
+"PO-Revision-Date: 2012-12-05 20:42+0000\n"
+"Last-Translator: Santi (Pexego) <santiago@pexego.es>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:00+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-06 04:39+0000\n"
+"X-Generator: Launchpad (build 16341)\n"
 
 #. module: base
 #: model:ir.module.module,description:base.module_account_check_writing
@@ -24,6 +24,10 @@ msgid ""
 "================================================\n"
 "    "
 msgstr ""
+"\n"
+"Módulo para la emisión e impresión  de cheques\n"
+"================================================\n"
+"    "
 
 #. module: base
 #: model:res.country,name:base.sh
@@ -59,7 +63,7 @@ msgstr "Estructura de la vista"
 #. module: base
 #: model:ir.module.module,summary:base.module_sale_stock
 msgid "Quotation, Sale Orders, Delivery & Invoicing Control"
-msgstr ""
+msgstr "Presupuesto, órdenes de venta, entrega y control de facturación"
 
 #. module: base
 #: selection:ir.sequence,implementation:0
@@ -88,7 +92,7 @@ msgstr ""
 #. module: base
 #: model:ir.module.module,summary:base.module_point_of_sale
 msgid "Touchscreen Interface for Shops"
-msgstr ""
+msgstr "Interfaz de pantalla táctil para tiendas"
 
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_l10n_in_hr_payroll
@@ -140,7 +144,7 @@ msgstr ""
 #. module: base
 #: help:res.partner,employee:0
 msgid "Check this box if this contact is an Employee."
-msgstr ""
+msgstr "Marque si el contacto es un empleado"
 
 #. module: base
 #: help:ir.model.fields,domain:0
@@ -171,7 +175,7 @@ msgstr "Ventana destino"
 #. module: base
 #: field:ir.actions.report.xml,report_rml:0
 msgid "Main Report File Path"
-msgstr ""
+msgstr "Ruta de archivo del informe principal"
 
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_sale_analytic_plans
@@ -269,7 +273,7 @@ msgstr "creado."
 #. module: base
 #: field:ir.actions.report.xml,report_xsl:0
 msgid "XSL Path"
-msgstr ""
+msgstr "Ruta XSL"
 
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_l10n_tr
@@ -295,7 +299,7 @@ msgstr "Inuktitut / ᐃᓄᒃᑎᑐᑦ"
 #. module: base
 #: model:res.groups,name:base.group_multi_currency
 msgid "Multi Currencies"
-msgstr ""
+msgstr "Multidivisas"
 
 #. module: base
 #: model:ir.module.module,description:base.module_l10n_cl
@@ -319,6 +323,7 @@ msgid ""
 "The internal user that is in charge of communicating with this contact if "
 "any."
 msgstr ""
+"El usuario interno encargado de comunicarse con este contacto si lo hubiese."
 
 #. module: base
 #: view:res.partner:0
@@ -531,7 +536,7 @@ msgstr ""
 #. module: base
 #: field:ir.model.relation,name:0
 msgid "Relation Name"
-msgstr ""
+msgstr "Nombre de relación"
 
 #. module: base
 #: view:ir.rule:0
diff --git a/openerp/addons/base/i18n/es_DO.po b/openerp/addons/base/i18n/es_DO.po
index f589a00e4cc..0f632301e0e 100644
--- a/openerp/addons/base/i18n/es_DO.po
+++ b/openerp/addons/base/i18n/es_DO.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-server\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-12-03 16:01+0000\n"
-"PO-Revision-Date: 2012-12-04 17:37+0000\n"
+"PO-Revision-Date: 2012-12-05 21:00+0000\n"
 "Last-Translator: Carlos Matos Villar <carlosmvillar19@hotmail.com>\n"
 "Language-Team: Spanish (Dominican Republic) <es_DO@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-05 05:18+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-06 04:39+0000\n"
+"X-Generator: Launchpad (build 16341)\n"
 
 #. module: base
 #: model:ir.module.module,description:base.module_account_check_writing
@@ -4554,73 +4554,93 @@ msgid ""
 "      and iban account numbers\n"
 "    "
 msgstr ""
+"\n"
+"Modulo que extiende el objeto estándar account_bank_statement_line  para "
+"probar el soporte e-banking.\n"
+"============================================================================="
+"=======================\n"
+"\n"
+"Este Modulo Agrega:\n"
+"--------------\n"
+"    - Fecha de Divisa\n"
+"    - Pagos por Lotes\n"
+"    - Trazabilidad de cambios a lineas declaradas de banco\n"
+"    - Vistas declararas de Lineas de Banco\n"
+"    - Reporte de Balances de Declaraciones de Banco\n"
+"    - mejoras en el rendimiento para la importación digital del estado de "
+"cuenta bancario (vía \n"
+"      'e-banking_import' contexto de bandera)\n"
+"    - name_search en res.partner.bank mejorado para permitir la búsqueda en "
+"el Banco \n"
+"      y el número de cuenta de IBAN\n"
+"    "
 
 #. module: base
 #: selection:ir.module.module,state:0
 #: selection:ir.module.module.dependency,state:0
 msgid "To be upgraded"
-msgstr ""
+msgstr "Para ser actualizado"
 
 #. module: base
 #: model:res.country,name:base.ly
 msgid "Libya"
-msgstr ""
+msgstr "Libia"
 
 #. module: base
 #: model:res.country,name:base.cf
 msgid "Central African Republic"
-msgstr ""
+msgstr "República Centro Africana"
 
 #. module: base
 #: model:res.country,name:base.li
 msgid "Liechtenstein"
-msgstr ""
+msgstr "Liechtenstein"
 
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_project_issue_sheet
 msgid "Timesheet on Issues"
-msgstr ""
+msgstr "Parte de horas para las incidencias"
 
 #. module: base
 #: model:res.partner.title,name:base.res_partner_title_ltd
 msgid "Ltd"
-msgstr ""
+msgstr "Ltd"
 
 #. module: base
 #: field:res.partner,ean13:0
 msgid "EAN13"
-msgstr ""
+msgstr "EAN13"
 
 #. module: base
 #: code:addons/orm.py:2247
 #, python-format
 msgid "Invalid Architecture!"
-msgstr ""
+msgstr "¡Estructura no válida!"
 
 #. module: base
 #: model:res.country,name:base.pt
 msgid "Portugal"
-msgstr ""
+msgstr "Portugal"
 
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_share
 msgid "Share any Document"
-msgstr ""
+msgstr "Compartir cualquier documento"
 
 #. module: base
 #: model:ir.module.module,summary:base.module_crm
 msgid "Leads, Opportunities, Phone Calls"
-msgstr ""
+msgstr "Conduce, Oportunidades, Llamadas Teléfono"
 
 #. module: base
 #: view:res.lang:0
 msgid "6.  %d, %m         ==> 05, 12"
-msgstr ""
+msgstr "6. %d, %m ==> 05, 12"
 
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_l10n_it
 msgid "Italy - Accounting"
-msgstr ""
+msgstr "Italia - Contabilidad"
 
 #. module: base
 #: field:ir.actions.act_url,help:0
@@ -4632,7 +4652,7 @@ msgstr ""
 #: field:ir.actions.server,help:0
 #: field:ir.actions.wizard,help:0
 msgid "Action description"
-msgstr ""
+msgstr "Descripción de la acción"
 
 #. module: base
 #: model:ir.module.module,description:base.module_l10n_ma
@@ -4658,6 +4678,9 @@ msgid ""
 "its dependencies are satisfied. If the module has no dependency, it is "
 "always installed."
 msgstr ""
+"Un módulo auto-instalable se instala automáticamente por el sistema cuando "
+"todas sus dependencias han sido satisfechas. Si el módulo no tiene "
+"dependencias, será instalado siempre."
 
 #. module: base
 #: model:ir.actions.act_window,name:base.res_lang_act_window
@@ -4665,7 +4688,7 @@ msgstr ""
 #: model:ir.ui.menu,name:base.menu_res_lang_act_window
 #: view:res.lang:0
 msgid "Languages"
-msgstr ""
+msgstr "Idiomas"
 
 #. module: base
 #: model:ir.module.module,description:base.module_point_of_sale
@@ -4695,16 +4718,41 @@ msgid ""
 "* Refund previous sales\n"
 "    "
 msgstr ""
+"\n"
+"Rápido y Fácil proceso de ventas.\n"
+"=================================\n"
+"\n"
+"Este modulo les permite gestionar sus tiendas de ventas muy fácilmente con "
+"una completa interfaz táctil web.\n"
+"Esto es compatible con todas las Tabletas y las iPad's ofreciendo múltiples "
+"métodos de pago. \n"
+"\n"
+"La selección de productos puede ser hecha en varias formas: \n"
+"\n"
+"*Usando un lector de código de barra\n"
+"*Navegando a través de las categorías de productos o vía una búsqueda de "
+"texto.\n"
+"\n"
+"Características Principales\n"
+"------------------\n"
+"*Rápida codificación de las ventas\n"
+"*Elija un método (la vía rápida) o dividir el pago entre varios métodos de "
+"pago\n"
+"*Calculo de la cantidad de dinero a regresar\n"
+"*Crear y confirmar la lista de recolección automática\n"
+"*Le Permite al usuario crear una factura automática\n"
+"*Reembolso de ventas anteriores\n"
+"    "
 
 #. module: base
 #: model:ir.module.category,name:base.module_category_localization_account_charts
 msgid "Account Charts"
-msgstr ""
+msgstr "Planes de cuentas"
 
 #. module: base
 #: model:ir.ui.menu,name:base.menu_event_main
 msgid "Events Organization"
-msgstr ""
+msgstr "Organización de Envetos"
 
 #. module: base
 #: model:ir.actions.act_window,name:base.action_partner_customer_form
@@ -4712,27 +4760,27 @@ msgstr ""
 #: model:ir.ui.menu,name:base.menu_partner_form
 #: view:res.partner:0
 msgid "Customers"
-msgstr ""
+msgstr "Clientes"
 
 #. module: base
 #: model:res.country,name:base.au
 msgid "Australia"
-msgstr ""
+msgstr "Australia"
 
 #. module: base
 #: report:ir.module.reference:0
 msgid "Menu :"
-msgstr ""
+msgstr "Menú :"
 
 #. module: base
 #: selection:ir.model.fields,state:0
 msgid "Base Field"
-msgstr ""
+msgstr "Campo base"
 
 #. module: base
 #: model:ir.module.category,name:base.module_category_managing_vehicles_and_contracts
 msgid "Managing vehicles and contracts"
-msgstr ""
+msgstr "Gestión de Vehiculos y Contratos"
 
 #. module: base
 #: model:ir.module.module,description:base.module_base_setup
@@ -4747,62 +4795,70 @@ msgid ""
 "\n"
 "    "
 msgstr ""
+"\n"
+"Módulo que permite configurar el sistema cuando se instala una nueva base de "
+"datos.\n"
+"===================================================================\n"
+"\n"
+"Muestra una lista de aplicaciones para instalar.\n"
+"\n"
+"    "
 
 #. module: base
 #: model:ir.model,name:base.model_res_config
 msgid "res.config"
-msgstr ""
+msgstr "res.config"
 
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_l10n_pl
 msgid "Poland - Accounting"
-msgstr ""
+msgstr "Polonia - Contabilidad"
 
 #. module: base
 #: view:ir.cron:0
 msgid "Action to Trigger"
-msgstr ""
+msgstr "Acción a activar"
 
 #. module: base
 #: field:ir.model.constraint,name:0
 #: selection:ir.translation,type:0
 msgid "Constraint"
-msgstr ""
+msgstr "Restricción"
 
 #. module: base
 #: selection:ir.values,key:0
 #: selection:res.partner,type:0
 #: selection:res.partner.address,type:0
 msgid "Default"
-msgstr ""
+msgstr "Por defecto"
 
 #. module: base
 #: model:ir.module.module,summary:base.module_lunch
 msgid "Lunch Order, Meal, Food"
-msgstr ""
+msgstr "Orden de Almuerso, Comida, Alimento"
 
 #. module: base
 #: view:ir.model.fields:0
 #: field:ir.model.fields,required:0
 #: field:res.partner.bank.type.field,required:0
 msgid "Required"
-msgstr ""
+msgstr "Requerido"
 
 #. module: base
 #: model:res.country,name:base.ro
 msgid "Romania"
-msgstr ""
+msgstr "Rumanía"
 
 #. module: base
 #: field:ir.module.module,summary:0
 #: field:res.request.history,name:0
 msgid "Summary"
-msgstr ""
+msgstr "Resumen"
 
 #. module: base
 #: model:ir.module.category,name:base.module_category_hidden_dependency
 msgid "Dependency"
-msgstr ""
+msgstr "Dependencia"
 
 #. module: base
 #: model:ir.module.module,description:base.module_portal
@@ -4826,16 +4882,34 @@ msgid ""
 "very handy when used in combination with the module 'share'.\n"
 "    "
 msgstr ""
+"\n"
+"Personaliza el acceso a su base de datos de OpenERP a usuarios externos "
+"mediante la creación de portales.\n"
+"============================================================================="
+"=====================\n"
+"Un portal define un menú de usuario especifico y derechos de acceso para sus "
+"miembros. Este\n"
+"menú puede ser visto por los miembros del portal, usuarios anónimos y otros "
+"usuarios que\n"
+"tienen el acceso a características técnicas (por ejemplo: El Administrado).\n"
+"También, cada miembro del portal esta enlazado a un socio especifico.\n"
+"\n"
+"El modulo también asocia grupos de usuarios al portal de usuarios (agregando "
+"un grupo en\n"
+"el portal automáticamente los agrega al portal de usuarios, etc). Esa "
+"característica es\n"
+"muy útil cuando se usa en combinación con el modulo 'Compartir'.\n"
+"    "
 
 #. module: base
 #: field:multi_company.default,expression:0
 msgid "Expression"
-msgstr ""
+msgstr "Expresión"
 
 #. module: base
 #: view:res.company:0
 msgid "Header/Footer"
-msgstr ""
+msgstr "Cabecera / Pie de página"
 
 #. module: base
 #: help:ir.mail_server,sequence:0
@@ -4843,11 +4917,14 @@ 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 ""
+"Cuando para un correo no se especifica un servidor de correo en concreto, se "
+"usa el de mayor prioridad. La prioridad por defecto es 10 (número más "
+"pequeño = más prioridad)"
 
 #. module: base
 #: field:res.partner,parent_id:0
 msgid "Related Company"
-msgstr ""
+msgstr "Compañías Relacionadas"
 
 #. module: base
 #: help:ir.actions.act_url,help:0
@@ -4862,52 +4939,54 @@ msgid ""
 "Optional help text for the users with a description of the target view, such "
 "as its usage and purpose."
 msgstr ""
+"Texto de ayuda opcional para los usuarios con una descripción de la vista "
+"destino, como su uso y su propósito."
 
 #. module: base
 #: model:res.country,name:base.va
 msgid "Holy See (Vatican City State)"
-msgstr ""
+msgstr "Santa Sede (Ciudad Estado del Vaticano)"
 
 #. module: base
 #: field:base.module.import,module_file:0
 msgid "Module .ZIP file"
-msgstr ""
+msgstr "Archivo .ZIP del módulo"
 
 #. module: base
 #: model:res.partner.category,name:base.res_partner_category_17
 msgid "Telecom sector"
-msgstr ""
+msgstr "Sector de telecomunicaciones"
 
 #. module: base
 #: field:workflow.transition,trigger_model:0
 msgid "Trigger Object"
-msgstr ""
+msgstr "Objeto del disparo"
 
 #. module: base
 #: sql_constraint:ir.sequence.type:0
 msgid "`code` must be unique."
-msgstr ""
+msgstr "'código' debe ser único."
 
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_knowledge
 msgid "Knowledge Management System"
-msgstr ""
+msgstr "Sistema de Gestión del Conocimiento"
 
 #. module: base
 #: view:workflow.activity:0
 #: field:workflow.activity,in_transitions:0
 msgid "Incoming Transitions"
-msgstr ""
+msgstr "Transiciones entrantes"
 
 #. module: base
 #: field:ir.values,value_unpickle:0
 msgid "Default value or action reference"
-msgstr ""
+msgstr "Valor por defecto o referencia de acción"
 
 #. module: base
 #: model:res.country,name:base.sr
 msgid "Suriname"
-msgstr ""
+msgstr "Surinam"
 
 #. module: base
 #: model:ir.module.module,description:base.module_account_sequence
@@ -4927,11 +5006,27 @@ msgid ""
 "    * Number Padding\n"
 "    "
 msgstr ""
+"\n"
+"Este modulo mantiene secuencias de números internas para entradas de "
+"cuentas.\n"
+"============================================================================="
+"=\n"
+"\n"
+"Les permite configurar de secuencias de cuentas para darles mantenimiento. \n"
+"\n"
+"Usted puede personalizar los siguientes atributos de la secuencia:\n"
+"---------------------------------------------------------\n"
+"    *Prefijo\n"
+"    *Sufijo\n"
+"    *Proximo Número\n"
+"    *Incremento de Número\n"
+"    *Número de Relleno\n"
+"    "
 
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_project_timesheet
 msgid "Bill Time on Tasks"
-msgstr ""
+msgstr "Facturar tiempo en tareas"
 
 #. module: base
 #: model:ir.module.category,name:base.module_category_marketing
@@ -4939,12 +5034,12 @@ msgstr ""
 #: model:ir.ui.menu,name:base.marketing_menu
 #: model:ir.ui.menu,name:base.menu_report_marketing
 msgid "Marketing"
-msgstr ""
+msgstr "Mercadeo"
 
 #. module: base
 #: view:res.partner.bank:0
 msgid "Bank account"
-msgstr ""
+msgstr "Cuenta bancaria"
 
 #. module: base
 #: model:ir.module.module,description:base.module_web_calendar
@@ -4954,53 +5049,57 @@ msgid ""
 "==========================\n"
 "\n"
 msgstr ""
+"\n"
+"Vista de Calendario Web OpenERP.\n"
+"===============================\n"
+"\n"
 
 #. module: base
 #: selection:base.language.install,lang:0
 msgid "Spanish (HN) / Español (HN)"
-msgstr ""
+msgstr "Español (HN) / Español (HN)"
 
 #. module: base
 #: view:ir.sequence.type:0
 msgid "Sequence Type"
-msgstr ""
+msgstr "Tipo de secuencia"
 
 #. module: base
 #: view:base.language.export:0
 msgid "Unicode/UTF-8"
-msgstr ""
+msgstr "Unicode/UTF-8"
 
 #. module: base
 #: selection:base.language.install,lang:0
 msgid "Hindi / हिंदी"
-msgstr ""
+msgstr "Hindi / हिंदी"
 
 #. 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 ""
+msgstr "Cargar una Traducción"
 
 #. module: base
 #: field:ir.module.module,latest_version:0
 msgid "Installed Version"
-msgstr ""
+msgstr "Versión instalada"
 
 #. module: base
 #: field:ir.module.module,license:0
 msgid "License"
-msgstr ""
+msgstr "Licencia"
 
 #. module: base
 #: field:ir.attachment,url:0
 msgid "Url"
-msgstr ""
+msgstr "Url"
 
 #. module: base
 #: selection:ir.translation,type:0
 msgid "SQL Constraint"
-msgstr ""
+msgstr "Restricción SQL"
 
 #. module: base
 #: help:ir.ui.menu,groups_id:0
@@ -5009,6 +5108,9 @@ msgid ""
 "groups. If this field is empty, OpenERP will compute visibility based on the "
 "related object's read access."
 msgstr ""
+"Si tiene grupos, la visibilidad del menú se basará en esos grupos. Si el "
+"campo está vacío, OpenERP otorgará la visibilidad basándose en los permisos "
+"de lectura de los objetos asociados."
 
 #. module: base
 #: field:ir.actions.server,srcmodel_id:0
@@ -5020,7 +5122,7 @@ msgstr ""
 #: field:ir.model.relation,model:0
 #: view:ir.values:0
 msgid "Model"
-msgstr ""
+msgstr "Modelo"
 
 #. module: base
 #: view:base.language.install:0
@@ -5028,6 +5130,8 @@ 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 ""
+"El idioma seleccionado ha sido instalado con éxito. Deberá cambiar las "
+"preferencias del usuario y abrir un nuevo menú para apreciar los cambios."
 
 #. module: base
 #: field:ir.actions.act_window.view,view_id:0
@@ -5035,7 +5139,7 @@ msgstr ""
 #: selection:ir.translation,type:0
 #: view:ir.ui.view:0
 msgid "View"
-msgstr ""
+msgstr "Vista"
 
 #. module: base
 #: model:ir.module.module,description:base.module_crm_partner_assign
@@ -5055,21 +5159,36 @@ msgid ""
 "You can also use the geolocalization without using the GPS coordinates.\n"
 "    "
 msgstr ""
+"\n"
+"Este es el modulo usado por OpenERP SA para redirigir clientes a sus socios, "
+"basados en geolocalización.\n"
+"============================================================================="
+"======================\n"
+"\n"
+"Usted puede geolocalizar sus oportunidades mediante el uso de este modulo.\n"
+"\n"
+"Use la geolocalización cuando se asignen oportunidades a los socios.\n"
+"Determine las coordenadas GPS de acuerdo a la dirección de el socio.\n"
+"\n"
+"Los socios mas apropiados pueden ser asignados.\n"
+"Usted puede también usar la geolocalización sin el uso de las coordenadas de "
+"GPS.\n"
+"    "
 
 #. module: base
 #: view:ir.actions.act_window:0
 msgid "Open a Window"
-msgstr ""
+msgstr "Abrir una ventana"
 
 #. module: base
 #: model:res.country,name:base.gq
 msgid "Equatorial Guinea"
-msgstr ""
+msgstr "Guinea ecuatorial"
 
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_web_api
 msgid "OpenERP Web API"
-msgstr ""
+msgstr "Aplicación Web OpenERP"
 
 #. module: base
 #: model:ir.module.module,description:base.module_l10n_fr_rib
@@ -5113,22 +5232,58 @@ msgid ""
 "Accounts in OpenERP: the first with the type 'RIB', the second with the type "
 "'IBAN'. \n"
 msgstr ""
+"\n"
+"Este modulo deja a los usuarios entrar a los detalles del banco de Socios en "
+"el formato RIB (Estándar Francés para los detalles de bancos)\n"
+"============================================================================="
+"=========================\n"
+"\n"
+"Las Cuentas de Banco RIB pueden ser entradas en la pestaña de "
+"\"Contabilidad\" de el formulario de el Socio mediante la especificación de "
+"cuenta tipo \"RIB\". \n"
+"\n"
+"Los cuatros campos estándares RIB se convertirán en mandatarios:\n"
+"------------------------------------------------------    \n"
+"    - Código de Banco\n"
+"    - Código de Oficina\n"
+"    - Número de Cuenta\n"
+"    - Clave RIB\n"
+"    \n"
+"Como una medida de seguridad, OpenERP verificará las claves RIB cuando "
+"quiera que un RIB sea guardado, y \n"
+"se rechazará al fichero de datos si la clave es incorrecta. Por favor tenga "
+"en mente que esto solo puede suceder cuando el usuario presione el botón "
+"'Guardar', por ejemplo en el Formulario de Socios. Desde cada cuenta "
+"bancaria debe relacionar a un banco, los usuarios deberán entrar los códigos "
+"de banco RIB en el Formulario de Banco - esto será el pre-llenado el código "
+"RIB de el banco cuando ellos seleccionen el Banco. Para hacer esto más "
+"fácil, este modulo también les permitirá a los usuarios encontrar Bancos "
+"usando sus códigos RIB.\n"
+"\n"
+"El modulo base_iban puede ser un agregado útil a este modulo, porque los "
+"bancos Franceses\n"
+"ahora están progresivamente adoptando el formato IBAN internacional en vez "
+"de el Formato RIB.\n"
+"Los códigos RIB y IBAN para una sola cuenta puede ser entrado mediante la "
+"grabación de dos Cuentas de\n"
+"Bancos en OpenERP: La primera con el tipo 'RIB', la segunda con el tipo "
+"'IBAN'. \n"
 
 #. module: base
 #: model:ir.model,name:base.model_ir_actions_report_xml
 #: selection:ir.ui.menu,action:0
 msgid "ir.actions.report.xml"
-msgstr ""
+msgstr "ir.actions.report.xml"
 
 #. module: base
 #: model:res.country,name:base.ps
 msgid "Palestinian Territory, Occupied"
-msgstr ""
+msgstr "Territorio Palestino Ocupado"
 
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_l10n_ch
 msgid "Switzerland - Accounting"
-msgstr ""
+msgstr "Suiza - Contabilidad"
 
 #. module: base
 #: field:res.bank,zip:0
@@ -5137,18 +5292,18 @@ msgstr ""
 #: field:res.partner.address,zip:0
 #: field:res.partner.bank,zip:0
 msgid "Zip"
-msgstr ""
+msgstr "C.P."
 
 #. module: base
 #: view:ir.module.module:0
 #: field:ir.module.module,author:0
 msgid "Author"
-msgstr ""
+msgstr "Autor"
 
 #. module: base
 #: view:res.lang:0
 msgid "%c - Appropriate date and time representation."
-msgstr ""
+msgstr "%c - Representación apropiada de fecha y hora."
 
 #. module: base
 #: code:addons/base/res/res_config.py:388
@@ -5158,31 +5313,34 @@ msgid ""
 "\n"
 "Click 'Continue' and enjoy your OpenERP experience..."
 msgstr ""
+"Su base de datos está ahora completamente configurada.\n"
+"\n"
+"Haga clic en 'Continuar' y disfrute de su experiencia OpenERP ..."
 
 #. module: base
 #: model:ir.module.category,description:base.module_category_marketing
 msgid "Helps you manage your marketing campaigns step by step."
-msgstr ""
+msgstr "Le ayuda a gestionar sus campañas de marketing paso a paso."
 
 #. module: base
 #: selection:base.language.install,lang:0
 msgid "Hebrew / עִבְרִי"
-msgstr ""
+msgstr "Hebreo / עִבְרִי"
 
 #. module: base
 #: model:res.country,name:base.bo
 msgid "Bolivia"
-msgstr ""
+msgstr "Bolivia"
 
 #. module: base
 #: model:res.country,name:base.gh
 msgid "Ghana"
-msgstr ""
+msgstr "Ghana"
 
 #. module: base
 #: field:res.lang,direction:0
 msgid "Direction"
-msgstr ""
+msgstr "Dirección"
 
 #. module: base
 #: view:ir.actions.act_window:0
@@ -5195,34 +5353,35 @@ msgstr ""
 #: model:ir.ui.menu,name:base.menu_action_ui_view
 #: view:ir.ui.view:0
 msgid "Views"
-msgstr ""
+msgstr "Vistas"
 
 #. module: base
 #: view:res.groups:0
 #: field:res.groups,rule_groups:0
 msgid "Rules"
-msgstr ""
+msgstr "Reglas"
 
 #. module: base
 #: field:ir.mail_server,smtp_host:0
 msgid "SMTP Server"
-msgstr ""
+msgstr "Servidor SMTP"
 
 #. module: base
 #: code:addons/base/module/module.py:299
 #, python-format
 msgid "You try to remove a module that is installed or will be installed"
 msgstr ""
+"Está tratando de eliminar un módulo que está instalado o será instalado"
 
 #. module: base
 #: view:base.module.upgrade:0
 msgid "The selected modules have been updated / installed !"
-msgstr ""
+msgstr "¡Los módulos seleccionados han sido actualizados / instalados !"
 
 #. module: base
 #: selection:base.language.install,lang:0
 msgid "Spanish (PR) / Español (PR)"
-msgstr ""
+msgstr "Español (PR) / Español (PR)"
 
 #. module: base
 #: model:ir.module.module,description:base.module_crm_profiling
@@ -5245,11 +5404,30 @@ msgid ""
 "since it's the same which has been renamed.\n"
 "    "
 msgstr ""
+"\n"
+"Este modulo permite a los usuarios realizar la segmentación dentro de los "
+"socios.\n"
+"============================================================================="
+"\n"
+"\n"
+"Estos usan los criterios de perfiles desde el modulo de segmentación "
+"anterior y probar este. \n"
+"Gracias al nuevo concepto de cuestionarios. Usted ahora puede reagrupar "
+"preguntas en un \n"
+"cuestionario y directamente usarlo sobre un socio.\n"
+"\n"
+"Esto también ha sido fusionado con la herramienta de segmentación CRM y SRM "
+"anterior porque ellos \n"
+"estaban superponiendo.\n"
+"\n"
+"    **Nota:** Este modulo no es compatible con el modulo de segmentación, ya "
+"que es el mismo al que se le ha cambiado el nombre.\n"
+"    "
 
 #. module: base
 #: model:res.country,name:base.gt
 msgid "Guatemala"
-msgstr ""
+msgstr "Guatemala"
 
 #. module: base
 #: help:ir.actions.server,message:0
@@ -5258,18 +5436,21 @@ msgid ""
 "the same values as those available in the condition field, e.g. `Dear [[ "
 "object.partner_id.name ]]`"
 msgstr ""
+"Contenido del e-mail, que debe contener expresiones encerradas en dobles "
+"corchetes basadas en los mismos valores disponibles en el campo condición. "
+"Por ejemplo: 'Estimado [[ object.partner_id.name ]]'"
 
 #. 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 ""
+msgstr "Flujos de Trabajo"
 
 #. module: base
 #: model:ir.ui.menu,name:base.next_id_73
 msgid "Purchase"
-msgstr ""
+msgstr "Compra"
 
 #. module: base
 #: selection:base.language.install,lang:0
@@ -5279,33 +5460,33 @@ msgstr ""
 #. module: base
 #: model:ir.model,name:base.model_ir_needaction_mixin
 msgid "ir.needaction_mixin"
-msgstr ""
+msgstr "ir.needaction_mixin"
 
 #. module: base
 #: view:base.language.export:0
 msgid "This file was generated using the universal"
-msgstr ""
+msgstr "Este archivo fue generado usando el universal"
 
 #. module: base
 #: model:res.partner.category,name:base.res_partner_category_7
 msgid "IT Services"
-msgstr ""
+msgstr "Servicios TI"
 
 #. module: base
 #: model:ir.module.category,name:base.module_category_specific_industry_applications
 msgid "Specific Industry Applications"
-msgstr ""
+msgstr "Aplicaciones específicas de la industria"
 
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_google_docs
 msgid "Google Docs integration"
-msgstr ""
+msgstr "Documentos Integrados de Google"
 
 #. module: base
 #: code:addons/base/ir/ir_fields.py:328
 #, python-format
 msgid "name"
-msgstr ""
+msgstr "nombre"
 
 #. module: base
 #: model:ir.module.module,description:base.module_mrp_operations
@@ -5346,22 +5527,22 @@ msgstr ""
 #. module: base
 #: view:res.config.installer:0
 msgid "Skip"
-msgstr ""
+msgstr "Saltar"
 
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_event_sale
 msgid "Events Sales"
-msgstr ""
+msgstr "Eventos de Ventas"
 
 #. module: base
 #: model:res.country,name:base.ls
 msgid "Lesotho"
-msgstr ""
+msgstr "Lesoto"
 
 #. module: base
 #: view:base.language.export:0
 msgid ", or your preferred text editor"
-msgstr ""
+msgstr ", O usted preferiría un editor de texto?"
 
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_crm_partner_assign
@@ -5371,64 +5552,64 @@ msgstr ""
 #. module: base
 #: model:res.country,name:base.ke
 msgid "Kenya"
-msgstr ""
+msgstr "Kenia"
 
 #. module: base
 #: model:ir.actions.act_window,name:base.action_translation
 #: model:ir.ui.menu,name:base.menu_action_translation
 msgid "Translated Terms"
-msgstr ""
+msgstr "Términos traducidos"
 
 #. module: base
 #: selection:base.language.install,lang:0
 msgid "Abkhazian / аҧсуа"
-msgstr ""
+msgstr "Abkhazian / аҧсуа"
 
 #. module: base
 #: view:base.module.configuration:0
 msgid "System Configuration Done"
-msgstr ""
+msgstr "Configuración del sistema realizada"
 
 #. module: base
 #: code:addons/orm.py:1540
 #, python-format
 msgid "Error occurred while validating the field(s) %s: %s"
-msgstr ""
+msgstr "Ha ocurrido un error mientras se validaban los campo(s) %s: %s"
 
 #. module: base
 #: view:ir.property:0
 msgid "Generic"
-msgstr ""
+msgstr "Genérico"
 
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_document_ftp
 msgid "Shared Repositories (FTP)"
-msgstr ""
+msgstr "Repositorios compartidos (FTP)"
 
 #. module: base
 #: model:res.country,name:base.sm
 msgid "San Marino"
-msgstr ""
+msgstr "San Marino"
 
 #. module: base
 #: model:res.country,name:base.bm
 msgid "Bermuda"
-msgstr ""
+msgstr "Bermudas"
 
 #. module: base
 #: model:res.country,name:base.pe
 msgid "Peru"
-msgstr ""
+msgstr "Perú"
 
 #. module: base
 #: selection:ir.model.fields,on_delete:0
 msgid "Set NULL"
-msgstr ""
+msgstr "Establecer a NULL"
 
 #. module: base
 #: view:res.users:0
 msgid "Save"
-msgstr ""
+msgstr "Grabar"
 
 #. module: base
 #: field:ir.actions.report.xml,report_xml:0
@@ -5438,23 +5619,23 @@ msgstr ""
 #. module: base
 #: model:res.country,name:base.bj
 msgid "Benin"
-msgstr ""
+msgstr "Benín"
 
 #. 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 ""
+msgstr "Tipos de cuentas bancarias"
 
 #. module: base
 #: help:ir.sequence,suffix:0
 msgid "Suffix value of the record for the sequence"
-msgstr ""
+msgstr "Valor del sufijo del registro para la secuencia."
 
 #. module: base
 #: help:ir.mail_server,smtp_user:0
 msgid "Optional username for SMTP authentication"
-msgstr ""
+msgstr "Nombre de usuario opcional para la autenticación SMTP"
 
 #. module: base
 #: model:ir.model,name:base.model_ir_actions_actions
@@ -5464,18 +5645,18 @@ msgstr ""
 #. module: base
 #: selection:ir.model.fields,select_level:0
 msgid "Not Searchable"
-msgstr ""
+msgstr "No puede ser buscado"
 
 #. module: base
 #: view:ir.config_parameter:0
 #: field:ir.config_parameter,key:0
 msgid "Key"
-msgstr ""
+msgstr "Clave"
 
 #. module: base
 #: field:res.company,rml_header:0
 msgid "RML Header"
-msgstr ""
+msgstr "Cabecera RML"
 
 #. module: base
 #: help:res.country,address_format:0
@@ -5494,139 +5675,156 @@ msgid ""
 "            \n"
 "%(country_code)s: the code of the country"
 msgstr ""
+"Puede colocar aquí el formato habitual que se usa en las direcciones "
+"pertenecientes a este país.\n"
+"\n"
+"Puede usar patrones de cadena de estilo python con todos los campos de la "
+"dirección (por ejemplo, usar '%(street)s' para mostrar el campo 'street') "
+"más:\n"
+"\n"
+"%(state_name)s: para el nombre de la provincia, región o estado\n"
+"\n"
+"%(state_code)s: para el código de la provincia, región o estado\n"
+"\n"
+"%(country_name)s: para el nombre del país\n"
+"\n"
+"%(country_code)s: para el código del país"
 
 #. module: base
 #: model:res.country,name:base.mu
 msgid "Mauritius"
-msgstr ""
+msgstr "Mauricio"
 
 #. module: base
 #: view:ir.model.access:0
 msgid "Full Access"
-msgstr ""
+msgstr "Acceso completo"
 
 #. 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 ""
+msgstr "Seguridad"
 
 #. module: base
 #: selection:base.language.install,lang:0
 msgid "Portuguese / Português"
-msgstr ""
+msgstr "Portugues / Português"
 
 #. module: base
 #: code:addons/base/ir/ir_model.py:364
 #, python-format
 msgid "Changing the storing system for field \"%s\" is not allowed."
 msgstr ""
+"No está permitido cambiar el sistema de almacenamiento para el campo \"%s\"."
 
 #. module: base
 #: help:res.partner.bank,company_id:0
 msgid "Only if this bank account belong to your company"
-msgstr ""
+msgstr "Sólo si esta cuenta bancaria pertenece a su compañía"
 
 #. module: base
 #: code:addons/base/ir/ir_fields.py:338
 #, python-format
 msgid "Unknown sub-field '%s'"
-msgstr ""
+msgstr "Sub-campo '%s' Desconocido"
 
 #. module: base
 #: model:res.country,name:base.za
 msgid "South Africa"
-msgstr ""
+msgstr "Sudáfrica"
 
 #. module: base
 #: view:ir.module.module:0
 #: selection:ir.module.module,state:0
 #: selection:ir.module.module.dependency,state:0
 msgid "Installed"
-msgstr ""
+msgstr "Instalado"
 
 #. module: base
 #: selection:base.language.install,lang:0
 msgid "Ukrainian / українська"
-msgstr ""
+msgstr "Ucraniano / українська"
 
 #. module: base
 #: model:res.country,name:base.sn
 msgid "Senegal"
-msgstr ""
+msgstr "Senegal"
 
 #. module: base
 #: model:res.country,name:base.hu
 msgid "Hungary"
-msgstr ""
+msgstr "Hungría"
 
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_hr_recruitment
 msgid "Recruitment Process"
-msgstr ""
+msgstr "Proceso de selección"
 
 #. module: base
 #: model:res.country,name:base.br
 msgid "Brazil"
-msgstr ""
+msgstr "Brasil"
 
 #. module: base
 #: view:res.lang:0
 msgid "%M - Minute [00,59]."
-msgstr ""
+msgstr "%M - Minuto [00,59]."
 
 #. module: base
 #: selection:ir.module.module,license:0
 msgid "Affero GPL-3"
-msgstr ""
+msgstr "Affero GPL-3"
 
 #. module: base
 #: field:ir.sequence,number_next:0
 msgid "Next Number"
-msgstr ""
+msgstr "Número siguiente"
 
 #. module: base
 #: help:workflow.transition,condition:0
 msgid "Expression to be satisfied if we want the transition done."
 msgstr ""
+"Expresión que debe ser satisfecha si queremos que la transición sea "
+"realizada."
 
 #. module: base
 #: selection:base.language.install,lang:0
 msgid "Spanish (PA) / Español (PA)"
-msgstr ""
+msgstr "Español (PA) / Español (PA)"
 
 #. module: base
 #: view:res.currency:0
 #: field:res.currency,rate_ids:0
 msgid "Rates"
-msgstr ""
+msgstr "Tasas"
 
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_email_template
 msgid "Email Templates"
-msgstr ""
+msgstr "Plantillas email"
 
 #. module: base
 #: model:res.country,name:base.sy
 msgid "Syria"
-msgstr ""
+msgstr "Siria"
 
 #. module: base
 #: view:res.lang:0
 msgid "======================================================"
-msgstr ""
+msgstr "======================================================"
 
 #. module: base
 #: sql_constraint:ir.model:0
 msgid "Each model must be unique!"
-msgstr ""
+msgstr "¡Cada modelo debe ser único!"
 
 #. module: base
 #: model:ir.module.category,name:base.module_category_localization
 #: model:ir.ui.menu,name:base.menu_localisation
 msgid "Localization"
-msgstr ""
+msgstr "Localización"
 
 #. module: base
 #: model:ir.module.module,description:base.module_web_api
@@ -5636,11 +5834,14 @@ msgid ""
 "================\n"
 "\n"
 msgstr ""
+"\n"
+"Aplicación Web OpenERP.\n"
+"\n"
 
 #. module: base
 #: selection:res.request,state:0
 msgid "draft"
-msgstr ""
+msgstr "borrador"
 
 #. module: base
 #: selection:ir.property,type:0
@@ -5649,12 +5850,12 @@ msgstr ""
 #: field:res.partner,date:0
 #: field:res.request,date_sent:0
 msgid "Date"
-msgstr ""
+msgstr "Fecha"
 
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_event_moodle
 msgid "Event Moodle"
-msgstr ""
+msgstr "Evento Moodle"
 
 #. module: base
 #: model:ir.module.module,description:base.module_email_template
@@ -5705,55 +5906,56 @@ msgstr ""
 #. module: base
 #: model:ir.ui.menu,name:base.menu_partner_category_form
 msgid "Partner Tags"
-msgstr ""
+msgstr "Etiquetas de Socios"
 
 #. module: base
 #: view:res.company:0
 msgid "Preview Header/Footer"
-msgstr ""
+msgstr "Vista Preliminar Cabezera/Pies"
 
 #. module: base
 #: field:ir.ui.menu,parent_id:0
 #: field:wizard.ir.model.menu.create,menu_id:0
 msgid "Parent Menu"
-msgstr ""
+msgstr "Menú padre"
 
 #. module: base
 #: field:res.partner.bank,owner_name:0
 msgid "Account Owner Name"
-msgstr ""
+msgstr "Nombre del propietario de la cuenta"
 
 #. module: base
 #: code:addons/base/ir/ir_model.py:412
 #, python-format
 msgid "Cannot rename column to %s, because that column already exists!"
 msgstr ""
+"¡No se puede renombrar la columna a %s, porqué ya existe esa columna!"
 
 #. module: base
 #: view:ir.attachment:0
 msgid "Attached To"
-msgstr ""
+msgstr "Adjuntado a"
 
 #. module: base
 #: field:res.lang,decimal_point:0
 msgid "Decimal Separator"
-msgstr ""
+msgstr "Separador de decimales"
 
 #. module: base
 #: code:addons/orm.py:5245
 #, python-format
 msgid "Missing required value for the field '%s'."
-msgstr ""
+msgstr "Falta valor requerido para el campo '%s'."
 
 #. module: base
 #: model:ir.model,name:base.model_res_partner_address
 msgid "res.partner.address"
-msgstr ""
+msgstr "res.partner.address"
 
 #. module: base
 #: view:ir.rule:0
 msgid "Write Access Right"
-msgstr ""
+msgstr "Escribir Derechos de Acceso"
 
 #. module: base
 #: model:ir.actions.act_window,help:base.action_res_groups
@@ -5765,54 +5967,60 @@ msgid ""
 "to see. Whether they can have a read, write, create and delete access right "
 "can be managed from here."
 msgstr ""
+"Un grupo es un conjunto de áreas funcionales que se asignarán al usuario "
+"para darle acceso y derechos a aplicaciones específicas y tareas en el "
+"sistema. Puede crear grupos personalizados o editar los existentes para "
+"personalizar la vista de menús que los usuarios podrán ver. La gestión de "
+"los permisos de lectura, escritura, creación y eliminación se hace desde "
+"aquí."
 
 #. module: base
 #: view:ir.filters:0
 #: field:ir.filters,name:0
 msgid "Filter Name"
-msgstr ""
+msgstr "Nombre del filtro"
 
 #. module: base
 #: view:ir.attachment:0
 #: view:res.partner:0
 #: field:res.request,history:0
 msgid "History"
-msgstr ""
+msgstr "Historial"
 
 #. module: base
 #: model:res.country,name:base.im
 msgid "Isle of Man"
-msgstr ""
+msgstr "Isla del Hombre"
 
 #. module: base
 #: help:ir.actions.client,res_model:0
 msgid "Optional model, mostly used for needactions."
-msgstr ""
+msgstr "Modelo opcional, mayormente usado para acciones necesarias."
 
 #. module: base
 #: field:ir.attachment,create_uid:0
 msgid "Creator"
-msgstr ""
+msgstr "Creador"
 
 #. module: base
 #: model:res.country,name:base.bv
 msgid "Bouvet Island"
-msgstr ""
+msgstr "Isla Bouvet"
 
 #. module: base
 #: field:ir.model.constraint,type:0
 msgid "Constraint Type"
-msgstr ""
+msgstr "Tipo de Restrinciones"
 
 #. module: base
 #: field:res.company,child_ids:0
 msgid "Child Companies"
-msgstr ""
+msgstr "Compañías hijas"
 
 #. module: base
 #: model:res.country,name:base.ni
 msgid "Nicaragua"
-msgstr ""
+msgstr "Nicaragua"
 
 #. module: base
 #: model:ir.module.module,description:base.module_stock_invoice_directly
@@ -5826,11 +6034,19 @@ msgid ""
 "wizard if the delivery is to be invoiced.\n"
 "    "
 msgstr ""
+"\n"
+"Asistente de facturación para Entregar.\n"
+"=====================================\n"
+"\n"
+"Cuando usted envía o entrega bienes, este modulo automáticamente lanza el "
+"asistente de facturación\n"
+"si la entrega será facturada.\n"
+"    "
 
 #. module: base
 #: selection:ir.translation,type:0
 msgid "Wizard Button"
-msgstr ""
+msgstr "Botón asistente"
 
 #. module: base
 #: view:ir.model.fields:0
@@ -5838,22 +6054,22 @@ msgstr ""
 #: selection:ir.translation,type:0
 #: field:multi_company.default,field_id:0
 msgid "Field"
-msgstr ""
+msgstr "Campo"
 
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_project_long_term
 msgid "Long Term Projects"
-msgstr ""
+msgstr "Proyectos a largo plazo"
 
 #. module: base
 #: model:res.country,name:base.ve
 msgid "Venezuela"
-msgstr ""
+msgstr "Venezuela"
 
 #. module: base
 #: view:res.lang:0
 msgid "9.  %j              ==> 340"
-msgstr ""
+msgstr "9. %j ==> 340"
 
 #. module: base
 #: model:ir.module.module,description:base.module_auth_signup
@@ -5863,26 +6079,30 @@ msgid ""
 "=======================\n"
 "    "
 msgstr ""
+"\n"
+"Permite a los usuarios iniciar sesión.\n"
+"===============================\n"
+"    "
 
 #. module: base
 #: model:res.country,name:base.zm
 msgid "Zambia"
-msgstr ""
+msgstr "Zambia"
 
 #. module: base
 #: view:ir.actions.todo:0
 msgid "Launch Configuration Wizard"
-msgstr ""
+msgstr "Iniciar asistente de configuración"
 
 #. module: base
 #: model:ir.module.module,summary:base.module_mrp
 msgid "Manufacturing Orders, Bill of Materials, Routing"
-msgstr ""
+msgstr "Ordenes de Producción, Lista de Materiales, Rutas"
 
 #. module: base
 #: view:ir.module.module:0
 msgid "Cancel Upgrade"
-msgstr ""
+msgstr "Cancelar actualización"
 
 #. module: base
 #: model:ir.module.module,description:base.module_report_webkit
@@ -5945,27 +6165,27 @@ msgstr ""
 #. module: base
 #: model:res.groups,name:base.group_sale_salesman_all_leads
 msgid "See all Leads"
-msgstr ""
+msgstr "Ver todos los Conduces"
 
 #. module: base
 #: model:res.country,name:base.ci
 msgid "Ivory Coast (Cote D'Ivoire)"
-msgstr ""
+msgstr "Costa de Marfil"
 
 #. module: base
 #: model:res.country,name:base.kz
 msgid "Kazakhstan"
-msgstr ""
+msgstr "Kazajstán"
 
 #. module: base
 #: view:res.lang:0
 msgid "%w - Weekday number [0(Sunday),6]."
-msgstr ""
+msgstr "%w - Día de la semana [0(domingo),6]."
 
 #. module: base
 #: model:ir.ui.menu,name:base.menu_ir_filters
 msgid "User-defined Filters"
-msgstr ""
+msgstr "Usuario- Filtros Definidos"
 
 #. module: base
 #: field:ir.actions.act_window_close,name:0
@@ -5997,7 +6217,7 @@ msgstr ""
 #: field:workflow,name:0
 #: field:workflow.activity,name:0
 msgid "Name"
-msgstr ""
+msgstr "Nombre"
 
 #. module: base
 #: help:ir.actions.act_window,multi:0
@@ -6005,27 +6225,29 @@ msgid ""
 "If set to true, the action will not be displayed on the right toolbar of a "
 "form view"
 msgstr ""
+"Si se marca esta opción, la acción no se mostrará en la barra de "
+"herramientas de la derecha en la vista formulario."
 
 #. module: base
 #: model:res.country,name:base.ms
 msgid "Montserrat"
-msgstr ""
+msgstr "Montserrat"
 
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_decimal_precision
 msgid "Decimal Precision Configuration"
-msgstr ""
+msgstr "Configuración de la precisión decimal"
 
 #. module: base
 #: 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
 msgid "Application Terms"
-msgstr ""
+msgstr "Términos de la aplicación"
 
 #. module: base
 #: model:ir.actions.act_window,help:base.open_module_tree
@@ -6046,22 +6268,22 @@ msgstr ""
 #: report:ir.module.reference:0
 #: field:ir.translation,module:0
 msgid "Module"
-msgstr ""
+msgstr "Módulo"
 
 #. module: base
 #: selection:base.language.install,lang:0
 msgid "English (UK)"
-msgstr ""
+msgstr "Inglés (Reino Unido)"
 
 #. module: base
 #: selection:base.language.install,lang:0
 msgid "Japanese / 日本語"
-msgstr ""
+msgstr "Japonés / 日本語"
 
 #. module: base
 #: model:ir.model,name:base.model_base_language_import
 msgid "Language Import"
-msgstr ""
+msgstr "Importación de idioma"
 
 #. module: base
 #: help:workflow.transition,act_from:0
@@ -6069,12 +6291,14 @@ msgid ""
 "Source activity. When this activity is over, the condition is tested to "
 "determine if we can start the ACT_TO activity."
 msgstr ""
+"Actividad origen. Cuando esta actividad se ha terminado, se testea la "
+"condición para determinar si se puede empezar la actividad destino ACT_TO."
 
 #. module: base
 #: model:ir.module.category,name:base.module_category_generic_modules_accounting
 #: view:res.company:0
 msgid "Accounting"
-msgstr ""
+msgstr "Contabilidad"
 
 #. module: base
 #: model:ir.module.module,description:base.module_base_vat
@@ -6124,28 +6348,28 @@ msgstr ""
 #. module: base
 #: model:ir.model,name:base.model_ir_actions_act_window_view
 msgid "ir.actions.act_window.view"
-msgstr ""
+msgstr "ir.actions.act_window.view"
 
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_web
 #: report:ir.module.reference:0
 msgid "Web"
-msgstr ""
+msgstr "Web"
 
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_lunch
 msgid "Lunch Orders"
-msgstr ""
+msgstr "Pedidos de comida"
 
 #. module: base
 #: selection:base.language.install,lang:0
 msgid "English (CA)"
-msgstr ""
+msgstr "Inglés (Canadá)"
 
 #. module: base
 #: model:ir.module.category,name:base.module_category_human_resources
 msgid "Human Resources"
-msgstr ""
+msgstr "Recursos humanos"
 
 #. module: base
 #: model:ir.module.module,description:base.module_l10n_syscohada
@@ -6167,6 +6391,23 @@ msgid ""
 "    Replica of Democratic Congo, Senegal, Chad, Togo.\n"
 "    "
 msgstr ""
+"\n"
+"Este modulo implementa el plan de contabilidad para el área OHADA.\n"
+"===================================================================\n"
+"    \n"
+"Esto le permite a cualquier empresa o asociación gestionar su contabilidad "
+"financiera.\n"
+"\n"
+"Los países que usan OHADA son los siguientes:\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"
+"    "
 
 #. module: base
 #: view:ir.translation:0
diff --git a/openerp/addons/base/i18n/fr.po b/openerp/addons/base/i18n/fr.po
index b115ee3555b..a33e3507161 100644
--- a/openerp/addons/base/i18n/fr.po
+++ b/openerp/addons/base/i18n/fr.po
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2012-12-03 16:01+0000\n"
-"PO-Revision-Date: 2012-12-04 13:28+0000\n"
+"PO-Revision-Date: 2012-12-05 19:56+0000\n"
 "Last-Translator: Quentin THEURET <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: 2012-12-05 05:18+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-06 04:38+0000\n"
+"X-Generator: Launchpad (build 16341)\n"
 
 #. module: base
 #: model:ir.module.module,description:base.module_account_check_writing
@@ -129,10 +129,10 @@ msgid ""
 msgstr ""
 "\n"
 "Ce module ajoute des fabricants et des attributs sur le formulaire produit.\n"
-"==========================================================\n"
+"===========================================================================\n"
 "\n"
 "Vous pouvez maintenant définir pour un produit:\n"
-"-------------------------------------------------------------------\n"
+"-----------------------------------------------\n"
 "    * un fabricant\n"
 "    * le nom du produit chez le fabricant\n"
 "    * le code produit chez le fabricant\n"
@@ -153,7 +153,7 @@ msgid ""
 msgstr ""
 "\n"
 "Ce module ajoute les utilisateurs Google dans res.user.\n"
-"========================================\n"
+"=======================================================\n"
 
 #. module: base
 #: help:res.partner,employee:0
@@ -212,7 +212,7 @@ msgid ""
 msgstr ""
 "\n"
 "Génère vos factures à partir des dépenses et des feuilles de temps.\n"
-"=====================================================\n"
+"===================================================================\n"
 "\n"
 "Module pour générer les factures basées sur les coûts (RH, dépenses…).\n"
 "\n"
@@ -254,7 +254,7 @@ msgid ""
 msgstr ""
 "\n"
 "Le module générique de Gestion de la Relation Client d'OpenERP\n"
-"===================================================\n"
+"==============================================================\n"
 "Cette application permet à un groupe de personnes de gérer intelligemment et "
 "efficacement les pistes, les opportunités, les réunions et les appels "
 "téléphoniques.\n"
@@ -278,7 +278,7 @@ msgstr ""
 "futures se fassent au bon endroit.\n"
 "\n"
 "Le tableau de bord GRC inclura :\n"
-"--------------------------------------------\n"
+"--------------------------------\n"
 "* Le revenu planifié par étape et par utilisateur (graphique)\n"
 "* Les opportunités par étape (graphique)\n"
 
@@ -364,7 +364,7 @@ msgid ""
 msgstr ""
 "\n"
 "Comptabilité chilienne et mise en place des taxes pour le Chili\n"
-"================================================\n"
+"===============================================================\n"
 "Plan comptable chilien et taxes en accord avec la législation en vigueur.\n"
 "\n"
 "    "
@@ -418,10 +418,10 @@ msgid ""
 msgstr ""
 "\n"
 "Ajoute des informations de date additionnelles au commandes de vente.\n"
-"==========================================================\n"
+"=====================================================================\n"
 "\n"
 "Vous pouvez ajouter les dates suivantes à un bon de commande:\n"
-"-----------------------------------------------------------\n"
+"-------------------------------------------------------------\n"
 "    * Date de la demande\n"
 "    * Date de confirmation\n"
 "    * Date Effective\n"
@@ -486,7 +486,7 @@ msgid ""
 msgstr ""
 "\n"
 "Installateur invisible pour la base de connaissances\n"
-"==========================================\n"
+"====================================================\n"
 "\n"
 "Rend disponible la configuration de l’application des connaissances depuis "
 "l'endroit où vous\n"
@@ -514,7 +514,7 @@ msgstr ""
 "Permet d'ajouter des méthodes de livraison dans les commandes de vente et "
 "dans les livraisons.\n"
 "============================================================================="
-"\n"
+"=================\n"
 "\n"
 "Vous pouvez définir vos propres transporteurs et grilles de prix de "
 "livraison. Quand vous créez \n"
@@ -701,7 +701,7 @@ msgid ""
 msgstr ""
 "\n"
 "Module de définition des comptes analytiques.\n"
-"========================================\n"
+"=============================================\n"
 "\n"
 "Dans OpenERP, les comptes analytiques sont liés à des comptes financiers "
 "mais sont traités\n"
@@ -734,14 +734,14 @@ msgid ""
 msgstr ""
 "\n"
 "Gestion et organisation d'événements\n"
-"=================================\n"
+"====================================\n"
 "\n"
 "Le module 'event' vous permet d'organiser efficacement des événements et "
 "toutes les tâches liées : planification, suivi des inscriptions,\n"
 "des présences, etc.\n"
 "\n"
 "Fonctionnalités clés\n"
-"----------------------------\n"
+"--------------------\n"
 "* Gestion des événements et des inscriptions\n"
 "* Utilisation d'e-mails pour automatiquement confirmer et envoyer des "
 "accusés de réception pour chaque inscription à un événement\n"
@@ -941,10 +941,10 @@ msgid ""
 msgstr ""
 "\n"
 "Comptabilité et gestion financière\n"
-"================================\n"
+"==================================\n"
 "\n"
 "Le module de comptabilité et de finance couvre :\n"
-"---------------------------------------------------------------------\n"
+"------------------------------------------------\n"
 "    * Comptabilité générale\n"
 "    * Comptabilité de coût / comptabilité analytique\n"
 "    * Comptabilité de tiers\n"
@@ -955,8 +955,7 @@ msgstr ""
 "    * Lettrages par partenaire\n"
 "\n"
 "Il créé également un tableau de bord pour les comptables qui inclut :\n"
-"-----------------------------------------------------------------------------"
-"------------------\n"
+"---------------------------------------------------------------------\n"
 "    * Une liste des factures clients à approuver\n"
 "    * L'analyse de la société\n"
 "    * Un graphe de la trésorerie\n"
@@ -1008,7 +1007,7 @@ msgid ""
 msgstr ""
 "\n"
 "Module LinkedIn pour OpenERP Web.\n"
-"===============================\n"
+"=================================\n"
 "Ce module fournit l'intégration de LinkedIn avec OpenERP.\n"
 "        "
 
@@ -1155,7 +1154,7 @@ msgid ""
 msgstr ""
 "\n"
 "Gère les absences et les demandes de congés\n"
-"=======================================\n"
+"===========================================\n"
 "\n"
 "Cette application contrôle la programmation des congés de votre société. Il "
 "permet aux employés de faire des demandes de congés. Ensuite, les managers "
@@ -1315,7 +1314,7 @@ msgid ""
 msgstr ""
 "\n"
 "Module de pointage des heures pour les employés.\n"
-"==========================================\n"
+"================================================\n"
 "\n"
 "Comptabilise les temps de présence des employés sur la base des\n"
 "pointages (Entrée / Sorties) réalisés.\n"
@@ -1759,7 +1758,7 @@ msgstr ""
 "dans la configuration du serveur.\n"
 "\n"
 "Paramètres de configuration du serveur :\n"
-"-------------------------------\n"
+"----------------------------------------\n"
 "[webdav]:\n"
 "+++++++++ \n"
 "    * enable = True ; Sert le webdav à travers les serveurs http(s)\n"
@@ -1835,7 +1834,7 @@ msgstr ""
 "Ce module ajoute un menu pour les réclamations et les fonctionnalités pour "
 "votre portail si les modules claim et portal sont installés.\n"
 "============================================================================="
-"=======================================\n"
+"==========================================================\n"
 "    "
 
 #. module: base
@@ -1929,7 +1928,7 @@ msgid ""
 msgstr ""
 "\n"
 "Le module de base pour gérer les repas.\n"
-"====================================\n"
+"=======================================\n"
 "\n"
 "Des sociétés commandent des sandwiches, des pizzas et d'autres repas, à des "
 "fournisseurs, pour leurs employés pour leur offrir plus de commodités.\n"
@@ -2148,7 +2147,7 @@ msgstr ""
 "Ce module fournit le plan comptable standard pour l'Autriche qui est basé "
 "sur le modèle BMF.gv.at.\n"
 "============================================================================="
-"======================== \n"
+"===================== \n"
 "Veuillez garder à l'esprit que vous devez le revoir et l'adapter avec votre "
 "comptable avant de l'utiliser dans un environnement de production.\n"
 
@@ -2171,7 +2170,7 @@ msgid ""
 msgstr ""
 "\n"
 "Droits d'accès à la comptabilité\n"
-"==========================\n"
+"================================\n"
 "Cela donne à l'administrateur les droits d'accès à toutes les "
 "fonctionnalités comptables telles que les mouvements comptables et le plan "
 "de comptes.\n"
@@ -2268,7 +2267,7 @@ msgstr ""
 "Ce module ajoute les outils de partage générique pour votre base de données "
 "OpenERP actuelle.\n"
 "============================================================================="
-"============\n"
+"================\n"
 "\n"
 "Il ajoute spécifiquement un bouton 'Partager' qui est disponible dans le "
 "client web pour\n"
@@ -2376,7 +2375,8 @@ msgstr ""
 "\n"
 "Synchronisation les entrées dans les tâches avec les entrées dans les "
 "feuilles de temps.\n"
-"=========================================================================\n"
+"============================================================================="
+"===========\n"
 "\n"
 "Ce module vous permet de transférer les entrées sous les tâches définies "
 "pour la gestion de\n"
@@ -2455,7 +2455,7 @@ msgid ""
 msgstr ""
 "\n"
 "Module de base pour gérer le plan comptable pour l'Équateur dans OpenERP.\n"
-"==============================================================\n"
+"=========================================================================\n"
 "\n"
 "Module pour la comptabilité équatorienne\n"
 "    "
@@ -2506,13 +2506,13 @@ msgid ""
 msgstr ""
 "\n"
 "Gestion des devis et des commandes de vente\n"
-"=========================================\n"
+"===========================================\n"
 "\n"
 "Ce module fait le lien entre les ventes et les applications de gestion des "
 "entrepôts.\n"
 "\n"
 "Préférences\n"
-"-------------------\n"
+"-----------\n"
 "* Expédition : Choix de la livraison en une fois ou une livraison partielle\n"
 "* Facturation : Choisir comment les factures vont être payées\n"
 "* Incoterms : International Commercial terms\n"
@@ -2901,7 +2901,7 @@ msgid ""
 msgstr ""
 "\n"
 "Gestion de Support (Helpdesk).\n"
-"====================\n"
+"==============================\n"
 "\n"
 "Les dossiers et le traitement des réclamations sont bien suivis et tracés "
 "avec le Helpdesk.\n"
@@ -4260,7 +4260,7 @@ msgstr "De droite à gauche"
 #. module: base
 #: model:res.country,name:base.sx
 msgid "Sint Maarten (Dutch part)"
-msgstr ""
+msgstr "Saint-Martin (partie néerlandaise)"
 
 #. module: base
 #: view:ir.actions.act_window:0
diff --git a/openerp/addons/base/i18n/ru.po b/openerp/addons/base/i18n/ru.po
index a1e1ce55102..fe6bcfdc94d 100644
--- a/openerp/addons/base/i18n/ru.po
+++ b/openerp/addons/base/i18n/ru.po
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2012-12-03 16:01+0000\n"
-"PO-Revision-Date: 2012-12-01 11:25+0000\n"
-"Last-Translator: Chertykov Denis <chertykov@gmail.com>\n"
+"PO-Revision-Date: 2012-12-05 09:43+0000\n"
+"Last-Translator: Denis Karataev <dskarataev@gmail.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 04:59+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-06 04:38+0000\n"
+"X-Generator: Launchpad (build 16341)\n"
 
 #. module: base
 #: model:ir.module.module,description:base.module_account_check_writing
@@ -1638,7 +1638,7 @@ msgstr "Настройка нижнего колонтитула отчета"
 #. module: base
 #: field:ir.translation,comments:0
 msgid "Translation comments"
-msgstr ""
+msgstr "Комментарии перевода"
 
 #. module: base
 #: model:ir.module.module,description:base.module_lunch
@@ -5663,6 +5663,9 @@ msgid ""
 "              <p>You should try others search criteria.</p>\n"
 "            "
 msgstr ""
+"<p><b>Модули не найдены!</b></p>\n"
+"              <p>Попробуйте поискать по другим критериям.</p>\n"
+"            "
 
 #. module: base
 #: model:ir.model,name:base.model_ir_module_module
@@ -7490,6 +7493,11 @@ msgid ""
 "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
@@ -8407,6 +8415,8 @@ msgid ""
 "Translation features are unavailable until you install an extra OpenERP "
 "translation."
 msgstr ""
+"Возможности перевода не доступны до тех пор, пока вы не установите "
+"расширенный OpenERP перевод."
 
 #. module: base
 #: model:ir.module.module,description:base.module_l10n_nl
diff --git a/openerp/addons/base/i18n/zh_CN.po b/openerp/addons/base/i18n/zh_CN.po
index f00c358a87e..a8a2b9fdee0 100644
--- a/openerp/addons/base/i18n/zh_CN.po
+++ b/openerp/addons/base/i18n/zh_CN.po
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2012-12-03 16:01+0000\n"
-"PO-Revision-Date: 2012-12-04 13:01+0000\n"
+"PO-Revision-Date: 2012-12-05 15:59+0000\n"
 "Last-Translator: ccdos <ccdos@163.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-05 05:18+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-06 04:39+0000\n"
+"X-Generator: Launchpad (build 16341)\n"
 
 #. module: base
 #: model:ir.module.module,description:base.module_account_check_writing
@@ -88,7 +88,7 @@ msgstr "帮助您管理项目、跟踪任务、生成计划等"
 #. module: base
 #: model:ir.module.module,summary:base.module_point_of_sale
 msgid "Touchscreen Interface for Shops"
-msgstr "商店的触摸屏接口"
+msgstr "触摸屏接口的POS 系统"
 
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_l10n_in_hr_payroll
@@ -896,6 +896,14 @@ msgid ""
 "              </p>\n"
 "            "
 msgstr ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                点击此处在你的地址本中增加一个新的联系人。\n"
+"              </p><p>\n"
+"                Openerp可以帮助你轻松的跟踪所有与客户相关的活动：\n"
+"                例如讨论，商业机会的历史记录，\n"
+"                文档，等等。\n"
+"              </p>\n"
+"            "
 
 #. module: base
 #: model:ir.module.module,description:base.module_web_linkedin
@@ -2645,6 +2653,18 @@ msgid ""
 "    * Date\n"
 "    "
 msgstr ""
+"\n"
+"为你的分析帐目设定缺省值。\n"
+"==============================================\n"
+"\n"
+"基于以下规则时，允许自动选择分析帐目：\n"
+"---------------------------------------------------------------------\n"
+"    * 产品\n"
+"    * 合作伙伴\n"
+"    * 用户\n"
+"    * 公司\n"
+"    * 日期\n"
+"    "
 
 #. module: base
 #: field:res.company,rml_header1:0

From 538834d9c34e3bd54e984e8bf03953260399a22e Mon Sep 17 00:00:00 2001
From: Launchpad Translations on behalf of openerp <>
Date: Thu, 6 Dec 2012 04:54:06 +0000
Subject: [PATCH 065/110] Launchpad automatic translations update.

bzr revid: launchpad_translations_on_behalf_of_openerp-20121206044118-gn1y04y813l6skve
bzr revid: launchpad_translations_on_behalf_of_openerp-20121206045406-0pzpwmkyyxre13hn
---
 addons/account/i18n/de.po                     |  101 +-
 addons/account/i18n/it.po                     |  215 +-
 addons/account_accountant/i18n/es.po          |   11 +-
 addons/account_analytic_analysis/i18n/es.po   |   86 +-
 addons/account_analytic_default/i18n/es.po    |   10 +-
 addons/account_analytic_plans/i18n/fr.po      |   22 +-
 addons/account_voucher/i18n/fr.po             |   17 +-
 .../analytic_contract_hr_expense/i18n/es.po   |   72 +
 addons/audittrail/i18n/ru.po                  |   20 +-
 addons/base_report_designer/i18n/fr.po        |   10 +-
 addons/base_status/i18n/fr.po                 |   24 +-
 addons/board/i18n/fr.po                       |   34 +-
 addons/crm/i18n/nb.po                         |  119 +-
 addons/crm/i18n/nl.po                         |   26 +-
 addons/crm/i18n/ru.po                         |   33 +-
 addons/crm/i18n/zh_CN.po                      |   20 +-
 addons/fleet/i18n/nl.po                       |   88 +-
 addons/fleet/i18n/pt.po                       | 1895 +++++++++++++++++
 addons/hr/i18n/zh_CN.po                       |    8 +-
 addons/hr_attendance/i18n/zh_CN.po            |   16 +-
 addons/hr_holidays/i18n/zh_CN.po              |   26 +-
 addons/hr_timesheet/i18n/lt.po                |   10 +-
 addons/knowledge/i18n/pt.po                   |   18 +-
 addons/l10n_be_coda/i18n/pt.po                |   14 +-
 addons/l10n_be_invoice_bba/i18n/pt.po         |  146 ++
 addons/mail/i18n/ru.po                        |  243 ++-
 addons/note/i18n/pt.po                        |  288 +++
 addons/note_pad/i18n/pt.po                    |   28 +
 addons/portal_crm/i18n/pt.po                  |  552 +++++
 addons/portal_event/i18n/pt.po                |   59 +
 addons/sale/i18n/pt.po                        |   99 +-
 addons/sale/i18n/ru.po                        |  247 ++-
 addons/sale/i18n/sl.po                        |   10 +-
 addons/web/i18n/nl.po                         |  130 +-
 addons/web/i18n/pt.po                         |  268 +--
 addons/web/i18n/ru.po                         |  110 +-
 addons/web_calendar/i18n/nl.po                |   10 +-
 addons/web_kanban/i18n/nl.po                  |    9 +-
 addons/web_linkedin/i18n/pt.po                |   26 +-
 addons/web_shortcuts/i18n/pt.po               |   25 +
 addons/web_view_editor/i18n/nl.po             |   16 +-
 41 files changed, 4269 insertions(+), 892 deletions(-)
 create mode 100644 addons/analytic_contract_hr_expense/i18n/es.po
 create mode 100644 addons/fleet/i18n/pt.po
 create mode 100644 addons/l10n_be_invoice_bba/i18n/pt.po
 create mode 100644 addons/note/i18n/pt.po
 create mode 100644 addons/note_pad/i18n/pt.po
 create mode 100644 addons/portal_crm/i18n/pt.po
 create mode 100644 addons/portal_event/i18n/pt.po
 create mode 100644 addons/web_shortcuts/i18n/pt.po

diff --git a/addons/account/i18n/de.po b/addons/account/i18n/de.po
index 61f701026c2..4e3759713c4 100644
--- a/addons/account/i18n/de.po
+++ b/addons/account/i18n/de.po
@@ -7,15 +7,15 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2012-12-03 16:02+0000\n"
-"PO-Revision-Date: 2012-12-04 23:19+0000\n"
+"PO-Revision-Date: 2012-12-05 22:09+0000\n"
 "Last-Translator: Thorsten Vocks (OpenBig.org) <thorsten.vocks@big-"
 "consulting.net>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-05 05:19+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-06 04:40+0000\n"
+"X-Generator: Launchpad (build 16341)\n"
 
 #. module: account
 #: model:process.transition,name:account.process_transition_supplierreconcilepaid0
@@ -1949,6 +1949,14 @@ msgid ""
 "should choose 'Round per line' because you certainly want the sum of your "
 "tax-included line subtotals to be equal to the total amount with taxes."
 msgstr ""
+"Bei Auswahl 'Runden pro Zeile': Die Steuern werden je Zeile berechnet und "
+"gerundet, um abschließend die Steuer des Auftrags über die Summe der "
+"einzelnen Auftragszeilen zu berechnen. Bei Auswahl 'Global Runden': Die "
+"Steuern werden je Zeile berechnet, summiert und abschließend global für den "
+"gesamten Auftrag gerundet. Falls Sie zu Brutto Preisen inklusive Steuern "
+"verkaufen möchten, sollten Sie 'Runden pro Zeile' einstellen, um "
+"sicherzustellen dass der Gesamtbetrag des Auftrags der Summe aller einzelnen "
+"Auftragszeilen entspricht."
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_report_account_type_sales_tree_all
@@ -2213,7 +2221,7 @@ msgstr "Betrag Haben"
 #: field:account.bank.statement,message_ids:0
 #: field:account.invoice,message_ids:0
 msgid "Messages"
-msgstr ""
+msgstr "Mitteilungen"
 
 #. module: account
 #: view:account.vat.declaration:0
@@ -2444,7 +2452,7 @@ msgstr "Gültig"
 #: field:account.bank.statement,message_follower_ids:0
 #: field:account.invoice,message_follower_ids:0
 msgid "Followers"
-msgstr ""
+msgstr "Followers"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_print_journal
@@ -5858,7 +5866,7 @@ msgstr ""
 #: code:addons/account/account_invoice.py:1335
 #, python-format
 msgid "%s <b>paid</b>."
-msgstr ""
+msgstr "%s <b>bezahlt</b>."
 
 #. module: account
 #: view:account.financial.report:0
@@ -7493,7 +7501,7 @@ msgstr ""
 #: code:addons/account/account_invoice.py:1321
 #, python-format
 msgid "Customer invoice"
-msgstr ""
+msgstr "Ausgangsrechnung"
 
 #. module: account
 #: selection:account.account.type,report_type:0
@@ -9267,6 +9275,8 @@ msgid ""
 "You cannot use this general account in this journal, check the tab 'Entry "
 "Controls' on the related journal."
 msgstr ""
+"Sie können dieses Sachkonto nicht in diesem Journal buchen, prüfen Sie den "
+"Aktenreiter 'Kontierungsrichtlinie'."
 
 #. module: account
 #: view:account.payment.term.line:0
@@ -9327,6 +9337,18 @@ msgid ""
 "              </p>\n"
 "            "
 msgstr ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Klicken Sie um ein Journal hinzuzufügen.\n"
+"              </p><p>\n"
+"                In einem Journal werden alle Geschäftsvorfälle in "
+"chronologischer Reihenfolge aufgezeichnet und gebucht.\n"
+"              </p><p>\n"
+"                Ein typisches Unternehmen hat dazu jeweils ein Journal je "
+"Zahlungsmethode (Barkasse, Bank, Scheck), ein\n"
+"               Journal für alle Eingangsrechnungen und Ausgangsrechnungen "
+"und ein Journal für sonstige Buchungen auf Sachkonten.\n"
+"              </p>\n"
+"            "
 
 #. module: account
 #: model:ir.model,name:account.model_account_fiscalyear_close_state
@@ -9460,6 +9482,9 @@ msgid ""
 "computed. Because it is space consuming, we do not allow to use it while "
 "doing a comparison."
 msgstr ""
+"Diese Erweiterung bietet Ihnen weitere Details Ihrer berechneten Salden. "
+"Aufgrund der Speicherintensität ist dieses nicht während der Durchführung "
+"von vergleichenden Auswertungen erlaubt."
 
 #. module: account
 #: model:ir.model,name:account.model_account_fiscalyear_close
@@ -9476,6 +9501,8 @@ msgstr "Die Kurzbezeichnung muss eindeutig sein für jedes Unternehmen."
 #: help:product.template,property_account_expense:0
 msgid "This account will be used to value outgoing stock using cost price."
 msgstr ""
+"Dieses Konto wird gebucht zur Bewertung der Ausgangslieferungen mit dem "
+"Standardpreis."
 
 #. module: account
 #: view:account.invoice:0
@@ -9513,7 +9540,7 @@ msgstr "Erlaubte Finanzkonten (leer = alle)"
 #. module: account
 #: field:account.config.settings,sale_tax_rate:0
 msgid "Sales tax (%)"
-msgstr ""
+msgstr "Umsatzsteuer (%)"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_analytic_account_tree2
@@ -9538,6 +9565,17 @@ msgid ""
 "              </p>\n"
 "            "
 msgstr ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Klicken Sie zur Definition von wiederkehrenden Buchungen.\n"
+"              </p><p>\n"
+"                Eine wiederkehrende Buchung erfolgt immer regelmässig "
+"ausgehend von einem bestimmten\n"
+"                Datum, z.B. dem Datum der Vertragsunterzeichnung oder dem "
+"vereinbarten Vertragsbeginn. \n"
+"                Sie können durch wiederkehrende Buchungen automatisch "
+"buchen.\n"
+"              </p>\n"
+"            "
 
 #. module: account
 #: view:account.journal:0
@@ -9579,6 +9617,8 @@ msgid ""
 "This allows you to check writing and printing.\n"
 "                This installs the module account_check_writing."
 msgstr ""
+"Erstellen und drucken Sie Scheckformulare.\n"
+"                Hierdurch wird das Modul account_check_writing installiert."
 
 #. module: account
 #: model:res.groups,name:account.group_account_invoice
@@ -9619,6 +9659,7 @@ msgstr ""
 #, python-format
 msgid "The account move (%s) for centralisation has been confirmed."
 msgstr ""
+"Der Buchungssatz (%s) für die zusammengefasste Gegenbuchung wurde bestätigt."
 
 #. module: account
 #: report:account.analytic.account.journal:0
@@ -9657,6 +9698,9 @@ msgid ""
 "created. If you leave that field empty, it will use the same journal as the "
 "current invoice."
 msgstr ""
+"Wählen Sie das Journal für die Buchung der Gutschriften. Wenn Sie das Feld "
+"frei lassen, wird das gleiche Journal wie für die korrespondierende Rechnung "
+"genutzt."
 
 #. module: account
 #: help:account.bank.statement.line,sequence:0
@@ -9685,7 +9729,7 @@ msgstr "Falsches Modell!"
 #: view:account.tax.code.template:0
 #: view:account.tax.template:0
 msgid "Tax Template"
-msgstr ""
+msgstr "Steuern Vorlage"
 
 #. module: account
 #: field:account.invoice.refund,period:0
@@ -9705,6 +9749,10 @@ msgid ""
 "some non legal fields or you must unreconcile first.\n"
 "%s."
 msgstr ""
+"Sie können einen bereits ausgeglichenen Beleg nicht mehr modifizieren. "
+"Entweder können Sie nur die unkritischen Daten anpassen oder den "
+"vorgenommenen Ausgleich vorher stornieren. \n"
+"%s"
 
 #. module: account
 #: help:account.financial.report,sign:0
@@ -9748,7 +9796,7 @@ msgstr "Rechnungen im Entwurf werden geprüft, gebucht und gedruckt."
 #: field:account.bank.statement,message_is_follower:0
 #: field:account.invoice,message_is_follower:0
 msgid "Is a Follower"
-msgstr ""
+msgstr "Ist ein Follower"
 
 #. module: account
 #: view:account.move:0
@@ -9764,11 +9812,14 @@ msgid ""
 "You cannot select an account type with a deferral method different of "
 "\"Unreconciled\" for accounts with internal type \"Payable/Receivable\"."
 msgstr ""
+"Konfigurationsfehler !\n"
+"Sie können für Konten mit der Kontoart Debitor / Kreditor  nur den Kontotyp "
+"\"nicht beglichen\" für die Jahreswechsel Methode auswählen."
 
 #. module: account
 #: field:account.config.settings,has_fiscal_year:0
 msgid "Company has a fiscal year"
-msgstr ""
+msgstr "Das Unternehmen hat ein Geschäftsjahr"
 
 #. module: account
 #: help:account.tax,child_depend:0
@@ -9784,7 +9835,7 @@ msgstr ""
 #: code:addons/account/account.py:633
 #, python-format
 msgid "You cannot deactivate an account that contains journal items."
-msgstr ""
+msgstr "Sie können kein Konto mit vorhandenen Buchungssätzen deaktivieren."
 
 #. module: account
 #: selection:account.tax,applicable_type:0
@@ -9863,6 +9914,10 @@ msgid ""
 "chart\n"
 "                        of accounts."
 msgstr ""
+"Sobald Sie eine Rechnung buchen, können Sie keine Änderungen\n"
+"                        vornehmen. Den gebuchten Rechnungen wird eine "
+"eindeutige\n"
+"                        Nummer zugewiesen und Buchungssätze werden generiert."
 
 #. module: account
 #: model:process.node,note:account.process_node_bankstatement0
@@ -9877,7 +9932,7 @@ msgstr "Beende Status für Geschäftsjahr und Perioden"
 #. module: account
 #: field:account.config.settings,purchase_refund_journal_id:0
 msgid "Purchase refund journal"
-msgstr ""
+msgstr "Lieferantengutschrift Journal"
 
 #. module: account
 #: view:account.analytic.line:0
@@ -9901,7 +9956,7 @@ msgstr "Erzeuge Rechnung"
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_configuration_installer
 msgid "Configure Accounting Data"
-msgstr ""
+msgstr "Konfiguration Buchhaltung"
 
 #. module: account
 #: field:wizard.multi.charts.accounts,purchase_tax_rate:0
@@ -9921,6 +9976,8 @@ msgid ""
 "Please check that the field 'Internal Transfers Account' is set on the "
 "payment method '%s'."
 msgstr ""
+"Bitte überprüfen Sie, ob ein 'durchlaufender Posten' für die Zahlungsmethode "
+"'%s' hinterlegt wurde."
 
 #. module: account
 #: field:account.vat.declaration,display_detail:0
@@ -10233,11 +10290,14 @@ msgid ""
 "The period is invalid. Either some periods are overlapping or the period's "
 "dates are not matching the scope of the fiscal year."
 msgstr ""
+"Fehler !\n"
+"Die Periode wurde nicht korrekt angelegt. Entweder überschneiden sich "
+"Perioden, oder der Zeitraum passt zeitlich nicht in dieses Geschäftsjahr."
 
 #. module: account
 #: report:account.overdue:0
 msgid "There is nothing due with this customer."
-msgstr ""
+msgstr "Es gibt keine fälligen Rechnungen für den Kunden."
 
 #. module: account
 #: help:account.tax,account_paid_id:0
@@ -10260,7 +10320,7 @@ msgstr ""
 #. module: account
 #: report:account.invoice:0
 msgid "Source"
-msgstr ""
+msgstr "Herkunft"
 
 #. module: account
 #: selection:account.model.line,date_maturity:0
@@ -10283,11 +10343,13 @@ msgid ""
 "This field contains the information related to the numbering of the journal "
 "entries of this journal."
 msgstr ""
+"In diesem Feld finden Sie die Nummernfolge, die dann für die Nummerierung "
+"der Buchungszeilen in diesem Journal angewendet wird."
 
 #. module: account
 #: field:account.invoice,sent:0
 msgid "Sent"
-msgstr ""
+msgstr "Gesendet"
 
 #. module: account
 #: view:account.unreconcile.reconcile:0
@@ -10303,7 +10365,7 @@ msgstr "Allgemeine Auswertung"
 #: field:account.config.settings,default_sale_tax:0
 #: field:account.config.settings,sale_tax:0
 msgid "Default sale tax"
-msgstr ""
+msgstr "Standard Umsatzsteuer"
 
 #. module: account
 #: report:account.overdue:0
@@ -10315,6 +10377,7 @@ msgstr "Saldo:"
 #, python-format
 msgid "Cannot create moves for different companies."
 msgstr ""
+"Es können keine Buchungen für verschiedene Unternehmen generiert werden."
 
 #. module: account
 #: view:account.invoice.report:0
@@ -10390,7 +10453,7 @@ msgstr "Ende der Periode"
 #. module: account
 #: model:account.account.type,name:account.account_type_expense_view1
 msgid "Expense View"
-msgstr ""
+msgstr "Aufwendungen Ansicht"
 
 #. module: account
 #: field:account.move.line,date_maturity:0
diff --git a/addons/account/i18n/it.po b/addons/account/i18n/it.po
index e35ba6b56a0..1e822b5817e 100644
--- a/addons/account/i18n/it.po
+++ b/addons/account/i18n/it.po
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2012-12-03 16:02+0000\n"
-"PO-Revision-Date: 2012-12-02 23:01+0000\n"
+"PO-Revision-Date: 2012-12-06 00:09+0000\n"
 "Last-Translator: Sergio Corato <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: 2012-12-04 05:23+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-06 04:40+0000\n"
+"X-Generator: Launchpad (build 16341)\n"
 
 #. module: account
 #: model:process.transition,name:account.process_transition_supplierreconcilepaid0
@@ -205,6 +205,14 @@ msgid ""
 "              </p>\n"
 "            "
 msgstr ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click per aggiungere una periodo fiscale.\n"
+"              </p><p>\n"
+"                Un periodo contabile è tipicamente un mese o un "
+"quadrimestre.\n"
+"                Di solito corrisponde ai periodi di liquidazione IVA.\n"
+"              </p>\n"
+"            "
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_view_created_invoice_dashboard
@@ -479,7 +487,7 @@ msgstr ""
 #: code:addons/account/static/src/xml/account_move_line_quickadd.xml:8
 #, python-format
 msgid "Period :"
-msgstr ""
+msgstr "Periodo :"
 
 #. module: account
 #: field:account.account.template,chart_template_id:0
@@ -1008,6 +1016,8 @@ msgid ""
 "                                                  opening/closing fiscal "
 "year process."
 msgstr ""
+"Non è possibile annullare le registrazioni del sezionale se sono state "
+"generate dal processo di apertura/chiusura dell'anno fiscale."
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_subscription_form_new
@@ -1214,6 +1224,8 @@ msgid ""
 "Check this box if you don't want any tax related to this tax code to appear "
 "on invoices"
 msgstr ""
+"Selezionare questa casella per non far apparire alcuna imposta collegata a "
+"questo codice imposta nelle fatture"
 
 #. module: account
 #: field:report.account.receivable,name:0
@@ -1341,7 +1353,7 @@ msgstr "Centralizzazione del credito"
 #: model:ir.actions.act_window,name:account.action_account_tax_code_template_form
 #: model:ir.ui.menu,name:account.menu_action_account_tax_code_template_form
 msgid "Tax Code Templates"
-msgstr "Template di codici tasse"
+msgstr "Template di codici imposte"
 
 #. module: account
 #: constraint:account.move.line:0
@@ -1349,6 +1361,9 @@ msgid ""
 "The amount expressed in the secondary currency must be positif when journal "
 "item are debit and negatif when journal item are credit."
 msgstr ""
+"L'importo espresso nella valuta secondaria deve essere positivo quando la "
+"voce del sezionale è un debito e positivo quando la voce del sezionale è un "
+"credito."
 
 #. module: account
 #: view:account.invoice.cancel:0
@@ -1597,7 +1612,7 @@ msgstr "Conto di credito"
 #: code:addons/account/account.py:767
 #, python-format
 msgid "%s (copy)"
-msgstr ""
+msgstr "%s (copia)"
 
 #. module: account
 #: selection:account.balance.report,display_account:0
@@ -1876,6 +1891,17 @@ msgid ""
 "should choose 'Round per line' because you certainly want the sum of your "
 "tax-included line subtotals to be equal to the total amount with taxes."
 msgstr ""
+"Se è selezionato 'Arrotondamento per Riga' : per ogni imposta, l'ammontare "
+"dell'imposta sarà prima calcolato e arrotondato per ogni riga di Ordine "
+"d'aquisto/Ordine di vendita/fattura e poi questi ammontari arrotondati "
+"saranno sommati, formando quindi l'ammontare totale per quella tassa. Se è "
+"selezionato 'Arrotondamento Globale': per ogni imposta, il totale "
+"dell'imposta sarà calcolato per ogni riga di Ordine d'aquisto/Ordine di "
+"vendita/fattura, poi questi ammontari saranno sommati e infine questo somma "
+"totale sarà arrotondata. Se le vendite vengono effettuate con l'imposta "
+"compresa, sarebbe meglio selezionare 'Arrotondamento per riga' perchè "
+"l'ammontare totale dei sub-totali delle righe compreso l'imposta sarà uguale "
+"al totale imposte comprese."
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_report_account_type_sales_tree_all
@@ -2030,6 +2056,9 @@ msgid ""
 "Select a configuration package to setup automatically your\n"
 "                        taxes and chart of accounts."
 msgstr ""
+"Selezionare un pacchetto di configurazione per configurare automaticamente "
+"le\n"
+"                        imposte e il piano dei conti."
 
 #. module: account
 #: view:account.analytic.account:0
@@ -2127,7 +2156,7 @@ msgstr "Registrazione in 'Bozza'"
 #. module: account
 #: field:account.config.settings,module_account_check_writing:0
 msgid "Pay your suppliers by check"
-msgstr ""
+msgstr "Pagamento dei fornitori tramite assegno"
 
 #. module: account
 #: field:account.move.line.reconcile,credit:0
@@ -2150,6 +2179,13 @@ msgid ""
 "useful because it enables you to preview at any time the tax that you owe at "
 "the start and end of the month or quarter."
 msgstr ""
+"Questo menu stampa una dichiarazione delle imposte basata sulle fatture o "
+"sui pagamenti. Selezionare uno o più periodi dell'anno fiscale. "
+"L'informazione richiesta per una dichiarazione delle imposte è creata "
+"automaticamente da OpenERP dalle fatture (o dai pagamenti, in alcuni paesi). "
+"Questi dati sono aggiornati in tempo reale. E' molto utile perchè permette "
+"di verificare in ogni momento le imposte che sono dovute all'inizio e alla "
+"fine del mese o quadrimestre."
 
 #. module: account
 #: code:addons/account/account.py:408
@@ -2353,6 +2389,8 @@ msgid ""
 "You cannot change the type of account to '%s' type as it contains journal "
 "items!"
 msgstr ""
+"Non è possibile cambiare il tipo di conto al tipo '%s' perchè contiene "
+"registrazioni nel sezionale!"
 
 #. module: account
 #: model:ir.model,name:account.model_account_aged_trial_balance
@@ -3352,7 +3390,7 @@ msgstr "Linea 2:"
 #. module: account
 #: field:wizard.multi.charts.accounts,only_one_chart_template:0
 msgid "Only One Chart Template Available"
-msgstr ""
+msgstr "Solo Un Piano dei Conti Disponibile"
 
 #. module: account
 #: view:account.chart.template:0
@@ -3365,7 +3403,7 @@ msgstr "Bilancio spese"
 #: field:account.bank.statement,message_summary:0
 #: field:account.invoice,message_summary:0
 msgid "Summary"
-msgstr ""
+msgstr "Riepilogo"
 
 #. module: account
 #: help:account.invoice,period_id:0
@@ -3487,7 +3525,7 @@ msgstr "Seleziona l'Anno Fiscale"
 #: view:account.config.settings:0
 #: view:account.installer:0
 msgid "Date Range"
-msgstr ""
+msgstr "Intervallo date"
 
 #. module: account
 #: view:account.period:0
@@ -3539,7 +3577,7 @@ msgstr ""
 #: code:addons/account/account.py:2620
 #, python-format
 msgid "There is no parent code for the template account."
-msgstr ""
+msgstr "Manca il codice padre del template del conto."
 
 #. module: account
 #: help:account.chart.template,code_digits:0
@@ -3567,6 +3605,8 @@ msgstr "Sempre"
 msgid ""
 "Full accounting features: journals, legal statements, chart of accounts, etc."
 msgstr ""
+"Complete funzionalità contabili: sezionali, stampe fiscali, piano dei conti, "
+"ecc."
 
 #. module: account
 #: view:account.analytic.line:0
@@ -3623,7 +3663,7 @@ msgstr "File elettronico"
 #. module: account
 #: field:account.config.settings,has_chart_of_accounts:0
 msgid "Company has a chart of accounts"
-msgstr ""
+msgstr "L'azienda ha un piano dei conti"
 
 #. module: account
 #: view:account.payment.term.line:0
@@ -3639,12 +3679,12 @@ msgstr "Mastrino  partner"
 #: code:addons/account/account_invoice.py:1330
 #, python-format
 msgid "%s <b>created</b>."
-msgstr ""
+msgstr "%s <b>creato</b>."
 
 #. module: account
 #: view:account.period:0
 msgid "Account Period"
-msgstr ""
+msgstr "Periodo Contabile"
 
 #. module: account
 #: help:account.account,currency_id:0
@@ -3673,7 +3713,7 @@ msgstr "Template di piano dei conti"
 #. module: account
 #: view:account.bank.statement:0
 msgid "Transactions"
-msgstr ""
+msgstr "Movimenti"
 
 #. module: account
 #: model:ir.model,name:account.model_account_unreconcile_reconcile
@@ -3774,7 +3814,7 @@ msgstr "Configurazione Modulo di Contabilià"
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_vat_declaration
 msgid "Account Tax Declaration"
-msgstr ""
+msgstr "Dichiarazione Imposte"
 
 #. module: account
 #: view:account.payment.term.line:0
@@ -3789,6 +3829,9 @@ msgid ""
 "centralized counterpart box in the related journal from the configuration "
 "menu."
 msgstr ""
+"Non è possibile creare una fattura su un sezionale centralizzato. "
+"Deselezionare la casella di contropartita centralizzata nel relativo "
+"sezionale dal menu di configurazione."
 
 #. module: account
 #: field:account.bank.statement,balance_start:0
@@ -3813,7 +3856,7 @@ msgstr "Chiudi un periodo"
 #: view:account.bank.statement:0
 #: field:account.cashbox.line,subtotal_opening:0
 msgid "Opening Subtotal"
-msgstr ""
+msgstr "Subtotale di Apertura"
 
 #. module: account
 #: constraint:account.move.line:0
@@ -3821,6 +3864,8 @@ msgid ""
 "You cannot create journal items with a secondary currency without recording "
 "both 'currency' and 'amount currency' field."
 msgstr ""
+"Non è possibile creare registrazioni nel sezionale con una valuta secondaria "
+"senza registrazione sia il campo 'valuta' che quello 'importo valuta'."
 
 #. module: account
 #: field:account.financial.report,display_detail:0
@@ -3848,6 +3893,10 @@ msgid ""
 "quotations with a button \"Pay with  Paypal\" in automated emails or through "
 "the OpenERP portal."
 msgstr ""
+"Un conto Paypal (email) per ricevere pagamenti online (carta di credito, "
+"ecc.) Se selezionato, il cliente potrà pagare le fatture o i preventivo con "
+"un tasto \"Paga con Paypal\" con email automatiche o tramite il portale "
+"OpenERP."
 
 #. module: account
 #: code:addons/account/account_move_line.py:535
@@ -3925,6 +3974,8 @@ msgid ""
 "You have not supplied enough arguments to compute the initial balance, "
 "please select a period and a journal in the context."
 msgstr ""
+"Non sono stati forniti abbastanza argomenti per calcolare il saldo iniziale, "
+"è necessario selezionare un periodo e un sezionale nel contesto."
 
 #. module: account
 #: model:ir.actions.report.xml,name:account.account_transfers
@@ -3934,7 +3985,7 @@ msgstr "Trasferimenti"
 #. module: account
 #: field:account.config.settings,expects_chart_of_accounts:0
 msgid "This company has its own chart of accounts"
-msgstr ""
+msgstr "Questa azienda ha il proprio piano dei conti"
 
 #. module: account
 #: view:account.chart:0
@@ -3945,7 +3996,7 @@ msgstr "Piano dei conti"
 #: view:cash.box.out:0
 #: model:ir.actions.act_window,name:account.action_cash_box_out
 msgid "Take Money Out"
-msgstr ""
+msgstr "Preleva Contanti"
 
 #. module: account
 #: report:account.vat.declaration:0
@@ -4042,6 +4093,7 @@ msgstr "Crea conto"
 #, python-format
 msgid "The entries to reconcile should belong to the same company."
 msgstr ""
+"Le registrazioni da riconciliare dovrebbero appartenere alla stessa azienda."
 
 #. module: account
 #: field:account.invoice.tax,tax_amount:0
@@ -4062,6 +4114,7 @@ msgstr "Dettaglio"
 #: help:account.config.settings,default_purchase_tax:0
 msgid "This purchase tax will be assigned by default on new products."
 msgstr ""
+"Questa imposta sugli acquisti sarà assegnata di default sui nuovi prodotti."
 
 #. module: account
 #: report:account.invoice:0
@@ -4090,7 +4143,7 @@ msgstr ""
 #. module: account
 #: model:ir.model,name:account.model_account_journal_cashbox_line
 msgid "account.journal.cashbox.line"
-msgstr ""
+msgstr "account.journal.cashbox.line"
 
 #. module: account
 #: model:ir.model,name:account.model_account_partner_reconcile_process
@@ -4230,7 +4283,7 @@ msgstr ""
 #. module: account
 #: field:account.config.settings,group_check_supplier_invoice_total:0
 msgid "Check the total of supplier invoices"
-msgstr ""
+msgstr "Verifica il totale sulle fatture dei fornitori"
 
 #. module: account
 #: view:account.tax:0
@@ -4244,6 +4297,8 @@ msgid ""
 "When monthly periods are created. The status is 'Draft'. At the end of "
 "monthly period it is in 'Done' status."
 msgstr ""
+"Quando i periodo mensili sono creati. Lo stato è 'Bozza'. Alla fine del "
+"periodo mensile è nello stato 'Completato'."
 
 #. module: account
 #: view:account.invoice.report:0
@@ -4270,7 +4325,7 @@ msgstr "Conto di debito"
 #: code:addons/account/wizard/account_fiscalyear_close.py:88
 #, python-format
 msgid "The periods to generate opening entries cannot be found."
-msgstr ""
+msgstr "Mancano i periodi per creare le registrazioni di apertura."
 
 #. module: account
 #: model:process.node,name:account.process_node_supplierpaymentorder0
@@ -4314,7 +4369,7 @@ msgstr "Fattore di Moltiplicazione del codice tassa"
 #. module: account
 #: field:account.config.settings,complete_tax_set:0
 msgid "Complete set of taxes"
-msgstr ""
+msgstr "Set completo di imposte"
 
 #. module: account
 #: field:account.account,name:0
@@ -4332,7 +4387,7 @@ msgstr "Nome"
 #: code:addons/account/installer.py:94
 #, python-format
 msgid "No unconfigured company !"
-msgstr ""
+msgstr "Nessuna azienda non configurata !"
 
 #. module: account
 #: field:res.company,expects_chart_of_accounts:0
@@ -4375,7 +4430,7 @@ msgstr ""
 #: help:account.bank.statement,message_ids:0
 #: help:account.invoice,message_ids:0
 msgid "Messages and communication history"
-msgstr ""
+msgstr "Storico messaggi e comunicazioni"
 
 #. module: account
 #: help:account.journal,analytic_journal_id:0
@@ -4410,13 +4465,15 @@ msgid ""
 "Check this box if you don't want any tax related to this tax Code to appear "
 "on invoices."
 msgstr ""
+"Selezionare questa casella per non far apparire alcuna imposta relativa a "
+"questo Codice imposta nelle fatture."
 
 #. module: account
 #: code:addons/account/account_move_line.py:1048
 #: code:addons/account/account_move_line.py:1131
 #, python-format
 msgid "You cannot use an inactive account."
-msgstr ""
+msgstr "Non è possibile utilizzare un conto disattivo."
 
 #. module: account
 #: model:ir.actions.act_window,name:account.open_board_account
@@ -4447,7 +4504,7 @@ msgstr "Sottoconti consolidati"
 #: code:addons/account/wizard/account_invoice_refund.py:146
 #, python-format
 msgid "Insufficient Data!"
-msgstr ""
+msgstr "Dati Insufficienti!"
 
 #. module: account
 #: help:account.account,unrealized_gain_loss:0
@@ -4484,7 +4541,7 @@ msgstr "titolo"
 #. module: account
 #: selection:account.invoice.refund,filter_refund:0
 msgid "Create a draft credit note"
-msgstr ""
+msgstr "Creare una bozza di nota di credito"
 
 #. module: account
 #: view:account.invoice:0
@@ -4516,7 +4573,7 @@ msgstr "Patrimonio"
 #. module: account
 #: view:account.config.settings:0
 msgid "Accounting & Finance"
-msgstr ""
+msgstr "Contabilità & Finanza"
 
 #. module: account
 #: view:account.invoice.confirm:0
@@ -4543,7 +4600,7 @@ msgstr "(Bisogna annullare la riconciliazione per aprire la fattura)"
 #. module: account
 #: field:account.tax,account_analytic_collected_id:0
 msgid "Invoice Tax Analytic Account"
-msgstr ""
+msgstr "Conto Analitico Imposte Fattura"
 
 #. module: account
 #: field:account.chart,period_from:0
@@ -4581,6 +4638,8 @@ msgid ""
 "If you put \"%(year)s\" in the prefix, it will be replaced by the current "
 "year."
 msgstr ""
+"Se viene inserito \"%(year)s\" nel prefisso, sarà sostituito dal corrente "
+"anno."
 
 #. module: account
 #: help:account.account,active:0
@@ -4618,6 +4677,9 @@ msgid ""
 "9.99 EUR, whereas a decimal precision of 4 will allow journal  entries like: "
 "0.0231 EUR."
 msgstr ""
+"Per esempio, una precisione decimale di 2 permette registrazioni contabili "
+"come: 9,99 EURO, mentre una precisione decimale di 4 permette registrazioni "
+"contabili come: 0,0231 EURO."
 
 #. module: account
 #: view:account.payment.term.line:0
@@ -4693,6 +4755,8 @@ msgid ""
 "Error!\n"
 "You cannot create recursive Tax Codes."
 msgstr ""
+"Errore!\n"
+"Non è possibile creare Conti Imposta ricorsivi."
 
 #. module: account
 #: constraint:account.period:0
@@ -4700,6 +4764,8 @@ msgid ""
 "Error!\n"
 "The duration of the Period(s) is/are invalid."
 msgstr ""
+"Errore!\n"
+"La durata del Periodo/i non è valida."
 
 #. module: account
 #: field:account.entries.report,month:0
@@ -4717,11 +4783,13 @@ msgstr "Mese"
 #, python-format
 msgid "You cannot change the code of account which contains journal items!"
 msgstr ""
+"Non è possibile cambiare un codice conto che contiene registrazioni "
+"contabili!"
 
 #. module: account
 #: field:account.config.settings,purchase_sequence_prefix:0
 msgid "Supplier invoice sequence"
-msgstr ""
+msgstr "Sequenza delle fatture fornitori"
 
 #. module: account
 #: code:addons/account/account_invoice.py:571
@@ -4731,13 +4799,15 @@ msgid ""
 "Cannot find a chart of account, you should create one from Settings\\"
 "Configuration\\Accounting menu."
 msgstr ""
+"Non è possibile trovare un piano dei conti, è consigliabile crearne uno dal "
+"menu Configurazione\\Configurazione\\Contabilità."
 
 #. module: account
 #: field:account.entries.report,product_uom_id:0
 #: view:analytic.entries.report:0
 #: field:analytic.entries.report,product_uom_id:0
 msgid "Product Unit of Measure"
-msgstr ""
+msgstr "Unità di Misura Prodotto"
 
 #. module: account
 #: field:res.company,paypal_account:0
@@ -4775,7 +4845,7 @@ msgstr "Lasciare vuoto per utilizzare la data corrente"
 #: view:account.bank.statement:0
 #: field:account.cashbox.line,subtotal_closing:0
 msgid "Closing Subtotal"
-msgstr ""
+msgstr "Subtotale di Chiusura"
 
 #. module: account
 #: field:account.tax,base_code_id:0
@@ -4788,6 +4858,8 @@ msgstr "Conto imponibile"
 msgid ""
 "You have to provide an account for the write off/exchange difference entry."
 msgstr ""
+"E' necessario fornire un conto per le registrazioni di storni/differenze di "
+"cambio."
 
 #. module: account
 #: help:res.company,paypal_account:0
@@ -4829,14 +4901,14 @@ msgstr "Spunta se volete visualizzare anche i Conti con salto a zero."
 #. module: account
 #: field:account.move.reconcile,opening_reconciliation:0
 msgid "Opening Entries Reconciliation"
-msgstr ""
+msgstr "Riconciliazione Apertura Contabile"
 
 #. module: account
 #. openerp-web
 #: code:addons/account/static/src/xml/account_move_reconciliation.xml:24
 #, python-format
 msgid "Last Reconciliation:"
-msgstr ""
+msgstr "Ultima Riconciliazione:"
 
 #. module: account
 #: model:ir.ui.menu,name:account.menu_finance_periodical_processing
@@ -4860,11 +4932,13 @@ msgid ""
 "There is currently no company without chart of account. The wizard will "
 "therefore not be executed."
 msgstr ""
+"Non c'è alcuna azienda senza un piano dei conti. La procedura non verrà "
+"quindi eseguita."
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_wizard_multi_chart
 msgid "Set Your Accounting Options"
-msgstr ""
+msgstr "Imposta Configurazioni Contabili"
 
 #. module: account
 #: model:ir.model,name:account.model_account_chart
@@ -4945,7 +5019,7 @@ msgstr "Note di credito"
 #: model:ir.actions.act_window,name:account.action_account_manual_reconcile
 #: model:ir.ui.menu,name:account.menu_manual_reconcile_bank
 msgid "Journal Items to Reconcile"
-msgstr ""
+msgstr "Voci Sezionale da Riconciliare"
 
 #. module: account
 #: sql_constraint:account.period:0
@@ -4955,12 +5029,12 @@ msgstr "Nell'azienda il nome del periodo deve essere univoco!"
 #. module: account
 #: help:wizard.multi.charts.accounts,currency_id:0
 msgid "Currency as per company's country."
-msgstr ""
+msgstr "Valute per paese dell'azienda."
 
 #. module: account
 #: view:account.tax:0
 msgid "Tax Computation"
-msgstr ""
+msgstr "Calcolo Imposte"
 
 #. module: account
 #: view:wizard.multi.charts.accounts:0
@@ -4997,6 +5071,8 @@ msgid ""
 "Error!\n"
 "You cannot create an account which has parent account of different company."
 msgstr ""
+"Errore!\n"
+"Non è possibile creare un conto con un conto-padre di un'altra azienda."
 
 #. module: account
 #: code:addons/account/account_invoice.py:615
@@ -5032,7 +5108,7 @@ msgstr "Modelli per operazioni periodiche"
 #. module: account
 #: view:account.tax:0
 msgid "Children/Sub Taxes"
-msgstr ""
+msgstr "Imposte Figlie/Sottoimposte"
 
 #. module: account
 #: xsl:account.transfer:0
@@ -5057,7 +5133,7 @@ msgstr "Funziona come default account per la rilevazione del credito"
 #. module: account
 #: view:cash.box.out:0
 msgid "Describe why you take money from the cash register:"
-msgstr ""
+msgstr "Descrivere la causale di prelievo dal registro di cassa:"
 
 #. module: account
 #: selection:account.invoice,state:0
@@ -5074,12 +5150,12 @@ msgstr "Esempio"
 #. module: account
 #: help:account.config.settings,group_proforma_invoices:0
 msgid "Allows you to put invoices in pro-forma state."
-msgstr ""
+msgstr "Permette di impostare fatture nello stato proforma."
 
 #. module: account
 #: view:account.journal:0
 msgid "Unit Of Currency Definition"
-msgstr ""
+msgstr "Definizione dell'Unita della Valuta"
 
 #. module: account
 #: view:account.tax.template:0
@@ -5093,6 +5169,8 @@ msgid ""
 "It adds the currency column on report if the currency differs from the "
 "company currency."
 msgstr ""
+"Aggiunge la colonna della valuta nel report se la valuta è diversa da quella "
+"aziendale."
 
 #. module: account
 #: code:addons/account/account.py:3336
@@ -5132,7 +5210,7 @@ msgstr "Fattura annullata"
 #. module: account
 #: view:account.invoice:0
 msgid "My Invoices"
-msgstr ""
+msgstr "Mie Fatture"
 
 #. module: account
 #: selection:account.bank.statement,state:0
@@ -5142,7 +5220,7 @@ msgstr "Nuovo"
 #. module: account
 #: view:wizard.multi.charts.accounts:0
 msgid "Sale Tax"
-msgstr ""
+msgstr "Imposta sulle Vendite"
 
 #. module: account
 #: field:account.tax,ref_tax_code_id:0
@@ -5167,6 +5245,9 @@ msgid ""
 "printed it comes to 'Printed' status. When all transactions are done, it "
 "comes in 'Done' status."
 msgstr ""
+"Al momento della creazione dei periodi del sezionale. Lo stato è 'Bozza'. Se "
+"un report viene stampato lo stato diventa 'Stampato'. Quando tutte le "
+"transazioni sono fatte, lo stato diventa 'Completato'."
 
 #. module: account
 #: code:addons/account/account.py:3147
@@ -5201,6 +5282,7 @@ msgstr "Fatture"
 #: help:account.config.settings,expects_chart_of_accounts:0
 msgid "Check this box if this company is a legal entity."
 msgstr ""
+"Selezionare questa casella se l'azienda ha una personalità giuridica."
 
 #. module: account
 #: model:account.account.type,name:account.conf_account_type_chk
@@ -5246,7 +5328,7 @@ msgstr "Controllo"
 #: view:validate.account.move:0
 #: view:validate.account.move.lines:0
 msgid "or"
-msgstr ""
+msgstr "o"
 
 #. module: account
 #: view:account.invoice.report:0
@@ -5316,6 +5398,8 @@ msgid ""
 "Set the account that will be set by default on invoice tax lines for "
 "invoices. Leave empty to use the expense account."
 msgstr ""
+"Imposta il conto che sarà usato di default nelle righe imposta nelle "
+"fatture. Lasciare vuoto per usare il conto di costo."
 
 #. module: account
 #: code:addons/account/account.py:889
@@ -5331,7 +5415,7 @@ msgstr "Scritture da rivedere"
 #. module: account
 #: selection:res.company,tax_calculation_rounding_method:0
 msgid "Round Globally"
-msgstr ""
+msgstr "Arrotonda Globalmente"
 
 #. module: account
 #: field:account.bank.statement,message_comment_ids:0
@@ -5339,7 +5423,7 @@ msgstr ""
 #: field:account.invoice,message_comment_ids:0
 #: help:account.invoice,message_comment_ids:0
 msgid "Comments and emails"
-msgstr ""
+msgstr "Commenti ed Email"
 
 #. module: account
 #: view:account.bank.statement:0
@@ -5359,6 +5443,8 @@ msgid ""
 "Please verify the price of the invoice !\n"
 "The encoded total does not match the computed total."
 msgstr ""
+"Verificare il prezzo sulla fattura !\n"
+"Il totale inserito non corrisponde con il totale calcolato."
 
 #. module: account
 #: field:account.account,active:0
@@ -5773,7 +5859,7 @@ msgstr ""
 #: field:account.tax,child_depend:0
 #: field:account.tax.template,child_depend:0
 msgid "Tax on Children"
-msgstr "Calcolo su tasse figlie"
+msgstr "Calcolo su imposte figlie"
 
 #. module: account
 #: help:res.partner,last_reconciliation_date:0
@@ -6198,7 +6284,7 @@ msgstr "Genera scritture di apertura"
 #: help:account.tax,type:0
 #: help:account.tax.template,type:0
 msgid "The computation method for the tax amount."
-msgstr "Il metodo di calcolo per l'importo delle tasse"
+msgstr "Il metodo di calcolo per l'importo delle imposte"
 
 #. module: account
 #: view:account.payment.term.line:0
@@ -6404,7 +6490,7 @@ msgstr "L'espressione \"%(...)s\" nel modello è errata!"
 #. module: account
 #: view:account.tax.template:0
 msgid "Compute Code for Taxes Included Prices"
-msgstr "Codice per il calcolo delle tasse incluse nel prezzo"
+msgstr "Codice per il calcolo delle imposte incluse nel prezzo"
 
 #. module: account
 #: help:account.bank.statement,balance_end:0
@@ -6915,10 +7001,10 @@ msgid ""
 "higher ones. The order is important if you have a tax that has several tax "
 "children. In this case, the evaluation order is important."
 msgstr ""
-"Il campo sequenza è usato per ordinare le linee delle tasse dalla più "
-"piccola alla più grande. Questo ordinamento è importante se hai delle tasse "
-"che hanno tasse \"figlio\". In questo caso, l'ordine con cui vendono "
-"valutate è importante."
+"Il campo sequenza è usato per ordinare le linee delle imposte dalla più "
+"piccola alla più grande. Questo ordinamento è importante se hai delle "
+"imposte che hanno imposte \"figlio\". In questo caso, l'ordine con cui "
+"vendono valutate è importante."
 
 #. module: account
 #: code:addons/account/account.py:1405
@@ -7562,7 +7648,7 @@ msgstr "Vendite"
 #: selection:account.subscription,state:0
 #: selection:report.invoice.created,state:0
 msgid "Done"
-msgstr "Fatto"
+msgstr "Completato"
 
 #. module: account
 #: code:addons/account/account.py:1278
@@ -7636,7 +7722,7 @@ msgstr ""
 #. module: account
 #: report:account.invoice:0
 msgid "Taxes:"
-msgstr "Imposte"
+msgstr "Imposte:"
 
 #. module: account
 #: code:addons/account/account_invoice.py:440
@@ -8365,9 +8451,10 @@ msgid ""
 "to the higher ones. The order is important if you have a tax with several "
 "tax children. In this case, the evaluation order is important."
 msgstr ""
-"Il campo delle sequenze è usato per ordinare le linee delle tasse dalla più "
-"bassa alla più alta. L'ordine è importante se si ha una tassa con differenti "
-"sottotasse figlie. in questo caso, l'ordine di valutazione è importante."
+"Il campo delle sequenze è usato per ordinare le linee delle imposte dalla "
+"più bassa alla più alta. L'ordine è importante se si ha un'imposta con "
+"differenti sotto-imposte figlie. in questo caso, l'ordine di valutazione è "
+"importante."
 
 #. module: account
 #: model:ir.model,name:account.model_account_cashbox_line
@@ -8624,8 +8711,8 @@ msgid ""
 "Set if the amount of tax must be included in the base amount before "
 "computing the next taxes."
 msgstr ""
-"Selezionare se l'importo della tassa debba essere incluso nell'importo base "
-"prima di calcolare le prossime tasse"
+"Selezionare se l'importo dell'imposta debba essere incluso nell'importo base "
+"prima di calcolare le prossime imposte"
 
 #. module: account
 #: code:addons/account/account.py:3138
@@ -8760,7 +8847,7 @@ msgstr "int.Tipo"
 #. module: account
 #: field:account.move.line,tax_amount:0
 msgid "Tax/Base Amount"
-msgstr "Tassa/Imponibile"
+msgstr "Imponibile"
 
 #. module: account
 #: view:account.payment.term.line:0
@@ -9224,7 +9311,7 @@ msgstr ""
 #: model:account.account.type,name:account.data_account_type_expense
 #: model:account.financial.report,name:account.account_financial_report_expense0
 msgid "Expense"
-msgstr "Costo"
+msgstr "Costi"
 
 #. module: account
 #: help:account.chart,fiscalyear:0
diff --git a/addons/account_accountant/i18n/es.po b/addons/account_accountant/i18n/es.po
index 0239523d2ba..ffedffdd81e 100644
--- a/addons/account_accountant/i18n/es.po
+++ b/addons/account_accountant/i18n/es.po
@@ -8,20 +8,19 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-11-24 02:51+0000\n"
-"PO-Revision-Date: 2010-12-26 08:18+0000\n"
-"Last-Translator: Jordi Esteve (www.zikzakmedia.com) "
-"<jesteve@zikzakmedia.com>\n"
+"PO-Revision-Date: 2012-12-05 19:57+0000\n"
+"Last-Translator: Santi (Pexego) <santiago@pexego.es>\n"
 "Language-Team: Spanish <es@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:28+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-06 04:41+0000\n"
+"X-Generator: Launchpad (build 16341)\n"
 
 #. module: account_accountant
 #: model:ir.actions.client,name:account_accountant.action_client_account_menu
 msgid "Open Accounting Menu"
-msgstr ""
+msgstr "Abrir menú de contabilidad"
 
 #~ msgid "Accountant"
 #~ msgstr "Contable"
diff --git a/addons/account_analytic_analysis/i18n/es.po b/addons/account_analytic_analysis/i18n/es.po
index ff45dbbc367..cc070a99890 100644
--- a/addons/account_analytic_analysis/i18n/es.po
+++ b/addons/account_analytic_analysis/i18n/es.po
@@ -7,39 +7,39 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev_rc3\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2012-12-03 16:02+0000\n"
-"PO-Revision-Date: 2012-02-08 19:59+0000\n"
-"Last-Translator: Ana Juaristi Olalde <ajuaristio@gmail.com>\n"
+"PO-Revision-Date: 2012-12-05 20:15+0000\n"
+"Last-Translator: Santi (Pexego) <santiago@pexego.es>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:34+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-06 04:40+0000\n"
+"X-Generator: Launchpad (build 16341)\n"
 
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
 msgid "No order to invoice, create"
-msgstr ""
+msgstr "No hay órdenes para facturar, cree una"
 
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
 msgid "Group By..."
-msgstr "Agrupado por ..."
+msgstr "Agrupar por..."
 
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
 msgid "To Invoice"
-msgstr ""
+msgstr "A facturar"
 
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
 msgid "Remaining"
-msgstr ""
+msgstr "Restante"
 
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
 msgid "Contracts in progress"
-msgstr "Contratos en progreso"
+msgstr "Contratos en proceso"
 
 #. module: account_analytic_analysis
 #: help:account.analytic.account,last_worked_invoiced_date:0
@@ -73,7 +73,7 @@ msgstr ""
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
 msgid "⇒ Invoice"
-msgstr ""
+msgstr "⇒ factura"
 
 #. module: account_analytic_analysis
 #: field:account.analytic.account,ca_invoiced:0
@@ -88,7 +88,7 @@ msgstr "Fecha del último coste facturado"
 #. module: account_analytic_analysis
 #: help:account.analytic.account,fix_price_to_invoice:0
 msgid "Sum of quotations for this contract."
-msgstr ""
+msgstr "Suma de presupuestos para este contrato"
 
 #. module: account_analytic_analysis
 #: help:account.analytic.account,ca_invoiced:0
@@ -99,6 +99,7 @@ msgstr "Importe total facturado al cliente para esta cuenta."
 #: help:account.analytic.account,timesheet_ca_invoiced:0
 msgid "Sum of timesheet lines invoiced for this contract."
 msgstr ""
+"Suma de las líneas de las hojas de servicios facturadas para este contrato"
 
 #. module: account_analytic_analysis
 #: help:account.analytic.account,revenue_per_hour:0
@@ -108,12 +109,12 @@ msgstr "Calculado utilizando la fórmula: Importe facturado / Tiempo total"
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
 msgid "Contracts not assigned"
-msgstr ""
+msgstr "Contratos no asignados"
 
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
 msgid "Partner"
-msgstr ""
+msgstr "Empresa"
 
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
@@ -156,12 +157,12 @@ msgstr ""
 #. module: account_analytic_analysis
 #: help:account.analytic.account,remaining_hours_to_invoice:0
 msgid "Computed using the formula: Maximum Time - Total Invoiced Time"
-msgstr ""
+msgstr "Calculado usando la fórmula: Tiempo máximo - Tiempo total facturado"
 
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
 msgid "Expected"
-msgstr ""
+msgstr "Previsto"
 
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
@@ -174,7 +175,7 @@ msgstr "Cuenta analítica"
 #. module: account_analytic_analysis
 #: help:account.analytic.account,theorical_margin:0
 msgid "Computed using the formula: Theoretical Revenue - Total Costs"
-msgstr ""
+msgstr "Calculado usando la fórmula: Ingreso teórico - Costes totales"
 
 #. module: account_analytic_analysis
 #: field:account.analytic.account,hours_qtt_invoiced:0
@@ -204,7 +205,7 @@ msgstr "Tasa de margen real (%)"
 #. module: account_analytic_analysis
 #: help:account.analytic.account,remaining_hours:0
 msgid "Computed using the formula: Maximum Time - Total Worked Time"
-msgstr ""
+msgstr "Calculado usando la fórmula: Tiempo máximo - Tiempo total trabajado"
 
 #. module: account_analytic_analysis
 #: help:account.analytic.account,hours_quantity:0
@@ -218,23 +219,23 @@ msgstr ""
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
 msgid "Nothing to invoice, create"
-msgstr ""
+msgstr "Nada que facturar, crear"
 
 #. module: account_analytic_analysis
 #: model:ir.actions.act_window,name:account_analytic_analysis.template_of_contract_action
 #: model:ir.ui.menu,name:account_analytic_analysis.menu_template_of_contract_action
 msgid "Template of Contract"
-msgstr ""
+msgstr "Plantilla de contrato"
 
 #. module: account_analytic_analysis
 #: model:res.groups,name:account_analytic_analysis.group_template_required
 msgid "Mandatory use of templates in contracts"
-msgstr ""
+msgstr "Uso obligatorio de plantillas en contratos"
 
 #. module: account_analytic_analysis
 #: field:account.analytic.account,hours_quantity:0
 msgid "Total Worked Time"
-msgstr ""
+msgstr "Tiempo total trabajado"
 
 #. module: account_analytic_analysis
 #: field:account.analytic.account,real_margin:0
@@ -254,7 +255,7 @@ msgstr "Calcula utilizando la fórmula: (Margen real / Costes totales) * 100."
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
 msgid "or view"
-msgstr ""
+msgstr "o ver"
 
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
@@ -271,7 +272,7 @@ msgstr "Mes"
 #: model:ir.actions.act_window,name:account_analytic_analysis.action_hr_tree_invoiced_all
 #: model:ir.ui.menu,name:account_analytic_analysis.menu_action_hr_tree_invoiced_all
 msgid "Time & Materials to Invoice"
-msgstr ""
+msgstr "Tiempo y materiales a facturar"
 
 #. module: account_analytic_analysis
 #: model:ir.actions.act_window,name:account_analytic_analysis.action_account_analytic_overdue_all
@@ -282,12 +283,12 @@ msgstr "Contratos"
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
 msgid "Start Date"
-msgstr ""
+msgstr "Fecha de inicio"
 
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
 msgid "Invoiced"
-msgstr ""
+msgstr "Facturado"
 
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
@@ -306,13 +307,13 @@ msgstr "Contratos pendientes para renovar con el cliente"
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
 msgid "Timesheets"
-msgstr ""
+msgstr "Hojas de servicios"
 
 #. module: account_analytic_analysis
 #: code:addons/account_analytic_analysis/account_analytic_analysis.py:461
 #, python-format
 msgid "Sale Order Lines of %s"
-msgstr ""
+msgstr "Líneas de pedidos de venta de %s"
 
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
@@ -327,7 +328,7 @@ msgstr "Cantidad sobrepasada"
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
 msgid "Status"
-msgstr ""
+msgstr "Estado"
 
 #. module: account_analytic_analysis
 #: field:account.analytic.account,ca_theorical:0
@@ -349,7 +350,7 @@ msgstr ""
 #. module: account_analytic_analysis
 #: model:ir.actions.act_window,name:account_analytic_analysis.action_sales_order
 msgid "Sales Orders"
-msgstr ""
+msgstr "Pedidos de venta"
 
 #. module: account_analytic_analysis
 #: help:account.analytic.account,last_invoice_date:0
@@ -403,6 +404,8 @@ msgid ""
 "Allows you to set the template field as required when creating an analytic "
 "account or a contract."
 msgstr ""
+"Le permite marcar el campo plantilla como obligatorio al crear una cuenta "
+"analítica o contrato"
 
 #. module: account_analytic_analysis
 #: help:account.analytic.account,hours_qtt_invoiced:0
@@ -437,12 +440,12 @@ msgstr ""
 #. module: account_analytic_analysis
 #: field:account.analytic.account,toinvoice_total:0
 msgid "Total to Invoice"
-msgstr ""
+msgstr "Total a facturar"
 
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
 msgid "Sale Orders"
-msgstr ""
+msgstr "Pedidos de venta"
 
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
@@ -452,7 +455,7 @@ msgstr "Abrir"
 #. module: account_analytic_analysis
 #: field:account.analytic.account,invoiced_total:0
 msgid "Total Invoiced"
-msgstr ""
+msgstr "Total facturado"
 
 #. module: account_analytic_analysis
 #: help:account.analytic.account,remaining_ca:0
@@ -463,7 +466,7 @@ msgstr ""
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
 msgid "Responsible"
-msgstr ""
+msgstr "Responsable"
 
 #. module: account_analytic_analysis
 #: field:account.analytic.account,last_invoice_date:0
@@ -506,6 +509,9 @@ msgid ""
 "remaining subtotals which, in turn, are computed as the maximum between "
 "'(Estimation - Invoiced)' and 'To Invoice' amounts"
 msgstr ""
+"Ingresos restantes esperados para este contrato. Calculado como la suma de "
+"los subtotales restantes que, a su vez, se calcula como el máximo entre las "
+"cantidades '(Estimación - facturado)' y  'A facturar'"
 
 #. module: account_analytic_analysis
 #: model:ir.actions.act_window,name:account_analytic_analysis.action_account_analytic_overdue
@@ -516,7 +522,7 @@ msgstr "Contratos a renovar"
 #. module: account_analytic_analysis
 #: help:account.analytic.account,toinvoice_total:0
 msgid " Sum of everything that could be invoiced for this contract."
-msgstr ""
+msgstr " Suma de todo lo que podría ser facturado para este contrato"
 
 #. module: account_analytic_analysis
 #: field:account.analytic.account,theorical_margin:0
@@ -526,7 +532,7 @@ msgstr "Márgen teórico"
 #. module: account_analytic_analysis
 #: field:account.analytic.account,remaining_total:0
 msgid "Total Remaining"
-msgstr ""
+msgstr "Total restante"
 
 #. module: account_analytic_analysis
 #: help:account.analytic.account,real_margin:0
@@ -536,12 +542,12 @@ msgstr "Calculado utilizando la fórmula: Importe facturado - Costes totales."
 #. module: account_analytic_analysis
 #: field:account.analytic.account,hours_qtt_est:0
 msgid "Estimation of Hours to Invoice"
-msgstr ""
+msgstr "Estimación de horas a facturar"
 
 #. module: account_analytic_analysis
 #: field:account.analytic.account,fix_price_invoices:0
 msgid "Fixed Price"
-msgstr ""
+msgstr "Precio fijo"
 
 #. module: account_analytic_analysis
 #: help:account.analytic.account,last_worked_date:0
@@ -556,12 +562,12 @@ msgstr ""
 #. module: account_analytic_analysis
 #: field:sale.config.settings,group_template_required:0
 msgid "Mandatory use of templates."
-msgstr ""
+msgstr "Uso obligatorio de plantillas"
 
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
 msgid "Contracts Having a Partner"
-msgstr ""
+msgstr "Contratos que tienen una empresa"
 
 #. module: account_analytic_analysis
 #: help:account.analytic.account,total_cost:0
@@ -601,7 +607,7 @@ msgstr "Tiempo total"
 #: model:res.groups,comment:account_analytic_analysis.group_template_required
 msgid ""
 "the field template of the analytic accounts and contracts will be required."
-msgstr ""
+msgstr "el campo plantilla de las cuentas analíticas será obligatorio."
 
 #. module: account_analytic_analysis
 #: field:account.analytic.account,invoice_on_timesheets:0
diff --git a/addons/account_analytic_default/i18n/es.po b/addons/account_analytic_default/i18n/es.po
index d9de0a9804e..390bea9a0db 100644
--- a/addons/account_analytic_default/i18n/es.po
+++ b/addons/account_analytic_default/i18n/es.po
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2012-12-03 16:02+0000\n"
-"PO-Revision-Date: 2012-02-08 17:37+0000\n"
-"Last-Translator: Ana Juaristi Olalde <ajuaristio@gmail.com>\n"
+"PO-Revision-Date: 2012-12-05 20:17+0000\n"
+"Last-Translator: Santi (Pexego) <santiago@pexego.es>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:37+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-06 04:40+0000\n"
+"X-Generator: Launchpad (build 16341)\n"
 
 #. module: account_analytic_default
 #: model:ir.actions.act_window,name:account_analytic_default.analytic_rule_action_partner
@@ -31,7 +31,7 @@ msgstr "Agrupar por..."
 #. module: account_analytic_default
 #: help:account.analytic.default,date_stop:0
 msgid "Default end date for this Analytic Account."
-msgstr ""
+msgstr "Fecha de fin por defecto para esta cuenta analítica"
 
 #. module: account_analytic_default
 #: model:ir.model,name:account_analytic_default.model_stock_picking
diff --git a/addons/account_analytic_plans/i18n/fr.po b/addons/account_analytic_plans/i18n/fr.po
index 3f5526caad6..633a0547097 100644
--- a/addons/account_analytic_plans/i18n/fr.po
+++ b/addons/account_analytic_plans/i18n/fr.po
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2012-12-03 16:02+0000\n"
-"PO-Revision-Date: 2012-02-18 23:19+0000\n"
-"Last-Translator: t.o <Unknown>\n"
+"PO-Revision-Date: 2012-12-05 09:24+0000\n"
+"Last-Translator: WANTELLET Sylvain <Swantellet@tetra-info.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:34+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-06 04:40+0000\n"
+"X-Generator: Launchpad (build 16341)\n"
 
 #. module: account_analytic_plans
 #: field:account.analytic.plan.instance,account4_ids:0
@@ -48,7 +48,7 @@ msgstr "Taux (%)"
 #: code:addons/account_analytic_plans/account_analytic_plans.py:234
 #, python-format
 msgid "The total should be between %s and %s."
-msgstr ""
+msgstr "Le total devrait se situer entre %s et %s."
 
 #. module: account_analytic_plans
 #: view:account.analytic.plan:0
@@ -144,7 +144,7 @@ msgstr "Identifiant du Compte3"
 #: view:account.crossovered.analytic:0
 #: view:analytic.plan.create.model:0
 msgid "or"
-msgstr ""
+msgstr "ou"
 
 #. module: account_analytic_plans
 #: model:ir.model,name:account_analytic_plans.model_account_analytic_line
@@ -283,7 +283,7 @@ msgstr "Ligne de relevé bancaire"
 #: code:addons/account_analytic_plans/wizard/analytic_plan_create_model.py:41
 #, python-format
 msgid "Error!"
-msgstr ""
+msgstr "Erreur !"
 
 #. module: account_analytic_plans
 #: report:account.analytic.account.crossovered.analytic:0
@@ -299,7 +299,7 @@ msgstr "Imprimer l'analytique croisé"
 #: code:addons/account_analytic_plans/wizard/account_crossovered_analytic.py:61
 #, python-format
 msgid "User Error!"
-msgstr ""
+msgstr "Erreur utilisateur !"
 
 #. module: account_analytic_plans
 #: field:account.analytic.plan.instance,account6_ids:0
@@ -317,7 +317,7 @@ msgstr "Journal analytique"
 #: code:addons/account_analytic_plans/wizard/analytic_plan_create_model.py:38
 #, python-format
 msgid "Please put a name and a code before saving the model."
-msgstr ""
+msgstr "Indiquez un nom et un code avant d'enregistrer le modèle."
 
 #. module: account_analytic_plans
 #: report:account.analytic.account.crossovered.analytic:0
@@ -377,7 +377,7 @@ msgstr "Ligne de facture"
 #: code:addons/account_analytic_plans/wizard/analytic_plan_create_model.py:41
 #, python-format
 msgid "There is no analytic plan defined."
-msgstr ""
+msgstr "Aucun plan analytique n'a été défini."
 
 #. module: account_analytic_plans
 #: model:ir.model,name:account_analytic_plans.model_account_bank_statement
@@ -404,7 +404,7 @@ msgstr "Distribution analytique"
 #: code:addons/account_analytic_plans/account_analytic_plans.py:221
 #, python-format
 msgid "A model with this name and code already exists."
-msgstr ""
+msgstr "Un modèle existe déjà avec ce nom et ce code."
 
 #. module: account_analytic_plans
 #: help:account.analytic.plan.line,root_analytic_id:0
diff --git a/addons/account_voucher/i18n/fr.po b/addons/account_voucher/i18n/fr.po
index ae6c763b081..2fc3c38da2f 100644
--- a/addons/account_voucher/i18n/fr.po
+++ b/addons/account_voucher/i18n/fr.po
@@ -7,15 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2012-12-03 16:01+0000\n"
-"PO-Revision-Date: 2012-12-03 21:05+0000\n"
-"Last-Translator: Frederic Clementi - Camptocamp.com "
-"<frederic.clementi@camptocamp.com>\n"
+"PO-Revision-Date: 2012-12-05 09:22+0000\n"
+"Last-Translator: Numérigraphe <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: 2012-12-04 05:41+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-06 04:40+0000\n"
+"X-Generator: Launchpad (build 16341)\n"
 
 #. module: account_voucher
 #: field:account.bank.statement.line,voucher_id:0
@@ -278,6 +277,14 @@ msgid ""
 "              </p>\n"
 "            "
 msgstr ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Cliquez pour enregistrer un reçu de vente. \n"
+"              </p><p>\n"
+"                Quand le reçu de vente sera confirmé, vous pourrez "
+"enregistrer\n"
+"                les paiements clients en rapport avec ce reçu de vente.\n"
+"              </p>\n"
+"            "
 
 #. module: account_voucher
 #: help:account.voucher,message_unread:0
diff --git a/addons/analytic_contract_hr_expense/i18n/es.po b/addons/analytic_contract_hr_expense/i18n/es.po
new file mode 100644
index 00000000000..a2f83a7c929
--- /dev/null
+++ b/addons/analytic_contract_hr_expense/i18n/es.po
@@ -0,0 +1,72 @@
+# Spanish translation for openobject-addons
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"PO-Revision-Date: 2012-12-05 20:20+0000\n"
+"Last-Translator: Santi (Pexego) <santiago@pexego.es>\n"
+"Language-Team: Spanish <es@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2012-12-06 04:41+0000\n"
+"X-Generator: Launchpad (build 16341)\n"
+
+#. module: analytic_contract_hr_expense
+#: view:account.analytic.account:0
+msgid "or view"
+msgstr "o ver"
+
+#. module: analytic_contract_hr_expense
+#: view:account.analytic.account:0
+msgid "Nothing to invoice, create"
+msgstr "Nada que facturar, crear"
+
+#. module: analytic_contract_hr_expense
+#: view:account.analytic.account:0
+msgid "expenses"
+msgstr "gastos"
+
+#. module: analytic_contract_hr_expense
+#: model:ir.model,name:analytic_contract_hr_expense.model_account_analytic_account
+msgid "Analytic Account"
+msgstr "Cuenta analítica"
+
+#. module: analytic_contract_hr_expense
+#: code:addons/analytic_contract_hr_expense/analytic_contract_hr_expense.py:134
+#, python-format
+msgid "Expenses to Invoice of %s"
+msgstr "Gastos a facturar de %s"
+
+#. module: analytic_contract_hr_expense
+#: code:addons/analytic_contract_hr_expense/analytic_contract_hr_expense.py:119
+#, python-format
+msgid "Expenses of %s"
+msgstr "Gastos de %s"
+
+#. module: analytic_contract_hr_expense
+#: field:account.analytic.account,expense_invoiced:0
+#: field:account.analytic.account,expense_to_invoice:0
+#: field:account.analytic.account,remaining_expense:0
+msgid "unknown"
+msgstr "desconocido"
+
+#. module: analytic_contract_hr_expense
+#: field:account.analytic.account,est_expenses:0
+msgid "Estimation of Expenses to Invoice"
+msgstr "Estimación de gastos a facturar"
+
+#. module: analytic_contract_hr_expense
+#: field:account.analytic.account,charge_expenses:0
+msgid "Charge Expenses"
+msgstr ""
+
+#. module: analytic_contract_hr_expense
+#: view:account.analytic.account:0
+msgid "⇒ Invoice"
+msgstr "⇒ factura"
diff --git a/addons/audittrail/i18n/ru.po b/addons/audittrail/i18n/ru.po
index 594365a3ea8..6003ac76e79 100644
--- a/addons/audittrail/i18n/ru.po
+++ b/addons/audittrail/i18n/ru.po
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2012-11-24 02:52+0000\n"
-"PO-Revision-Date: 2010-10-16 09:06+0000\n"
-"Last-Translator: Nikolay Chesnokov <chesnokov_n@msn.com>\n"
+"PO-Revision-Date: 2012-12-05 09:24+0000\n"
+"Last-Translator: Эдуард <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: 2012-11-25 06:14+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-06 04:40+0000\n"
+"X-Generator: Launchpad (build 16341)\n"
 
 #. module: audittrail
 #: view:audittrail.log:0
@@ -55,13 +55,13 @@ msgstr ""
 #: view:audittrail.rule:0
 #: model:ir.model,name:audittrail.model_audittrail_rule
 msgid "Audittrail Rule"
-msgstr ""
+msgstr "Правило аудита"
 
 #. module: audittrail
 #: view:audittrail.rule:0
 #: field:audittrail.rule,state:0
 msgid "Status"
-msgstr ""
+msgstr "Статус"
 
 #. module: audittrail
 #: view:audittrail.view.log:0
@@ -224,7 +224,7 @@ msgstr "Выберите объект, для которого вы хотите
 #. module: audittrail
 #: model:ir.ui.menu,name:audittrail.menu_audit
 msgid "Audit"
-msgstr ""
+msgstr "Аудит"
 
 #. module: audittrail
 #: field:audittrail.rule,log_workflow:0
@@ -305,7 +305,7 @@ msgstr "Журналировать удаление"
 #: view:audittrail.log:0
 #: view:audittrail.rule:0
 msgid "Model"
-msgstr ""
+msgstr "Модель"
 
 #. module: audittrail
 #: field:audittrail.log.line,field_description:0
@@ -356,7 +356,7 @@ msgstr "Логи проведения аудита"
 #. module: audittrail
 #: view:audittrail.rule:0
 msgid "Draft  Rule"
-msgstr ""
+msgstr "Черновое правило"
 
 #. module: audittrail
 #: view:audittrail.log:0
@@ -399,7 +399,7 @@ msgstr "Строка протокола"
 #. module: audittrail
 #: view:audittrail.view.log:0
 msgid "or"
-msgstr ""
+msgstr "или"
 
 #. module: audittrail
 #: field:audittrail.rule,log_action:0
diff --git a/addons/base_report_designer/i18n/fr.po b/addons/base_report_designer/i18n/fr.po
index af631e66f98..a1beaebafff 100644
--- a/addons/base_report_designer/i18n/fr.po
+++ b/addons/base_report_designer/i18n/fr.po
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2012-11-24 02:52+0000\n"
-"PO-Revision-Date: 2012-05-10 17:41+0000\n"
-"Last-Translator: lholivier <olivier.lenoir@free.fr>\n"
+"PO-Revision-Date: 2012-12-05 09:16+0000\n"
+"Last-Translator: Numérigraphe <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: 2012-11-25 06:08+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-06 04:40+0000\n"
+"X-Generator: Launchpad (build 16341)\n"
 
 #. module: base_report_designer
 #: model:ir.model,name:base_report_designer.model_base_report_sxw
@@ -181,7 +181,7 @@ msgstr "Annuler"
 #. module: base_report_designer
 #: view:base.report.sxw:0
 msgid "or"
-msgstr ""
+msgstr "ou"
 
 #. module: base_report_designer
 #: model:ir.model,name:base_report_designer.model_ir_actions_report_xml
diff --git a/addons/base_status/i18n/fr.po b/addons/base_status/i18n/fr.po
index 250cf354c5a..6af7564047b 100644
--- a/addons/base_status/i18n/fr.po
+++ b/addons/base_status/i18n/fr.po
@@ -8,20 +8,20 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-12-03 16:03+0000\n"
-"PO-Revision-Date: 2012-11-29 17:43+0000\n"
-"Last-Translator: Christophe Chauvet - http://www.syleam.fr/ <Unknown>\n"
+"PO-Revision-Date: 2012-12-05 09:30+0000\n"
+"Last-Translator: Numérigraphe <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: 2012-12-04 05:55+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-06 04:41+0000\n"
+"X-Generator: Launchpad (build 16341)\n"
 
 #. module: base_status
 #: code:addons/base_status/base_state.py:107
 #, python-format
 msgid "Error !"
-msgstr "Erreur!"
+msgstr "Erreur !"
 
 #. module: base_status
 #: code:addons/base_status/base_stage.py:326
@@ -41,7 +41,7 @@ msgstr "%s a été <b>renouvelée</b>."
 #: code:addons/base_status/base_stage.py:211
 #, python-format
 msgid "Error!"
-msgstr "Erreur!"
+msgstr "Erreur !"
 
 #. module: base_status
 #: code:addons/base_status/base_state.py:107
@@ -50,15 +50,15 @@ msgid ""
 "You can not escalate, you are already at the top level regarding your sales-"
 "team category."
 msgstr ""
-"Vous ne pouvez pas escalader, vous êtes déjà au niveau le plus haut selon la "
-"catégorie de votre équipe de ventes."
+"Vous ne pouvez pas demander d'escalade : vous êtes déjà au plus haut niveau "
+"possible dans votre catégorie d'équipes de ventes."
 
 #. module: base_status
 #: code:addons/base_status/base_stage.py:344
 #: code:addons/base_status/base_state.py:214
 #, python-format
 msgid "%s is now <b>pending</b>."
-msgstr "%s est mainetant <b>en attente</b>."
+msgstr "%s est maintenant <b>en attente</b>."
 
 #. module: base_status
 #: code:addons/base_status/base_stage.py:338
@@ -79,9 +79,9 @@ msgid ""
 "You are already at the top level of your sales-team category.\n"
 "Therefore you cannot escalate furthermore."
 msgstr ""
-"vous êtes déjà au niveau le plus haut selon la catégorie de votre équipe de "
-"ventes.\n"
-"Par conséquent vous ne pouvez pas escalder plus haut."
+"Vous êtes déjà au plus haut niveau possible dans votre catégorie d'équipes "
+"de ventes.\n"
+"Par conséquent vous ne pouvez pas demander une escalade au niveau supérieur."
 
 #. module: base_status
 #: code:addons/base_status/base_stage.py:332
diff --git a/addons/board/i18n/fr.po b/addons/board/i18n/fr.po
index ea8a7ee1d23..7f3b4ae8e43 100644
--- a/addons/board/i18n/fr.po
+++ b/addons/board/i18n/fr.po
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2012-11-24 02:52+0000\n"
-"PO-Revision-Date: 2011-01-12 13:11+0000\n"
-"Last-Translator: OpenERP Administrators <Unknown>\n"
+"PO-Revision-Date: 2012-12-05 09:11+0000\n"
+"Last-Translator: Numérigraphe <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: 2012-11-25 06:12+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-06 04:40+0000\n"
+"X-Generator: Launchpad (build 16341)\n"
 
 #. module: board
 #: model:ir.actions.act_window,name:board.action_board_create
@@ -25,40 +25,40 @@ msgstr ""
 #. module: board
 #: view:board.create:0
 msgid "Create"
-msgstr ""
+msgstr "Créer"
 
 #. module: board
 #. openerp-web
 #: code:addons/board/static/src/xml/board.xml:4
 #, python-format
 msgid "Reset Layout.."
-msgstr ""
+msgstr "Réinitialiser l'agencement"
 
 #. module: board
 #: view:board.create:0
 msgid "Create New Dashboard"
-msgstr ""
+msgstr "Créer un nouveau tableau de bord"
 
 #. module: board
 #. openerp-web
 #: code:addons/board/static/src/xml/board.xml:40
 #, python-format
 msgid "Choose dashboard layout"
-msgstr ""
+msgstr "Choisissez l'agencement du tableau de bord"
 
 #. module: board
 #. openerp-web
 #: code:addons/board/static/src/xml/board.xml:70
 #, python-format
 msgid "Add"
-msgstr ""
+msgstr "Ajouter"
 
 #. module: board
 #. openerp-web
 #: code:addons/board/static/src/js/dashboard.js:139
 #, python-format
 msgid "Are you sure you want to remove this item ?"
-msgstr ""
+msgstr "Voulez-vous réellement supprimer cet élément ?"
 
 #. module: board
 #: model:ir.model,name:board.model_board_board
@@ -70,7 +70,7 @@ msgstr "Tableau"
 #: model:ir.actions.act_window,name:board.open_board_my_dash_action
 #: model:ir.ui.menu,name:board.menu_board_my_dash
 msgid "My Dashboard"
-msgstr ""
+msgstr "Mon tableau de bord"
 
 #. module: board
 #: field:board.create,name:0
@@ -87,14 +87,14 @@ msgstr ""
 #: code:addons/board/static/src/xml/board.xml:67
 #, python-format
 msgid "Add to Dashboard"
-msgstr ""
+msgstr "Ajouter au tableau de bord"
 
 #. module: board
 #. openerp-web
 #: code:addons/board/static/src/xml/board.xml:28
 #, python-format
 msgid "&nbsp;"
-msgstr ""
+msgstr "&nbsp;"
 
 #. module: board
 #: model:ir.actions.act_window,help:board.open_board_my_dash_action
@@ -132,21 +132,21 @@ msgstr "Menu parent"
 #: code:addons/board/static/src/xml/board.xml:8
 #, python-format
 msgid "Change Layout.."
-msgstr ""
+msgstr "Modifier l'agencement..."
 
 #. module: board
 #. openerp-web
 #: code:addons/board/static/src/js/dashboard.js:93
 #, python-format
 msgid "Edit Layout"
-msgstr ""
+msgstr "Modifier l'agencement"
 
 #. module: board
 #. openerp-web
 #: code:addons/board/static/src/xml/board.xml:10
 #, python-format
 msgid "Change Layout"
-msgstr ""
+msgstr "Modifier l'agencement"
 
 #. module: board
 #: view:board.create:0
@@ -156,7 +156,7 @@ msgstr "Annuler"
 #. module: board
 #: view:board.create:0
 msgid "or"
-msgstr ""
+msgstr "ou"
 
 #. module: board
 #. openerp-web
diff --git a/addons/crm/i18n/nb.po b/addons/crm/i18n/nb.po
index d59a83d5c2e..292758baf54 100644
--- a/addons/crm/i18n/nb.po
+++ b/addons/crm/i18n/nb.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-12-03 16:01+0000\n"
-"PO-Revision-Date: 2012-12-04 21:08+0000\n"
+"PO-Revision-Date: 2012-12-05 12:24+0000\n"
 "Last-Translator: Kaare Pettersen <Unknown>\n"
 "Language-Team: Norwegian Bokmal <nb@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-05 05:19+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-06 04:39+0000\n"
+"X-Generator: Launchpad (build 16341)\n"
 
 #. module: crm
 #: view:crm.lead.report:0
@@ -219,7 +219,7 @@ msgstr "Mul-ut"
 #. module: crm
 #: field:crm.case.stage,fold:0
 msgid "Hide in Views when Empty"
-msgstr ""
+msgstr "Skjule i visninger når tomt."
 
 #. module: crm
 #: model:ir.actions.server,name:crm.action_email_reminder_lead
@@ -1585,12 +1585,12 @@ msgstr "Mulighetene har blitt <b>vunnet</b>."
 #. module: crm
 #: view:crm.phonecall:0
 msgid "Phone Calls that are assigned to me or to my team(s)"
-msgstr ""
+msgstr "Telefonsamtaler som er tildelt til meg eller mitt team (s)"
 
 #. module: crm
 #: model:ir.model,name:crm.model_crm_payment_mode
 msgid "CRM Payment Mode"
-msgstr ""
+msgstr "CRM Betalings modus."
 
 #. module: crm
 #: view:crm.lead.report:0
@@ -1613,7 +1613,7 @@ msgstr "Grupper etter..."
 #. module: crm
 #: view:crm.merge.opportunity:0
 msgid "Merge Leads/Opportunities"
-msgstr ""
+msgstr "Sammenlagt ledelse/Muligheter."
 
 #. module: crm
 #: field:crm.case.section,parent_id:0
@@ -1624,7 +1624,7 @@ msgstr "Hovedteam"
 #: selection:crm.lead2opportunity.partner,action:0
 #: selection:crm.lead2opportunity.partner.mass,action:0
 msgid "Do not link to a customer"
-msgstr ""
+msgstr "Ikke koble til en kunde."
 
 #. module: crm
 #: field:crm.lead,date_action:0
@@ -1647,7 +1647,7 @@ msgstr ""
 #. module: crm
 #: view:crm.lead2opportunity.partner.mass:0
 msgid "Assign opportunities to"
-msgstr ""
+msgstr "Tildel muligheter til."
 
 #. module: crm
 #: field:crm.lead,zip:0
@@ -1668,7 +1668,7 @@ msgstr "Måned for samtale"
 #: code:addons/crm/crm_phonecall.py:289
 #, python-format
 msgid "Partner has been <b>created</b>."
-msgstr ""
+msgstr "Partner har blitt<b>Opprettet</b>."
 
 #. module: crm
 #: field:sale.config.settings,module_crm_claim:0
@@ -1686,7 +1686,7 @@ msgstr ""
 #. module: crm
 #: model:crm.case.categ,name:crm.categ_oppor3
 msgid "Services"
-msgstr ""
+msgstr "Tjenester."
 
 #. module: crm
 #: selection:crm.lead,priority:0
@@ -1731,7 +1731,7 @@ msgstr "Svar til"
 #. module: crm
 #: view:crm.lead:0
 msgid "Display"
-msgstr ""
+msgstr "Skjerm."
 
 #. module: crm
 #: view:board.board:0
@@ -1746,7 +1746,7 @@ msgstr "Prospektet konverterer til forretningspartner"
 #. module: crm
 #: model:ir.actions.server,name:crm.actions_server_crm_lead_unread
 msgid "CRM Lead: Mark unread"
-msgstr ""
+msgstr "CRM ledelse: Merk som ulest."
 
 #. module: crm
 #: view:crm.case.channel:0
@@ -1772,12 +1772,12 @@ msgstr "Ekstra inforrmasjon"
 #. module: crm
 #: view:crm.lead:0
 msgid "Fund Raising"
-msgstr ""
+msgstr "Fond hevet."
 
 #. module: crm
 #: view:crm.lead:0
 msgid "Edit..."
-msgstr ""
+msgstr "Rediger..."
 
 #. module: crm
 #: model:crm.case.resource.type,name:crm.type_lead5
@@ -1787,7 +1787,7 @@ msgstr ""
 #. module: crm
 #: view:crm.case.section:0
 msgid "Select Stages for this Sales Team"
-msgstr ""
+msgstr "Velg stadier for dette salgslaget."
 
 #. module: crm
 #: view:crm.lead:0
@@ -1815,7 +1815,7 @@ msgstr ""
 #: view:crm.payment.mode:0
 #: model:ir.actions.act_window,name:crm.action_crm_payment_mode
 msgid "Payment Mode"
-msgstr ""
+msgstr "Betaling modus."
 
 #. module: crm
 #: model:ir.model,name:crm.model_crm_lead2opportunity_partner_mass
@@ -1825,13 +1825,13 @@ msgstr ""
 #. module: crm
 #: view:sale.config.settings:0
 msgid "On Mail Server"
-msgstr ""
+msgstr "På epost server."
 
 #. module: crm
 #: model:ir.actions.act_window,name:crm.open_board_statistical_dash
 #: model:ir.ui.menu,name:crm.menu_board_statistics_dash
 msgid "CRM"
-msgstr ""
+msgstr "CRM."
 
 #. module: crm
 #: model:ir.actions.act_window,name:crm.crm_segmentation_tree-act
@@ -1852,7 +1852,7 @@ msgstr "Telefonsalg"
 #. module: crm
 #: view:crm.lead:0
 msgid "Leads Assigned to Me or My Team(s)"
-msgstr ""
+msgstr "Fører tilordnet til meg eller min Team (s)"
 
 #. module: crm
 #: model:ir.model,name:crm.model_crm_segmentation_line
@@ -1903,7 +1903,7 @@ msgstr "Lead / kunde"
 #. module: crm
 #: model:crm.case.section,name:crm.crm_case_section_2
 msgid "Support Department"
-msgstr ""
+msgstr "Støtte avdeling."
 
 #. module: crm
 #: view:crm.lead.report:0
@@ -1943,7 +1943,7 @@ msgstr "Leads/muligheter som er i stadium Ny"
 #: code:addons/crm/crm_lead.py:883
 #, python-format
 msgid "%s <b>partner</b> is now set to <em>%s</em>."
-msgstr ""
+msgstr "%s <b>Partner</b> er nå satt til<em>%s</em>."
 
 #. module: crm
 #: selection:crm.phonecall,state:0
@@ -1980,13 +1980,13 @@ msgstr "Leads"
 #. module: crm
 #: model:crm.case.categ,name:crm.categ_oppor5
 msgid "Design"
-msgstr ""
+msgstr "Design."
 
 #. module: crm
 #: selection:crm.lead2opportunity.partner,name:0
 #: selection:crm.lead2opportunity.partner.mass,name:0
 msgid "Merge with existing opportunities"
-msgstr ""
+msgstr "Slå sammen med eksisterende muligheter."
 
 #. module: crm
 #: model:ir.actions.act_window,help:crm.crm_case_category_act_oppor11
@@ -2054,7 +2054,7 @@ msgstr "Åpne muligheter"
 #. module: crm
 #: model:crm.case.resource.type,name:crm.type_lead2
 msgid "Email Campaign - Services"
-msgstr ""
+msgstr "Epost kampanje - Tjenester."
 
 #. module: crm
 #: selection:crm.case.stage,state:0
@@ -2141,13 +2141,13 @@ msgstr "Obligatorisk uttrykk"
 #: selection:crm.lead2partner,action:0
 #: selection:crm.phonecall2partner,action:0
 msgid "Create a new customer"
-msgstr ""
+msgstr "Opprett en ny kunde."
 
 #. module: crm
 #: field:crm.lead2opportunity.partner,action:0
 #: field:crm.lead2opportunity.partner.mass,action:0
 msgid "Related Customer"
-msgstr ""
+msgstr "Relatert kunde."
 
 #. module: crm
 #: field:crm.lead.report,deadline_day:0
@@ -2157,7 +2157,7 @@ msgstr "Forvenet sluttdag"
 #. module: crm
 #: model:crm.case.categ,name:crm.categ_oppor2
 msgid "Software"
-msgstr ""
+msgstr "Programvare."
 
 #. module: crm
 #: field:crm.case.section,change_responsible:0
@@ -2195,12 +2195,12 @@ msgstr "By"
 #. module: crm
 #: selection:crm.case.stage,type:0
 msgid "Both"
-msgstr ""
+msgstr "Begge."
 
 #. module: crm
 #: view:crm.phonecall:0
 msgid "Call Done"
-msgstr ""
+msgstr "Telefonsamtale ferdig."
 
 #. module: crm
 #: view:crm.phonecall:0
@@ -2211,7 +2211,7 @@ msgstr "Ansvarlig"
 #. module: crm
 #: model:ir.actions.server,name:crm.action_email_reminder_customer_lead
 msgid "Reminder to Customer"
-msgstr ""
+msgstr "Påminnelse til kunde."
 
 #. module: crm
 #: model:crm.case.section,name:crm.crm_case_section_3
@@ -2221,13 +2221,13 @@ msgstr ""
 #. module: crm
 #: model:crm.case.categ,name:crm.categ_oppor1
 msgid "Product"
-msgstr ""
+msgstr "Produkt."
 
 #. module: crm
 #: code:addons/crm/crm_phonecall.py:284
 #, python-format
 msgid "Phonecall has been <b>created and opened</b>."
-msgstr ""
+msgstr "Telefonsamtalen har blitt <b> opprettet og åpnet</b>."
 
 #. module: crm
 #: field:base.action.rule,trg_max_history:0
@@ -2237,12 +2237,12 @@ msgstr "Maksimal kommunikasjonshistorikk"
 #. module: crm
 #: view:crm.lead2opportunity.partner.mass:0
 msgid "Conversion Options"
-msgstr ""
+msgstr "Konverterings alternativer."
 
 #. module: crm
 #: view:crm.lead:0
 msgid "Address"
-msgstr ""
+msgstr "Adresse"
 
 #. module: crm
 #: help:crm.case.section,alias_id:0
@@ -2309,7 +2309,7 @@ msgstr "Fortsett prosess"
 #: model:ir.actions.act_window,name:crm.action_crm_lead2opportunity_partner
 #: model:ir.actions.act_window,name:crm.phonecall2opportunity_act
 msgid "Convert to opportunity"
-msgstr ""
+msgstr "Konverter til muligheter."
 
 #. module: crm
 #: field:crm.opportunity2phonecall,user_id:0
@@ -2366,12 +2366,12 @@ msgstr "Salgsteamet saken tilhører."
 #. module: crm
 #: model:crm.case.resource.type,name:crm.type_lead6
 msgid "Banner Ads"
-msgstr ""
+msgstr "Banner annonser."
 
 #. module: crm
 #: field:crm.merge.opportunity,opportunity_ids:0
 msgid "Leads/Opportunities"
-msgstr ""
+msgstr "Fører/Muligheter."
 
 #. module: crm
 #: field:crm.lead,fax:0
@@ -2391,7 +2391,7 @@ msgstr "Firma"
 #. module: crm
 #: view:base.action.rule:0
 msgid "Conditions on Communication History"
-msgstr ""
+msgstr "Forholdene på kommunikasjon Historie."
 
 #. module: crm
 #: view:crm.lead:0
@@ -2406,17 +2406,17 @@ msgstr "Objektnavn"
 #. module: crm
 #: view:crm.phonecall:0
 msgid "Phone Calls Assigned to Me or My Team(s)"
-msgstr ""
+msgstr "Telefonsamtaler Tilordnet til meg eller min Team (s)"
 
 #. module: crm
 #: view:crm.lead:0
 msgid "Reset"
-msgstr ""
+msgstr "Tilbakestill."
 
 #. module: crm
 #: view:sale.config.settings:0
 msgid "After-Sale Services"
-msgstr ""
+msgstr "Etter-salgs tjenester."
 
 #. module: crm
 #: model:ir.actions.server,message:crm.action_email_reminder_customer_lead
@@ -2486,7 +2486,7 @@ msgstr ""
 #. module: crm
 #: field:crm.case.stage,state:0
 msgid "Related Status"
-msgstr ""
+msgstr "Relatert status."
 
 #. module: crm
 #: field:crm.phonecall,name:0
@@ -2507,7 +2507,7 @@ msgstr "Planlegg/logg samtale"
 #. module: crm
 #: view:crm.merge.opportunity:0
 msgid "Select Leads/Opportunities"
-msgstr ""
+msgstr "Velg fører/Muligheter."
 
 #. module: crm
 #: selection:crm.phonecall,state:0
@@ -2527,7 +2527,7 @@ msgstr "Bekreft"
 #. module: crm
 #: view:crm.lead:0
 msgid "Unread messages"
-msgstr ""
+msgstr "Uleste meldinger."
 
 #. module: crm
 #: field:crm.phonecall.report,section_id:0
@@ -2544,12 +2544,12 @@ msgstr "Valgfritt uttrykk"
 #: field:crm.lead,message_follower_ids:0
 #: field:crm.phonecall,message_follower_ids:0
 msgid "Followers"
-msgstr ""
+msgstr "Følgere."
 
 #. module: crm
 #: field:sale.config.settings,fetchmail_lead:0
 msgid "Create leads from incoming mails"
-msgstr ""
+msgstr "Opprett fører fra innkommende post."
 
 #. module: crm
 #: view:crm.lead:0
@@ -2571,7 +2571,7 @@ msgstr "Kanal"
 #: view:crm.opportunity2phonecall:0
 #: view:crm.phonecall2phonecall:0
 msgid "Schedule Call"
-msgstr ""
+msgstr "Planlegg telefonsamtale."
 
 #. module: crm
 #: view:crm.lead.report:0
@@ -2600,7 +2600,7 @@ msgstr "Opprette forretningsmuligheter fra Leads"
 #. module: crm
 #: model:crm.case.resource.type,name:crm.type_lead3
 msgid "Email Campaign - Products"
-msgstr ""
+msgstr "Epost kampanje - Produkter."
 
 #. module: crm
 #: field:base.action.rule,act_categ_id:0
@@ -2633,7 +2633,7 @@ msgstr "Aller første kontakt med nytt prospekt"
 #. module: crm
 #: view:res.partner:0
 msgid "Calls"
-msgstr ""
+msgstr "Samtaler."
 
 #. module: crm
 #: field:crm.case.stage,on_change:0
@@ -2643,7 +2643,7 @@ msgstr "Skift mulighet automatisk"
 #. module: crm
 #: view:crm.phonecall.report:0
 msgid "My Phone Calls"
-msgstr ""
+msgstr "Mine telefonsamtaler."
 
 #. module: crm
 #: model:crm.case.stage,name:crm.stage_lead3
@@ -2679,7 +2679,7 @@ msgstr "En samarbeidspartner er allerede definert"
 #. module: crm
 #: view:sale.config.settings:0
 msgid "Configure"
-msgstr ""
+msgstr "Konfigurer."
 
 #. module: crm
 #: field:crm.lead.report,deadline_month:0
@@ -2727,7 +2727,7 @@ msgstr "Forventet år for lukking"
 #. module: crm
 #: model:ir.actions.client,name:crm.action_client_crm_menu
 msgid "Open Sale Menu"
-msgstr ""
+msgstr "Åpen salgs meny."
 
 #. module: crm
 #: field:crm.lead,date_open:0
@@ -2745,7 +2745,7 @@ msgstr "Gruppemedlemmer"
 #: view:crm.opportunity2phonecall:0
 #: view:crm.phonecall2phonecall:0
 msgid "Schedule/Log a Call"
-msgstr ""
+msgstr "Planlegg/Loggføre en samtale."
 
 #. module: crm
 #: field:crm.lead,planned_cost:0
@@ -2864,7 +2864,7 @@ msgstr "November"
 #: field:crm.phonecall,message_comment_ids:0
 #: help:crm.phonecall,message_comment_ids:0
 msgid "Comments and emails"
-msgstr ""
+msgstr "Kommentarer og E-poster."
 
 #. module: crm
 #: model:crm.case.stage,name:crm.stage_lead5
@@ -2912,7 +2912,7 @@ msgstr "Planlagt omsetning"
 #. module: crm
 #: model:ir.actions.server,name:crm.actions_server_crm_lead_read
 msgid "CRM Lead: Mark read"
-msgstr ""
+msgstr "CRM fører: Merk som lest."
 
 #. module: crm
 #: model:ir.model,name:crm.model_crm_phonecall2phonecall
@@ -2966,6 +2966,7 @@ msgstr "Telefonsamtale"
 #: view:crm.phonecall.report:0
 msgid "Phone calls that are assigned to one of the sale teams I manage"
 msgstr ""
+"Telefonsamtaler som er tilordnet ett av salgs lagene jeg administrerer."
 
 #. module: crm
 #: view:crm.lead:0
@@ -2976,7 +2977,7 @@ msgstr "Opprettet dato"
 #: view:crm.lead:0
 #: view:crm.phonecall2opportunity:0
 msgid "at"
-msgstr ""
+msgstr "På."
 
 #. module: crm
 #: model:crm.case.stage,name:crm.stage_lead1
@@ -3047,7 +3048,7 @@ msgstr ""
 #. module: crm
 #: view:crm.lead:0
 msgid "Internal Notes"
-msgstr ""
+msgstr "Interne notater."
 
 #. module: crm
 #: view:crm.lead:0
@@ -3117,7 +3118,7 @@ msgstr "Tapt"
 #: code:addons/crm/wizard/crm_lead_to_opportunity.py:100
 #, python-format
 msgid "Closed/Cancelled leads cannot be converted into opportunities."
-msgstr ""
+msgstr "Stengt / Avbrutt fører kan ikke konverteres til muligheter."
 
 #. module: crm
 #: field:crm.lead,country_id:0
diff --git a/addons/crm/i18n/nl.po b/addons/crm/i18n/nl.po
index 5e3557a184d..964348f8ecf 100644
--- a/addons/crm/i18n/nl.po
+++ b/addons/crm/i18n/nl.po
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2012-12-03 16:01+0000\n"
-"PO-Revision-Date: 2012-11-25 13:38+0000\n"
+"PO-Revision-Date: 2012-12-05 18:03+0000\n"
 "Last-Translator: Erwin van der Ploeg (Endian Solutions) <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: 2012-12-04 05:16+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-06 04:39+0000\n"
+"X-Generator: Launchpad (build 16341)\n"
 
 #. module: crm
 #: view:crm.lead.report:0
@@ -568,7 +568,7 @@ msgstr "Geraamde omzet"
 #. module: crm
 #: model:ir.actions.server,name:crm.actions_server_crm_phonecall_read
 msgid "CRM Phonecall: Mark read"
-msgstr ""
+msgstr "Relatiebeheer telefoongesprek: Markeer als gelezen"
 
 #. module: crm
 #: selection:crm.lead.report,creation_month:0
@@ -622,7 +622,7 @@ msgstr "Relatie contactnaam"
 #. module: crm
 #: model:ir.actions.server,name:crm.actions_server_crm_phonecall_unread
 msgid "CRM Phonecall: Mark unread"
-msgstr ""
+msgstr "Relatiebeheer telefoongesprek: Markeer als ongelezen"
 
 #. module: crm
 #: model:ir.actions.server,subject:crm.action_email_reminder_lead
@@ -740,12 +740,14 @@ msgstr "De naam van het segment"
 #. module: crm
 #: model:ir.filters,name:crm.filter_usa_lead
 msgid "Leads from USA"
-msgstr ""
+msgstr "Leads uit America"
 
 #. module: crm
 #: sql_constraint:crm.lead:0
 msgid "The probability of closing the deal should be between 0% and 100%!"
 msgstr ""
+"De waarschijnlijkheid voor het sluiten van de opdracht moet liggen tussen de "
+")% en 100%!"
 
 #. module: crm
 #: view:crm.lead:0
@@ -978,7 +980,7 @@ msgstr "Markeren als verloren"
 #. module: crm
 #: model:ir.filters,name:crm.filter_draft_lead
 msgid "Draft Leads"
-msgstr ""
+msgstr "Concept leads"
 
 #. module: crm
 #: selection:crm.lead.report,creation_month:0
@@ -1272,7 +1274,7 @@ msgstr "Openingsdatum"
 #. module: crm
 #: field:crm.lead,company_currency:0
 msgid "Currency"
-msgstr ""
+msgstr "Valuta"
 
 #. module: crm
 #: field:crm.case.channel,name:0
@@ -1761,6 +1763,10 @@ msgid ""
 "the treatment delays or number of leads per state. You can sort out your "
 "leads analysis by different groups to get accurate grained analysis."
 msgstr ""
+"Leads analyses geven u de mogelijkheid om verschillende relatiebeheer "
+"gerelateerde informatie, zoals tijdsduur tot openen en leads per fase, te "
+"controleren. Het is mogelijk om uw leads te sorteren in verschillende "
+"groepen om zo een goede analyse te maken."
 
 #. module: crm
 #: model:crm.case.categ,name:crm.categ_oppor3
@@ -1825,7 +1831,7 @@ msgstr "Prospect word omgezet naar relatie"
 #. module: crm
 #: model:ir.actions.server,name:crm.actions_server_crm_lead_unread
 msgid "CRM Lead: Mark unread"
-msgstr ""
+msgstr "Relatiebeheer lead: Markeer als ongelezen"
 
 #. module: crm
 #: view:crm.case.channel:0
@@ -3080,7 +3086,7 @@ msgstr "Geplande omzet"
 #. module: crm
 #: model:ir.actions.server,name:crm.actions_server_crm_lead_read
 msgid "CRM Lead: Mark read"
-msgstr ""
+msgstr "Relatiebeheer lead: Markeer als gelezen"
 
 #. module: crm
 #: model:ir.model,name:crm.model_crm_phonecall2phonecall
diff --git a/addons/crm/i18n/ru.po b/addons/crm/i18n/ru.po
index c80b621ff87..40aefd2535e 100644
--- a/addons/crm/i18n/ru.po
+++ b/addons/crm/i18n/ru.po
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2012-12-03 16:01+0000\n"
-"PO-Revision-Date: 2012-11-25 11:45+0000\n"
-"Last-Translator: Chertykov Denis <chertykov@gmail.com>\n"
+"PO-Revision-Date: 2012-12-05 09:26+0000\n"
+"Last-Translator: Denis Karataev <dskarataev@gmail.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:18+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-06 04:39+0000\n"
+"X-Generator: Launchpad (build 16341)\n"
 
 #. module: crm
 #: view:crm.lead.report:0
@@ -2313,7 +2313,7 @@ msgstr "Продолжение процесса"
 #: model:ir.actions.act_window,name:crm.action_crm_lead2opportunity_partner
 #: model:ir.actions.act_window,name:crm.phonecall2opportunity_act
 msgid "Convert to opportunity"
-msgstr ""
+msgstr "Преобразовать в возможность"
 
 #. module: crm
 #: field:crm.opportunity2phonecall,user_id:0
@@ -2375,7 +2375,7 @@ msgstr ""
 #. module: crm
 #: field:crm.merge.opportunity,opportunity_ids:0
 msgid "Leads/Opportunities"
-msgstr ""
+msgstr "Кандидаты/Возможности"
 
 #. module: crm
 #: field:crm.lead,fax:0
@@ -2410,17 +2410,17 @@ msgstr "Название объекта"
 #. module: crm
 #: view:crm.phonecall:0
 msgid "Phone Calls Assigned to Me or My Team(s)"
-msgstr ""
+msgstr "Звонки назначенные мне или моей команде"
 
 #. module: crm
 #: view:crm.lead:0
 msgid "Reset"
-msgstr ""
+msgstr "Сброс"
 
 #. module: crm
 #: view:sale.config.settings:0
 msgid "After-Sale Services"
-msgstr ""
+msgstr "Послепродажное обслуживание"
 
 #. module: crm
 #: model:ir.actions.server,message:crm.action_email_reminder_customer_lead
@@ -2511,7 +2511,7 @@ msgstr "Запланировать/Описать звонок"
 #. module: crm
 #: view:crm.merge.opportunity:0
 msgid "Select Leads/Opportunities"
-msgstr ""
+msgstr "Выбор кандидатов/возможностей"
 
 #. module: crm
 #: selection:crm.phonecall,state:0
@@ -2548,12 +2548,12 @@ msgstr "Необязательное выражение"
 #: field:crm.lead,message_follower_ids:0
 #: field:crm.phonecall,message_follower_ids:0
 msgid "Followers"
-msgstr ""
+msgstr "Подписчики"
 
 #. module: crm
 #: field:sale.config.settings,fetchmail_lead:0
 msgid "Create leads from incoming mails"
-msgstr ""
+msgstr "Создать кандидатов из входящей почты"
 
 #. module: crm
 #: view:crm.lead:0
@@ -2637,7 +2637,7 @@ msgstr "Самый первый перспективный контакт"
 #. module: crm
 #: view:res.partner:0
 msgid "Calls"
-msgstr ""
+msgstr "Звонки"
 
 #. module: crm
 #: field:crm.case.stage,on_change:0
@@ -2647,7 +2647,7 @@ msgstr "Автоматически изменять вероятность"
 #. module: crm
 #: view:crm.phonecall.report:0
 msgid "My Phone Calls"
-msgstr ""
+msgstr "Мои телефонные звонки"
 
 #. module: crm
 #: model:crm.case.stage,name:crm.stage_lead3
@@ -2731,7 +2731,7 @@ msgstr "Ожид. год закрытия"
 #. module: crm
 #: model:ir.actions.client,name:crm.action_client_crm_menu
 msgid "Open Sale Menu"
-msgstr ""
+msgstr "Открыть меню продаж"
 
 #. module: crm
 #: field:crm.lead,date_open:0
@@ -2960,6 +2960,7 @@ msgstr "Правила действий"
 #: help:sale.config.settings,group_fund_raising:0
 msgid "Allows you to trace and manage your activities for fund raising."
 msgstr ""
+"Позволяет отслеживать и управлять своей деятельностью по сбору средств."
 
 #. module: crm
 #: field:crm.meeting,phonecall_id:0
@@ -2970,7 +2971,7 @@ msgstr "Звонок"
 #. module: crm
 #: view:crm.phonecall.report:0
 msgid "Phone calls that are assigned to one of the sale teams I manage"
-msgstr ""
+msgstr "Телефонные звонки, которые отнесены к одной из моей команды продаж"
 
 #. module: crm
 #: view:crm.lead:0
diff --git a/addons/crm/i18n/zh_CN.po b/addons/crm/i18n/zh_CN.po
index 19f6aa83142..02f7a8f5040 100644
--- a/addons/crm/i18n/zh_CN.po
+++ b/addons/crm/i18n/zh_CN.po
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2012-12-03 16:01+0000\n"
-"PO-Revision-Date: 2012-11-26 02:18+0000\n"
-"Last-Translator: Wei \"oldrev\" Li <oldrev@gmail.com>\n"
+"PO-Revision-Date: 2012-12-05 16:32+0000\n"
+"Last-Translator: jerryzhang <jerry.zhangzhe@gmail.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:18+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-06 04:40+0000\n"
+"X-Generator: Launchpad (build 16341)\n"
 
 #. module: crm
 #: view:crm.lead.report:0
@@ -26,7 +26,7 @@ msgstr "线索"
 msgid ""
 "Allows you to configure your incoming mail server, and create leads from "
 "incoming emails."
-msgstr ""
+msgstr "允许你设置接收邮件服务器，并从收到的邮件中创建线索"
 
 #. module: crm
 #: selection:crm.case.stage,type:0
@@ -67,7 +67,7 @@ msgstr ""
 #. module: crm
 #: view:crm.lead2opportunity.partner.mass:0
 msgid "Convert to Opportunities"
-msgstr ""
+msgstr "转为商机"
 
 #. module: crm
 #: view:crm.lead.report:0
@@ -516,7 +516,7 @@ msgstr "计划收入"
 #. module: crm
 #: model:ir.actions.server,name:crm.actions_server_crm_phonecall_read
 msgid "CRM Phonecall: Mark read"
-msgstr ""
+msgstr "CRM电话记录：标记为已读"
 
 #. module: crm
 #: selection:crm.lead.report,creation_month:0
@@ -565,7 +565,7 @@ msgstr "联系人姓名"
 #. module: crm
 #: model:ir.actions.server,name:crm.actions_server_crm_phonecall_unread
 msgid "CRM Phonecall: Mark unread"
-msgstr ""
+msgstr "CRM电话记录：标记为未读"
 
 #. module: crm
 #: model:ir.actions.server,subject:crm.action_email_reminder_lead
@@ -677,7 +677,7 @@ msgstr ""
 #. module: crm
 #: sql_constraint:crm.lead:0
 msgid "The probability of closing the deal should be between 0% and 100%!"
-msgstr ""
+msgstr "这笔交易达成的概率应该在0%到100%之间！"
 
 #. module: crm
 #: view:crm.lead:0
@@ -723,7 +723,7 @@ msgstr "电视"
 #. module: crm
 #: model:ir.actions.act_window,name:crm.action_crm_send_mass_convert
 msgid "Convert to opportunities"
-msgstr ""
+msgstr "转为商机"
 
 #. module: crm
 #: model:ir.model,name:crm.model_sale_config_settings
diff --git a/addons/fleet/i18n/nl.po b/addons/fleet/i18n/nl.po
index cc4b1b029b8..36f6916a39d 100644
--- a/addons/fleet/i18n/nl.po
+++ b/addons/fleet/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: 2012-11-24 02:52+0000\n"
-"PO-Revision-Date: 2012-12-04 07:46+0000\n"
+"PO-Revision-Date: 2012-12-05 17:59+0000\n"
 "Last-Translator: Leen Sonneveld <leen.sonneveld@opensol.nl>\n"
 "Language-Team: Dutch <nl@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-05 05:20+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-06 04:41+0000\n"
+"X-Generator: Launchpad (build 16341)\n"
 
 #. module: fleet
 #: selection:fleet.vehicle,fuel_type:0
@@ -30,7 +30,7 @@ msgstr "Compacte"
 #. module: fleet
 #: model:fleet.service.type,name:fleet.type_service_1
 msgid "A/C Compressor Replacement"
-msgstr ""
+msgstr "Airco compressor vervangen"
 
 #. module: fleet
 #: help:fleet.vehicle,vin_sn:0
@@ -42,7 +42,7 @@ msgstr "Uniek motor nummer (serienummer)"
 #: view:fleet.vehicle.log.contract:0
 #: view:fleet.vehicle.log.services:0
 msgid "Service"
-msgstr ""
+msgstr "Service"
 
 #. module: fleet
 #: selection:fleet.vehicle.log.contract,cost_frequency:0
@@ -173,7 +173,7 @@ msgstr ""
 #: code:addons/fleet/fleet.py:655
 #, python-format
 msgid "%s contract(s) need(s) to be renewed and/or closed!"
-msgstr ""
+msgstr "%s contract(en) moet(en) vernieuwd en/of afgelosten worden!"
 
 #. module: fleet
 #: view:fleet.vehicle.cost:0
@@ -193,7 +193,7 @@ msgstr "Waarde van het aangeschafte voertuig"
 #. module: fleet
 #: model:fleet.service.type,name:fleet.type_service_44
 msgid "Tie Rod End Replacement"
-msgstr ""
+msgstr "Stuurkogel vervangen"
 
 #. module: fleet
 #: model:fleet.service.type,name:fleet.type_service_24
@@ -282,7 +282,7 @@ msgstr ""
 #: view:fleet.vehicle.log.services:0
 #: field:fleet.vehicle.log.services,notes:0
 msgid "Notes"
-msgstr ""
+msgstr "Aantekeningen"
 
 #. module: fleet
 #: code:addons/fleet/fleet.py:47
@@ -305,7 +305,7 @@ msgstr "Voertuig waar deze log betrekking op heeft"
 #: field:fleet.vehicle.log.fuel,cost_amount:0
 #: field:fleet.vehicle.log.services,cost_amount:0
 msgid "Amount"
-msgstr ""
+msgstr "Bedrag"
 
 #. module: fleet
 #: field:fleet.vehicle,message_unread:0
@@ -545,17 +545,17 @@ msgstr ""
 #. module: fleet
 #: field:fleet.vehicle.cost,cost_subtype:0
 msgid "Type"
-msgstr ""
+msgstr "Type"
 
 #. module: fleet
 #: field:fleet.vehicle,contract_renewal_overdue:0
 msgid "Has Contracts Overdued"
-msgstr ""
+msgstr "Heeft vervallen contracten"
 
 #. module: fleet
 #: field:fleet.vehicle.cost,amount:0
 msgid "Total Price"
-msgstr ""
+msgstr "Totaalprijs"
 
 #. module: fleet
 #: model:fleet.service.type,name:fleet.type_service_27
@@ -570,17 +570,17 @@ msgstr ""
 #. module: fleet
 #: help:fleet.vehicle,driver:0
 msgid "Driver of the vehicle"
-msgstr ""
+msgstr "Bestuurder van het voertuig"
 
 #. module: fleet
 #: view:fleet.vehicle:0
 msgid "other(s)"
-msgstr ""
+msgstr "overige(n)"
 
 #. module: fleet
 #: model:fleet.service.type,name:fleet.type_service_refueling
 msgid "Refueling"
-msgstr ""
+msgstr "Tanken"
 
 #. module: fleet
 #: help:fleet.vehicle,message_summary:0
@@ -592,7 +592,7 @@ msgstr ""
 #. module: fleet
 #: model:fleet.service.type,name:fleet.type_service_5
 msgid "A/C Recharge"
-msgstr ""
+msgstr "Airco bijvullen"
 
 #. module: fleet
 #: model:ir.model,name:fleet.model_fleet_vehicle_log_fuel
@@ -700,7 +700,7 @@ msgstr "Huidige staat van het voertuig"
 #. module: fleet
 #: selection:fleet.vehicle,transmission:0
 msgid "Manual"
-msgstr ""
+msgstr "Handmatig"
 
 #. module: fleet
 #: model:fleet.service.type,name:fleet.type_service_52
@@ -783,7 +783,7 @@ msgstr "Indicatieve kosten"
 #. module: fleet
 #: model:fleet.service.type,name:fleet.type_service_26
 msgid "Heater Control Valve Replacement"
-msgstr ""
+msgstr "Verwarmingsklep vervangen"
 
 #. module: fleet
 #: view:fleet.vehicle.log.contract:0
@@ -858,7 +858,7 @@ msgstr "Remklauw vervangen"
 #. module: fleet
 #: field:fleet.vehicle,odometer:0
 msgid "Last Odometer"
-msgstr ""
+msgstr "Laatste km-stand"
 
 #. module: fleet
 #: model:ir.actions.act_window,name:fleet.fleet_vehicle_model_act
@@ -884,7 +884,7 @@ msgstr "Modellen"
 #. module: fleet
 #: view:fleet.vehicle.log.contract:0
 msgid "amount"
-msgstr ""
+msgstr "bedrag"
 
 #. module: fleet
 #: help:fleet.vehicle,fuel_type:0
@@ -943,12 +943,12 @@ msgstr ""
 #. module: fleet
 #: model:fleet.service.type,name:fleet.type_service_43
 msgid "Thermostat Replacement"
-msgstr ""
+msgstr "Thermostaat vervangen"
 
 #. module: fleet
 #: field:fleet.service.type,category:0
 msgid "Category"
-msgstr ""
+msgstr "Categorie"
 
 #. module: fleet
 #: model:ir.actions.act_window,name:fleet.action_fleet_vehicle_log_fuel_graph
@@ -961,6 +961,8 @@ msgid ""
 "This field holds the image used as logo for the brand, limited to "
 "1024x1024px."
 msgstr ""
+"Dit veld bevat het beeld dat gebruikt wordt als logo voor het merk, max. "
+"1024x1024px."
 
 #. module: fleet
 #: model:fleet.service.type,name:fleet.type_service_service_11
@@ -1116,27 +1118,27 @@ msgstr ""
 #. module: fleet
 #: model:fleet.service.type,name:fleet.type_service_service_15
 msgid "Residual value (Excluding VAT)"
-msgstr ""
+msgstr "Restwaarde (excl. BTW)"
 
 #. module: fleet
 #: model:fleet.service.type,name:fleet.type_service_7
 msgid "Alternator Replacement"
-msgstr ""
+msgstr "Dyname vervangen"
 
 #. module: fleet
 #: model:fleet.service.type,name:fleet.type_service_3
 msgid "A/C Diagnosis"
-msgstr ""
+msgstr "Airco diagnose"
 
 #. module: fleet
 #: model:fleet.service.type,name:fleet.type_service_23
 msgid "Fuel Pump Replacement"
-msgstr ""
+msgstr "Brandstof pomp vervangen"
 
 #. module: fleet
 #: view:fleet.vehicle.log.contract:0
 msgid "Activation Cost"
-msgstr ""
+msgstr "Activeringswaarde"
 
 #. module: fleet
 #: view:fleet.vehicle.cost:0
@@ -1146,23 +1148,23 @@ msgstr ""
 #. module: fleet
 #: model:fleet.service.type,name:fleet.type_service_4
 msgid "A/C Evaporator Replacement"
-msgstr ""
+msgstr "Airco verdamper vervangen"
 
 #. module: fleet
 #: view:fleet.vehicle:0
 msgid "show all the costs for this vehicle"
-msgstr ""
+msgstr "toon alle kosten van het voertuig"
 
 #. module: fleet
 #: view:fleet.vehicle.odometer:0
 msgid "Odometer Values Per Month"
-msgstr ""
+msgstr "Km-standen per maand"
 
 #. module: fleet
 #: field:fleet.vehicle,message_comment_ids:0
 #: help:fleet.vehicle,message_comment_ids:0
 msgid "Comments and emails"
-msgstr ""
+msgstr "Opmerkingen en e-mails."
 
 #. module: fleet
 #: model:ir.actions.act_window,help:fleet.fleet_vehicle_act
@@ -1190,7 +1192,7 @@ msgstr ""
 #. module: fleet
 #: field:fleet.vehicle.log.contract,expiration_date:0
 msgid "Contract Expiration Date"
-msgstr ""
+msgstr "Contract vervaldatum"
 
 #. module: fleet
 #: view:fleet.vehicle.cost:0
@@ -1224,7 +1226,7 @@ msgstr ""
 #. module: fleet
 #: selection:fleet.vehicle,odometer_unit:0
 msgid "Kilometers"
-msgstr ""
+msgstr "Kilometers"
 
 #. module: fleet
 #: view:fleet.vehicle.log.fuel:0
@@ -1236,7 +1238,7 @@ msgstr ""
 #: field:fleet.vehicle.cost,contract_id:0
 #: selection:fleet.vehicle.cost,cost_type:0
 msgid "Contract"
-msgstr ""
+msgstr "Contract"
 
 #. module: fleet
 #: model:ir.actions.act_window,name:fleet.fleet_vehicle_model_brand_act
@@ -1247,26 +1249,26 @@ msgstr ""
 #. module: fleet
 #: model:fleet.service.type,name:fleet.type_service_10
 msgid "Battery Replacement"
-msgstr ""
+msgstr "Accu vervangen"
 
 #. module: fleet
 #: view:fleet.vehicle.cost:0
 #: field:fleet.vehicle.cost,date:0
 #: field:fleet.vehicle.odometer,date:0
 msgid "Date"
-msgstr ""
+msgstr "Datum"
 
 #. module: fleet
 #: model:ir.actions.act_window,name:fleet.fleet_vehicle_act
 #: model:ir.ui.menu,name:fleet.fleet_vehicle_menu
 #: model:ir.ui.menu,name:fleet.fleet_vehicles
 msgid "Vehicles"
-msgstr ""
+msgstr "Voertuigen"
 
 #. module: fleet
 #: selection:fleet.vehicle,odometer_unit:0
 msgid "Miles"
-msgstr ""
+msgstr "Mijl"
 
 #. module: fleet
 #: help:fleet.vehicle.log.contract,cost_generated:0
@@ -1278,7 +1280,7 @@ msgstr ""
 #. module: fleet
 #: model:fleet.service.type,name:fleet.type_service_service_17
 msgid "Emissions"
-msgstr ""
+msgstr "Emissies"
 
 #. module: fleet
 #: model:ir.actions.act_window,help:fleet.action_fleet_reporting_costs
@@ -1300,7 +1302,7 @@ msgstr ""
 #. module: fleet
 #: field:fleet.vehicle,car_value:0
 msgid "Car Value"
-msgstr ""
+msgstr "Voertuig waarde"
 
 #. module: fleet
 #: model:ir.actions.act_window,name:fleet.open_board_fleet
@@ -1313,17 +1315,17 @@ msgstr "Wagenpark"
 #. module: fleet
 #: model:fleet.service.type,name:fleet.type_service_service_14
 msgid "Total expenses (Excluding VAT)"
-msgstr ""
+msgstr "Totale uitgaven (excl. BTW)"
 
 #. module: fleet
 #: field:fleet.vehicle.cost,odometer_id:0
 msgid "Odometer"
-msgstr ""
+msgstr "Kilometerteller"
 
 #. module: fleet
 #: model:fleet.service.type,name:fleet.type_service_45
 msgid "Tire Replacement"
-msgstr ""
+msgstr "Band vervangen"
 
 #. module: fleet
 #: view:fleet.service.type:0
diff --git a/addons/fleet/i18n/pt.po b/addons/fleet/i18n/pt.po
new file mode 100644
index 00000000000..fa5d6ef0c5d
--- /dev/null
+++ b/addons/fleet/i18n/pt.po
@@ -0,0 +1,1895 @@
+# Portuguese translation for openobject-addons
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-11-24 02:52+0000\n"
+"PO-Revision-Date: 2012-12-05 10:16+0000\n"
+"Last-Translator: Andrei Talpa (multibase.pt) <andrei.talpa@multibase.pt>\n"
+"Language-Team: Portuguese <pt@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2012-12-06 04:41+0000\n"
+"X-Generator: Launchpad (build 16341)\n"
+
+#. module: fleet
+#: selection:fleet.vehicle,fuel_type:0
+msgid "Hybrid"
+msgstr ""
+
+#. module: fleet
+#: model:fleet.vehicle.tag,name:fleet.vehicle_tag_compact
+msgid "Compact"
+msgstr ""
+
+#. module: fleet
+#: model:fleet.service.type,name:fleet.type_service_1
+msgid "A/C Compressor Replacement"
+msgstr ""
+
+#. module: fleet
+#: help:fleet.vehicle,vin_sn:0
+msgid "Unique number written on the vehicle motor (VIN/SN number)"
+msgstr ""
+
+#. module: fleet
+#: selection:fleet.service.type,category:0
+#: view:fleet.vehicle.log.contract:0
+#: view:fleet.vehicle.log.services:0
+msgid "Service"
+msgstr ""
+
+#. module: fleet
+#: selection:fleet.vehicle.log.contract,cost_frequency:0
+msgid "Monthly"
+msgstr ""
+
+#. module: fleet
+#: code:addons/fleet/fleet.py:62
+#, python-format
+msgid "Unknown"
+msgstr "Desconhecido"
+
+#. module: fleet
+#: model:fleet.service.type,name:fleet.type_service_20
+msgid "Engine/Drive Belt(s) Replacement"
+msgstr ""
+
+#. module: fleet
+#: view:fleet.vehicle.cost:0
+msgid "Vehicle costs"
+msgstr ""
+
+#. module: fleet
+#: selection:fleet.vehicle,fuel_type:0
+msgid "Diesel"
+msgstr ""
+
+#. module: fleet
+#: code:addons/fleet/fleet.py:421
+#, python-format
+msgid "License Plate: from '%s' to '%s'"
+msgstr ""
+
+#. module: fleet
+#: model:fleet.service.type,name:fleet.type_service_38
+msgid "Resurface Rotors"
+msgstr ""
+
+#. module: fleet
+#: view:fleet.vehicle.cost:0
+msgid "Group By..."
+msgstr "Agrupar por..."
+
+#. module: fleet
+#: model:fleet.service.type,name:fleet.type_service_32
+msgid "Oil Pump Replacement"
+msgstr ""
+
+#. module: fleet
+#: model:fleet.service.type,name:fleet.type_service_18
+msgid "Engine Belt Inspection"
+msgstr ""
+
+#. module: fleet
+#: selection:fleet.vehicle.log.contract,cost_frequency:0
+msgid "No"
+msgstr "Não"
+
+#. module: fleet
+#: help:fleet.vehicle,power:0
+msgid "Power in kW of the vehicle"
+msgstr ""
+
+#. module: fleet
+#: model:fleet.service.type,name:fleet.type_service_service_2
+msgid "Depreciation and Interests"
+msgstr ""
+
+#. module: fleet
+#: field:fleet.vehicle.log.contract,insurer_id:0
+#: field:fleet.vehicle.log.fuel,vendor_id:0
+#: field:fleet.vehicle.log.services,vendor_id:0
+msgid "Supplier"
+msgstr ""
+
+#. module: fleet
+#: model:fleet.service.type,name:fleet.type_service_35
+msgid "Power Steering Hose Replacement"
+msgstr ""
+
+#. module: fleet
+#: view:fleet.vehicle.log.contract:0
+msgid "Odometer details"
+msgstr ""
+
+#. module: fleet
+#: view:fleet.vehicle:0
+msgid "Has Alert(s)"
+msgstr "Tem alerta(s)"
+
+#. module: fleet
+#: field:fleet.vehicle.log.fuel,liter:0
+msgid "Liter"
+msgstr "Litro"
+
+#. module: fleet
+#: view:fleet.vehicle.cost:0
+#: field:fleet.vehicle.cost,parent_id:0
+msgid "Parent"
+msgstr ""
+
+#. module: fleet
+#: view:board.board:0
+msgid "Fuel Costs"
+msgstr ""
+
+#. module: fleet
+#: model:fleet.service.type,name:fleet.type_service_9
+msgid "Battery Inspection"
+msgstr ""
+
+#. module: fleet
+#: field:fleet.vehicle,company_id:0
+msgid "Company"
+msgstr "Empresa"
+
+#. module: fleet
+#: view:fleet.vehicle.log.contract:0
+msgid "Invoice Date"
+msgstr ""
+
+#. module: fleet
+#: view:fleet.vehicle.log.fuel:0
+msgid "Refueling Details"
+msgstr ""
+
+#. module: fleet
+#: code:addons/fleet/fleet.py:655
+#, python-format
+msgid "%s contract(s) need(s) to be renewed and/or closed!"
+msgstr ""
+
+#. module: fleet
+#: view:fleet.vehicle.cost:0
+msgid "Indicative Costs"
+msgstr ""
+
+#. module: fleet
+#: model:fleet.service.type,name:fleet.type_service_16
+msgid "Charging System Diagnosis"
+msgstr ""
+
+#. module: fleet
+#: help:fleet.vehicle,car_value:0
+msgid "Value of the bought vehicle"
+msgstr ""
+
+#. module: fleet
+#: model:fleet.service.type,name:fleet.type_service_44
+msgid "Tie Rod End Replacement"
+msgstr ""
+
+#. module: fleet
+#: model:fleet.service.type,name:fleet.type_service_24
+msgid "Head Gasket(s) Replacement"
+msgstr ""
+
+#. module: fleet
+#: view:fleet.vehicle:0
+#: selection:fleet.vehicle.cost,cost_type:0
+msgid "Services"
+msgstr "Serviços"
+
+#. module: fleet
+#: help:fleet.vehicle,odometer:0
+#: help:fleet.vehicle.cost,odometer:0
+#: help:fleet.vehicle.cost,odometer_id:0
+msgid "Odometer measure of the vehicle at the moment of this log"
+msgstr ""
+
+#. module: fleet
+#: view:fleet.vehicle.log.contract:0
+#: field:fleet.vehicle.log.contract,notes:0
+msgid "Terms and Conditions"
+msgstr "Termos e condições"
+
+#. module: fleet
+#: model:ir.actions.act_window,name:fleet.action_fleet_vehicle_kanban
+msgid "Vehicles with alerts"
+msgstr ""
+
+#. module: fleet
+#: model:ir.actions.act_window,name:fleet.fleet_vehicle_costs_act
+#: model:ir.ui.menu,name:fleet.fleet_vehicle_costs_menu
+msgid "Vehicle Costs"
+msgstr ""
+
+#. module: fleet
+#: view:fleet.vehicle.cost:0
+msgid "Total Cost"
+msgstr ""
+
+#. module: fleet
+#: selection:fleet.service.type,category:0
+msgid "Both"
+msgstr ""
+
+#. module: fleet
+#: field:fleet.vehicle.log.contract,cost_id:0
+#: field:fleet.vehicle.log.fuel,cost_id:0
+#: field:fleet.vehicle.log.services,cost_id:0
+msgid "Automatically created field to link to parent fleet.vehicle.cost"
+msgstr ""
+
+#. module: fleet
+#: view:fleet.vehicle.log.contract:0
+msgid "Terminate Contract"
+msgstr ""
+
+#. module: fleet
+#: help:fleet.vehicle.cost,parent_id:0
+msgid "Parent cost to this current cost"
+msgstr ""
+
+#. module: fleet
+#: help:fleet.vehicle.log.contract,cost_frequency:0
+msgid "Frequency of the recuring cost"
+msgstr ""
+
+#. module: fleet
+#: model:fleet.service.type,name:fleet.type_service_service_1
+msgid "Calculation Benefit In Kind"
+msgstr ""
+
+#. module: fleet
+#: help:fleet.vehicle.log.contract,expiration_date:0
+msgid ""
+"Date when the coverage of the contract expirates (by default, one year after "
+"begin date)"
+msgstr ""
+
+#. module: fleet
+#: view:fleet.vehicle.log.fuel:0
+#: field:fleet.vehicle.log.fuel,notes:0
+#: view:fleet.vehicle.log.services:0
+#: field:fleet.vehicle.log.services,notes:0
+msgid "Notes"
+msgstr ""
+
+#. module: fleet
+#: code:addons/fleet/fleet.py:47
+#, python-format
+msgid "Operation not allowed!"
+msgstr ""
+
+#. module: fleet
+#: field:fleet.vehicle,message_ids:0
+msgid "Messages"
+msgstr ""
+
+#. module: fleet
+#: help:fleet.vehicle.cost,vehicle_id:0
+msgid "Vehicle concerned by this log"
+msgstr ""
+
+#. module: fleet
+#: field:fleet.vehicle.log.contract,cost_amount:0
+#: field:fleet.vehicle.log.fuel,cost_amount:0
+#: field:fleet.vehicle.log.services,cost_amount:0
+msgid "Amount"
+msgstr ""
+
+#. module: fleet
+#: field:fleet.vehicle,message_unread:0
+msgid "Unread Messages"
+msgstr ""
+
+#. module: fleet
+#: model:fleet.service.type,name:fleet.type_service_6
+msgid "Air Filter Replacement"
+msgstr ""
+
+#. module: fleet
+#: model:ir.model,name:fleet.model_fleet_vehicle_tag
+msgid "fleet.vehicle.tag"
+msgstr ""
+
+#. module: fleet
+#: view:fleet.vehicle:0
+msgid "show the services logs for this vehicle"
+msgstr ""
+
+#. module: fleet
+#: field:fleet.vehicle,contract_renewal_name:0
+msgid "Name of contract to renew soon"
+msgstr ""
+
+#. module: fleet
+#: model:fleet.vehicle.tag,name:fleet.vehicle_tag_senior
+msgid "Senior"
+msgstr ""
+
+#. module: fleet
+#: help:fleet.vehicle.log.contract,state:0
+msgid "Choose wheter the contract is still valid or not"
+msgstr ""
+
+#. module: fleet
+#: selection:fleet.vehicle,transmission:0
+msgid "Automatic"
+msgstr ""
+
+#. module: fleet
+#: help:fleet.vehicle,message_unread:0
+msgid "If checked new messages require your attention."
+msgstr ""
+
+#. module: fleet
+#: code:addons/fleet/fleet.py:414
+#, python-format
+msgid "Driver: from '%s' to '%s'"
+msgstr ""
+
+#. module: fleet
+#: view:fleet.vehicle:0
+msgid "and"
+msgstr ""
+
+#. module: fleet
+#: field:fleet.vehicle.model.brand,image_medium:0
+msgid "Medium-sized photo"
+msgstr ""
+
+#. module: fleet
+#: model:fleet.service.type,name:fleet.type_service_34
+msgid "Oxygen Sensor Replacement"
+msgstr ""
+
+#. module: fleet
+#: view:fleet.vehicle.log.services:0
+msgid "Service Type"
+msgstr ""
+
+#. module: fleet
+#: help:fleet.vehicle,transmission:0
+msgid "Transmission Used by the vehicle"
+msgstr ""
+
+#. module: fleet
+#: code:addons/fleet/fleet.py:726
+#: view:fleet.vehicle.log.contract:0
+#: model:ir.actions.act_window,name:fleet.act_renew_contract
+#, python-format
+msgid "Renew Contract"
+msgstr ""
+
+#. module: fleet
+#: view:fleet.vehicle:0
+msgid "show the odometer logs for this vehicle"
+msgstr ""
+
+#. module: fleet
+#: help:fleet.vehicle,odometer_unit:0
+msgid "Unit of the odometer "
+msgstr ""
+
+#. module: fleet
+#: view:fleet.vehicle.log.services:0
+msgid "Services Costs Per Month"
+msgstr ""
+
+#. module: fleet
+#: view:fleet.vehicle.cost:0
+msgid "Effective Costs"
+msgstr ""
+
+#. module: fleet
+#: model:fleet.service.type,name:fleet.type_service_service_8
+msgid "Repair and maintenance"
+msgstr ""
+
+#. module: fleet
+#: help:fleet.vehicle.log.contract,purchaser_id:0
+msgid "Person to which the contract is signed for"
+msgstr ""
+
+#. module: fleet
+#: model:ir.actions.act_window,help:fleet.fleet_vehicle_log_contract_act
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to create a new contract. \n"
+"              </p><p>\n"
+"                Manage all your contracts (leasing, insurances, etc.) with\n"
+"                their related services, costs. OpenERP will automatically "
+"warn\n"
+"                you when some contracts have to be renewed.\n"
+"              </p><p>\n"
+"                Each contract (e.g.: leasing) may include several services\n"
+"                (reparation, insurances, periodic maintenance).\n"
+"              </p>\n"
+"            "
+msgstr ""
+
+#. module: fleet
+#: model:ir.model,name:fleet.model_fleet_service_type
+msgid "Type of services available on a vehicle"
+msgstr ""
+
+#. module: fleet
+#: model:ir.actions.act_window,name:fleet.fleet_vehicle_service_types_act
+#: model:ir.ui.menu,name:fleet.fleet_vehicle_service_types_menu
+msgid "Service Types"
+msgstr ""
+
+#. module: fleet
+#: view:board.board:0
+msgid "Contracts Costs"
+msgstr ""
+
+#. module: fleet
+#: model:ir.actions.act_window,name:fleet.fleet_vehicle_log_services_act
+#: model:ir.ui.menu,name:fleet.fleet_vehicle_log_services_menu
+msgid "Vehicles Services Logs"
+msgstr ""
+
+#. module: fleet
+#: model:ir.actions.act_window,name:fleet.fleet_vehicle_log_fuel_act
+#: model:ir.ui.menu,name:fleet.fleet_vehicle_log_fuel_menu
+msgid "Vehicles Fuel Logs"
+msgstr ""
+
+#. module: fleet
+#: view:fleet.vehicle.model.brand:0
+msgid ""
+"$('.oe_picture').load(function() { if($(this).width() > $(this).height()) { "
+"$(this).addClass('oe_employee_picture_wide') } });"
+msgstr ""
+
+#. module: fleet
+#: view:board.board:0
+msgid "Vehicles With Alerts"
+msgstr ""
+
+#. module: fleet
+#: model:ir.actions.act_window,help:fleet.fleet_vehicle_costs_act
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to create a new cost.\n"
+"              </p><p>\n"
+"                OpenERP helps you managing the costs for your different\n"
+"                vehicles. Costs are created automatically from services,\n"
+"                contracts (fixed or recurring) and fuel logs.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
+#. module: fleet
+#: view:fleet.vehicle:0
+msgid "show the fuel logs for this vehicle"
+msgstr ""
+
+#. module: fleet
+#: field:fleet.vehicle.log.contract,purchaser_id:0
+msgid "Contractor"
+msgstr ""
+
+#. module: fleet
+#: field:fleet.vehicle,license_plate:0
+msgid "License Plate"
+msgstr ""
+
+#. module: fleet
+#: field:fleet.vehicle.log.contract,cost_frequency:0
+msgid "Recurring Cost Frequency"
+msgstr ""
+
+#. module: fleet
+#: field:fleet.vehicle.log.fuel,inv_ref:0
+#: field:fleet.vehicle.log.services,inv_ref:0
+msgid "Invoice Reference"
+msgstr ""
+
+#. module: fleet
+#: field:fleet.vehicle,message_follower_ids:0
+msgid "Followers"
+msgstr ""
+
+#. module: fleet
+#: field:fleet.vehicle,location:0
+msgid "Location"
+msgstr ""
+
+#. module: fleet
+#: view:fleet.vehicle.cost:0
+msgid "Costs Per Month"
+msgstr ""
+
+#. module: fleet
+#: field:fleet.contract.state,name:0
+msgid "Contract Status"
+msgstr ""
+
+#. module: fleet
+#: field:fleet.vehicle,contract_renewal_total:0
+msgid "Total of contracts due or overdue minus one"
+msgstr ""
+
+#. module: fleet
+#: field:fleet.vehicle.cost,cost_subtype:0
+msgid "Type"
+msgstr ""
+
+#. module: fleet
+#: field:fleet.vehicle,contract_renewal_overdue:0
+msgid "Has Contracts Overdued"
+msgstr ""
+
+#. module: fleet
+#: field:fleet.vehicle.cost,amount:0
+msgid "Total Price"
+msgstr ""
+
+#. module: fleet
+#: model:fleet.service.type,name:fleet.type_service_27
+msgid "Heater Core Replacement"
+msgstr ""
+
+#. module: fleet
+#: model:fleet.service.type,name:fleet.type_service_14
+msgid "Car Wash"
+msgstr ""
+
+#. module: fleet
+#: help:fleet.vehicle,driver:0
+msgid "Driver of the vehicle"
+msgstr ""
+
+#. module: fleet
+#: view:fleet.vehicle:0
+msgid "other(s)"
+msgstr ""
+
+#. module: fleet
+#: model:fleet.service.type,name:fleet.type_service_refueling
+msgid "Refueling"
+msgstr ""
+
+#. module: fleet
+#: help:fleet.vehicle,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: fleet
+#: model:fleet.service.type,name:fleet.type_service_5
+msgid "A/C Recharge"
+msgstr ""
+
+#. module: fleet
+#: model:ir.model,name:fleet.model_fleet_vehicle_log_fuel
+msgid "Fuel log for vehicles"
+msgstr ""
+
+#. module: fleet
+#: view:fleet.vehicle:0
+msgid "Engine Options"
+msgstr ""
+
+#. module: fleet
+#: view:fleet.vehicle.log.fuel:0
+msgid "Fuel Costs Per Month"
+msgstr ""
+
+#. module: fleet
+#: model:fleet.vehicle.tag,name:fleet.vehicle_tag_sedan
+msgid "Sedan"
+msgstr ""
+
+#. module: fleet
+#: field:fleet.vehicle,seats:0
+msgid "Seats Number"
+msgstr ""
+
+#. module: fleet
+#: model:fleet.vehicle.tag,name:fleet.vehicle_tag_convertible
+msgid "Convertible"
+msgstr ""
+
+#. module: fleet
+#: model:ir.ui.menu,name:fleet.fleet_configuration
+msgid "Configuration"
+msgstr ""
+
+#. module: fleet
+#: view:fleet.vehicle.log.contract:0
+#: field:fleet.vehicle.log.contract,sum_cost:0
+msgid "Indicative Costs Total"
+msgstr ""
+
+#. module: fleet
+#: model:fleet.vehicle.tag,name:fleet.vehicle_tag_junior
+msgid "Junior"
+msgstr ""
+
+#. module: fleet
+#: help:fleet.vehicle,model_id:0
+msgid "Model of the vehicle"
+msgstr ""
+
+#. module: fleet
+#: model:ir.actions.act_window,help:fleet.fleet_vehicle_state_act
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to create a vehicule status.\n"
+"              </p><p>\n"
+"                You can customize available status to track the evolution "
+"of\n"
+"                each vehicule. Example: Active, Being Repaired, Sold.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
+#. module: fleet
+#: view:fleet.vehicle:0
+#: field:fleet.vehicle,log_fuel:0
+#: view:fleet.vehicle.log.fuel:0
+msgid "Fuel Logs"
+msgstr ""
+
+#. module: fleet
+#: code:addons/fleet/fleet.py:409
+#: code:addons/fleet/fleet.py:413
+#: code:addons/fleet/fleet.py:417
+#: code:addons/fleet/fleet.py:420
+#, python-format
+msgid "None"
+msgstr ""
+
+#. module: fleet
+#: model:ir.actions.act_window,name:fleet.action_fleet_reporting_costs_non_effective
+#: model:ir.ui.menu,name:fleet.menu_fleet_reporting_indicative_costs
+msgid "Indicative Costs Analysis"
+msgstr ""
+
+#. module: fleet
+#: model:fleet.service.type,name:fleet.type_service_12
+msgid "Brake Inspection"
+msgstr ""
+
+#. module: fleet
+#: help:fleet.vehicle,state:0
+msgid "Current state of the vehicle"
+msgstr ""
+
+#. module: fleet
+#: selection:fleet.vehicle,transmission:0
+msgid "Manual"
+msgstr ""
+
+#. module: fleet
+#: model:fleet.service.type,name:fleet.type_service_52
+msgid "Wheel Bearing Replacement"
+msgstr ""
+
+#. module: fleet
+#: help:fleet.vehicle.cost,cost_subtype:0
+msgid "Cost type purchased with this cost"
+msgstr ""
+
+#. module: fleet
+#: selection:fleet.vehicle,fuel_type:0
+msgid "Gasoline"
+msgstr ""
+
+#. module: fleet
+#: model:ir.actions.act_window,help:fleet.fleet_vehicle_model_brand_act
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to create a new brand.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
+#. module: fleet
+#: field:fleet.vehicle.log.contract,start_date:0
+msgid "Contract Start Date"
+msgstr ""
+
+#. module: fleet
+#: field:fleet.vehicle,odometer_unit:0
+msgid "Odometer Unit"
+msgstr ""
+
+#. module: fleet
+#: model:fleet.service.type,name:fleet.type_service_30
+msgid "Intake Manifold Gasket Replacement"
+msgstr ""
+
+#. module: fleet
+#: selection:fleet.vehicle.log.contract,cost_frequency:0
+msgid "Daily"
+msgstr ""
+
+#. module: fleet
+#: model:fleet.service.type,name:fleet.type_service_service_6
+msgid "Snow tires"
+msgstr ""
+
+#. module: fleet
+#: help:fleet.vehicle.cost,date:0
+msgid "Date when the cost has been executed"
+msgstr ""
+
+#. module: fleet
+#: field:fleet.vehicle.state,sequence:0
+msgid "Order"
+msgstr ""
+
+#. module: fleet
+#: view:fleet.vehicle.cost:0
+msgid "Vehicles costs"
+msgstr ""
+
+#. module: fleet
+#: model:ir.model,name:fleet.model_fleet_vehicle_log_services
+msgid "Services for vehicles"
+msgstr ""
+
+#. module: fleet
+#: view:fleet.vehicle.log.contract:0
+msgid "Indicative Cost"
+msgstr ""
+
+#. module: fleet
+#: model:fleet.service.type,name:fleet.type_service_26
+msgid "Heater Control Valve Replacement"
+msgstr ""
+
+#. module: fleet
+#: view:fleet.vehicle.log.contract:0
+msgid ""
+"Create a new contract automatically with all the same informations except "
+"for the date that will start at the end of current contract"
+msgstr ""
+
+#. module: fleet
+#: selection:fleet.vehicle.log.contract,state:0
+msgid "Terminated"
+msgstr ""
+
+#. module: fleet
+#: model:ir.model,name:fleet.model_fleet_vehicle_cost
+msgid "Cost related to a vehicle"
+msgstr ""
+
+#. module: fleet
+#: model:fleet.service.type,name:fleet.type_service_33
+msgid "Other Maintenance"
+msgstr ""
+
+#. module: fleet
+#: field:fleet.vehicle.model,brand:0
+#: view:fleet.vehicle.model.brand:0
+msgid "Model Brand"
+msgstr ""
+
+#. module: fleet
+#: field:fleet.vehicle.model.brand,image_small:0
+msgid "Smal-sized photo"
+msgstr ""
+
+#. module: fleet
+#: field:fleet.vehicle,state:0
+#: view:fleet.vehicle.state:0
+msgid "State"
+msgstr ""
+
+#. module: fleet
+#: field:fleet.vehicle.log.contract,cost_generated:0
+msgid "Recurring Cost Amount"
+msgstr ""
+
+#. module: fleet
+#: model:fleet.service.type,name:fleet.type_service_49
+msgid "Transmission Replacement"
+msgstr ""
+
+#. module: fleet
+#: model:ir.actions.act_window,help:fleet.fleet_vehicle_log_fuel_act
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to create a new fuel log. \n"
+"              </p><p>\n"
+"                Here you can add refuelling entries for all vehicles.  You "
+"can\n"
+"                also filter logs of a particular vehicle using the search\n"
+"                field.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
+#. module: fleet
+#: model:fleet.service.type,name:fleet.type_service_11
+msgid "Brake Caliper Replacement"
+msgstr ""
+
+#. module: fleet
+#: field:fleet.vehicle,odometer:0
+msgid "Last Odometer"
+msgstr ""
+
+#. module: fleet
+#: model:ir.actions.act_window,name:fleet.fleet_vehicle_model_act
+#: model:ir.ui.menu,name:fleet.fleet_vehicle_model_menu
+msgid "Vehicle Model"
+msgstr ""
+
+#. module: fleet
+#: field:fleet.vehicle,doors:0
+msgid "Doors Number"
+msgstr ""
+
+#. module: fleet
+#: help:fleet.vehicle,acquisition_date:0
+msgid "Date when the vehicle has been bought"
+msgstr ""
+
+#. module: fleet
+#: view:fleet.vehicle.model:0
+msgid "Models"
+msgstr ""
+
+#. module: fleet
+#: view:fleet.vehicle.log.contract:0
+msgid "amount"
+msgstr ""
+
+#. module: fleet
+#: help:fleet.vehicle,fuel_type:0
+msgid "Fuel Used by the vehicle"
+msgstr ""
+
+#. module: fleet
+#: view:fleet.vehicle.log.contract:0
+msgid "Set Contract In Progress"
+msgstr ""
+
+#. module: fleet
+#: field:fleet.vehicle.cost,odometer_unit:0
+#: field:fleet.vehicle.odometer,unit:0
+msgid "Unit"
+msgstr ""
+
+#. module: fleet
+#: field:fleet.vehicle,message_is_follower:0
+msgid "Is a Follower"
+msgstr ""
+
+#. module: fleet
+#: field:fleet.vehicle,horsepower:0
+msgid "Horsepower"
+msgstr ""
+
+#. module: fleet
+#: field:fleet.vehicle,image:0
+#: field:fleet.vehicle,image_medium:0
+#: field:fleet.vehicle,image_small:0
+#: field:fleet.vehicle.model,image:0
+#: field:fleet.vehicle.model,image_medium:0
+#: field:fleet.vehicle.model,image_small:0
+#: field:fleet.vehicle.model.brand,image:0
+msgid "Logo"
+msgstr ""
+
+#. module: fleet
+#: field:fleet.vehicle,horsepower_tax:0
+msgid "Horsepower Taxation"
+msgstr ""
+
+#. module: fleet
+#: field:fleet.vehicle,log_services:0
+#: view:fleet.vehicle.log.services:0
+msgid "Services Logs"
+msgstr ""
+
+#. module: fleet
+#: code:addons/fleet/fleet.py:47
+#, python-format
+msgid "Emptying the odometer value of a vehicle is not allowed."
+msgstr ""
+
+#. module: fleet
+#: model:fleet.service.type,name:fleet.type_service_43
+msgid "Thermostat Replacement"
+msgstr ""
+
+#. module: fleet
+#: field:fleet.service.type,category:0
+msgid "Category"
+msgstr ""
+
+#. module: fleet
+#: model:ir.actions.act_window,name:fleet.action_fleet_vehicle_log_fuel_graph
+msgid "Fuel Costs by Month"
+msgstr ""
+
+#. module: fleet
+#: help:fleet.vehicle.model.brand,image:0
+msgid ""
+"This field holds the image used as logo for the brand, limited to "
+"1024x1024px."
+msgstr ""
+
+#. module: fleet
+#: model:fleet.service.type,name:fleet.type_service_service_11
+msgid "Management Fee"
+msgstr ""
+
+#. module: fleet
+#: view:fleet.vehicle:0
+msgid "All vehicles"
+msgstr ""
+
+#. module: fleet
+#: view:fleet.vehicle.log.fuel:0
+#: view:fleet.vehicle.log.services:0
+msgid "Additional Details"
+msgstr ""
+
+#. module: fleet
+#: model:ir.actions.act_window,name:fleet.action_fleet_vehicle_log_services_graph
+msgid "Services Costs by Month"
+msgstr ""
+
+#. module: fleet
+#: model:fleet.service.type,name:fleet.type_service_service_9
+msgid "Assistance"
+msgstr ""
+
+#. module: fleet
+#: field:fleet.vehicle.log.fuel,price_per_liter:0
+msgid "Price Per Liter"
+msgstr ""
+
+#. module: fleet
+#: model:fleet.service.type,name:fleet.type_service_17
+msgid "Door Window Motor/Regulator Replacement"
+msgstr ""
+
+#. module: fleet
+#: model:fleet.service.type,name:fleet.type_service_46
+msgid "Tire Service"
+msgstr ""
+
+#. module: fleet
+#: model:fleet.service.type,name:fleet.type_service_8
+msgid "Ball Joint Replacement"
+msgstr ""
+
+#. module: fleet
+#: field:fleet.vehicle,fuel_type:0
+msgid "Fuel Type"
+msgstr ""
+
+#. module: fleet
+#: model:fleet.service.type,name:fleet.type_service_22
+msgid "Fuel Injector Replacement"
+msgstr ""
+
+#. module: fleet
+#: model:fleet.service.type,name:fleet.type_service_50
+msgid "Water Pump Replacement"
+msgstr ""
+
+#. module: fleet
+#: help:fleet.vehicle,location:0
+msgid "Location of the vehicle (garage, ...)"
+msgstr ""
+
+#. module: fleet
+#: model:fleet.service.type,name:fleet.type_service_28
+msgid "Heater Hose Replacement"
+msgstr ""
+
+#. module: fleet
+#: field:fleet.vehicle.log.contract,state:0
+msgid "Status"
+msgstr ""
+
+#. module: fleet
+#: model:fleet.service.type,name:fleet.type_service_40
+msgid "Rotor Replacement"
+msgstr ""
+
+#. module: fleet
+#: help:fleet.vehicle.model,brand:0
+msgid "Brand of the vehicle"
+msgstr ""
+
+#. module: fleet
+#: help:fleet.vehicle.log.contract,start_date:0
+msgid "Date when the coverage of the contract begins"
+msgstr ""
+
+#. module: fleet
+#: selection:fleet.vehicle,fuel_type:0
+msgid "Electric"
+msgstr ""
+
+#. module: fleet
+#: field:fleet.vehicle,tag_ids:0
+msgid "Tags"
+msgstr ""
+
+#. module: fleet
+#: view:fleet.vehicle:0
+#: field:fleet.vehicle,log_contracts:0
+msgid "Contracts"
+msgstr ""
+
+#. module: fleet
+#: model:fleet.service.type,name:fleet.type_service_13
+msgid "Brake Pad(s) Replacement"
+msgstr ""
+
+#. module: fleet
+#: view:fleet.vehicle.log.fuel:0
+#: view:fleet.vehicle.log.services:0
+msgid "Odometer Details"
+msgstr ""
+
+#. module: fleet
+#: field:fleet.vehicle,driver:0
+msgid "Driver"
+msgstr ""
+
+#. module: fleet
+#: help:fleet.vehicle.model.brand,image_small:0
+msgid ""
+"Small-sized photo of the brand. It is automatically resized as a 64x64px "
+"image, with aspect ratio preserved. Use this field anywhere a small image is "
+"required."
+msgstr ""
+
+#. module: fleet
+#: view:board.board:0
+msgid "Fleet Dashboard"
+msgstr ""
+
+#. module: fleet
+#: model:fleet.vehicle.tag,name:fleet.vehicle_tag_break
+msgid "Break"
+msgstr ""
+
+#. module: fleet
+#: model:fleet.service.type,name:fleet.type_contract_omnium
+msgid "Omnium"
+msgstr ""
+
+#. module: fleet
+#: view:fleet.vehicle.log.services:0
+msgid "Services Details"
+msgstr ""
+
+#. module: fleet
+#: model:fleet.service.type,name:fleet.type_service_service_15
+msgid "Residual value (Excluding VAT)"
+msgstr ""
+
+#. module: fleet
+#: model:fleet.service.type,name:fleet.type_service_7
+msgid "Alternator Replacement"
+msgstr ""
+
+#. module: fleet
+#: model:fleet.service.type,name:fleet.type_service_3
+msgid "A/C Diagnosis"
+msgstr ""
+
+#. module: fleet
+#: model:fleet.service.type,name:fleet.type_service_23
+msgid "Fuel Pump Replacement"
+msgstr ""
+
+#. module: fleet
+#: view:fleet.vehicle.log.contract:0
+msgid "Activation Cost"
+msgstr ""
+
+#. module: fleet
+#: view:fleet.vehicle.cost:0
+msgid "Cost Type"
+msgstr ""
+
+#. module: fleet
+#: model:fleet.service.type,name:fleet.type_service_4
+msgid "A/C Evaporator Replacement"
+msgstr ""
+
+#. module: fleet
+#: view:fleet.vehicle:0
+msgid "show all the costs for this vehicle"
+msgstr ""
+
+#. module: fleet
+#: view:fleet.vehicle.odometer:0
+msgid "Odometer Values Per Month"
+msgstr ""
+
+#. module: fleet
+#: field:fleet.vehicle,message_comment_ids:0
+#: help:fleet.vehicle,message_comment_ids:0
+msgid "Comments and emails"
+msgstr ""
+
+#. module: fleet
+#: model:ir.actions.act_window,help:fleet.fleet_vehicle_act
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to create a new vehicle. \n"
+"              </p><p>\n"
+"                You will be able to manage your fleet by keeping track of "
+"the\n"
+"                contracts, services, fixed and recurring costs, odometers "
+"and\n"
+"                fuel logs associated to each vehicle.\n"
+"            </p><p>\n"
+"                OpenERP will warn you when services or contract have to be\n"
+"                renewed.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
+#. module: fleet
+#: model:fleet.service.type,name:fleet.type_service_service_13
+msgid "Entry into service tax"
+msgstr ""
+
+#. module: fleet
+#: field:fleet.vehicle.log.contract,expiration_date:0
+msgid "Contract Expiration Date"
+msgstr ""
+
+#. module: fleet
+#: view:fleet.vehicle.cost:0
+msgid "Cost Subtype"
+msgstr ""
+
+#. module: fleet
+#: model:ir.actions.act_window,help:fleet.open_board_fleet
+msgid ""
+"<div class=\"oe_empty_custom_dashboard\">\n"
+"                  <p>\n"
+"                    <b>Fleet dashboard is empty.</b>\n"
+"                  </p><p>\n"
+"                    To add your first report into this dashboard, go to any\n"
+"                    menu, switch to list or graph view, and click <i>'Add "
+"to\n"
+"                    Dashboard'</i> in the extended search options.\n"
+"                  </p><p>\n"
+"                    You can filter and group data before inserting into the\n"
+"                    dashboard using the search options.\n"
+"                  </p>\n"
+"              </div>\n"
+"            "
+msgstr ""
+
+#. module: fleet
+#: model:fleet.service.type,name:fleet.type_service_service_12
+msgid "Rent (Excluding VAT)"
+msgstr ""
+
+#. module: fleet
+#: selection:fleet.vehicle,odometer_unit:0
+msgid "Kilometers"
+msgstr ""
+
+#. module: fleet
+#: view:fleet.vehicle.log.fuel:0
+msgid "Vehicle Details"
+msgstr ""
+
+#. module: fleet
+#: selection:fleet.service.type,category:0
+#: field:fleet.vehicle.cost,contract_id:0
+#: selection:fleet.vehicle.cost,cost_type:0
+msgid "Contract"
+msgstr ""
+
+#. module: fleet
+#: model:ir.actions.act_window,name:fleet.fleet_vehicle_model_brand_act
+#: model:ir.ui.menu,name:fleet.fleet_vehicle_model_brand_menu
+msgid "Model brand of Vehicle"
+msgstr ""
+
+#. module: fleet
+#: model:fleet.service.type,name:fleet.type_service_10
+msgid "Battery Replacement"
+msgstr ""
+
+#. module: fleet
+#: view:fleet.vehicle.cost:0
+#: field:fleet.vehicle.cost,date:0
+#: field:fleet.vehicle.odometer,date:0
+msgid "Date"
+msgstr ""
+
+#. module: fleet
+#: model:ir.actions.act_window,name:fleet.fleet_vehicle_act
+#: model:ir.ui.menu,name:fleet.fleet_vehicle_menu
+#: model:ir.ui.menu,name:fleet.fleet_vehicles
+msgid "Vehicles"
+msgstr ""
+
+#. module: fleet
+#: selection:fleet.vehicle,odometer_unit:0
+msgid "Miles"
+msgstr ""
+
+#. module: fleet
+#: help:fleet.vehicle.log.contract,cost_generated:0
+msgid ""
+"Costs paid at regular intervals, depending on the cost frequency. If the "
+"cost frequency is set to unique, the cost will be logged at the start date"
+msgstr ""
+
+#. module: fleet
+#: model:fleet.service.type,name:fleet.type_service_service_17
+msgid "Emissions"
+msgstr ""
+
+#. module: fleet
+#: model:ir.actions.act_window,help:fleet.action_fleet_reporting_costs
+#: model:ir.actions.act_window,help:fleet.action_fleet_reporting_costs_non_effective
+msgid ""
+"<p>\n"
+"          OpenERP helps you managing the costs for your different vehicles\n"
+"          Costs are generally created from services and contract and appears "
+"here.\n"
+"        </p>\n"
+"        <p>\n"
+"          Thanks to the different filters, OpenERP can only print the "
+"effective\n"
+"          costs, sort them by type and by vehicle.\n"
+"        </p>\n"
+"      "
+msgstr ""
+
+#. module: fleet
+#: field:fleet.vehicle,car_value:0
+msgid "Car Value"
+msgstr ""
+
+#. module: fleet
+#: model:ir.actions.act_window,name:fleet.open_board_fleet
+#: model:ir.ui.menu,name:fleet.menu_fleet_dashboard
+#: model:ir.ui.menu,name:fleet.menu_fleet_reporting
+#: model:ir.ui.menu,name:fleet.menu_root
+msgid "Fleet"
+msgstr ""
+
+#. module: fleet
+#: model:fleet.service.type,name:fleet.type_service_service_14
+msgid "Total expenses (Excluding VAT)"
+msgstr ""
+
+#. module: fleet
+#: field:fleet.vehicle.cost,odometer_id:0
+msgid "Odometer"
+msgstr ""
+
+#. module: fleet
+#: model:fleet.service.type,name:fleet.type_service_45
+msgid "Tire Replacement"
+msgstr ""
+
+#. module: fleet
+#: view:fleet.service.type:0
+msgid "Service types"
+msgstr ""
+
+#. module: fleet
+#: field:fleet.vehicle.log.fuel,purchaser_id:0
+#: field:fleet.vehicle.log.services,purchaser_id:0
+msgid "Purchaser"
+msgstr ""
+
+#. module: fleet
+#: model:fleet.service.type,name:fleet.type_service_service_3
+msgid "Tax roll"
+msgstr ""
+
+#. module: fleet
+#: view:fleet.vehicle.model:0
+#: field:fleet.vehicle.model,vendors:0
+msgid "Vendors"
+msgstr ""
+
+#. module: fleet
+#: model:fleet.service.type,name:fleet.type_contract_leasing
+msgid "Leasing"
+msgstr ""
+
+#. module: fleet
+#: help:fleet.vehicle.model.brand,image_medium:0
+msgid ""
+"Medium-sized logo of the brand. It is automatically resized as a 128x128px "
+"image, with aspect ratio preserved. Use this field in form views or some "
+"kanban views."
+msgstr ""
+
+#. module: fleet
+#: selection:fleet.vehicle.log.contract,cost_frequency:0
+msgid "Weekly"
+msgstr ""
+
+#. module: fleet
+#: view:fleet.vehicle:0
+#: view:fleet.vehicle.odometer:0
+msgid "Odometer Logs"
+msgstr ""
+
+#. module: fleet
+#: field:fleet.vehicle,acquisition_date:0
+msgid "Acquisition Date"
+msgstr ""
+
+#. module: fleet
+#: model:ir.model,name:fleet.model_fleet_vehicle_odometer
+msgid "Odometer log for a vehicle"
+msgstr ""
+
+#. module: fleet
+#: field:fleet.vehicle.cost,cost_type:0
+msgid "Category of the cost"
+msgstr ""
+
+#. module: fleet
+#: model:fleet.service.type,name:fleet.type_service_service_5
+#: model:fleet.service.type,name:fleet.type_service_service_7
+msgid "Summer tires"
+msgstr ""
+
+#. module: fleet
+#: field:fleet.vehicle,contract_renewal_due_soon:0
+msgid "Has Contracts to renew"
+msgstr ""
+
+#. module: fleet
+#: model:fleet.service.type,name:fleet.type_service_31
+msgid "Oil Change"
+msgstr ""
+
+#. module: fleet
+#: selection:fleet.vehicle.log.contract,state:0
+msgid "To Close"
+msgstr ""
+
+#. module: fleet
+#: model:ir.model,name:fleet.model_fleet_vehicle_model_brand
+msgid "Brand model of the vehicle"
+msgstr ""
+
+#. module: fleet
+#: model:fleet.service.type,name:fleet.type_service_51
+msgid "Wheel Alignment"
+msgstr ""
+
+#. module: fleet
+#: model:fleet.vehicle.tag,name:fleet.vehicle_tag_purchased
+msgid "Purchased"
+msgstr ""
+
+#. module: fleet
+#: model:ir.actions.act_window,help:fleet.fleet_vehicle_odometer_act
+msgid ""
+"<p>\n"
+"                Here you can add various odometer entries for all vehicles.\n"
+"                You can also show odometer value for a particular vehicle "
+"using\n"
+"                the search field.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
+#. module: fleet
+#: model:ir.actions.act_window,help:fleet.fleet_vehicle_model_act
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to create a new model.\n"
+"              </p><p>\n"
+"                You can define several models (e.g. A3, A4) for each brand "
+"(Audi).\n"
+"              </p>\n"
+"            "
+msgstr ""
+
+#. module: fleet
+#: view:fleet.vehicle:0
+msgid "General Properties"
+msgstr ""
+
+#. module: fleet
+#: model:fleet.service.type,name:fleet.type_service_21
+msgid "Exhaust Manifold Replacement"
+msgstr ""
+
+#. module: fleet
+#: model:fleet.service.type,name:fleet.type_service_47
+msgid "Transmission Filter Replacement"
+msgstr ""
+
+#. module: fleet
+#: model:fleet.service.type,name:fleet.type_service_service_10
+msgid "Replacement Vehicle"
+msgstr ""
+
+#. module: fleet
+#: selection:fleet.vehicle.log.contract,state:0
+msgid "In Progress"
+msgstr ""
+
+#. module: fleet
+#: selection:fleet.vehicle.log.contract,cost_frequency:0
+msgid "Yearly"
+msgstr ""
+
+#. module: fleet
+#: model:ir.actions.act_window,name:fleet.fleet_vehicle_state_act
+#: model:ir.ui.menu,name:fleet.fleet_vehicle_state_menu
+msgid "States of Vehicle"
+msgstr ""
+
+#. module: fleet
+#: field:fleet.vehicle.model,modelname:0
+msgid "Model name"
+msgstr ""
+
+#. module: fleet
+#: view:board.board:0
+#: model:ir.actions.act_window,name:fleet.action_fleet_vehicle_costs_graph
+msgid "Costs by Month"
+msgstr ""
+
+#. module: fleet
+#: model:fleet.service.type,name:fleet.type_service_service_18
+msgid "Touring Assistance"
+msgstr ""
+
+#. module: fleet
+#: field:fleet.vehicle,power:0
+msgid "Power (kW)"
+msgstr ""
+
+#. module: fleet
+#: code:addons/fleet/fleet.py:418
+#, python-format
+msgid "State: from '%s' to '%s'"
+msgstr ""
+
+#. module: fleet
+#: model:fleet.service.type,name:fleet.type_service_2
+msgid "A/C Condenser Replacement"
+msgstr ""
+
+#. module: fleet
+#: model:fleet.service.type,name:fleet.type_service_19
+msgid "Engine Coolant Replacement"
+msgstr ""
+
+#. module: fleet
+#: view:fleet.vehicle.cost:0
+msgid "Cost Details"
+msgstr ""
+
+#. module: fleet
+#: code:addons/fleet/fleet.py:410
+#, python-format
+msgid "Model: from '%s' to '%s'"
+msgstr ""
+
+#. module: fleet
+#: selection:fleet.vehicle.cost,cost_type:0
+msgid "Other"
+msgstr ""
+
+#. module: fleet
+#: view:fleet.vehicle.log.contract:0
+msgid "Contract details"
+msgstr ""
+
+#. module: fleet
+#: model:fleet.vehicle.tag,name:fleet.vehicle_tag_leasing
+msgid "Employee Car"
+msgstr ""
+
+#. module: fleet
+#: field:fleet.vehicle.cost,auto_generated:0
+msgid "Automatically Generated"
+msgstr ""
+
+#. module: fleet
+#: selection:fleet.vehicle.cost,cost_type:0
+msgid "Fuel"
+msgstr ""
+
+#. module: fleet
+#: sql_constraint:fleet.vehicle.state:0
+msgid "State name already exists"
+msgstr ""
+
+#. module: fleet
+#: model:fleet.service.type,name:fleet.type_service_37
+msgid "Radiator Repair"
+msgstr ""
+
+#. module: fleet
+#: model:ir.model,name:fleet.model_fleet_vehicle_log_contract
+msgid "Contract information on a vehicle"
+msgstr ""
+
+#. module: fleet
+#: field:fleet.vehicle.log.contract,days_left:0
+msgid "Warning Date"
+msgstr ""
+
+#. module: fleet
+#: model:fleet.service.type,name:fleet.type_service_service_19
+msgid "Residual value in %"
+msgstr ""
+
+#. module: fleet
+#: view:fleet.vehicle:0
+msgid "Additional Properties"
+msgstr ""
+
+#. module: fleet
+#: model:ir.model,name:fleet.model_fleet_vehicle_state
+msgid "fleet.vehicle.state"
+msgstr ""
+
+#. module: fleet
+#: view:fleet.vehicle.log.contract:0
+msgid "Contract Costs Per Month"
+msgstr ""
+
+#. module: fleet
+#: model:ir.actions.act_window,name:fleet.fleet_vehicle_log_contract_act
+#: model:ir.ui.menu,name:fleet.fleet_vehicle_log_contract_menu
+msgid "Vehicles Contracts"
+msgstr ""
+
+#. module: fleet
+#: model:fleet.service.type,name:fleet.type_service_48
+msgid "Transmission Fluid Replacement"
+msgstr ""
+
+#. module: fleet
+#: field:fleet.vehicle.model.brand,name:0
+msgid "Brand Name"
+msgstr ""
+
+#. module: fleet
+#: model:fleet.service.type,name:fleet.type_service_36
+msgid "Power Steering Pump Replacement"
+msgstr ""
+
+#. module: fleet
+#: help:fleet.vehicle.cost,contract_id:0
+msgid "Contract attached to this cost"
+msgstr ""
+
+#. module: fleet
+#: code:addons/fleet/fleet.py:397
+#, python-format
+msgid "Vehicle %s has been added to the fleet!"
+msgstr ""
+
+#. module: fleet
+#: view:fleet.vehicle.log.contract:0
+#: view:fleet.vehicle.log.fuel:0
+#: view:fleet.vehicle.log.services:0
+msgid "Price"
+msgstr ""
+
+#. module: fleet
+#: view:fleet.vehicle:0
+#: view:fleet.vehicle.cost:0
+#: field:fleet.vehicle.cost,vehicle_id:0
+#: field:fleet.vehicle.odometer,vehicle_id:0
+msgid "Vehicle"
+msgstr ""
+
+#. module: fleet
+#: field:fleet.vehicle.cost,cost_ids:0
+#: view:fleet.vehicle.log.contract:0
+#: view:fleet.vehicle.log.services:0
+msgid "Included Services"
+msgstr ""
+
+#. module: fleet
+#: model:ir.actions.act_window,help:fleet.action_fleet_vehicle_kanban
+msgid ""
+"<p>\n"
+"          Here are displayed vehicles for which one or more contracts need "
+"to be renewed. If you see this message, then there is no contracts to "
+"renew.\n"
+"        </p>\n"
+"      "
+msgstr ""
+
+#. module: fleet
+#: model:fleet.service.type,name:fleet.type_service_15
+msgid "Catalytic Converter Replacement"
+msgstr ""
+
+#. module: fleet
+#: model:fleet.service.type,name:fleet.type_service_25
+msgid "Heater Blower Motor Replacement"
+msgstr ""
+
+#. module: fleet
+#: model:ir.actions.act_window,name:fleet.fleet_vehicle_odometer_act
+#: model:ir.ui.menu,name:fleet.fleet_vehicle_odometer_menu
+msgid "Vehicles Odometer"
+msgstr ""
+
+#. module: fleet
+#: help:fleet.vehicle.log.contract,notes:0
+msgid "Write here all supplementary informations relative to this contract"
+msgstr ""
+
+#. module: fleet
+#: model:fleet.service.type,name:fleet.type_service_29
+msgid "Ignition Coil Replacement"
+msgstr ""
+
+#. module: fleet
+#: model:fleet.service.type,name:fleet.type_service_service_16
+msgid "Options"
+msgstr ""
+
+#. module: fleet
+#: model:fleet.service.type,name:fleet.type_contract_repairing
+msgid "Repairing"
+msgstr ""
+
+#. module: fleet
+#: model:ir.actions.act_window,name:fleet.action_fleet_reporting_costs
+#: model:ir.ui.menu,name:fleet.menu_fleet_reporting_costs
+msgid "Costs Analysis"
+msgstr ""
+
+#. module: fleet
+#: field:fleet.vehicle.log.contract,ins_ref:0
+msgid "Contract Reference"
+msgstr ""
+
+#. module: fleet
+#: field:fleet.service.type,name:0
+#: field:fleet.vehicle,name:0
+#: field:fleet.vehicle.cost,name:0
+#: field:fleet.vehicle.log.contract,name:0
+#: field:fleet.vehicle.model,name:0
+#: field:fleet.vehicle.odometer,name:0
+#: field:fleet.vehicle.state,name:0
+#: field:fleet.vehicle.tag,name:0
+msgid "Name"
+msgstr ""
+
+#. module: fleet
+#: help:fleet.vehicle,doors:0
+msgid "Number of doors of the vehicle"
+msgstr ""
+
+#. module: fleet
+#: field:fleet.vehicle,transmission:0
+msgid "Transmission"
+msgstr ""
+
+#. module: fleet
+#: field:fleet.vehicle,vin_sn:0
+msgid "Chassis Number"
+msgstr ""
+
+#. module: fleet
+#: help:fleet.vehicle,color:0
+msgid "Color of the vehicle"
+msgstr ""
+
+#. module: fleet
+#: model:ir.actions.act_window,help:fleet.fleet_vehicle_log_services_act
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to create a new service entry. \n"
+"              </p><p>\n"
+"                OpenERP helps you keeping track of all the services done\n"
+"                on your vehicle. Services can be of many type: occasional\n"
+"                repair, fixed maintenance, etc.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
+#. module: fleet
+#: field:fleet.vehicle,co2:0
+msgid "CO2 Emissions"
+msgstr ""
+
+#. module: fleet
+#: view:fleet.vehicle.log.contract:0
+msgid "Contract logs"
+msgstr ""
+
+#. module: fleet
+#: view:fleet.vehicle:0
+msgid "Costs"
+msgstr ""
+
+#. module: fleet
+#: field:fleet.vehicle,message_summary:0
+msgid "Summary"
+msgstr ""
+
+#. module: fleet
+#: model:ir.actions.act_window,name:fleet.action_fleet_vehicle_log_contract_graph
+msgid "Contracts Costs by Month"
+msgstr ""
+
+#. module: fleet
+#: field:fleet.vehicle,model_id:0
+#: view:fleet.vehicle.model:0
+msgid "Model"
+msgstr ""
+
+#. module: fleet
+#: model:fleet.service.type,name:fleet.type_service_41
+msgid "Spark Plug Replacement"
+msgstr ""
+
+#. module: fleet
+#: help:fleet.vehicle,message_ids:0
+msgid "Messages and communication history"
+msgstr ""
+
+#. module: fleet
+#: model:ir.model,name:fleet.model_fleet_vehicle
+msgid "Information on a vehicle"
+msgstr ""
+
+#. module: fleet
+#: help:fleet.vehicle,co2:0
+msgid "CO2 emissions of the vehicle"
+msgstr ""
+
+#. module: fleet
+#: model:fleet.service.type,name:fleet.type_service_53
+msgid "Windshield Wiper(s) Replacement"
+msgstr ""
+
+#. module: fleet
+#: view:fleet.vehicle.log.contract:0
+#: field:fleet.vehicle.log.contract,generated_cost_ids:0
+msgid "Generated Costs"
+msgstr ""
+
+#. module: fleet
+#: field:fleet.vehicle,color:0
+msgid "Color"
+msgstr ""
+
+#. module: fleet
+#: model:ir.actions.act_window,help:fleet.fleet_vehicle_service_types_act
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to create a new type of service.\n"
+"              </p><p>\n"
+"                Each service can used in contracts, as a standalone service "
+"or both.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
+#. module: fleet
+#: view:board.board:0
+msgid "Services Costs"
+msgstr ""
+
+#. module: fleet
+#: model:ir.model,name:fleet.model_fleet_vehicle_model
+msgid "Model of a vehicle"
+msgstr ""
+
+#. module: fleet
+#: help:fleet.vehicle,seats:0
+msgid "Number of seats of the vehicle"
+msgstr ""
+
+#. module: fleet
+#: field:fleet.vehicle.cost,odometer:0
+#: field:fleet.vehicle.odometer,value:0
+msgid "Odometer Value"
+msgstr ""
+
+#. module: fleet
+#: view:fleet.vehicle.log.services:0
+msgid "Cost"
+msgstr ""
+
+#. module: fleet
+#: model:fleet.service.type,name:fleet.type_service_39
+msgid "Rotate Tires"
+msgstr ""
+
+#. module: fleet
+#: model:fleet.service.type,name:fleet.type_service_42
+msgid "Starter Replacement"
+msgstr ""
+
+#. module: fleet
+#: view:fleet.vehicle.cost:0
+#: field:fleet.vehicle.cost,year:0
+msgid "Year"
+msgstr ""
+
+#. module: fleet
+#: help:fleet.vehicle,license_plate:0
+msgid "License plate number of the vehicle (ie: plate number for a car)"
+msgstr ""
+
+#. module: fleet
+#: model:ir.model,name:fleet.model_fleet_contract_state
+msgid "Contains the different possible status of a leasing contract"
+msgstr ""
+
+#. module: fleet
+#: view:fleet.vehicle:0
+msgid "show the contract for this vehicle"
+msgstr ""
+
+#. module: fleet
+#: view:fleet.vehicle.log.services:0
+msgid "Total"
+msgstr ""
+
+#. module: fleet
+#: help:fleet.service.type,category:0
+msgid ""
+"Choose wheter the service refer to contracts, vehicle services or both"
+msgstr ""
+
+#. module: fleet
+#: help:fleet.vehicle.cost,cost_type:0
+msgid "For internal purpose only"
+msgstr ""
+
+#. module: fleet
+#: help:fleet.vehicle.state,sequence:0
+msgid "Used to order the note stages"
+msgstr ""
diff --git a/addons/hr/i18n/zh_CN.po b/addons/hr/i18n/zh_CN.po
index 4271b584531..73ae9ff29c1 100644
--- a/addons/hr/i18n/zh_CN.po
+++ b/addons/hr/i18n/zh_CN.po
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2012-12-03 16:02+0000\n"
-"PO-Revision-Date: 2012-11-28 16:54+0000\n"
+"PO-Revision-Date: 2012-12-06 03:12+0000\n"
 "Last-Translator: ccdos <ccdos@163.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:40+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-06 04:40+0000\n"
+"X-Generator: Launchpad (build 16341)\n"
 
 #. module: hr
 #: constraint:hr.employee:0
@@ -168,7 +168,7 @@ msgstr "生日"
 #: model:ir.actions.act_window,name:hr.open_view_categ_form
 #: model:ir.ui.menu,name:hr.menu_view_employee_category_form
 msgid "Employee Tags"
-msgstr ""
+msgstr "员工标签"
 
 #. module: hr
 #: view:hr.job:0
diff --git a/addons/hr_attendance/i18n/zh_CN.po b/addons/hr_attendance/i18n/zh_CN.po
index 3851a613ced..82f7ccc0f87 100644
--- a/addons/hr_attendance/i18n/zh_CN.po
+++ b/addons/hr_attendance/i18n/zh_CN.po
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2012-12-03 16:03+0000\n"
-"PO-Revision-Date: 2012-11-29 11:12+0000\n"
-"Last-Translator: ccdos <ccdos@163.com>\n"
+"PO-Revision-Date: 2012-12-05 16:24+0000\n"
+"Last-Translator: jerryzhang <jerry.zhangzhe@gmail.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:42+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-06 04:40+0000\n"
+"X-Generator: Launchpad (build 16341)\n"
 
 #. module: hr_attendance
 #: model:ir.model,name:hr_attendance.model_hr_attendance_month
@@ -43,12 +43,12 @@ msgstr "考勤"
 #: code:addons/hr_attendance/static/src/js/attendance.js:34
 #, python-format
 msgid "Last sign in: %s,<br />%s.<br />Click to sign out."
-msgstr "上次签到：%s,<br />%s.<br />，单击 签出。"
+msgstr "上次签入时间是：%s,<br />%s.<br />，单击此处签出。"
 
 #. module: hr_attendance
 #: constraint:hr.attendance:0
 msgid "Error ! Sign in (resp. Sign out) must follow Sign out (resp. Sign in)"
-msgstr "错误"
+msgstr "错误！签入（或签出）动作必须在签出（或签入）动作之后。"
 
 #. module: hr_attendance
 #: help:hr.action.reason,name:0
@@ -70,7 +70,7 @@ msgstr "打印每月考勤报表"
 #: code:addons/hr_attendance/report/timesheet.py:122
 #, python-format
 msgid "Attendances by Week"
-msgstr "周出席率"
+msgstr ""
 
 #. module: hr_attendance
 #: selection:hr.action.reason,action_type:0
@@ -104,7 +104,7 @@ msgstr "签出"
 #: code:addons/hr_attendance/wizard/hr_attendance_error.py:49
 #, python-format
 msgid "No records are found for your selection!"
-msgstr "没找到你要的计量"
+msgstr "你搜索的结果为空！"
 
 #. module: hr_attendance
 #: view:hr.attendance.error:0
diff --git a/addons/hr_holidays/i18n/zh_CN.po b/addons/hr_holidays/i18n/zh_CN.po
index 6c50eefef37..ac24ea47bd7 100644
--- a/addons/hr_holidays/i18n/zh_CN.po
+++ b/addons/hr_holidays/i18n/zh_CN.po
@@ -7,19 +7,19 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2012-12-03 16:02+0000\n"
-"PO-Revision-Date: 2012-02-16 03:27+0000\n"
-"Last-Translator: 开阖软件     Jeff Wang <jeff@osbzr.com>\n"
+"PO-Revision-Date: 2012-12-06 02:14+0000\n"
+"Last-Translator: jerryzhang <jerry.zhangzhe@gmail.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:38+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-06 04:40+0000\n"
+"X-Generator: Launchpad (build 16341)\n"
 
 #. module: hr_holidays
 #: selection:hr.holidays.status,color_name:0
 msgid "Blue"
-msgstr "蓝"
+msgstr "蓝色"
 
 #. module: hr_holidays
 #: field:hr.holidays,linked_request_ids:0
@@ -37,7 +37,7 @@ msgstr "等待第二次审批"
 msgid ""
 "You cannot modify a leave request that has been approved. Contact a human "
 "resource manager."
-msgstr ""
+msgstr "你不能修改正在审核中的请假申请，如有必要，请与人力资源经理联系。"
 
 #. module: hr_holidays
 #: help:hr.holidays.status,remaining_leaves:0
@@ -84,7 +84,7 @@ msgstr "员工类型"
 #. module: hr_holidays
 #: selection:hr.holidays.status,color_name:0
 msgid "Brown"
-msgstr "棕"
+msgstr "棕色"
 
 #. module: hr_holidays
 #: view:hr.holidays:0
@@ -106,7 +106,7 @@ msgstr "按员工"
 msgid ""
 "The default duration interval between the start date and the end date is 8 "
 "hours.  Feel free to adapt it to your needs."
-msgstr ""
+msgstr "开始时间与结束时间之间的默认时间间隔是8小时，你可以根据实际情况进行调整。"
 
 #. module: hr_holidays
 #: field:hr.holidays,number_of_days_temp:0
@@ -136,7 +136,7 @@ msgstr "浅绿色"
 #. module: hr_holidays
 #: field:hr.employee,current_leave_id:0
 msgid "Current Leave Type"
-msgstr "当前假期类型"
+msgstr "当前请假类型"
 
 #. module: hr_holidays
 #: view:hr.holidays:0
@@ -218,7 +218,7 @@ msgstr "第二次审批"
 #: code:addons/hr_holidays/hr_holidays.py:448
 #, python-format
 msgid "The request has been <b>approved</b>."
-msgstr ""
+msgstr "此申请已<b>通过审核</b>."
 
 #. module: hr_holidays
 #: selection:hr.employee,current_leave_state:0
@@ -332,7 +332,7 @@ msgstr ""
 #: view:hr.holidays.status:0
 #: model:ir.actions.act_window,name:hr_holidays.open_view_holiday_status
 msgid "Leave Types"
-msgstr ""
+msgstr "请假类型"
 
 #. module: hr_holidays
 #: field:hr.holidays.status,remaining_leaves:0
@@ -342,7 +342,7 @@ msgstr "剩余准假"
 #. module: hr_holidays
 #: field:hr.holidays,message_follower_ids:0
 msgid "Followers"
-msgstr ""
+msgstr "关注者"
 
 #. module: hr_holidays
 #: model:ir.model,name:hr_holidays.model_hr_holidays_remaining_leaves_user
@@ -446,7 +446,7 @@ msgstr "等待审批"
 #. module: hr_holidays
 #: field:hr.holidays,category_id:0
 msgid "Employee Tag"
-msgstr ""
+msgstr "员工类型"
 
 #. module: hr_holidays
 #: field:hr.holidays.status,max_leaves:0
diff --git a/addons/hr_timesheet/i18n/lt.po b/addons/hr_timesheet/i18n/lt.po
index a4e4cf82f3d..39bccdab68c 100644
--- a/addons/hr_timesheet/i18n/lt.po
+++ b/addons/hr_timesheet/i18n/lt.po
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2012-12-03 16:02+0000\n"
-"PO-Revision-Date: 2009-02-03 06:25+0000\n"
-"Last-Translator: <>\n"
+"PO-Revision-Date: 2012-12-05 08:53+0000\n"
+"Last-Translator: Mantas Kriaučiūnas <mantas@akl.lt>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:33+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-06 04:40+0000\n"
+"X-Generator: Launchpad (build 16341)\n"
 
 #. module: hr_timesheet
 #: model:ir.actions.act_window,help:hr_timesheet.act_analytic_cost_revenue
@@ -505,7 +505,7 @@ msgstr ""
 #: view:hr.sign.in.project:0
 #: view:hr.sign.out.project:0
 msgid "Cancel"
-msgstr "Atšaukti"
+msgstr "Atsisakyti"
 
 #. module: hr_timesheet
 #: xsl:hr.analytical.timesheet_users:0
diff --git a/addons/knowledge/i18n/pt.po b/addons/knowledge/i18n/pt.po
index 6b2bccfafef..b79e2006a99 100644
--- a/addons/knowledge/i18n/pt.po
+++ b/addons/knowledge/i18n/pt.po
@@ -8,19 +8,19 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-11-24 02:53+0000\n"
-"PO-Revision-Date: 2010-12-20 11:11+0000\n"
-"Last-Translator: Rui Franco (multibase.pt) <Unknown>\n"
+"PO-Revision-Date: 2012-12-05 09:27+0000\n"
+"Last-Translator: Andrei Talpa (multibase.pt) <andrei.talpa@multibase.pt>\n"
 "Language-Team: Portuguese <pt@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:25+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-06 04:41+0000\n"
+"X-Generator: Launchpad (build 16341)\n"
 
 #. module: knowledge
 #: view:knowledge.config.settings:0
 msgid "Documents"
-msgstr ""
+msgstr "Documentos"
 
 #. module: knowledge
 #: model:ir.model,name:knowledge.model_knowledge_config_settings
@@ -77,17 +77,17 @@ msgstr ""
 #. module: knowledge
 #: field:knowledge.config.settings,module_document:0
 msgid "Manage documents"
-msgstr ""
+msgstr "Gerir documentos"
 
 #. module: knowledge
 #: view:knowledge.config.settings:0
 msgid "Cancel"
-msgstr ""
+msgstr "Cancelar"
 
 #. module: knowledge
 #: view:knowledge.config.settings:0
 msgid "Apply"
-msgstr ""
+msgstr "Aplicar"
 
 #. module: knowledge
 #: model:ir.ui.menu,name:knowledge.menu_document_configuration
@@ -104,7 +104,7 @@ msgstr ""
 #. module: knowledge
 #: view:knowledge.config.settings:0
 msgid "or"
-msgstr ""
+msgstr "ou"
 
 #. module: knowledge
 #: field:knowledge.config.settings,module_document_webdav:0
diff --git a/addons/l10n_be_coda/i18n/pt.po b/addons/l10n_be_coda/i18n/pt.po
index caf4324a986..85f6cb24e01 100644
--- a/addons/l10n_be_coda/i18n/pt.po
+++ b/addons/l10n_be_coda/i18n/pt.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-11-24 02:53+0000\n"
-"PO-Revision-Date: 2012-05-31 15:12+0000\n"
-"Last-Translator: ThinkOpen Solutions <Unknown>\n"
+"PO-Revision-Date: 2012-12-05 10:11+0000\n"
+"Last-Translator: Andrei Talpa (multibase.pt) <andrei.talpa@multibase.pt>\n"
 "Language-Team: Portuguese <pt@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:20+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-06 04:41+0000\n"
+"X-Generator: Launchpad (build 16341)\n"
 
 #. module: l10n_be_coda
 #: model:account.coda.trans.code,description:l10n_be_coda.actcc_09_21
@@ -938,7 +938,7 @@ msgstr "Informações sobre detalhes do dinheiro"
 #. module: l10n_be_coda
 #: view:coda.bank.statement.line:0
 msgid "Bank Transaction"
-msgstr ""
+msgstr "Transação bancária"
 
 #. module: l10n_be_coda
 #: view:coda.bank.account:0
@@ -964,7 +964,7 @@ msgstr "Locação-venda, acordo pelo qual a instituição financeira é o locado
 #. module: l10n_be_coda
 #: view:account.coda.import:0
 msgid "or"
-msgstr ""
+msgstr "ou"
 
 #. module: l10n_be_coda
 #: model:account.coda.trans.code,description:l10n_be_coda.actcc_03_66
@@ -2148,7 +2148,7 @@ msgstr ""
 #: code:addons/l10n_be_coda/l10n_be_coda.py:303
 #, python-format
 msgid "Invalid Action!"
-msgstr ""
+msgstr "Ação inválida!"
 
 #. module: l10n_be_coda
 #: model:account.coda.trans.code,description:l10n_be_coda.actcc_07_14
diff --git a/addons/l10n_be_invoice_bba/i18n/pt.po b/addons/l10n_be_invoice_bba/i18n/pt.po
new file mode 100644
index 00000000000..3664ca2f2af
--- /dev/null
+++ b/addons/l10n_be_invoice_bba/i18n/pt.po
@@ -0,0 +1,146 @@
+# Portuguese translation for openobject-addons
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-11-24 02:53+0000\n"
+"PO-Revision-Date: 2012-12-05 10:01+0000\n"
+"Last-Translator: Andrei Talpa (multibase.pt) <andrei.talpa@multibase.pt>\n"
+"Language-Team: Portuguese <pt@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2012-12-06 04:41+0000\n"
+"X-Generator: Launchpad (build 16341)\n"
+
+#. module: l10n_be_invoice_bba
+#: sql_constraint:account.invoice:0
+msgid "Invoice Number must be unique per Company!"
+msgstr ""
+
+#. module: l10n_be_invoice_bba
+#: model:ir.model,name:l10n_be_invoice_bba.model_account_invoice
+msgid "Invoice"
+msgstr ""
+
+#. module: l10n_be_invoice_bba
+#: constraint:res.partner:0
+msgid "Error ! You cannot create recursive associated members."
+msgstr ""
+
+#. module: l10n_be_invoice_bba
+#: constraint:account.invoice:0
+msgid "Invalid BBA Structured Communication !"
+msgstr ""
+
+#. module: l10n_be_invoice_bba
+#: selection:res.partner,out_inv_comm_algorithm:0
+msgid "Random"
+msgstr ""
+
+#. module: l10n_be_invoice_bba
+#: help:res.partner,out_inv_comm_type:0
+msgid "Select Default Communication Type for Outgoing Invoices."
+msgstr ""
+
+#. module: l10n_be_invoice_bba
+#: help:res.partner,out_inv_comm_algorithm:0
+msgid ""
+"Select Algorithm to generate the Structured Communication on Outgoing "
+"Invoices."
+msgstr ""
+
+#. module: l10n_be_invoice_bba
+#: code:addons/l10n_be_invoice_bba/invoice.py:109
+#: code:addons/l10n_be_invoice_bba/invoice.py:135
+#, python-format
+msgid ""
+"The daily maximum of outgoing invoices with an automatically generated BBA "
+"Structured Communications has been exceeded!\n"
+"Please create manually a unique BBA Structured Communication."
+msgstr ""
+
+#. module: l10n_be_invoice_bba
+#: code:addons/l10n_be_invoice_bba/invoice.py:150
+#, python-format
+msgid "Error!"
+msgstr "Erro!"
+
+#. module: l10n_be_invoice_bba
+#: code:addons/l10n_be_invoice_bba/invoice.py:121
+#, python-format
+msgid ""
+"The Partner should have a 3-7 digit Reference Number for the generation of "
+"BBA Structured Communications!\n"
+"Please correct the Partner record."
+msgstr ""
+
+#. module: l10n_be_invoice_bba
+#: constraint:res.partner:0
+msgid "Error: Invalid ean code"
+msgstr ""
+
+#. module: l10n_be_invoice_bba
+#: code:addons/l10n_be_invoice_bba/invoice.py:108
+#: code:addons/l10n_be_invoice_bba/invoice.py:120
+#: code:addons/l10n_be_invoice_bba/invoice.py:134
+#: code:addons/l10n_be_invoice_bba/invoice.py:162
+#: code:addons/l10n_be_invoice_bba/invoice.py:172
+#: code:addons/l10n_be_invoice_bba/invoice.py:197
+#, python-format
+msgid "Warning!"
+msgstr ""
+
+#. module: l10n_be_invoice_bba
+#: selection:res.partner,out_inv_comm_algorithm:0
+msgid "Customer Reference"
+msgstr ""
+
+#. module: l10n_be_invoice_bba
+#: field:res.partner,out_inv_comm_type:0
+msgid "Communication Type"
+msgstr ""
+
+#. module: l10n_be_invoice_bba
+#: code:addons/l10n_be_invoice_bba/invoice.py:173
+#: code:addons/l10n_be_invoice_bba/invoice.py:198
+#, python-format
+msgid ""
+"The BBA Structured Communication has already been used!\n"
+"Please create manually a unique BBA Structured Communication."
+msgstr ""
+
+#. module: l10n_be_invoice_bba
+#: selection:res.partner,out_inv_comm_algorithm:0
+msgid "Date"
+msgstr "Data"
+
+#. module: l10n_be_invoice_bba
+#: model:ir.model,name:l10n_be_invoice_bba.model_res_partner
+msgid "Partner"
+msgstr ""
+
+#. module: l10n_be_invoice_bba
+#: code:addons/l10n_be_invoice_bba/invoice.py:151
+#, python-format
+msgid ""
+"Unsupported Structured Communication Type Algorithm '%s' !\n"
+"Please contact your OpenERP support channel."
+msgstr ""
+
+#. module: l10n_be_invoice_bba
+#: field:res.partner,out_inv_comm_algorithm:0
+msgid "Communication Algorithm"
+msgstr ""
+
+#. module: l10n_be_invoice_bba
+#: code:addons/l10n_be_invoice_bba/invoice.py:163
+#, python-format
+msgid ""
+"Empty BBA Structured Communication!\n"
+"Please fill in a unique BBA Structured Communication."
+msgstr ""
diff --git a/addons/mail/i18n/ru.po b/addons/mail/i18n/ru.po
index 35860baf813..ccab28898da 100644
--- a/addons/mail/i18n/ru.po
+++ b/addons/mail/i18n/ru.po
@@ -8,24 +8,24 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-12-03 16:01+0000\n"
-"PO-Revision-Date: 2012-10-30 09:52+0000\n"
-"Last-Translator: Chertykov Denis <chertykov@gmail.com>\n"
+"PO-Revision-Date: 2012-12-05 09:23+0000\n"
+"Last-Translator: Denis Karataev <dskarataev@gmail.com>\n"
 "Language-Team: Russian <ru@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:52+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-06 04:41+0000\n"
+"X-Generator: Launchpad (build 16341)\n"
 
 #. module: mail
 #: field:res.partner,notification_email_send:0
 msgid "Receive Feeds by Email"
-msgstr ""
+msgstr "Получать Ленты по эл. почте"
 
 #. module: mail
 #: view:mail.followers:0
 msgid "Followers Form"
-msgstr ""
+msgstr "Форма подписчиков"
 
 #. module: mail
 #: model:ir.model,name:mail.model_publisher_warranty_contract
@@ -36,7 +36,7 @@ msgstr ""
 #: field:mail.compose.message,author_id:0
 #: field:mail.message,author_id:0
 msgid "Author"
-msgstr ""
+msgstr "Автор"
 
 #. module: mail
 #: view:mail.mail:0
@@ -51,7 +51,7 @@ msgstr "Получатели сообщения"
 #. module: mail
 #: view:mail.message:0
 msgid "Comments"
-msgstr ""
+msgstr "Комментарии"
 
 #. module: mail
 #: view:mail.alias:0
@@ -63,7 +63,7 @@ msgstr "Группировать по ..."
 #: help:mail.compose.message,body:0
 #: help:mail.message,body:0
 msgid "Automatically sanitized HTML contents"
-msgstr ""
+msgstr "Автоматически обработанное HTML содержимое"
 
 #. module: mail
 #: help:mail.alias,alias_name:0
@@ -84,16 +84,18 @@ msgid ""
 "Invalid expression, it must be a literal python dictionary definition e.g. "
 "\"{'field': 'value'}\""
 msgstr ""
+"Неправильное выражение, здесь должен быть объявление словаря python например "
+"\"{'field': 'value'}\""
 
 #. module: mail
 #: view:mail.group:0
 msgid "Group Name"
-msgstr ""
+msgstr "Название группы"
 
 #. module: mail
 #: selection:mail.group,public:0
 msgid "Public"
-msgstr ""
+msgstr "Общедоступное"
 
 #. module: mail
 #: view:mail.mail:0
@@ -103,7 +105,7 @@ msgstr "Содержимое"
 #. module: mail
 #: view:mail.message:0
 msgid "Show messages to read"
-msgstr ""
+msgstr "Показать сообщения для прочтения"
 
 #. module: mail
 #: help:mail.compose.message,email_from:0
@@ -112,6 +114,8 @@ msgid ""
 "Email address of the sender. This field is set when no matching partner is "
 "found for incoming emails."
 msgstr ""
+"Адрес эл. почты отправителя. Это поле устанавливается когда партнер не "
+"определен для входящих писем."
 
 #. module: mail
 #: model:ir.model,name:mail.model_mail_compose_message
@@ -123,19 +127,19 @@ msgstr "Мастер составления эл. почты"
 #: field:mail.thread,message_unread:0
 #: field:res.partner,message_unread:0
 msgid "Unread Messages"
-msgstr ""
+msgstr "Непрочитанные сообщения"
 
 #. module: mail
 #. openerp-web
 #: code:addons/mail/static/src/xml/mail.xml:247
 #, python-format
 msgid "show"
-msgstr ""
+msgstr "показать"
 
 #. module: mail
 #: help:mail.message.subtype,default:0
 msgid "Checked by default when subscribing."
-msgstr ""
+msgstr "Отмеченный по умолчанию при подписке."
 
 #. module: mail
 #: help:mail.group,group_ids:0
@@ -143,37 +147,40 @@ msgid ""
 "Members of those groups will automatically added as followers. Note that "
 "they will be able to manage their subscription manually if necessary."
 msgstr ""
+"Члены этих групп будут автоматически добавлены в качестве подписчиков. "
+"Обратите внимание что им будет доступно управлять их подпиской вручную если "
+"понадобится."
 
 #. module: mail
 #. openerp-web
 #: code:addons/mail/static/src/js/mail.js:778
 #, python-format
 msgid "Do you really want to delete this message?"
-msgstr ""
+msgstr "Вы действительно хотите удалить это сообщение?"
 
 #. module: mail
 #: view:mail.message:0
 #: field:mail.notification,read:0
 msgid "Read"
-msgstr ""
+msgstr "Прочитать"
 
 #. module: mail
 #: view:mail.group:0
 msgid "Search Groups"
-msgstr ""
+msgstr "Поиск групп"
 
 #. module: mail
 #. openerp-web
 #: code:addons/mail/static/src/js/mail_followers.js:134
 #, python-format
 msgid "followers"
-msgstr ""
+msgstr "подписчики"
 
 #. module: mail
 #: code:addons/mail/mail_message.py:646
 #, python-format
 msgid "Access Denied"
-msgstr ""
+msgstr "Доступ запрещен"
 
 #. module: mail
 #: help:mail.group,image_medium:0
@@ -182,6 +189,9 @@ msgid ""
 "image, with aspect ratio preserved. Use this field in form views or some "
 "kanban views."
 msgstr ""
+"Фото группы среднего размера. Оно автоматически принимает размер в 128 на "
+"128 пикселей, с сохранением соотношения сторон. Используйте это поле в видах "
+"форм или видах kanban."
 
 #. module: mail
 #: view:mail.mail:0
@@ -204,7 +214,7 @@ msgstr "Цепочка"
 #: code:addons/mail/static/src/xml/mail.xml:37
 #, python-format
 msgid "Open the full mail composer"
-msgstr ""
+msgstr "Открыть полноценный составитель письма"
 
 #. module: mail
 #. openerp-web
@@ -221,7 +231,7 @@ msgstr ""
 #. module: mail
 #: field:mail.group,group_ids:0
 msgid "Auto Subscription"
-msgstr ""
+msgstr "Автоматическая подписка"
 
 #. module: mail
 #: field:mail.mail,references:0
@@ -233,12 +243,12 @@ msgstr "Ссылки"
 #: code:addons/mail/static/src/xml/mail.xml:179
 #, python-format
 msgid "No messages."
-msgstr ""
+msgstr "Нет сообщений."
 
 #. module: mail
 #: model:ir.model,name:mail.model_mail_group
 msgid "Discussion group"
-msgstr ""
+msgstr "Дискуссионная группа"
 
 #. module: mail
 #. openerp-web
@@ -246,14 +256,14 @@ msgstr ""
 #: code:addons/mail/static/src/xml/mail.xml:95
 #, python-format
 msgid "uploading"
-msgstr ""
+msgstr "отправка данных"
 
 #. module: mail
 #. openerp-web
 #: code:addons/mail/static/src/xml/mail.xml:211
 #, python-format
 msgid "Set back to Inbox"
-msgstr ""
+msgstr "Вернуть во входящие"
 
 #. module: mail
 #: help:mail.compose.message,type:0
@@ -262,11 +272,14 @@ msgid ""
 "Message type: email for email message, notification for system message, "
 "comment for other messages such as user replies"
 msgstr ""
+"Тип сообщения: эл. почта - для эл. почты, уведомление - для системных "
+"сообщений, комментарий - для остальных сообщений таких как сообщения "
+"пользователя"
 
 #. module: mail
 #: model:ir.model,name:mail.model_mail_wizard_invite
 msgid "Invite wizard"
-msgstr ""
+msgstr "Мастер приглашений"
 
 #. module: mail
 #: selection:mail.mail,state:0
@@ -282,25 +295,25 @@ msgstr "Адрес ответа"
 #: code:addons/mail/wizard/invite.py:36
 #, python-format
 msgid "<div>You have been invited to follow %s.</div>"
-msgstr ""
+msgstr "<div>Вам было предложено отслеживать %s.</div>"
 
 #. module: mail
 #: help:mail.group,message_unread:0
 #: help:mail.thread,message_unread:0
 #: help:res.partner,message_unread:0
 msgid "If checked new messages require your attention."
-msgstr ""
+msgstr "Если отмечено, новые сообщения требуют вашего внимания."
 
 #. module: mail
 #: field:mail.group,image_medium:0
 msgid "Medium-sized photo"
-msgstr ""
+msgstr "Фото среднего размера"
 
 #. module: mail
 #: model:ir.actions.client,name:mail.action_mail_to_me_feeds
 #: model:ir.ui.menu,name:mail.mail_tomefeeds
 msgid "To: me"
-msgstr ""
+msgstr "Кому: мне"
 
 #. module: mail
 #: field:mail.message.subtype,name:0
@@ -318,28 +331,28 @@ msgstr "Авто удаление"
 #: view:mail.group:0
 #, python-format
 msgid "Unfollow"
-msgstr ""
+msgstr "Отписаться"
 
 #. module: mail
 #. openerp-web
 #: code:addons/mail/static/src/xml/mail.xml:246
 #, python-format
 msgid "show one more message"
-msgstr ""
+msgstr "показать еще одно сообщение"
 
 #. module: mail
 #: code:addons/mail/mail_mail.py:71
 #: code:addons/mail/res_users.py:76
 #, python-format
 msgid "Invalid Action!"
-msgstr ""
+msgstr "Неверное действие!"
 
 #. module: mail
 #. openerp-web
 #: code:addons/mail/static/src/xml/mail.xml:25
 #, python-format
 msgid "User img"
-msgstr ""
+msgstr "Изображение пользователя"
 
 #. module: mail
 #: model:ir.actions.act_window,name:mail.action_view_mail_mail
@@ -352,7 +365,7 @@ msgstr "Эл. почта"
 #. module: mail
 #: field:mail.followers,partner_id:0
 msgid "Related Partner"
-msgstr ""
+msgstr "Связанный партнер"
 
 #. module: mail
 #: help:mail.group,message_summary:0
@@ -375,7 +388,7 @@ msgstr ""
 #: selection:mail.compose.message,type:0
 #: selection:mail.message,type:0
 msgid "System notification"
-msgstr ""
+msgstr "Системное уведомление"
 
 #. module: mail
 #: model:ir.model,name:mail.model_res_partner
@@ -397,7 +410,7 @@ msgstr "Тема"
 #. module: mail
 #: field:mail.wizard.invite,partner_ids:0
 msgid "Partners"
-msgstr ""
+msgstr "Партнеры"
 
 #. module: mail
 #: view:mail.mail:0
@@ -421,7 +434,7 @@ msgstr "Сообщение эл. почты"
 #: help:mail.compose.message,favorite_user_ids:0
 #: help:mail.message,favorite_user_ids:0
 msgid "Users that set this message in their favorites"
-msgstr ""
+msgstr "Пользователи которые добавили это сообщение себе в избранное"
 
 #. module: mail
 #: model:ir.model,name:mail.model_base_config_settings
@@ -432,7 +445,7 @@ msgstr ""
 #: field:mail.compose.message,to_read:0
 #: field:mail.message,to_read:0
 msgid "To read"
-msgstr ""
+msgstr "Прочитать"
 
 #. module: mail
 #: view:mail.compose.message:0
@@ -444,7 +457,7 @@ msgstr "Отправить"
 #: code:addons/mail/static/src/js/mail_followers.js:130
 #, python-format
 msgid "No followers"
-msgstr ""
+msgstr "Нет подписчиков"
 
 #. module: mail
 #: view:mail.mail:0
@@ -454,7 +467,7 @@ msgstr "Ошибка"
 #. module: mail
 #: model:mail.message.subtype,name:mail.mt_crm_won
 msgid "Won"
-msgstr ""
+msgstr "Выиграно"
 
 #. module: mail
 #. openerp-web
@@ -467,20 +480,20 @@ msgstr ""
 #: field:res.partner,message_follower_ids:0
 #, python-format
 msgid "Followers"
-msgstr ""
+msgstr "Подписчики"
 
 #. module: mail
 #: model:ir.actions.client,name:mail.action_mail_archives_feeds
 #: model:ir.ui.menu,name:mail.mail_archivesfeeds
 msgid "Archives"
-msgstr ""
+msgstr "Архивы"
 
 #. module: mail
 #. openerp-web
 #: code:addons/mail/static/src/xml/mail.xml:82
 #, python-format
 msgid "Delete this attachment"
-msgstr ""
+msgstr "Удалить вложение"
 
 #. module: mail
 #: field:mail.compose.message,message_id:0
@@ -493,41 +506,41 @@ msgstr "ID сообщения"
 #: code:addons/mail/static/src/js/mail_followers.js:132
 #, python-format
 msgid "One follower"
-msgstr ""
+msgstr "Один подписчик"
 
 #. module: mail
 #: field:mail.compose.message,type:0
 #: field:mail.message,type:0
 msgid "Type"
-msgstr ""
+msgstr "Тип"
 
 #. module: mail
 #: selection:mail.compose.message,type:0
 #: view:mail.mail:0
 #: selection:mail.message,type:0
 msgid "Email"
-msgstr ""
+msgstr "Эл. почта"
 
 #. module: mail
 #: field:ir.ui.menu,mail_group_id:0
 msgid "Mail Group"
-msgstr ""
+msgstr "Почтовая группа"
 
 #. module: mail
 #: selection:res.partner,notification_email_send:0
 msgid "Comments and Emails"
-msgstr ""
+msgstr "Комментарии и эл. почта"
 
 #. module: mail
 #: model:ir.model,name:mail.model_mail_favorite
 msgid "Favorite messages"
-msgstr ""
+msgstr "Избранные сообщения"
 
 #. module: mail
 #: code:addons/mail/res_users.py:97
 #, python-format
 msgid "%s has joined the %s network."
-msgstr ""
+msgstr "%s присоединился к сети %s."
 
 #. module: mail
 #: help:mail.group,image_small:0
@@ -536,6 +549,9 @@ msgid ""
 "image, with aspect ratio preserved. Use this field anywhere a small image is "
 "required."
 msgstr ""
+"Фотография группы небольшого размера. Автоматически изменяет размер на 64 на "
+"64 пикселя, с сохранением соотношения сторон. Используйте это там где "
+"требуется изображение небольшого размера."
 
 #. module: mail
 #: view:mail.compose.message:0
@@ -555,34 +571,34 @@ msgstr ""
 #: code:addons/mail/static/src/xml/mail.xml:43
 #, python-format
 msgid "Write to the followers of this document..."
-msgstr ""
+msgstr "Написать подписанным на этот документ..."
 
 #. module: mail
 #: field:mail.group,group_public_id:0
 msgid "Authorized Group"
-msgstr ""
+msgstr "Авторизованная группа"
 
 #. module: mail
 #: view:mail.group:0
 msgid "Join Group"
-msgstr ""
+msgstr "Присоединиться к группе"
 
 #. module: mail
 #: help:mail.mail,email_from:0
 msgid "Message sender, taken from user preferences."
-msgstr ""
+msgstr "Отправитель сообщения, взятый из настроек пользователя."
 
 #. module: mail
 #: code:addons/mail/wizard/invite.py:39
 #, python-format
 msgid "<div>You have been invited to follow a new document.</div>"
-msgstr ""
+msgstr "<div>Вы были приглашены для слежения за новым документом.</div>"
 
 #. module: mail
 #: field:mail.compose.message,parent_id:0
 #: field:mail.message,parent_id:0
 msgid "Parent Message"
-msgstr ""
+msgstr "Родительское сообщение"
 
 #. module: mail
 #: field:mail.compose.message,res_id:0
@@ -606,7 +622,7 @@ msgstr ""
 #. module: mail
 #: model:ir.ui.menu,name:mail.group_rd_ir_ui_menu
 msgid "R&D"
-msgstr ""
+msgstr "НИОКР"
 
 #. module: mail
 #. openerp-web
@@ -646,6 +662,8 @@ msgid ""
 "You may not create a user. To create new users, you should use the "
 "\"Settings > Users\" menu."
 msgstr ""
+"Вы не можете создать пользователя. Для создания новых пользователей вы "
+"должны использовать меню Настройки > Пользователи."
 
 #. module: mail
 #: model:ir.actions.act_window,name:mail.action_view_mail_message
@@ -668,7 +686,7 @@ msgstr ""
 #: code:addons/mail/static/src/xml/mail.xml:271
 #, python-format
 msgid "like"
-msgstr ""
+msgstr "как"
 
 #. module: mail
 #: view:mail.compose.message:0
@@ -682,12 +700,12 @@ msgstr "Отмена"
 #: code:addons/mail/static/src/xml/mail.xml:44
 #, python-format
 msgid "Share with my followers..."
-msgstr ""
+msgstr "Поделиться с моими подписчиками..."
 
 #. module: mail
 #: field:mail.notification,partner_id:0
 msgid "Contact"
-msgstr ""
+msgstr "Контакт"
 
 #. module: mail
 #: view:mail.group:0
@@ -695,6 +713,8 @@ msgid ""
 "Only the invited followers can read the\n"
 "                                    discussions on this group."
 msgstr ""
+"Только приглашенные подписчики могут читать\n"
+"                                    дискуссии в этой группе."
 
 #. module: mail
 #: model:ir.model,name:mail.model_ir_ui_menu
@@ -704,7 +724,7 @@ msgstr ""
 #. module: mail
 #: view:mail.message:0
 msgid "Has attachments"
-msgstr ""
+msgstr "Есть вложения"
 
 #. module: mail
 #: view:mail.mail:0
@@ -718,6 +738,8 @@ msgid ""
 "The following partners chosen as recipients for the email have no email "
 "address linked :"
 msgstr ""
+"Следующие партнеры выбраны как получатели эл. почты не имеющие прикрепленных "
+"адресов эл. почты:"
 
 #. module: mail
 #: help:mail.alias,alias_defaults:0
@@ -731,14 +753,14 @@ msgstr ""
 #: help:mail.message,notified_partner_ids:0
 msgid ""
 "Partners that have a notification pushing this message in their mailboxes"
-msgstr ""
+msgstr "Партнеры которые имеют уведомление доставляемое в их почтовые ящики"
 
 #. module: mail
 #: selection:mail.compose.message,type:0
 #: view:mail.mail:0
 #: selection:mail.message,type:0
 msgid "Comment"
-msgstr ""
+msgstr "Коментарий"
 
 #. module: mail
 #: model:ir.actions.client,help:mail.action_mail_inbox_feeds
@@ -754,18 +776,27 @@ msgid ""
 "                </p>\n"
 "            "
 msgstr ""
+"<p>\n"
+"                    Поздравляем! Во входящих пусто.\n"
+"                </p><p>\n"
+"                    Ваши входящие содержат личные сообщения или\n"
+"                    эл. почту отправленную вам а также информацию по "
+"документам\n"
+"                    или людям которых вы отслеживаете.\n"
+"                </p>\n"
+"            "
 
 #. module: mail
 #: field:mail.mail,notification:0
 msgid "Is Notification"
-msgstr ""
+msgstr "это уведомление"
 
 #. module: mail
 #. openerp-web
 #: code:addons/mail/static/src/xml/mail.xml:161
 #, python-format
 msgid "Compose a new message"
-msgstr ""
+msgstr "Написать новое сообщение"
 
 #. module: mail
 #: view:mail.mail:0
@@ -778,6 +809,8 @@ msgstr "Отправить сейчас"
 msgid ""
 "Unable to send email, please configure the sender's email address or alias."
 msgstr ""
+"Невозможно отправить эл. почту, пожалуйста настройте адрес эл. почты "
+"отправителя или псевдоним."
 
 #. module: mail
 #: help:res.users,alias_id:0
@@ -785,11 +818,13 @@ msgid ""
 "Email address internally associated with this user. Incoming emails will "
 "appear in the user's notifications."
 msgstr ""
+"Адрес эл .почты внутренне связанный с этим пользователем. Входящая эл. почта "
+"будет показываться в уведомлениях этого пользователя."
 
 #. module: mail
 #: field:mail.group,image:0
 msgid "Photo"
-msgstr ""
+msgstr "Фото"
 
 #. module: mail
 #. openerp-web
@@ -798,7 +833,7 @@ msgstr ""
 #: view:mail.wizard.invite:0
 #, python-format
 msgid "or"
-msgstr ""
+msgstr "или"
 
 #. module: mail
 #: help:mail.compose.message,vote_user_ids:0
@@ -812,6 +847,8 @@ msgid ""
 "The email address associated with this group. New emails received will "
 "automatically create new topics."
 msgstr ""
+"Адрес эл. почты связанный с этой группой. Новая получаемая эл. почта будет "
+"автоматически создавать новые топики."
 
 #. module: mail
 #: view:mail.mail:0
@@ -826,7 +863,7 @@ msgstr "Искать эл. почту"
 #. module: mail
 #: model:mail.message.subtype,name:mail.mt_issue_canceled
 msgid "Canceled"
-msgstr ""
+msgstr "Отменено"
 
 #. module: mail
 #: field:mail.compose.message,child_ids:0
@@ -839,16 +876,18 @@ msgstr ""
 #: help:mail.message,to_read:0
 msgid "Functional field to search for messages the current user has to read"
 msgstr ""
+"Функциональное поле для поиска сообщений текущего пользователя которые "
+"должны быть прочитаны"
 
 #. module: mail
 #: field:mail.alias,alias_user_id:0
 msgid "Owner"
-msgstr ""
+msgstr "Владелец"
 
 #. module: mail
 #: model:ir.model,name:mail.model_res_users
 msgid "Users"
-msgstr ""
+msgstr "Пользователи"
 
 #. module: mail
 #: model:ir.model,name:mail.model_mail_message
@@ -859,67 +898,67 @@ msgstr ""
 #: field:mail.vote,message_id:0
 #: field:mail.wizard.invite,message:0
 msgid "Message"
-msgstr ""
+msgstr "Сообщение"
 
 #. module: mail
 #: model:ir.actions.client,name:mail.action_mail_star_feeds
 #: model:ir.ui.menu,name:mail.mail_starfeeds
 msgid "Todo"
-msgstr ""
+msgstr "Задачи"
 
 #. module: mail
 #: help:mail.followers,res_id:0
 #: help:mail.wizard.invite,res_id:0
 msgid "Id of the followed resource"
-msgstr ""
+msgstr "номер отслеживаемого ресурса"
 
 #. module: mail
 #: field:mail.compose.message,body:0
 #: field:mail.message,body:0
 msgid "Contents"
-msgstr ""
+msgstr "Содержание"
 
 #. module: mail
 #: model:ir.actions.act_window,name:mail.action_view_mail_alias
 #: model:ir.ui.menu,name:mail.mail_alias_menu
 msgid "Aliases"
-msgstr ""
+msgstr "Псевдонимы"
 
 #. module: mail
 #: field:mail.compose.message,vote_user_ids:0
 #: field:mail.message,vote_user_ids:0
 msgid "Votes"
-msgstr ""
+msgstr "Голоса"
 
 #. module: mail
 #: view:mail.group:0
 msgid "Group"
-msgstr ""
+msgstr "Группа"
 
 #. module: mail
 #: field:mail.group,public:0
 msgid "Privacy"
-msgstr ""
+msgstr "Конфиденциальность"
 
 #. module: mail
 #: view:mail.mail:0
 msgid "Notification"
-msgstr ""
+msgstr "Уведомление"
 
 #. module: mail
 #: model:ir.ui.menu,name:mail.group_support_ir_ui_menu
 msgid "Support"
-msgstr ""
+msgstr "Поддержка"
 
 #. module: mail
 #: view:mail.wizard.invite:0
 msgid "Add Followers"
-msgstr ""
+msgstr "Добавить подписчиков"
 
 #. module: mail
 #: model:mail.message.subtype,name:mail.mt_issue_closed
 msgid "Closed"
-msgstr ""
+msgstr "Закрыто"
 
 #. module: mail
 #: field:mail.alias,alias_force_thread_id:0
@@ -929,7 +968,7 @@ msgstr ""
 #. module: mail
 #: model:ir.ui.menu,name:mail.mail_group_root
 msgid "My Groups"
-msgstr ""
+msgstr "Мои группы"
 
 #. module: mail
 #: model:ir.actions.client,help:mail.action_mail_archives_feeds
@@ -943,12 +982,22 @@ msgid ""
 "                </p>\n"
 "            "
 msgstr ""
+"<p>\n"
+"                    Сообщения не найдены и ни одно сообщение еще не было "
+"отправлено.\n"
+"                </p><p>\n"
+"                    Нажмите на верхней правой иконке для написания "
+"сообщения. Это\n"
+"                    сообщение будет отправлено по эл. почте если это "
+"внутренний контакт.\n"
+"                </p>\n"
+"            "
 
 #. module: mail
 #: view:mail.mail:0
 #: field:mail.mail,state:0
 msgid "Status"
-msgstr ""
+msgstr "Статус"
 
 #. module: mail
 #: view:mail.mail:0
@@ -959,13 +1008,13 @@ msgstr "Исходящее"
 #. module: mail
 #: selection:res.partner,notification_email_send:0
 msgid "All feeds"
-msgstr ""
+msgstr "Все ленты"
 
 #. module: mail
 #: help:mail.compose.message,record_name:0
 #: help:mail.message,record_name:0
 msgid "Name get of the related document."
-msgstr ""
+msgstr "Название связанного документа."
 
 #. module: mail
 #: model:ir.actions.act_window,name:mail.action_view_notifications
@@ -976,12 +1025,12 @@ msgstr ""
 #: field:mail.message,notification_ids:0
 #: view:mail.notification:0
 msgid "Notifications"
-msgstr ""
+msgstr "Уведомления"
 
 #. module: mail
 #: view:mail.alias:0
 msgid "Search Alias"
-msgstr ""
+msgstr "Поиск псевдонима"
 
 #. module: mail
 #: help:mail.alias,alias_force_thread_id:0
@@ -990,6 +1039,9 @@ msgid ""
 "attached, even if they did not reply to it. If set, this will disable the "
 "creation of new records completely."
 msgstr ""
+"Опциональный номер записи к которой все входящие сообщения будут "
+"присоединены, даже если на них не было ответа. Если установлено, это "
+"отключит создание новых записей полностью."
 
 #. module: mail
 #: help:mail.message.subtype,name:0
@@ -1000,6 +1052,11 @@ msgid ""
 "subtypes allow to precisely tune the notifications the user want to receive "
 "on its wall."
 msgstr ""
+"Подтип сообщения дает более точный тип сообщения, особенно для системы "
+"уведомлений. Например, это может быть уведомление связанное с новой записью, "
+"или с изменением состояния в строке прогресса. Подтипы сообщений разрешают "
+"точнее настраивать уведомления которые пользователь хочет получать на своей "
+"стене."
 
 #. module: mail
 #: view:mail.mail:0
@@ -1009,19 +1066,19 @@ msgstr ""
 #. module: mail
 #: model:ir.ui.menu,name:mail.group_best_sales_practices_ir_ui_menu
 msgid "Best Sales Practices"
-msgstr ""
+msgstr "Лучшие практики продаж"
 
 #. module: mail
 #: selection:mail.group,public:0
 msgid "Selected Group Only"
-msgstr ""
+msgstr "Только выбранная группа"
 
 #. module: mail
 #: field:mail.group,message_is_follower:0
 #: field:mail.thread,message_is_follower:0
 #: field:res.partner,message_is_follower:0
 msgid "Is a Follower"
-msgstr ""
+msgstr "Подписан"
 
 #. module: mail
 #: view:mail.alias:0
diff --git a/addons/note/i18n/pt.po b/addons/note/i18n/pt.po
new file mode 100644
index 00000000000..d285eb91b00
--- /dev/null
+++ b/addons/note/i18n/pt.po
@@ -0,0 +1,288 @@
+# Portuguese translation for openobject-addons
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"PO-Revision-Date: 2012-12-05 10:05+0000\n"
+"Last-Translator: Andrei Talpa (multibase.pt) <andrei.talpa@multibase.pt>\n"
+"Language-Team: Portuguese <pt@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2012-12-06 04:41+0000\n"
+"X-Generator: Launchpad (build 16341)\n"
+
+#. module: note
+#: field:note.note,memo:0
+msgid "Note Content"
+msgstr "Conteúdo da nota"
+
+#. module: note
+#: view:note.stage:0
+msgid "Stages of Notes"
+msgstr ""
+
+#. module: note
+#: model:note.stage,name:note.demo_note_stage_04
+#: model:note.stage,name:note.note_stage_02
+msgid "This Week"
+msgstr "Esta semana"
+
+#. module: note
+#: model:ir.model,name:note.model_base_config_settings
+msgid "base.config.settings"
+msgstr ""
+
+#. module: note
+#: model:ir.model,name:note.model_note_tag
+msgid "Note Tag"
+msgstr ""
+
+#. module: note
+#: model:res.groups,name:note.group_note_fancy
+msgid "Notes / Fancy mode"
+msgstr ""
+
+#. module: note
+#: model:ir.model,name:note.model_note_note
+#: view:note.note:0
+msgid "Note"
+msgstr "Nota"
+
+#. module: note
+#: view:note.note:0
+msgid "Group By..."
+msgstr "Agrupar por..."
+
+#. module: note
+#: field:note.note,message_follower_ids:0
+msgid "Followers"
+msgstr "Seguidores"
+
+#. module: note
+#: model:ir.actions.act_window,help:note.action_note_note
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"            Click to add a personal note.\n"
+"          </p><p>\n"
+"            Use notes to organize personal tasks or notes. All\n"
+"            notes are private; no one else will be able to see them. "
+"However\n"
+"            you can share some notes with other people by inviting "
+"followers\n"
+"            on the note. (Useful for meeting minutes, especially if\n"
+"            you activate the pad feature for collaborative writings).\n"
+"          </p><p>\n"
+"            You can customize how you process your notes/tasks by adding,\n"
+"            removing or modifying columns.\n"
+"          </p>\n"
+"        "
+msgstr ""
+
+#. module: note
+#: model:note.stage,name:note.demo_note_stage_01
+#: model:note.stage,name:note.note_stage_01
+msgid "Today"
+msgstr "Hoje"
+
+#. module: note
+#: model:ir.model,name:note.model_res_users
+msgid "Users"
+msgstr "Utilizadores"
+
+#. module: note
+#: view:note.note:0
+msgid "í"
+msgstr ""
+
+#. module: note
+#: view:note.stage:0
+msgid "Stage of Notes"
+msgstr ""
+
+#. module: note
+#: field:note.note,message_unread:0
+msgid "Unread Messages"
+msgstr ""
+
+#. module: note
+#: field:note.note,current_partner_id:0
+msgid "unknown"
+msgstr "desconhecido"
+
+#. module: note
+#: view:note.note:0
+msgid "By sticky note Category"
+msgstr ""
+
+#. module: note
+#: help:note.note,message_unread:0
+msgid "If checked new messages require your attention."
+msgstr ""
+
+#. module: note
+#: field:note.stage,name:0
+msgid "Stage Name"
+msgstr ""
+
+#. module: note
+#: field:note.note,message_is_follower:0
+msgid "Is a Follower"
+msgstr ""
+
+#. module: note
+#: model:note.stage,name:note.demo_note_stage_02
+msgid "Tomorrow"
+msgstr "Amanhã"
+
+#. module: note
+#: view:note.note:0
+#: field:note.note,open:0
+msgid "Active"
+msgstr "Activo"
+
+#. module: note
+#: help:note.stage,user_id:0
+msgid "Owner of the note stage."
+msgstr ""
+
+#. module: note
+#: model:ir.ui.menu,name:note.menu_notes_stage
+msgid "Categories"
+msgstr "Categorias"
+
+#. module: note
+#: field:note.note,message_comment_ids:0
+#: help:note.note,message_comment_ids:0
+msgid "Comments and emails"
+msgstr ""
+
+#. module: note
+#: field:note.tag,name:0
+msgid "Tag Name"
+msgstr ""
+
+#. module: note
+#: field:note.note,message_ids:0
+msgid "Messages"
+msgstr "Mensagens"
+
+#. module: note
+#: view:base.config.settings:0
+#: model:ir.actions.act_window,name:note.action_note_note
+#: model:ir.ui.menu,name:note.menu_note_notes
+#: view:note.note:0
+#: model:note.stage,name:note.note_stage_04
+msgid "Notes"
+msgstr "Notas"
+
+#. module: note
+#: model:note.stage,name:note.demo_note_stage_03
+#: model:note.stage,name:note.note_stage_03
+msgid "Later"
+msgstr ""
+
+#. module: note
+#: model:ir.model,name:note.model_note_stage
+msgid "Note Stage"
+msgstr ""
+
+#. module: note
+#: field:note.note,message_summary:0
+msgid "Summary"
+msgstr ""
+
+#. module: note
+#: help:note.stage,sequence:0
+msgid "Used to order the note stages"
+msgstr ""
+
+#. module: note
+#: field:note.note,stage_ids:0
+msgid "Stages of Users"
+msgstr ""
+
+#. module: note
+#: field:note.note,name:0
+msgid "Note Summary"
+msgstr ""
+
+#. module: note
+#: model:ir.actions.act_window,name:note.action_note_stage
+#: view:note.note:0
+msgid "Stages"
+msgstr ""
+
+#. module: note
+#: help:note.note,message_ids:0
+msgid "Messages and communication history"
+msgstr ""
+
+#. module: note
+#: view:note.note:0
+msgid "Delete"
+msgstr ""
+
+#. module: note
+#: field:note.note,color:0
+msgid "Color Index"
+msgstr ""
+
+#. module: note
+#: field:note.note,sequence:0
+#: field:note.stage,sequence:0
+msgid "Sequence"
+msgstr ""
+
+#. module: note
+#: field:note.note,tag_ids:0
+msgid "Tags"
+msgstr ""
+
+#. module: note
+#: view:note.note:0
+msgid "Archive"
+msgstr ""
+
+#. module: note
+#: field:base.config.settings,module_note_pad:0
+msgid "Use collaborative pads (etherpad)"
+msgstr ""
+
+#. module: note
+#: help:note.note,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: note
+#: field:base.config.settings,group_note_fancy:0
+msgid "Use fancy layouts for notes"
+msgstr ""
+
+#. module: note
+#: field:note.stage,user_id:0
+msgid "Owner"
+msgstr "Proprietário"
+
+#. module: note
+#: view:note.note:0
+#: field:note.note,stage_id:0
+msgid "Stage"
+msgstr ""
+
+#. module: note
+#: field:note.note,date_done:0
+msgid "Date done"
+msgstr ""
+
+#. module: note
+#: field:note.stage,fold:0
+msgid "Folded by Default"
+msgstr ""
diff --git a/addons/note_pad/i18n/pt.po b/addons/note_pad/i18n/pt.po
new file mode 100644
index 00000000000..159c5de738a
--- /dev/null
+++ b/addons/note_pad/i18n/pt.po
@@ -0,0 +1,28 @@
+# Portuguese translation for openobject-addons
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-11-24 02:53+0000\n"
+"PO-Revision-Date: 2012-12-05 09:44+0000\n"
+"Last-Translator: Andrei Talpa (multibase.pt) <andrei.talpa@multibase.pt>\n"
+"Language-Team: Portuguese <pt@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2012-12-06 04:41+0000\n"
+"X-Generator: Launchpad (build 16341)\n"
+
+#. module: note_pad
+#: model:ir.model,name:note_pad.model_note_note
+msgid "Note"
+msgstr "Nota"
+
+#. module: note_pad
+#: field:note.note,note_pad_url:0
+msgid "Pad Url"
+msgstr ""
diff --git a/addons/portal_crm/i18n/pt.po b/addons/portal_crm/i18n/pt.po
new file mode 100644
index 00000000000..b2e9cca1fdb
--- /dev/null
+++ b/addons/portal_crm/i18n/pt.po
@@ -0,0 +1,552 @@
+# Portuguese translation for openobject-addons
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"PO-Revision-Date: 2012-12-05 09:41+0000\n"
+"Last-Translator: Andrei Talpa (multibase.pt) <andrei.talpa@multibase.pt>\n"
+"Language-Team: Portuguese <pt@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2012-12-06 04:41+0000\n"
+"X-Generator: Launchpad (build 16341)\n"
+
+#. module: portal_crm
+#: selection:portal_crm.crm_contact_us,type:0
+msgid "Lead"
+msgstr ""
+
+#. module: portal_crm
+#: field:portal_crm.crm_contact_us,title:0
+msgid "Title"
+msgstr "Título"
+
+#. module: portal_crm
+#: field:portal_crm.crm_contact_us,probability:0
+msgid "Success Rate (%)"
+msgstr "Taxa de Sucesso (%)"
+
+#. module: portal_crm
+#: view:portal_crm.crm_contact_us:0
+msgid "Contact us"
+msgstr ""
+
+#. module: portal_crm
+#: field:portal_crm.crm_contact_us,date_action:0
+msgid "Next Action Date"
+msgstr ""
+
+#. module: portal_crm
+#: field:portal_crm.crm_contact_us,fax:0
+msgid "Fax"
+msgstr "Fax"
+
+#. module: portal_crm
+#: field:portal_crm.crm_contact_us,zip:0
+msgid "Zip"
+msgstr "Código Postal"
+
+#. module: portal_crm
+#: field:portal_crm.crm_contact_us,message_unread:0
+msgid "Unread Messages"
+msgstr ""
+
+#. module: portal_crm
+#: field:portal_crm.crm_contact_us,company_id:0
+msgid "Company"
+msgstr "Empresa"
+
+#. module: portal_crm
+#: field:portal_crm.crm_contact_us,day_open:0
+msgid "Days to Open"
+msgstr ""
+
+#. module: portal_crm
+#: view:portal_crm.crm_contact_us:0
+msgid "Thank you for your interest, we'll respond to your request shortly."
+msgstr ""
+
+#. module: portal_crm
+#: selection:portal_crm.crm_contact_us,priority:0
+msgid "Highest"
+msgstr ""
+
+#. module: portal_crm
+#: field:portal_crm.crm_contact_us,mobile:0
+msgid "Mobile"
+msgstr "Telemóvel"
+
+#. module: portal_crm
+#: field:portal_crm.crm_contact_us,description:0
+msgid "Notes"
+msgstr "Notas"
+
+#. module: portal_crm
+#: field:portal_crm.crm_contact_us,message_ids:0
+msgid "Messages"
+msgstr "Mensagens"
+
+#. module: portal_crm
+#: field:portal_crm.crm_contact_us,color:0
+msgid "Color Index"
+msgstr ""
+
+#. module: portal_crm
+#: field:portal_crm.crm_contact_us,partner_latitude:0
+msgid "Geo Latitude"
+msgstr ""
+
+#. module: portal_crm
+#: field:portal_crm.crm_contact_us,partner_name:0
+msgid "Customer Name"
+msgstr "Nome do Cliente"
+
+#. module: portal_crm
+#: selection:portal_crm.crm_contact_us,state:0
+msgid "Cancelled"
+msgstr "Cancelado"
+
+#. module: portal_crm
+#: help:portal_crm.crm_contact_us,message_unread:0
+msgid "If checked new messages require your attention."
+msgstr ""
+
+#. module: portal_crm
+#: help:portal_crm.crm_contact_us,channel_id:0
+msgid "Communication channel (mail, direct, phone, ...)"
+msgstr ""
+
+#. module: portal_crm
+#: field:portal_crm.crm_contact_us,type_id:0
+msgid "Campaign"
+msgstr "Campanha"
+
+#. module: portal_crm
+#: field:portal_crm.crm_contact_us,ref:0
+msgid "Reference"
+msgstr "Referência"
+
+#. module: portal_crm
+#: field:portal_crm.crm_contact_us,date_action_next:0
+#: field:portal_crm.crm_contact_us,title_action:0
+msgid "Next Action"
+msgstr ""
+
+#. module: portal_crm
+#: help:portal_crm.crm_contact_us,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: portal_crm
+#: field:portal_crm.crm_contact_us,partner_id:0
+msgid "Partner"
+msgstr ""
+
+#. module: portal_crm
+#: model:ir.actions.act_window,name:portal_crm.action_contact_us
+msgid "Contact Us"
+msgstr ""
+
+#. module: portal_crm
+#: field:portal_crm.crm_contact_us,name:0
+msgid "Subject"
+msgstr "Assunto"
+
+#. module: portal_crm
+#: field:portal_crm.crm_contact_us,opt_out:0
+msgid "Opt-Out"
+msgstr ""
+
+#. module: portal_crm
+#: field:portal_crm.crm_contact_us,priority:0
+msgid "Priority"
+msgstr "Prioridade"
+
+#. module: portal_crm
+#: field:portal_crm.crm_contact_us,state_id:0
+msgid "State"
+msgstr ""
+
+#. module: portal_crm
+#: field:portal_crm.crm_contact_us,message_follower_ids:0
+msgid "Followers"
+msgstr ""
+
+#. module: portal_crm
+#: help:portal_crm.crm_contact_us,partner_id:0
+msgid "Linked partner (optional). Usually created when converting the lead."
+msgstr ""
+
+#. module: portal_crm
+#: field:portal_crm.crm_contact_us,payment_mode:0
+msgid "Payment Mode"
+msgstr "Modo de Pagamento"
+
+#. module: portal_crm
+#: selection:portal_crm.crm_contact_us,state:0
+msgid "New"
+msgstr ""
+
+#. module: portal_crm
+#: field:portal_crm.crm_contact_us,type:0
+msgid "Type"
+msgstr "Tipo"
+
+#. module: portal_crm
+#: field:portal_crm.crm_contact_us,email_from:0
+msgid "Email"
+msgstr "Email"
+
+#. module: portal_crm
+#: field:portal_crm.crm_contact_us,channel_id:0
+msgid "Channel"
+msgstr ""
+
+#. module: portal_crm
+#: view:portal_crm.crm_contact_us:0
+msgid "Name"
+msgstr "Nome"
+
+#. module: portal_crm
+#: selection:portal_crm.crm_contact_us,priority:0
+msgid "Lowest"
+msgstr ""
+
+#. module: portal_crm
+#: field:portal_crm.crm_contact_us,create_date:0
+msgid "Creation Date"
+msgstr "Data de Criação"
+
+#. module: portal_crm
+#: view:portal_crm.crm_contact_us:0
+msgid "Close"
+msgstr "Fechar"
+
+#. module: portal_crm
+#: selection:portal_crm.crm_contact_us,state:0
+msgid "Pending"
+msgstr "Pendente"
+
+#. module: portal_crm
+#: help:portal_crm.crm_contact_us,type:0
+msgid "Type is used to separate Leads and Opportunities"
+msgstr ""
+
+#. module: portal_crm
+#: field:portal_crm.crm_contact_us,categ_ids:0
+msgid "Categories"
+msgstr "Categorias"
+
+#. module: portal_crm
+#: field:portal_crm.crm_contact_us,stage_id:0
+msgid "Stage"
+msgstr ""
+
+#. module: portal_crm
+#: field:portal_crm.crm_contact_us,user_login:0
+msgid "User Login"
+msgstr ""
+
+#. module: portal_crm
+#: help:portal_crm.crm_contact_us,opt_out:0
+msgid ""
+"If opt-out is checked, this contact has refused to receive emails or "
+"unsubscribed to a campaign."
+msgstr ""
+
+#. module: portal_crm
+#: field:portal_crm.crm_contact_us,contact_name:0
+msgid "Contact Name"
+msgstr ""
+
+#. module: portal_crm
+#: model:ir.ui.menu,name:portal_crm.portal_company_contact
+msgid "Contact"
+msgstr ""
+
+#. module: portal_crm
+#: field:portal_crm.crm_contact_us,partner_address_email:0
+msgid "Partner Contact Email"
+msgstr ""
+
+#. module: portal_crm
+#: field:portal_crm.crm_contact_us,planned_revenue:0
+msgid "Expected Revenue"
+msgstr ""
+
+#. module: portal_crm
+#: field:portal_crm.crm_contact_us,task_ids:0
+msgid "Tasks"
+msgstr "Tarefas"
+
+#. module: portal_crm
+#: view:portal_crm.crm_contact_us:0
+msgid "Contact form"
+msgstr ""
+
+#. module: portal_crm
+#: field:portal_crm.crm_contact_us,company_currency:0
+msgid "Currency"
+msgstr ""
+
+#. module: portal_crm
+#: field:portal_crm.crm_contact_us,write_date:0
+msgid "Update Date"
+msgstr ""
+
+#. module: portal_crm
+#: field:portal_crm.crm_contact_us,date_deadline:0
+msgid "Expected Closing"
+msgstr ""
+
+#. module: portal_crm
+#: field:portal_crm.crm_contact_us,ref2:0
+msgid "Reference 2"
+msgstr "Referência 2"
+
+#. module: portal_crm
+#: field:portal_crm.crm_contact_us,user_email:0
+msgid "User Email"
+msgstr "Email Utilizador"
+
+#. module: portal_crm
+#: field:portal_crm.crm_contact_us,date_open:0
+msgid "Opened"
+msgstr ""
+
+#. module: portal_crm
+#: selection:portal_crm.crm_contact_us,state:0
+msgid "In Progress"
+msgstr "Em Progresso"
+
+#. module: portal_crm
+#: help:portal_crm.crm_contact_us,partner_name:0
+msgid ""
+"The name of the future partner company that will be created while converting "
+"the lead into opportunity"
+msgstr ""
+
+#. module: portal_crm
+#: field:portal_crm.crm_contact_us,planned_cost:0
+msgid "Planned Costs"
+msgstr ""
+
+#. module: portal_crm
+#: help:portal_crm.crm_contact_us,date_deadline:0
+msgid "Estimate of the date on which the opportunity will be won."
+msgstr ""
+
+#. module: portal_crm
+#: help:portal_crm.crm_contact_us,email_cc:0
+msgid ""
+"These email addresses will be added to the CC field of all inbound and "
+"outbound emails for this record before being sent. Separate multiple email "
+"addresses with a comma"
+msgstr ""
+
+#. module: portal_crm
+#: selection:portal_crm.crm_contact_us,priority:0
+msgid "Low"
+msgstr ""
+
+#. module: portal_crm
+#: field:portal_crm.crm_contact_us,date_closed:0
+#: selection:portal_crm.crm_contact_us,state:0
+msgid "Closed"
+msgstr ""
+
+#. module: portal_crm
+#: field:portal_crm.crm_contact_us,date_assign:0
+msgid "Assignation Date"
+msgstr ""
+
+#. module: portal_crm
+#: field:portal_crm.crm_contact_us,state:0
+msgid "Status"
+msgstr "Estado"
+
+#. module: portal_crm
+#: selection:portal_crm.crm_contact_us,priority:0
+msgid "Normal"
+msgstr "Normal"
+
+#. module: portal_crm
+#: field:portal_crm.crm_contact_us,email_cc:0
+msgid "Global CC"
+msgstr "CC Global"
+
+#. module: portal_crm
+#: field:portal_crm.crm_contact_us,street2:0
+msgid "Street2"
+msgstr ""
+
+#. module: portal_crm
+#: field:portal_crm.crm_contact_us,id:0
+msgid "ID"
+msgstr ""
+
+#. module: portal_crm
+#: field:portal_crm.crm_contact_us,phone:0
+msgid "Phone"
+msgstr ""
+
+#. module: portal_crm
+#: field:portal_crm.crm_contact_us,message_is_follower:0
+msgid "Is a Follower"
+msgstr "É um Seguidor"
+
+#. module: portal_crm
+#: field:portal_crm.crm_contact_us,active:0
+msgid "Active"
+msgstr ""
+
+#. module: portal_crm
+#: field:portal_crm.crm_contact_us,user_id:0
+msgid "Salesperson"
+msgstr ""
+
+#. module: portal_crm
+#: field:portal_crm.crm_contact_us,day_close:0
+msgid "Days to Close"
+msgstr ""
+
+#. module: portal_crm
+#: field:portal_crm.crm_contact_us,message_comment_ids:0
+#: help:portal_crm.crm_contact_us,message_comment_ids:0
+msgid "Comments and emails"
+msgstr ""
+
+#. module: portal_crm
+#: field:portal_crm.crm_contact_us,company_ids:0
+msgid "Companies"
+msgstr "Empresas"
+
+#. module: portal_crm
+#: field:portal_crm.crm_contact_us,message_summary:0
+msgid "Summary"
+msgstr ""
+
+#. module: portal_crm
+#: help:portal_crm.crm_contact_us,section_id:0
+msgid ""
+"When sending mails, the default email address is taken from the sales team."
+msgstr ""
+
+#. module: portal_crm
+#: field:portal_crm.crm_contact_us,partner_address_name:0
+msgid "Partner Contact Name"
+msgstr ""
+
+#. module: portal_crm
+#: field:portal_crm.crm_contact_us,partner_longitude:0
+msgid "Geo Longitude"
+msgstr ""
+
+#. module: portal_crm
+#: help:portal_crm.crm_contact_us,date_assign:0
+msgid "Last date this case was forwarded/assigned to a partner"
+msgstr ""
+
+#. module: portal_crm
+#: help:portal_crm.crm_contact_us,email_from:0
+msgid "Email address of the contact"
+msgstr ""
+
+#. module: portal_crm
+#: field:portal_crm.crm_contact_us,city:0
+msgid "City"
+msgstr "Cidade"
+
+#. module: portal_crm
+#: view:portal_crm.crm_contact_us:0
+msgid "Submit"
+msgstr "Submeter"
+
+#. module: portal_crm
+#: field:portal_crm.crm_contact_us,function:0
+msgid "Function"
+msgstr ""
+
+#. module: portal_crm
+#: field:portal_crm.crm_contact_us,referred:0
+msgid "Referred By"
+msgstr ""
+
+#. module: portal_crm
+#: field:portal_crm.crm_contact_us,partner_assigned_id:0
+msgid "Assigned Partner"
+msgstr "Parceiro Atribuído"
+
+#. module: portal_crm
+#: selection:portal_crm.crm_contact_us,type:0
+msgid "Opportunity"
+msgstr "Oportunidade"
+
+#. module: portal_crm
+#: help:portal_crm.crm_contact_us,partner_assigned_id:0
+msgid "Partner this case has been forwarded/assigned to."
+msgstr ""
+
+#. module: portal_crm
+#: field:portal_crm.crm_contact_us,country_id:0
+msgid "Country"
+msgstr "País"
+
+#. module: portal_crm
+#: view:portal_crm.crm_contact_us:0
+msgid "Thank you"
+msgstr "Obrigado"
+
+#. module: portal_crm
+#: help:portal_crm.crm_contact_us,state:0
+msgid ""
+"The Status is set to 'Draft', when a case is created. If the case is in "
+"progress the Status is set to 'Open'. When the case is over, the Status is "
+"set to 'Done'. If the case needs to be reviewed then the Status is  set to "
+"'Pending'."
+msgstr ""
+
+#. module: portal_crm
+#: help:portal_crm.crm_contact_us,message_ids:0
+msgid "Messages and communication history"
+msgstr ""
+
+#. module: portal_crm
+#: help:portal_crm.crm_contact_us,type_id:0
+msgid ""
+"From which campaign (seminar, marketing campaign, mass mailing, ...) did "
+"this contact come from?"
+msgstr ""
+
+#. module: portal_crm
+#: selection:portal_crm.crm_contact_us,priority:0
+msgid "High"
+msgstr ""
+
+#. module: portal_crm
+#: field:portal_crm.crm_contact_us,section_id:0
+msgid "Sales Team"
+msgstr ""
+
+#. module: portal_crm
+#: field:portal_crm.crm_contact_us,street:0
+msgid "Street"
+msgstr "Rua"
+
+#. module: portal_crm
+#: field:portal_crm.crm_contact_us,date_action_last:0
+msgid "Last Action"
+msgstr ""
+
+#. module: portal_crm
+#: model:ir.model,name:portal_crm.model_portal_crm_crm_contact_us
+msgid "Contact form for the portal"
+msgstr ""
diff --git a/addons/portal_event/i18n/pt.po b/addons/portal_event/i18n/pt.po
new file mode 100644
index 00000000000..918a4b6de21
--- /dev/null
+++ b/addons/portal_event/i18n/pt.po
@@ -0,0 +1,59 @@
+# Portuguese translation for openobject-addons
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"PO-Revision-Date: 2012-12-05 09:43+0000\n"
+"Last-Translator: Andrei Talpa (multibase.pt) <andrei.talpa@multibase.pt>\n"
+"Language-Team: Portuguese <pt@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2012-12-06 04:41+0000\n"
+"X-Generator: Launchpad (build 16341)\n"
+
+#. module: portal_event
+#: view:event.event:0
+msgid "Portal Settings"
+msgstr ""
+
+#. module: portal_event
+#: model:ir.actions.act_window,help:portal_event.action_event_view
+msgid "There are no public events."
+msgstr "Não existem eventos públicos."
+
+#. module: portal_event
+#: selection:event.event,visibility:0
+msgid "Private"
+msgstr "Privado"
+
+#. module: portal_event
+#: model:ir.model,name:portal_event.model_event_event
+msgid "Event"
+msgstr "Evento"
+
+#. module: portal_event
+#: model:ir.actions.act_window,name:portal_event.action_event_view
+#: model:ir.ui.menu,name:portal_event.portal_company_events
+msgid "Events"
+msgstr "Eventos"
+
+#. module: portal_event
+#: field:event.event,visibility:0
+msgid "Visibility"
+msgstr "Visibilidade"
+
+#. module: portal_event
+#: help:event.event,visibility:0
+msgid "Event's visibility in the portal's contact page"
+msgstr ""
+
+#. module: portal_event
+#: selection:event.event,visibility:0
+msgid "Public"
+msgstr "Público"
diff --git a/addons/sale/i18n/pt.po b/addons/sale/i18n/pt.po
index baf99a41163..7a23221a4d0 100644
--- a/addons/sale/i18n/pt.po
+++ b/addons/sale/i18n/pt.po
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev_rc3\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2012-12-03 16:02+0000\n"
-"PO-Revision-Date: 2012-05-10 17:19+0000\n"
-"Last-Translator: Raphael Collet (OpenERP) <Unknown>\n"
+"PO-Revision-Date: 2012-12-05 09:56+0000\n"
+"Last-Translator: Andrei Talpa (multibase.pt) <andrei.talpa@multibase.pt>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:30+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-06 04:40+0000\n"
+"X-Generator: Launchpad (build 16341)\n"
 
 #. module: sale
 #: model:ir.model,name:sale.model_account_config_settings
@@ -59,6 +59,7 @@ msgstr "Dia"
 
 #. module: sale
 #: model:process.transition.action,name:sale.process_transition_action_cancelorder0
+#: view:sale.order:0
 msgid "Cancel Order"
 msgstr "Cancelar Ordem de Venda"
 
@@ -82,7 +83,7 @@ msgstr ""
 #. module: sale
 #: view:res.partner:0
 msgid "False"
-msgstr ""
+msgstr "Falso"
 
 #. module: sale
 #: report:sale.order:0
@@ -101,6 +102,7 @@ msgid ""
 msgstr ""
 
 #. module: sale
+#: field:sale.order,project_id:0
 #: view:sale.report:0
 #: field:sale.report,analytic_account_id:0
 #: field:sale.shop,project_id:0
@@ -151,7 +153,7 @@ msgstr ""
 #. module: sale
 #: selection:sale.advance.payment.inv,advance_payment_method:0
 msgid "Percentage"
-msgstr ""
+msgstr "Percentagem"
 
 #. module: sale
 #: report:sale.order:0
@@ -299,7 +301,7 @@ msgid "Advance of %s %%"
 msgstr ""
 
 #. module: sale
-#: model:ir.actions.act_window,name:sale.action_orders_exception
+#: model:ir.actions.act_window,name:sale.action_order_tree2
 msgid "Sales in Exception"
 msgstr "Excepção de Vendas"
 
@@ -375,8 +377,8 @@ msgid "Advance of %s %s"
 msgstr ""
 
 #. module: sale
-#: model:ir.actions.act_window,name:sale.action_quotations
-#: model:ir.ui.menu,name:sale.menu_sale_quotations
+#: view:board.board:0
+#: model:ir.actions.act_window,name:sale.action_quotation_for_sale
 #: view:sale.order:0
 #: view:sale.report:0
 msgid "Quotations"
@@ -385,7 +387,6 @@ msgstr "Cotações"
 #. module: sale
 #: field:sale.advance.payment.inv,qtty:0
 #: report:sale.order:0
-#: field:sale.order.line,product_uom_qty:0
 msgid "Quantity"
 msgstr "Quantidade"
 
@@ -410,6 +411,7 @@ msgid "Fiscal Position"
 msgstr "Posição Fiscal"
 
 #. module: sale
+#: selection:sale.order,state:0
 #: selection:sale.report,state:0
 msgid "In Progress"
 msgstr "Em Progresso"
@@ -499,7 +501,6 @@ msgid "or"
 msgstr ""
 
 #. module: sale
-#: field:sale.order,invoice_exists:0
 #: field:sale.order,invoiced_rate:0
 #: field:sale.order.line,invoiced:0
 msgid "Invoiced"
@@ -563,7 +564,7 @@ msgstr "Endereço da Fatura :"
 #. module: sale
 #: field:sale.order.line,product_uom:0
 msgid "Unit of Measure "
-msgstr ""
+msgstr "Unidade de Medida "
 
 #. module: sale
 #: field:sale.config.settings,time_unit:0
@@ -597,10 +598,11 @@ msgstr ""
 #. module: sale
 #: view:sale.order:0
 msgid "(update)"
-msgstr ""
+msgstr "(atualizar)"
 
 #. module: sale
 #: model:ir.model,name:sale.model_sale_order_line
+#: field:stock.move,sale_line_id:0
 msgid "Sales Order Line"
 msgstr "Linha da ordem de venda"
 
@@ -612,7 +614,7 @@ msgstr ""
 #. module: sale
 #: view:sale.order:0
 msgid "Print"
-msgstr ""
+msgstr "Imprimir"
 
 #. module: sale
 #: report:sale.order:0
@@ -620,7 +622,6 @@ msgid "Order N°"
 msgstr "Ordem Nº"
 
 #. module: sale
-#: view:sale.order:0
 #: field:sale.order,order_line:0
 msgid "Order Lines"
 msgstr "Linhas da Ordem"
@@ -698,12 +699,12 @@ msgstr ""
 #: code:addons/sale/wizard/sale_make_invoice_advance.py:95
 #, python-format
 msgid "Configuration Error!"
-msgstr ""
+msgstr "Erro de Configuração!"
 
 #. module: sale
 #: view:sale.order:0
 msgid "Send by Email"
-msgstr ""
+msgstr "Enviar por Email"
 
 #. module: sale
 #: code:addons/sale/res_config.py:89
@@ -718,6 +719,7 @@ msgstr "Data da Ordem"
 
 #. module: sale
 #: view:sale.order.line:0
+#: field:sale.report,shipped:0
 msgid "Shipped"
 msgstr "Enviado"
 
@@ -729,7 +731,6 @@ msgid ""
 msgstr ""
 
 #. module: sale
-#: model:ir.model,name:sale.model_res_partner
 #: view:sale.report:0
 #: field:sale.report,partner_id:0
 msgid "Partner"
@@ -766,7 +767,7 @@ msgid "You cannot confirm a sale order which has no line."
 msgstr "Não pode confirmar uma ordem de venda que não tem nenhuma linha."
 
 #. module: sale
-#: code:addons/sale/sale.py:966
+#: code:addons/sale/sale.py:1124
 #, python-format
 msgid ""
 "You have to select a pricelist or a customer in the sales form !\n"
@@ -813,7 +814,7 @@ msgstr ""
 #. module: sale
 #: field:sale.order,currency_id:0
 msgid "unknown"
-msgstr ""
+msgstr "desconhecido"
 
 #. module: sale
 #: field:sale.order,message_is_follower:0
@@ -879,6 +880,7 @@ msgid "Your Reference"
 msgstr "Sua Referência"
 
 #. module: sale
+#: view:sale.order:0
 #: view:sale.order.line:0
 msgid "Qty"
 msgstr "Qtd"
@@ -890,9 +892,10 @@ msgstr "Minhas linhas da ordem de vendas"
 
 #. module: sale
 #: model:process.transition.action,name:sale.process_transition_action_cancel0
+#: model:process.transition.action,name:sale.process_transition_action_cancel1
+#: model:process.transition.action,name:sale.process_transition_action_cancel2
 #: view:sale.advance.payment.inv:0
 #: view:sale.make.invoice:0
-#: view:sale.order:0
 #: view:sale.order.line:0
 #: view:sale.order.line.make.invoice:0
 msgid "Cancel"
@@ -913,10 +916,9 @@ msgstr ""
 
 #. module: sale
 #: model:process.transition,name:sale.process_transition_invoice0
+#: model:process.transition,name:sale.process_transition_invoiceafterdelivery0
 #: model:process.transition.action,name:sale.process_transition_action_createinvoice0
 #: view:sale.advance.payment.inv:0
-#: view:sale.order:0
-#: field:sale.order,order_policy:0
 #: view:sale.order.line:0
 msgid "Create Invoice"
 msgstr "Criar Fatura"
@@ -943,6 +945,7 @@ msgstr ""
 
 #. module: sale
 #: report:sale.order:0
+#: view:sale.order.line:0
 msgid "Price"
 msgstr "Preço"
 
@@ -1049,7 +1052,7 @@ msgstr "A Espera da Agenda"
 #: view:sale.order.line:0
 #: field:sale.report,product_uom:0
 msgid "Unit of Measure"
-msgstr ""
+msgstr "Unidade de Medida"
 
 #. module: sale
 #: field:sale.order.line,type:0
@@ -1078,6 +1081,7 @@ msgid "Sale Order"
 msgstr "Ordem de Venda"
 
 #. module: sale
+#: view:sale.order:0
 #: field:sale.order,amount_tax:0
 #: field:sale.order.line,tax_id:0
 msgid "Taxes"
@@ -1147,6 +1151,7 @@ msgstr ""
 #. module: sale
 #: model:ir.actions.act_window,name:sale.action_sale_order_make_invoice
 #: model:ir.actions.act_window,name:sale.action_view_sale_order_line_make_invoice
+#: view:sale.order:0
 msgid "Make Invoices"
 msgstr "Criar faturas"
 
@@ -1251,7 +1256,7 @@ msgstr "Análise de vendas"
 
 #. module: sale
 #: model:process.node,name:sale.process_node_quotation0
-#: view:sale.order:0
+#: selection:sale.order,state:0
 #: selection:sale.report,state:0
 msgid "Quotation"
 msgstr "Cotação"
@@ -1400,10 +1405,8 @@ msgid "Customer Invoices"
 msgstr "Faturas de clientes"
 
 #. module: sale
-#: model:ir.actions.act_window,name:sale.open_board_sales
-#: model:ir.ui.menu,name:sale.menu_dashboard_sales
+#: model:ir.actions.act_window,name:sale.act_res_partner_2_sale_order
 #: model:process.process,name:sale.process_process_salesprocess0
-#: view:res.partner:0
 #: view:sale.order:0
 #: view:sale.report:0
 msgid "Sales"
@@ -1425,7 +1428,6 @@ msgid "Unit Price"
 msgstr "Preço Unitário"
 
 #. module: sale
-#: view:sale.order:0
 #: selection:sale.order,state:0
 #: view:sale.order.line:0
 #: selection:sale.order.line,state:0
@@ -1434,10 +1436,8 @@ msgid "Done"
 msgstr "Concluído"
 
 #. module: sale
-#: code:addons/sale/wizard/sale_line_invoice.py:123
 #: model:process.node,name:sale.process_node_invoice0
-#: view:sale.order:0
-#, python-format
+#: model:process.node,name:sale.process_node_invoiceafterdelivery0
 msgid "Invoice"
 msgstr "Fatura"
 
@@ -1513,6 +1513,7 @@ msgid "Product UoS"
 msgstr "UoS do artigo"
 
 #. module: sale
+#: selection:sale.order,state:0
 #: selection:sale.report,state:0
 msgid "Manual In Progress"
 msgstr "Manual em Progresso"
@@ -1661,7 +1662,7 @@ msgid "Invoice Exception"
 msgstr "Exceção da Fatura"
 
 #. module: sale
-#: code:addons/sale/sale.py:888
+#: code:addons/sale/sale.py:1017
 #, python-format
 msgid "No Customer Defined !"
 msgstr "Nenhum Cliente Definido !"
@@ -1684,12 +1685,12 @@ msgstr ""
 #. module: sale
 #: field:sale.order,message_ids:0
 msgid "Messages"
-msgstr ""
+msgstr "Mensagens"
 
 #. module: sale
 #: field:sale.config.settings,module_project:0
 msgid "Project"
-msgstr ""
+msgstr "Projeto"
 
 #. module: sale
 #: code:addons/sale/sale.py:354
@@ -1699,7 +1700,7 @@ msgstr ""
 #: code:addons/sale/sale.py:803
 #, python-format
 msgid "Error!"
-msgstr ""
+msgstr "Erro!"
 
 #. module: sale
 #: report:sale.order:0
@@ -1738,6 +1739,7 @@ msgstr ""
 
 #. module: sale
 #: model:ir.actions.act_window,name:sale.action_shop_form
+#: model:ir.ui.menu,name:sale.menu_action_shop_form
 #: field:sale.order,shop_id:0
 #: view:sale.report:0
 #: field:sale.report,shop_id:0
@@ -1761,15 +1763,12 @@ msgid "Contract Features"
 msgstr ""
 
 #. module: sale
-#: code:addons/sale/sale.py:273
-#: code:addons/sale/sale.py:576
 #: model:ir.model,name:sale.model_sale_order
 #: model:process.node,name:sale.process_node_order0
 #: model:process.node,name:sale.process_node_saleorder0
-#: field:res.partner,sale_order_ids:0
 #: model:res.request.link,name:sale.req_link_sale_order
 #: view:sale.order:0
-#, python-format
+#: field:stock.picking,sale_id:0
 msgid "Sales Order"
 msgstr "Ordem de venda"
 
@@ -1791,7 +1790,7 @@ msgstr "Confirmado"
 #. module: sale
 #: field:sale.order,note:0
 msgid "Terms and conditions"
-msgstr ""
+msgstr "Termos e condições"
 
 #. module: sale
 #: model:process.transition.action,name:sale.process_transition_action_confirm0
@@ -1801,9 +1800,10 @@ msgstr "Confirmar"
 #. module: sale
 #: field:sale.order,message_follower_ids:0
 msgid "Followers"
-msgstr ""
+msgstr "Seguidores"
 
 #. module: sale
+#: view:sale.order:0
 #: field:sale.order.line,invoice_lines:0
 msgid "Invoice Lines"
 msgstr "Linhas da Fatura"
@@ -1815,7 +1815,6 @@ msgid "# of Lines"
 msgstr "# de Linhas"
 
 #. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_line_product_tree
 #: view:sale.order:0
 #: view:sale.order.line:0
 msgid "Sales Order Lines"
@@ -1889,7 +1888,7 @@ msgid ""
 msgstr ""
 
 #. module: sale
-#: code:addons/sale/wizard/sale_line_invoice.py:109
+#: code:addons/sale/wizard/sale_line_invoice.py:111
 #, python-format
 msgid ""
 "Invoice cannot be created for this Sales Order Line due to one of the "
@@ -1914,6 +1913,8 @@ msgid "Weight"
 msgstr "Peso"
 
 #. module: sale
+#: view:sale.open.invoice:0
+#: view:sale.order:0
 #: field:sale.order,invoice_ids:0
 msgid "Invoices"
 msgstr "Faturas"
@@ -1945,7 +1946,10 @@ msgid "Untaxed Amount"
 msgstr "Montante sem imposto"
 
 #. module: sale
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:202
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:163
+#: model:ir.actions.act_window,name:sale.action_view_sale_advance_payment_inv
+#: view:sale.advance.payment.inv:0
+#: view:sale.order:0
 #, python-format
 msgid "Advance Invoice"
 msgstr "Adiantamento da Fatura"
@@ -1986,6 +1990,8 @@ msgid "Email Templates"
 msgstr "Email Templates"
 
 #. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_form
+#: model:ir.ui.menu,name:sale.menu_sale_order
 #: view:sale.order:0
 msgid "Sales Orders"
 msgstr "Ordens de Vendas"
@@ -2023,7 +2029,7 @@ msgid "January"
 msgstr "Janeiro"
 
 #. module: sale
-#: model:ir.actions.act_window,name:sale.action_orders_in_progress
+#: model:ir.actions.act_window,name:sale.action_order_tree4
 msgid "Sales Order in Progress"
 msgstr "Ordem de Venda em Progresso"
 
@@ -2202,6 +2208,7 @@ msgid "Quotation N°"
 msgstr "Cotação nº"
 
 #. module: sale
+#: field:sale.order,picked_rate:0
 #: view:sale.report:0
 msgid "Picked"
 msgstr "Escolhido"
diff --git a/addons/sale/i18n/ru.po b/addons/sale/i18n/ru.po
index 89bdd464eed..69998179757 100644
--- a/addons/sale/i18n/ru.po
+++ b/addons/sale/i18n/ru.po
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2012-12-03 16:02+0000\n"
-"PO-Revision-Date: 2012-10-23 18:53+0000\n"
-"Last-Translator: Chertykov Denis <chertykov@gmail.com>\n"
+"PO-Revision-Date: 2012-12-05 08:26+0000\n"
+"Last-Translator: Denis Karataev <dskarataev@gmail.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:31+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-06 04:40+0000\n"
+"X-Generator: Launchpad (build 16341)\n"
 
 #. module: sale
 #: model:ir.model,name:sale.model_account_config_settings
@@ -44,7 +44,7 @@ msgstr "Ед.прод."
 #: view:sale.report:0
 #: field:sale.report,user_id:0
 msgid "Salesperson"
-msgstr ""
+msgstr "Продавец"
 
 #. module: sale
 #: help:sale.order,pricelist_id:0
@@ -59,6 +59,7 @@ msgstr "День"
 
 #. module: sale
 #: model:process.transition.action,name:sale.process_transition_action_cancelorder0
+#: view:sale.order:0
 msgid "Cancel Order"
 msgstr "Отменить заказ"
 
@@ -77,7 +78,7 @@ msgstr ""
 #. module: sale
 #: help:sale.order,message_unread:0
 msgid "If checked new messages require your attention."
-msgstr ""
+msgstr "Если отмечено, новые сообщения требуют вашего внимания."
 
 #. module: sale
 #: view:res.partner:0
@@ -101,6 +102,7 @@ msgid ""
 msgstr ""
 
 #. module: sale
+#: field:sale.order,project_id:0
 #: view:sale.report:0
 #: field:sale.report,analytic_account_id:0
 #: field:sale.shop,project_id:0
@@ -123,7 +125,7 @@ msgstr "Кол-во"
 #. module: sale
 #: help:sale.config.settings,group_discount_per_so_line:0
 msgid "Allows you to apply some discount per sale order line."
-msgstr ""
+msgstr "Позволяет вам применять некоторые скидки к строке заказа продаж"
 
 #. module: sale
 #: help:sale.config.settings,group_sale_pricelist:0
@@ -141,12 +143,12 @@ msgstr "Условия платежа по умолчанию"
 #: code:addons/sale/sale.py:662
 #, python-format
 msgid "Invoice <b>paid</b>."
-msgstr ""
+msgstr "Счет <b>оплачен</b>."
 
 #. module: sale
 #: field:sale.config.settings,group_uom:0
 msgid "Allow using different units of measures"
-msgstr ""
+msgstr "Разрешить использование различных единиц измерения"
 
 #. module: sale
 #: selection:sale.advance.payment.inv,advance_payment_method:0
@@ -163,6 +165,7 @@ msgstr "Дисконт (%)"
 #, python-format
 msgid "Please define income account for this product: \"%s\" (id:%d)."
 msgstr ""
+"Пожалуйста, определите дебетовый счет для этого продукта: \"%s\" (id:%d)."
 
 #. module: sale
 #: view:sale.report:0
@@ -211,17 +214,17 @@ msgstr "Прочая информация"
 #: code:addons/sale/wizard/sale_make_invoice.py:42
 #, python-format
 msgid "Warning!"
-msgstr ""
+msgstr "Внимание!"
 
 #. module: sale
 #: view:sale.config.settings:0
 msgid "Invoicing Process"
-msgstr ""
+msgstr "Выставление счетов"
 
 #. module: sale
 #: view:sale.order:0
 msgid "Sales Order done"
-msgstr ""
+msgstr "Заказ продаж исполнен"
 
 #. module: sale
 #: model:ir.actions.act_window,name:sale.act_res_partner_2_sale_order
@@ -234,6 +237,7 @@ msgstr "Предложения цен и продажи"
 msgid ""
 "Allows you to select and maintain different units of measure for products."
 msgstr ""
+"Позволяет выбирать и поддерживать различные единицы измерения для товаров."
 
 #. module: sale
 #: model:ir.model,name:sale.model_sale_make_invoice
@@ -254,7 +258,7 @@ msgstr "Скидка (%)"
 #. module: sale
 #: view:sale.order.line.make.invoice:0
 msgid "Create & View Invoice"
-msgstr ""
+msgstr "Создать и просмотреть счет на оплату"
 
 #. module: sale
 #: view:board.board:0
@@ -286,6 +290,15 @@ msgid ""
 "              </p>\n"
 "            "
 msgstr ""
+"<p>\n"
+"                Это список всех строк заказа для выставления в счет. Вы "
+"можете\n"
+"                выставлять счета раздельно, по строкам заказа продаж. Вы не\n"
+"                нуждаетесь в этом списке если выставляете счет из заказов на "
+"доставку или\n"
+"                если вы выставляете счет сразу на весь заказ продаж.\n"
+"              </p>\n"
+"            "
 
 #. module: sale
 #: view:sale.order:0
@@ -299,14 +312,14 @@ msgid "Advance of %s %%"
 msgstr ""
 
 #. module: sale
-#: model:ir.actions.act_window,name:sale.action_orders_exception
+#: model:ir.actions.act_window,name:sale.action_order_tree2
 msgid "Sales in Exception"
 msgstr "Продажи в состоянии \"Исключение\""
 
 #. module: sale
 #: help:sale.order.line,address_allotment_id:0
 msgid "A partner to whom the particular product needs to be allotted."
-msgstr ""
+msgstr "Партнер, кому предназначен конкретный продукт."
 
 #. module: sale
 #: view:sale.order:0
@@ -336,6 +349,17 @@ msgid ""
 "              </p>\n"
 "            "
 msgstr ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Нажмите для создания предложения которое может быть "
+"конвертировано в\n"
+"                заказ продаж.\n"
+"              </p><p>\n"
+"                OpenERP поможет вам эффективнее обрабатывать весь поток "
+"продаж:\n"
+"                предложение, заказ продаж, доставка, выставление счетов и "
+"оплата.\n"
+"              </p>\n"
+"            "
 
 #. module: sale
 #: selection:sale.report,month:0
@@ -360,12 +384,12 @@ msgstr "Октябрь"
 #. module: sale
 #: field:sale.order,message_summary:0
 msgid "Summary"
-msgstr ""
+msgstr "Итого"
 
 #. module: sale
 #: view:sale.order:0
 msgid "View Invoice"
-msgstr ""
+msgstr "Просмотреть счет"
 
 #. module: sale
 #: code:addons/sale/wizard/sale_make_invoice_advance.py:113
@@ -375,8 +399,8 @@ msgid "Advance of %s %s"
 msgstr ""
 
 #. module: sale
-#: model:ir.actions.act_window,name:sale.action_quotations
-#: model:ir.ui.menu,name:sale.menu_sale_quotations
+#: view:board.board:0
+#: model:ir.actions.act_window,name:sale.action_quotation_for_sale
 #: view:sale.order:0
 #: view:sale.report:0
 msgid "Quotations"
@@ -385,14 +409,13 @@ msgstr "Предложения"
 #. module: sale
 #: field:sale.advance.payment.inv,qtty:0
 #: report:sale.order:0
-#: field:sale.order.line,product_uom_qty:0
 msgid "Quantity"
 msgstr "Количество"
 
 #. module: sale
 #: help:sale.order,partner_shipping_id:0
 msgid "Delivery address for current sales order."
-msgstr ""
+msgstr "Адрес доставки для текущего заказа продаж."
 
 #. module: sale
 #: report:sale.order:0
@@ -410,6 +433,7 @@ msgid "Fiscal Position"
 msgstr "Система налогообложения"
 
 #. module: sale
+#: selection:sale.order,state:0
 #: selection:sale.report,state:0
 msgid "In Progress"
 msgstr "Выполняется"
@@ -418,7 +442,7 @@ msgstr "Выполняется"
 #: code:addons/sale/sale.py:667
 #, python-format
 msgid "Draft Invoice of %s %s <b>waiting for validation</b>."
-msgstr ""
+msgstr "Черновик счета от %s %s <b>ожидает проверки</b>."
 
 #. module: sale
 #: model:process.transition,note:sale.process_transition_confirmquotation0
@@ -433,7 +457,7 @@ msgstr ""
 #: code:addons/sale/sale.py:843
 #, python-format
 msgid "You cannot cancel a sale order line that has already been invoiced."
-msgstr ""
+msgstr "Вы не можете строку заказа продаж по которой уже был выставлен счет."
 
 #. module: sale
 #: report:sale.order:0
@@ -453,7 +477,7 @@ msgstr "sale.config.settings"
 #. module: sale
 #: selection:sale.order,order_policy:0
 msgid "Before Delivery"
-msgstr ""
+msgstr "Перед доставкой"
 
 #. module: sale
 #: code:addons/sale/sale.py:804
@@ -466,7 +490,7 @@ msgstr ""
 #. module: sale
 #: model:res.groups,name:sale.group_delivery_invoice_address
 msgid "Addresses in Sale Orders"
-msgstr ""
+msgstr "Адреса в заказах продаж"
 
 #. module: sale
 #: field:sale.order,project_id:0
@@ -496,10 +520,9 @@ msgstr ""
 #: view:sale.make.invoice:0
 #: view:sale.order.line.make.invoice:0
 msgid "or"
-msgstr ""
+msgstr "или"
 
 #. module: sale
-#: field:sale.order,invoice_exists:0
 #: field:sale.order,invoiced_rate:0
 #: field:sale.order.line,invoiced:0
 msgid "Invoiced"
@@ -508,7 +531,7 @@ msgstr "Выставлен счет"
 #. module: sale
 #: model:res.groups,name:sale.group_analytic_accounting
 msgid "Analytic Accounting for Sales"
-msgstr ""
+msgstr "Аналитические счета для продаж"
 
 #. module: sale
 #: field:sale.order,date_confirm:0
@@ -533,7 +556,7 @@ msgstr "Март"
 #. module: sale
 #: model:ir.actions.server,name:sale.actions_server_sale_order_read
 msgid "Sale: Mark read"
-msgstr ""
+msgstr "Продажа: Пометить как прочитанное"
 
 #. module: sale
 #: help:sale.order,amount_total:0
@@ -544,6 +567,7 @@ msgstr "Общая сумма."
 #: field:sale.config.settings,module_sale_journal:0
 msgid "Allow batch invoicing of delivery orders through journals"
 msgstr ""
+"Разрешить групповое выставление счета из заказов на доставку через журналы"
 
 #. module: sale
 #: field:sale.order.line,price_subtotal:0
@@ -553,7 +577,7 @@ msgstr "Подитог"
 #. module: sale
 #: field:sale.config.settings,group_discount_per_so_line:0
 msgid "Allow setting a discount on the sale order lines"
-msgstr ""
+msgstr "Разрешить настраивать скидку строкам заказа продаж"
 
 #. module: sale
 #: report:sale.order:0
@@ -601,13 +625,14 @@ msgstr "(обновление)"
 
 #. module: sale
 #: model:ir.model,name:sale.model_sale_order_line
+#: field:stock.move,sale_line_id:0
 msgid "Sales Order Line"
 msgstr "Позиция заказа продаж"
 
 #. module: sale
 #: field:sale.config.settings,module_analytic_user_function:0
 msgid "One employee can have different roles per contract"
-msgstr ""
+msgstr "Один сотрудник может иметь различные роли в различных контактах"
 
 #. module: sale
 #: view:sale.order:0
@@ -620,7 +645,6 @@ msgid "Order N°"
 msgstr "Заказ №"
 
 #. module: sale
-#: view:sale.order:0
 #: field:sale.order,order_line:0
 msgid "Order Lines"
 msgstr "Позиции заказа"
@@ -628,7 +652,7 @@ msgstr "Позиции заказа"
 #. module: sale
 #: field:account.config.settings,module_sale_analytic_plans:0
 msgid "Use multiple analytic accounts on sales"
-msgstr ""
+msgstr "Использовать несколько аналитических счетов в продажах"
 
 #. module: sale
 #: help:sale.config.settings,module_sale_journal:0
@@ -638,6 +662,10 @@ msgid ""
 "                and perform batch operations on journals.\n"
 "                This installs the module sale_journal."
 msgstr ""
+"Разрешает вам распределять ваши продажи и доставки (комплектовочные листы) "
+"по разным журналам,\n"
+"                и исполнять групповые операции на основе журналов.\n"
+"                Это устанавливает модуль sale_journal."
 
 #. module: sale
 #: field:sale.order,create_date:0
@@ -648,7 +676,7 @@ msgstr "Дата создания"
 #: code:addons/sale/sale.py:659
 #, python-format
 msgid "Sale Order for <em>%s</em> set to <b>Done</b>"
-msgstr ""
+msgstr "Заказ продаж для <em>%s</em> в статусе <b>Выполнен</b>"
 
 #. module: sale
 #: model:ir.actions.act_window,name:sale.action_order_line_tree3
@@ -690,7 +718,7 @@ msgstr ""
 #: code:addons/sale/wizard/sale_make_invoice_advance.py:92
 #, python-format
 msgid "There is no income account defined as global property."
-msgstr ""
+msgstr "Нет дебетовых счетов определенных в качестве глобального свойства."
 
 #. module: sale
 #: code:addons/sale/sale.py:984
@@ -703,7 +731,7 @@ msgstr "Ошибка конфигурации!"
 #. module: sale
 #: view:sale.order:0
 msgid "Send by Email"
-msgstr ""
+msgstr "Отправить по Email"
 
 #. module: sale
 #: code:addons/sale/res_config.py:89
@@ -718,6 +746,7 @@ msgstr "Дата заказа"
 
 #. module: sale
 #: view:sale.order.line:0
+#: field:sale.report,shipped:0
 msgid "Shipped"
 msgstr "Доставлено"
 
@@ -729,7 +758,6 @@ msgid ""
 msgstr ""
 
 #. module: sale
-#: model:ir.model,name:sale.model_res_partner
 #: view:sale.report:0
 #: field:sale.report,partner_id:0
 msgid "Partner"
@@ -738,7 +766,7 @@ msgstr "Партнёр"
 #. module: sale
 #: view:sale.advance.payment.inv:0
 msgid "Create and View Invoice"
-msgstr ""
+msgstr "Создать и просмотреть счет"
 
 #. module: sale
 #: model:ir.actions.act_window,help:sale.action_shop_form
@@ -766,7 +794,7 @@ msgid "You cannot confirm a sale order which has no line."
 msgstr "Нельзя подтвердить заказ продаж без товара"
 
 #. module: sale
-#: code:addons/sale/sale.py:966
+#: code:addons/sale/sale.py:1124
 #, python-format
 msgid ""
 "You have to select a pricelist or a customer in the sales form !\n"
@@ -785,7 +813,7 @@ msgstr "Категория продукции"
 #: code:addons/sale/sale.py:555
 #, python-format
 msgid "Cannot cancel this sales order!"
-msgstr ""
+msgstr "Нельзя отменить этот заказ продаж!"
 
 #. module: sale
 #: view:sale.order:0
@@ -798,6 +826,8 @@ msgstr "Воссоздать счет"
 msgid ""
 "In order to delete a confirmed sale order, you must cancel it before !"
 msgstr ""
+"Для того чтобы удалить утвержденный заказ продаж, вы должны сначала отменить "
+"его!"
 
 #. module: sale
 #: report:sale.order:0
@@ -807,17 +837,17 @@ msgstr "Налоги :"
 #. module: sale
 #: selection:sale.order,order_policy:0
 msgid "On Demand"
-msgstr ""
+msgstr "По запросу"
 
 #. module: sale
 #: field:sale.order,currency_id:0
 msgid "unknown"
-msgstr ""
+msgstr "неизвесно"
 
 #. module: sale
 #: field:sale.order,message_is_follower:0
 msgid "Is a Follower"
-msgstr ""
+msgstr "Подписан"
 
 #. module: sale
 #: field:sale.order,date_order:0
@@ -860,7 +890,7 @@ msgstr "Нет верной позиции в прайс листе ! :"
 #. module: sale
 #: field:sale.config.settings,module_sale_margin:0
 msgid "Display margins on sales orders"
-msgstr ""
+msgstr "Показывать прибыль в заказах продаж"
 
 #. module: sale
 #: help:sale.order,invoice_ids:0
@@ -878,6 +908,7 @@ msgid "Your Reference"
 msgstr "Ваша ссылка"
 
 #. module: sale
+#: view:sale.order:0
 #: view:sale.order.line:0
 msgid "Qty"
 msgstr "Кол-во"
@@ -889,9 +920,10 @@ msgstr "Мои позиции заказов продаж"
 
 #. module: sale
 #: model:process.transition.action,name:sale.process_transition_action_cancel0
+#: model:process.transition.action,name:sale.process_transition_action_cancel1
+#: model:process.transition.action,name:sale.process_transition_action_cancel2
 #: view:sale.advance.payment.inv:0
 #: view:sale.make.invoice:0
-#: view:sale.order:0
 #: view:sale.order.line:0
 #: view:sale.order.line.make.invoice:0
 msgid "Cancel"
@@ -912,10 +944,9 @@ msgstr ""
 
 #. module: sale
 #: model:process.transition,name:sale.process_transition_invoice0
+#: model:process.transition,name:sale.process_transition_invoiceafterdelivery0
 #: model:process.transition.action,name:sale.process_transition_action_createinvoice0
 #: view:sale.advance.payment.inv:0
-#: view:sale.order:0
-#: field:sale.order,order_policy:0
 #: view:sale.order.line:0
 msgid "Create Invoice"
 msgstr "Создать счет"
@@ -942,13 +973,14 @@ msgstr ""
 
 #. module: sale
 #: report:sale.order:0
+#: view:sale.order.line:0
 msgid "Price"
 msgstr "Цена"
 
 #. module: sale
 #: view:sale.order:0
 msgid "Quotation Number"
-msgstr ""
+msgstr "Номер предложения"
 
 #. module: sale
 #: selection:sale.order.line,type:0
@@ -963,7 +995,7 @@ msgstr "Адрес доставки :"
 #. module: sale
 #: help:account.config.settings,group_analytic_account_for_sales:0
 msgid "Allows you to specify an analytic account on sale orders."
-msgstr ""
+msgstr "Разрешает вам выбирать аналитический счет в заказе продаж."
 
 #. module: sale
 #: model:process.node,note:sale.process_node_quotation0
@@ -974,23 +1006,23 @@ msgstr "Черновик заказа продажи"
 #: code:addons/sale/sale.py:647
 #, python-format
 msgid "Quotation for <em>%s</em> <b>created</b>."
-msgstr ""
+msgstr "Предложение для <em>%s</em> <b>создано</b>."
 
 #. module: sale
 #: help:sale.order,message_ids:0
 msgid "Messages and communication history"
-msgstr ""
+msgstr "Сообщения и история общения"
 
 #. module: sale
 #: view:sale.order:0
 msgid "New Copy of Quotation"
-msgstr ""
+msgstr "Новая копия предложения"
 
 #. module: sale
 #: code:addons/sale/sale.py:1007
 #, python-format
 msgid "Cannot delete a sales order line which is in state '%s'."
-msgstr ""
+msgstr "Нельзя удалить строку заказа продаж которая в состоянии '%s'."
 
 #. module: sale
 #: model:res.groups,name:sale.group_mrp_properties
@@ -1004,6 +1036,8 @@ msgid ""
 "Before choosing a product,\n"
 " select a customer in the sales form."
 msgstr ""
+"Перед выбором продукта,\n"
+" выберите покупателя на форме продаж."
 
 #. module: sale
 #: view:sale.order:0
@@ -1036,7 +1070,7 @@ msgstr "Группировать по ..."
 #. module: sale
 #: view:sale.config.settings:0
 msgid "Product Features"
-msgstr ""
+msgstr "Характеристики продукта"
 
 #. module: sale
 #: selection:sale.order,state:0
@@ -1077,6 +1111,7 @@ msgid "Sale Order"
 msgstr "Заказ"
 
 #. module: sale
+#: view:sale.order:0
 #: field:sale.order,amount_tax:0
 #: field:sale.order.line,tax_id:0
 msgid "Taxes"
@@ -1146,13 +1181,14 @@ msgstr ""
 #. module: sale
 #: model:ir.actions.act_window,name:sale.action_sale_order_make_invoice
 #: model:ir.actions.act_window,name:sale.action_view_sale_order_line_make_invoice
+#: view:sale.order:0
 msgid "Make Invoices"
 msgstr "Сформировать счета"
 
 #. module: sale
 #: field:res.partner,sale_order_count:0
 msgid "# of Sales Order"
-msgstr ""
+msgstr "№ заказа продаж"
 
 #. module: sale
 #: view:sale.order:0
@@ -1176,11 +1212,13 @@ msgid ""
 "After clicking 'Show Lines to Invoice', select lines to invoice and create "
 "the invoice from the 'More' dropdown menu."
 msgstr ""
+"После нажатия 'Показать строки для добавления в счет', выберите строки для "
+"добавления в счет и создайте счет через выпадающее меню \"Еще\""
 
 #. module: sale
 #: help:sale.order,invoice_exists:0
 msgid "It indicates that sale order has at least one invoice."
-msgstr ""
+msgstr "Это означает что заказ продаж имеет как минимум один счет."
 
 #. module: sale
 #: selection:sale.order,state:0
@@ -1198,16 +1236,17 @@ msgstr "Сгруппировать счета"
 #, python-format
 msgid "Quotation for <em>%s</em> <b>converted</b> to Sale Order of %s %s."
 msgstr ""
+"Предложение для <em>%s</em> <b>превращено</b> в заказ продаж от %s %s."
 
 #. module: sale
 #: view:sale.advance.payment.inv:0
 msgid "Invoice Sale Order"
-msgstr ""
+msgstr "Выставить счет по заказу продаж"
 
 #. module: sale
 #: view:sale.config.settings:0
 msgid "Contracts Management"
-msgstr ""
+msgstr "Управление контрактами"
 
 #. module: sale
 #: view:sale.report:0
@@ -1250,7 +1289,7 @@ msgstr "Анализ продаж"
 
 #. module: sale
 #: model:process.node,name:sale.process_node_quotation0
-#: view:sale.order:0
+#: selection:sale.order,state:0
 #: selection:sale.report,state:0
 msgid "Quotation"
 msgstr "Предложение"
@@ -1377,7 +1416,7 @@ msgstr ""
 #. module: sale
 #: field:sale.config.settings,group_sale_pricelist:0
 msgid "Use pricelists to adapt your price per customers"
-msgstr ""
+msgstr "Используйте прайс-листы для установки персональных цен для клиентов"
 
 #. module: sale
 #: view:sale.order.line:0
@@ -1391,6 +1430,8 @@ msgid ""
 "invoice).                                              You have to choose  "
 "if you want your invoice based on ordered "
 msgstr ""
+"Заказ продаж автоматически создаст предложение счета (черновик счета). Вы "
+"должны выбрать если хотите счет основанный на заказанном "
 
 #. module: sale
 #: code:addons/sale/sale.py:435
@@ -1399,10 +1440,8 @@ msgid "Customer Invoices"
 msgstr "Счета заказчику"
 
 #. module: sale
-#: model:ir.actions.act_window,name:sale.open_board_sales
-#: model:ir.ui.menu,name:sale.menu_dashboard_sales
+#: model:ir.actions.act_window,name:sale.act_res_partner_2_sale_order
 #: model:process.process,name:sale.process_process_salesprocess0
-#: view:res.partner:0
 #: view:sale.order:0
 #: view:sale.report:0
 msgid "Sales"
@@ -1424,7 +1463,6 @@ msgid "Unit Price"
 msgstr "Цена за ед."
 
 #. module: sale
-#: view:sale.order:0
 #: selection:sale.order,state:0
 #: view:sale.order.line:0
 #: selection:sale.order.line,state:0
@@ -1433,10 +1471,8 @@ msgid "Done"
 msgstr "Сделано"
 
 #. module: sale
-#: code:addons/sale/wizard/sale_line_invoice.py:123
 #: model:process.node,name:sale.process_node_invoice0
-#: view:sale.order:0
-#, python-format
+#: model:process.node,name:sale.process_node_invoiceafterdelivery0
 msgid "Invoice"
 msgstr "Счет"
 
@@ -1471,7 +1507,7 @@ msgstr "ТМЦ"
 #. module: sale
 #: field:sale.config.settings,group_invoice_so_lines:0
 msgid "Generate invoices based on the sale order lines"
-msgstr ""
+msgstr "Сгенерировать счета основанные на строках заказа продаж"
 
 #. module: sale
 #: help:sale.order,order_policy:0
@@ -1499,7 +1535,7 @@ msgstr "Счет на"
 #. module: sale
 #: selection:sale.advance.payment.inv,advance_payment_method:0
 msgid "Fixed price (deposit)"
-msgstr ""
+msgstr "Фиксированная цена (депозит)"
 
 #. module: sale
 #: report:sale.order:0
@@ -1512,6 +1548,7 @@ msgid "Product UoS"
 msgstr "Ед.продажи товара"
 
 #. module: sale
+#: selection:sale.order,state:0
 #: selection:sale.report,state:0
 msgid "Manual In Progress"
 msgstr "Выполняется вручную"
@@ -1519,7 +1556,7 @@ msgstr "Выполняется вручную"
 #. module: sale
 #: model:ir.actions.server,name:sale.actions_server_sale_order_unread
 msgid "Sale: Mark unread"
-msgstr ""
+msgstr "Продажа: Отметить как непрочитанное"
 
 #. module: sale
 #: view:sale.order.line:0
@@ -1529,7 +1566,7 @@ msgstr "Заказ"
 #. module: sale
 #: view:sale.order:0
 msgid "Confirm Sale"
-msgstr ""
+msgstr "Подтвердить продажу"
 
 #. module: sale
 #: model:process.transition,name:sale.process_transition_saleinvoice0
@@ -1557,7 +1594,7 @@ msgstr ""
 #. module: sale
 #: selection:sale.advance.payment.inv,advance_payment_method:0
 msgid "Some order lines"
-msgstr ""
+msgstr "Некоторые строки заказа"
 
 #. module: sale
 #: view:res.partner:0
@@ -1567,7 +1604,7 @@ msgstr ""
 #. module: sale
 #: model:res.groups,name:sale.group_discount_per_so_line
 msgid "Discount on lines"
-msgstr ""
+msgstr "Скидка по строкам"
 
 #. module: sale
 #: field:sale.order,client_order_ref:0
@@ -1632,7 +1669,7 @@ msgstr "Дата подтверждения заказа продаж."
 #: code:addons/sale/sale.py:556
 #, python-format
 msgid "First cancel all invoices attached to this sales order."
-msgstr ""
+msgstr "Сначала отмените все счета прикрепленные к этому заказу продаж."
 
 #. module: sale
 #: field:sale.order,company_id:0
@@ -1660,7 +1697,7 @@ msgid "Invoice Exception"
 msgstr "Исключение счета"
 
 #. module: sale
-#: code:addons/sale/sale.py:888
+#: code:addons/sale/sale.py:1017
 #, python-format
 msgid "No Customer Defined !"
 msgstr "Заказчик не определен !"
@@ -1668,12 +1705,12 @@ msgstr "Заказчик не определен !"
 #. module: sale
 #: field:sale.order,partner_shipping_id:0
 msgid "Delivery Address"
-msgstr ""
+msgstr "Адрес доставки"
 
 #. module: sale
 #: selection:sale.order,state:0
 msgid "Sale to Invoice"
-msgstr ""
+msgstr "Продажа в счет"
 
 #. module: sale
 #: view:sale.config.settings:0
@@ -1712,6 +1749,9 @@ msgid ""
 "replenishment.\n"
 "On order: When needed, the product is purchased or produced."
 msgstr ""
+"Из запаса: Когда нужно, продукт берется из запаса или мы ожидаем пополнение "
+"запаса.\n"
+"На заказ: Когда нужно, продукт заказывается или производится."
 
 #. module: sale
 #: selection:sale.order,state:0
@@ -1733,10 +1773,11 @@ msgstr "Предложение отправлено"
 #. module: sale
 #: model:ir.model,name:sale.model_mail_compose_message
 msgid "Email composition wizard"
-msgstr ""
+msgstr "Мастер составления эл. почты"
 
 #. module: sale
 #: model:ir.actions.act_window,name:sale.action_shop_form
+#: model:ir.ui.menu,name:sale.menu_action_shop_form
 #: field:sale.order,shop_id:0
 #: view:sale.report:0
 #: field:sale.report,shop_id:0
@@ -1753,22 +1794,20 @@ msgstr "Дата подтверждения"
 #, python-format
 msgid "Please define sales journal for this company: \"%s\" (id:%d)."
 msgstr ""
+"Пожалуйста определите журнал продаж для этой компании: \"%s\" (id:%d)"
 
 #. module: sale
 #: view:sale.config.settings:0
 msgid "Contract Features"
-msgstr ""
+msgstr "Характеристики контракта"
 
 #. module: sale
-#: code:addons/sale/sale.py:273
-#: code:addons/sale/sale.py:576
 #: model:ir.model,name:sale.model_sale_order
 #: model:process.node,name:sale.process_node_order0
 #: model:process.node,name:sale.process_node_saleorder0
-#: field:res.partner,sale_order_ids:0
 #: model:res.request.link,name:sale.req_link_sale_order
 #: view:sale.order:0
-#, python-format
+#: field:stock.picking,sale_id:0
 msgid "Sales Order"
 msgstr "Заказ продаж"
 
@@ -1790,7 +1829,7 @@ msgstr "Подтвержден"
 #. module: sale
 #: field:sale.order,note:0
 msgid "Terms and conditions"
-msgstr ""
+msgstr "Условия"
 
 #. module: sale
 #: model:process.transition.action,name:sale.process_transition_action_confirm0
@@ -1800,9 +1839,10 @@ msgstr "Подтвердить"
 #. module: sale
 #: field:sale.order,message_follower_ids:0
 msgid "Followers"
-msgstr ""
+msgstr "Подписчики"
 
 #. module: sale
+#: view:sale.order:0
 #: field:sale.order.line,invoice_lines:0
 msgid "Invoice Lines"
 msgstr "Позиции счета"
@@ -1814,7 +1854,6 @@ msgid "# of Lines"
 msgstr "Кол-во позиций"
 
 #. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_line_product_tree
 #: view:sale.order:0
 #: view:sale.order.line:0
 msgid "Sales Order Lines"
@@ -1860,7 +1899,7 @@ msgstr ""
 #. module: sale
 #: selection:sale.order,order_policy:0
 msgid "On Delivery Order"
-msgstr ""
+msgstr "На основе заказа на доставку"
 
 #. module: sale
 #: view:sale.report:0
@@ -1888,7 +1927,7 @@ msgid ""
 msgstr ""
 
 #. module: sale
-#: code:addons/sale/wizard/sale_line_invoice.py:109
+#: code:addons/sale/wizard/sale_line_invoice.py:111
 #, python-format
 msgid ""
 "Invoice cannot be created for this Sales Order Line due to one of the "
@@ -1911,6 +1950,8 @@ msgid "Weight"
 msgstr "Вес"
 
 #. module: sale
+#: view:sale.open.invoice:0
+#: view:sale.order:0
 #: field:sale.order,invoice_ids:0
 msgid "Invoices"
 msgstr "Счета"
@@ -1924,7 +1965,7 @@ msgstr "Декабрь"
 #: code:addons/sale/wizard/sale_make_invoice_advance.py:96
 #, python-format
 msgid "There is no income account defined for this product: \"%s\" (id:%d)."
-msgstr ""
+msgstr "Нет дебетовых счетов определенных для этого продукта: \"%s\" (id:%d)"
 
 #. module: sale
 #: view:sale.order.line:0
@@ -1942,7 +1983,10 @@ msgid "Untaxed Amount"
 msgstr "Сумма до налогов"
 
 #. module: sale
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:202
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:163
+#: model:ir.actions.act_window,name:sale.action_view_sale_advance_payment_inv
+#: view:sale.advance.payment.inv:0
+#: view:sale.order:0
 #, python-format
 msgid "Advance Invoice"
 msgstr "Счет на предоплату"
@@ -1950,7 +1994,7 @@ msgstr "Счет на предоплату"
 #. module: sale
 #: model:ir.actions.client,name:sale.action_client_sale_menu
 msgid "Open Sale Menu"
-msgstr ""
+msgstr "Открыть меню продаж"
 
 #. module: sale
 #: selection:sale.order.line,state:0
@@ -1960,7 +2004,7 @@ msgstr "Черновик"
 #. module: sale
 #: field:sale.config.settings,module_sale_stock:0
 msgid "Trigger delivery orders automatically from sale orders"
-msgstr ""
+msgstr "Создавать заказы на доставку автоматически из заказов продаж"
 
 #. module: sale
 #: help:sale.order,amount_tax:0
@@ -1970,7 +2014,7 @@ msgstr "Сумма налога."
 #. module: sale
 #: view:sale.order:0
 msgid "Sale Order "
-msgstr ""
+msgstr "Заказ продаж "
 
 #. module: sale
 #: view:sale.order.line:0
@@ -1983,6 +2027,8 @@ msgid "Email Templates"
 msgstr "Шаблоны писем"
 
 #. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_form
+#: model:ir.ui.menu,name:sale.menu_sale_order
 #: view:sale.order:0
 msgid "Sales Orders"
 msgstr "Заказы продаж"
@@ -2002,7 +2048,7 @@ msgstr "Ноябрь"
 #: field:sale.order,message_comment_ids:0
 #: help:sale.order,message_comment_ids:0
 msgid "Comments and emails"
-msgstr ""
+msgstr "Комментарии и эл. письма"
 
 #. module: sale
 #: field:sale.advance.payment.inv,product_id:0
@@ -2020,20 +2066,20 @@ msgid "January"
 msgstr "Январь"
 
 #. module: sale
-#: model:ir.actions.act_window,name:sale.action_orders_in_progress
+#: model:ir.actions.act_window,name:sale.action_order_tree4
 msgid "Sales Order in Progress"
 msgstr "Заказы в процессе выполнения"
 
 #. module: sale
 #: field:sale.config.settings,timesheet:0
 msgid "Prepare invoices based on timesheets"
-msgstr ""
+msgstr "Подготовить счета основанные на расписаниях"
 
 #. module: sale
 #: code:addons/sale/sale.py:655
 #, python-format
 msgid "Sale Order for <em>%s</em> <b>cancelled</b>."
-msgstr ""
+msgstr "Заказ продаж для <em>%s</em> <b>отменен</b>."
 
 #. module: sale
 #: help:sale.order,origin:0
@@ -2049,12 +2095,12 @@ msgstr "Задержка по обязательствам"
 #. module: sale
 #: field:sale.report,state:0
 msgid "Order Status"
-msgstr ""
+msgstr "Статус заказа"
 
 #. module: sale
 #: view:sale.advance.payment.inv:0
 msgid "Show Lines to Invoice"
-msgstr ""
+msgstr "Показать строки для выставления в счет"
 
 #. module: sale
 #: field:sale.report,date:0
@@ -2086,7 +2132,7 @@ msgstr "Нет прайс-листа ! : "
 #: model:ir.actions.act_window,name:sale.action_orders
 #: model:ir.ui.menu,name:sale.menu_sale_order
 msgid "Sale Orders"
-msgstr ""
+msgstr "Заказы продаж"
 
 #. module: sale
 #: field:sale.config.settings,module_account_analytic_analysis:0
@@ -2199,6 +2245,7 @@ msgid "Quotation N°"
 msgstr "Предложение №"
 
 #. module: sale
+#: field:sale.order,picked_rate:0
 #: view:sale.report:0
 msgid "Picked"
 msgstr "Скомплектовано"
diff --git a/addons/sale/i18n/sl.po b/addons/sale/i18n/sl.po
index 49ccd62f6f5..c9783b962e5 100644
--- a/addons/sale/i18n/sl.po
+++ b/addons/sale/i18n/sl.po
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2012-12-03 16:02+0000\n"
-"PO-Revision-Date: 2012-12-04 14:05+0000\n"
+"PO-Revision-Date: 2012-12-05 10:46+0000\n"
 "Last-Translator: Vida Potočnik <vida.potocnik@mentis.si>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-05 05:20+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-06 04:40+0000\n"
+"X-Generator: Launchpad (build 16341)\n"
 
 #. module: sale
 #: model:ir.model,name:sale.model_account_config_settings
@@ -27,6 +27,8 @@ msgid ""
 "Sale Order Lines that are confirmed, done or in exception state and haven't "
 "yet been invoiced"
 msgstr ""
+"Pozicije prodajnega naloga, ko so potrjene, zaključene ali s statusom "
+"\"izjema\" in še niso fakturirane"
 
 #. module: sale
 #: view:sale.order:0
@@ -221,7 +223,7 @@ msgstr ""
 #. module: sale
 #: view:sale.order:0
 msgid "Sales Order done"
-msgstr ""
+msgstr "Prodajni nalog zaključen"
 
 #. module: sale
 #: model:ir.actions.act_window,name:sale.act_res_partner_2_sale_order
diff --git a/addons/web/i18n/nl.po b/addons/web/i18n/nl.po
index 26af41b2a8f..976c8143f12 100644
--- a/addons/web/i18n/nl.po
+++ b/addons/web/i18n/nl.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openerp-web\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-11-30 18:13+0000\n"
-"PO-Revision-Date: 2012-11-25 07:07+0000\n"
+"PO-Revision-Date: 2012-12-05 18:18+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: 2012-12-01 05:20+0000\n"
-"X-Generator: Launchpad (build 16319)\n"
+"X-Launchpad-Export-Date: 2012-12-06 04:54+0000\n"
+"X-Generator: Launchpad (build 16341)\n"
 
 #. module: web
 #. openerp-web
@@ -59,7 +59,7 @@ msgstr "is kleiner of gelijk aan"
 #: code:addons/web/static/src/js/chrome.js:393
 #, python-format
 msgid "Please enter your previous password"
-msgstr ""
+msgstr "Geef uw vorige wachtwoord in"
 
 #. module: web
 #. openerp-web
@@ -82,7 +82,7 @@ msgstr "Wijzig hoofdwachtwoord"
 #: code:addons/web/static/src/js/chrome.js:491
 #, python-format
 msgid "Do you really want to delete the database: %s ?"
-msgstr ""
+msgstr "Weet u zeker dat u database %s wilt verwijderen?"
 
 #. module: web
 #. openerp-web
@@ -96,7 +96,7 @@ msgstr "Zoek %(field)s bij: %(value)s"
 #: code:addons/web/static/src/js/chrome.js:537
 #, python-format
 msgid "Access Denied"
-msgstr ""
+msgstr "Toegang geweigerd"
 
 #. module: web
 #. openerp-web
@@ -120,7 +120,7 @@ msgstr "Back-up database"
 #: code:addons/web/static/src/js/dates.js:53
 #, python-format
 msgid "'%s' is not a valid date"
-msgstr ""
+msgstr "'%s' is geen geldige datum"
 
 #. module: web
 #. openerp-web
@@ -147,7 +147,7 @@ msgstr "Bestand"
 #: code:addons/web/controllers/main.py:842
 #, python-format
 msgid "You cannot leave any password empty."
-msgstr ""
+msgstr "Het is niet toegestaan om de wachtwoord velden leeg te laten."
 
 #. module: web
 #. openerp-web
@@ -206,7 +206,7 @@ msgstr "M2O zoek velden behandelen momenteel geen meerdere standaard waardes"
 #: code:addons/web/static/src/js/view_form.js:1242
 #, python-format
 msgid "Widget type '%s' is not implemented"
-msgstr ""
+msgstr "Widget type '%s' is niet geimplementeerd"
 
 #. module: web
 #. openerp-web
@@ -235,7 +235,7 @@ msgstr "(no string)"
 #: code:addons/web/static/src/js/formats.js:282
 #, python-format
 msgid "'%s' is not a correct time"
-msgstr ""
+msgstr "'%s' is geen geldige tijd"
 
 #. module: web
 #. openerp-web
@@ -334,7 +334,7 @@ msgstr "Wachtwoord wijzigen"
 #: code:addons/web/static/src/js/view_form.js:3382
 #, python-format
 msgid "View type '%s' is not supported in One2Many."
-msgstr ""
+msgstr "Weergave type '%s' wordt niet ondersteund in One2Many."
 
 #. module: web
 #. openerp-web
@@ -349,7 +349,7 @@ msgstr "Downloaden"
 #: code:addons/web/static/src/js/formats.js:266
 #, python-format
 msgid "'%s' is not a correct datetime"
-msgstr ""
+msgstr "'%s' is geen geldinge datum/tijd"
 
 #. module: web
 #. openerp-web
@@ -377,13 +377,13 @@ msgstr "Selectie:"
 #: code:addons/web/static/src/js/view_form.js:869
 #, python-format
 msgid "The following fields are invalid:"
-msgstr ""
+msgstr "De volgende velden zijn ongeldig:"
 
 #. module: web
 #: code:addons/web/controllers/main.py:863
 #, python-format
 msgid "Languages"
-msgstr ""
+msgstr "Talen"
 
 #. module: web
 #. openerp-web
@@ -404,7 +404,7 @@ msgstr "Importeren"
 #: code:addons/web/static/src/js/chrome.js:543
 #, python-format
 msgid "Could not restore the database"
-msgstr ""
+msgstr "Het was niet mogelijk om de database te herstellen"
 
 #. module: web
 #. openerp-web
@@ -517,7 +517,7 @@ msgstr "Niet ondersteunde operator %s in domein %s"
 #: code:addons/web/static/src/js/formats.js:242
 #, python-format
 msgid "'%s' is not a correct float"
-msgstr ""
+msgstr "'%s' is geen correcte float"
 
 #. module: web
 #. openerp-web
@@ -531,7 +531,7 @@ msgstr "Teruggezet"
 #: code:addons/web/static/src/js/view_list.js:392
 #, python-format
 msgid "%d-%d of %d"
-msgstr ""
+msgstr "%d-%d of %d"
 
 #. module: web
 #. openerp-web
@@ -545,7 +545,7 @@ msgstr "Aanmaken en Bewerken..."
 #: code:addons/web/static/src/js/pyeval.js:731
 #, python-format
 msgid "Unknown nonliteral type "
-msgstr ""
+msgstr "Onbekend nonliteral type "
 
 #. module: web
 #. openerp-web
@@ -573,7 +573,7 @@ msgstr "Afdrukken Workflow"
 #: code:addons/web/static/src/js/chrome.js:396
 #, python-format
 msgid "Please confirm your new password"
-msgstr ""
+msgstr "Bevestig uw wachtwoord"
 
 #. module: web
 #. openerp-web
@@ -622,7 +622,7 @@ msgstr "Model %s velden"
 #: code:addons/web/static/src/js/view_list.js:890
 #, python-format
 msgid "Setting 'id' attribute on existing record %s"
-msgstr ""
+msgstr "Instellen van 'id' attribute op bestaand record %s"
 
 #. module: web
 #. openerp-web
@@ -667,6 +667,8 @@ msgstr "Action ID:"
 #, python-format
 msgid "Your user's preference timezone does not match your browser timezone:"
 msgstr ""
+"De tijdzone in uw gebruikersvoorkeuren komt niet overheen met de tijdzone "
+"van uw browser:"
 
 #. module: web
 #. openerp-web
@@ -674,6 +676,7 @@ msgstr ""
 #, python-format
 msgid "Field '%s' specified in view could not be found."
 msgstr ""
+"Veld '%s' welke in de weergave is gespecificeerd kon niet worden gevonden."
 
 #. module: web
 #. openerp-web
@@ -701,7 +704,7 @@ msgstr "Bytes,Kb,Mb,Gb,Tb,Pb,Eb,Zb,Yb"
 #: code:addons/web/static/src/js/chrome.js:481
 #, python-format
 msgid "The database has been duplicated."
-msgstr ""
+msgstr "De database is gedupliceerd."
 
 #. module: web
 #. openerp-web
@@ -793,7 +796,7 @@ msgstr "Veldscheidingsteken:"
 #: code:addons/web/static/src/xml/base.xml:458
 #, python-format
 msgid "Browser's timezone"
-msgstr ""
+msgstr "Tijdzone van de browser"
 
 #. module: web
 #. openerp-web
@@ -859,7 +862,7 @@ msgstr "Voorkeuren"
 #: code:addons/web/static/src/js/view_form.js:434
 #, python-format
 msgid "Wrong on change format: %s"
-msgstr ""
+msgstr "Fout bij het wijzigen van het formaat: %s"
 
 #. module: web
 #. openerp-web
@@ -874,7 +877,7 @@ msgstr "Verwijder Database"
 #: code:addons/web/static/src/xml/base.xml:462
 #, python-format
 msgid "Click here to change your user's timezone."
-msgstr ""
+msgstr "Klik hier om uw tijdzone te wijzigen."
 
 #. module: web
 #. openerp-web
@@ -920,21 +923,21 @@ msgstr "Gebruikersnaam"
 #: code:addons/web/static/src/js/chrome.js:481
 #, python-format
 msgid "Duplicating database"
-msgstr ""
+msgstr "Dupliceer database"
 
 #. module: web
 #. openerp-web
 #: code:addons/web/static/src/js/chrome.js:563
 #, python-format
 msgid "Password has been changed successfully"
-msgstr ""
+msgstr "Uw wachtwoord is succesvol gewijzigd."
 
 #. module: web
 #. openerp-web
 #: code:addons/web/static/src/js/view_list_editable.js:781
 #, python-format
 msgid "The form's data can not be discarded"
-msgstr ""
+msgstr "De gegevens van het formulier kunnen niet worden verwijderd."
 
 #. module: web
 #. openerp-web
@@ -969,6 +972,10 @@ msgid ""
 "\n"
 "%s"
 msgstr ""
+"Locale evaluatie fout\n"
+"%s\n"
+"\n"
+"%s"
 
 #. module: web
 #. openerp-web
@@ -1003,7 +1010,7 @@ msgstr "Aanmaakdatum:"
 #: code:addons/web/controllers/main.py:851
 #, python-format
 msgid "Error, password not changed !"
-msgstr ""
+msgstr "Fout, uw wachtwoord is niet gewijzigd!"
 
 #. module: web
 #. openerp-web
@@ -1026,7 +1033,7 @@ msgstr "/web/binary/upload_attachment"
 #: code:addons/web/static/src/js/chrome.js:563
 #, python-format
 msgid "Changed Password"
-msgstr ""
+msgstr "Wachtwoord gewijzigd"
 
 #. module: web
 #. openerp-web
@@ -1060,14 +1067,14 @@ msgstr "Backup"
 #: code:addons/web/static/src/js/dates.js:80
 #, python-format
 msgid "'%s' is not a valid time"
-msgstr ""
+msgstr "'%s' is geen geldige tijd"
 
 #. module: web
 #. openerp-web
 #: code:addons/web/static/src/js/formats.js:274
 #, python-format
 msgid "'%s' is not a correct date"
-msgstr ""
+msgstr "'%s' is geen correcte datum"
 
 #. module: web
 #. openerp-web
@@ -1121,7 +1128,7 @@ msgstr "Laatst aangepast door:"
 #: code:addons/web/static/src/xml/base.xml:466
 #, python-format
 msgid "Timezone mismatch"
-msgstr ""
+msgstr "Tijdzone fout"
 
 #. module: web
 #. openerp-web
@@ -1189,7 +1196,7 @@ msgstr "Geavanceerd filter toevoegen"
 #: code:addons/web/controllers/main.py:844
 #, python-format
 msgid "The new password and its confirmation must be identical."
-msgstr ""
+msgstr "Het nieuwe wachtwoord en haar bevestiging moeten identiek zijn."
 
 #. module: web
 #. openerp-web
@@ -1204,7 +1211,7 @@ msgstr "Herstel database"
 #: code:addons/web/static/src/js/chrome.js:645
 #, python-format
 msgid "Login"
-msgstr ""
+msgstr "Inloggen"
 
 #. module: web
 #. openerp-web
@@ -1247,7 +1254,7 @@ msgstr "Groepeer op: %s"
 #: code:addons/web/static/src/js/view_form.js:151
 #, python-format
 msgid "No data provided."
-msgstr ""
+msgstr "Geen gegevens ingevoerd"
 
 #. module: web
 #. openerp-web
@@ -1318,7 +1325,7 @@ msgstr "%(page)d/%(page_count)d"
 #: code:addons/web/static/src/js/chrome.js:397
 #, python-format
 msgid "The confirmation does not match the password"
-msgstr ""
+msgstr "De bevestiging komt niet overeen met het wachtwoord"
 
 #. module: web
 #. openerp-web
@@ -1357,7 +1364,7 @@ msgstr ""
 #: code:addons/web/static/src/xml/base.xml:393
 #, python-format
 msgid "99+"
-msgstr ""
+msgstr "99+"
 
 #. module: web
 #. openerp-web
@@ -1371,7 +1378,7 @@ msgstr "1. Importeer een .CSV bestand"
 #: code:addons/web/static/src/js/chrome.js:645
 #, python-format
 msgid "No database selected !"
-msgstr ""
+msgstr "Geen database geselecteerd!"
 
 #. module: web
 #. openerp-web
@@ -1409,7 +1416,7 @@ msgstr "is gelijk aan"
 #: code:addons/web/static/src/js/views.js:1455
 #, python-format
 msgid "Could not serialize XML"
-msgstr ""
+msgstr "Could not serialize XML"
 
 #. module: web
 #. openerp-web
@@ -1516,14 +1523,14 @@ msgstr "Boomstructuur"
 #: code:addons/web/controllers/main.py:766
 #, python-format
 msgid "Could not drop database !"
-msgstr ""
+msgstr "De database kon niet worden verwijderd!"
 
 #. module: web
 #. openerp-web
 #: code:addons/web/static/src/js/formats.js:227
 #, python-format
 msgid "'%s' is not a correct integer"
-msgstr ""
+msgstr "'%s' is geen correct geheel getal (integer)"
 
 #. module: web
 #. openerp-web
@@ -1544,7 +1551,7 @@ msgstr "Onbekend veld %s in domein %s"
 #: code:addons/web/static/src/js/views.js:1421
 #, python-format
 msgid "Node [%s] is not a JSONified XML node"
-msgstr ""
+msgstr "Node [%s] is geen JSONified XML node"
 
 #. module: web
 #. openerp-web
@@ -1558,7 +1565,7 @@ msgstr "Geavanceerd zoeken..."
 #: code:addons/web/static/src/js/chrome.js:499
 #, python-format
 msgid "Dropping database"
-msgstr ""
+msgstr "Database verwijderen"
 
 #. module: web
 #. openerp-web
@@ -1623,7 +1630,7 @@ msgstr "%d jaar geleden"
 #: code:addons/web/static/src/js/view_list.js:1019
 #, python-format
 msgid "Unknown m2m command %s"
-msgstr ""
+msgstr "Onbekend m2m commando %s"
 
 #. module: web
 #. openerp-web
@@ -1646,14 +1653,14 @@ msgstr "Naam nieuwe database:"
 #: code:addons/web/static/src/js/chrome.js:394
 #, python-format
 msgid "Please enter your new password"
-msgstr ""
+msgstr "Vul uw nieuwe wachtwoord in"
 
 #. module: web
 #. openerp-web
 #: code:addons/web/static/src/js/views.js:1463
 #, python-format
 msgid "Could not parse string to xml"
-msgstr ""
+msgstr "Could not parse string to xml"
 
 #. module: web
 #. openerp-web
@@ -1760,7 +1767,7 @@ msgstr "Weergeven velden"
 #: code:addons/web/static/src/xml/base.xml:330
 #, python-format
 msgid "Confirm New Password:"
-msgstr ""
+msgstr "Bevestig nieuw wachtwoord"
 
 #. module: web
 #. openerp-web
@@ -1932,7 +1939,7 @@ msgstr "Soort:"
 #: code:addons/web/static/src/js/chrome.js:538
 #, python-format
 msgid "Incorrect super-administrator password"
-msgstr ""
+msgstr "Het super-administrator wachtwoord is incorrect."
 
 #. module: web
 #. openerp-web
@@ -1974,6 +1981,8 @@ msgid ""
 "The type of the field '%s' must be a many2many field with a relation to "
 "'ir.attachment' model."
 msgstr ""
+"Het type van het veld '%s' moet een many2many veld zijn met een relatie naar "
+"het 'ir.attachment' model."
 
 #. module: web
 #. openerp-web
@@ -2038,14 +2047,14 @@ msgstr "Demonstratiegegevens laden:"
 #: code:addons/web/static/src/js/dates.js:26
 #, python-format
 msgid "'%s' is not a valid datetime"
-msgstr ""
+msgstr "'%s' is geen correcte datum/tijd"
 
 #. module: web
 #. openerp-web
 #: code:addons/web/static/src/js/views.js:1471
 #, python-format
 msgid "Could not find a DOM Parser: %s"
-msgstr ""
+msgstr "Kon geen DOM Parser: %s vinden"
 
 #. module: web
 #. openerp-web
@@ -2125,14 +2134,14 @@ msgstr "Download \"%s\""
 #: code:addons/web/static/src/js/view_form.js:324
 #, python-format
 msgid "New"
-msgstr ""
+msgstr "Nieuw"
 
 #. module: web
 #. openerp-web
 #: code:addons/web/static/src/js/view_list.js:1746
 #, python-format
 msgid "Can't convert value %s to context"
-msgstr ""
+msgstr "Niet mogelijk om de waarde %s te converteren."
 
 #. module: web
 #. openerp-web
@@ -2205,13 +2214,13 @@ msgstr "Over OpenERP"
 #: code:addons/web/static/src/js/formats.js:297
 #, python-format
 msgid "'%s' is not a correct date, datetime nor time"
-msgstr ""
+msgstr "'%s' is is geen correcte datum, datum/tijd of tijd."
 
 #. module: web
 #: code:addons/web/controllers/main.py:1306
 #, python-format
 msgid "No content found for field '%s' on '%s:%s'"
-msgstr ""
+msgstr "Geen inhoud gevonden voor veld '%s' bij '%s:%s'"
 
 #. module: web
 #. openerp-web
@@ -2239,7 +2248,7 @@ msgstr "Beheer administraties"
 #: code:addons/web/static/src/js/pyeval.js:765
 #, python-format
 msgid "Evaluation Error"
-msgstr ""
+msgstr "Evaluatie fout"
 
 #. module: web
 #. openerp-web
@@ -2273,6 +2282,7 @@ msgstr "Nee"
 #, python-format
 msgid "'%s' is not convertible to date, datetime nor time"
 msgstr ""
+"'%s' is niet converteerbaar naar een datum, een datum/tijd of een tijd"
 
 #. module: web
 #. openerp-web
@@ -2347,7 +2357,7 @@ msgstr "Het veld is leeg. Er is niets om op te slaan!"
 #: code:addons/web/static/src/js/view_list.js:1327
 #, python-format
 msgid "%s (%d)"
-msgstr ""
+msgstr "%s (%d)"
 
 #. module: web
 #. openerp-web
@@ -2410,7 +2420,7 @@ msgstr "Weet u zeker dat u deze bijlage wilt verwijderen?"
 #: code:addons/web/static/src/js/views.js:838
 #, python-format
 msgid "Technical Translation"
-msgstr ""
+msgstr "Technische vertaling"
 
 #. module: web
 #. openerp-web
@@ -2424,14 +2434,14 @@ msgstr "Veld:"
 #: code:addons/web/static/src/js/chrome.js:499
 #, python-format
 msgid "The database %s has been dropped"
-msgstr ""
+msgstr "Database %s is verwijderd"
 
 #. module: web
 #. openerp-web
 #: code:addons/web/static/src/xml/base.xml:456
 #, python-format
 msgid "User's timezone"
-msgstr ""
+msgstr "Gebruikers tijdzone"
 
 #. module: web
 #. openerp-web
@@ -2461,6 +2471,8 @@ msgstr "Special:"
 msgid ""
 "The old password you provided is incorrect, your password was not changed."
 msgstr ""
+"Het oude wachtwoord wat u heft ingevoerd is niet correct. Uw wachtwoord is "
+"niet gewijzigd."
 
 #. module: web
 #. openerp-web
diff --git a/addons/web/i18n/pt.po b/addons/web/i18n/pt.po
index 7fbfa8bb178..2f23aadfef2 100644
--- a/addons/web/i18n/pt.po
+++ b/addons/web/i18n/pt.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openerp-web\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-11-30 18:13+0000\n"
-"PO-Revision-Date: 2012-12-04 12:09+0000\n"
-"Last-Translator: Andrei Talpa (multibase.pt) <andrei.talpa@multibase.pt>\n"
+"PO-Revision-Date: 2012-12-05 10:11+0000\n"
+"Last-Translator: Rui Franco (multibase.pt) <Unknown>\n"
 "Language-Team: Portuguese <pt@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-05 05:42+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-06 04:54+0000\n"
+"X-Generator: Launchpad (build 16341)\n"
 
 #. module: web
 #. openerp-web
@@ -29,21 +29,21 @@ msgstr "Idioma predefinido:"
 #: code:addons/web/static/src/js/coresetup.js:593
 #, python-format
 msgid "%d minutes ago"
-msgstr "%d minutos atrás"
+msgstr "há %d minutos"
 
 #. module: web
 #. openerp-web
 #: code:addons/web/static/src/js/coresetup.js:621
 #, python-format
 msgid "Still loading...<br />Please be patient."
-msgstr "A carregar...<br />Por favor aguarde."
+msgstr "Carregando...<br />Por favor, aguarde."
 
 #. module: web
 #. openerp-web
 #: code:addons/web/static/src/js/search.js:1834
 #, python-format
 msgid "%(field)s %(operator)s \"%(value)s\""
-msgstr "%(field)s %(operator)s \"%(value)s\""
+msgstr ""
 
 #. module: web
 #. openerp-web
@@ -59,7 +59,7 @@ msgstr "menor ou igual a"
 #: code:addons/web/static/src/js/chrome.js:393
 #, python-format
 msgid "Please enter your previous password"
-msgstr "Por favor, introduza a sua Senha atual"
+msgstr "Por favor, indique a sua senha atual"
 
 #. module: web
 #. openerp-web
@@ -68,35 +68,35 @@ msgstr "Por favor, introduza a sua Senha atual"
 #: code:addons/web/static/src/xml/base.xml:282
 #, python-format
 msgid "Master password:"
-msgstr "Palavra chave de administração:"
+msgstr "Senha de administração"
 
 #. module: web
 #. openerp-web
 #: code:addons/web/static/src/xml/base.xml:274
 #, python-format
 msgid "Change Master Password"
-msgstr "Alterar a Senha Principal"
+msgstr "Alterar a senha de administração"
 
 #. module: web
 #. openerp-web
 #: code:addons/web/static/src/js/chrome.js:491
 #, python-format
 msgid "Do you really want to delete the database: %s ?"
-msgstr "Confirma que pretende remover a base de dados: %s?"
+msgstr "Quer mesmo apagar a base de dados: %s?"
 
 #. module: web
 #. openerp-web
 #: code:addons/web/static/src/js/search.js:1400
 #, python-format
 msgid "Search %(field)s at: %(value)s"
-msgstr "Pesquisar %(field)s em: %(value)s"
+msgstr ""
 
 #. module: web
 #. openerp-web
 #: code:addons/web/static/src/js/chrome.js:537
 #, python-format
 msgid "Access Denied"
-msgstr "Acesso Negado"
+msgstr "Acesso negado"
 
 #. module: web
 #. openerp-web
@@ -112,7 +112,7 @@ msgstr "cerca de uma hora atrás"
 #: code:addons/web/static/src/xml/base.xml:216
 #, python-format
 msgid "Backup Database"
-msgstr "Salvaguarda da Base de Dados"
+msgstr "Fazer cópia de segurança da base de dados"
 
 #. module: web
 #. openerp-web
@@ -127,14 +127,14 @@ msgstr "%s não é uma data válida"
 #: code:addons/web/static/src/xml/base.xml:1812
 #, python-format
 msgid "Here is a preview of the file we could not import:"
-msgstr "Aqui está uma previsão do ficheiro que não conseguiu ser importado:"
+msgstr "Aqui está uma antevisão do ficheiro que não pode ser importado:"
 
 #. module: web
 #. openerp-web
 #: code:addons/web/static/src/js/coresetup.js:592
 #, python-format
 msgid "about a minute ago"
-msgstr ""
+msgstr "cerca de um minuto atrás"
 
 #. module: web
 #. openerp-web
@@ -147,14 +147,14 @@ msgstr "Ficheiro"
 #: code:addons/web/controllers/main.py:842
 #, python-format
 msgid "You cannot leave any password empty."
-msgstr ""
+msgstr "Não pode deixar qualquer senha em branco."
 
 #. module: web
 #. openerp-web
 #: code:addons/web/static/src/js/chrome.js:681
 #, python-format
 msgid "Invalid username or password"
-msgstr "Nome e palavra chave inválidos"
+msgstr "Nome de utilizador ou senha inválidos"
 
 #. module: web
 #. openerp-web
@@ -163,7 +163,7 @@ msgstr "Nome e palavra chave inválidos"
 #: code:addons/web/static/src/xml/base.xml:260
 #, python-format
 msgid "Master Password:"
-msgstr "Palavra Chave de Administração:"
+msgstr "Senha de administração"
 
 #. module: web
 #. openerp-web
@@ -178,7 +178,7 @@ msgstr "Selecionar"
 #: code:addons/web/static/src/js/chrome.js:549
 #, python-format
 msgid "Database restored successfully"
-msgstr "Base de dados restaurada com sucesso"
+msgstr ""
 
 #. module: web
 #. openerp-web
@@ -192,7 +192,7 @@ msgstr "Versão"
 #: code:addons/web/static/src/xml/base.xml:564
 #, python-format
 msgid "Latest Modification Date:"
-msgstr "Data da Ultima Modificação:"
+msgstr "Data da modificação mais recente:"
 
 #. module: web
 #. openerp-web
@@ -235,7 +235,7 @@ msgstr "(sem texto)"
 #: code:addons/web/static/src/js/formats.js:282
 #, python-format
 msgid "'%s' is not a correct time"
-msgstr ""
+msgstr "'%s' não é uma hora correta"
 
 #. module: web
 #. openerp-web
@@ -249,7 +249,7 @@ msgstr "não é um número válido"
 #: code:addons/web/static/src/xml/base.xml:325
 #, python-format
 msgid "New Password:"
-msgstr "Nova Palavra-chave:"
+msgstr "Nova senha:"
 
 #. module: web
 #. openerp-web
@@ -277,7 +277,7 @@ msgstr "Carregar ficheiro"
 #: code:addons/web/static/src/js/coresetup.js:598
 #, python-format
 msgid "about a month ago"
-msgstr ""
+msgstr "cerca de um mês atrás"
 
 #. module: web
 #. openerp-web
@@ -291,7 +291,7 @@ msgstr "Filtros personalizados"
 #: code:addons/web/static/src/xml/base.xml:1311
 #, python-format
 msgid "Button Type:"
-msgstr "Tipo de Botão:"
+msgstr "Tipo de botão:"
 
 #. module: web
 #. openerp-web
@@ -312,7 +312,7 @@ msgstr "Filtro personalizado"
 #: code:addons/web/static/src/xml/base.xml:159
 #, python-format
 msgid "Duplicate Database"
-msgstr "Duplicar a Base de Dados"
+msgstr "Duplicar a base de dados"
 
 #. module: web
 #. openerp-web
@@ -327,14 +327,15 @@ msgstr "Duplicar a Base de Dados"
 #: code:addons/web/static/src/xml/base.xml:336
 #, python-format
 msgid "Change Password"
-msgstr "Alterar Palavra-chave"
+msgstr "Alterar senha"
 
 #. module: web
 #. openerp-web
 #: code:addons/web/static/src/js/view_form.js:3382
 #, python-format
 msgid "View type '%s' is not supported in One2Many."
-msgstr "Tipo de vista '%s' n˜ao ´e suportador numa relaç˜ao 'Um para Muitos'"
+msgstr ""
+"Tipo de vista '%s' não suportado numa relação do tipo 'Um para Muitos'"
 
 #. module: web
 #. openerp-web
@@ -349,7 +350,7 @@ msgstr "Transferir"
 #: code:addons/web/static/src/js/formats.js:266
 #, python-format
 msgid "'%s' is not a correct datetime"
-msgstr ""
+msgstr "'%s' não é uma Data/Hora correta"
 
 #. module: web
 #. openerp-web
@@ -383,14 +384,14 @@ msgstr "Os seguintes campos são inválidos:"
 #: code:addons/web/controllers/main.py:863
 #, python-format
 msgid "Languages"
-msgstr "Línguas"
+msgstr "Idiomas"
 
 #. module: web
 #. openerp-web
 #: code:addons/web/static/src/xml/base.xml:1245
 #, python-format
 msgid "...Upload in progress..."
-msgstr ""
+msgstr "...Transferência em progresso..."
 
 #. module: web
 #. openerp-web
@@ -411,14 +412,14 @@ msgstr "Não foi possível recuperar a base de dados"
 #: code:addons/web/static/src/js/view_form.js:4811
 #, python-format
 msgid "File upload"
-msgstr ""
+msgstr "Transferência de ficheiro"
 
 #. module: web
 #. openerp-web
 #: code:addons/web/static/src/js/view_form.js:3775
 #, python-format
 msgid "Action Button"
-msgstr ""
+msgstr "Botão de ação"
 
 #. module: web
 #. openerp-web
@@ -441,6 +442,7 @@ msgstr "contém"
 #, python-format
 msgid "Take a minute to get a coffee,<br />because it's loading..."
 msgstr ""
+"Aproveite para ir dar uma volta,<br />porque a operação pode demorar..."
 
 #. module: web
 #. openerp-web
@@ -454,21 +456,21 @@ msgstr "Activar o modo de programador"
 #: code:addons/web/static/src/js/chrome.js:324
 #, python-format
 msgid "Loading (%d)"
-msgstr "A Atualizar (%d)"
+msgstr "Carregando (%d)"
 
 #. module: web
 #. openerp-web
 #: code:addons/web/static/src/js/search.js:1116
 #, python-format
 msgid "GroupBy"
-msgstr ""
+msgstr "Agrupar por"
 
 #. module: web
 #. openerp-web
 #: code:addons/web/static/src/js/view_list.js:684
 #, python-format
 msgid "You must select at least one record."
-msgstr "Tem de seleccionar pelo menos um registo."
+msgstr "Tem de selecionar pelo menos um registo."
 
 #. module: web
 #. openerp-web
@@ -482,7 +484,7 @@ msgstr "Ver Registo (perm_read)"
 #: code:addons/web/static/src/js/view_form.js:1059
 #, python-format
 msgid "Set Default"
-msgstr "Definir como Padrão"
+msgstr "Definir como padrão"
 
 #. module: web
 #. openerp-web
@@ -538,7 +540,7 @@ msgstr "%d-%d de %d"
 #: code:addons/web/static/src/js/view_form.js:2841
 #, python-format
 msgid "Create and Edit..."
-msgstr "Criar e Editar"
+msgstr "Criar e editar"
 
 #. module: web
 #. openerp-web
@@ -566,7 +568,7 @@ msgstr "não é"
 #: code:addons/web/static/src/xml/base.xml:544
 #, python-format
 msgid "Print Workflow"
-msgstr ""
+msgstr "Imprimir fluxo de trabalho"
 
 #. module: web
 #. openerp-web
@@ -601,14 +603,14 @@ msgstr ""
 #: code:addons/web/static/src/xml/base.xml:1658
 #, python-format
 msgid "Export Formats"
-msgstr "Formatos de Exportação"
+msgstr "Formatos de exportação"
 
 #. module: web
 #. openerp-web
 #: code:addons/web/static/src/xml/base.xml:952
 #, python-format
 msgid "On change:"
-msgstr "Quando altera:"
+msgstr "Aquando de uma alteração:"
 
 #. module: web
 #. openerp-web
@@ -638,14 +640,14 @@ msgstr "Lista"
 #: code:addons/web/static/src/js/search.js:1942
 #, python-format
 msgid "greater than"
-msgstr "maior que"
+msgstr "maior do que"
 
 #. module: web
 #. openerp-web
 #: code:addons/web/static/src/xml/base.xml:540
 #, python-format
 msgid "View"
-msgstr "Visualizar"
+msgstr "Vista"
 
 #. module: web
 #. openerp-web
@@ -659,7 +661,7 @@ msgstr "Guardar filtro"
 #: code:addons/web/static/src/xml/base.xml:1319
 #, python-format
 msgid "Action ID:"
-msgstr "ID da Acção:"
+msgstr "ID da ação:"
 
 #. module: web
 #. openerp-web
@@ -667,6 +669,7 @@ msgstr "ID da Acção:"
 #, python-format
 msgid "Your user's preference timezone does not match your browser timezone:"
 msgstr ""
+"O seu fuso horário não coincide com o que está definido no \"browser\":"
 
 #. module: web
 #. openerp-web
@@ -680,14 +683,14 @@ msgstr ""
 #: code:addons/web/static/src/xml/base.xml:1731
 #, python-format
 msgid "Saved exports:"
-msgstr "Exportações Guardadas:"
+msgstr "Exportações guardadas:"
 
 #. module: web
 #. openerp-web
 #: code:addons/web/static/src/xml/base.xml:320
 #, python-format
 msgid "Old Password:"
-msgstr "Palavra-chave antiga"
+msgstr "Senha antiga"
 
 #. module: web
 #. openerp-web
@@ -715,7 +718,7 @@ msgstr "Aplicar"
 #: code:addons/web/static/src/xml/base.xml:1361
 #, python-format
 msgid "Save & New"
-msgstr "Guardar & Novo"
+msgstr ""
 
 #. module: web
 #. openerp-web
@@ -723,7 +726,7 @@ msgstr "Guardar & Novo"
 #: code:addons/web/static/src/xml/base.xml:1200
 #, python-format
 msgid "Save As"
-msgstr "Guardar Como"
+msgstr "Guardar como"
 
 #. module: web
 #. openerp-web
@@ -737,7 +740,7 @@ msgstr ""
 #: code:addons/web/static/src/js/coresetup.js:596
 #, python-format
 msgid "a day ago"
-msgstr "há um dia atrás"
+msgstr "há um dia"
 
 #. module: web
 #. openerp-web
@@ -764,7 +767,7 @@ msgid ""
 msgstr ""
 "Atenção, o registo foi modificado, as suas alterações vão ser descartadas.\n"
 "\n"
-"Tem a certeza que quer sair desta página?"
+"Tem a certeza de que quer sair desta página?"
 
 #. module: web
 #. openerp-web
@@ -792,7 +795,7 @@ msgstr "Delimitador:"
 #: code:addons/web/static/src/xml/base.xml:458
 #, python-format
 msgid "Browser's timezone"
-msgstr ""
+msgstr "Fuso horário do \"browser\""
 
 #. module: web
 #. openerp-web
@@ -837,7 +840,7 @@ msgstr "OpenERP.com"
 #: code:addons/web/static/src/js/view_form.js:2316
 #, python-format
 msgid "Can't send email to invalid e-mail address"
-msgstr ""
+msgstr "É impossível enviar uma mensagem para um endereço inválido"
 
 #. module: web
 #. openerp-web
@@ -866,7 +869,7 @@ msgstr ""
 #: code:addons/web/static/src/xml/base.xml:185
 #, python-format
 msgid "Drop Database"
-msgstr ""
+msgstr "Eliminar base de dados"
 
 #. module: web
 #. openerp-web
@@ -926,7 +929,7 @@ msgstr ""
 #: code:addons/web/static/src/js/chrome.js:563
 #, python-format
 msgid "Password has been changed successfully"
-msgstr ""
+msgstr "A senha foi alterada com êxito"
 
 #. module: web
 #. openerp-web
@@ -988,21 +991,21 @@ msgstr "Gravar lista de campos"
 #: code:addons/web/static/src/js/views.js:821
 #, python-format
 msgid "View Log (%s)"
-msgstr "Ver Registo (%s)"
+msgstr "Ver registo (%s)"
 
 #. module: web
 #. openerp-web
 #: code:addons/web/static/src/xml/base.xml:558
 #, python-format
 msgid "Creation Date:"
-msgstr "Data de Criação:"
+msgstr "Data de criação:"
 
 #. module: web
 #: code:addons/web/controllers/main.py:806
 #: code:addons/web/controllers/main.py:851
 #, python-format
 msgid "Error, password not changed !"
-msgstr ""
+msgstr "Erro, a senha não foi alterada!"
 
 #. module: web
 #. openerp-web
@@ -1065,7 +1068,7 @@ msgstr ""
 #: code:addons/web/static/src/js/formats.js:274
 #, python-format
 msgid "'%s' is not a correct date"
-msgstr ""
+msgstr "'%s' não é uma data correta"
 
 #. module: web
 #. openerp-web
@@ -1079,7 +1082,7 @@ msgstr "(sem rótulo)"
 #: code:addons/web/static/src/js/coresetup.js:597
 #, python-format
 msgid "%d days ago"
-msgstr "há %d dias atrás"
+msgstr "há %d dias"
 
 #. module: web
 #. openerp-web
@@ -1104,14 +1107,14 @@ msgstr "Cancelar"
 #: code:addons/web/static/src/xml/base.xml:9
 #, python-format
 msgid "Loading..."
-msgstr "A carregar ..."
+msgstr "Carregando..."
 
 #. module: web
 #. openerp-web
 #: code:addons/web/static/src/xml/base.xml:561
 #, python-format
 msgid "Latest Modification by:"
-msgstr "Ultima Modificação por:"
+msgstr "Modificação mais recente por:"
 
 #. module: web
 #. openerp-web
@@ -1119,7 +1122,7 @@ msgstr "Ultima Modificação por:"
 #: code:addons/web/static/src/xml/base.xml:466
 #, python-format
 msgid "Timezone mismatch"
-msgstr ""
+msgstr "Fuso horário inválido"
 
 #. module: web
 #. openerp-web
@@ -1167,7 +1170,7 @@ msgstr ""
 #: code:addons/web/static/src/js/coresetup.js:599
 #, python-format
 msgid "%d months ago"
-msgstr "há %d meses atrás"
+msgstr "há %d meses"
 
 #. module: web
 #. openerp-web
@@ -1182,7 +1185,7 @@ msgstr "Apagar"
 #: code:addons/web/static/src/xml/base.xml:1440
 #, python-format
 msgid "Add Advanced Filter"
-msgstr "Adicionar Filtro Avançado"
+msgstr "Adicionar filtro avançado"
 
 #. module: web
 #: code:addons/web/controllers/main.py:844
@@ -1196,14 +1199,14 @@ msgstr "A nova senha e a sua confirmação devem ser idênticas."
 #: code:addons/web/static/src/xml/base.xml:248
 #, python-format
 msgid "Restore Database"
-msgstr "Recuperar Base de Dados"
+msgstr "Recuperar base de dados"
 
 #. module: web
 #. openerp-web
 #: code:addons/web/static/src/js/chrome.js:645
 #, python-format
 msgid "Login"
-msgstr ""
+msgstr "Iniciar sessão"
 
 #. module: web
 #. openerp-web
@@ -1225,14 +1228,14 @@ msgstr "Restaurar"
 #: code:addons/web/static/src/xml/base.xml:1652
 #, python-format
 msgid "Export Type:"
-msgstr "Tipo de Exportação:"
+msgstr "Tipo de exportação:"
 
 #. module: web
 #. openerp-web
 #: code:addons/web/static/src/xml/base.xml:406
 #, python-format
 msgid "Log out"
-msgstr ""
+msgstr "Terminar sessão"
 
 #. module: web
 #. openerp-web
@@ -1261,7 +1264,7 @@ msgstr "Exportar"
 #: code:addons/web/static/src/js/data_export.js:12
 #, python-format
 msgid "Export To File"
-msgstr "Exportar para Ficheiro"
+msgstr "Exportar para ficheiro"
 
 #. module: web
 #. openerp-web
@@ -1296,7 +1299,7 @@ msgstr ""
 #: code:addons/web/static/src/xml/base.xml:1682
 #, python-format
 msgid "Remove All"
-msgstr "Remover Tudo"
+msgstr "Remover tudo"
 
 #. module: web
 #. openerp-web
@@ -1348,8 +1351,8 @@ msgid ""
 "For use if CSV files have titles on multiple lines, skips more than a single "
 "line during import"
 msgstr ""
-"Para utilização se os ficheiros CSV tiverem títulos em múltiplas linhas, "
-"ignora mais que uma única linha durante a importação"
+"No caso de os ficheiros CSV terem títulos em várias linhas, ignora-se mais "
+"do que uma única linha durante a importação"
 
 #. module: web
 #. openerp-web
@@ -1384,14 +1387,14 @@ msgstr "(%d registos)"
 #: code:addons/web/static/src/xml/base.xml:948
 #, python-format
 msgid "Change default:"
-msgstr "Trocar padrão:"
+msgstr "Mudar padrão:"
 
 #. module: web
 #. openerp-web
 #: code:addons/web/static/src/xml/base.xml:171
 #, python-format
 msgid "Original database name:"
-msgstr ""
+msgstr "Nome da base de dados original:"
 
 #. module: web
 #. openerp-web
@@ -1422,7 +1425,7 @@ msgstr "Pesquisa avançada"
 #: code:addons/web/static/src/xml/base.xml:290
 #, python-format
 msgid "Confirm new master password:"
-msgstr "Confirme nova palavra chave de administração:"
+msgstr "Confirme a nova senha de administração:"
 
 #. module: web
 #. openerp-web
@@ -1454,7 +1457,7 @@ msgstr "não contém"
 #: code:addons/web/static/src/xml/base.xml:1760
 #, python-format
 msgid "Import Options"
-msgstr "Opções de Importação"
+msgstr "Opções de importação"
 
 #. module: web
 #. openerp-web
@@ -1468,7 +1471,7 @@ msgstr "Adicionar %s"
 #: code:addons/web/static/src/xml/base.xml:145
 #, python-format
 msgid "Admin password:"
-msgstr "Palavra chave de administração:"
+msgstr "Senha de administração:"
 
 #. module: web
 #. openerp-web
@@ -1512,7 +1515,7 @@ msgstr "Árvore"
 #: code:addons/web/controllers/main.py:766
 #, python-format
 msgid "Could not drop database !"
-msgstr ""
+msgstr "Não foi possível eliminar a base de dados!"
 
 #. module: web
 #. openerp-web
@@ -1547,14 +1550,14 @@ msgstr ""
 #: code:addons/web/static/src/xml/base.xml:1403
 #, python-format
 msgid "Advanced Search..."
-msgstr "Pesquisa Avançada..."
+msgstr "Pesquisa avançada..."
 
 #. module: web
 #. openerp-web
 #: code:addons/web/static/src/js/chrome.js:499
 #, python-format
 msgid "Dropping database"
-msgstr "A eliminar base de dados"
+msgstr "Eliminando a base de dados"
 
 #. module: web
 #. openerp-web
@@ -1577,7 +1580,7 @@ msgstr "Sim"
 #: code:addons/web/static/src/js/view_form.js:4831
 #, python-format
 msgid "There was a problem while uploading your file"
-msgstr ""
+msgstr "Houve um problema ao carregar o seu ficheiro"
 
 #. module: web
 #. openerp-web
@@ -1591,14 +1594,14 @@ msgstr "XML ID:"
 #: code:addons/web/static/src/xml/base.xml:932
 #, python-format
 msgid "Size:"
-msgstr "Dimensões:"
+msgstr "Tamanho"
 
 #. module: web
 #. openerp-web
 #: code:addons/web/static/src/xml/base.xml:1799
 #, python-format
 msgid "--- Don't Import ---"
-msgstr "--- Não Importar ---"
+msgstr "--- Não importar ---"
 
 #. module: web
 #. openerp-web
@@ -1626,7 +1629,7 @@ msgstr ""
 #: code:addons/web/static/src/js/view_form.js:1066
 #, python-format
 msgid "Save default"
-msgstr "Salvar Padrão"
+msgstr "Guardar o padrão"
 
 #. module: web
 #. openerp-web
@@ -1684,14 +1687,15 @@ msgstr "Criar \"<strong>%s</strong>\""
 #: code:addons/web/static/src/js/data_export.js:361
 #, python-format
 msgid "Please select fields to save export list..."
-msgstr "Por favor seleccione os campos para gravar lista de exportação..."
+msgstr ""
+"Por favor selecione campos para poder gravar a lista de exportação..."
 
 #. module: web
 #. openerp-web
 #: code:addons/web/static/src/xml/base.xml:418
 #, python-format
 msgid "Copyright © 2004-TODAY OpenERP SA. All Rights Reserved."
-msgstr "Copyright © 2004-HOJE OpenERP SA. Todos os Direitos Reservados."
+msgstr "Copyright © 2004-HOJE OpenERP SA. Todos os direitos reservados."
 
 #. module: web
 #. openerp-web
@@ -1749,21 +1753,21 @@ msgstr "Criar: "
 #: code:addons/web/static/src/xml/base.xml:534
 #, python-format
 msgid "View Fields"
-msgstr "Ver Campos"
+msgstr "Ver campos"
 
 #. module: web
 #. openerp-web
 #: code:addons/web/static/src/xml/base.xml:330
 #, python-format
 msgid "Confirm New Password:"
-msgstr ""
+msgstr "Confirmar a nova senha:"
 
 #. module: web
 #. openerp-web
 #: code:addons/web/static/src/js/view_list.js:573
 #, python-format
 msgid "Do you really want to remove these records?"
-msgstr "Você quer realmente remover estes registos?"
+msgstr "Quer mesmo remover estes registos?"
 
 #. module: web
 #. openerp-web
@@ -1785,7 +1789,7 @@ msgstr "é"
 #: code:addons/web/static/src/js/data_export.js:6
 #, python-format
 msgid "Export Data"
-msgstr "Exportar Dados"
+msgstr "Exportar dados"
 
 #. module: web
 #. openerp-web
@@ -1816,7 +1820,7 @@ msgstr "OpenERP"
 #: code:addons/web/static/src/xml/base.xml:225
 #, python-format
 msgid "Database:"
-msgstr "Base de Dados:"
+msgstr "Base de dados:"
 
 #. module: web
 #. openerp-web
@@ -1824,7 +1828,7 @@ msgstr "Base de Dados:"
 #: code:addons/web/static/src/xml/base.xml:1215
 #, python-format
 msgid "Uploading ..."
-msgstr "A enviar..."
+msgstr "Carregando..."
 
 #. module: web
 #. openerp-web
@@ -1845,7 +1849,7 @@ msgstr "Acerca"
 #: code:addons/web/static/src/xml/base.xml:1406
 #, python-format
 msgid "Search Again"
-msgstr "Pesquisar Novamente"
+msgstr "Pesquisar novamente"
 
 #. module: web
 #. openerp-web
@@ -1867,7 +1871,7 @@ msgstr "Limpar"
 #: code:addons/web/static/src/xml/base.xml:1655
 #, python-format
 msgid "Export all Data"
-msgstr "Exportar Todos os Dados"
+msgstr "Exportar todos os dados"
 
 #. module: web
 #. openerp-web
@@ -1883,7 +1887,7 @@ msgstr ""
 #: code:addons/web/static/src/xml/base.xml:531
 #, python-format
 msgid "Set Defaults"
-msgstr "Definir Valores Predefinidos"
+msgstr "Definir valores padrão"
 
 #. module: web
 #. openerp-web
@@ -1912,7 +1916,7 @@ msgstr "O registo não foi encontrado na base de dados."
 #: code:addons/web/static/src/xml/base.xml:1447
 #, python-format
 msgid "Filter Name:"
-msgstr "Nome do Filtro:"
+msgstr "Nome do filtro:"
 
 #. module: web
 #. openerp-web
@@ -1941,14 +1945,14 @@ msgstr "Objeto:"
 #: code:addons/web/static/src/js/chrome.js:326
 #, python-format
 msgid "Loading"
-msgstr "A carregar"
+msgstr "Carregando"
 
 #. module: web
 #. openerp-web
 #: code:addons/web/static/src/js/coresetup.js:600
 #, python-format
 msgid "about a year ago"
-msgstr ""
+msgstr "há cerca de um ano"
 
 #. module: web
 #. openerp-web
@@ -1974,7 +1978,7 @@ msgstr ""
 #: code:addons/web/static/src/js/coresetup.js:595
 #, python-format
 msgid "%d hours ago"
-msgstr "%d horas atrás"
+msgstr "há %d horas"
 
 #. module: web
 #. openerp-web
@@ -1989,7 +1993,7 @@ msgstr "Adicionar: "
 #: code:addons/web/static/src/xml/base.xml:1833
 #, python-format
 msgid "Quick Add"
-msgstr ""
+msgstr "Criação rápida"
 
 #. module: web
 #. openerp-web
@@ -2017,7 +2021,7 @@ msgstr "OK"
 #: code:addons/web/static/src/js/views.js:1163
 #, python-format
 msgid "Uploading..."
-msgstr "A enviar..."
+msgstr "Enviando..."
 
 #. module: web
 #. openerp-web
@@ -2032,7 +2036,7 @@ msgstr "Carregar dados de demonstração"
 #: code:addons/web/static/src/js/dates.js:26
 #, python-format
 msgid "'%s' is not a valid datetime"
-msgstr ""
+msgstr "'%s' não é uma data/hora correta"
 
 #. module: web
 #. openerp-web
@@ -2055,7 +2059,7 @@ msgstr "Ficheiro:"
 #: code:addons/web/static/src/js/search.js:1943
 #, python-format
 msgid "less than"
-msgstr "menor que"
+msgstr "menor do que"
 
 #. module: web
 #. openerp-web
@@ -2070,7 +2074,7 @@ msgstr "Aviso"
 #: code:addons/web/static/src/xml/base.xml:541
 #, python-format
 msgid "Edit SearchView"
-msgstr "Editar Vista de Pesquisa"
+msgstr "Editar vista de pesquisa"
 
 #. module: web
 #. openerp-web
@@ -2091,7 +2095,7 @@ msgstr "Adicionar um item"
 #: code:addons/web/static/src/xml/base.xml:1578
 #, python-format
 msgid "Save current filter"
-msgstr "Guardar filtro actual"
+msgstr "Guardar filtro atual"
 
 #. module: web
 #. openerp-web
@@ -2112,7 +2116,7 @@ msgstr "Por favor introduza o nome da lista de campos a gravar..."
 #: code:addons/web/static/src/js/view_list.js:2185
 #, python-format
 msgid "Download \"%s\""
-msgstr "Tranferindo \"%s\""
+msgstr "Tranferir \"%s\""
 
 #. module: web
 #. openerp-web
@@ -2134,14 +2138,14 @@ msgstr ""
 #: code:addons/web/static/src/xml/base.xml:535
 #, python-format
 msgid "Fields View Get"
-msgstr "Obter Vista dos Campos"
+msgstr "Obter vista dos campos"
 
 #. module: web
 #. openerp-web
 #: code:addons/web/static/src/xml/base.xml:149
 #, python-format
 msgid "Confirm password:"
-msgstr "Confirmar palavra-passe:"
+msgstr "Confirmar senha:"
 
 #. module: web
 #. openerp-web
@@ -2171,14 +2175,14 @@ msgstr "OpenERP é uma marca registada de"
 #: code:addons/web/static/src/js/data_export.js:374
 #, python-format
 msgid "Please select fields to export..."
-msgstr "Por favor seleccione os campos a exportar..."
+msgstr "Por favor selecione os campos a exportar..."
 
 #. module: web
 #. openerp-web
 #: code:addons/web/static/src/xml/base.xml:286
 #, python-format
 msgid "New master password:"
-msgstr "Nova palavra chave de administração:"
+msgstr "Nova senha de administração:"
 
 #. module: web
 #. openerp-web
@@ -2192,7 +2196,7 @@ msgstr "é falso"
 #: code:addons/web/static/src/xml/base.xml:404
 #, python-format
 msgid "About OpenERP"
-msgstr "Sobre o OpenERP"
+msgstr "Acerca do OpenERP"
 
 #. module: web
 #. openerp-web
@@ -2200,6 +2204,8 @@ msgstr "Sobre o OpenERP"
 #, python-format
 msgid "'%s' is not a correct date, datetime nor time"
 msgstr ""
+"'%s' não está correto como qualquer um dos seguintes formatos: Data, "
+"Data/Hora, Hora"
 
 #. module: web
 #: code:addons/web/controllers/main.py:1306
@@ -2212,7 +2218,7 @@ msgstr ""
 #: code:addons/web/static/src/xml/base.xml:304
 #, python-format
 msgid "Database Management"
-msgstr ""
+msgstr "Gestão da base de dados"
 
 #. module: web
 #. openerp-web
@@ -2226,21 +2232,21 @@ msgstr "Imagem"
 #: code:addons/web/static/src/xml/base.xml:81
 #, python-format
 msgid "Manage Databases"
-msgstr "Gerir Bases de Dados"
+msgstr "Gerir bases de dados"
 
 #. module: web
 #. openerp-web
 #: code:addons/web/static/src/js/pyeval.js:765
 #, python-format
 msgid "Evaluation Error"
-msgstr ""
+msgstr "Erro de avaliação"
 
 #. module: web
 #. openerp-web
 #: code:addons/web/static/src/js/search.js:1285
 #, python-format
 msgid "not a valid integer"
-msgstr "não é um numero válido"
+msgstr "não é um número inteiro válido"
 
 #. module: web
 #. openerp-web
@@ -2266,7 +2272,7 @@ msgstr "Não"
 #: code:addons/web/static/src/js/formats.js:309
 #, python-format
 msgid "'%s' is not convertible to date, datetime nor time"
-msgstr ""
+msgstr "'%s' não é convertível para data, data/hora ou hora"
 
 #. module: web
 #. openerp-web
@@ -2306,7 +2312,7 @@ msgstr "Ainda a carregar..."
 #, python-format
 msgid "Incorrect value for field %(fieldname)s: [%(value)s] is %(message)s"
 msgstr ""
-"Valor incorrecto para o campo %(fieldname)s: [%(value)s] é %(message)s"
+"Valor incorreto para o campo %(fieldname)s: o [%(value)s] é %(message)s"
 
 #. module: web
 #. openerp-web
@@ -2327,14 +2333,14 @@ msgstr "Registado"
 #: code:addons/web/static/src/xml/base.xml:1585
 #, python-format
 msgid "Use by default"
-msgstr "Usar por defeito"
+msgstr "Usar como padrão"
 
 #. module: web
 #. openerp-web
 #: code:addons/web/static/src/js/view_form.js:4846
 #, python-format
 msgid "The field is empty, there's nothing to save !"
-msgstr "O campo esta vazio, não há nada a gravar!"
+msgstr "O campo esta vazio, não há nada para gravar!"
 
 #. module: web
 #. openerp-web
@@ -2348,7 +2354,7 @@ msgstr "%s (%d)"
 #: code:addons/web/static/src/js/search.js:777
 #, python-format
 msgid "triggered from search view"
-msgstr "obtida através da vista de pesquisa"
+msgstr "ativada pela vista de pesquisa"
 
 #. module: web
 #. openerp-web
@@ -2362,14 +2368,14 @@ msgstr "Filtro"
 #: code:addons/web/static/src/xml/base.xml:928
 #, python-format
 msgid "Widget:"
-msgstr "Elemento:"
+msgstr ""
 
 #. module: web
 #. openerp-web
 #: code:addons/web/static/src/xml/base.xml:542
 #, python-format
 msgid "Edit Action"
-msgstr "Editar Ação"
+msgstr "Editar ação"
 
 #. module: web
 #. openerp-web
@@ -2390,7 +2396,7 @@ msgstr "Só você"
 #: code:addons/web/static/src/xml/base.xml:543
 #, python-format
 msgid "Edit Workflow"
-msgstr "Editar Fluxo de Trabalho"
+msgstr "Editar fluxo de trabalho"
 
 #. module: web
 #. openerp-web
@@ -2404,7 +2410,7 @@ msgstr ""
 #: code:addons/web/static/src/js/views.js:838
 #, python-format
 msgid "Technical Translation"
-msgstr "Tradução Técnica"
+msgstr "Tradução técnica"
 
 #. module: web
 #. openerp-web
@@ -2433,7 +2439,7 @@ msgstr "Fuso horário do utilizador"
 #: code:addons/web/static/src/js/chrome.js:1133
 #, python-format
 msgid "Client Error"
-msgstr "Erro do Cliente"
+msgstr "Erro de cliente"
 
 #. module: web
 #. openerp-web
@@ -2455,13 +2461,15 @@ msgstr "Especial:"
 msgid ""
 "The old password you provided is incorrect, your password was not changed."
 msgstr ""
+"A senha atual indicada por si está incorreta. A sua senha não foi, portanto, "
+"alterada."
 
 #. module: web
 #. openerp-web
 #: code:addons/web/static/src/xml/base.xml:555
 #, python-format
 msgid "Creation User:"
-msgstr "Utilizador de Criação:"
+msgstr ""
 
 #. module: web
 #. openerp-web
@@ -2482,7 +2490,7 @@ msgstr "Guardar & Fechar"
 #: code:addons/web/static/src/js/view_form.js:2818
 #, python-format
 msgid "Search More..."
-msgstr "Pesquisar Mais..."
+msgstr "Pesquisar mais..."
 
 #. module: web
 #. openerp-web
@@ -2490,7 +2498,7 @@ msgstr "Pesquisar Mais..."
 #: code:addons/web/static/src/xml/base.xml:311
 #, python-format
 msgid "Password"
-msgstr "Palavra-chave"
+msgstr "Senha"
 
 #. module: web
 #. openerp-web
@@ -2527,14 +2535,14 @@ msgstr "Pesquisar %(field)s por: %(value)s"
 #: code:addons/web/static/src/xml/base.xml:1252
 #, python-format
 msgid "Delete this file"
-msgstr "Apagar este ficheiro"
+msgstr ""
 
 #. module: web
 #. openerp-web
 #: code:addons/web/static/src/xml/base.xml:109
 #, python-format
 msgid "Create Database"
-msgstr "Criar Base de dados"
+msgstr "Criar base de dados"
 
 #. module: web
 #. openerp-web
diff --git a/addons/web/i18n/ru.po b/addons/web/i18n/ru.po
index 136e14a793f..8366699d7d9 100644
--- a/addons/web/i18n/ru.po
+++ b/addons/web/i18n/ru.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openerp-web\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-11-30 18:13+0000\n"
-"PO-Revision-Date: 2012-11-27 12:33+0000\n"
-"Last-Translator: Chertykov Denis <chertykov@gmail.com>\n"
+"PO-Revision-Date: 2012-12-05 11:06+0000\n"
+"Last-Translator: Denis Karataev <dskarataev@gmail.com>\n"
 "Language-Team: Russian <ru@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-01 05:20+0000\n"
-"X-Generator: Launchpad (build 16319)\n"
+"X-Launchpad-Export-Date: 2012-12-06 04:54+0000\n"
+"X-Generator: Launchpad (build 16341)\n"
 
 #. module: web
 #. openerp-web
@@ -59,7 +59,7 @@ msgstr "меньше или равен"
 #: code:addons/web/static/src/js/chrome.js:393
 #, python-format
 msgid "Please enter your previous password"
-msgstr ""
+msgstr "Пожалуйста введите ваш предыдущий пароль"
 
 #. module: web
 #. openerp-web
@@ -82,7 +82,7 @@ msgstr "Изменить главный пароль"
 #: code:addons/web/static/src/js/chrome.js:491
 #, python-format
 msgid "Do you really want to delete the database: %s ?"
-msgstr ""
+msgstr "Вы действительно хотите удалить базу данных: %s?"
 
 #. module: web
 #. openerp-web
@@ -96,7 +96,7 @@ msgstr "Искать %(field)s в: %(value)s"
 #: code:addons/web/static/src/js/chrome.js:537
 #, python-format
 msgid "Access Denied"
-msgstr ""
+msgstr "Доступ запрещен"
 
 #. module: web
 #. openerp-web
@@ -120,7 +120,7 @@ msgstr "Резервное копирование базы данных"
 #: code:addons/web/static/src/js/dates.js:53
 #, python-format
 msgid "'%s' is not a valid date"
-msgstr ""
+msgstr "%s не является допустимой датой"
 
 #. module: web
 #. openerp-web
@@ -147,7 +147,7 @@ msgstr "Файл"
 #: code:addons/web/controllers/main.py:842
 #, python-format
 msgid "You cannot leave any password empty."
-msgstr ""
+msgstr "Вы не можете оставить пароль пустым."
 
 #. module: web
 #. openerp-web
@@ -237,7 +237,7 @@ msgstr "(нет строки)"
 #: code:addons/web/static/src/js/formats.js:282
 #, python-format
 msgid "'%s' is not a correct time"
-msgstr ""
+msgstr "'%s' не является корректным временем"
 
 #. module: web
 #. openerp-web
@@ -336,7 +336,7 @@ msgstr "Изменить пароль"
 #: code:addons/web/static/src/js/view_form.js:3382
 #, python-format
 msgid "View type '%s' is not supported in One2Many."
-msgstr ""
+msgstr "Тип вида '%s' не поддерживается в one2many"
 
 #. module: web
 #. openerp-web
@@ -351,7 +351,7 @@ msgstr "Загрузить"
 #: code:addons/web/static/src/js/formats.js:266
 #, python-format
 msgid "'%s' is not a correct datetime"
-msgstr ""
+msgstr "'%s' не является корректной датой и временем"
 
 #. module: web
 #. openerp-web
@@ -379,13 +379,13 @@ msgstr "Выбор:"
 #: code:addons/web/static/src/js/view_form.js:869
 #, python-format
 msgid "The following fields are invalid:"
-msgstr ""
+msgstr "Следующие поля заполнены неверны:"
 
 #. module: web
 #: code:addons/web/controllers/main.py:863
 #, python-format
 msgid "Languages"
-msgstr ""
+msgstr "Языки"
 
 #. module: web
 #. openerp-web
@@ -406,7 +406,7 @@ msgstr "Импорт"
 #: code:addons/web/static/src/js/chrome.js:543
 #, python-format
 msgid "Could not restore the database"
-msgstr ""
+msgstr "Невозможно восстановить базу данных"
 
 #. module: web
 #. openerp-web
@@ -520,7 +520,7 @@ msgstr "Неподдерживаемый оператор %s в домене %s"
 #: code:addons/web/static/src/js/formats.js:242
 #, python-format
 msgid "'%s' is not a correct float"
-msgstr ""
+msgstr "'%s' не является корректным числом с плавающей точкой"
 
 #. module: web
 #. openerp-web
@@ -576,7 +576,7 @@ msgstr "Печать рабочего процесса"
 #: code:addons/web/static/src/js/chrome.js:396
 #, python-format
 msgid "Please confirm your new password"
-msgstr ""
+msgstr "Пожалуйста подтвердите ваш новый пароль"
 
 #. module: web
 #. openerp-web
@@ -670,13 +670,15 @@ msgstr "ID действия:"
 #, python-format
 msgid "Your user's preference timezone does not match your browser timezone:"
 msgstr ""
+"Часовой пояс в ваших настройках пользователя не совпадает с часовым поясом "
+"вашего браузера:"
 
 #. module: web
 #. openerp-web
 #: code:addons/web/static/src/js/view_form.js:1238
 #, python-format
 msgid "Field '%s' specified in view could not be found."
-msgstr ""
+msgstr "Поле '%s' указанное в виде не может быть найдено."
 
 #. module: web
 #. openerp-web
@@ -704,7 +706,7 @@ msgstr "Байты,Кб,Мб,Гб,Тб,Пб,Eb,Zb,Yb"
 #: code:addons/web/static/src/js/chrome.js:481
 #, python-format
 msgid "The database has been duplicated."
-msgstr ""
+msgstr "База данных была скопирована."
 
 #. module: web
 #. openerp-web
@@ -795,7 +797,7 @@ msgstr "Разделитель:"
 #: code:addons/web/static/src/xml/base.xml:458
 #, python-format
 msgid "Browser's timezone"
-msgstr ""
+msgstr "Часовой пояс браузера"
 
 #. module: web
 #. openerp-web
@@ -861,7 +863,7 @@ msgstr "Настройки"
 #: code:addons/web/static/src/js/view_form.js:434
 #, python-format
 msgid "Wrong on change format: %s"
-msgstr ""
+msgstr "Неправильный или измененный формат: %s"
 
 #. module: web
 #. openerp-web
@@ -876,7 +878,7 @@ msgstr "Удалить базу данных"
 #: code:addons/web/static/src/xml/base.xml:462
 #, python-format
 msgid "Click here to change your user's timezone."
-msgstr ""
+msgstr "Нажмите здесь для изменения часового пояса вашего пользователя."
 
 #. module: web
 #. openerp-web
@@ -922,21 +924,21 @@ msgstr "Имя пользователя"
 #: code:addons/web/static/src/js/chrome.js:481
 #, python-format
 msgid "Duplicating database"
-msgstr ""
+msgstr "Копирование базы данных"
 
 #. module: web
 #. openerp-web
 #: code:addons/web/static/src/js/chrome.js:563
 #, python-format
 msgid "Password has been changed successfully"
-msgstr ""
+msgstr "Пароль был успешно изменен"
 
 #. module: web
 #. openerp-web
 #: code:addons/web/static/src/js/view_list_editable.js:781
 #, python-format
 msgid "The form's data can not be discarded"
-msgstr ""
+msgstr "Информация формы не может быть отклонена"
 
 #. module: web
 #. openerp-web
@@ -1005,7 +1007,7 @@ msgstr "Дата создания:"
 #: code:addons/web/controllers/main.py:851
 #, python-format
 msgid "Error, password not changed !"
-msgstr ""
+msgstr "Ошибка, пароль не изменен!"
 
 #. module: web
 #. openerp-web
@@ -1027,7 +1029,7 @@ msgstr "/web/binary/upload_attachment"
 #: code:addons/web/static/src/js/chrome.js:563
 #, python-format
 msgid "Changed Password"
-msgstr ""
+msgstr "Измененный пароль"
 
 #. module: web
 #. openerp-web
@@ -1061,14 +1063,14 @@ msgstr "Резервная копия"
 #: code:addons/web/static/src/js/dates.js:80
 #, python-format
 msgid "'%s' is not a valid time"
-msgstr ""
+msgstr "'%s' не является допустимым временем"
 
 #. module: web
 #. openerp-web
 #: code:addons/web/static/src/js/formats.js:274
 #, python-format
 msgid "'%s' is not a correct date"
-msgstr ""
+msgstr "'%s' не является корректной датой"
 
 #. module: web
 #. openerp-web
@@ -1122,7 +1124,7 @@ msgstr "Изменялся:"
 #: code:addons/web/static/src/xml/base.xml:466
 #, python-format
 msgid "Timezone mismatch"
-msgstr ""
+msgstr "Несовпадение часовых поясов"
 
 #. module: web
 #. openerp-web
@@ -1190,7 +1192,7 @@ msgstr "Добавить расширенный фильтр"
 #: code:addons/web/controllers/main.py:844
 #, python-format
 msgid "The new password and its confirmation must be identical."
-msgstr ""
+msgstr "Новый пароль и его подтверждение должны быть идентичны."
 
 #. module: web
 #. openerp-web
@@ -1205,7 +1207,7 @@ msgstr "Восстановить базу данных"
 #: code:addons/web/static/src/js/chrome.js:645
 #, python-format
 msgid "Login"
-msgstr ""
+msgstr "Войти"
 
 #. module: web
 #. openerp-web
@@ -1248,7 +1250,7 @@ msgstr "Группировать по: %s"
 #: code:addons/web/static/src/js/view_form.js:151
 #, python-format
 msgid "No data provided."
-msgstr ""
+msgstr "Нет предоставленных данных."
 
 #. module: web
 #. openerp-web
@@ -1319,7 +1321,7 @@ msgstr "%(page)d/%(page_count)d"
 #: code:addons/web/static/src/js/chrome.js:397
 #, python-format
 msgid "The confirmation does not match the password"
-msgstr ""
+msgstr "Подтверждение должно совпадать с паролем"
 
 #. module: web
 #. openerp-web
@@ -1372,7 +1374,7 @@ msgstr "1. Импорт из .CSV файла"
 #: code:addons/web/static/src/js/chrome.js:645
 #, python-format
 msgid "No database selected !"
-msgstr ""
+msgstr "Не выбрана база данных!"
 
 #. module: web
 #. openerp-web
@@ -1410,7 +1412,7 @@ msgstr "соответствует"
 #: code:addons/web/static/src/js/views.js:1455
 #, python-format
 msgid "Could not serialize XML"
-msgstr ""
+msgstr "Невозможно сериализовать XML"
 
 #. module: web
 #. openerp-web
@@ -1517,14 +1519,14 @@ msgstr "Дерево"
 #: code:addons/web/controllers/main.py:766
 #, python-format
 msgid "Could not drop database !"
-msgstr ""
+msgstr "Невозможно удалить базу данных!"
 
 #. module: web
 #. openerp-web
 #: code:addons/web/static/src/js/formats.js:227
 #, python-format
 msgid "'%s' is not a correct integer"
-msgstr ""
+msgstr "'%s' не является корректным целым числом"
 
 #. module: web
 #. openerp-web
@@ -1559,7 +1561,7 @@ msgstr "Расширенный поиск..."
 #: code:addons/web/static/src/js/chrome.js:499
 #, python-format
 msgid "Dropping database"
-msgstr ""
+msgstr "Удаление базы данных"
 
 #. module: web
 #. openerp-web
@@ -1624,7 +1626,7 @@ msgstr "%d лет назад"
 #: code:addons/web/static/src/js/view_list.js:1019
 #, python-format
 msgid "Unknown m2m command %s"
-msgstr ""
+msgstr "Неизвестная m2m команда %s"
 
 #. module: web
 #. openerp-web
@@ -1647,14 +1649,14 @@ msgstr "Название новой базы данных:"
 #: code:addons/web/static/src/js/chrome.js:394
 #, python-format
 msgid "Please enter your new password"
-msgstr ""
+msgstr "Пожалуйста введите ваш новый пароль"
 
 #. module: web
 #. openerp-web
 #: code:addons/web/static/src/js/views.js:1463
 #, python-format
 msgid "Could not parse string to xml"
-msgstr ""
+msgstr "Невозможно преобразовать строку в XML"
 
 #. module: web
 #. openerp-web
@@ -1761,7 +1763,7 @@ msgstr "Просмотр полей"
 #: code:addons/web/static/src/xml/base.xml:330
 #, python-format
 msgid "Confirm New Password:"
-msgstr ""
+msgstr "Подтвердите новый пароль:"
 
 #. module: web
 #. openerp-web
@@ -1932,7 +1934,7 @@ msgstr "Тип:"
 #: code:addons/web/static/src/js/chrome.js:538
 #, python-format
 msgid "Incorrect super-administrator password"
-msgstr ""
+msgstr "Неправильный пароль супер-администратора"
 
 #. module: web
 #. openerp-web
@@ -1974,6 +1976,7 @@ msgid ""
 "The type of the field '%s' must be a many2many field with a relation to "
 "'ir.attachment' model."
 msgstr ""
+"Тип поля '%s' должен быть many2many и иметь связь с моделью 'ir.attachment'."
 
 #. module: web
 #. openerp-web
@@ -2038,7 +2041,7 @@ msgstr "Загрузить демонстрационные данные:"
 #: code:addons/web/static/src/js/dates.js:26
 #, python-format
 msgid "'%s' is not a valid datetime"
-msgstr ""
+msgstr "'%s' не является допустимой датой и временем"
 
 #. module: web
 #. openerp-web
@@ -2125,14 +2128,14 @@ msgstr "Загрузка \"%s\""
 #: code:addons/web/static/src/js/view_form.js:324
 #, python-format
 msgid "New"
-msgstr ""
+msgstr "Новый"
 
 #. module: web
 #. openerp-web
 #: code:addons/web/static/src/js/view_list.js:1746
 #, python-format
 msgid "Can't convert value %s to context"
-msgstr ""
+msgstr "Невозможно конвертировать значение %s в контекст"
 
 #. module: web
 #. openerp-web
@@ -2206,12 +2209,14 @@ msgstr "Об OpenERP"
 #, python-format
 msgid "'%s' is not a correct date, datetime nor time"
 msgstr ""
+"'%s' не является ни корректной датой, ни временем, ни тем и другим вместе "
+"взятым."
 
 #. module: web
 #: code:addons/web/controllers/main.py:1306
 #, python-format
 msgid "No content found for field '%s' on '%s:%s'"
-msgstr ""
+msgstr "Не найдено содержимое для поля '%s' на '%s:%s'"
 
 #. module: web
 #. openerp-web
@@ -2272,7 +2277,7 @@ msgstr "Нет"
 #: code:addons/web/static/src/js/formats.js:309
 #, python-format
 msgid "'%s' is not convertible to date, datetime nor time"
-msgstr ""
+msgstr "'%s' не является конвертируемым в дату, время или дату и время"
 
 #. module: web
 #. openerp-web
@@ -2410,7 +2415,7 @@ msgstr "Вы действительно хотите удалить это вл
 #: code:addons/web/static/src/js/views.js:838
 #, python-format
 msgid "Technical Translation"
-msgstr ""
+msgstr "Технический перевод"
 
 #. module: web
 #. openerp-web
@@ -2424,14 +2429,14 @@ msgstr "Поле:"
 #: code:addons/web/static/src/js/chrome.js:499
 #, python-format
 msgid "The database %s has been dropped"
-msgstr ""
+msgstr "База данных %s была удалена"
 
 #. module: web
 #. openerp-web
 #: code:addons/web/static/src/xml/base.xml:456
 #, python-format
 msgid "User's timezone"
-msgstr ""
+msgstr "Часовой пояс пользователя"
 
 #. module: web
 #. openerp-web
@@ -2461,6 +2466,7 @@ msgstr "Специальное:"
 msgid ""
 "The old password you provided is incorrect, your password was not changed."
 msgstr ""
+"Старый пароль который вы предоставили неверен, ваш пароль не был изменен."
 
 #. module: web
 #. openerp-web
diff --git a/addons/web_calendar/i18n/nl.po b/addons/web_calendar/i18n/nl.po
index e447e033f03..c2ce1219f60 100644
--- a/addons/web_calendar/i18n/nl.po
+++ b/addons/web_calendar/i18n/nl.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openerp-web\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-11-30 18:13+0000\n"
-"PO-Revision-Date: 2012-11-25 07:04+0000\n"
+"PO-Revision-Date: 2012-12-05 07:55+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: 2012-12-01 05:21+0000\n"
-"X-Generator: Launchpad (build 16319)\n"
+"X-Launchpad-Export-Date: 2012-12-06 04:54+0000\n"
+"X-Generator: Launchpad (build 16341)\n"
 
 #. module: web_calendar
 #. openerp-web
@@ -43,7 +43,7 @@ msgstr "Opslaan"
 #: code:addons/web_calendar/static/src/js/calendar.js:99
 #, python-format
 msgid "Calendar view has a 'date_delay' type != float"
-msgstr ""
+msgstr "Agenda weergave heeft een 'date_delay' type != float"
 
 #. module: web_calendar
 #. openerp-web
@@ -214,7 +214,7 @@ msgstr "Agenda"
 #: code:addons/web_calendar/static/src/js/calendar.js:91
 #, python-format
 msgid "Calendar view has not defined 'date_start' attribute."
-msgstr ""
+msgstr "Agenda weergave heeft een niet gedefinieerde 'date_start' attribute."
 
 #~ msgid "Navigator"
 #~ msgstr "Navigator"
diff --git a/addons/web_kanban/i18n/nl.po b/addons/web_kanban/i18n/nl.po
index 8802165e88d..3238834de19 100644
--- a/addons/web_kanban/i18n/nl.po
+++ b/addons/web_kanban/i18n/nl.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openerp-web\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-11-30 18:13+0000\n"
-"PO-Revision-Date: 2012-11-25 07:06+0000\n"
+"PO-Revision-Date: 2012-12-05 07:53+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: 2012-12-01 05:21+0000\n"
-"X-Generator: Launchpad (build 16319)\n"
+"X-Launchpad-Export-Date: 2012-12-06 04:54+0000\n"
+"X-Generator: Launchpad (build 16341)\n"
 
 #. module: web_kanban
 #. openerp-web
@@ -30,6 +30,7 @@ msgstr "Kolom aanpassen"
 #, python-format
 msgid "An error has occured while moving the record to this group."
 msgstr ""
+"Er is een fout opgetreden bij het verplaatsen van het record naar deze groep."
 
 #. module: web_kanban
 #. openerp-web
@@ -150,7 +151,7 @@ msgstr "of"
 #: code:addons/web_kanban/static/src/xml/web_kanban.xml:51
 #, python-format
 msgid "99+"
-msgstr ""
+msgstr "99+"
 
 #. module: web_kanban
 #. openerp-web
diff --git a/addons/web_linkedin/i18n/pt.po b/addons/web_linkedin/i18n/pt.po
index 8a49cdcec22..e32db7518ad 100644
--- a/addons/web_linkedin/i18n/pt.po
+++ b/addons/web_linkedin/i18n/pt.po
@@ -8,31 +8,31 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-11-24 02:54+0000\n"
-"PO-Revision-Date: 2012-12-02 16:18+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"PO-Revision-Date: 2012-12-05 09:47+0000\n"
+"Last-Translator: Aires Correia Lopes Silvestre <aires.silvestre@gmail.com>\n"
 "Language-Team: Portuguese <pt@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-03 04:36+0000\n"
-"X-Generator: Launchpad (build 16319)\n"
+"X-Launchpad-Export-Date: 2012-12-06 04:41+0000\n"
+"X-Generator: Launchpad (build 16341)\n"
 
 #. module: web_linkedin
 #: view:sale.config.settings:0
 msgid "here:"
-msgstr ""
+msgstr "aqui:"
 
 #. module: web_linkedin
 #: field:sale.config.settings,api_key:0
 msgid "API Key"
-msgstr ""
+msgstr "Chave API"
 
 #. module: web_linkedin
 #. openerp-web
 #: code:addons/web_linkedin/static/src/js/linkedin.js:249
 #, python-format
 msgid "No results found"
-msgstr ""
+msgstr "Nenhum resultado encontrado"
 
 #. module: web_linkedin
 #. openerp-web
@@ -51,7 +51,7 @@ msgstr ""
 #: code:addons/web_linkedin/static/src/xml/linkedin.xml:13
 #, python-format
 msgid "People"
-msgstr ""
+msgstr "Pessoas"
 
 #. module: web_linkedin
 #: model:ir.model,name:web_linkedin.model_sale_config_settings
@@ -61,7 +61,7 @@ msgstr ""
 #. module: web_linkedin
 #: field:sale.config.settings,server_domain:0
 msgid "unknown"
-msgstr ""
+msgstr "desconhecido"
 
 #. module: web_linkedin
 #: view:sale.config.settings:0
@@ -73,24 +73,24 @@ msgstr ""
 #: code:addons/web_linkedin/static/src/xml/linkedin.xml:15
 #, python-format
 msgid "Companies"
-msgstr ""
+msgstr "Empresas"
 
 #. module: web_linkedin
 #: view:sale.config.settings:0
 msgid "API key"
-msgstr ""
+msgstr "Chave API"
 
 #. module: web_linkedin
 #: view:sale.config.settings:0
 msgid "Copy the"
-msgstr ""
+msgstr "Copiar o"
 
 #. module: web_linkedin
 #. openerp-web
 #: code:addons/web_linkedin/static/src/js/linkedin.js:181
 #, python-format
 msgid "LinkedIn search"
-msgstr ""
+msgstr "Pesquisa LinkedIn"
 
 #. module: web_linkedin
 #. openerp-web
diff --git a/addons/web_shortcuts/i18n/pt.po b/addons/web_shortcuts/i18n/pt.po
new file mode 100644
index 00000000000..a3185a4bb00
--- /dev/null
+++ b/addons/web_shortcuts/i18n/pt.po
@@ -0,0 +1,25 @@
+# Portuguese translation for openobject-addons
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-11-24 02:54+0000\n"
+"PO-Revision-Date: 2012-12-05 10:09+0000\n"
+"Last-Translator: Andrei Talpa (multibase.pt) <andrei.talpa@multibase.pt>\n"
+"Language-Team: Portuguese <pt@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2012-12-06 04:41+0000\n"
+"X-Generator: Launchpad (build 16341)\n"
+
+#. module: web_shortcuts
+#. openerp-web
+#: code:addons/web_shortcuts/static/src/xml/web_shortcuts.xml:21
+#, python-format
+msgid "Add / Remove Shortcut..."
+msgstr "Adicionar / Remover atalho..."
diff --git a/addons/web_view_editor/i18n/nl.po b/addons/web_view_editor/i18n/nl.po
index 592ec11ace2..27d3f26d786 100644
--- a/addons/web_view_editor/i18n/nl.po
+++ b/addons/web_view_editor/i18n/nl.po
@@ -8,21 +8,21 @@ msgstr ""
 "Project-Id-Version: openerp-web\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-11-30 18:13+0000\n"
-"PO-Revision-Date: 2012-11-25 07:09+0000\n"
+"PO-Revision-Date: 2012-12-05 07:54+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: 2012-12-01 05:21+0000\n"
-"X-Generator: Launchpad (build 16319)\n"
+"X-Launchpad-Export-Date: 2012-12-06 04:54+0000\n"
+"X-Generator: Launchpad (build 16341)\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 ""
+msgstr "De volgende velden zijn ongeldig."
 
 #. module: web_view_editor
 #. openerp-web
@@ -36,7 +36,7 @@ msgstr "Aanmaken"
 #: code:addons/web_view_editor/static/src/js/view_editor.js:986
 #, python-format
 msgid "New Field"
-msgstr ""
+msgstr "Nieuw veld"
 
 #. module: web_view_editor
 #. openerp-web
@@ -71,7 +71,7 @@ msgstr "Opslaan"
 #: code:addons/web_view_editor/static/src/js/view_editor.js:393
 #, python-format
 msgid "Select an element"
-msgstr ""
+msgstr "Selecteer een element"
 
 #. module: web_view_editor
 #. openerp-web
@@ -86,7 +86,7 @@ msgstr "Bijwerken"
 #: code:addons/web_view_editor/static/src/js/view_editor.js:263
 #, python-format
 msgid "Please select view in list :"
-msgstr ""
+msgstr "Selecteer weergave in de lijst:"
 
 #. module: web_view_editor
 #. openerp-web
@@ -150,7 +150,7 @@ msgstr "Wilt u dit knooppunt werkelijk verwijderen?"
 #: code:addons/web_view_editor/static/src/js/view_editor.js:390
 #, python-format
 msgid "Can't Update View"
-msgstr ""
+msgstr "Kan de weergave niet vernieuwen"
 
 #. module: web_view_editor
 #. openerp-web

From 4fa577f0d4f6c3dbac2ffc59f6a872aa1d5f1b86 Mon Sep 17 00:00:00 2001
From: "ajay javiya (OpenERP)" <aja@tinyerp.com>
Date: Thu, 6 Dec 2012 12:04:00 +0530
Subject: [PATCH 066/110] [FIX]: Set password should be encrypted on user form

bzr revid: aja@tinyerp.com-20121206063400-2h8vm6sknjw9k6pa
---
 addons/auth_signup/res_users_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/auth_signup/res_users_view.xml b/addons/auth_signup/res_users_view.xml
index 90729c54285..cae1fe1ad3a 100644
--- a/addons/auth_signup/res_users_view.xml
+++ b/addons/auth_signup/res_users_view.xml
@@ -22,7 +22,7 @@
                 </xpath>
                 <!-- hide field set_password -->
                 <field name="new_password" position="replace">
-                    <field name="new_password" groups="base.group_no_one"/>
+                    <field name="new_password" groups="base.group_no_one" password="True"/>
                 </field>
             </field>
         </record>

From 21927bc24961c16f1809d2252e7af1760c8e4b6a Mon Sep 17 00:00:00 2001
From: Fabien Meghazi <fme@openerp.com>
Date: Thu, 6 Dec 2012 10:13:34 +0100
Subject: [PATCH 067/110] [FIX] error in tree view during refactoring

bzr revid: fme@openerp.com-20121206091334-c2z76kbmibqq0jgq
---
 addons/web/static/src/js/view_tree.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/web/static/src/js/view_tree.js b/addons/web/static/src/js/view_tree.js
index a68b92bc33a..acac93f1842 100644
--- a/addons/web/static/src/js/view_tree.js
+++ b/addons/web/static/src/js/view_tree.js
@@ -37,7 +37,7 @@ instance.web.TreeView = instance.web.View.extend(/** @lends instance.web.TreeVie
         this.options = _.extend({}, this.defaults, options || {});
 
         _.bindAll(this, 'color_for');
-        this.on('view_loaded', self, self.load_tree);
+        this.on('view_loaded', this, this.load_tree);
     },
 
     /**

From e7477373e9bf1a621d6b93dc2e0f46908ad40d17 Mon Sep 17 00:00:00 2001
From: Arnaud Pineux <api@openerp.com>
Date: Thu, 6 Dec 2012 10:24:12 +0100
Subject: [PATCH 068/110] [FIX] purchase double validation unistall fixed

bzr revid: api@openerp.com-20121206092412-1eki0578ggcjoioz
---
 addons/purchase/purchase.py                   |  9 +++++
 addons/purchase/test/process/cancel_order.yml |  2 +-
 .../purchase_double_validation_installer.py   |  6 ++--
 .../purchase_double_validation_workflow.xml   | 33 ++++++++++++-------
 4 files changed, 35 insertions(+), 15 deletions(-)

diff --git a/addons/purchase/purchase.py b/addons/purchase/purchase.py
index aaaa9ddc5a5..4fdfe25930a 100644
--- a/addons/purchase/purchase.py
+++ b/addons/purchase/purchase.py
@@ -389,6 +389,15 @@ class purchase_order(osv.osv):
         self.write(cr, uid, ids, {'state': 'approved', 'date_approve': fields.date.context_today(self,cr,uid,context=context)})
         return True
 
+    def print_confirm(self,cr,uid,ids,context=None):
+        print "Confirmed"
+
+    def print_double(self,cr,uid,ids,context=None):
+        print "double Approval"
+
+    def print_router(self,cr,uid,ids,context=None):
+        print "Routed"
+
     def wkf_send_rfq(self, cr, uid, ids, context=None):
         '''
         This function opens a window to compose an email, with the edi purchase template message loaded by default
diff --git a/addons/purchase/test/process/cancel_order.yml b/addons/purchase/test/process/cancel_order.yml
index 80fd7b5ff57..95c42fb1b15 100644
--- a/addons/purchase/test/process/cancel_order.yml
+++ b/addons/purchase/test/process/cancel_order.yml
@@ -8,7 +8,7 @@
   I check the "Approved" status  after confirmed RFQ.
 -
   !assert {model: purchase.order, id: purchase_order_5}:
-    - state == 'approved'
+    - state == 'confirmed'
 -
   First I cancel  receptions related to this order if order shipped.
 -
diff --git a/addons/purchase_double_validation/purchase_double_validation_installer.py b/addons/purchase_double_validation/purchase_double_validation_installer.py
index 1a4b42ee448..5bd7bd24cb1 100644
--- a/addons/purchase_double_validation/purchase_double_validation_installer.py
+++ b/addons/purchase_double_validation/purchase_double_validation_installer.py
@@ -34,16 +34,16 @@ class purchase_config_settings(osv.osv_memory):
 
     def get_default_limit_amount(self, cr, uid, fields, context=None):
         ir_model_data = self.pool.get('ir.model.data')
-        transition = ir_model_data.get_object(cr, uid, 'purchase_double_validation', 'trans_confirmed_double_app_lt')
+        transition = ir_model_data.get_object(cr, uid, 'purchase_double_validation', 'trans_confirmed_double_lt')
         field, value = transition.condition.split('<', 1)
         return {'limit_amount': int(value)}
 
     def set_limit_amount(self, cr, uid, ids, context=None):
         ir_model_data = self.pool.get('ir.model.data')
         config = self.browse(cr, uid, ids[0], context)
-        waiting = ir_model_data.get_object(cr, uid, 'purchase_double_validation', 'trans_confirmed_double_app')
+        waiting = ir_model_data.get_object(cr, uid, 'purchase_double_validation', 'trans_confirmed_double_gt')
         waiting.write({'condition': 'amount_total >= %s' % config.limit_amount})
-        confirm = ir_model_data.get_object(cr, uid, 'purchase_double_validation', 'trans_confirmed_double_app_lt')
+        confirm = ir_model_data.get_object(cr, uid, 'purchase_double_validation', 'trans_confirmed_double_lt')
         confirm.write({'condition': 'amount_total < %s' % config.limit_amount})
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/purchase_double_validation/purchase_double_validation_workflow.xml b/addons/purchase_double_validation/purchase_double_validation_workflow.xml
index 1db3d3d61e7..673063ff049 100644
--- a/addons/purchase_double_validation/purchase_double_validation_workflow.xml
+++ b/addons/purchase_double_validation/purchase_double_validation_workflow.xml
@@ -1,30 +1,41 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data>
-        <record id="act_double_app" model="workflow.activity">
+
+        <record id="act_double_wait" model="workflow.activity">
             <field name="wkf_id" ref="purchase.purchase_order"/>
-            <field name="name">doubleApproval</field>
-            <field name="split_mode">OR</field>
-            <field name="kind">function</field>
-            <field name="action">wkf_approve_order()</field>
+            <field name="name">WaitForApproval</field>
+            <field name="kind">dummy</field>
         </record>
 
-         <record id="trans_confirmed_double_app" model="workflow.transition">
+        <record id="act_double_check" model="workflow.activity">
+            <field name="wkf_id" ref="purchase.purchase_order"/>
+            <field name="name">CheckForApproval</field>
+            <field name="split_mode">OR</field>
+            <field name="kind">dummy</field>
+        </record>
+
+         <record id="trans_confirmed_double_check" model="workflow.transition">
             <field name="act_from" ref="purchase.act_confirmed"/>
-            <field name="act_to" ref="act_double_app"/>
+            <field name="act_to" ref="act_double_check"/>
+        </record>
+        
+        <record id="trans_confirmed_double_gt" model="workflow.transition">
+            <field name="act_from" ref="act_double_check"/>
+            <field name="act_to" ref="act_double_wait"/>
             <field name="condition">amount_untaxed &gt;= 5000</field>
             <field name="signal">purchase_approve</field>
             <field name="group_id" ref="purchase.group_purchase_manager"/>
         </record>
 
-        <record id="trans_confirmed_double_app_lt" model="workflow.transition">
-            <field name="act_from" ref="purchase.act_confirmed"/>
-            <field name="act_to" ref="act_double_app"/>
+        <record id="trans_confirmed_double_lt" model="workflow.transition">
+            <field name="act_from" ref="act_double_check"/>
+            <field name="act_to" ref="act_double_wait"/>
             <field name="condition">amount_untaxed &lt; 5000</field>
         </record>
 
         <record id="trans_double_app_conf" model="workflow.transition">
-            <field name="act_from" ref="act_double_app"/>
+            <field name="act_from" ref="act_double_wait"/>
             <field name="act_to" ref="purchase.act_router"/>
         </record>
 

From 11b3bbce1ce9f8c970c590442aca4f3f8de0689c Mon Sep 17 00:00:00 2001
From: Raphael Collet <rco@openerp.com>
Date: Thu, 6 Dec 2012 10:36:03 +0100
Subject: [PATCH 069/110] [FIX] auth_signup: automatically invite new users to
 set their password *only* when created from the users form view

bzr revid: rco@openerp.com-20121206093603-5zru6o160v20553h
---
 addons/auth_signup/res_users.py       | 2 +-
 addons/auth_signup/res_users_view.xml | 5 +++++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/addons/auth_signup/res_users.py b/addons/auth_signup/res_users.py
index 8380cd8b23f..5fd7917f444 100644
--- a/addons/auth_signup/res_users.py
+++ b/addons/auth_signup/res_users.py
@@ -254,6 +254,6 @@ class res_users(osv.Model):
         # overridden to automatically invite user to sign up
         user_id = super(res_users, self).create(cr, uid, values, context=context)
         user = self.browse(cr, uid, user_id, context=context)
-        if user.email:
+        if context and context.get('reset_password') and user.email:
             user.action_reset_password()
         return user_id
diff --git a/addons/auth_signup/res_users_view.xml b/addons/auth_signup/res_users_view.xml
index 90729c54285..f7bfdd8eeb5 100644
--- a/addons/auth_signup/res_users_view.xml
+++ b/addons/auth_signup/res_users_view.xml
@@ -2,6 +2,11 @@
 <openerp>
     <data>
 
+        <!-- add context in action to enable automatic reset password -->
+        <record id="base.action_res_users" model="ir.actions.act_window">
+            <field name="context">{'reset_password': True}</field>
+        </record>
+
         <record id="res_users_form_view" model="ir.ui.view">
             <field name="name">user.form.state</field>
             <field name="model">res.users</field>

From 6637e05898ecd8793911807c41ffe78ee2b98f6b Mon Sep 17 00:00:00 2001
From: Fabien Meghazi <fme@openerp.com>
Date: Thu, 6 Dec 2012 10:51:23 +0100
Subject: [PATCH 070/110] [FIX] Fixed diagram view

bzr revid: fme@openerp.com-20121206095123-4nybio4m9dtb9z9o
---
 addons/web_diagram/controllers/main.py      | 5 -----
 addons/web_diagram/static/src/js/diagram.js | 9 ++-------
 2 files changed, 2 insertions(+), 12 deletions(-)

diff --git a/addons/web_diagram/controllers/main.py b/addons/web_diagram/controllers/main.py
index 6af1f91adc0..c598a7e4652 100644
--- a/addons/web_diagram/controllers/main.py
+++ b/addons/web_diagram/controllers/main.py
@@ -3,11 +3,6 @@ import openerp
 class DiagramView(openerp.addons.web.controllers.main.View):
     _cp_path = "/web_diagram/diagram"
 
-    @openerp.addons.web.http.jsonrequest
-    def load(self, req, model, view_id):
-        fields_view = self.fields_view_get(req, model, view_id, 'diagram')
-        return {'fields_view': fields_view}
-
     @openerp.addons.web.http.jsonrequest
     def get_diagram_info(self, req, id, model, node, connector,
                          src_node, des_node, label, **kw):
diff --git a/addons/web_diagram/static/src/js/diagram.js b/addons/web_diagram/static/src/js/diagram.js
index 7b914922205..00b2cdfe0ae 100644
--- a/addons/web_diagram/static/src/js/diagram.js
+++ b/addons/web_diagram/static/src/js/diagram.js
@@ -9,6 +9,7 @@ var QWeb = instance.web.qweb,
 instance.web.views.add('diagram', 'instance.web.DiagramView');
 instance.web.DiagramView = instance.web.View.extend({
     display_name: _lt('Diagram'),
+    view_type: 'diagram',
     searchable: false,
     init: function(parent, dataset, view_id, options) {
         var self = this;
@@ -24,12 +25,6 @@ instance.web.DiagramView = instance.web.View.extend({
         this.on('view_loaded', self, self.load_diagram);
         this.on('pager_action_executed', self, self.pager_action_trigger);
     },
-    start: function() {
-        var self = this;
-        return this.rpc("/web_diagram/diagram/load", {"model": this.model, "view_id": this.view_id}).done(function(r) {
-            self.load_diagram(r);
-        });
-    },
 
     toTitleCase: function(str) {
         return str.replace(/\w\S*/g, function(txt){return txt.charAt(0).toUpperCase() + txt.substr(1).toLowerCase();});
@@ -41,7 +36,7 @@ instance.web.DiagramView = instance.web.View.extend({
             this.id = this.ids[self.dataset.index || 0];
         }
 
-        this.fields_view = result.fields_view,
+        this.fields_view = result,
         this.view_id = this.fields_view.view_id,
         this.fields = this.fields_view.fields,
         this.nodes = this.fields_view.arch.children[0],

From 1f94d1aef5be970486f540095b9685894a7356ae Mon Sep 17 00:00:00 2001
From: Arnaud Pineux <api@openerp.com>
Date: Thu, 6 Dec 2012 11:06:12 +0100
Subject: [PATCH 071/110] [FIX] Purchase_double_validation tests

bzr revid: api@openerp.com-20121206100612-xc5hcv6p6ynnz9ri
---
 addons/purchase/test/process/cancel_order.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/purchase/test/process/cancel_order.yml b/addons/purchase/test/process/cancel_order.yml
index 95c42fb1b15..80fd7b5ff57 100644
--- a/addons/purchase/test/process/cancel_order.yml
+++ b/addons/purchase/test/process/cancel_order.yml
@@ -8,7 +8,7 @@
   I check the "Approved" status  after confirmed RFQ.
 -
   !assert {model: purchase.order, id: purchase_order_5}:
-    - state == 'confirmed'
+    - state == 'approved'
 -
   First I cancel  receptions related to this order if order shipped.
 -

From b2457a3fc116dd77cfa54431d93c79e506bb7a40 Mon Sep 17 00:00:00 2001
From: Cedric Snauwaert <csn@openerp.com>
Date: Thu, 6 Dec 2012 11:50:33 +0100
Subject: [PATCH 072/110] [REF]change some field name, remove useless line in
 access rules

bzr revid: csn@openerp.com-20121206105033-6dcffqm1626jt5r8
---
 addons/fleet/fleet.py                    | 58 +++++++--------
 addons/fleet/fleet_demo.xml              | 90 ++++++++++++------------
 addons/fleet/fleet_view.xml              | 45 ++++++------
 addons/fleet/security/fleet_security.xml | 12 ++--
 4 files changed, 102 insertions(+), 103 deletions(-)

diff --git a/addons/fleet/fleet.py b/addons/fleet/fleet.py
index e74ac4839f4..db999d41d12 100644
--- a/addons/fleet/fleet.py
+++ b/addons/fleet/fleet.py
@@ -66,8 +66,8 @@ class fleet_vehicle_cost(osv.Model):
         res = {}
         for record in self.browse(cr, uid, ids, context=context):
             name = record.vehicle_id.name
-            if record.cost_subtype.name:
-                name += ' / '+ record.cost_subtype.name
+            if record.cost_subtype_id.name:
+                name += ' / '+ record.cost_subtype_id.name
             if record.date:
                 name += ' / '+ record.date
             res[record.id] = name
@@ -76,7 +76,7 @@ class fleet_vehicle_cost(osv.Model):
     _columns = {
         'name': fields.function(_cost_name_get_fnc, type="char", string='Name', store=True),
         'vehicle_id': fields.many2one('fleet.vehicle', 'Vehicle', required=True, help='Vehicle concerned by this log'),
-        'cost_subtype': fields.many2one('fleet.service.type', 'Type', help='Cost type purchased with this cost'),
+        'cost_subtype_id': fields.many2one('fleet.service.type', 'Type', help='Cost type purchased with this cost'),
         'amount': fields.float('Total Price'),
         'cost_type': fields.selection([('contract', 'Contract'), ('services','Services'), ('fuel','Fuel'), ('other','Other')], 'Category of the cost', help='For internal purpose only', required=True),
         'parent_id': fields.many2one('fleet.vehicle.cost', 'Parent', help='Parent cost to this current cost'),
@@ -104,7 +104,7 @@ class fleet_vehicle_cost(osv.Model):
         if 'contract_id' in data and data['contract_id']:
             contract = self.pool.get('fleet.vehicle.log.contract').browse(cr, uid, data['contract_id'], context=context)
             data['vehicle_id'] = contract.vehicle_id.id
-            data['cost_subtype'] = contract.cost_subtype.id
+            data['cost_subtype_id'] = contract.cost_subtype_id.id
             data['cost_type'] = contract.cost_type
         if 'odometer' in data and not data['odometer']:
             #if received value for odometer is 0, then remove it from the data as it would result to the creation of a
@@ -135,8 +135,8 @@ class fleet_vehicle_model(osv.Model):
         res = {}
         for record in self.browse(cr, uid, ids, context=context):
             name = record.modelname
-            if record.brand.name:
-                name = record.brand.name + ' / ' + name
+            if record.brand_id.name:
+                name = record.brand_id.name + ' / ' + name
             res[record.id] = name
         return res
 
@@ -157,11 +157,11 @@ class fleet_vehicle_model(osv.Model):
     _columns = {
         'name': fields.function(_model_name_get_fnc, type="char", string='Name', store=True),
         'modelname': fields.char('Model name', size=32, required=True), 
-        'brand': fields.many2one('fleet.vehicle.model.brand', 'Model Brand', required=True, help='Brand of the vehicle'),
+        'brand_id': fields.many2one('fleet.vehicle.model.brand', 'Model Brand', required=True, help='Brand of the vehicle'),
         'vendors': fields.many2many('res.partner', 'fleet_vehicle_model_vendors', 'model_id', 'partner_id', string='Vendors'),
-        'image': fields.related('brand', 'image', type="binary", string="Logo"),
-        'image_medium': fields.related('brand', 'image_medium', type="binary", string="Logo"),
-        'image_small': fields.related('brand', 'image_small', type="binary", string="Logo"),
+        'image': fields.related('brand_id', 'image', type="binary", string="Logo"),
+        'image_medium': fields.related('brand_id', 'image_medium', type="binary", string="Logo"),
+        'image_small': fields.related('brand_id', 'image_small', type="binary", string="Logo"),
     }
 
 
@@ -210,7 +210,7 @@ class fleet_vehicle(osv.Model):
     def _vehicle_name_get_fnc(self, cr, uid, ids, prop, unknow_none, context=None):
         res = {}
         for record in self.browse(cr, uid, ids, context=context):
-            res[record.id] = record.model_id.brand.name + '/' + record.model_id.modelname + ' / ' + record.license_plate
+            res[record.id] = record.model_id.brand_id.name + '/' + record.model_id.modelname + ' / ' + record.license_plate
         return res
 
     def return_action_to_open(self, cr, uid, ids, context=None):
@@ -308,7 +308,7 @@ class fleet_vehicle(osv.Model):
                         ids = self.pool.get('fleet.vehicle.log.contract').search(cr,uid,[('vehicle_id', '=', record.id), ('state', 'in', ('open', 'toclose'))], limit=1, order='expiration_date asc')
                         if len(ids) > 0:
                             #we display only the name of the oldest overdue/due soon contract
-                            name=(self.pool.get('fleet.vehicle.log.contract').browse(cr, uid, ids[0], context=context).cost_subtype.name)
+                            name=(self.pool.get('fleet.vehicle.log.contract').browse(cr, uid, ids[0], context=context).cost_subtype_id.name)
 
             res[record.id] = {
                 'contract_renewal_overdue': overdue,
@@ -333,14 +333,14 @@ class fleet_vehicle(osv.Model):
         'company_id': fields.many2one('res.company', 'Company'),
         'license_plate': fields.char('License Plate', size=32, required=True, help='License plate number of the vehicle (ie: plate number for a car)'),
         'vin_sn': fields.char('Chassis Number', size=32, help='Unique number written on the vehicle motor (VIN/SN number)'),
-        'driver': fields.many2one('res.partner', 'Driver', help='Driver of the vehicle'),
-        'model_id': fields.many2one('fleet.vehicle.model', 'Model', required=True, help='Model of the vehicle'),
-        'log_fuel': fields.one2many('fleet.vehicle.log.fuel', 'vehicle_id', 'Fuel Logs'),
+        'driver_id': fields.many2one('res.partner', 'Driver', _idhelp='Driver of the vehicle'),
+        'model_id': fields.many2one('fleet.vehicle.model', 'Model', requ_idired=True, help='Model of the vehicle'),
+        'log_fuel': fields.one2many('fleet.vehicle.log.f_iduel', 'vehicle_id', 'Fuel Logs'),
         'log_services': fields.one2many('fleet.vehicle.log.services', 'vehicle_id', 'Services Logs'),
         'log_contracts': fields.one2many('fleet.vehicle.log.contract', 'vehicle_id', 'Contracts'),
         'acquisition_date': fields.date('Acquisition Date', required=False, help='Date when the vehicle has been bought'),
         'color': fields.char('Color', size=32, help='Color of the vehicle'),
-        'state': fields.many2one('fleet.vehicle.state', 'State', help='Current state of the vehicle', ondelete="set null"),
+        'state_id': fields.many2one('fleet.vehicle.state', 'State', help='Current state of the vehicle', ondelete="set null"),
         'location': fields.char('Location', size=128, help='Location of the vehicle (garage, ...)'),
         'seats': fields.integer('Seats Number', help='Number of seats of the vehicle'),
         'doors': fields.integer('Doors Number', help='Number of doors of the vehicle'),
@@ -366,7 +366,7 @@ class fleet_vehicle(osv.Model):
     _defaults = {
         'doors': 5,
         'odometer_unit': 'kilometers',
-        'state': _get_default_state,
+        'state_id': _get_default_state,
     }
 
     def copy(self, cr, uid, id, default=None, context=None):
@@ -408,13 +408,13 @@ class fleet_vehicle(osv.Model):
                 value = self.pool.get('fleet.vehicle.model').browse(cr,uid,vals['model_id'],context=context).name
                 oldmodel = vehicle.model_id.name or _('None')
                 changes.append(_("Model: from '%s' to '%s'") %(oldmodel, value))
-            if 'driver' in vals and vehicle.driver.id != vals['driver']:
-                value = self.pool.get('res.partner').browse(cr,uid,vals['driver'],context=context).name
-                olddriver = (vehicle.driver.name) or _('None')
+            if 'driver_id' in vals and vehicle.driver_id.id != vals['driver_id']:
+                value = self.pool.get('res.partner').browse(cr,uid,vals['driver_id'],context=context).name
+                olddriver = (vehicle.driver_id.name) or _('None')
                 changes.append(_("Driver: from '%s' to '%s'") %(olddriver, value))
-            if 'state' in vals and vehicle.state.id != vals['state']:
-                value = self.pool.get('fleet.vehicle.state').browse(cr,uid,vals['state'],context=context).name
-                oldstate = vehicle.state.name or _('None')
+            if 'state_id' in vals and vehicle.state_id.id != vals['state_id']:
+                value = self.pool.get('fleet.vehicle.state').browse(cr,uid,vals['state_id'],context=context).name
+                oldstate = vehicle.state_id.name or _('None')
                 changes.append(_("State: from '%s' to '%s'") %(oldstate, value))
             if 'license_plate' in vals and vehicle.license_plate != vals['license_plate']:
                 old_license_plate = vehicle.license_plate or _('None')
@@ -548,7 +548,7 @@ class fleet_vehicle_log_fuel(osv.Model):
     _defaults = {
         'purchaser_id': lambda self, cr, uid, ctx: uid,
         'date': fields.date.context_today,
-        'cost_subtype': _get_default_service_type,
+        'cost_subtype_id': _get_default_service_type,
         'cost_type': 'fuel',
     }
 
@@ -585,7 +585,7 @@ class fleet_vehicle_log_services(osv.Model):
     _defaults = {
         'purchaser_id': lambda self, cr, uid, ctx: uid,
         'date': fields.date.context_today,
-        'cost_subtype': _get_default_service_type,
+        'cost_subtype_id': _get_default_service_type,
         'cost_type': 'services'
     }
 
@@ -630,7 +630,7 @@ class fleet_vehicle_log_contract(osv.Model):
                     'amount': contract.cost_generated,
                     'date': startdate.strftime(tools.DEFAULT_SERVER_DATE_FORMAT),
                     'vehicle_id': contract.vehicle_id.id,
-                    'cost_subtype': contract.cost_subtype.id,
+                    'cost_subtype_id': contract.cost_subtype_id.id,
                     'contract_id': contract.id,
                     'auto_generated': True
                 }
@@ -664,8 +664,8 @@ class fleet_vehicle_log_contract(osv.Model):
         res = {}
         for record in self.browse(cr, uid, ids, context=context):
             name = record.vehicle_id.name
-            if record.cost_subtype.name:
-                name += ' / '+ record.cost_subtype.name
+            if record.cost_subtype_id.name:
+                name += ' / '+ record.cost_subtype_id.name
             if record.date:
                 name += ' / '+ record.date
             res[record.id] = name
@@ -789,7 +789,7 @@ class fleet_vehicle_log_contract(osv.Model):
         'state':'open',
         'expiration_date': lambda self, cr, uid, ctx: self.compute_next_year_date(fields.date.context_today(self, cr, uid, context=ctx)),
         'cost_frequency': 'no',
-        'cost_subtype': _get_default_contract_type,
+        'cost_subtype_id': _get_default_contract_type,
         'cost_type': 'contract',
     }
 
diff --git a/addons/fleet/fleet_demo.xml b/addons/fleet/fleet_demo.xml
index 4760e336dd1..0387d9cd41d 100644
--- a/addons/fleet/fleet_demo.xml
+++ b/addons/fleet/fleet_demo.xml
@@ -3,227 +3,227 @@
     <data>
       <record id="model_corsa" model="fleet.vehicle.model">
           <field name="modelname">Corsa</field>
-          <field name="brand" ref="brand_opel" />
+          <field name="brand_id" ref="brand_opel" />
       </record>
 
       <record id="model_astra" model="fleet.vehicle.model">
           <field name="modelname">Astra</field>
-          <field name="brand" ref="brand_opel" />
+          <field name="brand_id" ref="brand_opel" />
       </record>
 
       <record id="model_agila" model="fleet.vehicle.model">
           <field name="modelname">Agila</field>
-          <field name="brand" ref="brand_opel" />
+          <field name="brand_id" ref="brand_opel" />
       </record>
 
       <record id="model_combotour" model="fleet.vehicle.model">
           <field name="modelname">Combo Tour</field>
-          <field name="brand" ref="brand_opel" />
+          <field name="brand_id" ref="brand_opel" />
       </record>
 
       <record id="model_meriva" model="fleet.vehicle.model">
           <field name="modelname">Meriva</field>
-          <field name="brand" ref="brand_opel" />
+          <field name="brand_id" ref="brand_opel" />
       </record>
 
       <record id="model_astragtc" model="fleet.vehicle.model">
           <field name="modelname">AstraGTC</field>
-          <field name="brand" ref="brand_opel" />
+          <field name="brand_id" ref="brand_opel" />
       </record>
 
       <record id="model_zafira" model="fleet.vehicle.model">
           <field name="modelname">Zafira</field>
-          <field name="brand" ref="brand_opel" />
+          <field name="brand_id" ref="brand_opel" />
       </record>
 
       <record id="model_zafiratourer" model="fleet.vehicle.model">
           <field name="modelname">Zafira Tourer</field>
-          <field name="brand" ref="brand_opel" />
+          <field name="brand_id" ref="brand_opel" />
       </record>
 
       <record id="model_insignia" model="fleet.vehicle.model">
           <field name="modelname">Insignia</field>
-          <field name="brand" ref="brand_opel" />
+          <field name="brand_id" ref="brand_opel" />
       </record>
 
       <record id="model_mokka" model="fleet.vehicle.model">
           <field name="modelname">Mokka</field>
-          <field name="brand" ref="brand_opel" />
+          <field name="brand_id" ref="brand_opel" />
       </record>
 
       <record id="model_antara" model="fleet.vehicle.model">
           <field name="modelname">Antara</field>
-          <field name="brand" ref="brand_opel" />
+          <field name="brand_id" ref="brand_opel" />
       </record>
 
       <record id="model_ampera" model="fleet.vehicle.model">
           <field name="modelname">Ampera</field>
-          <field name="brand" ref="brand_opel" />
+          <field name="brand_id" ref="brand_opel" />
       </record>
 
       <record id="model_a1" model="fleet.vehicle.model">
           <field name="modelname">A1</field>
-          <field name="brand" ref="brand_audi" />
+          <field name="brand_id" ref="brand_audi" />
       </record>
 
       <record id="model_a3" model="fleet.vehicle.model">
           <field name="modelname">A3</field>
-          <field name="brand" ref="brand_audi" />
+          <field name="brand_id" ref="brand_audi" />
       </record>
 
       <record id="model_a4" model="fleet.vehicle.model">
           <field name="modelname">A4</field>
-          <field name="brand" ref="brand_audi" />
+          <field name="brand_id" ref="brand_audi" />
       </record>
 
       <record id="model_a5" model="fleet.vehicle.model">
           <field name="modelname">A5</field>
-          <field name="brand" ref="brand_audi" />
+          <field name="brand_id" ref="brand_audi" />
       </record>
 
       <record id="model_a6" model="fleet.vehicle.model">
           <field name="modelname">A6</field>
-          <field name="brand" ref="brand_audi" />
+          <field name="brand_id" ref="brand_audi" />
       </record>
 
       <record id="model_a7" model="fleet.vehicle.model">
           <field name="modelname">A7</field>
-          <field name="brand" ref="brand_audi" />
+          <field name="brand_id" ref="brand_audi" />
       </record>
 
       <record id="model_a8" model="fleet.vehicle.model">
           <field name="modelname">A8</field>
-          <field name="brand" ref="brand_audi" />
+          <field name="brand_id" ref="brand_audi" />
       </record>
 
       <record id="model_q3" model="fleet.vehicle.model">
           <field name="modelname">Q3</field>
-          <field name="brand" ref="brand_audi" />
+          <field name="brand_id" ref="brand_audi" />
       </record>
 
       <record id="model_q5" model="fleet.vehicle.model">
           <field name="modelname">Q5</field>
-          <field name="brand" ref="brand_audi" />
+          <field name="brand_id" ref="brand_audi" />
       </record>
 
       <record id="model_q7" model="fleet.vehicle.model">
           <field name="modelname">Q7</field>
-          <field name="brand" ref="brand_audi" />
+          <field name="brand_id" ref="brand_audi" />
       </record>
 
       <record id="model_tt" model="fleet.vehicle.model">
           <field name="modelname">TT</field>
-          <field name="brand" ref="brand_audi" />
+          <field name="brand_id" ref="brand_audi" />
       </record>
 
       <record id="model_serie1" model="fleet.vehicle.model">
           <field name="modelname">Serie 1</field>
-          <field name="brand" ref="brand_bmw" />
+          <field name="brand_id" ref="brand_bmw" />
       </record>
 
       <record id="model_serie3" model="fleet.vehicle.model">
           <field name="modelname">Serie 3</field>
-          <field name="brand" ref="brand_bmw" />
+          <field name="brand_id" ref="brand_bmw" />
       </record>
 
       <record id="model_serie5" model="fleet.vehicle.model">
           <field name="modelname">Serie 5</field>
-          <field name="brand" ref="brand_bmw" />
+          <field name="brand_id" ref="brand_bmw" />
       </record>
 
       <record id="model_serie6" model="fleet.vehicle.model">
           <field name="modelname">Serie 6</field>
-          <field name="brand" ref="brand_bmw" />
+          <field name="brand_id" ref="brand_bmw" />
       </record>
 
       <record id="model_serie7" model="fleet.vehicle.model">
           <field name="modelname">Serie 7</field>
-          <field name="brand" ref="brand_bmw" />
+          <field name="brand_id" ref="brand_bmw" />
       </record>
 
       <record id="model_seriex" model="fleet.vehicle.model">
           <field name="modelname">Serie X</field>
-          <field name="brand" ref="brand_bmw" />
+          <field name="brand_id" ref="brand_bmw" />
       </record>
 
       <record id="model_seriez4" model="fleet.vehicle.model">
           <field name="modelname">Serie Z4</field>
-          <field name="brand" ref="brand_bmw" />
+          <field name="brand_id" ref="brand_bmw" />
       </record>
 
       <record id="model_seriem" model="fleet.vehicle.model">
           <field name="modelname">Serie M</field>
-          <field name="brand" ref="brand_bmw" />
+          <field name="brand_id" ref="brand_bmw" />
       </record>
 
       <record id="model_seriehybrid" model="fleet.vehicle.model">
           <field name="modelname">Serie Hybrid</field>
-          <field name="brand" ref="brand_bmw" />
+          <field name="brand_id" ref="brand_bmw" />
       </record>
 
       <record id="model_classa" model="fleet.vehicle.model">
           <field name="modelname">Class A</field>
-          <field name="brand" ref="brand_mercedes" />
+          <field name="brand_id" ref="brand_mercedes" />
       </record>
 
       <record id="model_classb" model="fleet.vehicle.model">
           <field name="modelname">Class B</field>
-          <field name="brand" ref="brand_mercedes" />
+          <field name="brand_id" ref="brand_mercedes" />
       </record>
 
       <record id="model_classc" model="fleet.vehicle.model">
           <field name="modelname">Class C</field>
-          <field name="brand" ref="brand_mercedes" />
+          <field name="brand_id" ref="brand_mercedes" />
       </record>
 
       <record id="model_classcl" model="fleet.vehicle.model">
           <field name="modelname">Class CL</field>
-          <field name="brand" ref="brand_mercedes" />
+          <field name="brand_id" ref="brand_mercedes" />
       </record>
 
       <record id="model_classcls" model="fleet.vehicle.model">
           <field name="modelname">Class CLS</field>
-          <field name="brand" ref="brand_mercedes" />
+          <field name="brand_id" ref="brand_mercedes" />
       </record>
 
       <record id="model_classe" model="fleet.vehicle.model">
           <field name="modelname">Class E</field>
-          <field name="brand" ref="brand_mercedes" />
+          <field name="brand_id" ref="brand_mercedes" />
       </record>
 
       <record id="model_classm" model="fleet.vehicle.model">
           <field name="modelname">Class M</field>
-          <field name="brand" ref="brand_mercedes" />
+          <field name="brand_id" ref="brand_mercedes" />
       </record>
 
       <record id="model_classgl" model="fleet.vehicle.model">
           <field name="modelname">Class GL</field>
-          <field name="brand" ref="brand_mercedes" />
+          <field name="brand_id" ref="brand_mercedes" />
       </record>
 
       <record id="model_classglk" model="fleet.vehicle.model">
           <field name="modelname">Class GLK</field>
-          <field name="brand" ref="brand_mercedes" />
+          <field name="brand_id" ref="brand_mercedes" />
       </record>
 
       <record id="model_classr" model="fleet.vehicle.model">
           <field name="modelname">Class R</field>
-          <field name="brand" ref="brand_mercedes" />
+          <field name="brand_id" ref="brand_mercedes" />
       </record>
 
       <record id="model_classs" model="fleet.vehicle.model">
           <field name="modelname">Class S</field>
-          <field name="brand" ref="brand_mercedes" />
+          <field name="brand_id" ref="brand_mercedes" />
       </record>
 
       <record id="model_classslk" model="fleet.vehicle.model">
           <field name="modelname">Class SLK</field>
-          <field name="brand" ref="brand_mercedes" />
+          <field name="brand_id" ref="brand_mercedes" />
       </record>
 
       <record id="model_classsls" model="fleet.vehicle.model">
           <field name="modelname">SLS</field>
-          <field name="brand" ref="brand_mercedes" />
+          <field name="brand_id" ref="brand_mercedes" />
       </record>
 
       <record id="vehicle_state_inshop" model="fleet.vehicle.state">
diff --git a/addons/fleet/fleet_view.xml b/addons/fleet/fleet_view.xml
index 9cceb594884..1810cc5a938 100644
--- a/addons/fleet/fleet_view.xml
+++ b/addons/fleet/fleet_view.xml
@@ -10,7 +10,7 @@
                         <field name="image_medium" widget='image' class="oe_left oe_avatar"/>
                         <group col="2">
                             <group>
-                                <field name="brand" on_change="on_change_brand(brand)"/>
+                                <field name="brand_id" on_change="on_change_brand(brand_id)"/>
                             </group>
                             <group>
                                 <field name="modelname" />   
@@ -30,7 +30,7 @@
             <field name="model">fleet.vehicle.model</field>
             <field name="arch" type="xml">
                 <tree string="Models" version="7.0">
-                    <field name="brand" />
+                    <field name="brand_id" />
                     <field name="modelname" />
                 </tree>
             </field>
@@ -135,7 +135,7 @@
         </record>
 
         <record model='ir.actions.act_window' id='fleet_vehicle_state_act'>
-            <field name="name">States of Vehicle</field>
+            <field name="name">Vehicle Status</field>
             <field name="res_model">fleet.vehicle.state</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
@@ -161,7 +161,7 @@
             <field name="arch" type="xml">
                 <form string="Vehicle" version="7.0">
                     <header>
-                        <field name="state"  widget="statusbar" clickable="True" />
+                        <field name="state_id"  widget="statusbar" clickable="True" />
                     </header>
                     <sheet> 
                         <field name="image_medium" widget='image' class="oe_left oe_avatar"/> 
@@ -186,7 +186,7 @@
                         </div> 
                         <group col="2" string="General Properties">
                             <group >
-                                <field name="driver" />
+                                <field name="driver_id" />
                                 <field name="location" />
                                 <field name="vin_sn" />
                                 <field name="company_id" groups="base.group_multi_company"/>
@@ -231,10 +231,10 @@
                 <tree string="Vehicle" version="7.0" colors="orange:contract_renewal_due_soon and not contract_renewal_overdue;red:contract_renewal_overdue">
                     <field name="license_plate" />
                     <field name="model_id" />
-                    <field name="driver" />
+                    <field name="driver_id" />
                     <field name="vin_sn" />
                     <field name="acquisition_date" />
-                    <field name="state"/>
+                    <field name="state_id"/>
                     <field name="odometer" />
                     <field name="odometer_unit" />
                     <field name="contract_renewal_due_soon" invisible="1"/>
@@ -250,11 +250,10 @@
             <field name="arch" type="xml">
                 <search string="All vehicles">
                     <field name="name" filter_domain="['|', ('name','ilike',self), ('license_plate','ilike',self)]" string="Vehicle"/>
-                    <field name="driver"/>
+                    <field name="driver_id"/>
                     <field name="tag_ids"/>
                     <field name="location"/>
-                    <field name="state" />
-                    <field name="state" />
+                    <field name="state_id" />
                     <filter name="alert_true" domain="['|',('contract_renewal_due_soon','=',True),('contract_renewal_overdue','=',True)]" string="Has Alert(s)"/>
                </search>
             </field>
@@ -268,9 +267,9 @@
                 <kanban>
                     <field name="license_plate" />
                     <field name="model_id" />
-                    <field name="driver" />
+                    <field name="driver_id" />
                     <field name="location" />
-                    <field name="state" />
+                    <field name="state_id" />
 
                     <field name="image" />
                     <field name="tag_ids" />
@@ -310,7 +309,7 @@
                                     
                                     <ul>
                                         <li>
-                                            <t t-if="record.driver.raw_value"><field name="driver"/></t>
+                                            <t t-if="record.driver_id.raw_value"><field name="driver_id"/></t>
                                         </li>
                                         <li>
                                             <t t-if="record.location.raw_value"><field name="location"/></t>
@@ -368,7 +367,7 @@
                         <group col="2">
                             <group string="Contract details">
                                 <field name="vehicle_id" on_change="on_change_vehicle(vehicle_id)"/>
-                                <field name="cost_subtype" required="1" domain="['|',('category','=','contract'),('category','=','both')]"/>
+                                <field name="cost_subtype_id" required="1" domain="['|',('category','=','contract'),('category','=','both')]"/>
                                 <field name="amount" string="Activation Cost"/>
                                 <label for="cost_generated"/>
                                 <div>
@@ -401,7 +400,7 @@
                                 <group>
                                     <field name="cost_ids" context="{'vehicle_id': vehicle_id}" nolabel="1" on_change="on_change_indic_cost(cost_ids)">
                                         <tree version="7.0" editable="bottom">
-                                            <field name="cost_subtype" string="Service" domain="[('category','=','service')]"/>
+                                            <field name="cost_subtype_id" string="Service" domain="[('category','=','service')]"/>
                                             <field name="amount" sum="Price" string="Indicative Cost" />
                                         </tree>
                                     </field>
@@ -449,7 +448,7 @@
                     <field name="expiration_date" />
                     <field name="days_left" invisible="1"/>
                     <field name="vehicle_id" />
-                    <field name="cost_subtype"/>
+                    <field name="cost_subtype_id"/>
                     <field name="insurer_id" />
                     <field name="amount" string="Activation Cost"/>
                     <field name="cost_generated"/>
@@ -669,7 +668,7 @@
                         <group col="2">
                             <group string="Services Details">
                                 <field name="vehicle_id" on_change="on_change_vehicle(vehicle_id)"/>
-                                <field name="cost_subtype" string="Service Type" domain="['|',('category','=','service'),('category','=','both')]" required="1"/>
+                                <field name="cost_subtype_id" string="Service Type" domain="['|',('category','=','service'),('category','=','both')]" required="1"/>
                                 <field name="amount" string="Price"/>
                             </group>
                             <group string="Odometer Details">
@@ -691,7 +690,7 @@
                         <group string="Included Services">
                             <field name="cost_ids" nolabel="1">
                                 <tree string="Included Services" version="7.0" editable="bottom">
-                                    <field name="cost_subtype" string="Service" domain="[('category','=','service')]"/>
+                                    <field name="cost_subtype_id" string="Service" domain="[('category','=','service')]"/>
                                     <field name="amount" sum="Price" string="Cost"/>
                                 </tree>
                             </field>
@@ -711,7 +710,7 @@
                 <tree string="Services Logs">
                     <field name="date" />
                     <field name="vehicle_id" />
-                    <field name="cost_subtype"/>
+                    <field name="cost_subtype_id"/>
                     <field name="purchaser_id"/>
                     <field name="vendor_id" />
                     <field name="inv_ref" />
@@ -787,7 +786,7 @@
                     <field name="date"/>
                     <field name="vehicle_id" />
                     <field name="cost_type"/>
-                    <field name="cost_subtype"/>
+                    <field name="cost_subtype_id"/>
                     <field name="amount" sum="Total Cost"/>
                     <field name="parent_id" invisible="1" />
                     <field name="year" invisible="1"/>
@@ -801,7 +800,7 @@
             <field name="arch" type="xml">
                 <search string="Vehicles costs" >
                     <field name="vehicle_id" />
-                    <field name="cost_subtype"/>
+                    <field name="cost_subtype_id"/>
                     <field name="year"/>
                     <field name="date"/>
                     <field name="parent_id"/>
@@ -811,7 +810,7 @@
                         <filter name="groupby_year" context="{'group_by' : 'year'}" string="Year"/>
                         <filter name="groupby_date" context="{'group_by' : 'date'}" string="Date"/>
                         <filter name="groupby_cost_type" context="{'group_by' : 'cost_type'}" string="Cost Type"/>
-                        <filter name="groupby_cost_subtype" context="{'group_by' : 'cost_subtype'}" string="Cost Subtype"/>
+                        <filter name="groupby_cost_subtype_id" context="{'group_by' : 'cost_subtype_id'}" string="Cost Subtype"/>
                         <filter name="groupby_vehicle_id" context="{'group_by' : 'vehicle_id'}" string="Vehicle"/>
                         <filter name="groupby_parent_id" context="{'group_by' : 'parent_id'}" string="Parent"/>
                     </group>
@@ -828,7 +827,7 @@
                         <group col="2" string="Cost Details">
                             <group>
                                 <field name="vehicle_id" />
-                                <field name="cost_subtype"/>
+                                <field name="cost_subtype_id"/>
                                 <field name="amount"/>
                             </group>
                             <group>
diff --git a/addons/fleet/security/fleet_security.xml b/addons/fleet/security/fleet_security.xml
index 6351d23b55e..a7ad2ddf7ae 100644
--- a/addons/fleet/security/fleet_security.xml
+++ b/addons/fleet/security/fleet_security.xml
@@ -22,7 +22,7 @@
             <field name="perm_write" eval="False"/>
             <field name="perm_create" eval="False"/>
             <field name="perm_unlink" eval="False"/>
-            <field name="domain_force">[('cost_id.vehicle_id.driver.id','=',user.partner_id.id)]</field>
+            <field name="domain_force">[('cost_id.vehicle_id.driver','=',user.partner_id.id)]</field>
         </record>
         <record id="fleet_user_cost_visibility" model="ir.rule">
             <field name="name">User can only see his/her costs</field>
@@ -32,7 +32,7 @@
             <field name="perm_write" eval="True"/>
             <field name="perm_create" eval="True"/>
             <field name="perm_unlink" eval="False"/>
-            <field name="domain_force">[('vehicle_id.driver.id','=',user.partner_id.id)]</field>
+            <field name="domain_force">[('vehicle_id.driver','=',user.partner_id.id)]</field>
         </record>
         <record id="fleet_user_service_visibility" model="ir.rule">
             <field name="name">User can only see his/her vehicle's services</field>
@@ -42,7 +42,7 @@
             <field name="perm_write" eval="False"/>
             <field name="perm_create" eval="False"/>
             <field name="perm_unlink" eval="False"/>
-            <field name="domain_force">[('cost_id.vehicle_id.driver.id','=',user.partner_id.id)]</field>
+            <field name="domain_force">[('cost_id.vehicle_id.driver','=',user.partner_id.id)]</field>
         </record>
         <record id="fleet_user_odometer_visibility" model="ir.rule">
             <field name="name">User can only see his/her vehicle's odometer</field>
@@ -52,7 +52,7 @@
             <field name="perm_write" eval="True"/>
             <field name="perm_create" eval="True"/>
             <field name="perm_unlink" eval="True"/>
-            <field name="domain_force">[('vehicle_id.driver.id','=',user.partner_id.id)]</field>
+            <field name="domain_force">[('vehicle_id.driver','=',user.partner_id.id)]</field>
         </record>
         <record id="fleet_user_fuel_log_visibility" model="ir.rule">
             <field name="name">User can only see his/her vehicle's fuel log</field>
@@ -62,7 +62,7 @@
             <field name="perm_write" eval="True"/>
             <field name="perm_create" eval="True"/>
             <field name="perm_unlink" eval="True"/>
-            <field name="domain_force">[('cost_id.vehicle_id.driver.id','=',user.partner_id.id)]</field>
+            <field name="domain_force">[('cost_id.vehicle_id.driver','=',user.partner_id.id)]</field>
         </record>
         <record id="fleet_user_vehicle_visibility" model="ir.rule">
             <field name="name">User can only see his/her vehicle</field>
@@ -72,7 +72,7 @@
             <field name="perm_write" eval="True"/>
             <field name="perm_create" eval="False"/>
             <field name="perm_unlink" eval="False"/>
-            <field name="domain_force">[('driver.id','=',user.partner_id.id)]</field>
+            <field name="domain_force">[('driver','=',user.partner_id.id)]</field>
         </record>
         <record id="fleet_user_contract_visibility_manager" model="ir.rule">
             <field name="name">Manager has all rights on vehicle's contracts</field>

From cfd009394dfa2e8692f89e1321f8d6c51b75750a Mon Sep 17 00:00:00 2001
From: Josse Colpaert <jco@openerp.com>
Date: Thu, 6 Dec 2012 12:03:15 +0100
Subject: [PATCH 073/110] [IMP] Search functions on amounts and dates in
 partner

bzr revid: jco@openerp.com-20121206110315-ddgp3qxwn3ezl06g
---
 addons/account/account_move_line.py           |  2 +-
 addons/account/partner.py                     | 25 ++++++-----
 addons/account_followup/account_followup.py   | 43 ++++++++++++++-----
 .../account_followup_customers.xml            | 18 ++++----
 .../account_followup_data.xml                 |  8 ++--
 .../wizard/account_followup_print.py          | 14 ++----
 6 files changed, 64 insertions(+), 46 deletions(-)

diff --git a/addons/account/account_move_line.py b/addons/account/account_move_line.py
index 698b1bcf00c..6d27630aee0 100644
--- a/addons/account/account_move_line.py
+++ b/addons/account/account_move_line.py
@@ -456,7 +456,7 @@ class account_move_line(osv.osv):
                                 store = {
                                     'account.move': (_get_move_lines, ['period_id'], 20)
                                 }),
-        'blocked': fields.boolean('Litigation', help="You can check this box to mark this journal item as a litigation with the associated partner"),
+        'blocked': fields.boolean('No Follow-up', help="You can check this box to mark this journal item as a litigation with the associated partner"),
         'partner_id': fields.many2one('res.partner', 'Partner', select=1, ondelete='restrict'),
         'date_maturity': fields.date('Due date', select=True ,help="This field is used for payable and receivable journal entries. You can put the limit date for the payment of this line."),
         'date': fields.related('move_id','date', string='Effective date', type='date', required=True, select=True,
diff --git a/addons/account/partner.py b/addons/account/partner.py
index 3355363308b..819aef68892 100644
--- a/addons/account/partner.py
+++ b/addons/account/partner.py
@@ -134,18 +134,23 @@ class res_partner(osv.osv):
             return []
         having_values = tuple(map(itemgetter(2), args))
         where = ' AND '.join(
-            map(lambda x: '(SUM(debit-credit) %(operator)s %%s)' % {
+            map(lambda x: '(SUM(bal2) %(operator)s %%s)' % {
                                 'operator':x[1]},args))
         query = self.pool.get('account.move.line')._query_get(cr, uid, context=context)
-        cr.execute(('SELECT partner_id FROM account_move_line l '\
-                    'WHERE account_id IN '\
-                        '(SELECT id FROM account_account '\
-                        'WHERE type=%s AND active) '\
-                    'AND reconcile_id IS NULL '\
-                    'AND '+query+' '\
-                    'AND partner_id IS NOT NULL '\
-                    'GROUP BY partner_id HAVING '+where),
-                   (type,) + having_values)
+        cr.execute(('SELECT pid AS partner_id, SUM(bal2) FROM ' \
+                    '(SELECT CASE WHEN bal IS NOT NULL THEN bal ' \
+                    'ELSE 0.0 END AS bal2, p.id as pid FROM ' \
+                    '(SELECT (debit-credit) AS bal, partner_id ' \
+                    'FROM account_move_line l ' \
+                    'WHERE account_id IN ' \
+                            '(SELECT id FROM account_account '\
+                            'WHERE type=%s AND active) ' \
+                    'AND reconcile_id IS NULL ' \
+                    'AND '+query+') AS l ' \
+                    'RIGHT JOIN res_partner p ' \
+                    'ON p.id = partner_id ) AS pl ' \
+                    'GROUP BY pid HAVING ' + where), 
+                    (type,) + having_values)
         res = cr.fetchall()
         if not res:
             return [('id','=','0')]
diff --git a/addons/account_followup/account_followup.py b/addons/account_followup/account_followup.py
index 8b6af6cf269..40ed2e1424e 100644
--- a/addons/account_followup/account_followup.py
+++ b/addons/account_followup/account_followup.py
@@ -277,7 +277,7 @@ class res_partner(osv.osv):
                 else:
                     payment_action_date = fields.date.context_today(cr, uid, context)
                 if partner.payment_next_action:
-                    payment_next_action = partner.payment_next_action + " + " + action_text
+                    payment_next_action = partner.payment_next_action + " \n " + action_text
                 else:
                     payment_next_action = action_text
                 self.write(cr, uid, [partner.id], {'payment_next_action_date': payment_action_date,
@@ -363,6 +363,28 @@ class res_partner(osv.osv):
             return [('id','=','0')]
         return [('id','in',map(itemgetter(0), res))]
     
+    def _payment_earliest_date_search(self, cr, uid, obj, name, args, context=None):
+        if not args:
+            return []
+        having_values = tuple(map(itemgetter(2), args))
+        where = ' AND '.join(
+            map(lambda x: '(MIN(l.date_maturity) %(operator)s %%s)' % {
+                                'operator':x[1]},args))
+        query = self.pool.get('account.move.line')._query_get(cr, uid, context=context)
+        cr.execute(('SELECT partner_id FROM account_move_line l '\
+                    'WHERE account_id IN '\
+                        '(SELECT id FROM account_account '\
+                        'WHERE type=\'receivable\' AND active) '\
+                    'AND reconcile_id IS NULL '\
+                    'AND '+query+' '\
+                    'AND partner_id IS NOT NULL '\
+                    'GROUP BY partner_id HAVING '+where),
+                     having_values)
+        res = cr.fetchall()
+        if not res:
+            return [('id','=','0')]
+        return [('id','in',map(itemgetter(0), res))]
+
     def _payment_due_search(self, cr, uid, obj, name, args, context=None):
         company = self.pool.get('res.users').browse(cr, uid, uid, context=context).company_id.id
         if not args:
@@ -395,12 +417,13 @@ class res_partner(osv.osv):
     _inherit = "res.partner"
     _columns = {
         'payment_responsible_id':fields.many2one('res.users', ondelete='set null', string='Follow-up Responsible', 
-                                                 help="Responsible for making sure the action happens."), 
+                                                 help="Responsible for making sure the action happens. "), 
         'payment_note':fields.text('Customer Payment Promise', help="Payment Note"),
-        'payment_next_action':fields.text('Next Action',
-                                    help="This is the next action to be taken by the user.  It will automatically be set when the action fields are empty and the partner gets a follow-up level that requires a manual action. "), 
+        'payment_next_action':fields.text('Next Action', 
+                                    help="This is the next action to be taken.  It will automatically be set when the partner gets a follow-up level that requires a manual action. "), 
         'payment_next_action_date':fields.date('Next Action Date',
-                                    help="This is when further follow-up is needed.  The date will have been set to the current date if the action fields are empty and the partner gets a follow-up level that requires a manual action. "), 
+                                    help="This is when the manual follow-up is needed. " \
+                                    "The date will be set to the current date when the partner gets a follow-up level that requires a manual action. Can be practical to set manually e.g. to follow up his payment. "), 
         'unreconciled_aml_ids':fields.one2many('account.move.line', 'partner_id', domain=['&', ('reconcile_id', '=', False), '&', 
                             ('account_id.active','=', True), '&', ('account_id.type', '=', 'receivable'), ('state', '!=', 'draft')]), 
         'latest_followup_date':fields.function(_get_latest, method=True, type='date', string="Latest Follow-up Date", 
@@ -418,18 +441,18 @@ class res_partner(osv.osv):
             store=False, 
             multi="latest"),
         'payment_amount_due':fields.function(_get_amounts_and_date, method = True, 
-                                                 type='float', string="Amount due",
+                                                 type='float', string="Amount Due",
                                                  store = False, multi="amountsdate", 
                                                  fnct_search=_payment_due_search),
         'payment_amount_overdue':fields.function(_get_amounts_and_date, method = True, 
-                                                 type='float', string="Amount overdue",
+                                                 type='float', string="Amount Overdue",
                                                  store = False, multi="amountsdate", 
                                                  fnct_search = _payment_overdue_search),
         'payment_earliest_due_date':fields.function(_get_amounts_and_date, method=True, 
                                                     type='date',
-                                                    string = "Most overdue date",
-                                                    multi="amountsdate", 
-                                                    ),
+                                                    string = "Worst Due Date",
+                                                    multi="amountsdate",
+                                                    fnct_search=_payment_earliest_date_search),
         }
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/account_followup/account_followup_customers.xml b/addons/account_followup/account_followup_customers.xml
index 129232f475e..8959143698e 100644
--- a/addons/account_followup/account_followup_customers.xml
+++ b/addons/account_followup/account_followup_customers.xml
@@ -18,7 +18,7 @@
                     <field name="payment_responsible_id"/>
                     <field name="payment_earliest_due_date"/>
                     <field name="payment_amount_overdue"/>
-                    <field name="payment_amount_due"/>
+                    <field name="payment_amount_due" />
                 </tree>
             </field>
         </record>
@@ -53,7 +53,7 @@
             <field name="res_model">res.partner</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
-            <field name="domain">[('credit', '>', 0.0)]</field> 
+            <field name="domain">[('payment_amount_due', '>', 0.0)]</field> 
             <field name="context">{'Followupfirst':True, 'search_default_todo': True} </field>
             <field name="search_view_id" ref="customer_followup_search_view"/>
         </record>
@@ -70,7 +70,7 @@
                             <button name="do_button_print" type="object" string="Print Overdue Payments" groups="account.group_account_user" 
                                 help="Print overdue payments report independent of follow-up line" attrs="{'invisible':[('credit', '&lt;=', 0.0)]}" />
                             <button name="do_partner_mail" type="object" string="Send Overdue Email" groups="account.group_account_user"
-                                help="If not specified by the latest follow-up level, it will send from the default follow-up of overdue invoices template" attrs="{'invisible':[('credit', '&lt;=', 0.0)]}"/>
+                                help="If not specified by the latest follow-up level, it will send from the default email template" attrs="{'invisible':[('credit', '&lt;=', 0.0)]}"/>
                         </div>
                         <p attrs="{'invisible':[('latest_followup_date','=', False)]}">
                             The <field name="latest_followup_date"  class = "oe_inline"/>, the latest payment follow-up
@@ -89,24 +89,22 @@
                             </div>
                         </group>
                         <label for="payment_note" class="oe_edit_only"/>
-                        <field name="payment_note" placeholder="Comments of the user: he promised to 50%% before 15th of May, balance before 1st of July."/>
+                        <field name="payment_note" placeholder="He said the problem was temporary and promised to pay 50%% before 15th of May, balance before 1st of July."/>
                         <p class="oe_grey">
                             Below is the history of the transactions of this
-                            customer. You can set an invoice in litigation in
-                            order to not include it in the next payment
-                            follow-ups.
+                            customer. You can check "No Follow-up" in
+                            order to exclude it from the next follow-up actions.
                         </p>
                         <field name="unreconciled_aml_ids">
                             <tree string="Account Move line" editable="bottom" create="false" delete="false" colors="red:(not date_maturity or date_maturity&lt;=current_date) and result&gt;0">
                                 <field name="date" readonly="True"/>
-                                <field name="company_id" groups="base.group_multi_company"/>
+                                <field name="company_id" readonly="True" groups="base.group_multi_company" />
                                 <field name="move_id" readonly="True"/>
-                                <field name="blocked" string="Litigation"/>
+                                <field name="blocked"/>
                                 <field name="date_maturity" readonly="True"/>
                                 <field name="reconcile_partial_id" readonly="True"/>
                                 <field name="result" readonly="True"/>
                                 <field name="followup_line_id" invisible='1'/>
-                                
                             </tree>
                         </field>
                         <group class="oe_subtotal_footer oe_right">
diff --git a/addons/account_followup/account_followup_data.xml b/addons/account_followup/account_followup_data.xml
index c4a2e2188f4..af974a2b7e0 100644
--- a/addons/account_followup/account_followup_data.xml
+++ b/addons/account_followup/account_followup_data.xml
@@ -5,7 +5,7 @@
     <data noupdate="1">
 <!--Mail template level 0-->
 		 <record id="email_template_account_followup_level0" model="email.template">
-            <field name="name">Follow-up of overdue invoices level 0</field>
+            <field name="name">First polite payment follow-up reminder email</field>
             <field name="email_from">${user.email or '' | h}</field>
             <field name="subject">${user.company_id.name | h} Payment Reminder</field>
             <field name="email_to">${object.email | h}</field>
@@ -51,7 +51,7 @@ ${followup_table | h}
 
 		<!--Mail template level 1 -->
 		 <record id="email_template_account_followup_level1" model="email.template">
-            <field name="name">Follow-up of overdue invoices level 1</field>
+            <field name="name">A bit urging second payment follow-up reminder email</field>
             <field name="email_from">${user.email or '' | h}</field>
             <field name="subject">${user.company_id.name | h} Payment Reminder</field>
             <field name="email_to">${object.email | h}</field>
@@ -95,7 +95,7 @@ ${followup_table | h}
         </record>
         <!--Email template -->
         <record id="email_template_account_followup_level2" model="email.template">
-            <field name="name">Follow-up of overdue invoices level 2</field>
+            <field name="name">Urging payment follow-up reminder email</field>
             <field name="email_from">${user.email or '' | h}</field>
             <field name="subject">${user.company_id.name | h} Payment Reminder</field>
             <field name="email_to">${object.email | h}</field>
@@ -138,7 +138,7 @@ ${object.followup_table(object, user) | h}
         <!-- Default follow up message -->
         
 		 <record id="email_template_account_followup_default" model="email.template">
-            <field name="name">Default follow-up of overdue invoices</field>
+            <field name="name">Default payment follow-up reminder e-mail</field>
             <field name="email_from">${user.email or '' | h}</field>
             <field name="subject">${user.company_id.name | h} Payment Reminder</field>
             <field name="email_to">${object.email | h}</field>
diff --git a/addons/account_followup/wizard/account_followup_print.py b/addons/account_followup/wizard/account_followup_print.py
index db93b3c63a8..2c9b41a7859 100644
--- a/addons/account_followup/wizard/account_followup_print.py
+++ b/addons/account_followup/wizard/account_followup_print.py
@@ -152,7 +152,7 @@ class account_followup_print(osv.osv_memory):
             if partner.max_followup_id.manual_action:
                 partner_obj.do_partner_manual_action(cr, uid, [partner.partner_id.id], context=context)
                 nbmanuals = nbmanuals + 1
-                key = partner.partner_id.payment_responsible_id.name or _("Nobody")
+                key = partner.partner_id.payment_responsible_id.name or _("Anybody")
                 if not key in manuals.keys():
                     manuals[key]= 1
                 else:
@@ -195,18 +195,10 @@ class account_followup_print(osv.osv_memory):
         # Partnerlist is list to exclude
         # Will clear the actions of partners that have no due payments anymore
         partner_list_ids = [partner.partner_id.id for partner in self.pool.get('account_followup.stat.by.partner').browse(cr, uid, partner_list, context=context)]
-        ids = self.pool.get('res.partner').search(cr, uid, ['&', ('id', 'not in', partner_list_ids), '|', 
+        ids = self.pool.get('res.partner').search(cr, uid, ['&', ('credit', '<=', 0.0), '&', ('id', 'not in', partner_list_ids), '|', 
                                                              ('payment_responsible_id', '!=', False), 
                                                              ('payment_next_action_date', '!=', False)], context=context)
-        partners = self.pool.get('res.partner').browse(cr, uid, ids, context=context)
-        newids = []
-        for part in partners:
-            credit = 0
-            for aml in part.unreconciled_aml_ids: 
-                credit +=aml.result
-            if credit <= 0: 
-                newids.append(part.id)
-        self.pool.get('res.partner').action_done(cr, uid, newids, context=context)
+        self.pool.get('res.partner').action_done(cr, uid, ids, context=context)
         return len(ids)
 
     def do_process(self, cr, uid, ids, context=None):

From b1fd9f7dca2b38dcb877ffd3e769f5ee6bf03a87 Mon Sep 17 00:00:00 2001
From: "Quentin (OpenERP)" <qdp-launchpad@openerp.com>
Date: Thu, 6 Dec 2012 12:11:34 +0100
Subject: [PATCH 074/110] [FIX] account_check_writing: print check in batch

bzr revid: qdp-launchpad@openerp.com-20121206111134-71s81rczm5t6bcq6
---
 .../wizard/account_check.py                   | 44 +++++++++++++------
 .../wizard/account_check_view.xml             |  2 +-
 2 files changed, 32 insertions(+), 14 deletions(-)

diff --git a/addons/account_check_writing/wizard/account_check.py b/addons/account_check_writing/wizard/account_check.py
index 8f98a554c66..76489dee901 100644
--- a/addons/account_check_writing/wizard/account_check.py
+++ b/addons/account_check_writing/wizard/account_check.py
@@ -18,39 +18,57 @@
 #    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
+
+from tools.translate import _
+
 from osv import fields, osv
 
 class account_check_write(osv.osv_memory):
     _name = 'account.check.write'
-    _description = 'Assign Check Number'
+    _description = 'Prin Check in Batch'
 
     _columns = {
-        'check_number': fields.char('Check Number', required=True, help="The Check Number."),
+        'check_number': fields.integer('Next Check Number', required=True, help="The number of the next check number to be printed."),
     }
 
+    def _get_next_number(self, cr, uid, context=None):
+        dummy, sequence_id = self.pool.get('ir.model.data').get_object_reference(cr, uid, 'account_check_writing', 'sequence_check_number')
+        return self.pool.get('ir.sequence').read(cr, uid, sequence_id, ['number_next'])['number_next']
+
     _defaults = {
-        'check_number': lambda obj, cr, uid, context:obj.pool.get('ir.sequence').get(cr, uid, 'check.number'),
+        'check_number': _get_next_number,
    }
 
     def print_check_write(self, cr, uid, ids, context=None):
-        voucher_obj = self.pool.get('account.voucher')
         if context is None:
             context = {}
-        voucher_ids = context.get('active_ids', [])
-        number = int(self.browse(cr, uid, ids[0], context=context).check_number)
-        if voucher_ids:
-            checks = voucher_obj.browse(cr, uid, voucher_ids, context=context)
-            for check in checks:
-                if not check.number:
-                    voucher_obj.write(cr, uid, [check.id], {'number': str(number)}, context=context)
-                    number += 1
+        voucher_obj = self.pool.get('account.voucher')
+        ir_sequence_obj = self.pool.get('ir.sequence')
 
+        #update the sequence to number the checks from the value encoded in the wizard
+        dummy, sequence_id = self.pool.get('ir.model.data').get_object_reference(cr, uid, 'account_check_writing', 'sequence_check_number')
+        increment = ir_sequence_obj.read(cr, uid, sequence_id, ['number_increment'])['number_increment']
+        new_value = self.browse(cr, uid, ids[0], context=context).check_number
+        ir_sequence_obj.write(cr, uid, sequence_id, {'number_next': new_value})
+
+        #validate the checks so that they get a number
+        voucher_ids = context.get('active_ids', [])
+        for check in voucher_obj.browse(cr, uid, voucher_ids, context=context):
+            new_value += increment
+            if check.number:
+                raise osv.except_osv(_('Error!'),_("One of the printed check already got a number."))
+        voucher_obj.proforma_voucher(cr, uid, voucher_ids, context=context)
+
+        #update the sequence again (because the assignation using next_val was made during the same transaction of
+        #the first update of sequence)
+        ir_sequence_obj.write(cr, uid, sequence_id, {'number_next': new_value})
+
+        #print the checks
         check_layout_report = {
             'top' : 'account.print.check.top',
             'middle' : 'account.print.check.middle',
             'bottom' : 'account.print.check.bottom',
         }
-
         check_layout = voucher_obj.browse(cr, uid, voucher_ids[0], context=context).company_id.check_layout
         if not check_layout:
             check_layout = 'top'
diff --git a/addons/account_check_writing/wizard/account_check_view.xml b/addons/account_check_writing/wizard/account_check_view.xml
index 0e4121e9f08..ea81c444d91 100644
--- a/addons/account_check_writing/wizard/account_check_view.xml
+++ b/addons/account_check_writing/wizard/account_check_view.xml
@@ -20,7 +20,7 @@
 
         <act_window id="action_account_check_write"
             multi="True"
-            name="Check Write"
+            name="Print Check in Batch"
             res_model="account.check.write" src_model="account.voucher"
             view_mode="form" target="new" view_type="form" /> 
 

From dce6cac0470bcc396cc3f0a651a97d1ba5c8de9c Mon Sep 17 00:00:00 2001
From: "Quentin (OpenERP)" <qdp-launchpad@openerp.com>
Date: Thu, 6 Dec 2012 12:18:25 +0100
Subject: [PATCH 075/110] [IMP] account_check_writing: improved name of files

bzr revid: qdp-launchpad@openerp.com-20121206111825-zq8uul49obew1vx4
---
 addons/account_check_writing/__openerp__.py                     | 2 +-
 addons/account_check_writing/wizard/__init__.py                 | 2 +-
 .../{account_check.py => account_check_batch_printing.py}       | 0
 ...unt_check_view.xml => account_check_batch_printing_view.xml} | 0
 4 files changed, 2 insertions(+), 2 deletions(-)
 rename addons/account_check_writing/wizard/{account_check.py => account_check_batch_printing.py} (100%)
 rename addons/account_check_writing/wizard/{account_check_view.xml => account_check_batch_printing_view.xml} (100%)

diff --git a/addons/account_check_writing/__openerp__.py b/addons/account_check_writing/__openerp__.py
index c0189a938e7..e01c17d66a7 100644
--- a/addons/account_check_writing/__openerp__.py
+++ b/addons/account_check_writing/__openerp__.py
@@ -30,7 +30,7 @@ Module for the Check Writing and Check Printing.
     'website': 'http://www.openerp.com',
     'depends' : ['account_voucher'],
     'data': [
-        'wizard/account_check_view.xml',
+        'wizard/account_check_batch_printing_view.xml',
         'account_check_writing_report.xml',
         'account_view.xml',
         'account_voucher_view.xml',
diff --git a/addons/account_check_writing/wizard/__init__.py b/addons/account_check_writing/wizard/__init__.py
index 74c20e11397..d39c8716122 100644
--- a/addons/account_check_writing/wizard/__init__.py
+++ b/addons/account_check_writing/wizard/__init__.py
@@ -19,6 +19,6 @@
 #
 ##############################################################################
 
-import account_check
+import account_check_batch_printing
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/account_check_writing/wizard/account_check.py b/addons/account_check_writing/wizard/account_check_batch_printing.py
similarity index 100%
rename from addons/account_check_writing/wizard/account_check.py
rename to addons/account_check_writing/wizard/account_check_batch_printing.py
diff --git a/addons/account_check_writing/wizard/account_check_view.xml b/addons/account_check_writing/wizard/account_check_batch_printing_view.xml
similarity index 100%
rename from addons/account_check_writing/wizard/account_check_view.xml
rename to addons/account_check_writing/wizard/account_check_batch_printing_view.xml

From d9528501cf989779621f5dc67f3e9495ac45bfe5 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Thu, 6 Dec 2012 13:04:40 +0100
Subject: [PATCH 076/110] [IMP] qweb doc

bzr revid: xmo@openerp.com-20121206120440-17m9q0yhc4osd157
---
 addons/web/doc/qweb.rst | 584 +++++++++++++++++++++++++++++++++++-----
 1 file changed, 523 insertions(+), 61 deletions(-)

diff --git a/addons/web/doc/qweb.rst b/addons/web/doc/qweb.rst
index 7ad1e20d57a..47e5fe7d48f 100644
--- a/addons/web/doc/qweb.rst
+++ b/addons/web/doc/qweb.rst
@@ -1,79 +1,541 @@
-
 QWeb
 ====
 
-QWeb is the template engine used by the OpenERP Web Client. It is a home made engine create by OpenERP developers. There are a few things to note about it:
+QWeb is the template engine used by the OpenERP Web Client. It is an
+XML-based templating language, similar to `Genshi
+<http://en.wikipedia.org/wiki/Genshi_(templating_language)>`_,
+`Thymeleaf <http://en.wikipedia.org/wiki/Thymeleaf>`_ or `Facelets
+<http://en.wikipedia.org/wiki/Facelets>`_ with a few peculiarities:
 
-* Template are rendered in javascript on the client-side, the server does nothing.
-* It is an xml template engine, like Facelets_ for example. The source file must be a valid xml.
-* Templates are not interpreted. There are compiled to javascript. This makes them a lot faster to render, but sometimes harder to debug.
-* Most of the time it is used through the Widget class, but you can also use it directly using *openerp.web.qweb.render()* .
+* It's implemented fully in javascript and rendered in the browser.
+* Each template file (XML files) contains multiple templates, where
+  template engine usually have a 1:1 mapping between template files
+  and templates.
+* It has special support in OpenERP Web's
+  :class:`~instance.web.Widget`, though it can be used outside of
+  OpenERP Web (and it's possible to use :class:`~instance.web.Widget`
+  without relying on the QWeb integration).
 
-.. _Facelets: http://en.wikipedia.org/wiki/Facelets
+Here's an example demonstrating most of the basic QWeb features:
 
-Here is a typical QWeb file:
+.. code-block:: xml
 
-::
-
-    <?xml version="1.0" encoding="UTF-8"?>
     <templates>
-        <t t-name="Template1">
-            <div>...</div>
-        </t>
-        <t t-name="Template2">
-            <div>...</div>
-        </t>
+      <div t-name="example_template" t-attf-class="base #{cls}">
+        <h4 t-if="title"><t t-esc="title"/></h4>
+        <ul>
+          <li t-foreach="items" t-as="item" t-att-class="item_parity">
+            <t t-call="example_template.sub">
+              <t t-set="arg" t-value="item_value"/>
+            </t>
+          </li>
+        </ul>
+      </div>
+      <t t-name="example_template.sub">
+        <t t-esc="arg.name"/>
+        <dl>
+          <t t-foreach="arg.tags" t-as="tag" t-if="tag_index lt 5">
+            <dt><t t-esc="tag"/></dt>
+            <dd><t t-esc="tag_value"/></dd>
+          </t>
+        </dl>
+      </t>
     </templates>
 
-A QWeb file contains multiple templates, they are simply identified by a name.
+rendered with the following context:
 
-Here is a sample QWeb template:
+.. code-block:: json
 
-::
+    {
+        "class1": "foo",
+        "title": "Random Title",
+        "items": [
+            { "name": "foo", "tags": {"bar": "baz", "qux": "quux"} },
+            { "name": "Lorem", "tags": {
+                    "ipsum": "dolor",
+                    "sit": "amet",
+                    "consectetur": "adipiscing",
+                    "elit": "Sed",
+                    "hendrerit": "ullamcorper",
+                    "ante": "id",
+                    "vestibulum": "Lorem",
+                    "ipsum": "dolor",
+                    "sit": "amet"
+                }
+            }
+        ]
+    }
 
-    <t t-name="UserPage">
-        <div>
-            <p>Name: <t t-esc="widget.user_name"/></p>
-            <p>Password: <input type="text" t-att-value="widget.password"/></p>
-            <p t-if="widget.is_admin">This user is an Administrator</p>
-            <t t-foreach="widget.roles" t-as="role">
-                <p>User has role: <t t-esc="role"/></p>
-            </t>
-        </div>
-    </t>
+will yield this section of HTML document (reformated for readability):
 
+.. code-block:: html
 
-*widget* is a variable given to the template engine by Widget sub-classes when they decide to render their associated template, it is simply *this*. Here is the corresponding Widget sub-class:
-
-::
-
-    UserPageWidget = openerp.base.Widget.extend({
-        template: "UserPage",
-        init: function(parent) {
-            this._super(parent);
-            this.user_name = "Xavier";
-            this.password = "lilo";
-            this.is_admin = true;
-            this.roles = ["Web Developer", "IE Hater", "Steve Jobs Worshiper"];
-        },
-    });
-
-It could output something like this:
-
-::
-
-    <div>
-        <p>Name: Xavier</p>
-        <p>Password: <input type="text" value="lilo"/></p>
-        <p>This user is an Administrator</p
-        <p>User has role: Web Developer</p>
-        <p>User has role: IE Hater</p>
-        <p>User has role: Steve Jobs Worshiper</p>
+    <div class="base foo">
+        <h4>Random Title</h4>
+        <ul>
+            <li class="even">
+                foo
+                <dl>
+                    <dt>bar</dt>
+                    <dd>baz</dd>
+                    <dt>qux</dt>
+                    <dd>quux</dd>
+                </dl>
+            </li>
+            <li class="odd">
+                Lorem
+                <dl>
+                    <dt>ipsum</dt>
+                    <dd>dolor</dd>
+                    <dt>sit</dt>
+                    <dd>amet</dd>
+                    <dt>consectetur</dt>
+                    <dd>adipiscing</dd>
+                    <dt>elit</dt>
+                    <dd>Sed</dd>
+                    <dt>hendrerit</dt>
+                    <dd>ullamcorper</dd>
+                </dl>
+            </li>
+        </ul>
     </div>
 
-A QWeb template should always contain one unique root element to be used effectively with the Widget class, here it is a *<div>*. QWeb only react to *<t>* elements or attributes prefixed by *t-*. The *<t>* is simply a null element, it is only used when you need to use a *t-* attribute without outputting an html element at the same time. Here are the effects of the most common QWeb attributes:
+API
+---
 
-* *t-esc* outputs the result of the evaluation of the given javascript expression
-* *t-att-ATTR* sets the value of the *ATTR* attribute to the result of the evaluation of the given javascript expression
-* *t-if* outputs the element and its content only if the given javascript expression returns true
-* *t-foreach* outputs as many times as contained in the list returned by the given javascript expression. For each iteration, a variable with the name defined by *t-as* contains the current element in the list.
+While QWeb implements a number of attributes and methods for
+customization and configuration, only two things are really important
+to the user:
+
+.. js:class:: QWeb2.Engine
+
+    The QWeb "renderer", handles most of QWeb's logic (loading,
+    parsing, compiling and rendering templates).
+
+    OpenERP Web instantiates one for the user, and sets it to
+    ``instance.web.qweb``. It also loads all the template files of the
+    various modules into that QWeb instance.
+
+    A :js:class:`QWeb2.Engine` also serves as a "template namespace".
+
+    .. js:function:: QWeb2.Engine.render(template[, context])
+
+        Renders a previously loaded template to a String, using
+        ``context`` (if provided) to find the variables accessed
+        during template rendering (e.g. strings to display).
+
+        :param String template: the name of the template to render
+        :param Object context: the basic namespace to use for template
+                               rendering
+        :returns: String
+
+    The engine exposes an other method which may be useful in some
+    cases (e.g. if you need a separate template namespace with, in
+    OpenERP Web, Kanban views get their own :js:class:`QWeb2.Engine`
+    instance so their templates don't collide with more general
+    "module" templates):
+
+    .. js:function:: QWeb2.Engine.add_template(templates)
+
+        Loads a template file (a collection of templates) in the QWeb
+        instance. The templates can be specified as:
+
+        An XML string
+            QWeb will attempt to parse it to an XML document then load
+            it.
+
+        A URL
+            QWeb will attempt to download the URL content, then load
+            the resulting XML string.
+
+        A ``Document`` or ``Node``
+            QWeb will traverse the first level of the document (the
+            child nodes of the provided root) and load any named
+            template or template override.
+
+        :type templates: String | Document | Node
+
+    A :js:class:`QWeb2.Engine` also exposes various attributes for
+    behavior customization:
+
+    .. js:attribute:: QWeb2.Engine.prefix
+
+        Prefix used to recognize :ref:`directives <qweb-directives>`
+        during parsing. A string. By default, ``t``.
+
+    .. js:attribute:: QWeb2.Engine.debug
+
+        Boolean flag putting the engine in "debug mode". Normally,
+        QWeb intercepts any error raised during template execution. In
+        debug mode, it leaves all exceptions go through without
+        intercepting them.
+
+    .. js:attribute:: QWeb2.Engine.jQuery
+
+        The jQuery instance used during :ref:`template inheritance
+        <qweb-directives-inheritance>` processing. Defaults to
+        ``window.jQuery``.
+
+    .. js:attribute:: QWeb2.Engine.preprocess_node
+
+        A ``Function``. If present, called before compiling each DOM
+        node to template code. In OpenERP Web, this is used to
+        automatically translate text content and some attributes in
+        templates. Defaults to ``null``.
+
+.. _qweb-directives:
+
+Directives
+----------
+
+A basic QWeb template is nothing more than an XHTML document (as it
+must be valid XML), which will be output as-is. But the rendering can
+be customized with bits of logic called "directives". Directives are
+attributes elements prefixed by :js:attr:`~QWeb2.Engine.prefix` (this
+document will use the default prefix ``t``, as does OpenERP Web).
+
+A directive will usually control or alter the output of the element it
+is set on. If no suitable element is available, the prefix itself can
+be used as a "no-operation" element solely for supporting directives
+(or internal content, which will be rendered). This means:
+
+.. code-block:: xml
+
+    <t>Something something</t>
+
+will simply output the string "Something something" (the element
+itself will be skipped and "unwrapped"):
+
+.. code-block:: javascript
+
+    var e = new QWeb2.Engine();
+    e.add_template('<templates>\
+        <t t-name="test1"><t>Test 1</t></t>\
+        <t t-name="test2"><span>Test 2</span></t>\
+    </templates>');
+    e.render('test1'); // Test 1
+    e.render('test2'); // <span>Test 2</span>
+
+.. note::
+
+    The conventions used in directive descriptions are the following:
+
+    * directives are described as compound functions, potentially with
+      optional sections. Each section of the function name is an
+      attribute of the element bearing the directive.
+
+    * a special parameter is ``BODY``, which does not have a name and
+      designates the content of the element.
+
+    * special parameter types (aside from ``BODY`` which remains
+      untyped) are ``Name``, which designates a valid javascript
+      variable name, ``Expression`` which designates a valid
+      javascript expression, and ``Format`` which designates a
+      Ruby-style format string (a literal string with
+      ``#{Expression}`` inclusions executed and replaced by their
+      result)
+
+.. note::
+
+    ``Expression`` actually supports a few extensions on the
+    javascript syntax: because some syntactic elements of javascript
+    are not compatible with XML and must be escaped, text
+    substitutions are performed from forms which don't need to be
+    escaped. Thus the following "keyword operators" are available in
+    an ``Expression``: ``and`` (maps to ``&&``), ``or`` (maps to
+    ``||``), ``gt`` (maps to ``>``), ``gte`` (maps to ``>=``), ``lt``
+    (maps to ``<``) and ``lte`` (maps to ``<=``).
+
+.. _qweb-directives-templates:
+
+Defining Templates
+++++++++++++++++++
+
+.. _qweb-directive-name:
+
+.. function:: t-name=name
+
+    :param String name: an arbitrary javascript string. Each template
+                        name is unique in a given
+                        :js:class:`QWeb2.Engine` instance, defining a
+                        new template with an existing name will
+                        overwrite the previous one without warning.
+
+                        When multiple templates are related, it is
+                        customary to use dotted names as a kind of
+                        "namespace" e.g. ``foo`` and ``foo.bar`` which
+                        will be used either by ``foo`` or by a
+                        sub-widget of the widget used by ``foo``.
+
+    Templates can only be defined as the children of the document
+    root. The document root's name is irrelevant (it's not checked)
+    but is usually ``<templates>`` for simplicity.
+
+    .. code-block:: xml
+
+        <templates>
+            <t t-name="template1">
+                <!-- template code -->
+            </t>
+        </templates>
+
+    :ref:`t-name <qweb-directive-name>` can be used on an element with
+    an output as well:
+
+    .. code-block:: xml
+
+        <templates>
+            <div t-name="template2">
+                <!-- template code -->
+            </div>
+        </templates>
+
+    which ensures the template has a single root (if a template has
+    multiple roots and is then passed directly to jQuery, odd things
+    occur).
+
+.. _qweb-directives-output:
+
+Output
+++++++
+
+.. _qweb-directive-esc:
+
+.. function:: t-esc=content
+
+    :param Expression content:
+
+    Evaluates, html-escapes and outputs ``content``.
+
+.. _qweb-directive-escf:
+
+.. function:: t-escf=content
+
+    :param Format content:
+
+    Similar to :ref:`t-esc <qweb-directive-esc>` but evaluates a
+    ``Format`` instead of just an expression.
+
+.. _qweb-directive-raw:
+
+.. function:: t-raw=content
+
+    :param Expression content:
+
+    Similar to :ref:`t-esc <qweb-directive-esc>` but does *not*
+    html-escape the result of evaluating ``content``. Should only ever
+    be used for known-secure content, or will be an XSS attack vector.
+
+.. _qweb-directive-rawf:
+
+.. function:: t-rawf=content
+
+    :param Format content:
+
+    ``Format``-based version of :ref:`t-raw <qweb-directive-raw>`.
+
+.. _qweb-directive-att:
+
+.. function:: t-att=map
+
+    :param Expression map:
+
+    Evaluates ``map`` expecting an ``Object`` result, sets each
+    key:value pair as an attribute (and its value) on the holder
+    element:
+
+    .. code-block:: xml
+
+        <span t-att="{foo: 3, bar: 42}"/>
+
+    will yield
+
+    .. code-block:: html
+
+        <span foo="3" bar="42"/>
+
+.. function:: t-att-ATTNAME=value
+
+    :param Name ATTNAME:
+    :param Expression value:
+
+    Evaluates ``value`` and sets it on the attribute ``ATTNAME`` on
+    the holder element.
+
+    If ``value``'s result is ``undefined``, suppresses the creation of
+    the attribute.
+
+.. _qweb-directive-attf:
+
+.. function:: t-attf-ATTNAME=value
+
+    :param Name ATTNAME:
+    :param Format value:
+
+    Similar to :ref:`t-att-* <qweb-directive-att>` but the value of
+    the attribute is specified via a ``Format`` instead of an
+    expression. Useful for specifying e.g. classes mixing literal
+    classes and computed ones.
+
+.. _qweb-directives-flow:
+
+Flow Control
+++++++++++++
+
+.. _qweb-directive-set:
+
+.. function:: t-set=name (t-value=value | BODY)
+
+    :param Name name:
+    :param Expression value:
+    :param BODY:
+
+    Creates a new binding in the template context. If ``value`` is
+    specified, evaluates it and sets it to the specified
+    ``name``. Otherwise, processes ``BODY`` and uses that instead.
+
+.. _qweb-directive-if:
+
+.. function:: t-if=condition
+
+    :param Expression condition:
+
+    Evaluates ``condition``, suppresses the output of the holder
+    element and its content of the result is falsy.
+
+.. _qweb-directive-foreach:
+
+.. function:: t-foreach=iterable [t-as=name]
+
+    :param Expression iterable:
+    :param Name name:
+
+    Evaluates ``iterable``, iterates on it and evaluates the holder
+    element and its body once per iteration round.
+
+    If ``name`` is not specified, computes a ``name`` based on
+    ``iterable`` (by replacing non-``Name`` characters by ``_``).
+
+    If ``iterable`` yields a ``Number``, treats it as a range from 0
+    to that number (excluded).
+
+    While iterating, :ref:`t-foreach <qweb-directive-foreach>` adds a
+    number of variables in the context:
+
+    ``#{name}``
+        If iterating on an array (or a range), the current value in
+        the iteration. If iterating on an *object*, the current key.
+    ``#{name}_all``
+        The collection being iterated (the array generated for a
+        ``Number``)
+    ``#{name}_value``
+        The current iteration value (current item for an array, value
+        for the current item for an object)
+    ``#{name}_index``
+        The 0-based index of the current iteration round.
+    ``#{name}_first``
+        Whether the current iteration round is the first one.
+    ``#{name}_parity``
+        ``"odd"`` if the current iteration round is odd, ``"even"``
+        otherwise. ``0`` is considered even.
+
+.. _qweb-directive-call:
+
+.. function:: t-call=template [BODY]
+
+    :param String template:
+    :param BODY:
+
+    Calls the specified ``template`` and returns its result. If
+    ``BODY`` is specified, it is evaluated *before* calling
+    ``template`` and can be used to specify e.g. parameters. This
+    usage is similar to `call-template with with-param in XSLT
+    <http://zvon.org/xxl/XSLTreference/OutputOverview/xslt_with-param_frame.html>`_.
+
+.. _qweb-directives-inheritance:
+
+Template Inheritance and Extension
+++++++++++++++++++++++++++++++++++
+
+.. _qweb-directive-extend:
+
+.. function:: t-extend=template BODY
+
+    :param String template: name of the template to extend
+
+    Works similarly to OpenERP models: if used on its own, will alter
+    the specified template in-place; if used in conjunction with
+    :ref:`t-name <qweb-directive-name>` will create a new template
+    using the old one as a base.
+
+    ``BODY`` should be a sequence of :ref:`t-jquery
+    <qweb-directive-jquery>` alteration directives.
+
+    .. note::
+
+        The inheritance in the second form is *static*: the parent
+        template is copied and transformed when :ref:`t-extend
+        <qweb-directive-extend>` is called. If it is altered later (by
+        a :ref:`t-extend <qweb-directive-extend>` without a
+        :ref:`t-name <qweb-directive-name>`), these changes will *not*
+        appear in the "child" templates.
+
+.. _qweb-directive-jquery:
+
+.. function:: t-jquery=selector [t-operation=operation] BODY
+
+    :param String selector: a CSS selector into the parent template
+    :param operation: one of ``append``, ``prepend``, ``before``,
+                      ``after``, ``inner`` or ``replace``.
+    :param BODY: ``operation`` argument, or alterations to perform
+
+    * If ``operation`` is specified, applies the selector to the
+      parent template to find a *context node*, then applies
+      ``operation`` (as a jQuery operation) to the *context node*,
+      passing ``BODY`` as parameter.
+
+      .. note::
+
+          ``replace`` maps to jQuery's `replaceWith(newContent)
+          <http://api.jquery.com/replaceWith/>`_, ``inner`` maps to
+          `html(htmlString) <http://api.jquery.com/html/>`_.
+
+    * If ``operation`` is not provided, ``BODY`` is evaluated as
+      javascript code, with the *context node* as ``this``.
+
+      .. warning::
+
+          While this second form is much more powerful than the first,
+          it is also much harder to read and maintain and should be
+          avoided. It is usually possible to either avoid it or
+          replace it with a sequence of ``t-jquery:t-operation:``.
+
+Escape Hatches / debugging
+++++++++++++++++++++++++++
+
+.. _qweb-directive-log:
+
+.. function:: t-log=expression
+
+    :param Expression expression:
+
+    Evaluates the provided expression (in the current template
+    context) and logs its result via ``console.log``.
+
+.. _qweb-directive-debug:
+
+.. function:: t-debug
+
+    Injects a debugger breakpoint (via the ``debugger;`` statement) in
+    the compiled template output.
+
+.. _qweb-directive-js:
+
+.. function:: t-js=context BODY
+
+    :param Name context:
+    :param BODY: javascript code
+
+    Injects the provided ``BODY`` javascript code into the compiled
+    template, passing it the current template context using the name
+    specified by ``context``.

From fe032878cbeff7f12dc44d67c0aa07710731a1c7 Mon Sep 17 00:00:00 2001
From: Christophe Simonis <chs@openerp.com>
Date: Thu, 6 Dec 2012 14:08:48 +0100
Subject: [PATCH 077/110] [FIX] correct setup.py

lp bug: https://launchpad.net/bugs/1087192 fixed
lp bug: https://launchpad.net/bugs/1017120 fixed

bzr revid: chs@openerp.com-20121206130848-a3jz9ntihfh6payu
---
 setup.py | 34 ++++++++++++++++------------------
 1 file changed, 16 insertions(+), 18 deletions(-)

diff --git a/setup.py b/setup.py
index 4f1435c0603..7d41e4d5c3c 100755
--- a/setup.py
+++ b/setup.py
@@ -21,31 +21,29 @@
 ##############################################################################
 
 import glob, os, re, setuptools, sys
-from os.path import join, isfile
+from os.path import join
 
 # List all data files
 def data():
-    files = []
+    r = {}
     for root, dirnames, filenames in os.walk('openerp'):
         for filename in filenames:
-            if not re.match(r'.*(\.pyc|\.pyo|\~)$',filename):
-                files.append(os.path.join(root, filename))
-    d = {}
-    for v in files:
-        k=os.path.dirname(v)
-        if k in d:
-            d[k].append(v)
-        else:
-            d[k]=[v]
-    r = d.items()
+            if not re.match(r'.*(\.pyc|\.pyo|\~)$', filename):
+                r.setdefault(root, []).append(os.path.join(root, filename))
+
     if os.name == 'nt':
-        r.append(("Microsoft.VC90.CRT", glob.glob('C:\Microsoft.VC90.CRT\*.*')))
+        r["Microsoft.VC90.CRT"] = glob.glob('C:\Microsoft.VC90.CRT\*.*')
 
-    import babel
-    r.append(("localedata",
-              glob.glob(os.path.join(os.path.dirname(babel.__file__), "localedata" , '*'))))
+        import babel
+        r["localedata"] = glob.glob(os.path.join(os.path.dirname(babel.__file__), "localedata", '*'))
 
-    return r
+        import pytz
+        tzdir = os.path.dirname(pytz.__file__)
+        for root, _, filenames in os.walk(os.path.join(tzdir, "zoneinfo")):
+            base = os.path.join('pytz', root[len(tzdir) + 1:])
+            r[base] = [os.path.join(root, f) for f in filenames]
+
+    return r.items()
 
 def gen_manifest():
     file_list="\n".join(data())
@@ -64,7 +62,7 @@ def py2exe_options():
                     "skip_archive": 1,
                     "optimize": 2,
                     "dist_dir": 'dist',
-                    "packages": [ "DAV", "HTMLParser", "PIL", "asynchat", "asyncore", "commands", "dateutil", "decimal", "docutils", "email", "encodings", "imaplib", "lxml", "lxml._elementpath", "lxml.builder", "lxml.etree", "lxml.objectify", "mako", "openerp", "poplib", "pychart", "pydot", "pyparsing", "reportlab", "select", "simplejson", "smtplib", "uuid", "vatnumber", "vobject", "xml", "xml.dom", "yaml", ],
+                    "packages": [ "DAV", "HTMLParser", "PIL", "asynchat", "asyncore", "commands", "dateutil", "decimal", "docutils", "email", "encodings", "imaplib", "lxml", "lxml._elementpath", "lxml.builder", "lxml.etree", "lxml.objectify", "mako", "openerp", "poplib", "pychart", "pydot", "pyparsing", "pytz", "reportlab", "select", "simplejson", "smtplib", "uuid", "vatnumber", "vobject", "xml", "xml.dom", "yaml", ],
                     "excludes" : ["Tkconstants","Tkinter","tcl"],
                 }
             }

From 173a8b9d4d80136ba775383d6a66b08dc4d7f41f Mon Sep 17 00:00:00 2001
From: Fabien Meghazi <fme@openerp.com>
Date: Thu, 6 Dec 2012 14:21:15 +0100
Subject: [PATCH 078/110] [FIX] QWeb: purge compiled template when template is
 added

bzr revid: fme@openerp.com-20121206132115-6fyedomrrchrxc43
---
 addons/web/static/lib/qweb/qweb2.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/addons/web/static/lib/qweb/qweb2.js b/addons/web/static/lib/qweb/qweb2.js
index 5c076112eb0..0aa2aaba92f 100644
--- a/addons/web/static/lib/qweb/qweb2.js
+++ b/addons/web/static/lib/qweb/qweb2.js
@@ -228,6 +228,7 @@ QWeb2.Engine = (function() {
                     }
                     if (name) {
                         this.templates[name] = node;
+                        this.compiled_templates[name] = null;
                     } else if (extend) {
                         delete(this.compiled_templates[extend]);
                         if (this.extend_templates[extend]) {

From 88053a85a2543cd14c8f17e5bbcc3df684a2c4a5 Mon Sep 17 00:00:00 2001
From: Raphael Collet <rco@openerp.com>
Date: Thu, 6 Dec 2012 14:24:46 +0100
Subject: [PATCH 079/110] [IMP] auth_signup: move exception guard from
 second-order method to controller method

bzr revid: rco@openerp.com-20121206132446-w1884yc337wj037d
---
 addons/auth_signup/controllers/main.py | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/addons/auth_signup/controllers/main.py b/addons/auth_signup/controllers/main.py
index d2429e8dfd2..baf1a8f0b28 100644
--- a/addons/auth_signup/controllers/main.py
+++ b/addons/auth_signup/controllers/main.py
@@ -57,18 +57,17 @@ class Controller(openerp.addons.web.http.Controller):
     def signup(self, req, dbname, token, name, login, password):
         """ sign up a user (new or existing)"""
         values = {'name': name, 'login': login, 'password': password}
-        return self._signup_with_values(req, dbname, token, values)
+        try:
+            self._signup_with_values(req, dbname, token, values)
+        except SignupError, e:
+            return {'error': openerp.tools.exception_to_unicode(e)}
+        return {}
 
     def _signup_with_values(self, req, dbname, token, values):
         registry = RegistryManager.get(dbname)
         with registry.cursor() as cr:
             res_users = registry.get('res.users')
-            try:
-                res_users.signup(cr, openerp.SUPERUSER_ID, values, token)
-            except SignupError, e:
-                return {'error': openerp.tools.exception_to_unicode(e)}
-            cr.commit()
-        return {}
+            res_users.signup(cr, openerp.SUPERUSER_ID, values, token)
 
     @openerp.addons.web.http.httprequest
     def reset_password(self, req, dbname, login):

From 7ac99cbeafc88f0fe6f6c2ee425c9ef87180a2ce Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Thu, 6 Dec 2012 14:51:14 +0100
Subject: [PATCH 080/110] [FIX] form selection field: don't interpret value 0
 as false in the template when the code doesn't do so

bzr revid: xmo@openerp.com-20121206135114-nuwc3wdc6zatbl3d
---
 addons/web/static/src/js/view_form.js | 11 ++++-------
 addons/web/static/src/xml/base.xml    |  5 ++++-
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js
index 21c3b3f43d9..d5feb342ebe 100644
--- a/addons/web/static/src/js/view_form.js
+++ b/addons/web/static/src/js/view_form.js
@@ -2680,13 +2680,10 @@ instance.web.form.FieldSelection = instance.web.form.AbstractField.extend(instan
     init: function(field_manager, node) {
         var self = this;
         this._super(field_manager, node);
-        this.values = _.clone(this.field.selection);
-        _.each(this.values, function(v, i) {
-            if (v[0] === false && v[1] === '') {
-                self.values.splice(i, 1);
-            }
-        });
-        this.values.unshift([false, '']);
+        this.values = _(this.field.selection).chain()
+            .reject(function (v) { return v[0] === false && v[1] === ''; })
+            .unshift([false, ''])
+            .value();
     },
     initialize_content: function() {
         // Flag indicating whether we're in an event chain containing a change
diff --git a/addons/web/static/src/xml/base.xml b/addons/web/static/src/xml/base.xml
index c272e1f8eb4..2161bc84f3d 100644
--- a/addons/web/static/src/xml/base.xml
+++ b/addons/web/static/src/xml/base.xml
@@ -1054,7 +1054,10 @@
             t-att-autofocus="widget.node.attrs.autofocus"
             t-att-id="widget.id_for_label">
                 <t t-foreach="widget.values" t-as="option">
-                    <option><t t-esc="widget.node.attrs.placeholder" t-if="option[0] == false and widget.node.attrs.placeholder"/><t t-esc="option[1]" t-if="option[0] != false"/></option>
+                    <option>
+                        <t t-esc="widget.node.attrs.placeholder" t-if="option[0] === false and widget.node.attrs.placeholder"/>
+                        <t t-esc="option[1]" t-if="option[0] !== false"/>
+                    </option>
                 </t>
         </select>
     </span>

From d37bd882a8a6d75eba6cbf22c95de4aa8807ad99 Mon Sep 17 00:00:00 2001
From: Cedric Snauwaert <csn@openerp.com>
Date: Thu, 6 Dec 2012 15:29:41 +0100
Subject: [PATCH 081/110] [FIX]finish renaming some field

bzr revid: csn@openerp.com-20121206142941-pmq2s4h2or1ey0nl
---
 addons/fleet/fleet_demo.xml              | 74 ++++++++++++------------
 addons/fleet/security/fleet_security.xml | 12 ++--
 2 files changed, 43 insertions(+), 43 deletions(-)

diff --git a/addons/fleet/fleet_demo.xml b/addons/fleet/fleet_demo.xml
index 0387d9cd41d..d70943f4beb 100644
--- a/addons/fleet/fleet_demo.xml
+++ b/addons/fleet/fleet_demo.xml
@@ -253,7 +253,7 @@
           <field name="color">Black</field>
           <field name="location">Grand-Rosiere</field>
           <field name="doors">5</field>
-          <field name="driver" ref="base.res_partner_address_18" />
+          <field name="driver_id" ref="base.res_partner_address_18" />
           <field name="acquisition_date" eval="time.strftime('%Y-%m-%d 2:00:00')" />
           <field name="state" ref="vehicle_state_active"/>
           <field name="odometer_unit">kilometers</field>
@@ -268,7 +268,7 @@
           <field name="color">Red</field>
           <field name="location">Grand-Rosiere</field>
           <field name="doors">5</field>
-          <field name="driver" ref="base.res_partner_address_19" />
+          <field name="driver_id" ref="base.res_partner_address_19" />
           <field name="acquisition_date" eval="time.strftime('%Y-%m-%d 2:00:00')" />
           <field name="state" ref="vehicle_state_inactive"/>
           <field name="odometer_unit">kilometers</field>
@@ -283,7 +283,7 @@
           <field name="color">Titanium Grey</field>
           <field name="location">Grand-Rosiere</field>
           <field name="doors">3</field>
-          <field name="driver" ref="base.res_partner_address_17" />
+          <field name="driver_id" ref="base.res_partner_address_17" />
           <field name="acquisition_date" eval="time.strftime('%Y-%m-%d 2:00:00')" />
           <field name="state" ref="vehicle_state_active"/>
           <field name="odometer_unit">kilometers</field>
@@ -298,7 +298,7 @@
           <field name="color">White</field>
           <field name="location">Grand-Rosiere</field>
           <field name="doors">3</field>
-          <field name="driver" ref="base.res_partner_address_16" />
+          <field name="driver_id" ref="base.res_partner_address_16" />
           <field name="acquisition_date" eval="time.strftime('%Y-%m-%d 2:00:00')" />
           <field name="state" ref="vehicle_state_active"/>
           <field name="odometer_unit">kilometers</field>
@@ -313,7 +313,7 @@
           <field name="color">Brown</field>
           <field name="location">Grand-Rosiere</field>
           <field name="doors">5</field>
-          <field name="driver" ref="base.res_partner_address_15" />
+          <field name="driver_id" ref="base.res_partner_address_15" />
           <field name="acquisition_date" eval="time.strftime('%Y-%m-%d 2:00:00')" />
           <field name="state" ref="vehicle_state_active"/>
           <field name="odometer_unit">kilometers</field>
@@ -862,7 +862,7 @@
       <record id="log_service_1" model="fleet.vehicle.log.services" >
         <field name="vehicle_id" ref="vehicle_2" />
         <field name="amount">650</field>
-        <field name="cost_subtype" ref="type_service_service_8"/>
+        <field name="cost_subtype_id" ref="type_service_service_8"/>
         <field name="date">2012-09-02</field>
         <field name="purchaser_id" ref="base.res_partner_address_18" />
         <field name="inv_ref">4586</field>
@@ -873,7 +873,7 @@
       <record id="services_cost_11" model="fleet.vehicle.cost" >
         <field name="vehicle_id" ref="vehicle_2" />
         <field name="amount">50</field>
-        <field name="cost_subtype" ref="type_service_7"/>
+        <field name="cost_subtype_id" ref="type_service_7"/>
         <field name="date">2012-09-02</field>
         <field name="parent_id" ref="log_service_1_fleet_vehicle_cost" />
       </record>
@@ -881,7 +881,7 @@
       <record id="services_cost_12" model="fleet.vehicle.cost" >
         <field name="vehicle_id" ref="vehicle_2" />
         <field name="amount">25</field>
-        <field name="cost_subtype" ref="type_service_8"/>
+        <field name="cost_subtype_id" ref="type_service_8"/>
         <field name="date">2012-09-02</field>
         <field name="parent_id" ref="log_service_1_fleet_vehicle_cost" />
       </record>
@@ -889,7 +889,7 @@
       <record id="services_cost_13" model="fleet.vehicle.cost" >
         <field name="vehicle_id" ref="vehicle_2" />
         <field name="amount">100</field>
-        <field name="cost_subtype" ref="type_service_9"/>
+        <field name="cost_subtype_id" ref="type_service_9"/>
         <field name="date">2012-09-02</field>
         <field name="parent_id" ref="log_service_1_fleet_vehicle_cost" />
       </record>
@@ -897,7 +897,7 @@
       <record id="log_service_2" model="fleet.vehicle.log.services" >
         <field name="vehicle_id" ref="vehicle_2" />
         <field name="amount">350</field>
-        <field name="cost_subtype" ref="type_service_service_8"/>
+        <field name="cost_subtype_id" ref="type_service_service_8"/>
         <field name="date">2012-11-02</field>
         <field name="purchaser_id" ref="base.res_partner_address_18" />
         <field name="inv_ref">4814</field>
@@ -908,7 +908,7 @@
       <record id="services_cost_21" model="fleet.vehicle.cost" >
         <field name="vehicle_id" ref="vehicle_2" />
         <field name="amount">100</field>
-        <field name="cost_subtype" ref="type_service_10"/>
+        <field name="cost_subtype_id" ref="type_service_10"/>
         <field name="date">2012-11-02</field>
         <field name="parent_id" ref="log_service_2_fleet_vehicle_cost" />
       </record>
@@ -916,7 +916,7 @@
       <record id="services_cost_22" model="fleet.vehicle.cost" >
         <field name="vehicle_id" ref="vehicle_2" />
         <field name="amount">150</field>
-        <field name="cost_subtype" ref="type_service_11"/>
+        <field name="cost_subtype_id" ref="type_service_11"/>
         <field name="date">2012-11-02</field>
         <field name="parent_id" ref="log_service_2_fleet_vehicle_cost" />
       </record>
@@ -924,7 +924,7 @@
       <record id="services_cost_23" model="fleet.vehicle.cost" >
         <field name="vehicle_id" ref="vehicle_2" />
         <field name="amount">100</field>
-        <field name="cost_subtype" ref="type_service_12"/>
+        <field name="cost_subtype_id" ref="type_service_12"/>
         <field name="date">2012-11-02</field>
         <field name="parent_id" ref="log_service_2_fleet_vehicle_cost" />
       </record>
@@ -932,7 +932,7 @@
       <record id="log_service_3" model="fleet.vehicle.log.services" >
         <field name="vehicle_id" ref="vehicle_1" />
         <field name="amount">513</field>
-        <field name="cost_subtype" ref="type_service_service_8"/>
+        <field name="cost_subtype_id" ref="type_service_service_8"/>
         <field name="date">2012-10-15</field>
         <field name="purchaser_id" ref="base.res_partner_address_18" />
         <field name="inv_ref">124</field>
@@ -943,7 +943,7 @@
       <record id="log_service_4" model="fleet.vehicle.log.services" >
         <field name="vehicle_id" ref="vehicle_3" />
         <field name="amount">412</field>
-        <field name="cost_subtype" ref="type_service_service_8"/>
+        <field name="cost_subtype_id" ref="type_service_service_8"/>
         <field name="date">2012-10-08</field>
         <field name="purchaser_id" ref="base.res_partner_address_18" />
         <field name="inv_ref">20984</field>
@@ -954,7 +954,7 @@
       <record id="log_service_5" model="fleet.vehicle.log.services" >
         <field name="vehicle_id" ref="vehicle_4" />
         <field name="amount">275</field>
-        <field name="cost_subtype" ref="type_service_service_8"/>
+        <field name="cost_subtype_id" ref="type_service_service_8"/>
         <field name="date">2012-09-25</field>
         <field name="purchaser_id" ref="base.res_partner_address_18" />
         <field name="inv_ref">241</field>
@@ -965,7 +965,7 @@
       <record id="log_service_6" model="fleet.vehicle.log.services" >
         <field name="vehicle_id" ref="vehicle_5" />
         <field name="amount">302</field>
-        <field name="cost_subtype" ref="type_service_service_8"/>
+        <field name="cost_subtype_id" ref="type_service_service_8"/>
         <field name="date">2012-09-15</field>
         <field name="purchaser_id" ref="base.res_partner_address_18" />
         <field name="inv_ref">22513</field>
@@ -978,7 +978,7 @@
         <field name="amount">0</field>
         <field name="cost_generated">20</field>
         <field name="cost_frequency">daily</field>
-        <field name="cost_subtype" ref="type_contract_leasing"/>
+        <field name="cost_subtype_id" ref="type_contract_leasing"/>
         <field name="date" eval="time.strftime('%Y-01-01')" />
         <field name="start_date" eval="time.strftime('%Y-01-01')" />
         <field name="expiration_date" eval="(DateTime.now() + timedelta(5)).strftime('%Y-%m-%d')" />
@@ -990,7 +990,7 @@
       <record id="contract_cost_11" model="fleet.vehicle.cost" >
         <field name="vehicle_id" ref="vehicle_2" />
         <field name="amount">50</field>
-        <field name="cost_subtype" ref="type_service_service_2"/>
+        <field name="cost_subtype_id" ref="type_service_service_2"/>
         <field name="date">2012-01-01</field>
         <field name="parent_id" ref="log_contract_1_fleet_vehicle_cost" />
       </record>
@@ -998,7 +998,7 @@
       <record id="contract_cost_12" model="fleet.vehicle.cost" >
         <field name="vehicle_id" ref="vehicle_2" />
         <field name="amount">25</field>
-        <field name="cost_subtype" ref="type_service_service_3"/>
+        <field name="cost_subtype_id" ref="type_service_service_3"/>
         <field name="date">2012-01-01</field>
         <field name="parent_id" ref="log_contract_1_fleet_vehicle_cost" />
       </record>
@@ -1006,7 +1006,7 @@
       <record id="contract_cost_13" model="fleet.vehicle.cost" >
         <field name="vehicle_id" ref="vehicle_2" />
         <field name="amount">100</field>
-        <field name="cost_subtype" ref="type_contract_omnium"/>
+        <field name="cost_subtype_id" ref="type_contract_omnium"/>
         <field name="date">2012-01-01</field>
         <field name="parent_id" ref="log_contract_1_fleet_vehicle_cost" />
       </record>
@@ -1016,7 +1016,7 @@
         <field name="amount">0</field>
         <field name="cost_generated">150</field>
         <field name="cost_frequency">weekly</field>
-        <field name="cost_subtype" ref="type_contract_leasing"/>
+        <field name="cost_subtype_id" ref="type_contract_leasing"/>
         <field name="date" eval="time.strftime('%Y-01-01')" />
         <field name="start_date" eval="time.strftime('%Y-01-01')" />
         <field name="expiration_date" eval="(DateTime.now() + timedelta(-1)).strftime('%Y-%m-%d')" />
@@ -1028,7 +1028,7 @@
       <record id="contract_cost_21" model="fleet.vehicle.cost" >
         <field name="vehicle_id" ref="vehicle_1" />
         <field name="amount">50</field>
-        <field name="cost_subtype" ref="type_service_service_2"/>
+        <field name="cost_subtype_id" ref="type_service_service_2"/>
         <field name="date">2012-01-01</field>
         <field name="parent_id" ref="log_contract_2_fleet_vehicle_cost" />
       </record>
@@ -1036,7 +1036,7 @@
       <record id="contract_cost_22" model="fleet.vehicle.cost" >
         <field name="vehicle_id" ref="vehicle_1" />
         <field name="amount">25</field>
-        <field name="cost_subtype" ref="type_service_service_3"/>
+        <field name="cost_subtype_id" ref="type_service_service_3"/>
         <field name="date">2012-01-01</field>
         <field name="parent_id" ref="log_contract_2_fleet_vehicle_cost" />
       </record>
@@ -1044,7 +1044,7 @@
       <record id="contract_cost_23" model="fleet.vehicle.cost" >
         <field name="vehicle_id" ref="vehicle_1" />
         <field name="amount">100</field>
-        <field name="cost_subtype" ref="type_contract_omnium"/>
+        <field name="cost_subtype_id" ref="type_contract_omnium"/>
         <field name="date">2012-01-01</field>
         <field name="parent_id" ref="log_contract_2_fleet_vehicle_cost" />
       </record>
@@ -1054,7 +1054,7 @@
         <field name="amount">0</field>
         <field name="cost_generated">400</field>
         <field name="cost_frequency">monthly</field>
-        <field name="cost_subtype" ref="type_contract_leasing"/>
+        <field name="cost_subtype_id" ref="type_contract_leasing"/>
         <field name="date" eval="time.strftime('%Y-01-01')"/>
         <field name="start_date" eval="time.strftime('%Y-01-01')" />
         <field name="expiration_date" eval="time.strftime('%Y-12-31')" />
@@ -1066,7 +1066,7 @@
       <record id="contract_cost_31" model="fleet.vehicle.cost" >
         <field name="vehicle_id" ref="vehicle_3" />
         <field name="amount">50</field>
-        <field name="cost_subtype" ref="type_service_service_2"/>
+        <field name="cost_subtype_id" ref="type_service_service_2"/>
         <field name="date">2012-01-01</field>
         <field name="parent_id" ref="log_contract_3_fleet_vehicle_cost" />
       </record>
@@ -1074,7 +1074,7 @@
       <record id="contract_cost_32" model="fleet.vehicle.cost" >
         <field name="vehicle_id" ref="vehicle_3" />
         <field name="amount">25</field>
-        <field name="cost_subtype" ref="type_service_service_3"/>
+        <field name="cost_subtype_id" ref="type_service_service_3"/>
         <field name="date">2012-01-01</field>
         <field name="parent_id" ref="log_contract_3_fleet_vehicle_cost" />
       </record>
@@ -1082,7 +1082,7 @@
       <record id="contract_cost_33" model="fleet.vehicle.cost" >
         <field name="vehicle_id" ref="vehicle_3" />
         <field name="amount">100</field>
-        <field name="cost_subtype" ref="type_contract_omnium"/>
+        <field name="cost_subtype_id" ref="type_contract_omnium"/>
         <field name="date">2012-01-01</field>
         <field name="parent_id" ref="log_contract_3_fleet_vehicle_cost" />
       </record>
@@ -1092,7 +1092,7 @@
         <field name="amount">0</field>
         <field name="cost_generated">4000</field>
         <field name="cost_frequency">yearly</field>
-        <field name="cost_subtype" ref="type_contract_leasing"/>
+        <field name="cost_subtype_id" ref="type_contract_leasing"/>
         <field name="date" eval="time.strftime('%Y-01-01')" />
         <field name="start_date" eval="time.strftime('%Y-01-01')" />
         <field name="expiration_date" eval="time.strftime('%Y-12-31')" />
@@ -1104,7 +1104,7 @@
       <record id="contract_cost_41" model="fleet.vehicle.cost" >
         <field name="vehicle_id" ref="vehicle_4" />
         <field name="amount">50</field>
-        <field name="cost_subtype" ref="type_service_service_2"/>
+        <field name="cost_subtype_id" ref="type_service_service_2"/>
         <field name="date">2012-01-01</field>
         <field name="parent_id" ref="log_contract_4_fleet_vehicle_cost" />
       </record>
@@ -1112,7 +1112,7 @@
       <record id="contract_cost_42" model="fleet.vehicle.cost" >
         <field name="vehicle_id" ref="vehicle_4" />
         <field name="amount">25</field>
-        <field name="cost_subtype" ref="type_service_service_3"/>
+        <field name="cost_subtype_id" ref="type_service_service_3"/>
         <field name="date">2012-01-01</field>
         <field name="parent_id" ref="log_contract_4_fleet_vehicle_cost" />
       </record>
@@ -1120,7 +1120,7 @@
       <record id="contract_cost_43" model="fleet.vehicle.cost" >
         <field name="vehicle_id" ref="vehicle_4" />
         <field name="amount">100</field>
-        <field name="cost_subtype" ref="type_contract_omnium"/>
+        <field name="cost_subtype_id" ref="type_contract_omnium"/>
         <field name="date">2012-01-01</field>
         <field name="parent_id" ref="log_contract_4_fleet_vehicle_cost" />
       </record>
@@ -1130,7 +1130,7 @@
         <field name="amount">17000</field>
         <field name="cost_generated">0</field>
         <field name="cost_frequency">no</field>
-        <field name="cost_subtype" ref="type_contract_leasing"/>
+        <field name="cost_subtype_id" ref="type_contract_leasing"/>
         <field name="date" eval="time.strftime('2012-01-01')" />
         <field name="start_date" eval="time.strftime('2012-01-01')" />
         <field name="expiration_date" eval="time.strftime('2016-12-31')" />
@@ -1142,7 +1142,7 @@
       <record id="contract_cost_51" model="fleet.vehicle.cost" >
         <field name="vehicle_id" ref="vehicle_5" />
         <field name="amount">50</field>
-        <field name="cost_subtype" ref="type_service_service_2"/>
+        <field name="cost_subtype_id" ref="type_service_service_2"/>
         <field name="date">2012-01-01</field>
         <field name="parent_id" ref="log_contract_5_fleet_vehicle_cost" />
       </record>
@@ -1150,7 +1150,7 @@
       <record id="contract_cost_52" model="fleet.vehicle.cost" >
         <field name="vehicle_id" ref="vehicle_5" />
         <field name="amount">25</field>
-        <field name="cost_subtype" ref="type_service_service_3"/>
+        <field name="cost_subtype_id" ref="type_service_service_3"/>
         <field name="date">2012-01-01</field>
         <field name="parent_id" ref="log_contract_5_fleet_vehicle_cost" />
       </record>
@@ -1158,7 +1158,7 @@
       <record id="contract_cost_53" model="fleet.vehicle.cost" >
         <field name="vehicle_id" ref="vehicle_5" />
         <field name="amount">100</field>
-        <field name="cost_subtype" ref="type_contract_omnium"/>
+        <field name="cost_subtype_id" ref="type_contract_omnium"/>
         <field name="date">2012-01-01</field>
         <field name="parent_id" ref="log_contract_5_fleet_vehicle_cost" />
       </record>
diff --git a/addons/fleet/security/fleet_security.xml b/addons/fleet/security/fleet_security.xml
index a7ad2ddf7ae..daaa0b0cba7 100644
--- a/addons/fleet/security/fleet_security.xml
+++ b/addons/fleet/security/fleet_security.xml
@@ -22,7 +22,7 @@
             <field name="perm_write" eval="False"/>
             <field name="perm_create" eval="False"/>
             <field name="perm_unlink" eval="False"/>
-            <field name="domain_force">[('cost_id.vehicle_id.driver','=',user.partner_id.id)]</field>
+            <field name="domain_force">[('cost_id.vehicle_id.driver_id','=',user.partner_id.id)]</field>
         </record>
         <record id="fleet_user_cost_visibility" model="ir.rule">
             <field name="name">User can only see his/her costs</field>
@@ -32,7 +32,7 @@
             <field name="perm_write" eval="True"/>
             <field name="perm_create" eval="True"/>
             <field name="perm_unlink" eval="False"/>
-            <field name="domain_force">[('vehicle_id.driver','=',user.partner_id.id)]</field>
+            <field name="domain_force">[('vehicle_id.driver_id','=',user.partner_id.id)]</field>
         </record>
         <record id="fleet_user_service_visibility" model="ir.rule">
             <field name="name">User can only see his/her vehicle's services</field>
@@ -42,7 +42,7 @@
             <field name="perm_write" eval="False"/>
             <field name="perm_create" eval="False"/>
             <field name="perm_unlink" eval="False"/>
-            <field name="domain_force">[('cost_id.vehicle_id.driver','=',user.partner_id.id)]</field>
+            <field name="domain_force">[('cost_id.vehicle_id.driver_id','=',user.partner_id.id)]</field>
         </record>
         <record id="fleet_user_odometer_visibility" model="ir.rule">
             <field name="name">User can only see his/her vehicle's odometer</field>
@@ -52,7 +52,7 @@
             <field name="perm_write" eval="True"/>
             <field name="perm_create" eval="True"/>
             <field name="perm_unlink" eval="True"/>
-            <field name="domain_force">[('vehicle_id.driver','=',user.partner_id.id)]</field>
+            <field name="domain_force">[('vehicle_id.driver_id','=',user.partner_id.id)]</field>
         </record>
         <record id="fleet_user_fuel_log_visibility" model="ir.rule">
             <field name="name">User can only see his/her vehicle's fuel log</field>
@@ -62,7 +62,7 @@
             <field name="perm_write" eval="True"/>
             <field name="perm_create" eval="True"/>
             <field name="perm_unlink" eval="True"/>
-            <field name="domain_force">[('cost_id.vehicle_id.driver','=',user.partner_id.id)]</field>
+            <field name="domain_force">[('cost_id.vehicle_id.driver_id','=',user.partner_id.id)]</field>
         </record>
         <record id="fleet_user_vehicle_visibility" model="ir.rule">
             <field name="name">User can only see his/her vehicle</field>
@@ -72,7 +72,7 @@
             <field name="perm_write" eval="True"/>
             <field name="perm_create" eval="False"/>
             <field name="perm_unlink" eval="False"/>
-            <field name="domain_force">[('driver','=',user.partner_id.id)]</field>
+            <field name="domain_force">[('driver_id','=',user.partner_id.id)]</field>
         </record>
         <record id="fleet_user_contract_visibility_manager" model="ir.rule">
             <field name="name">Manager has all rights on vehicle's contracts</field>

From d3e2629631a4ef7d428e125d3c40fd5965f75c20 Mon Sep 17 00:00:00 2001
From: "Quentin (OpenERP)" <qdp-launchpad@openerp.com>
Date: Thu, 6 Dec 2012 16:09:03 +0100
Subject: [PATCH 082/110] [REF] account_test: refactoring

bzr revid: qdp-launchpad@openerp.com-20121206150903-cl19tda7r00xt1u4
---
 addons/account_test/account_test.py           |  2 +-
 addons/account_test/account_test_view.xml     | 36 +++++++------
 .../report/account_test_report.py             | 50 ++++++++-----------
 .../account_test/security/ir.model.access.csv |  2 +-
 4 files changed, 45 insertions(+), 45 deletions(-)

diff --git a/addons/account_test/account_test.py b/addons/account_test/account_test.py
index dc7442b1247..bf925e8236a 100644
--- a/addons/account_test/account_test.py
+++ b/addons/account_test/account_test.py
@@ -50,7 +50,7 @@ class accounting_assert_test(osv.osv):
     _columns = {
         'name': fields.char('Test Name', size=256, required=True, select=True, translate=True),
         'desc': fields.text('Test Description', select=True, translate=True),
-        'code_exec': fields.text('Python code or SQL query', required=True),
+        'code_exec': fields.text('Python code', required=True),
         'active': fields.boolean('Active'),
         'sequence': fields.integer('Sequence'),
     }
diff --git a/addons/account_test/account_test_view.xml b/addons/account_test/account_test_view.xml
index 1faca55c4d6..43a67edcc6c 100644
--- a/addons/account_test/account_test_view.xml
+++ b/addons/account_test/account_test_view.xml
@@ -13,7 +13,7 @@
                 </tree>
             </field>
         </record>
-            
+
         <record model="ir.ui.view" id="account_assert_form">
             <field name="name">Tests</field>
             <field name="model">accounting.assert.test</field>
@@ -39,20 +39,26 @@
                                 </group>
                                 <group string="Code Help">
                                     <pre>
-Code should always return a result value. If result is an empty list, it means that
-the test is succesful. Otherwise it will print what is inside result.
-Code must be python with correct indentation (if needed).
-Here is a list of function that you can use in your test :
- - group(lst, col) : 
- - reconciled_inv() : return the list of all reconciled invoices
- - get_parent(acc_id) : get parent analytical account
- - now() : return current datetime
+Code should always set a variable named `result` with the result of your test, that can be a list or
+a dictionary. If `result` is an empty list, it means that the test was succesful. Otherwise it will
+try to translate and print what is inside `result`.
+
+If the result of your test is a dictionary, you can set a variable named `column_order` to choose in
+what order you want to print `result`'s content.
+
+Should you need them, you can also use the following variables into your code:
+    * cr: cursor to the database
+    * uid: ID of the current user
+
+In any ways, the code must be legal python statements with correct indentation (if needed).
 
 Example: 
-sql = 'select id, name, ref, date from account_move_line where account_id in 
-(select id from account_account where type = 'view')'
-cr.execute(sql)
-result = cr.dictfetchall()
+    sql = '''SELECT id, name, ref, date
+             FROM account_move_line 
+             WHERE account_id IN (SELECT id FROM account_account WHERE type = 'view')
+          '''
+    cr.execute(sql)
+    result = cr.dictfetchall()
                                     </pre>
                                 </group>
                             </page>
@@ -61,7 +67,7 @@ result = cr.dictfetchall()
                 </form>
             </field>
         </record>
-    
+
         <record model="ir.actions.act_window" id="action_accounting_assert">
             <field name="name">Accounting Tests</field>
             <field name="res_model">accounting.assert.test</field>
@@ -72,7 +78,7 @@ result = cr.dictfetchall()
               </p>
             </field>
         </record>
-    
+
         <menuitem name="Accounting Tests" parent="account.menu_finance_reporting" id="menu_action_license" action="action_accounting_assert"/>
 
     </data>
diff --git a/addons/account_test/report/account_test_report.py b/addons/account_test/report/account_test_report.py
index f8ba7a47f65..ab683e18688 100644
--- a/addons/account_test/report/account_test_report.py
+++ b/addons/account_test/report/account_test_report.py
@@ -22,10 +22,7 @@
 
 import datetime
 import time
-import re
 from report import report_sxw
-from itertools import groupby
-from operator import itemgetter
 from tools.translate import _
 #
 # Use period and Journal for selection or resources
@@ -40,37 +37,34 @@ class report_assert_account(report_sxw.rml_parse):
         })
 
     def execute_code(self, code_exec):
-        def group(lst, col):
-            return dict((k, [v for v in itr]) for k, itr in groupby(sorted(lst, key=lambda x: x[col]), itemgetter(col)))
-
         def reconciled_inv():
-            reconciled_inv_ids = self.pool.get('account.invoice').search(self.cr, self.uid, [('reconciled','=',True)])
-            return reconciled_inv_ids
-
-        def get_parent(acc_id):
-            acc_an_id = self.pool.get('account.analytic.account').browse(self.cr, self.uid, acc_id).parent_id
-            while acc_an_id.parent_id:
-                acc_an_id = acc_an_id.parent_id
-            return acc_an_id.id
+            """
+            returns the list of invoices that are set as reconciled = True
+            """
+            return self.pool.get('account.invoice').search(self.cr, self.uid, [('reconciled','=',True)])
 
         def order_columns(item, cols=None):
+            """
+            This function is used to display a dictionary as a string, with its columns in the order chosen.
+
+            :param item: dict
+            :param cols: list of field names
+            :returns: a list of tuples (fieldname: value) in a similar way that would dict.items() do except that the
+                returned values are following the order given by cols
+            :rtype: [(key, value)]
+            """
             if cols is None:
                 cols = item.keys()
             return [(col, item.get(col)) for col in cols if col in item.keys()]
 
         localdict = {
             'cr': self.cr,
-            '_': _,
-            'reconciled_inv' : reconciled_inv,
-            'group' : group,
-            'get_parent' : get_parent,
-            'now': datetime.datetime.now(),
-            'result': None,
-            'column_order': None,
+            'uid': self.uid,
+            'reconciled_inv': reconciled_inv, #specific function used in different tests
+            'result': None, #used to store the result of the test
+            'column_order': None, #used to choose the display order of columns (in case you are returning a list of dict)
         }
-
         exec code_exec in localdict
-
         result = localdict['result']
         column_order = localdict.get('column_order', None)
 
@@ -79,12 +73,12 @@ class report_assert_account(report_sxw.rml_parse):
         if not result:
             result = [_('The test was passed successfully')]
         else:
-            def _format(a):
-                if isinstance(a, dict):
-                    return ', '.join(["%s: %s" % (tup[0], tup[1]) for tup in order_columns(a, column_order)])
+            def _format(item):
+                if isinstance(item, dict):
+                    return ', '.join(["%s: %s" % (tup[0], tup[1]) for tup in order_columns(item, column_order)])
                 else:
-                    return a
-            result = [_format(rec) for rec in result]
+                    return item
+            result = [_(_format(rec)) for rec in result]
 
         return result
 
diff --git a/addons/account_test/security/ir.model.access.csv b/addons/account_test/security/ir.model.access.csv
index 95f2336f80b..cf7e93b6baa 100644
--- a/addons/account_test/security/ir.model.access.csv
+++ b/addons/account_test/security/ir.model.access.csv
@@ -1,3 +1,3 @@
 "id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
-"access_accounting_assert_test","accounting.assert.test","model_accounting_assert_test",base.group_system,1,1,1,1
+"access_accounting_assert_test","accounting.assert.test","model_accounting_assert_test",base.group_system,1,0,0,1
 "access_accounting_assert_test_manager","accounting.assert.test","model_accounting_assert_test",account.group_account_manager,1,0,0,0

From 3d3534ca39b05c847965daf60597f29e20a82752 Mon Sep 17 00:00:00 2001
From: Christophe CHAUVET <christophe.chauvet@syleam.fr>
Date: Thu, 6 Dec 2012 17:37:11 +0100
Subject: [PATCH 083/110] [IMP] Don't use WITH OIDS when create a table

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

bzr revid: christophe.chauvet@syleam.fr-20121206163711-5jvrhrg8w5le4zay
---
 openerp/osv/orm.py | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/openerp/osv/orm.py b/openerp/osv/orm.py
index ef13253864b..40c15a217c7 100644
--- a/openerp/osv/orm.py
+++ b/openerp/osv/orm.py
@@ -2287,7 +2287,7 @@ class BaseModel(object):
                          if view_type == 'tree' or not action[2].get('multi')]
             resprint = [clean(print_) for print_ in resprint
                         if view_type == 'tree' or not print_[2].get('multi')]
-            #When multi="True" set it will display only in More of the list view 
+            #When multi="True" set it will display only in More of the list view
             resrelate = [clean(action) for action in resrelate
                          if (action[2].get('multi') and view_type == 'tree') or (not action[2].get('multi') and view_type == 'form')]
 
@@ -2681,17 +2681,17 @@ class BaseModel(object):
 
         order = orderby or groupby
         data_ids = self.search(cr, uid, [('id', 'in', alldata.keys())], order=order, context=context)
-        
+
         # the IDs of records that have groupby field value = False or '' should be included too
         data_ids += set(alldata.keys()).difference(data_ids)
-        
-        if groupby:   
+
+        if groupby:
             data = self.read(cr, uid, data_ids, [groupby], context=context)
             # restore order of the search as read() uses the default _order (this is only for groups, so the footprint of data should be small):
             data_dict = dict((d['id'], d[groupby] ) for d in data)
             result = [{'id': i, groupby: data_dict[i]} for i in data_ids]
         else:
-            result = [{'id': i} for i in data_ids] 
+            result = [{'id': i} for i in data_ids]
 
         for d in result:
             if groupby:
@@ -3318,7 +3318,7 @@ class BaseModel(object):
                 raise except_orm('Programming Error', ('Many2Many destination model does not exist: `%s`') % (f._obj,))
             dest_model = self.pool.get(f._obj)
             ref = dest_model._table
-            cr.execute('CREATE TABLE "%s" ("%s" INTEGER NOT NULL, "%s" INTEGER NOT NULL, UNIQUE("%s","%s")) WITH OIDS' % (m2m_tbl, col1, col2, col1, col2))
+            cr.execute('CREATE TABLE "%s" ("%s" INTEGER NOT NULL, "%s" INTEGER NOT NULL, UNIQUE("%s","%s")) WITHOUT OIDS' % (m2m_tbl, col1, col2, col1, col2))
             # create foreign key references with ondelete=cascade, unless the targets are SQL views
             cr.execute("SELECT relkind FROM pg_class WHERE relkind IN ('v') AND relname=%s", (ref,))
             if not cr.fetchall():
@@ -3835,7 +3835,7 @@ class BaseModel(object):
                 if operation in ('read','unlink'):
                     # No need to warn about deleting an already deleted record.
                     # And no error when reading a record that was deleted, to prevent spurious
-                    # errors for non-transactional search/read sequences coming from clients 
+                    # errors for non-transactional search/read sequences coming from clients
                     return
                 _logger.warning('Failed operation on deleted record(s): %s, uid: %s, model: %s', operation, uid, self._name)
                 raise except_orm(_('Missing document(s)'),
@@ -4322,12 +4322,12 @@ class BaseModel(object):
                 del vals[self._inherits[table]]
 
             record_id = tocreate[table].pop('id', None)
-            
+
             # When linking/creating parent records, force context without 'no_store_function' key that
-            # defers stored functions computing, as these won't be computed in batch at the end of create(). 
+            # defers stored functions computing, as these won't be computed in batch at the end of create().
             parent_context = dict(context)
             parent_context.pop('no_store_function', None)
-            
+
             if record_id is None or not record_id:
                 record_id = self.pool.get(table).create(cr, user, tocreate[table], context=parent_context)
             else:
@@ -4376,7 +4376,7 @@ class BaseModel(object):
                 upd0 = upd0 + ',"' + field + '"'
                 upd1 = upd1 + ',' + self._columns[field]._symbol_set[0]
                 upd2.append(self._columns[field]._symbol_set[1](vals[field]))
-                #for the function fields that receive a value, we set them directly in the database 
+                #for the function fields that receive a value, we set them directly in the database
                 #(they may be required), but we also need to trigger the _fct_inv()
                 if (hasattr(self._columns[field], '_fnct_inv')) and not isinstance(self._columns[field], fields.related):
                     #TODO: this way to special case the related fields is really creepy but it shouldn't be changed at

From bd2d663b229221154c3d3b35486bd9f9703b443b Mon Sep 17 00:00:00 2001
From: Josse Colpaert <jco@openerp.com>
Date: Thu, 6 Dec 2012 17:40:06 +0100
Subject: [PATCH 084/110] [IMP] currencies in mails + minor

bzr revid: jco@openerp.com-20121206164006-tx2paj5ybek6aupa
---
 addons/account_followup/account_followup.py   | 21 +++-------
 .../account_followup_customers.xml            |  1 -
 .../account_followup_data.xml                 | 38 ++++---------------
 .../account_followup_demo.xml                 |  4 +-
 .../account_followup_view.xml                 | 12 +++---
 .../report/account_followup_print.py          | 10 +++--
 .../wizard/account_followup_print.py          |  7 +++-
 .../wizard/account_followup_print_view.xml    |  2 +-
 8 files changed, 36 insertions(+), 59 deletions(-)

diff --git a/addons/account_followup/account_followup.py b/addons/account_followup/account_followup.py
index 40ed2e1424e..3f89ac09502 100644
--- a/addons/account_followup/account_followup.py
+++ b/addons/account_followup/account_followup.py
@@ -75,7 +75,7 @@ class followup_line(osv.osv):
 
 Exception made if there was a mistake of ours, it seems that the following amount stays unpaid. Please, take appropriate measures in order to carry out this payment in the next 8 days.
 
-Would your payment have been carried out after this mail was sent, please ignore this message. Do not hesitate to contact our accounting department at (+32).10.68.94.39.
+Would your payment have been carried out after this mail was sent, please ignore this message. Do not hesitate to contact our accounting department.
 
 Best Regards,
 """,
@@ -180,10 +180,7 @@ class res_partner(osv.osv):
             root.insert(0, first_node[0])
             res['arch'] = etree.tostring(doc, encoding="utf-8")
         return res
-    
-#    def search(self, cr, user, args, offset=0, limit=None, order=None, context=None, count=False, access_rights_uid=None):
-#        if order and order[0] == '':
-#        pass
+
     
     def _get_latest(self, cr, uid, ids, names, arg, context=None, company_id=None):
         res={}
@@ -328,10 +325,6 @@ class res_partner(osv.osv):
                                'payment_earliest_due_date': calc_date}
         return res
     
-    
-    def _search_unreconciled(self, cr, uid, obj, name, args, field, context=None):
-        pass
-    
     def _payment_overdue_search(self, cr, uid, obj, name, args, context=None):
         company = self.pool.get('res.users').browse(cr, uid, uid, context=context).company_id.id
         if not args:
@@ -343,8 +336,7 @@ class res_partner(osv.osv):
         query = self.pool.get('account.move.line')._query_get(cr, uid, context=context)
         cr.execute(('SELECT pid AS partner_id, SUM(bal2) FROM ' \
                     '(SELECT CASE WHEN bal IS NOT NULL THEN bal ' \
-                    'ELSE 0.0 END AS bal2, p.id as pid ' \
-                    ' FROM ' \
+                    'ELSE 0.0 END AS bal2, p.id as pid FROM ' \
                     '(SELECT (debit-credit) AS bal, partner_id ' \
                     'FROM account_move_line l ' \
                     'WHERE account_id IN ' \
@@ -417,19 +409,18 @@ class res_partner(osv.osv):
     _inherit = "res.partner"
     _columns = {
         'payment_responsible_id':fields.many2one('res.users', ondelete='set null', string='Follow-up Responsible', 
-                                                 help="Responsible for making sure the action happens. "), 
+                                                 help="Optionally you can assign a user to this field, which will make him responsible for the action. "), 
         'payment_note':fields.text('Customer Payment Promise', help="Payment Note"),
         'payment_next_action':fields.text('Next Action', 
                                     help="This is the next action to be taken.  It will automatically be set when the partner gets a follow-up level that requires a manual action. "), 
         'payment_next_action_date':fields.date('Next Action Date',
                                     help="This is when the manual follow-up is needed. " \
-                                    "The date will be set to the current date when the partner gets a follow-up level that requires a manual action. Can be practical to set manually e.g. to follow up his payment. "), 
+                                    "The date will be set to the current date when the partner gets a follow-up level that requires a manual action. Can be practical to set manually e.g. to see if he keeps his promises. "), 
         'unreconciled_aml_ids':fields.one2many('account.move.line', 'partner_id', domain=['&', ('reconcile_id', '=', False), '&', 
                             ('account_id.active','=', True), '&', ('account_id.type', '=', 'receivable'), ('state', '!=', 'draft')]), 
         'latest_followup_date':fields.function(_get_latest, method=True, type='date', string="Latest Follow-up Date", 
                             help="Latest date that the follow-up level of the partner was changed", 
-                            store=False, 
-                            multi="latest"), 
+                            store=False, multi="latest"), 
         'latest_followup_level_id':fields.function(_get_latest, method=True, 
             type='many2one', relation='account_followup.followup.line', string="Latest Follow-up Level", 
             help="The maximum follow-up level", 
diff --git a/addons/account_followup/account_followup_customers.xml b/addons/account_followup/account_followup_customers.xml
index 8959143698e..54bd334a2df 100644
--- a/addons/account_followup/account_followup_customers.xml
+++ b/addons/account_followup/account_followup_customers.xml
@@ -33,7 +33,6 @@
                         <filter string="Partners with Overdue Credits" domain="[('payment_amount_overdue', '>', 0.0)]" name="credits"/>
                         <separator/>
                         <filter string="Follow-ups To Do" domain="[('payment_next_action_date', '&lt;=', time.strftime('%%Y-%%m-%%d')), ('credit', '>', 0.0)]" name="todo"/>
-                        <filter string="Future Follow-ups" domain="[('payment_next_action_date', '&gt;', time.strftime('%%Y-%%m-%%d')), ('credit', '>', 0.0)]"/>
                         <separator/>
                         <filter string="No Responsible" domain="[('payment_responsible_id', '=', False)]"/>
                         <filter string="My Follow-ups" domain="[('payment_responsible_id','=', uid)]"/>
diff --git a/addons/account_followup/account_followup_data.xml b/addons/account_followup/account_followup_data.xml
index af974a2b7e0..ffb5ae8d854 100644
--- a/addons/account_followup/account_followup_data.xml
+++ b/addons/account_followup/account_followup_data.xml
@@ -26,20 +26,15 @@ contact our accounting department.
     </p>
 <br/>
 Best Regards,
-
+<br/>
    <br/>
 ${user.name | h}
 
 <br/>
 <br/>
 
-<%
-    from openerp.addons.account_followup.report import account_followup_print
-    rml_parse = account_followup_print.report_rappel(object._cr, user.id, "followup_rml_parser")
-    followup_table = rml_parse.get_unreconciled_table(object, user.company_id, ctx)
-%>
 
-${followup_table | h}
+${ctx['followup_table']}
 
     <br/>
 
@@ -74,19 +69,14 @@ Details of due payments is printed below.
 <br/>
 Best Regards,
     
+<br/>
 <br/>
 ${user.name | h}
     
 <br/>
 <br/>
 
-<%
-    from openerp.addons.account_followup.report import account_followup_print
-    rml_parse = account_followup_print.report_rappel(object._cr, user.id, "followup_rml_parser")
-    followup_table = rml_parse.get_unreconciled_table(object, user.company_id, ctx)
-%>
-
-${followup_table | h}
+${ctx['followup_table']}
 
     <br/>
 
@@ -116,18 +106,13 @@ In case of any queries concerning this matter, do not hesitate to contact our ac
 <br/>
 Best Regards,
 <br/>
+<br/>
 ${user.name | h}
 <br/>
 <br/>
 
 
-<%
-    from openerp.addons.account_followup.report import account_followup_print
-    rml_parse = account_followup_print.report_rappel(object._cr, user.id, "followup_rml_parser")
-    followup_table = rml_parse.get_unreconciled_table(object, user.company_id, ctx)
-%>
-
-${object.followup_table(object, user) | h}
+${ctx['followup_table']}
 
     <br/>
 
@@ -157,20 +142,13 @@ contact our accounting department.
     </p>
 <br/>
 Best Regards,
-</br>
-</br>
+<br/>
 <br/>
 ${user.name | h}
 <br/>
 <br/>
 
-<%
-    from openerp.addons.account_followup.report import account_followup_print
-    rml_parse = account_followup_print.report_rappel(object._cr, user.id, "followup_rml_parser")
-    followup_table = rml_parse.get_unreconciled_table(object, user.company_id, ctx)
-%>
-
-${followup_table | h}
+${ctx['followup_table']}
 
 <br/>
 </div>
diff --git a/addons/account_followup/account_followup_demo.xml b/addons/account_followup/account_followup_demo.xml
index 053d611fc08..0c470f5980e 100644
--- a/addons/account_followup/account_followup_demo.xml
+++ b/addons/account_followup/account_followup_demo.xml
@@ -17,7 +17,7 @@ Unless full payment is made in next 8 days, then legal action for the recovery o
 
 I trust that this action will prove unnecessary and details of due payments is printed below.
 
-In case of any queries concerning this matter, do not hesitate to contact our accounting department at [TEL NUMBER].
+In case of any queries concerning this matter, do not hesitate to contact our accounting department.
 
 Best Regards,
             </field>
@@ -39,7 +39,7 @@ Unless full payment is made in next 8 days, then legal action for the recovery o
 
 I trust that this action will prove unnecessary and details of due payments is printed below.
 
-In case of any queries concerning this matter, do not hesitate to contact our accounting department at [TEL NUMBER].
+In case of any queries concerning this matter, do not hesitate to contact our accounting department.
 
 Best Regards,
             </field>
diff --git a/addons/account_followup/account_followup_view.xml b/addons/account_followup/account_followup_view.xml
index c1b79d20369..5560ca822dc 100644
--- a/addons/account_followup/account_followup_view.xml
+++ b/addons/account_followup/account_followup_view.xml
@@ -76,9 +76,11 @@
                         To remind customers of paying their invoices, you can
                         define different actions depending on how severely
                         overdue the customer is. These actions are bundled
-                        into folow-up levels that are triggered when the due
-                        date of the most overdue invoice has passed a certain
-                        number of days.
+                        into follow-up levels that are triggered when the due
+                        date of an invoice has passed a certain
+                        number of days. If there are other overdue invoices for the 
+                        same customer, the actions of the most 
+                        overdue invoice will be executed. 
                     </p>
                     <field name="followup_line"/>
                 </form>
@@ -167,7 +169,7 @@
                 </tree>
             </field>
         </record>
-<!--
+
         <record id="view_move_line_form" model="ir.ui.view">
             <field name="name">account.move.line.form.followup</field>
             <field name="model">account.move.line</field>
@@ -178,6 +180,6 @@
                     <field name="followup_date"/>
                 </field>
             </field>
-        </record>-->
+        </record>
     </data>
 </openerp>
diff --git a/addons/account_followup/report/account_followup_print.py b/addons/account_followup/report/account_followup_print.py
index 2b70f46142c..65a56957d07 100644
--- a/addons/account_followup/report/account_followup_print.py
+++ b/addons/account_followup/report/account_followup_print.py
@@ -85,7 +85,7 @@ class report_rappel(report_sxw.rml_parse):
         final_res = self._lines_get_with_partner(partner, company.id)
         followup_table = ''
         for currency_dict in final_res:
-            currency_symbol = currency_dict.get('line', [{'currency_id': company.currency_id}])[0]['currency_id'].symbol
+            currency = currency_dict.get('line', [{'currency_id': company.currency_id}])[0]['currency_id']
             followup_table += '''
             <table border="2" width=100%%>
             <tr>
@@ -95,7 +95,7 @@ class report_rappel(report_sxw.rml_parse):
                 <td>Amount (%s)</td>
                 <td>Lit.</td>
             </tr>
-            ''' % (currency_symbol)
+            ''' % (currency.symbol)
             total = 0
             ctx = context
             for aml in currency_dict['line']:
@@ -107,8 +107,10 @@ class report_rappel(report_sxw.rml_parse):
                 if date <= ctx['current_date'] and aml['balance'] > 0:
                     strbegin = "<TD><B>"
                     strend = "</B></TD>"
-                followup_table +="<TR>" + strbegin + str(aml['date']) + strend + strbegin + aml['ref'] + strend + strbegin + str(date) + strend + strbegin + str(aml['balance']) + strend + strbegin + block + strend + "</TR>"
-            total = self.formatLang(total, dp='Account', currency_obj=partner.company_id.currency_id)
+                followup_table +="<TR>" + strbegin + str(aml['date']) + strend + strbegin + \
+                                aml['ref'] + strend + strbegin + str(date) + strend + strbegin + \
+                                str(aml['balance']) + strend + strbegin + block + strend + "</TR>"
+            total = self.formatLang(total, dp='Account', currency_obj=currency)
             followup_table += '''<tr> </tr>
                             </table>
                             <center>Amount due: %s </center>''' % (total)
diff --git a/addons/account_followup/wizard/account_followup_print.py b/addons/account_followup/wizard/account_followup_print.py
index 2c9b41a7859..5170a0f3b24 100644
--- a/addons/account_followup/wizard/account_followup_print.py
+++ b/addons/account_followup/wizard/account_followup_print.py
@@ -198,7 +198,12 @@ class account_followup_print(osv.osv_memory):
         ids = self.pool.get('res.partner').search(cr, uid, ['&', ('credit', '<=', 0.0), '&', ('id', 'not in', partner_list_ids), '|', 
                                                              ('payment_responsible_id', '!=', False), 
                                                              ('payment_next_action_date', '!=', False)], context=context)
-        self.pool.get('res.partner').action_done(cr, uid, ids, context=context)
+        parts = self.pool.get('res.partner').browse(cr, uid, ids, context=context)
+        newids = []
+        for part in parts: 
+            if not part.unreconciled_aml_ids: 
+                newids.append(part.id)
+        self.pool.get('res.partner').action_done(cr, uid, newids, context=context)
         return len(ids)
 
     def do_process(self, cr, uid, ids, context=None):
diff --git a/addons/account_followup/wizard/account_followup_print_view.xml b/addons/account_followup/wizard/account_followup_print_view.xml
index 29f36522d05..62943330d63 100644
--- a/addons/account_followup/wizard/account_followup_print_view.xml
+++ b/addons/account_followup/wizard/account_followup_print_view.xml
@@ -13,7 +13,7 @@
                 </group>
                 	<p class ="oe_grey">
                         This action will send follow-up emails, print the letters and
-                        set the manual actions per customers.
+                        set the manual actions per customer, according to the follow-up levels defined. 
                     </p>
                     <footer>
                         <button name="do_process" string="Send emails and generate letters" type="object" class="oe_highlight"/>

From 73dd7ccacca6628b4802ea0862494d33bc9713cd Mon Sep 17 00:00:00 2001
From: "Quentin (OpenERP)" <qdp-launchpad@openerp.com>
Date: Thu, 6 Dec 2012 17:47:06 +0100
Subject: [PATCH 085/110] [FIX] fixed emails in multi currency + removed
 duplicated code

bzr revid: qdp-launchpad@openerp.com-20121206164706-o25nomraucn6pcxd
---
 addons/account_followup/account_followup.py   |  6 ++--
 .../report/account_followup_print.py          | 36 -------------------
 2 files changed, 3 insertions(+), 39 deletions(-)

diff --git a/addons/account_followup/account_followup.py b/addons/account_followup/account_followup.py
index 3f89ac09502..29197550841 100644
--- a/addons/account_followup/account_followup.py
+++ b/addons/account_followup/account_followup.py
@@ -131,7 +131,7 @@ class email_template(osv.osv):
             final_res = rml_parse._lines_get_with_partner(partner, company.id)
             
             for currency_dict in final_res:
-                currency_symbol = currency_dict.get('line', [{'currency_id': company.currency_id}])[0]['currency_id'].symbol
+                currency = currency_dict.get('line', [{'currency_id': company.currency_id}])[0]['currency_id']
                 followup_table += '''
                 <table border="2" width=100%%>
                 <tr>
@@ -141,7 +141,7 @@ class email_template(osv.osv):
                     <td>Amount (%s)</td>
                     <td>Lit.</td>
                 </tr>
-                ''' % (currency_symbol)
+                ''' % (currency.symbol)
                 total = 0
                 for aml in currency_dict['line']:
                     block = aml['blocked'] and 'X' or ' '
@@ -153,7 +153,7 @@ class email_template(osv.osv):
                         strbegin = "<TD><B>"
                         strend = "</B></TD>"
                     followup_table +="<TR>" + strbegin + str(aml['date']) + strend + strbegin + aml['ref'] + strend + strbegin + str(date) + strend + strbegin + str(aml['balance']) + strend + strbegin + block + strend + "</TR>"
-                total = rml_parse.formatLang(total, dp='Account', currency_obj=partner.company_id.currency_id)
+                total = rml_parse.formatLang(total, dp='Account', currency_obj=currency)
                 followup_table += '''<tr> </tr>
                                 </table>
                                 <center>Amount due: %s </center>''' % (total)
diff --git a/addons/account_followup/report/account_followup_print.py b/addons/account_followup/report/account_followup_print.py
index 65a56957d07..bf346167182 100644
--- a/addons/account_followup/report/account_followup_print.py
+++ b/addons/account_followup/report/account_followup_print.py
@@ -81,42 +81,6 @@ class report_rappel(report_sxw.rml_parse):
                 final_res.append({'line': line_cur[cur]['line']})
         return final_res
 
-    def get_unreconciled_table(self, partner, company, context = None):
-        final_res = self._lines_get_with_partner(partner, company.id)
-        followup_table = ''
-        for currency_dict in final_res:
-            currency = currency_dict.get('line', [{'currency_id': company.currency_id}])[0]['currency_id']
-            followup_table += '''
-            <table border="2" width=100%%>
-            <tr>
-                <td>Invoice date</td>
-                <td>Reference</td>
-                <td>Due date</td>
-                <td>Amount (%s)</td>
-                <td>Lit.</td>
-            </tr>
-            ''' % (currency.symbol)
-            total = 0
-            ctx = context
-            for aml in currency_dict['line']:
-                block = aml['blocked'] and 'X' or ' '
-                total += aml['balance']
-                strbegin = "<TD>"
-                strend = "</TD>"
-                date = aml['date_maturity'] or aml['date']
-                if date <= ctx['current_date'] and aml['balance'] > 0:
-                    strbegin = "<TD><B>"
-                    strend = "</B></TD>"
-                followup_table +="<TR>" + strbegin + str(aml['date']) + strend + strbegin + \
-                                aml['ref'] + strend + strbegin + str(date) + strend + strbegin + \
-                                str(aml['balance']) + strend + strbegin + block + strend + "</TR>"
-            total = self.formatLang(total, dp='Account', currency_obj=currency)
-            followup_table += '''<tr> </tr>
-                            </table>
-                            <center>Amount due: %s </center>''' % (total)
-        return followup_table
-    
-    
     def _get_text(self, stat_line, followup_id, context=None):
         if context is None:
             context = {}

From a4194eb7a8f22afb75e5c15772966256578ffaf0 Mon Sep 17 00:00:00 2001
From: "Quentin (OpenERP)" <qdp-launchpad@openerp.com>
Date: Thu, 6 Dec 2012 18:00:39 +0100
Subject: [PATCH 086/110] [REF] account_followup: code refactoring

bzr revid: qdp-launchpad@openerp.com-20121206170039-fqs0qasccnq781dg
---
 addons/account_followup/account_followup_data.xml        | 8 ++++----
 addons/account_followup/report/account_followup_print.py | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/addons/account_followup/account_followup_data.xml b/addons/account_followup/account_followup_data.xml
index ffb5ae8d854..62ea7bce9c6 100644
--- a/addons/account_followup/account_followup_data.xml
+++ b/addons/account_followup/account_followup_data.xml
@@ -34,7 +34,7 @@ ${user.name | h}
 <br/>
 
 
-${ctx['followup_table']}
+${ctx.get('followup_table','')}
 
     <br/>
 
@@ -76,7 +76,7 @@ ${user.name | h}
 <br/>
 <br/>
 
-${ctx['followup_table']}
+${ctx.get('followup_table','')}
 
     <br/>
 
@@ -112,7 +112,7 @@ ${user.name | h}
 <br/>
 
 
-${ctx['followup_table']}
+${ctx.get('followup_table','')}
 
     <br/>
 
@@ -148,7 +148,7 @@ ${user.name | h}
 <br/>
 <br/>
 
-${ctx['followup_table']}
+${ctx.get('followup_table','')}
 
 <br/>
 </div>
diff --git a/addons/account_followup/report/account_followup_print.py b/addons/account_followup/report/account_followup_print.py
index bf346167182..f101aeaa369 100644
--- a/addons/account_followup/report/account_followup_print.py
+++ b/addons/account_followup/report/account_followup_print.py
@@ -23,10 +23,10 @@ import time
 
 import pooler
 from report import report_sxw
-from osv import fields
 
 class report_rappel(report_sxw.rml_parse):
     _name = "account_followup.report.rappel"
+
     def __init__(self, cr, uid, name, context=None):
         super(report_rappel, self).__init__(cr, uid, name, context=context)
         self.localcontext.update({

From 68d4ebc81d6f757bc11ef748d38d6bc5df99314a Mon Sep 17 00:00:00 2001
From: "Quentin (OpenERP)" <qdp-launchpad@openerp.com>
Date: Thu, 6 Dec 2012 18:26:26 +0100
Subject: [PATCH 087/110] [REF] account_followup: refactoring

bzr revid: qdp-launchpad@openerp.com-20121206172626-wv8txhwnlcm5qci9
---
 addons/account_followup/account_followup.py   | 53 +++++++++++--------
 .../wizard/account_followup_print.py          | 12 ++---
 2 files changed, 36 insertions(+), 29 deletions(-)

diff --git a/addons/account_followup/account_followup.py b/addons/account_followup/account_followup.py
index 29197550841..f4b65d6d991 100644
--- a/addons/account_followup/account_followup.py
+++ b/addons/account_followup/account_followup.py
@@ -119,8 +119,13 @@ class account_move_line(osv.osv):
 class email_template(osv.osv):
     _inherit = 'email.template'
 
-    def _get_followup_table_html(self, cr, uid, res_id, context = None):
-        #res_id -> res.partner
+    def _get_followup_table_html(self, cr, uid, res_id, context=None):
+    ''' Build the html tables to be included in emails send to partners, when reminding them their
+        overdue invoices.
+
+        :param res_id: ID of the partner for whom we are building the tables
+        :rtype: string
+    '''
         partner = self.pool.get('res.partner').browse(cr, uid, res_id, context=context)
         followup_table = ''
         if partner.unreconciled_aml_ids: 
@@ -159,12 +164,13 @@ class email_template(osv.osv):
                                 <center>Amount due: %s </center>''' % (total)
         return followup_table
 
-    # Adds current_date to the context.  That way it can be used to put
-    # the account move lines in bold that are overdue in the email
+
     def render_template(self, cr, uid, template, model, res_id, context=None):
-        context['current_date'] = fields.date.context_today(cr, uid, context)
-        if model == 'res.partner': # and 'followup' in context.keys() and context['followup']:
+        if model == 'res.partner' and context.get('followup'):
             context['followup_table'] = self._get_followup_table_html(cr, uid, res_id, context=context)
+            # Adds current_date to the context. That way it can be used to put
+            # the account move lines in bold that are overdue in the email
+            context['current_date'] = fields.date.context_today(cr, uid, context)
         return super(email_template, self).render_template(cr, uid, template, model, res_id, context=context)
 
 class res_partner(osv.osv):
@@ -181,7 +187,6 @@ class res_partner(osv.osv):
             res['arch'] = etree.tostring(doc, encoding="utf-8")
         return res
 
-    
     def _get_latest(self, cr, uid, ids, names, arg, context=None, company_id=None):
         res={}
         if company_id == None:
@@ -215,7 +220,6 @@ class res_partner(osv.osv):
         for partner in self.browse(cr, uid, partner_ids, context=context):
             #Check action: check if the action was not empty, if not add
             action_text= ""
-            context['followup'] = True
             if partner.payment_next_action:
                 action_text = (partner.payment_next_action or '') + "\n" + (partner.latest_followup_level_id_without_lit.manual_action_note or '')
             else:
@@ -253,32 +257,36 @@ class res_partner(osv.osv):
             }
 
     def do_partner_mail(self, cr, uid, partner_ids, context=None):
+        if context is None:
+            context = {}
+        ctx = context.copy()
+        ctx['followup'] = True
         #partner_ids are res.partner ids
         # If not defined by latest follow-up level, it will be the default template if it can find it
         mtp = self.pool.get('email.template')
         unknown_mails = 0
-        for partner in self.browse(cr, uid, partner_ids, context=context):
+        for partner in self.browse(cr, uid, partner_ids, context=ctx):
             if partner.email and partner.email.strip():
                 level = partner.latest_followup_level_id_without_lit
                 if level and level.send_email and level.email_template_id and level.email_template_id.id:
-                    mtp.send_mail(cr, uid, level.email_template_id.id, partner.id, context=context)
+                    mtp.send_mail(cr, uid, level.email_template_id.id, partner.id, context=ctx)
                 else:
                     mail_template_id = self.pool.get('ir.model.data').get_object_reference(cr, uid, 
                                                     'account_followup', 'email_template_account_followup_default')
-                    mtp.send_mail(cr, uid, mail_template_id[1], partner.id, context=context)
+                    mtp.send_mail(cr, uid, mail_template_id[1], partner.id, context=ctx)
             else:
                 unknown_mails = unknown_mails + 1
                 action_text = _("Email not sent because of email address of partner not filled in")
                 if partner.payment_next_action_date:
-                    payment_action_date = min(fields.date.context_today(cr, uid, context), partner.payment_next_action_date)
+                    payment_action_date = min(fields.date.context_today(cr, uid, ctx), partner.payment_next_action_date)
                 else:
-                    payment_action_date = fields.date.context_today(cr, uid, context)
+                    payment_action_date = fields.date.context_today(cr, uid, ctx)
                 if partner.payment_next_action:
                     payment_next_action = partner.payment_next_action + " \n " + action_text
                 else:
                     payment_next_action = action_text
                 self.write(cr, uid, [partner.id], {'payment_next_action_date': payment_action_date,
-                                                   'payment_next_action': payment_next_action}, context=context)
+                                                   'payment_next_action': payment_next_action}, context=ctx)
         return unknown_mails
 
     def action_done(self, cr, uid, ids, context=None):
@@ -405,17 +413,16 @@ class res_partner(osv.osv):
             return [('id','=','0')]
         return [('id','in',map(itemgetter(0), res))]
         
-        
     _inherit = "res.partner"
     _columns = {
         'payment_responsible_id':fields.many2one('res.users', ondelete='set null', string='Follow-up Responsible', 
-                                                 help="Optionally you can assign a user to this field, which will make him responsible for the action. "), 
+                                                 help="Optionally you can assign a user to this field, which will make him responsible for the action."), 
         'payment_note':fields.text('Customer Payment Promise', help="Payment Note"),
         'payment_next_action':fields.text('Next Action', 
                                     help="This is the next action to be taken.  It will automatically be set when the partner gets a follow-up level that requires a manual action. "), 
         'payment_next_action_date':fields.date('Next Action Date',
                                     help="This is when the manual follow-up is needed. " \
-                                    "The date will be set to the current date when the partner gets a follow-up level that requires a manual action. Can be practical to set manually e.g. to see if he keeps his promises. "), 
+                                    "The date will be set to the current date when the partner gets a follow-up level that requires a manual action. Can be practical to set manually e.g. to see if he keeps his promises."), 
         'unreconciled_aml_ids':fields.one2many('account.move.line', 'partner_id', domain=['&', ('reconcile_id', '=', False), '&', 
                             ('account_id.active','=', True), '&', ('account_id.type', '=', 'receivable'), ('state', '!=', 'draft')]), 
         'latest_followup_date':fields.function(_get_latest, method=True, type='date', string="Latest Follow-up Date", 
@@ -431,18 +438,18 @@ class res_partner(osv.osv):
             help="The maximum follow-up level without taking into account the account move lines with litigation", 
             store=False, 
             multi="latest"),
-        'payment_amount_due':fields.function(_get_amounts_and_date, method = True, 
+        'payment_amount_due':fields.function(_get_amounts_and_date, 
                                                  type='float', string="Amount Due",
-                                                 store = False, multi="amountsdate", 
+                                                 store = False, multi="followup", 
                                                  fnct_search=_payment_due_search),
-        'payment_amount_overdue':fields.function(_get_amounts_and_date, method = True, 
+        'payment_amount_overdue':fields.function(_get_amounts_and_date,
                                                  type='float', string="Amount Overdue",
-                                                 store = False, multi="amountsdate", 
+                                                 store = False, multi="followup", 
                                                  fnct_search = _payment_overdue_search),
-        'payment_earliest_due_date':fields.function(_get_amounts_and_date, method=True, 
+        'payment_earliest_due_date':fields.function(_get_amounts_and_date,
                                                     type='date',
                                                     string = "Worst Due Date",
-                                                    multi="amountsdate",
+                                                    multi="followup",
                                                     fnct_search=_payment_earliest_date_search),
         }
 
diff --git a/addons/account_followup/wizard/account_followup_print.py b/addons/account_followup/wizard/account_followup_print.py
index 5170a0f3b24..3f8bba1830f 100644
--- a/addons/account_followup/wizard/account_followup_print.py
+++ b/addons/account_followup/wizard/account_followup_print.py
@@ -195,15 +195,15 @@ class account_followup_print(osv.osv_memory):
         # Partnerlist is list to exclude
         # Will clear the actions of partners that have no due payments anymore
         partner_list_ids = [partner.partner_id.id for partner in self.pool.get('account_followup.stat.by.partner').browse(cr, uid, partner_list, context=context)]
-        ids = self.pool.get('res.partner').search(cr, uid, ['&', ('credit', '<=', 0.0), '&', ('id', 'not in', partner_list_ids), '|', 
+        ids = self.pool.get('res.partner').search(cr, uid, ['&', ('id', 'not in', partner_list_ids), '|', 
                                                              ('payment_responsible_id', '!=', False), 
                                                              ('payment_next_action_date', '!=', False)], context=context)
-        parts = self.pool.get('res.partner').browse(cr, uid, ids, context=context)
-        newids = []
-        for part in parts: 
+
+        partners_to_clear = []
+        for part in self.pool.get('res.partner').browse(cr, uid, ids, context=context): 
             if not part.unreconciled_aml_ids: 
-                newids.append(part.id)
-        self.pool.get('res.partner').action_done(cr, uid, newids, context=context)
+                partners_to_clear.append(part.id)
+        self.pool.get('res.partner').action_done(cr, uid, partners_to_clear, context=context)
         return len(ids)
 
     def do_process(self, cr, uid, ids, context=None):

From f86d1d8cdfa8c0dc99ae424a71aa4d051ad781b8 Mon Sep 17 00:00:00 2001
From: "Quentin (OpenERP)" <qdp-launchpad@openerp.com>
Date: Thu, 6 Dec 2012 18:33:03 +0100
Subject: [PATCH 088/110] [FIX] account_followup: followups todo filter

bzr revid: qdp-launchpad@openerp.com-20121206173303-931iggghubfcxo0y
---
 addons/account_followup/account_followup_customers.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/account_followup/account_followup_customers.xml b/addons/account_followup/account_followup_customers.xml
index 54bd334a2df..3a7b5315b62 100644
--- a/addons/account_followup/account_followup_customers.xml
+++ b/addons/account_followup/account_followup_customers.xml
@@ -32,7 +32,7 @@
                     <group string="Follow-up">
                         <filter string="Partners with Overdue Credits" domain="[('payment_amount_overdue', '>', 0.0)]" name="credits"/>
                         <separator/>
-                        <filter string="Follow-ups To Do" domain="[('payment_next_action_date', '&lt;=', time.strftime('%%Y-%%m-%%d')), ('credit', '>', 0.0)]" name="todo"/>
+                        <filter string="Follow-ups To Do" domain="[('payment_next_action_date', '&lt;=', time.strftime('%%Y-%%m-%%d')), ('payment_amount_overdue', '>', 0.0)]" name="todo"/>
                         <separator/>
                         <filter string="No Responsible" domain="[('payment_responsible_id', '=', False)]"/>
                         <filter string="My Follow-ups" domain="[('payment_responsible_id','=', uid)]"/>

From 0f5c3fb9f99618e7264905972d66d2a7adf6fd79 Mon Sep 17 00:00:00 2001
From: "Quentin (OpenERP)" <qdp-launchpad@openerp.com>
Date: Thu, 6 Dec 2012 18:44:25 +0100
Subject: [PATCH 089/110] [REF] account_followup: refactoring

bzr revid: qdp-launchpad@openerp.com-20121206174425-p9kzotbpfadicns6
---
 addons/account_followup/account_followup.py | 38 +++++++++------------
 1 file changed, 17 insertions(+), 21 deletions(-)

diff --git a/addons/account_followup/account_followup.py b/addons/account_followup/account_followup.py
index f4b65d6d991..90ce781f9c3 100644
--- a/addons/account_followup/account_followup.py
+++ b/addons/account_followup/account_followup.py
@@ -24,6 +24,7 @@ from lxml import etree
 from operator import itemgetter
 
 from tools.translate import _
+from report import account_followup_print
 
 
 class followup(osv.osv):
@@ -120,21 +121,21 @@ class email_template(osv.osv):
     _inherit = 'email.template'
 
     def _get_followup_table_html(self, cr, uid, res_id, context=None):
-    ''' Build the html tables to be included in emails send to partners, when reminding them their
+        ''' 
+        Build the html tables to be included in emails send to partners, when reminding them their
         overdue invoices.
 
         :param res_id: ID of the partner for whom we are building the tables
         :rtype: string
-    '''
+        '''
         partner = self.pool.get('res.partner').browse(cr, uid, res_id, context=context)
         followup_table = ''
         if partner.unreconciled_aml_ids: 
             company = self.pool.get('res.users').browse(cr, uid, uid, context=context).company_id
             current_date = fields.date.context_today(cr, uid, context)
-            from report import account_followup_print
             rml_parse = account_followup_print.report_rappel(cr, uid, "followup_rml_parser")
             final_res = rml_parse._lines_get_with_partner(partner, company.id)
-            
+
             for currency_dict in final_res:
                 currency = currency_dict.get('line', [{'currency_id': company.currency_id}])[0]['currency_id']
                 followup_table += '''
@@ -308,35 +309,30 @@ class res_partner(osv.osv):
         }
 
 
-    def _get_amounts_and_date(self, cr, uid, ids, name, arg, context=None, company_id=None):
+    def _get_amounts_and_date(self, cr, uid, ids, name, arg, context=None):
         res = {}
-        if company_id == None:
-            company = self.pool.get('res.users').browse(cr, uid, uid, context=context).company_id
-        else:
-            company = self.pool.get('res.company').browse(cr, uid, company_id, context=context)
+        company = self.pool.get('res.users').browse(cr, uid, uid, context=context).company_id
         current_date = fields.date.context_today(cr, uid, context)
         for partner in self.browse(cr, uid, ids, context=context):
-            res[partner.id] = [0.0, 0.0, False]
-            calc_date = False
-            amount_due = 0.0
-            amount_overdue = 0.0
+            worst_due_date = False
+            amount_due = amount_overdue = 0.0
             for aml in partner.unreconciled_aml_ids:
                 if (aml.company_id == company):
-                    date_maturity = (not aml.date_maturity) and aml.date or aml.date_maturity
-                    if (not calc_date or calc_date > date_maturity): 
-                        calc_date = date_maturity
+                    date_maturity = aml.date_maturity or aml.date
+                    if not worst_due_date or worst_due_date < date_maturity:
+                        worst_due_date = date_maturity
                     amount_due += aml.result
                     if (date_maturity <= current_date):
                         amount_overdue += aml.result
             res[partner.id] = {'payment_amount_due': amount_due, 
                                'payment_amount_overdue': amount_overdue, 
-                               'payment_earliest_due_date': calc_date}
+                               'payment_earliest_due_date': worst_due_date}
         return res
-    
+
     def _payment_overdue_search(self, cr, uid, obj, name, args, context=None):
-        company = self.pool.get('res.users').browse(cr, uid, uid, context=context).company_id.id
         if not args:
-                return []
+            return []
+        company = self.pool.get('res.users').browse(cr, uid, uid, context=context).company_id.id
         having_values = tuple(map(itemgetter(2), args))
         where = ' AND '.join(
             map(lambda x: '(SUM(bal2) %(operator)s %%s)' % {
@@ -362,7 +358,7 @@ class res_partner(osv.osv):
         if not res:
             return [('id','=','0')]
         return [('id','in',map(itemgetter(0), res))]
-    
+
     def _payment_earliest_date_search(self, cr, uid, obj, name, args, context=None):
         if not args:
             return []

From 885000b0f08b66172036254a35c734fb94f5bc8d Mon Sep 17 00:00:00 2001
From: "Quentin (OpenERP)" <qdp-launchpad@openerp.com>
Date: Thu, 6 Dec 2012 19:10:45 +0100
Subject: [PATCH 090/110] [REF] account_followup: fixing the redbot

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

diff --git a/addons/account_followup/account_followup.py b/addons/account_followup/account_followup.py
index 90ce781f9c3..bf3d4bb2043 100644
--- a/addons/account_followup/account_followup.py
+++ b/addons/account_followup/account_followup.py
@@ -24,8 +24,6 @@ from lxml import etree
 from operator import itemgetter
 
 from tools.translate import _
-from report import account_followup_print
-
 
 class followup(osv.osv):
     _name = 'account_followup.followup'
@@ -128,6 +126,8 @@ class email_template(osv.osv):
         :param res_id: ID of the partner for whom we are building the tables
         :rtype: string
         '''
+        from report import account_followup_print
+
         partner = self.pool.get('res.partner').browse(cr, uid, res_id, context=context)
         followup_table = ''
         if partner.unreconciled_aml_ids: 
@@ -408,7 +408,7 @@ class res_partner(osv.osv):
         if not res:
             return [('id','=','0')]
         return [('id','in',map(itemgetter(0), res))]
-        
+
     _inherit = "res.partner"
     _columns = {
         'payment_responsible_id':fields.many2one('res.users', ondelete='set null', string='Follow-up Responsible', 

From df81eada09e4f7245bc2a028ffb3c3bcf1ef0219 Mon Sep 17 00:00:00 2001
From: "Quentin (OpenERP)" <qdp-launchpad@openerp.com>
Date: Thu, 6 Dec 2012 20:15:37 +0100
Subject: [PATCH 091/110] [REF] account_followup: refactoring of search
 functions of function fields

bzr revid: qdp-launchpad@openerp.com-20121206191537-obrvvt2x07iocx4d
---
 addons/account_followup/account_followup.py | 88 +++++++++------------
 1 file changed, 36 insertions(+), 52 deletions(-)

diff --git a/addons/account_followup/account_followup.py b/addons/account_followup/account_followup.py
index bf3d4bb2043..486f1af9d5b 100644
--- a/addons/account_followup/account_followup.py
+++ b/addons/account_followup/account_followup.py
@@ -329,31 +329,33 @@ class res_partner(osv.osv):
                                'payment_earliest_due_date': worst_due_date}
         return res
 
+    def _get_followup_overdue_query(self, cr, uid, args, overdue_only=False, context=None):
+        company_id = self.pool.get('res.users').browse(cr, uid, uid, context=context).company_id.id
+        having_where_clause = ' AND '.join(map(lambda x: '(SUM(bal2) %s %%s)' % (x[1]), args))
+        having_values = [x[2] for x in args]
+        query = self.pool.get('account.move.line')._query_get(cr, uid, context=context)
+        overdue_only_str = overdue_only and 'AND date_maturity <= NOW()' or ''
+        return ('''SELECT pid AS partner_id, SUM(bal2) FROM
+                    (SELECT CASE WHEN bal IS NOT NULL THEN bal
+                    ELSE 0.0 END AS bal2, p.id as pid FROM
+                    (SELECT (debit-credit) AS bal, partner_id
+                    FROM account_move_line l
+                    WHERE account_id IN
+                            (SELECT id FROM account_account
+                            WHERE type=\'receivable\' AND active)
+                    ''' + overdue_only_str + '''
+                    AND reconcile_id IS NULL
+                    AND company_id = %s
+                    AND ''' + query + ''') AS l
+                    RIGHT JOIN res_partner p
+                    ON p.id = partner_id ) AS pl
+                    GROUP BY pid HAVING ''' + having_where_clause, [company_id] + having_values)
+
     def _payment_overdue_search(self, cr, uid, obj, name, args, context=None):
         if not args:
             return []
-        company = self.pool.get('res.users').browse(cr, uid, uid, context=context).company_id.id
-        having_values = tuple(map(itemgetter(2), args))
-        where = ' AND '.join(
-            map(lambda x: '(SUM(bal2) %(operator)s %%s)' % {
-                                'operator':x[1]},args))
-        query = self.pool.get('account.move.line')._query_get(cr, uid, context=context)
-        cr.execute(('SELECT pid AS partner_id, SUM(bal2) FROM ' \
-                    '(SELECT CASE WHEN bal IS NOT NULL THEN bal ' \
-                    'ELSE 0.0 END AS bal2, p.id as pid FROM ' \
-                    '(SELECT (debit-credit) AS bal, partner_id ' \
-                    'FROM account_move_line l ' \
-                    'WHERE account_id IN ' \
-                            '(SELECT id FROM account_account '\
-                            'WHERE type=\'receivable\' AND active) ' \
-                    'AND date_maturity <= NOW() ' \
-                    'AND l.company_id = %s '
-                    'AND reconcile_id IS NULL ' \
-                    'AND '+query+') AS l ' \
-                    'RIGHT JOIN res_partner p ' \
-                    'ON p.id = partner_id ) AS pl ' \
-                    'GROUP BY pid HAVING ' + where), 
-                     (str(company),) + having_values)
+        query, query_args = self._get_followup_overdue_query(cr, uid, args, overdue_only=True, context=context)
+        cr.execute(query, query_args)
         res = cr.fetchall()
         if not res:
             return [('id','=','0')]
@@ -362,52 +364,34 @@ class res_partner(osv.osv):
     def _payment_earliest_date_search(self, cr, uid, obj, name, args, context=None):
         if not args:
             return []
-        having_values = tuple(map(itemgetter(2), args))
-        where = ' AND '.join(
-            map(lambda x: '(MIN(l.date_maturity) %(operator)s %%s)' % {
-                                'operator':x[1]},args))
+        company_id = self.pool.get('res.users').browse(cr, uid, uid, context=context).company_id.id
+        having_where_clause = ' AND '.join(map(lambda x: '(MIN(l.date_maturity) %s %%s)' % (x[1]), args))
+        having_values = [x[2] for x in args]
         query = self.pool.get('account.move.line')._query_get(cr, uid, context=context)
-        cr.execute(('SELECT partner_id FROM account_move_line l '\
+        cr.execute('SELECT partner_id FROM account_move_line l '\
                     'WHERE account_id IN '\
                         '(SELECT id FROM account_account '\
                         'WHERE type=\'receivable\' AND active) '\
+                    'AND l.company_id = %s '
                     'AND reconcile_id IS NULL '\
                     'AND '+query+' '\
                     'AND partner_id IS NOT NULL '\
-                    'GROUP BY partner_id HAVING '+where),
-                     having_values)
+                    'GROUP BY partner_id HAVING '+ having_where_clause,
+                     [company_id] + having_values)
         res = cr.fetchall()
         if not res:
             return [('id','=','0')]
-        return [('id','in',map(itemgetter(0), res))]
+        return [('id','in', [x[0] for x in res])]
 
     def _payment_due_search(self, cr, uid, obj, name, args, context=None):
-        company = self.pool.get('res.users').browse(cr, uid, uid, context=context).company_id.id
         if not args:
-                return []
-        having_values = tuple(map(itemgetter(2), args))
-        where = ' AND '.join(
-            map(lambda x: '(SUM(bal2) %(operator)s %%s)' % {
-                                'operator':x[1]},args))
-        query = self.pool.get('account.move.line')._query_get(cr, uid, context=context)
-        cr.execute(('SELECT pid AS partner_id, SUM(bal2) FROM ' \
-                    '(SELECT CASE WHEN bal IS NOT NULL THEN bal ' \
-                    'ELSE 0.0 END AS bal2, p.id as pid FROM ' \
-                    '(SELECT (debit-credit) AS bal, partner_id ' \
-                    'FROM account_move_line l ' \
-                    'WHERE account_id IN ' \
-                            '(SELECT id FROM account_account '\
-                            'WHERE type=\'receivable\' AND active) ' \
-                    'AND reconcile_id IS NULL ' \
-                    'AND company_id = %s'
-                    'AND '+query+') AS l ' \
-                    'RIGHT JOIN res_partner p ' \
-                    'ON p.id = partner_id ) AS pl ' \
-                    'GROUP BY pid HAVING ' + where), (str(company),) + having_values)
+            return []
+        query, query_args = self._get_followup_overdue_query(cr, uid, args, overdue_only=False, context=context)
+        cr.execute(query, query_args)
         res = cr.fetchall()
         if not res:
             return [('id','=','0')]
-        return [('id','in',map(itemgetter(0), res))]
+        return [('id','in', [x[0] for x in res])]
 
     _inherit = "res.partner"
     _columns = {

From 85e8ece99c36bb502718868fc6ef433d88b14d56 Mon Sep 17 00:00:00 2001
From: "Quentin (OpenERP)" <qdp-launchpad@openerp.com>
Date: Fri, 7 Dec 2012 00:09:18 +0100
Subject: [PATCH 092/110] [REF] account_followup: refactoring

bzr revid: qdp-launchpad@openerp.com-20121206230918-ff0xi061fbauaj9d
---
 addons/account_followup/account_followup.py | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

diff --git a/addons/account_followup/account_followup.py b/addons/account_followup/account_followup.py
index 486f1af9d5b..c6c9bd8e079 100644
--- a/addons/account_followup/account_followup.py
+++ b/addons/account_followup/account_followup.py
@@ -21,7 +21,6 @@
 
 from osv import fields, osv
 from lxml import etree
-from operator import itemgetter
 
 from tools.translate import _
 
@@ -330,6 +329,19 @@ class res_partner(osv.osv):
         return res
 
     def _get_followup_overdue_query(self, cr, uid, args, overdue_only=False, context=None):
+        '''
+        This function is used to build the query and arguments to use when making a search on functional fields
+            * payment_amount_due
+            * payment_amount_overdue
+        Basically, the query is exactly the same except that for overdue there is an extra clause in the WHERE.
+
+        :param args: arguments given to the search in the usual domain notation (list of tuples)
+        :param overdue_only: option to add the extra argument to filter on overdue accounting entries or not
+        :returns: a tuple with
+            * the query to execute as first element
+            * the arguments for the execution of this query
+        :rtype: (string, [])
+        '''
         company_id = self.pool.get('res.users').browse(cr, uid, uid, context=context).company_id.id
         having_where_clause = ' AND '.join(map(lambda x: '(SUM(bal2) %s %%s)' % (x[1]), args))
         having_values = [x[2] for x in args]
@@ -359,7 +371,7 @@ class res_partner(osv.osv):
         res = cr.fetchall()
         if not res:
             return [('id','=','0')]
-        return [('id','in',map(itemgetter(0), res))]
+        return [('id','in', [x[0] for x in res])]
 
     def _payment_earliest_date_search(self, cr, uid, obj, name, args, context=None):
         if not args:

From 595b9e2d855aaf3e4a1247c455b9a288d22e8c77 Mon Sep 17 00:00:00 2001
From: Launchpad Translations on behalf of openerp <>
Date: Fri, 7 Dec 2012 04:34:34 +0000
Subject: [PATCH 093/110] Launchpad automatic translations update.

bzr revid: launchpad_translations_on_behalf_of_openerp-20121207043434-1dvo9j9slfscwdjt
---
 openerp/addons/base/i18n/es_DO.po | 817 +++++++++++++++++++-----------
 openerp/addons/base/i18n/fr.po    |  10 +-
 openerp/addons/base/i18n/zh_CN.po |   6 +-
 3 files changed, 520 insertions(+), 313 deletions(-)

diff --git a/openerp/addons/base/i18n/es_DO.po b/openerp/addons/base/i18n/es_DO.po
index 0f632301e0e..73c03ec05ae 100644
--- a/openerp/addons/base/i18n/es_DO.po
+++ b/openerp/addons/base/i18n/es_DO.po
@@ -8,13 +8,13 @@ msgstr ""
 "Project-Id-Version: openobject-server\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-12-03 16:01+0000\n"
-"PO-Revision-Date: 2012-12-05 21:00+0000\n"
+"PO-Revision-Date: 2012-12-06 20:42+0000\n"
 "Last-Translator: Carlos Matos Villar <carlosmvillar19@hotmail.com>\n"
 "Language-Team: Spanish (Dominican Republic) <es_DO@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-06 04:39+0000\n"
+"X-Launchpad-Export-Date: 2012-12-07 04:34+0000\n"
 "X-Generator: Launchpad (build 16341)\n"
 
 #. module: base
@@ -6412,114 +6412,114 @@ msgstr ""
 #. module: base
 #: view:ir.translation:0
 msgid "Comments"
-msgstr ""
+msgstr "Comentarios"
 
 #. module: base
 #: model:res.country,name:base.et
 msgid "Ethiopia"
-msgstr ""
+msgstr "Etiopía"
 
 #. module: base
 #: model:ir.module.category,name:base.module_category_authentication
 msgid "Authentication"
-msgstr ""
+msgstr "Autentificación"
 
 #. module: base
 #: model:res.country,name:base.sj
 msgid "Svalbard and Jan Mayen Islands"
-msgstr ""
+msgstr "Islas Jan Mayen y Svalbard"
 
 #. module: base
 #: model:ir.model,name:base.model_ir_actions_wizard
 #: selection:ir.ui.menu,action:0
 msgid "ir.actions.wizard"
-msgstr ""
+msgstr "ir.actions.wizard"
 
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_web_kanban
 msgid "Base Kanban"
-msgstr ""
+msgstr "Kanban web"
 
 #. module: base
 #: view:ir.actions.act_window:0
 #: view:ir.actions.report.xml:0
 #: view:ir.actions.server:0
 msgid "Group By"
-msgstr ""
+msgstr "Agrupar por"
 
 #. module: base
 #: view:res.config.installer:0
 msgid "title"
-msgstr ""
+msgstr "título"
 
 #. module: base
 #: code:addons/base/ir/ir_fields.py:147
 #, python-format
 msgid "true"
-msgstr ""
+msgstr "verdadero"
 
 #. module: base
 #: model:ir.model,name:base.model_base_language_install
 msgid "Install Language"
-msgstr ""
+msgstr "Instalar idioma"
 
 #. module: base
 #: model:res.partner.category,name:base.res_partner_category_11
 msgid "Services"
-msgstr ""
+msgstr "Servicios"
 
 #. module: base
 #: view:ir.translation:0
 msgid "Translation"
-msgstr ""
+msgstr "Traducción"
 
 #. module: base
 #: selection:res.request,state:0
 msgid "closed"
-msgstr ""
+msgstr "cerrado"
 
 #. module: base
 #: selection:base.language.export,state:0
 msgid "get"
-msgstr ""
+msgstr "obtener"
 
 #. module: base
 #: help:ir.model.fields,on_delete:0
 msgid "On delete property for many2one fields"
-msgstr ""
+msgstr "Propiedad de Eliminar para los campos many2one"
 
 #. module: base
 #: model:ir.module.category,name:base.module_category_accounting_and_finance
 msgid "Accounting & Finance"
-msgstr ""
+msgstr "Contabilidad y finanzas"
 
 #. module: base
 #: field:ir.actions.server,write_id:0
 msgid "Write Id"
-msgstr ""
+msgstr "Id escritura"
 
 #. module: base
 #: model:ir.ui.menu,name:base.menu_product
 msgid "Products"
-msgstr ""
+msgstr "Productos"
 
 #. 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 ""
+msgstr "Predeterminados definidos por el usuario"
 
 #. module: base
 #: model:ir.module.category,name:base.module_category_usability
 #: view:res.users:0
 msgid "Usability"
-msgstr ""
+msgstr "Usabilidad"
 
 #. module: base
 #: field:ir.actions.act_window,domain:0
 msgid "Domain Value"
-msgstr ""
+msgstr "Valor de dominio"
 
 #. module: base
 #: model:ir.module.module,description:base.module_association
@@ -6533,6 +6533,14 @@ msgid ""
 "membership products (schemes).\n"
 "    "
 msgstr ""
+"\n"
+"Este modulo es para configurar los módulos relacionados a una asociación.\n"
+"=========================================================================\n"
+"\n"
+"Esto instala el perfil para la asociación de gestión de eventos, "
+"registraciones, membresías, \n"
+"productos de membresías (Esquemas).\n"
+"    "
 
 #. module: base
 #: model:ir.ui.menu,name:base.menu_base_config
@@ -6546,7 +6554,7 @@ msgstr ""
 #: view:res.company:0
 #: view:res.config:0
 msgid "Configuration"
-msgstr ""
+msgstr "Configuración"
 
 #. module: base
 #: model:ir.module.module,description:base.module_edi
@@ -6565,17 +6573,30 @@ msgid ""
 "documentation at http://doc.openerp.com.\n"
 "    "
 msgstr ""
+"\n"
+"Provee una plataforma EDI común que otras aplicaciones pueden usar.\n"
+"=================================================================\n"
+"\n"
+"OpenERP especifica un formato general para intercambio de documentos de "
+"negocios entre \n"
+"diferentes sistemas, y provee mecanismos genéricos para importación y "
+"exportación de ellos.\n"
+"\n"
+"Más detalles acerca del formato EDI de OpenERP puede ser encontrado en la "
+"documentación técnica de OpenERP \n"
+"en http://doc.openerp.com\n"
+"    "
 
 #. module: base
 #: code:addons/base/ir/workflow/workflow.py:99
 #, python-format
 msgid "Operation forbidden"
-msgstr ""
+msgstr "Operación prohibida"
 
 #. module: base
 #: view:ir.actions.server:0
 msgid "SMS Configuration"
-msgstr ""
+msgstr "Configuración SMS"
 
 #. module: base
 #: help:ir.rule,active:0
@@ -6588,7 +6609,7 @@ msgstr ""
 #. module: base
 #: selection:base.language.install,lang:0
 msgid "Spanish (BO) / Español (BO)"
-msgstr ""
+msgstr "Español (BO) / Español (BO)"
 
 #. module: base
 #: model:ir.module.module,description:base.module_board
@@ -6605,12 +6626,12 @@ msgstr ""
 #: 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 ""
+msgstr "Lista controles de acceso"
 
 #. module: base
 #: model:res.country,name:base.um
 msgid "USA Minor Outlying Islands"
-msgstr ""
+msgstr "EE.UU. Islas Exteriores Menores"
 
 #. module: base
 #: help:ir.cron,numbercall:0
@@ -6618,37 +6639,39 @@ msgid ""
 "How many times the method is called,\n"
 "a negative number indicates no limit."
 msgstr ""
+"Cuántas veces es llamado el método,\n"
+"Un número negativo indica que no hay límite."
 
 #. module: base
 #: field:res.partner.bank.type.field,bank_type_id:0
 msgid "Bank Type"
-msgstr ""
+msgstr "Tipo de banco"
 
 #. module: base
 #: code:addons/base/res/res_users.py:103
 #, python-format
 msgid "The name of the group can not start with \"-\""
-msgstr ""
+msgstr "El nombre del grupo no puede empezar con \"-\""
 
 #. module: base
 #: view:ir.module.module:0
 msgid "Apps"
-msgstr ""
+msgstr "Aplicaciones"
 
 #. module: base
 #: view:ir.ui.view_sc:0
 msgid "Shortcut"
-msgstr ""
+msgstr "Acceso rápido"
 
 #. module: base
 #: field:ir.model.data,date_init:0
 msgid "Init Date"
-msgstr ""
+msgstr "Fecha inicial"
 
 #. module: base
 #: selection:base.language.install,lang:0
 msgid "Gujarati / ગુજરાતી"
-msgstr ""
+msgstr "Gujarati / ગુજરાતી"
 
 #. module: base
 #: code:addons/base/module/module.py:340
@@ -6656,53 +6679,55 @@ msgstr ""
 msgid ""
 "Unable to process module \"%s\" because an external dependency is not met: %s"
 msgstr ""
+"Imposible procesar el modulo \"%s\" por que no se resolvió la dependencia "
+"externa: %s"
 
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_l10n_be_hr_payroll
 msgid "Belgium - Payroll"
-msgstr ""
+msgstr "Bélgica - Nóminas"
 
 #. module: base
 #: view:workflow.activity:0
 #: field:workflow.activity,flow_start:0
 msgid "Flow Start"
-msgstr ""
+msgstr "Flujo de inicio"
 
 #. module: base
 #: model:ir.model,name:base.model_res_partner_title
 msgid "res.partner.title"
-msgstr ""
+msgstr "res.partner.title"
 
 #. module: base
 #: view:res.partner.bank:0
 msgid "Bank Account Owner"
-msgstr ""
+msgstr "Titular de la cuenta bancaria"
 
 #. module: base
 #: model:ir.module.category,name:base.module_category_uncategorized
 msgid "Uncategorized"
-msgstr ""
+msgstr "Sin categoría"
 
 #. module: base
 #: field:ir.attachment,res_name:0
 #: field:ir.ui.view_sc,resource:0
 msgid "Resource Name"
-msgstr ""
+msgstr "Nombre del recurso"
 
 #. module: base
 #: field:res.partner,is_company:0
 msgid "Is a Company"
-msgstr ""
+msgstr "Es una Empresa"
 
 #. module: base
 #: selection:ir.cron,interval_type:0
 msgid "Hours"
-msgstr ""
+msgstr "Horas"
 
 #. module: base
 #: model:res.country,name:base.gp
 msgid "Guadeloupe (French)"
-msgstr ""
+msgstr "Guadalupe (Francesa)"
 
 #. module: base
 #: code:addons/base/res/res_lang.py:185
@@ -6710,7 +6735,7 @@ msgstr ""
 #: code:addons/base/res/res_lang.py:189
 #, python-format
 msgid "User Error"
-msgstr ""
+msgstr "Error de usuario"
 
 #. module: base
 #: help:workflow.transition,signal:0
@@ -6719,6 +6744,9 @@ msgid ""
 "form, signal tests the name of the pressed button. If signal is NULL, no "
 "button is necessary to validate this transition."
 msgstr ""
+"Cuando la operación de la transición viene de un botón pulsado en el "
+"formulario de cliente, la señal comprueba el nombre del botón pulsado. Si la "
+"señal es NULL, ningún botón es necesario para validar esta transición."
 
 #. module: base
 #: model:ir.module.module,description:base.module_web_kanban
@@ -6728,23 +6756,28 @@ msgid ""
 "========================\n"
 "\n"
 msgstr ""
+"\n"
+"Vista Web OpenERP kanban.\n"
+"============================\n"
+"\n"
 
 #. module: base
 #: code:addons/base/ir/ir_fields.py:183
 #, python-format
 msgid "'%s' does not seem to be a number for field '%%(field)s'"
-msgstr ""
+msgstr "'%s' no parece haber un número para el campo '%%(field)s'"
 
 #. module: base
 #: help:res.country.state,name:0
 msgid ""
 "Administrative divisions of a country. E.g. Fed. State, Departement, Canton"
 msgstr ""
+"División administrativa de países. Por Ejemplo. Estado, Departamento, Canton"
 
 #. module: base
 #: view:res.partner.bank:0
 msgid "My Banks"
-msgstr ""
+msgstr "Bancos"
 
 #. module: base
 #: model:ir.module.module,description:base.module_hr_recruitment
@@ -6765,16 +6798,31 @@ msgid ""
 "You can define the different phases of interviews and easily rate the "
 "applicant from the kanban view.\n"
 msgstr ""
+"\n"
+"Gestiona las posiciones de trabajo y los procesos de reclutamiento\n"
+"========================================================\n"
+"\n"
+"Esta aplicación permite fácilmente mantener el rastreo de sus trabajos, "
+"vacantes, aplicaciones, entrevistas...\n"
+"\n"
+"Se integra con la pasarela de correo para recuperar automáticamente el "
+"correo electrónico enviado a <jobs@yourcompany.com> en la lista de "
+"aplicaciones. También integrada con el administrador de documentos del "
+"sistema para almacenar y buscar en la base de CV y buscar los candidatos  "
+"que usted esta buscando. Similarmente, esta integrado con el modulo de "
+"encuestas que te permite definir entrevistas para diferentes trabajos.\n"
+"Usted puede definir las diferentes fases de entrevistas y rango de "
+"aplicaciones de la vista kanban.\n"
 
 #. module: base
 #: sql_constraint:ir.filters:0
 msgid "Filter names must be unique"
-msgstr ""
+msgstr "Los nombres de los filtros deben ser unicos"
 
 #. module: base
 #: help:multi_company.default,object_id:0
 msgid "Object affected by this rule"
-msgstr ""
+msgstr "Objeto afectado por esta regla"
 
 #. module: base
 #: selection:ir.actions.act_window,target:0
@@ -6784,22 +6832,22 @@ msgstr ""
 #. module: base
 #: field:ir.filters,is_default:0
 msgid "Default filter"
-msgstr ""
+msgstr "Filtro por Defecto"
 
 #. module: base
 #: report:ir.module.reference:0
 msgid "Directory"
-msgstr ""
+msgstr "Directorio"
 
 #. module: base
 #: field:wizard.ir.model.menu.create,name:0
 msgid "Menu Name"
-msgstr ""
+msgstr "Nombre menú"
 
 #. module: base
 #: field:ir.values,key2:0
 msgid "Qualifier"
-msgstr ""
+msgstr "Calificador"
 
 #. module: base
 #: model:ir.module.module,description:base.module_l10n_be_coda
@@ -6901,34 +6949,34 @@ msgstr ""
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_auth_reset_password
 msgid "Reset Password"
-msgstr ""
+msgstr "Restablecer contraseña"
 
 #. module: base
 #: view:ir.attachment:0
 msgid "Month"
-msgstr ""
+msgstr "Mes"
 
 #. module: base
 #: model:res.country,name:base.my
 msgid "Malaysia"
-msgstr ""
+msgstr "Malasia"
 
 #. module: base
 #: code:addons/base/ir/ir_sequence.py:105
 #: code:addons/base/ir/ir_sequence.py:131
 #, python-format
 msgid "Increment number must not be zero."
-msgstr ""
+msgstr "El incremento de números debe ser cero."
 
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_account_cancel
 msgid "Cancel Journal Entries"
-msgstr ""
+msgstr "Cancelar asientos"
 
 #. module: base
 #: field:res.partner,tz_offset:0
 msgid "Timezone offset"
-msgstr ""
+msgstr "Ajuste de Zona Horaria"
 
 #. module: base
 #: model:ir.module.module,description:base.module_marketing_campaign
@@ -6967,6 +7015,41 @@ msgid ""
 "      CRM Leads.\n"
 "    "
 msgstr ""
+"\n"
+"Este modulo provee conduces automáticos a través de campañas de marketing "
+"(las campañas de hecho pueden ser definidas en cualquier recurso, no solo "
+"los conduces CRM).\n"
+"============================================================================="
+"=========================\n"
+"\n"
+"Las campañas son dinámicas y multi-canales. Los procesos son como sigue:\n"
+"--------------------------------------------------------------------------\n"
+"    * Diseñar campañas de marketing como flujos de trabajos, incluyendo "
+"plantillas de envío\n"
+"        de email, informes a imprimir y enviar por email, acciones "
+"personalizadas\n"
+"    * Definir segmentos de entrada que seleccionarán los artículos que "
+"deberán ser incluidos\n"
+"      en la campaña (Por Ejemplo: conduces desde ciertos países.)\n"
+"    * Correr su campaña en modo simulación para probar el tiempo real o "
+"acelerado,\n"
+"      y lo refinara\n"
+"    * Usted también iniciará la campaña real en modo manual, donde cada "
+"acción\n"
+"      requiere validación manual\n"
+"    * Finalmente lanzar su compañía viva, y observar las estadísticas como "
+"las\n"
+"      campañas hacen todo totalmente automáticamente.\n"
+"\n"
+"Mientras la campaña corre, usted puede por supuesto continuar de refinar los "
+"parámetros,\n"
+"segmentos de entradas, flujos de trabajo.\n"
+"\n"
+"**Notas:** Si usted necesita datos de demostración, usted puede instalar el "
+"modulo marketing_campaing_crm_demo\n"
+"      pero, este también instalará la aplicación CRM tal como depende de los "
+"conduces CRM.\n"
+"    "
 
 #. module: base
 #: help:ir.mail_server,smtp_debug:0
@@ -6974,6 +7057,9 @@ 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 ""
+"Si está habilitado, la salida completa de las sesiones SMTP serán escritas "
+"en el registro del servidor en el nivel DEBUG (¿esto es muy detallado y "
+"puede incluir información confidencial!"
 
 #. module: base
 #: model:ir.module.module,description:base.module_sale_margin
@@ -6986,11 +7072,18 @@ msgid ""
 "Price and Cost Price.\n"
 "    "
 msgstr ""
+"\n"
+"Este modulo agrega los \"Margenes\" en ordenes de ventas.\n"
+"===================================================\n"
+"\n"
+"Esto da la rentabilidad de calcular la diferencia entre\n"
+"el Precio de Unidad y el Precio de Costo.\n"
+"    "
 
 #. module: base
 #: selection:ir.actions.todo,type:0
 msgid "Launch Automatically"
-msgstr ""
+msgstr "Iniciar automáticamente"
 
 #. module: base
 #: help:ir.model.fields,translate:0
@@ -6998,21 +7091,24 @@ msgid ""
 "Whether values for this field can be translated (enables the translation "
 "mechanism for that field)"
 msgstr ""
+"Si los valores de este campo pueden ser traducidos (activa el mecanismo de "
+"traducción para este campo)."
 
 #. module: base
 #: selection:base.language.install,lang:0
 msgid "Indonesian / Bahasa Indonesia"
-msgstr ""
+msgstr "Indonesio / Bahasa Indonesia"
 
 #. module: base
 #: model:res.country,name:base.cv
 msgid "Cape Verde"
-msgstr ""
+msgstr "Cabo Verde"
 
 #. 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 ""
+"El usuario tendrá acceso a su propia data en la aplicación de ventas."
 
 #. module: base
 #: model:res.groups,comment:base.group_user
@@ -7020,12 +7116,15 @@ 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 ""
+"el usuario podrá gestionar sus propias cosas de recursos humanos "
+"(solicitudes de salida, hojas por horas de servicios, ...), si esta enlazado "
+"a un empleado del sistema."
 
 #. module: base
 #: code:addons/orm.py:2247
 #, python-format
 msgid "There is no view of type '%s' defined for the structure!"
-msgstr ""
+msgstr "¡No existe una vista del tipo '%s' definida para la estructura!"
 
 #. module: base
 #: help:ir.values,key:0
@@ -7033,58 +7132,60 @@ msgid ""
 "- Action: an action attached to one slot of the given model\n"
 "- Default: a default value for a model field"
 msgstr ""
+"- Acción: una acción adjunta al modelo dado\n"
+"- Por defecto: un valor por defecto para el campo del modelo"
 
 #. module: base
 #: field:base.module.update,add:0
 msgid "Number of modules added"
-msgstr ""
+msgstr "Número de módulos añadidos"
 
 #. module: base
 #: view:res.currency:0
 msgid "Price Accuracy"
-msgstr ""
+msgstr "Precisión del precio"
 
 #. module: base
 #: selection:base.language.install,lang:0
 msgid "Latvian / latviešu valoda"
-msgstr ""
+msgstr "Letón / latviešu valoda"
 
 #. module: base
 #: selection:base.language.install,lang:0
 msgid "French / Français"
-msgstr ""
+msgstr "Francés / Français"
 
 #. module: base
 #: view:ir.module.module:0
 msgid "Created Menus"
-msgstr ""
+msgstr "Menús creados"
 
 #. module: base
 #: code:addons/base/module/module.py:475
 #: view:ir.module.module:0
 #, python-format
 msgid "Uninstall"
-msgstr ""
+msgstr "Desinstalar"
 
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_account_budget
 msgid "Budgets Management"
-msgstr ""
+msgstr "Gestión de presupuestos"
 
 #. module: base
 #: field:workflow.triggers,workitem_id:0
 msgid "Workitem"
-msgstr ""
+msgstr "Elemento de trabajo"
 
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_anonymization
 msgid "Database Anonymization"
-msgstr ""
+msgstr "Anonimización de la base de datos"
 
 #. module: base
 #: selection:ir.mail_server,smtp_encryption:0
 msgid "SSL/TLS"
-msgstr ""
+msgstr "SSL/TLS"
 
 #. module: base
 #: view:ir.actions.todo:0
@@ -7099,27 +7200,27 @@ msgstr ""
 #: field:ir.ui.menu,action:0
 #: selection:ir.values,key:0
 msgid "Action"
-msgstr ""
+msgstr "Acción"
 
 #. module: base
 #: view:ir.actions.server:0
 msgid "Email Configuration"
-msgstr ""
+msgstr "Configuración Email"
 
 #. module: base
 #: model:ir.model,name:base.model_ir_cron
 msgid "ir.cron"
-msgstr ""
+msgstr "ir.cron"
 
 #. module: base
 #: model:res.country,name:base.cw
 msgid "Curaçao"
-msgstr ""
+msgstr "Curaçao"
 
 #. module: base
 #: view:ir.sequence:0
 msgid "Current Year without Century: %(y)s"
-msgstr ""
+msgstr "Año actual sin centuria: %(y)s"
 
 #. module: base
 #: help:ir.actions.client,tag:0
@@ -7127,16 +7228,19 @@ msgid ""
 "An arbitrary string, interpreted by the client according to its own needs "
 "and wishes. There is no central tag repository across clients."
 msgstr ""
+"Una cadena arbitraria, interpretada por el cliente de acuerdo con sus "
+"propias necesidades y deseos. No hay repositorio central de etiqueta a "
+"través de clientes."
 
 #. module: base
 #: sql_constraint:ir.rule:0
 msgid "Rule must have at least one checked access right !"
-msgstr ""
+msgstr "¡La regla debe tener por lo menos un derecho de acceso marcado!"
 
 #. module: base
 #: field:res.partner.bank.type,format_layout:0
 msgid "Format Layout"
-msgstr ""
+msgstr "Formato de presentación"
 
 #. module: base
 #: model:ir.module.module,description:base.module_document_ftp
@@ -7151,27 +7255,34 @@ msgid ""
 "using the\n"
 "FTP client.\n"
 msgstr ""
+"\n"
+"Módulo de soporte del interfaz FTP para el sistema de gestión de "
+"documentos.\n"
+"================================================================\n"
+"\n"
+"Este módulo permite acceder a los documentos, además de a través de OpenERP, "
+"a través de un cliente FTP.\n"
 
 #. module: base
 #: field:ir.model.fields,size:0
 msgid "Size"
-msgstr ""
+msgstr "Tamaño"
 
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_audittrail
 msgid "Audit Trail"
-msgstr ""
+msgstr "Rastro de auditoría"
 
 #. module: base
 #: code:addons/base/ir/ir_fields.py:265
 #, python-format
 msgid "Value '%s' not found in selection field '%%(field)s'"
-msgstr ""
+msgstr "Valor '%s' no encontrado en campo seleccionado '%%(field)s'"
 
 #. module: base
 #: model:res.country,name:base.sd
 msgid "Sudan"
-msgstr ""
+msgstr "Sudán"
 
 #. module: base
 #: model:ir.actions.act_window,name:base.action_currency_rate_type_form
@@ -7179,7 +7290,7 @@ msgstr ""
 #: field:res.currency.rate,currency_rate_type_id:0
 #: view:res.currency.rate.type:0
 msgid "Currency Rate Type"
-msgstr ""
+msgstr "Tipo de tasa de cambio"
 
 #. module: base
 #: model:ir.module.module,description:base.module_l10n_fr
@@ -7221,18 +7332,18 @@ msgstr ""
 #. module: base
 #: model:res.country,name:base.fm
 msgid "Micronesia"
-msgstr ""
+msgstr "Micronesia"
 
 #. module: base
 #: field:ir.module.module,menus_by_module:0
 #: view:res.groups:0
 msgid "Menus"
-msgstr ""
+msgstr "Menús"
 
 #. module: base
 #: selection:ir.actions.todo,type:0
 msgid "Launch Manually Once"
-msgstr ""
+msgstr "Iniciar manualmente una vez"
 
 #. module: base
 #: view:workflow:0
@@ -7242,44 +7353,44 @@ msgstr ""
 #: field:workflow.transition,wkf_id:0
 #: field:workflow.workitem,wkf_id:0
 msgid "Workflow"
-msgstr ""
+msgstr "Flujo de trabajo"
 
 #. module: base
 #: selection:base.language.install,lang:0
 msgid "Serbian (Latin) / srpski"
-msgstr ""
+msgstr "Serbio (Latín) / srpski"
 
 #. module: base
 #: model:res.country,name:base.il
 msgid "Israel"
-msgstr ""
+msgstr "Israel"
 
 #. module: base
 #: code:addons/base/res/res_config.py:444
 #, python-format
 msgid "Cannot duplicate configuration!"
-msgstr ""
+msgstr "No se puede configurar la configuración!"
 
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_l10n_syscohada
 msgid "OHADA - Accounting"
-msgstr ""
+msgstr "OHADA - Contabilidad"
 
 #. module: base
 #: help:res.bank,bic:0
 msgid "Sometimes called BIC or Swift."
-msgstr ""
+msgstr "Algunas veces llamado BIC o Swift"
 
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_l10n_in
 msgid "Indian - Accounting"
-msgstr ""
+msgstr "Contabilidad - India"
 
 #. module: base
 #: field:res.partner,mobile:0
 #: field:res.partner.address,mobile:0
 msgid "Mobile"
-msgstr ""
+msgstr "Móvil"
 
 #. module: base
 #: model:ir.module.module,description:base.module_l10n_mx
@@ -7291,11 +7402,17 @@ msgid ""
 "Mexican accounting chart and localization.\n"
 "    "
 msgstr ""
+"\n"
+"Módulo para gestionar el plan de cuentas para México en OpenERP\n"
+"=====================================================\n"
+"\n"
+"Plan de cuentas y localización mexicanos.\n"
+"    "
 
 #. module: base
 #: field:res.lang,time_format:0
 msgid "Time Format"
-msgstr ""
+msgstr "Formato de hora"
 
 #. module: base
 #: field:res.company,rml_header3:0
@@ -7305,22 +7422,22 @@ msgstr ""
 #. module: base
 #: model:res.groups,name:base.group_partner_manager
 msgid "Contact Creation"
-msgstr ""
+msgstr "Creación de Contacto"
 
 #. module: base
 #: view:ir.module.module:0
 msgid "Defined Reports"
-msgstr ""
+msgstr "Informes definidos"
 
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_project_gtd
 msgid "Todo Lists"
-msgstr ""
+msgstr "Lista de tareas pendientes"
 
 #. module: base
 #: view:ir.actions.report.xml:0
 msgid "Report xml"
-msgstr ""
+msgstr "Informe XML"
 
 #. module: base
 #: model:ir.actions.act_window,name:base.action_module_open_categ
@@ -7329,7 +7446,7 @@ msgstr ""
 #: model:ir.ui.menu,name:base.menu_management
 #: model:ir.ui.menu,name:base.menu_module_tree
 msgid "Modules"
-msgstr ""
+msgstr "Módulos"
 
 #. module: base
 #: view:workflow.activity:0
@@ -7337,7 +7454,7 @@ msgstr ""
 #: field:workflow.activity,subflow_id:0
 #: field:workflow.workitem,subflow_id:0
 msgid "Subflow"
-msgstr ""
+msgstr "Subflujo"
 
 #. module: base
 #: model:ir.actions.act_window,name:base.action_res_bank_form
@@ -7345,7 +7462,7 @@ msgstr ""
 #: view:res.bank:0
 #: field:res.partner,bank_ids:0
 msgid "Banks"
-msgstr ""
+msgstr "Bancos"
 
 #. module: base
 #: model:ir.module.module,description:base.module_web
@@ -7357,122 +7474,129 @@ msgid ""
 "This module provides the core of the OpenERP Web Client.\n"
 "        "
 msgstr ""
+"\n"
+"Modulo principal OpenERP Web.\n"
+"===========================\n"
+"\n"
+"Este modulo provee núcleo del Cliente Web de OpenERP.\n"
+"        "
 
 #. module: base
 #: view:ir.sequence:0
 msgid "Week of the Year: %(woy)s"
-msgstr ""
+msgstr "Semana del Año: %(woy)s"
 
 #. module: base
 #: field:res.users,id:0
 msgid "ID"
-msgstr ""
+msgstr "ID (identificación)"
 
 #. module: base
 #: field:ir.cron,doall:0
 msgid "Repeat Missed"
-msgstr ""
+msgstr "Repetir perdidos"
 
 #. module: base
 #: code:addons/base/module/wizard/base_module_import.py:67
 #, python-format
 msgid "Can not create the module file: %s !"
-msgstr ""
+msgstr "¡No se puede crear el archivo de módulo: %s!"
 
 #. module: base
 #: field:ir.server.object.lines,server_id:0
 msgid "Object Mapping"
-msgstr ""
+msgstr "Mapeado de objetos"
 
 #. module: base
 #: field:ir.module.category,xml_id:0
 #: field:ir.ui.view,xml_id:0
 msgid "External ID"
-msgstr ""
+msgstr "ID externo"
 
 #. module: base
 #: help:res.currency.rate,rate:0
 msgid "The rate of the currency to the currency of rate 1"
-msgstr ""
+msgstr "La tasa de cambio de la moneda respecto a la moneda de tasa 1"
 
 #. module: base
 #: model:res.country,name:base.uk
 msgid "United Kingdom"
-msgstr ""
+msgstr "Reino Unido"
 
 #. module: base
 #: view:res.config:0
 msgid "res_config_contents"
-msgstr ""
+msgstr "res_config_contents"
 
 #. module: base
 #: help:res.partner.category,active:0
 msgid "The active field allows you to hide the category without removing it."
 msgstr ""
+"El campo activo le permite ocultar la categoría sin tener que eliminarla."
 
 #. module: base
 #: report:ir.module.reference:0
 msgid "Object:"
-msgstr ""
+msgstr "Objeto:"
 
 #. module: base
 #: model:res.country,name:base.bw
 msgid "Botswana"
-msgstr ""
+msgstr "Botsuana"
 
 #. module: base
 #: view:res.partner.title:0
 msgid "Partner Titles"
-msgstr ""
+msgstr "Títulos de empresa"
 
 #. module: base
 #: code:addons/base/ir/ir_fields.py:197
 #: code:addons/base/ir/ir_fields.py:228
 #, python-format
 msgid "Use the format '%s'"
-msgstr ""
+msgstr "Use el formato '%s'"
 
 #. module: base
 #: help:ir.actions.act_window,auto_refresh:0
 msgid "Add an auto-refresh on the view"
-msgstr ""
+msgstr "Añadir una actualización automática a la vista"
 
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_crm_profiling
 msgid "Customer Profiling"
-msgstr ""
+msgstr "Perfiles de clientes"
 
 #. module: base
 #: selection:ir.cron,interval_type:0
 msgid "Work Days"
-msgstr ""
+msgstr "Días laborables"
 
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_multi_company
 msgid "Multi-Company"
-msgstr ""
+msgstr "Multi-compañía"
 
 #. 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 ""
+msgstr "Elementos de trabajo"
 
 #. module: base
 #: code:addons/base/res/res_bank.py:195
 #, python-format
 msgid "Invalid Bank Account Type Name format."
-msgstr ""
+msgstr "Tipo de formato del nombre invalido en Cuenta de Banco."
 
 #. module: base
 #: view:ir.filters:0
 msgid "Filters visible only for one user"
-msgstr ""
+msgstr "Filtros visibles solo para un usuario"
 
 #. module: base
 #: model:ir.model,name:base.model_ir_attachment
 msgid "ir.attachment"
-msgstr ""
+msgstr "ir.attachment"
 
 #. module: base
 #: code:addons/orm.py:4315
@@ -7481,11 +7605,14 @@ msgid ""
 "You cannot perform this operation. New Record Creation is not allowed for "
 "this object as this object is for reporting purpose."
 msgstr ""
+"No puede realizar esta operación. La creación de nuevos registros no está "
+"permitida para este objeto ya que este objeto tiene como finalidad la "
+"generación de informes."
 
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_auth_anonymous
 msgid "Anonymous"
-msgstr ""
+msgstr "Anónimo"
 
 #. module: base
 #: model:ir.module.module,description:base.module_base_import
@@ -7515,12 +7642,12 @@ msgstr ""
 #. module: base
 #: selection:res.currency,position:0
 msgid "After Amount"
-msgstr ""
+msgstr "Después del importe"
 
 #. module: base
 #: selection:base.language.install,lang:0
 msgid "Lithuanian / Lietuvių kalba"
-msgstr ""
+msgstr "Lituano / Lietuvių kalba"
 
 #. module: base
 #: help:ir.actions.server,record_id:0
@@ -7528,6 +7655,9 @@ 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 ""
+"Indique el nombre de campo donde se almacena el id del registro después de "
+"las operaciones de creación. Si está vacío, no podrá realizar un seguimiento "
+"del registro nuevo."
 
 #. module: base
 #: model:res.groups,comment:base.group_hr_user
@@ -7537,17 +7667,17 @@ msgstr ""
 #. module: base
 #: field:ir.ui.menu,needaction_enabled:0
 msgid "Target model uses the need action mechanism"
-msgstr ""
+msgstr "El objetivo modelo usa el mecanismo de acción necesitado"
 
 #. module: base
 #: help:ir.model.fields,relation:0
 msgid "For relationship fields, the technical name of the target model"
-msgstr ""
+msgstr "Para campos de relación, el nombre técnico del modelo destino."
 
 #. module: base
 #: view:res.lang:0
 msgid "%S - Seconds [00,61]."
-msgstr ""
+msgstr "%S - Segundos [00,61]."
 
 #. module: base
 #: help:base.language.import,overwrite:0
@@ -7555,16 +7685,18 @@ msgid ""
 "If you enable this option, existing translations (including custom ones) "
 "will be overwritten and replaced by those in this file"
 msgstr ""
+"Si habilita esta opción, las traducciones existentes (incluidas las "
+"personalizadas) serán sobreescritas y reemplazadas por las de este archivo"
 
 #. module: base
 #: field:ir.ui.view,inherit_id:0
 msgid "Inherited View"
-msgstr ""
+msgstr "Vista Heredada"
 
 #. module: base
 #: view:ir.translation:0
 msgid "Source Term"
-msgstr ""
+msgstr "Término original"
 
 #. module: base
 #: model:ir.module.category,name:base.module_category_project_management
@@ -7572,35 +7704,35 @@ msgstr ""
 #: model:ir.ui.menu,name:base.menu_project_config
 #: model:ir.ui.menu,name:base.menu_project_report
 msgid "Project"
-msgstr ""
+msgstr "Proyecto"
 
 #. module: base
 #: field:ir.ui.menu,web_icon_hover_data:0
 msgid "Web Icon Image (hover)"
-msgstr ""
+msgstr "Imagen icono web (inmóvil)"
 
 #. module: base
 #: view:base.module.import:0
 msgid "Module file successfully imported!"
-msgstr ""
+msgstr "¡Archivo de módulo importado con éxito!"
 
 #. 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 ""
+msgstr "Modelo de Restrinciones"
 
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_hr_timesheet
 #: model:ir.module.module,shortdesc:base.module_hr_timesheet_sheet
 msgid "Timesheets"
-msgstr ""
+msgstr "Hojas de servicios"
 
 #. module: base
 #: help:ir.values,company_id:0
 msgid "If set, action binding only applies for this company"
-msgstr ""
+msgstr "Si se establece, la acción vinculada sólo se aplica a esta compañía"
 
 #. module: base
 #: model:ir.module.module,description:base.module_l10n_cn
@@ -7615,7 +7747,7 @@ msgstr ""
 #. module: base
 #: model:res.country,name:base.lc
 msgid "Saint Lucia"
-msgstr ""
+msgstr "Santa Lucía"
 
 #. module: base
 #: help:res.users,new_password:0
@@ -7624,23 +7756,26 @@ msgid ""
 "password, otherwise leave empty. After a change of password, the user has to "
 "login again."
 msgstr ""
+"Especifique un valor sólo cuando esté creando un usuario o si está cambiando "
+"la contraseña del mismo. En otro caso déjelo vacío. Después de un cambio de "
+"contraseña,  el usuario debe iniciar sesión de nuevo."
 
 #. module: base
 #: model:res.country,name:base.so
 msgid "Somalia"
-msgstr ""
+msgstr "Somalia"
 
 #. module: base
 #: model:res.partner.title,shortcut:base.res_partner_title_doctor
 msgid "Dr."
-msgstr ""
+msgstr "Dr."
 
 #. 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 ""
+msgstr "Empleado"
 
 #. module: base
 #: model:ir.module.module,description:base.module_project_issue
@@ -7659,7 +7794,7 @@ msgstr ""
 #. module: base
 #: field:ir.model.access,perm_create:0
 msgid "Create Access"
-msgstr ""
+msgstr "Permiso para crear"
 
 #. module: base
 #: model:ir.module.module,description:base.module_hr_timesheet
@@ -7681,6 +7816,20 @@ msgid ""
 "up a management by affair.\n"
 "    "
 msgstr ""
+"\n"
+"Este modulo implementa un sistema de hojas por horas de servicio.\n"
+"=============================================================\n"
+"\n"
+"Cada empleado puede codificar y rastrear el tiempo invertido en sus "
+"diferentes proyectos.\n"
+"Un proyecto es una cuenta analítica y el tiempo invertido en un proyecto "
+"genera costos\n"
+"sobre la cuenta analítica.\n"
+"\n"
+"Esto esta completamente integrado con el costo del modulo Contabilidad. Esto "
+"les permite establecer\n"
+"un sistema de gestión de aventuras.\n"
+"    "
 
 #. module: base
 #: field:res.bank,state:0
@@ -7688,53 +7837,53 @@ msgstr ""
 #: field:res.partner.address,state_id:0
 #: field:res.partner.bank,state_id:0
 msgid "Fed. State"
-msgstr ""
+msgstr "Estado Federal"
 
 #. module: base
 #: field:ir.actions.server,copy_object:0
 msgid "Copy Of"
-msgstr ""
+msgstr "Copia de"
 
 #. module: base
 #: field:ir.model.data,display_name:0
 msgid "Record Name"
-msgstr ""
+msgstr "Grabar Nombre"
 
 #. module: base
 #: model:ir.model,name:base.model_ir_actions_client
 #: selection:ir.ui.menu,action:0
 msgid "ir.actions.client"
-msgstr ""
+msgstr "ir.actions.client"
 
 #. module: base
 #: model:res.country,name:base.io
 msgid "British Indian Ocean Territory"
-msgstr ""
+msgstr "Territorio Británico del Océano Índico"
 
 #. module: base
 #: model:ir.actions.server,name:base.action_server_module_immediate_install
 msgid "Module Immediate Install"
-msgstr ""
+msgstr "Instalar modulo inmediato"
 
 #. module: base
 #: view:ir.actions.server:0
 msgid "Field Mapping"
-msgstr ""
+msgstr "Mapeo de campo"
 
 #. module: base
 #: field:ir.model.fields,ttype:0
 msgid "Field Type"
-msgstr ""
+msgstr "Tipo de campo"
 
 #. module: base
 #: field:res.country.state,code:0
 msgid "State Code"
-msgstr ""
+msgstr "Codigo de Estado"
 
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_l10n_multilang
 msgid "Multi Language Chart of Accounts"
-msgstr ""
+msgstr "Plan de cuentas multi lenguaje"
 
 #. module: base
 #: model:ir.module.module,description:base.module_l10n_gt
@@ -7752,34 +7901,34 @@ msgstr ""
 #. module: base
 #: selection:res.lang,direction:0
 msgid "Left-to-Right"
-msgstr ""
+msgstr "De izquierda a derecha"
 
 #. module: base
 #: field:ir.model.fields,translate:0
 #: view:res.lang:0
 #: field:res.lang,translatable:0
 msgid "Translatable"
-msgstr ""
+msgstr "Traducible"
 
 #. module: base
 #: help:base.language.import,code:0
 msgid "ISO Language and Country code, e.g. en_US"
-msgstr ""
+msgstr "Idioma ISO y Código de País, Ejemplo: en_US"
 
 #. module: base
 #: model:res.country,name:base.vn
 msgid "Vietnam"
-msgstr ""
+msgstr "Vietnam"
 
 #. module: base
 #: field:res.users,signature:0
 msgid "Signature"
-msgstr ""
+msgstr "Firma"
 
 #. module: base
 #: field:res.partner.category,complete_name:0
 msgid "Full Name"
-msgstr ""
+msgstr "Nombre completo"
 
 #. module: base
 #: view:ir.attachment:0
@@ -7790,17 +7939,17 @@ msgstr ""
 #: code:addons/base/module/module.py:284
 #, python-format
 msgid "The name of the module must be unique !"
-msgstr ""
+msgstr "¡El nombre del módulo debe ser único!"
 
 #. module: base
 #: view:ir.property:0
 msgid "Parameters that are used by all resources."
-msgstr ""
+msgstr "Parámetros usados por todos los recursos."
 
 #. module: base
 #: model:res.country,name:base.mz
 msgid "Mozambique"
-msgstr ""
+msgstr "Mozambique"
 
 #. module: base
 #: help:ir.values,action_id:0
@@ -7808,22 +7957,24 @@ msgid ""
 "Action bound to this entry - helper field for binding an action, will "
 "automatically set the correct reference"
 msgstr ""
+"Acción vinculada a esta entrada - campo accesorio que permite enlazar una "
+"acción, que establecerá automáticamente la referencia correcta"
 
 #. module: base
 #: model:ir.ui.menu,name:base.menu_project_long_term
 msgid "Long Term Planning"
-msgstr ""
+msgstr "Planificación a largo plazo"
 
 #. module: base
 #: field:ir.actions.server,message:0
 msgid "Message"
-msgstr ""
+msgstr "Mensaje"
 
 #. module: base
 #: field:ir.actions.act_window.view,multi:0
 #: field:ir.actions.report.xml,multi:0
 msgid "On Multiple Doc."
-msgstr ""
+msgstr "En múltiples doc."
 
 #. module: base
 #: view:base.language.export:0
@@ -7839,17 +7990,17 @@ msgstr ""
 #: view:res.users:0
 #: view:wizard.ir.model.menu.create:0
 msgid "or"
-msgstr ""
+msgstr "ó"
 
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_account_accountant
 msgid "Accounting and Finance"
-msgstr ""
+msgstr "Contabilidad y finanzas"
 
 #. module: base
 #: view:ir.module.module:0
 msgid "Upgrade"
-msgstr ""
+msgstr "Actualizar"
 
 #. module: base
 #: model:ir.module.module,description:base.module_base_action_rule
@@ -7871,54 +8022,54 @@ msgstr ""
 #. module: base
 #: field:res.partner,function:0
 msgid "Job Position"
-msgstr ""
+msgstr "Posición de Trabajo"
 
 #. module: base
 #: view:res.partner:0
 #: field:res.partner,child_ids:0
 msgid "Contacts"
-msgstr ""
+msgstr "Contactos"
 
 #. module: base
 #: model:res.country,name:base.fo
 msgid "Faroe Islands"
-msgstr ""
+msgstr "Islas Feroe"
 
 #. module: base
 #: field:ir.mail_server,smtp_encryption:0
 msgid "Connection Security"
-msgstr ""
+msgstr "Seguridad de la conexión"
 
 #. module: base
 #: code:addons/base/ir/ir_actions.py:607
 #, python-format
 msgid "Please specify an action to launch !"
-msgstr ""
+msgstr "¡ Por favor, indique una acción a ejecutar !"
 
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_l10n_ec
 msgid "Ecuador - Accounting"
-msgstr ""
+msgstr "Ecuador - Contabilidad"
 
 #. module: base
 #: field:res.partner.category,name:0
 msgid "Category Name"
-msgstr ""
+msgstr "Nombre de categoría"
 
 #. module: base
 #: model:res.country,name:base.mp
 msgid "Northern Mariana Islands"
-msgstr ""
+msgstr "Islas Marianas del Norte"
 
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_l10n_hn
 msgid "Honduras - Accounting"
-msgstr ""
+msgstr "Honduras - Contabilidad"
 
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_report_intrastat
 msgid "Intrastat Reporting"
-msgstr ""
+msgstr "Informe Intrastat"
 
 #. module: base
 #: code:addons/base/res/res_users.py:135
@@ -7927,6 +8078,8 @@ msgid ""
 "Please use the change password wizard (in User Preferences or User menu) to "
 "change your own password."
 msgstr ""
+"Utilice el asistente de cambio de contraseña (en Preferencias de usuario o "
+"menú Usuario) para cambiar su propia contraseña."
 
 #. module: base
 #: model:ir.module.module,description:base.module_project_long_term
@@ -7961,12 +8114,12 @@ msgstr ""
 #: code:addons/orm.py:2021
 #, python-format
 msgid "Insufficient fields for Calendar View!"
-msgstr ""
+msgstr "¡Insuficientes campos para la vista calendario!"
 
 #. module: base
 #: selection:ir.property,type:0
 msgid "Integer"
-msgstr ""
+msgstr "Entero"
 
 #. module: base
 #: help:ir.actions.report.xml,report_rml:0
@@ -7974,26 +8127,28 @@ msgid ""
 "The path to the main report file (depending on Report Type) or NULL if the "
 "content is in another data field"
 msgstr ""
+"La ruta al archivo principal del informe (dependiendo del tipo de informe) o "
+"NULL si el contenido está en otro campo de datos."
 
 #. module: base
 #: model:res.partner.category,name:base.res_partner_category_14
 msgid "Manufacturer"
-msgstr ""
+msgstr "Fabricante"
 
 #. module: base
 #: help:res.users,company_id:0
 msgid "The company this user is currently working for."
-msgstr ""
+msgstr "La compañía para la cual trabaja este usuario actualmente."
 
 #. module: base
 #: model:ir.model,name:base.model_wizard_ir_model_menu_create
 msgid "wizard.ir.model.menu.create"
-msgstr ""
+msgstr "wizard.ir.model.menu.create"
 
 #. module: base
 #: view:workflow.transition:0
 msgid "Transition"
-msgstr ""
+msgstr "Transición"
 
 #. module: base
 #: field:ir.cron,active:0
@@ -8011,17 +8166,17 @@ msgstr ""
 #: view:workflow.instance:0
 #: view:workflow.workitem:0
 msgid "Active"
-msgstr ""
+msgstr "Activo"
 
 #. module: base
 #: model:res.country,name:base.na
 msgid "Namibia"
-msgstr ""
+msgstr "Namibia"
 
 #. module: base
 #: field:res.partner.category,child_ids:0
 msgid "Child Categories"
-msgstr ""
+msgstr "Categorías hijas"
 
 #. module: base
 #: code:addons/base/ir/ir_actions.py:607
@@ -8050,7 +8205,7 @@ msgstr ""
 #: code:addons/orm.py:3929
 #, python-format
 msgid "Error"
-msgstr ""
+msgstr "Error"
 
 #. module: base
 #: help:res.partner,tz:0
@@ -8064,22 +8219,22 @@ msgstr ""
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_account_analytic_default
 msgid "Account Analytic Defaults"
-msgstr ""
+msgstr "Valores por defecto en la contabilidad analítica"
 
 #. module: base
 #: selection:ir.ui.view,type:0
 msgid "mdx"
-msgstr ""
+msgstr "mdx"
 
 #. module: base
 #: view:ir.cron:0
 msgid "Scheduled Action"
-msgstr ""
+msgstr "Acciones Planificadas"
 
 #. module: base
 #: model:res.country,name:base.bi
 msgid "Burundi"
-msgstr ""
+msgstr "Burundi"
 
 #. module: base
 #: view:base.language.export:0
@@ -8087,22 +8242,22 @@ msgstr ""
 #: view:base.module.configuration:0
 #: view:base.module.update:0
 msgid "Close"
-msgstr ""
+msgstr "Cerrar"
 
 #. module: base
 #: selection:base.language.install,lang:0
 msgid "Spanish (MX) / Español (MX)"
-msgstr ""
+msgstr "Español (MX) / Español (MX)"
 
 #. module: base
 #: view:ir.actions.todo:0
 msgid "Wizards to be Launched"
-msgstr ""
+msgstr "Asistentes pendientes de lanzamiento"
 
 #. module: base
 #: model:res.country,name:base.bt
 msgid "Bhutan"
-msgstr ""
+msgstr "Bhután"
 
 #. module: base
 #: model:ir.module.module,description:base.module_portal_event
@@ -8118,48 +8273,48 @@ msgstr ""
 #. module: base
 #: help:ir.sequence,number_next:0
 msgid "Next number of this sequence"
-msgstr ""
+msgstr "Número siguiente de esta secuencia."
 
 #. module: base
 #: view:res.partner:0
 msgid "at"
-msgstr ""
+msgstr "en"
 
 #. module: base
 #: view:ir.rule:0
 msgid "Rule Definition (Domain Filter)"
-msgstr ""
+msgstr "Definición de Regla (Filtro de Dominio)"
 
 #. module: base
 #: selection:ir.actions.act_url,target:0
 msgid "This Window"
-msgstr ""
+msgstr "Esta ventana"
 
 #. module: base
 #: field:base.language.export,format:0
 msgid "File Format"
-msgstr ""
+msgstr "Formato del archivo"
 
 #. module: base
 #: field:res.lang,iso_code:0
 msgid "ISO code"
-msgstr ""
+msgstr "Código ISO"
 
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_association
 msgid "Associations Management"
-msgstr ""
+msgstr "Gestión de asociaciones"
 
 #. module: base
 #: help:ir.model,modules:0
 msgid "List of modules in which the object is defined or inherited"
-msgstr ""
+msgstr "Lista de módulos en los cuales el objeto es definido o heredado"
 
 #. module: base
 #: model:ir.module.category,name:base.module_category_localization_payroll
 #: model:ir.module.module,shortdesc:base.module_hr_payroll
 msgid "Payroll"
-msgstr ""
+msgstr "Nómina"
 
 #. module: base
 #: model:ir.actions.act_window,help:base.action_country_state
@@ -8172,28 +8327,28 @@ msgstr ""
 #. module: base
 #: view:workflow.workitem:0
 msgid "Workflow Workitems"
-msgstr ""
+msgstr "Elementos del flujo de trabajo"
 
 #. module: base
 #: model:res.country,name:base.vc
 msgid "Saint Vincent & Grenadines"
-msgstr ""
+msgstr "San Vicente y las Granadinas"
 
 #. module: base
 #: field:ir.mail_server,smtp_pass:0
 #: field:res.users,password:0
 msgid "Password"
-msgstr ""
+msgstr "Contraseña"
 
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_portal_claim
 msgid "Portal Claim"
-msgstr ""
+msgstr "Portal de Reclamaciones"
 
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_l10n_pe
 msgid "Peru Localization Chart Account"
-msgstr ""
+msgstr "Plan de Cuentas Localización de Perú"
 
 #. module: base
 #: model:ir.module.module,description:base.module_auth_oauth
@@ -8202,6 +8357,9 @@ msgid ""
 "Allow users to login through OAuth2 Provider.\n"
 "=============================================\n"
 msgstr ""
+"\n"
+"Permite a los usuarios iniciar sesión a través del proveedor OAuth2.\n"
+"==============================================================\n"
 
 #. module: base
 #: model:ir.actions.act_window,name:base.action_model_fields
@@ -8211,27 +8369,27 @@ msgstr ""
 #: view:ir.model.fields:0
 #: model:ir.ui.menu,name:base.ir_model_model_fields
 msgid "Fields"
-msgstr ""
+msgstr "Campos"
 
 #. module: base
 #: model:ir.actions.act_window,name:base.action_partner_employee_form
 msgid "Employees"
-msgstr ""
+msgstr "Empleados"
 
 #. module: base
 #: field:res.company,rml_header2:0
 msgid "RML Internal Header"
-msgstr ""
+msgstr "Cabecera interna RML"
 
 #. module: base
 #: field:ir.actions.act_window,search_view_id:0
 msgid "Search View Ref."
-msgstr ""
+msgstr "Ref. vista búsqueda"
 
 #. module: base
 #: help:res.users,partner_id:0
 msgid "Partner-related data of the user"
-msgstr ""
+msgstr "Socios - datos relacionados de el usuario"
 
 #. module: base
 #: model:ir.module.module,description:base.module_crm_todo
@@ -8241,36 +8399,40 @@ msgid ""
 "==========================================\n"
 "    "
 msgstr ""
+"\n"
+"Lista Todo para conduces CRM y oportunidades.\n"
+"================================================\n"
+"    "
 
 #. module: base
 #: view:ir.mail_server:0
 msgid "Test Connection"
-msgstr ""
+msgstr "Probar conexión"
 
 #. module: base
 #: field:res.partner,address:0
 msgid "Addresses"
-msgstr ""
+msgstr "Direcciones"
 
 #. module: base
 #: model:res.country,name:base.mm
 msgid "Myanmar"
-msgstr ""
+msgstr "Birmania"
 
 #. module: base
 #: help:ir.model.fields,modules:0
 msgid "List of modules in which the field is defined"
-msgstr ""
+msgstr "Lista de módulos en los cuales el campo esta definido"
 
 #. module: base
 #: selection:base.language.install,lang:0
 msgid "Chinese (CN) / 简体中文"
-msgstr ""
+msgstr "Chino (CN) / 简体中文"
 
 #. module: base
 #: field:ir.model.fields,selection:0
 msgid "Selection Options"
-msgstr ""
+msgstr "Opciones de selección"
 
 #. module: base
 #: field:res.bank,street:0
@@ -8279,17 +8441,17 @@ msgstr ""
 #: field:res.partner.address,street:0
 #: field:res.partner.bank,street:0
 msgid "Street"
-msgstr ""
+msgstr "Calle"
 
 #. module: base
 #: model:res.country,name:base.yu
 msgid "Yugoslavia"
-msgstr ""
+msgstr "Yugoslavia"
 
 #. module: base
 #: field:res.partner.category,parent_right:0
 msgid "Right parent"
-msgstr ""
+msgstr "Padre derecho"
 
 #. module: base
 #: model:ir.module.module,description:base.module_fetchmail
@@ -8337,17 +8499,17 @@ msgstr ""
 #. module: base
 #: field:res.currency,rounding:0
 msgid "Rounding Factor"
-msgstr ""
+msgstr "Factor de redondeo"
 
 #. module: base
 #: model:res.country,name:base.ca
 msgid "Canada"
-msgstr ""
+msgstr "Canadá"
 
 #. module: base
 #: view:base.language.export:0
 msgid "Launchpad"
-msgstr ""
+msgstr "Launchpad"
 
 #. module: base
 #: help:res.currency.rate,currency_rate_type_id:0
@@ -8355,22 +8517,25 @@ 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 ""
+"Permite definir tipos de tasa de cambio personalizados, como 'Promedio' o "
+"'Año atrás'. Dejar vacío si simplemente se quiere usar el tipo normal "
+"'exacto' de tasa de cambio."
 
 #. module: base
 #: selection:ir.module.module.dependency,state:0
 msgid "Unknown"
-msgstr ""
+msgstr "Desconocido"
 
 #. module: base
 #: model:ir.actions.act_window,name:base.action_res_users_my
 msgid "Change My Preferences"
-msgstr ""
+msgstr "Cambiar mis preferencias"
 
 #. module: base
 #: code:addons/base/ir/ir_actions.py:172
 #, python-format
 msgid "Invalid model name in the action definition."
-msgstr ""
+msgstr "Nombre de modelo no válido en la definición de acción."
 
 #. module: base
 #: model:ir.module.module,description:base.module_l10n_ro
@@ -8384,74 +8549,82 @@ msgid ""
 "Romanian accounting chart and localization.\n"
 "    "
 msgstr ""
+"\n"
+"Módulo para administrar el plan de cuentas, estructura de impuestos y número "
+"de registro de Rumania en OpenERP.\n"
+"============================================================================="
+"==============\n"
+"\n"
+"Plan de cuentas y localización de Rumania.\n"
+"    "
 
 #. module: base
 #: model:res.country,name:base.cm
 msgid "Cameroon"
-msgstr ""
+msgstr "Camerún"
 
 #. module: base
 #: model:res.country,name:base.bf
 msgid "Burkina Faso"
-msgstr ""
+msgstr "Burkina Faso"
 
 #. module: base
 #: selection:ir.model.fields,state:0
 msgid "Custom Field"
-msgstr ""
+msgstr "Campo personalizado"
 
 #. module: base
 #: model:ir.module.module,summary:base.module_account_accountant
 msgid "Financial and Analytic Accounting"
-msgstr ""
+msgstr "Contabilidad Análitica y Financiera"
 
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_portal_project
 msgid "Portal Project"
-msgstr ""
+msgstr "Portal de Proyectos"
 
 #. module: base
 #: model:res.country,name:base.cc
 msgid "Cocos (Keeling) Islands"
-msgstr ""
+msgstr "Islas Cocos (Keeling)"
 
 #. module: base
 #: selection:base.language.install,state:0
 #: selection:base.module.import,state:0
 #: selection:base.module.update,state:0
 msgid "init"
-msgstr ""
+msgstr "init"
 
 #. module: base
 #: view:res.partner:0
 #: field:res.partner,user_id:0
 msgid "Salesperson"
-msgstr ""
+msgstr "Vendedor"
 
 #. module: base
 #: view:res.lang:0
 msgid "11. %U or %W       ==> 48 (49th week)"
-msgstr ""
+msgstr "11. %U or %W ==> 48 (49ª semana)"
 
 #. module: base
 #: model:ir.model,name:base.model_res_partner_bank_type_field
 msgid "Bank type fields"
-msgstr ""
+msgstr "Campos tipo de banco"
 
 #. module: base
 #: constraint:ir.rule:0
 msgid "Rules can not be applied on Transient models."
-msgstr ""
+msgstr "Las reglas no pueden ser aplicadas en modelos transitorios."
 
 #. module: base
 #: selection:base.language.install,lang:0
 msgid "Dutch / Nederlands"
-msgstr ""
+msgstr "Holandés / Nederlands"
 
 #. module: base
 #: selection:res.company,paper_format:0
 msgid "US Letter"
-msgstr ""
+msgstr "Carta de EEUU"
 
 #. module: base
 #: model:ir.module.module,description:base.module_marketing
@@ -8463,28 +8636,35 @@ msgid ""
 "Contains the installer for marketing-related modules.\n"
 "    "
 msgstr ""
+"\n"
+"Menú para Marketing.\n"
+"===================\n"
+"\n"
+"Contiene el instalador para los módulos relacionados con marketing.\n"
+"    "
 
 #. module: base
 #: model:ir.actions.act_window,name:base.bank_account_update
 msgid "Company Bank Accounts"
-msgstr ""
+msgstr "Cuentas bancarias de la compañía"
 
 #. module: base
 #: code:addons/base/res/res_users.py:470
 #, python-format
 msgid "Setting empty passwords is not allowed for security reasons!"
 msgstr ""
+"¡No se permite establecer contraseñas vacías por motivos de seguridad!"
 
 #. module: base
 #: help:ir.mail_server,smtp_pass:0
 msgid "Optional password for SMTP authentication"
-msgstr ""
+msgstr "Contraseña opcional para la autenticación SMTP"
 
 #. module: base
 #: code:addons/base/ir/ir_model.py:719
 #, python-format
 msgid "Sorry, you are not allowed to modify this document."
-msgstr ""
+msgstr "Lo sentimos, usted no tiene permitido modificar este documento."
 
 #. module: base
 #: code:addons/base/res/res_config.py:350
@@ -8494,57 +8674,60 @@ msgid ""
 "\n"
 "This addon is already installed on your system"
 msgstr ""
+"\n"
+"\n"
+"Este módulo ya está instalado en su sistema."
 
 #. module: base
 #: help:ir.cron,interval_number:0
 msgid "Repeat every x."
-msgstr ""
+msgstr "Repetir cada x."
 
 #. module: base
 #: model:res.partner.bank.type,name:base.bank_normal
 msgid "Normal Bank Account"
-msgstr ""
+msgstr "Cuenta bancaria habitual"
 
 #. module: base
 #: view:ir.actions.wizard:0
 msgid "Wizard"
-msgstr ""
+msgstr "Asistente"
 
 #. module: base
 #: code:addons/base/ir/ir_fields.py:304
 #, python-format
 msgid "database id"
-msgstr ""
+msgstr "ID de la Base de Datos"
 
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_base_import
 msgid "Base import"
-msgstr ""
+msgstr "Importar Base"
 
 #. module: base
 #: report:ir.module.reference:0
 msgid "1cm 28cm 20cm 28cm"
-msgstr ""
+msgstr "1cm 28cm 20cm 28cm"
 
 #. module: base
 #: field:ir.module.module,maintainer:0
 msgid "Maintainer"
-msgstr ""
+msgstr "Mantenedor"
 
 #. module: base
 #: field:ir.sequence,suffix:0
 msgid "Suffix"
-msgstr ""
+msgstr "Sufijo"
 
 #. module: base
 #: model:res.country,name:base.mo
 msgid "Macau"
-msgstr ""
+msgstr "Macao"
 
 #. module: base
 #: model:ir.actions.report.xml,name:base.res_partner_address_report
 msgid "Labels"
-msgstr ""
+msgstr "Etiquetas"
 
 #. module: base
 #: help:res.partner,use_parent_address:0
@@ -8552,26 +8735,28 @@ msgid ""
 "Select this if you want to set company's address information  for this "
 "contact"
 msgstr ""
+"Marque esta si usted quiere ajustar la dirección de compañías para este "
+"contacto"
 
 #. module: base
 #: field:ir.default,field_name:0
 msgid "Object Field"
-msgstr ""
+msgstr "Campo del objeto"
 
 #. module: base
 #: selection:base.language.install,lang:0
 msgid "Spanish (PE) / Español (PE)"
-msgstr ""
+msgstr "Español (PE) / Español (PE)"
 
 #. module: base
 #: selection:base.language.install,lang:0
 msgid "French (CH) / Français (CH)"
-msgstr ""
+msgstr "Francés (CH) / Français (CH)"
 
 #. module: base
 #: model:res.partner.category,name:base.res_partner_category_13
 msgid "Distributor"
-msgstr ""
+msgstr "Distribuidor"
 
 #. module: base
 #: help:ir.actions.server,subject:0
@@ -8580,6 +8765,9 @@ msgid ""
 "the same values as those available in the condition field, e.g. `Hello [[ "
 "object.partner_id.name ]]`"
 msgstr ""
+"Asunto del e-mail, que puede contener expresiones encerradas entre corchetes "
+"dobles basadas en los mismos valores que los disponibles en el campo "
+"\"Condición\". Por ejemplo. 'Hola [[ object.partner_id.name ]]'."
 
 #. module: base
 #: help:res.partner,image:0
@@ -8587,11 +8775,13 @@ msgid ""
 "This field holds the image used as avatar for this contact, limited to "
 "1024x1024px"
 msgstr ""
+"Este campo sostiene la imagen usada como avatar para este contacto, limitado "
+"a 1024x1024px"
 
 #. module: base
 #: model:res.country,name:base.to
 msgid "Tonga"
-msgstr ""
+msgstr "Tonga"
 
 #. module: base
 #: help:ir.model.fields,serialization_field_id:0
@@ -8600,11 +8790,14 @@ msgid ""
 "serialization field, instead of having its own database column. This cannot "
 "be changed after creation."
 msgstr ""
+"Si está establecido, este campo se almacenará en la estructura del campo de "
+"serialización en lugar de tener su propia columna en la base de datos. No "
+"puede ser modificado después de la creación"
 
 #. module: base
 #: view:res.partner.bank:0
 msgid "Bank accounts belonging to one of your companies"
-msgstr ""
+msgstr "Cuentas bancarias pertencientes a alguna de sus compañías"
 
 #. module: base
 #: model:ir.module.module,description:base.module_account_analytic_plans
@@ -8661,7 +8854,7 @@ msgstr ""
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_account_sequence
 msgid "Entries Sequence Numbering"
-msgstr ""
+msgstr "Numeración de la secuencia de asientos"
 
 #. module: base
 #: view:base.language.export:0
@@ -8671,17 +8864,17 @@ msgstr ""
 #. module: base
 #: view:ir.values:0
 msgid "Client Actions"
-msgstr ""
+msgstr "Acciones cliente"
 
 #. module: base
 #: field:res.partner.bank.type,field_ids:0
 msgid "Type Fields"
-msgstr ""
+msgstr "Escribir Campos"
 
 #. module: base
 #: model:ir.module.module,summary:base.module_hr_recruitment
 msgid "Jobs, Recruitment, Applications, Job Interviews"
-msgstr ""
+msgstr "Trabajos, Reclutamiento, Aplicaciones, Entrevistas de Trabajo"
 
 #. module: base
 #: code:addons/base/module/module.py:513
@@ -8690,11 +8883,13 @@ msgid ""
 "You try to upgrade a module that depends on the module: %s.\n"
 "But this module is not available in your system."
 msgstr ""
+"Intenta actualizar un módulo que depende del módulo: %s.\n"
+"Pero este módulo no está disponible en su sistema."
 
 #. module: base
 #: field:workflow.transition,act_to:0
 msgid "Destination Activity"
-msgstr ""
+msgstr "Actividad destino"
 
 #. module: base
 #: help:res.currency,position:0
@@ -8702,6 +8897,8 @@ msgid ""
 "Determines where the currency symbol should be placed after or before the "
 "amount."
 msgstr ""
+"Determina si el símbolo de moneda debe situarse antes o después de la "
+"cantidad."
 
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_pad_project
@@ -8711,7 +8908,7 @@ msgstr ""
 #. module: base
 #: model:ir.model,name:base.model_base_update_translations
 msgid "base.update.translations"
-msgstr ""
+msgstr "base.actualizar.tranducciones"
 
 #. module: base
 #: code:addons/base/ir/ir_sequence.py:105
@@ -8719,27 +8916,27 @@ msgstr ""
 #: code:addons/base/res/res_users.py:470
 #, python-format
 msgid "Warning!"
-msgstr ""
+msgstr "Advertencia!"
 
 #. module: base
 #: view:ir.rule:0
 msgid "Full Access Right"
-msgstr ""
+msgstr "Derechos de Acceso Completo"
 
 #. module: base
 #: field:res.partner.category,parent_id:0
 msgid "Parent Category"
-msgstr ""
+msgstr "Categoría padre"
 
 #. module: base
 #: model:res.country,name:base.fi
 msgid "Finland"
-msgstr ""
+msgstr "Finlandia"
 
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_web_shortcuts
 msgid "Web Shortcuts"
-msgstr ""
+msgstr "Atajos Web"
 
 #. module: base
 #: view:res.partner:0
@@ -8748,52 +8945,52 @@ msgstr ""
 #: selection:res.partner.title,domain:0
 #: view:res.users:0
 msgid "Contact"
-msgstr ""
+msgstr "Contacto"
 
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_l10n_at
 msgid "Austria - Accounting"
-msgstr ""
+msgstr "Austria - Contabilidad"
 
 #. module: base
 #: model:ir.model,name:base.model_ir_ui_menu
 msgid "ir.ui.menu"
-msgstr ""
+msgstr "ir.ui.menu"
 
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_project
 msgid "Project Management"
-msgstr ""
+msgstr "Gestión de proyectos"
 
 #. module: base
 #: view:ir.module.module:0
 msgid "Cancel Uninstall"
-msgstr ""
+msgstr "Cancelar desinstalación"
 
 #. module: base
 #: view:res.bank:0
 msgid "Communication"
-msgstr ""
+msgstr "Comunicación"
 
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_analytic
 msgid "Analytic Accounting"
-msgstr ""
+msgstr "Contabilidad analítica"
 
 #. module: base
 #: model:ir.model,name:base.model_ir_model_constraint
 msgid "ir.model.constraint"
-msgstr ""
+msgstr "ir.model.constraint"
 
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_web_graph
 msgid "Graph Views"
-msgstr ""
+msgstr "Vistas Gráficas"
 
 #. module: base
 #: help:ir.model.relation,name:0
 msgid "PostgreSQL table name implementing a many2many relation."
-msgstr ""
+msgstr "Implementando Nombre de Tabla PostgreSQL a una relación many2many"
 
 #. module: base
 #: model:ir.module.module,description:base.module_base
@@ -8802,36 +8999,39 @@ msgid ""
 "The kernel of OpenERP, needed for all installation.\n"
 "===================================================\n"
 msgstr ""
+"\n"
+"El núcleo de OpenERP, necesitado para toda la instalación.\n"
+"========================================================\n"
 
 #. module: base
 #: model:ir.model,name:base.model_ir_server_object_lines
 msgid "ir.server.object.lines"
-msgstr ""
+msgstr "ir.server.object.lines"
 
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_l10n_be
 msgid "Belgium - Accounting"
-msgstr ""
+msgstr "Bélgica - Contabilidad"
 
 #. module: base
 #: view:ir.model.access:0
 msgid "Access Control"
-msgstr ""
+msgstr "Control de Acceso"
 
 #. module: base
 #: model:res.country,name:base.kw
 msgid "Kuwait"
-msgstr ""
+msgstr "Kuwait"
 
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_account_followup
 msgid "Payment Follow-up Management"
-msgstr ""
+msgstr "Seguimiento de Gestión de Pago"
 
 #. module: base
 #: field:workflow.workitem,inst_id:0
 msgid "Instance"
-msgstr ""
+msgstr "Instancia"
 
 #. module: base
 #: help:ir.actions.report.xml,attachment:0
@@ -8840,6 +9040,9 @@ msgid ""
 "Keep empty to not save the printed reports. You can use a python expression "
 "with the object and time variables."
 msgstr ""
+"Éste es el nombre del archivo del adjunto utilizado para almacenar el "
+"resultado de impresión. Déjelo vacío para no guardar los informes impresos. "
+"Puede utilizar una expresión Python con las variables objeto y fecha/hora."
 
 #. module: base
 #: sql_constraint:ir.model.data:0
@@ -8847,82 +9050,84 @@ msgid ""
 "You cannot have multiple records with the same external ID in the same "
 "module!"
 msgstr ""
+"¡No puede haber múltiples registros con el mismo ID externo en el mismo "
+"módulo!"
 
 #. module: base
 #: selection:ir.property,type:0
 msgid "Many2One"
-msgstr ""
+msgstr "Many2One"
 
 #. module: base
 #: model:res.country,name:base.ng
 msgid "Nigeria"
-msgstr ""
+msgstr "Nigeria"
 
 #. module: base
 #: code:addons/base/ir/ir_model.py:332
 #, python-format
 msgid "For selection fields, the Selection Options must be given!"
-msgstr ""
+msgstr "¡Para campos selection debe indicar las opciones de selección!"
 
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_base_iban
 msgid "IBAN Bank Accounts"
-msgstr ""
+msgstr "Cuentas bancarias IBAN"
 
 #. module: base
 #: field:res.company,user_ids:0
 msgid "Accepted Users"
-msgstr ""
+msgstr "Usuarios aceptados"
 
 #. module: base
 #: field:ir.ui.menu,web_icon_data:0
 msgid "Web Icon Image"
-msgstr ""
+msgstr "Imagen icono web"
 
 #. module: base
 #: field:ir.actions.server,wkf_model_id:0
 msgid "Target Object"
-msgstr ""
+msgstr "Objeto objetivo"
 
 #. module: base
 #: selection:ir.model.fields,select_level:0
 msgid "Always Searchable"
-msgstr ""
+msgstr "Siempre puede ser buscado"
 
 #. module: base
 #: help:res.country.state,code:0
 msgid "The state code in max. three chars."
-msgstr ""
+msgstr "El máximo codigo de estado. 3 caracteres"
 
 #. module: base
 #: model:res.country,name:base.hk
 msgid "Hong Kong"
-msgstr ""
+msgstr "Hong Kong"
 
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_portal_sale
 msgid "Portal Sale"
-msgstr ""
+msgstr "Portal de Ventas"
 
 #. module: base
 #: field:ir.default,ref_id:0
 msgid "ID Ref."
-msgstr ""
+msgstr "Ref. ID"
 
 #. module: base
 #: model:res.country,name:base.ph
 msgid "Philippines"
-msgstr ""
+msgstr "Filipinas"
 
 #. module: base
 #: model:ir.module.module,summary:base.module_hr_timesheet_sheet
 msgid "Timesheets, Attendances, Activities"
-msgstr ""
+msgstr "Hoja de horas por servicio, Asistencia, Actividades"
 
 #. module: base
 #: model:res.country,name:base.ma
 msgid "Morocco"
-msgstr ""
+msgstr "Marruecos"
 
 #. module: base
 #: help:ir.values,model_id:0
@@ -8930,6 +9135,8 @@ msgid ""
 "Model to which this entry applies - helper field for setting a model, will "
 "automatically set the correct model name"
 msgstr ""
+"Modelo para el que se aplica esta entrada - campo auxiliar para establecer "
+"un modelo, que será automáticamente establecido al nombre de modelo correcto"
 
 #. module: base
 #: view:res.lang:0
diff --git a/openerp/addons/base/i18n/fr.po b/openerp/addons/base/i18n/fr.po
index a33e3507161..548314881e4 100644
--- a/openerp/addons/base/i18n/fr.po
+++ b/openerp/addons/base/i18n/fr.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2012-12-03 16:01+0000\n"
-"PO-Revision-Date: 2012-12-05 19:56+0000\n"
+"PO-Revision-Date: 2012-12-06 10:07+0000\n"
 "Last-Translator: Quentin THEURET <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: 2012-12-06 04:38+0000\n"
+"X-Launchpad-Export-Date: 2012-12-07 04:34+0000\n"
 "X-Generator: Launchpad (build 16341)\n"
 
 #. module: base
@@ -253,8 +253,8 @@ msgid ""
 "* Opportunities by Stage (graph)\n"
 msgstr ""
 "\n"
-"Le module générique de Gestion de la Relation Client d'OpenERP\n"
-"==============================================================\n"
+"Le module générique de Gestion de la Relation Client d'OpenERP (CRM)\n"
+"====================================================================\n"
 "Cette application permet à un groupe de personnes de gérer intelligemment et "
 "efficacement les pistes, les opportunités, les réunions et les appels "
 "téléphoniques.\n"
@@ -277,7 +277,7 @@ msgstr ""
 "automatiquement à l'équipe appropriée et s'assurer que les correspondances "
 "futures se fassent au bon endroit.\n"
 "\n"
-"Le tableau de bord GRC inclura :\n"
+"Le tableau de bord CRM inclura :\n"
 "--------------------------------\n"
 "* Le revenu planifié par étape et par utilisateur (graphique)\n"
 "* Les opportunités par étape (graphique)\n"
diff --git a/openerp/addons/base/i18n/zh_CN.po b/openerp/addons/base/i18n/zh_CN.po
index a8a2b9fdee0..b9890196ea5 100644
--- a/openerp/addons/base/i18n/zh_CN.po
+++ b/openerp/addons/base/i18n/zh_CN.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2012-12-03 16:01+0000\n"
-"PO-Revision-Date: 2012-12-05 15:59+0000\n"
+"PO-Revision-Date: 2012-12-06 18:17+0000\n"
 "Last-Translator: ccdos <ccdos@163.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-06 04:39+0000\n"
+"X-Launchpad-Export-Date: 2012-12-07 04:34+0000\n"
 "X-Generator: Launchpad (build 16341)\n"
 
 #. module: base
@@ -9873,7 +9873,7 @@ msgstr "将要安装的模块"
 #: model:ir.module.module,shortdesc:base.module_base
 #: field:res.currency,base:0
 msgid "Base"
-msgstr "本位币"
+msgstr "base 模块"
 
 #. module: base
 #: field:ir.model.data,model:0

From c09b9cb5f9a2a7825571cf803ec760f9e3983b6c Mon Sep 17 00:00:00 2001
From: Launchpad Translations on behalf of openerp <>
Date: Fri, 7 Dec 2012 04:47:55 +0000
Subject: [PATCH 094/110] Launchpad automatic translations update.

bzr revid: launchpad_translations_on_behalf_of_openerp-20121207043623-mrfjgzunwq1dlmmh
bzr revid: launchpad_translations_on_behalf_of_openerp-20121207044755-avo3gbucdjj6i0ms
---
 addons/account/i18n/de.po                     | 130 ++-
 addons/account/i18n/it.po                     | 303 ++++--
 addons/account/i18n/zh_CN.po                  |  10 +-
 addons/account_analytic_analysis/i18n/de.po   | 173 ++--
 addons/account_analytic_default/i18n/de.po    |  43 +-
 addons/account_analytic_plans/i18n/de.po      |  26 +-
 addons/account_asset/i18n/de.po               |  33 +-
 .../i18n/de.po                                |  21 +-
 addons/account_budget/i18n/nl.po              |  27 +-
 addons/base_gengo/i18n/nb.po                  | 256 +++++
 addons/crm/i18n/pt_BR.po                      | 615 ++++++++----
 addons/crm_partner_assign/i18n/nb.po          | 931 ++++++++++++++++++
 addons/crm_todo/i18n/pt_BR.po                 |  14 +-
 addons/fleet/i18n/zh_CN.po                    |  15 +-
 addons/hr/i18n/zh_CN.po                       |   2 +-
 addons/hr_holidays/i18n/zh_CN.po              |   2 +-
 addons/knowledge/i18n/pt_BR.po                |  13 +-
 addons/mail/i18n/fr.po                        |   8 +-
 addons/note/i18n/pt_BR.po                     |  27 +-
 addons/note_pad/i18n/pt_BR.po                 |  28 +
 addons/pad/i18n/pt_BR.po                      |  24 +-
 addons/pad_project/i18n/pt_BR.po              |  12 +-
 addons/portal/i18n/fr.po                      |  10 +-
 addons/portal_claim/i18n/pt_BR.po             |  44 +
 addons/portal_sale/i18n/pt_BR.po              | 273 ++++-
 addons/project/i18n/pt_BR.po                  |  68 +-
 addons/project_gtd/i18n/pt_BR.po              |  16 +-
 addons/project_issue/i18n/pt_BR.po            |  63 +-
 addons/project_issue_sheet/i18n/pt_BR.po      |  13 +-
 addons/project_timesheet/i18n/pt_BR.po        |  48 +-
 addons/sale/i18n/es_AR.po                     | 179 ++--
 addons/sale/i18n/hr.po                        |  71 +-
 addons/sale/i18n/pt_BR.po                     | 107 +-
 addons/sale_crm/i18n/pt_BR.po                 |  35 +-
 addons/share/i18n/pt_BR.po                    | 109 +-
 addons/web/i18n/es.po                         |  25 +-
 addons/web/i18n/fa.po                         |  36 +-
 addons/web/i18n/hr.po                         |  18 +-
 addons/web_kanban/i18n/fa.po                  |  10 +-
 addons/web_view_editor/i18n/fa.po             |  14 +-
 40 files changed, 3049 insertions(+), 803 deletions(-)
 create mode 100644 addons/base_gengo/i18n/nb.po
 create mode 100644 addons/crm_partner_assign/i18n/nb.po
 create mode 100644 addons/note_pad/i18n/pt_BR.po
 create mode 100644 addons/portal_claim/i18n/pt_BR.po

diff --git a/addons/account/i18n/de.po b/addons/account/i18n/de.po
index 4e3759713c4..dc3291fc9da 100644
--- a/addons/account/i18n/de.po
+++ b/addons/account/i18n/de.po
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2012-12-03 16:02+0000\n"
-"PO-Revision-Date: 2012-12-05 22:09+0000\n"
+"PO-Revision-Date: 2012-12-06 10:40+0000\n"
 "Last-Translator: Thorsten Vocks (OpenBig.org) <thorsten.vocks@big-"
 "consulting.net>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-06 04:40+0000\n"
+"X-Launchpad-Export-Date: 2012-12-07 04:35+0000\n"
 "X-Generator: Launchpad (build 16341)\n"
 
 #. module: account
@@ -9891,7 +9891,7 @@ msgstr "Gültig ab"
 #. module: account
 #: field:account.cashbox.line,pieces:0
 msgid "Unit of Currency"
-msgstr ""
+msgstr "Währungseinheit"
 
 #. module: account
 #: code:addons/account/account.py:3137
@@ -10019,6 +10019,16 @@ msgid ""
 "related journal entries may or may not be reconciled.             \n"
 "* The 'Cancelled' status is used when user cancel invoice."
 msgstr ""
+" * Der \"Entwurf\"-Status wird verwendet, wenn ein Benutzer eine Rechnung "
+"erstellt, aber noch nicht gebucht hat.\n"
+"* Der \"Pro-forma\" Status wird nach dessen Auswahl  angezeigt, es wird aber "
+"noch keine Rechnungsnummer vergeben. \n"
+"* Die Rechnung ist im \"Offen\" Status, wenn Sie gebucht wurde, dadurch eine "
+"Rechnungsnummer bekommen hat, aber noch nicht vom Kunden bezahlt wurde. \n"
+"* Der\"Bezahlt\"-Status wird automatisch vergeben, wenn die offene Rechnung "
+"vom Kunden bezahlt wurde.\n"
+"* Eine Anzeige im \"Abgebrochen\"-Status erfolgt immer dann, wenn die "
+"Rechnung storniert wurde."
 
 #. module: account
 #: field:account.period,date_stop:0
@@ -10038,7 +10048,7 @@ msgstr "Finanz Reports"
 #. module: account
 #: model:account.account.type,name:account.account_type_liability_view1
 msgid "Liability View"
-msgstr ""
+msgstr "Passiva Ansicht"
 
 #. module: account
 #: report:account.account.balance:0
@@ -10086,7 +10096,7 @@ msgstr "Firmenreferenzen Partner"
 #. module: account
 #: view:account.invoice:0
 msgid "Ask Refund"
-msgstr ""
+msgstr "Gutschrift anfragen"
 
 #. module: account
 #: view:account.move.line:0
@@ -10127,12 +10137,12 @@ msgstr "Forderungskonten"
 #. module: account
 #: field:account.config.settings,purchase_refund_sequence_prefix:0
 msgid "Supplier credit note sequence"
-msgstr ""
+msgstr "Nummernfolge Lieferantengutschrift"
 
 #. module: account
 #: field:account.config.settings,purchase_sequence_next:0
 msgid "Next supplier invoice number"
-msgstr ""
+msgstr "Nächste Eingangsrechnung"
 
 #. module: account
 #: help:account.config.settings,module_account_payment:0
@@ -10144,6 +10154,12 @@ msgid ""
 "payments.\n"
 "                This installs the module account_payment."
 msgstr ""
+"Sie können Zahlungsaufträge erstellen und verwalten , um\n"
+"                     * diese als Grundlage für externe Erweiterungen zur "
+"Automatisierung von Zahlungen zu nutzen. \n"
+"                     * dadurch den Rechnungsausgleich von Lieferanten und "
+"andere Kreditoren durchzuführen.\n"
+"                 Es erfolgt eine Installation des Moduls account_payment."
 
 #. module: account
 #: xsl:account.transfer:0
@@ -10162,6 +10178,7 @@ msgstr "Bankauszüge"
 #, python-format
 msgid "To reconcile the entries company should be the same for all entries."
 msgstr ""
+"Das Unternehmen sollte für alle auszugleichenden Buchungen identisch sein."
 
 #. module: account
 #: field:account.account,balance:0
@@ -10241,7 +10258,7 @@ msgstr "Filter nach"
 #: field:account.cashbox.line,number_closing:0
 #: field:account.cashbox.line,number_opening:0
 msgid "Number of Units"
-msgstr ""
+msgstr "Stückzahl"
 
 #. module: account
 #: model:process.node,note:account.process_node_manually0
@@ -10266,12 +10283,12 @@ msgstr "Buchung"
 #: code:addons/account/wizard/account_period_close.py:51
 #, python-format
 msgid "Invalid Action!"
-msgstr ""
+msgstr "Diese Aktion ist fehlerhaft!"
 
 #. module: account
 #: view:account.bank.statement:0
 msgid "Date / Period"
-msgstr ""
+msgstr "Datum / Periode"
 
 #. module: account
 #: report:account.central.journal:0
@@ -10464,7 +10481,7 @@ msgstr "Fälligkeitsdatum"
 #: code:addons/account/account.py:1459
 #, python-format
 msgid " Centralisation"
-msgstr ""
+msgstr " Zusammenfassung"
 
 #. module: account
 #: help:account.journal,type:0
@@ -10548,7 +10565,7 @@ msgstr "Rechnungsentwürfe"
 #: view:cash.box.in:0
 #: model:ir.actions.act_window,name:account.action_cash_box_in
 msgid "Put Money In"
-msgstr ""
+msgstr "Zahle Geld ein"
 
 #. module: account
 #: selection:account.account.type,close_method:0
@@ -10609,7 +10626,7 @@ msgstr "Abrechnen von Analyt. Buchungen"
 #. module: account
 #: view:account.installer:0
 msgid "Configure your Fiscal Year"
-msgstr ""
+msgstr "Konfiguration Geschäftsjahr"
 
 #. module: account
 #: field:account.period,name:0
@@ -10623,6 +10640,8 @@ msgid ""
 "Selected invoice(s) cannot be cancelled as they are already in 'Cancelled' "
 "or 'Done' state."
 msgstr ""
+"Die ausgewählten Rechnungen können im Status \"abgebrochen\" oder "
+"\"bezahlt\" nicht mehr storniert werden."
 
 #. module: account
 #: report:account.analytic.account.quantity_cost_ledger:0
@@ -10657,6 +10676,10 @@ msgid ""
 "some non legal fields or you must unconfirm the journal entry first.\n"
 "%s."
 msgstr ""
+"Sie können keine Änderung bereits erfolgter Buchungen vornehmen. Lediglich "
+"unkritische Informationen können ohne weiteres geändert werden, ansonsten "
+"ist zunächst die zugrunde liegende Buchung zu stornieren.\n"
+"%s."
 
 #. module: account
 #: help:account.config.settings,module_account_budget:0
@@ -10667,6 +10690,15 @@ msgid ""
 "analytic account.\n"
 "                This installs the module account_budget."
 msgstr ""
+"Definieren Sie Ihre Kostenstellen und budgetieren Sie die dort relevanten "
+"Erfolgskonten.\n"
+"                 Sobald Sie die Vorlagen für Ihre anstehenden "
+"Budgetplanungen erstellt haben ,\n"
+"                 können Ihre verantwortlichen Projektmanager  die geplante "
+"Beträge für Ihre Kostenstellen\n"
+"                 differenziert nach Erfolgs- und Kostenkonten aufteilen.\n"
+"                 Zu diesem Zweck installieren Sie hier das Modul "
+"account_budget."
 
 #. module: account
 #: help:res.partner,property_account_payable:0
@@ -10721,12 +10753,12 @@ msgstr "Haben"
 #. module: account
 #: view:account.invoice:0
 msgid "Draft Invoice "
-msgstr ""
+msgstr "Entwurf Rechnung "
 
 #. module: account
 #: selection:account.invoice.refund,filter_refund:0
 msgid "Cancel: create credit note and reconcile"
-msgstr ""
+msgstr "Abbrechen: Erstelle Gutschrift und Ausgleich"
 
 #. module: account
 #: model:ir.ui.menu,name:account.menu_account_general_journal
@@ -10827,7 +10859,7 @@ msgstr "Gewinn & Verlust Übertrag"
 #: code:addons/account/account_invoice.py:368
 #, python-format
 msgid "There is no Sale/Purchase Journal(s) defined."
-msgstr ""
+msgstr "Es wurde noch kein Journal für Verkauf / Einkauf angelegt."
 
 #. module: account
 #: view:account.move.line.reconcile.select:0
@@ -10905,7 +10937,7 @@ msgstr "Kontotyp"
 #. module: account
 #: field:account.subscription.generate,date:0
 msgid "Generate Entries Before"
-msgstr ""
+msgstr "Buchungspositionen vorab erstellen"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_subscription_form_running
@@ -11005,6 +11037,8 @@ msgstr "Status"
 #: help:product.template,property_account_income:0
 msgid "This account will be used to value outgoing stock using sale price."
 msgstr ""
+"Dieses Konto wird für abgehende Bestände mit dem Verkaufspreis bewertet und "
+"gebucht."
 
 #. module: account
 #: field:account.invoice,check_total:0
@@ -11027,12 +11061,12 @@ msgstr "Bruttobetrag"
 #: code:addons/account/wizard/account_invoice_refund.py:109
 #, python-format
 msgid "Cannot %s draft/proforma/cancel invoice."
-msgstr ""
+msgstr "Entwurf / Proforma / Abgebrochen Rechnungen können nicht %s werden."
 
 #. module: account
 #: field:account.tax,account_analytic_paid_id:0
 msgid "Refund Tax Analytic Account"
-msgstr ""
+msgstr "Kostenstelle für Steuer der Gutschrift"
 
 #. module: account
 #: view:account.move.bank.reconcile:0
@@ -11099,7 +11133,7 @@ msgstr "Fälligkeitsdatum"
 #: field:cash.box.in,name:0
 #: field:cash.box.out,name:0
 msgid "Reason"
-msgstr ""
+msgstr "Begründung"
 
 #. module: account
 #: selection:account.partner.ledger,filter:0
@@ -11157,7 +11191,7 @@ msgstr "Konten ohne Buchung? "
 #: code:addons/account/account_move_line.py:1046
 #, python-format
 msgid "Unable to change tax!"
-msgstr ""
+msgstr "Eine Änderung der Steuer ist nicht möglich"
 
 #. module: account
 #: constraint:account.bank.statement:0
@@ -11189,6 +11223,9 @@ msgid ""
 "customer. The tool search can also be used to personalise your Invoices "
 "reports and so, match this analysis to your needs."
 msgstr ""
+"Durch diesen Bericht erhalten Sie einen Überblick über die Abrechnungen "
+"Ihrer Kunden. Das Suche + Filter Tool kann zur weiteren auf Ihre Bedürfnisse "
+"angepassten Analyse angepasst werden."
 
 #. module: account
 #: view:account.partner.reconcile.process:0
@@ -11209,7 +11246,7 @@ msgstr "Status der Rechnung ist 'Erledigt'"
 #. module: account
 #: field:account.config.settings,module_account_followup:0
 msgid "Manage customer payment follow-ups"
-msgstr ""
+msgstr "Verwalten Sie Zahlungserinnerungen"
 
 #. module: account
 #: model:ir.model,name:account.model_report_account_sales
@@ -11285,7 +11322,7 @@ msgstr "Debitoren"
 #: code:addons/account/account_move_line.py:776
 #, python-format
 msgid "Already reconciled."
-msgstr ""
+msgstr "Bereits ausgeglichen."
 
 #. module: account
 #: selection:account.model.line,date_maturity:0
@@ -11361,6 +11398,7 @@ msgstr "Gruppiere je Monat des Rechnungsdatums"
 #, python-format
 msgid "There is no income account defined for this product: \"%s\" (id:%d)."
 msgstr ""
+"Es wurde kein Ertragskonto für dieses Produkt definiert: \"%s\" (Kürzel: %d)."
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_aged_receivable_graph
@@ -11423,6 +11461,8 @@ msgid ""
 "The selected unit of measure is not compatible with the unit of measure of "
 "the product."
 msgstr ""
+"Die ausgewählte Mengeneinheit ist nicht mit derjenigen für das Produkt "
+"kompatibel."
 
 #. module: account
 #: view:account.fiscal.position:0
@@ -11446,6 +11486,17 @@ msgid ""
 "              </p>\n"
 "            "
 msgstr ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                 Klicken Sie um neue Steuern zu definieren.\n"
+"               </ p>\n"
+"                 Je nach Land, ist eine Steuer in der Regel ein Wert in "
+"Ihrer \n"
+"                 Umsatzsteuererklärung. OpenERP ermöglicht die Definition\n"
+"                 von Steuerstrukturen,  damit sämtliche Steuerberechnungen \n"
+"                 und Buchungen dann in einer oder mehrerer Positionen für \n"
+"                 die Voranmeldung bzw. Steuererklärung auftauchen.\n"
+"               </ p>\n"
+"            "
 
 #. module: account
 #: selection:account.entries.report,month:0
@@ -11472,6 +11523,22 @@ msgid ""
 "              </p>\n"
 "            "
 msgstr ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                 Wählen Sie Periode und Journal für Ihre Buchungen.\n"
+"               </ p>\n"
+"                 Diese Ansicht kann von Wirtschaftsprüfern und "
+"Steuerberatern genutzt werden, \n"
+"                 um schnellstmöglich Buchungen in  OpenERP von außen "
+"einzugeben. Wenn Sie eine \n"
+"                 Lieferantenrechnung erfassen, beginnen Sie normalerweise "
+"mit der Eingabe des \n"
+"                 Aufwandskontos für eine Rechnung. OpenERP wird Ihnen aus "
+"dem Kontext des\n"
+"                 Produkts dann automatisch eine Steuer vorschlagen sowie das "
+"Gegenkonto für die  \n"
+"                 \"Kreditoren\".\n"
+"               </ p>\n"
+"            "
 
 #. module: account
 #: help:account.invoice.line,account_id:0
@@ -11481,7 +11548,7 @@ msgstr "Aufwand- und Erlöskonto des Produktes"
 #. module: account
 #: view:account.config.settings:0
 msgid "Install more chart templates"
-msgstr ""
+msgstr "Installieren Sie weitere Kontenpläne"
 
 #. module: account
 #: report:account.general.journal:0
@@ -11529,6 +11596,8 @@ msgid ""
 "You cannot remove/deactivate an account which is set on a customer or "
 "supplier."
 msgstr ""
+"Sie können keine Konten deaktivieren, die bereits einem Kunden oder "
+"Lieferanten zugewiesen wurden."
 
 #. module: account
 #: model:ir.model,name:account.model_validate_account_move_lines
@@ -11540,6 +11609,8 @@ msgstr "Verbuche Buchungszeilen"
 msgid ""
 "The fiscal position will determine taxes and accounts used for the partner."
 msgstr ""
+"Die Steuerzuordnung steuert die zu benutzenden Steuern und Konten für den "
+"Partner."
 
 #. module: account
 #: model:process.node,note:account.process_node_supplierpaidinvoice0
@@ -11573,6 +11644,7 @@ msgstr "Manuelle Berechnung Steuer"
 #, python-format
 msgid "The payment term of supplier does not have a payment term line."
 msgstr ""
+"Die Zahlungsbedingung für die Lieferantenrechnung hat keine Zahlungsposition."
 
 #. module: account
 #: field:account.account,parent_right:0
@@ -11585,7 +11657,7 @@ msgstr "Oberkonto Rechts"
 #: code:addons/account/static/src/js/account_move_reconciliation.js:80
 #, python-format
 msgid "Never"
-msgstr ""
+msgstr "Niemals"
 
 #. module: account
 #: model:ir.model,name:account.model_account_addtmpl_wizard
@@ -11606,7 +11678,7 @@ msgstr "Partner"
 #. module: account
 #: field:account.account,note:0
 msgid "Internal Notes"
-msgstr ""
+msgstr "Interne Hinweise"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_fiscalyear
@@ -11639,7 +11711,7 @@ msgstr "Buchungsvorlage"
 #: code:addons/account/account_cash_statement.py:292
 #, python-format
 msgid "Loss"
-msgstr ""
+msgstr "Verlust"
 
 #. module: account
 #: selection:account.entries.report,month:0
@@ -11665,7 +11737,7 @@ msgstr ""
 #: view:account.bank.statement:0
 #: help:account.cashbox.line,number_closing:0
 msgid "Closing Unit Numbers"
-msgstr ""
+msgstr "Abschluss Bankauszug"
 
 #. module: account
 #: field:account.bank.accounts.wizard,bank_account_id:0
@@ -11731,7 +11803,7 @@ msgstr ""
 #. module: account
 #: selection:account.config.settings,tax_calculation_rounding_method:0
 msgid "Round per line"
-msgstr ""
+msgstr "Runden per  Zeile"
 
 #. module: account
 #: help:account.move.line,amount_residual_currency:0
diff --git a/addons/account/i18n/it.po b/addons/account/i18n/it.po
index 1e822b5817e..6bc1a0ac2bc 100644
--- a/addons/account/i18n/it.po
+++ b/addons/account/i18n/it.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2012-12-03 16:02+0000\n"
-"PO-Revision-Date: 2012-12-06 00:09+0000\n"
+"PO-Revision-Date: 2012-12-06 21:42+0000\n"
 "Last-Translator: Sergio Corato <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: 2012-12-06 04:40+0000\n"
+"X-Launchpad-Export-Date: 2012-12-07 04:35+0000\n"
 "X-Generator: Launchpad (build 16341)\n"
 
 #. module: account
@@ -305,6 +305,9 @@ msgid ""
 "sales, purchase, expense, contra, etc.\n"
 "                This installs the module account_voucher."
 msgstr ""
+"Include tutte le funzioni basilari per le registrazioni dei pagamenti per "
+"banca, cassa, vendite, acquisti, costi, contra, ecc.\n"
+"                Installa il modulo account_voucher."
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_use_model_create_entry
@@ -481,6 +484,14 @@ msgid ""
 "this box, you will be able to do invoicing & payments,\n"
 "                but not accounting (Journal Items, Chart of Accounts, ...)"
 msgstr ""
+"Permette di gestire le immobilizzazioni possedute da un'azienda o da una "
+"persona.\n"
+"               Tiene traccia del deprezzamento di queste immobilizzazioni, e "
+"crea movimenti contabili per queste righe di ammortamento.\n"
+"               Installa il modulo account_asset. Se non viene selezionata "
+"questa casella, sarà possibile effettuare fatture e pagamenti,\n"
+"               ma non contabilizzarli (Registrazioni nel Sezionale, Piano "
+"dei Conti, ...)"
 
 #. module: account
 #. openerp-web
@@ -509,6 +520,17 @@ msgid ""
 "should choose 'Round per line' because you certainly want the sum of your "
 "tax-included line subtotals to be equal to the total amount with taxes."
 msgstr ""
+"Se è selezionato 'Arrotondamento per Riga' : per ogni imposta, l'ammontare "
+"dell'imposta sarà prima calcolato e arrotondato per ogni riga di Ordine "
+"d'aquisto/Ordine di vendita/fattura e poi questi ammontari arrotondati "
+"saranno sommati, formando quindi l'ammontare totale per quella tassa. Se è "
+"selezionato 'Arrotondamento sul Totale': per ogni imposta, il totale "
+"dell'imposta sarà calcolato per ogni riga di Ordine d'aquisto/Ordine di "
+"vendita/fattura, poi questi ammontari saranno sommati e infine questo somma "
+"totale sarà arrotondata. Se le vendite vengono effettuate con l'imposta "
+"compresa, sarebbe meglio selezionare 'Arrotondamento per riga' perchè "
+"l'ammontare totale dei sub-totali delle righe compreso l'imposta sarà uguale "
+"al totale imposte comprese."
 
 #. module: account
 #: model:ir.model,name:account.model_wizard_multi_charts_accounts
@@ -1895,7 +1917,7 @@ msgstr ""
 "dell'imposta sarà prima calcolato e arrotondato per ogni riga di Ordine "
 "d'aquisto/Ordine di vendita/fattura e poi questi ammontari arrotondati "
 "saranno sommati, formando quindi l'ammontare totale per quella tassa. Se è "
-"selezionato 'Arrotondamento Globale': per ogni imposta, il totale "
+"selezionato 'Arrotondamento sul Totale': per ogni imposta, il totale "
 "dell'imposta sarà calcolato per ogni riga di Ordine d'aquisto/Ordine di "
 "vendita/fattura, poi questi ammontari saranno sommati e infine questo somma "
 "totale sarà arrotondata. Se le vendite vengono effettuate con l'imposta "
@@ -2039,6 +2061,108 @@ msgid ""
 "</div>\n"
 "            "
 msgstr ""
+"\n"
+"\\n\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"
+"\\n\n"
+"    <p>Buongiorno${object.partner_id.name and ' ' or "
+"''}${object.partner_id.name or ''},</p>\\n\n"
+"\\n\n"
+"    <p>E' disponibile una nuova fattura: </p>\\n\n"
+"    \\n\n"
+"    <p style=\\\"border-left: 1px solid #8e0000; margin-left: 30px;\\\">\\n\n"
+"       &nbsp;&nbsp;<strong>RIFERIMENTO</strong><br />\\n\n"
+"       &nbsp;&nbsp;Numero fattura: <strong>${object.number}</strong><br />\\"
+"n\n"
+"       &nbsp;&nbsp;Totale fattura: <strong>${object.amount_total} "
+"${object.currency_id.name}</strong><br />\\n\n"
+"       &nbsp;&nbsp;Data fattura: ${object.date_invoice}<br />\\n\n"
+"       % if object.origin:\\n\n"
+"       &nbsp;&nbsp;Rif. ordine: ${object.origin}<br />\\n\n"
+"       % endif\\n\n"
+"       % if object.user_id:\\n\n"
+"       &nbsp;&nbsp;Vs. contatto: <a href=\\\"mailto:${object.user_id.email "
+"or ''}?subject=Invoice%20${object.number}\\\">${object.user_id.name}</a>\\n\n"
+"       % endif\\n\n"
+"    </p>  \\n\n"
+"    \\n\n"
+"    % if object.company_id.paypal_account and object.type in ('out_invoice', "
+"'in_refund'):\\n\n"
+"    <% \\n\n"
+"    comp_name = quote(object.company_id.name)\\n\n"
+"    inv_number = quote(object.number)\\n\n"
+"    paypal_account = quote(object.company_id.paypal_account)\\n\n"
+"    inv_amount = quote(str(object.residual))\\n\n"
+"    cur_name = quote(object.currency_id.name)\\n\n"
+"    paypal_url = \\\"https://www.paypal.com/cgi-"
+"bin/webscr?cmd=_xclick&amp;business=%s&amp;item_name=%s%%20Invoice%%20%s&amp;"
+"\\\" \\\\\\n\n"
+"                 \\"
+"\"invoice=%s&amp;amount=%s&amp;currency_code=%s&amp;button_subtype=services&a"
+"mp;no_note=1&amp;bn=OpenERP_Invoice_PayNow_%s\\\" % \\\\\\n\n"
+"                 "
+"(paypal_account,comp_name,inv_number,inv_number,inv_amount,cur_name,cur_name)"
+"\\n\n"
+"    %>\\n\n"
+"    <br/>\\n\n"
+"    <p>E' possibile anche pagare direttamente con Paypal:</p>\\n\n"
+"        <a style=\\\"margin-left: 120px;\\\" href=\\\"${paypal_url}\\\">\\n\n"
+"            <img class=\\\"oe_edi_paypal_button\\\" src=\\"
+"\"https://www.paypal.com/en_US/i/btn/btn_paynowCC_LG.gif\\\"/>\\n\n"
+"        </a>\\n\n"
+"    % endif\\n\n"
+"    \\n\n"
+"    <br/>\\n\n"
+"    <p>Per qualsiasi informazione, non  esitate a contattarci.</p>\\n\n"
+"    <p>Grazie per aver scelto ${object.company_id.name or 'us'}!</p>\\n\n"
+"    <br/>\\n\n"
+"    <br/>\\n\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\n"
+"        <h3 style=\\\"margin: 0px; padding: 2px 14px; font-size: 12px; "
+"color: #FFF;\\\">\\n\n"
+"            <strong style=\\\"text-transform:uppercase;\\"
+"\">${object.company_id.name}</strong></h3>\\n\n"
+"    </div>\\n\n"
+"    <div style=\\\"width: 347px; margin: 0px; padding: 5px 14px; line-"
+"height: 16px; background-color: #F2F2F2;\\\">\\n\n"
+"        <span style=\\\"color: #222; margin-bottom: 5px; display: block; \\"
+"\">\\n\n"
+"        % if object.company_id.street:\\n\n"
+"            ${object.company_id.street}<br/>\\n\n"
+"        % endif\\n\n"
+"        % if object.company_id.street2:\\n\n"
+"            ${object.company_id.street2}<br/>\\n\n"
+"        % endif\\n\n"
+"        % if object.company_id.city or object.company_id.zip:\\n\n"
+"            ${object.company_id.zip} ${object.company_id.city}<br/>\\n\n"
+"        % endif\\n\n"
+"        % if object.company_id.country_id:\\n\n"
+"            ${object.company_id.state_id and ('%s, ' % "
+"object.company_id.state_id.name) or ''} ${object.company_id.country_id.name "
+"or ''}<br/>\\n\n"
+"        % endif\\n\n"
+"        </span>\\n\n"
+"        % if object.company_id.phone:\\n\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\n"
+"                Tel.:&nbsp; ${object.company_id.phone}\\n\n"
+"            </div>\\n\n"
+"        % endif\\n\n"
+"        % if object.company_id.website:\\n\n"
+"            <div>\\n\n"
+"                Web :&nbsp;<a href=\\\"${object.company_id.website}\\"
+"\">${object.company_id.website}</a>\\n\n"
+"            </div>\\n\n"
+"        %endif\\n\n"
+"        <p></p>\\n\n"
+"    </div>\\n\n"
+"</div>\\n\n"
+"            "
 
 #. module: account
 #: field:account.tax.code,sum:0
@@ -2407,7 +2531,7 @@ msgstr "Chiusura Anno Fiscale"
 #: code:addons/account/static/src/xml/account_move_line_quickadd.xml:14
 #, python-format
 msgid "Journal :"
-msgstr ""
+msgstr "Sezionale :"
 
 #. module: account
 #: sql_constraint:account.fiscal.position.tax:0
@@ -3272,12 +3396,14 @@ msgid ""
 "Selected invoice(s) cannot be confirmed as they are not in 'Draft' or 'Pro-"
 "Forma' state."
 msgstr ""
+"La fattura(/e) selezionata non possono essere confermate perché non sono in "
+"stato 'Bozza' o 'Proforma'."
 
 #. module: account
 #: code:addons/account/account.py:1056
 #, python-format
 msgid "You should choose the periods that belong to the same company."
-msgstr ""
+msgstr "I periodi dovrebbero appartenere alla stessa azienda."
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_report_account_sales_tree_all
@@ -3290,7 +3416,7 @@ msgstr "Vendite per conto"
 #: code:addons/account/account.py:1406
 #, python-format
 msgid "You cannot delete a posted journal entry \"%s\"."
-msgstr ""
+msgstr "Non è possibile cancellare una registrazione contabilizzata \"%s\"."
 
 #. module: account
 #: view:account.invoice:0
@@ -3317,6 +3443,8 @@ msgid ""
 "This journal already contains items, therefore you cannot modify its company "
 "field."
 msgstr ""
+"Questo sezionale contiene già registrazioni, perciò non è possibile "
+"modificare i campi aziendali."
 
 #. module: account
 #: code:addons/account/account.py:408
@@ -3325,6 +3453,8 @@ msgid ""
 "You need an Opening journal with centralisation checked to set the initial "
 "balance."
 msgstr ""
+"E' necessario un Sezionale di apertura configurato con la centralizzazione "
+"per configurare il saldo iniziale."
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_tax_code_list
@@ -3362,7 +3492,7 @@ msgstr "Agosto"
 #. module: account
 #: field:accounting.report,debit_credit:0
 msgid "Display Debit/Credit Columns"
-msgstr ""
+msgstr "Visualizza colonne Debito/Credito"
 
 #. module: account
 #: selection:account.entries.report,month:0
@@ -4057,6 +4187,10 @@ msgid ""
 "You cannot modify a posted entry of this journal.\n"
 "First you should set the journal to allow cancelling entries."
 msgstr ""
+"Non è possibile modificare una registrazione contabilizzata in questo "
+"sezionale.\n"
+"Prima è necessario configurare il sezionale per permettere l'eliminazione "
+"delle registrazioni."
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_print_sale_purchase_journal
@@ -4081,6 +4215,8 @@ msgid ""
 "There is no fiscal year defined for this date.\n"
 "Please create one from the configuration of the accounting menu."
 msgstr ""
+"Non c'è alcun anno fiscale definito per questa data.\n"
+"Crearne uno dalla configurazione del menu contabilità."
 
 #. module: account
 #: view:account.addtmpl.wizard:0
@@ -4392,12 +4528,12 @@ msgstr "Nessuna azienda non configurata !"
 #. module: account
 #: field:res.company,expects_chart_of_accounts:0
 msgid "Expects a Chart of Accounts"
-msgstr ""
+msgstr "Necessario un Piano dei Conti"
 
 #. module: account
 #: model:mail.message.subtype,name:account.mt_invoice_paid
 msgid "paid"
-msgstr ""
+msgstr "pagato"
 
 #. module: account
 #: field:account.move.line,date:0
@@ -4408,7 +4544,7 @@ msgstr "Data effettiva"
 #: code:addons/account/wizard/account_fiscalyear_close.py:100
 #, python-format
 msgid "The journal must have default credit and debit account."
-msgstr ""
+msgstr "Il sezionale deve avere un conto di credito e di debito di default."
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_bank_tree
@@ -4420,11 +4556,13 @@ msgstr "Configurazione conti bancari"
 #: selection:account.invoice.refund,filter_refund:0
 msgid "Modify: create credit note, reconcile and create a new draft invoice"
 msgstr ""
+"Modificare: crea una nota di credito, riconcilia e crea una nuova bozza di "
+"fattura"
 
 #. module: account
 #: xsl:account.transfer:0
 msgid "Partner ID"
-msgstr ""
+msgstr "Partner ID"
 
 #. module: account
 #: help:account.bank.statement,message_ids:0
@@ -5415,7 +5553,7 @@ msgstr "Scritture da rivedere"
 #. module: account
 #: selection:res.company,tax_calculation_rounding_method:0
 msgid "Round Globally"
-msgstr "Arrotonda Globalmente"
+msgstr "Arrotondamento sul Totale"
 
 #. module: account
 #: field:account.bank.statement,message_comment_ids:0
@@ -5510,7 +5648,7 @@ msgstr ""
 #. module: account
 #: model:res.groups,name:account.group_account_manager
 msgid "Financial Manager"
-msgstr ""
+msgstr "Manager Finanziario"
 
 #. module: account
 #: field:account.journal,group_invoice_lines:0
@@ -5544,6 +5682,9 @@ msgid ""
 "If you do not check this box, you will be able to do invoicing & payments, "
 "but not accounting (Journal Items, Chart of  Accounts, ...)"
 msgstr ""
+"Se questa casella non è selezionata, sarà possibile creare fatture e "
+"pagamenti, ma non contabilizzarli (Registrazioni nel sezionale, Piani dei "
+"Conti, ...)"
 
 #. module: account
 #: view:account.period:0
@@ -5577,6 +5718,8 @@ msgid ""
 "There is no period defined for this date: %s.\n"
 "Please create one."
 msgstr ""
+"Non c'è alcun periodo definito per questa data: %s.\n"
+"Crearne uno."
 
 #. module: account
 #: help:account.tax,price_include:0
@@ -5705,7 +5848,7 @@ msgstr "Anno"
 #. module: account
 #: help:account.invoice,sent:0
 msgid "It indicates that the invoice has been sent."
-msgstr ""
+msgstr "Indica che la fattura è stata spedita."
 
 #. module: account
 #: view:account.payment.term.line:0
@@ -5725,11 +5868,14 @@ msgid ""
 "Put a sequence in the journal definition for automatic numbering or create a "
 "sequence manually for this piece."
 msgstr ""
+"Non è possibile creare una sequenza automatica per questo codice.\n"
+"Inserire una sequenza nella configurazione del sezionale per la numerazione "
+"automatica o creare una sequenza manualmente per questo codice."
 
 #. module: account
 #: view:account.invoice:0
 msgid "Pro Forma Invoice "
-msgstr ""
+msgstr "Fattura Proforma "
 
 #. module: account
 #: selection:account.subscription,period_type:0
@@ -5795,6 +5941,8 @@ msgstr "Codice calcolo (se tipo=codice)"
 msgid ""
 "Cannot find a chart of accounts for this company, you should create one."
 msgstr ""
+"Non è possibile trovare un piano dei conti per questa azienda, è necessario "
+"crearne uno."
 
 #. module: account
 #: selection:account.analytic.journal,type:0
@@ -5854,6 +6002,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 ""
+"Gestisce il sommario (numero di messaggi, ...) di Chatter. Questo sommario è "
+"direttamente in html così da poter essere inserito nelle viste kanban."
 
 #. module: account
 #: field:account.tax,child_depend:0
@@ -5917,13 +6067,15 @@ msgstr "account.installer"
 #. module: account
 #: view:account.invoice:0
 msgid "Recompute taxes and total"
-msgstr ""
+msgstr "Ricalcola imposte e totale"
 
 #. module: account
 #: code:addons/account/account.py:1097
 #, python-format
 msgid "You cannot modify/delete a journal with entries for this period."
 msgstr ""
+"Non è possibile modificare/eliminare un sezionale che ha registrazioni in "
+"questo periodo."
 
 #. module: account
 #: field:account.tax.template,include_base_amount:0
@@ -5933,7 +6085,7 @@ msgstr "Incluso nell'imponibile"
 #. module: account
 #: field:account.invoice,supplier_invoice_number:0
 msgid "Supplier Invoice Number"
-msgstr ""
+msgstr "Numero Fattura Fornitore"
 
 #. module: account
 #: help:account.payment.term.line,days:0
@@ -5955,6 +6107,8 @@ msgstr "Calcolo ammontare"
 #, python-format
 msgid "You can not add/modify entries in a closed period %s of journal %s."
 msgstr ""
+"Non è possibile aggiungere/modificare registrazioni in un periodo chiuso %s "
+"del sezionale %s."
 
 #. module: account
 #: view:account.journal:0
@@ -5979,7 +6133,7 @@ msgstr "Inizio Periodo"
 #. module: account
 #: model:account.account.type,name:account.account_type_asset_view1
 msgid "Asset View"
-msgstr ""
+msgstr "Vista Immobilizzazioni"
 
 #. module: account
 #: model:ir.model,name:account.model_account_common_account_report
@@ -6055,12 +6209,12 @@ msgstr "Registrazioni di sezionale di fine anno"
 #. module: account
 #: view:account.invoice:0
 msgid "Draft Refund "
-msgstr ""
+msgstr "Bozza Rimborso "
 
 #. module: account
 #: view:cash.box.in:0
 msgid "Fill in this form if you put money in the cash register:"
-msgstr ""
+msgstr "Compilare questo form se viene immesso contante nel registro cassa:"
 
 #. module: account
 #: field:account.payment.term.line,value_amount:0
@@ -6143,7 +6297,7 @@ msgstr "Importo valuta"
 #. module: account
 #: selection:res.company,tax_calculation_rounding_method:0
 msgid "Round per Line"
-msgstr ""
+msgstr "Arrotondamento per Riga"
 
 #. module: account
 #: report:account.analytic.account.balance:0
@@ -6200,7 +6354,7 @@ msgstr ""
 #: code:addons/account/wizard/account_report_aged_partner_balance.py:56
 #, python-format
 msgid "You must set a period length greater than 0."
-msgstr ""
+msgstr "E' necessario impostare una durata del periodo maggiore di 0."
 
 #. module: account
 #: view:account.fiscal.position.template:0
@@ -6211,7 +6365,7 @@ msgstr "Modelli di \"posizioni fiscali\""
 #. module: account
 #: view:account.invoice:0
 msgid "Draft Refund"
-msgstr ""
+msgstr "Bozza Rimborso"
 
 #. module: account
 #: view:account.analytic.chart:0
@@ -6249,6 +6403,8 @@ msgstr "Riconcilia Con Storno"
 #: constraint:account.move.line:0
 msgid "You cannot create journal items on an account of type view."
 msgstr ""
+"Non è possibile creare registrazioni nel sezionale con un conto di tipo "
+"vista."
 
 #. module: account
 #: selection:account.payment.term.line,value:0
@@ -6262,6 +6418,8 @@ msgstr "Importo fissato"
 #, python-format
 msgid "You cannot change the tax, you should remove and recreate lines."
 msgstr ""
+"Non è possibile cambiare l'imposta, è necessario rimuoverla e ricreare le "
+"righe."
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_automatic_reconcile
@@ -6386,7 +6544,7 @@ msgstr "Corrispondenza imposte"
 #. module: account
 #: view:account.config.settings:0
 msgid "Select Company"
-msgstr ""
+msgstr "Selezionare Azienda"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_state_open
@@ -6460,7 +6618,7 @@ msgstr "# di Linee"
 #. module: account
 #: view:account.invoice:0
 msgid "(update)"
-msgstr ""
+msgstr "(aggiornare)"
 
 #. module: account
 #: field:account.aged.trial.balance,filter:0
@@ -6587,7 +6745,7 @@ msgstr "Azienda collegata a questo sezionale."
 #. module: account
 #: help:account.config.settings,group_multi_currency:0
 msgid "Allows you multi currency environment"
-msgstr ""
+msgstr "Permette una gestione multivaluta"
 
 #. module: account
 #: view:account.subscription:0
@@ -6670,7 +6828,7 @@ msgstr "Voce conto analitico"
 #. module: account
 #: model:ir.ui.menu,name:account.menu_action_model_form
 msgid "Models"
-msgstr ""
+msgstr "Modelli"
 
 #. module: account
 #: code:addons/account/account_invoice.py:1090
@@ -6679,6 +6837,8 @@ msgid ""
 "You cannot cancel an invoice which is partially paid. You need to "
 "unreconcile related payment entries first."
 msgstr ""
+"Non è possibile eliminare una fattura che è parzialmente pagata. E' "
+"necessario prima annullare la riconciliazione dei relativi pagamenti."
 
 #. module: account
 #: field:product.template,taxes_id:0
@@ -6763,7 +6923,7 @@ msgstr "Mostra semplicemente i sottoconti"
 #. module: account
 #: view:account.config.settings:0
 msgid "Bank & Cash"
-msgstr ""
+msgstr "Banca e Cassa"
 
 #. module: account
 #: help:account.fiscalyear.close.state,fy_id:0
@@ -6849,13 +7009,15 @@ msgstr "Crediti"
 #. module: account
 #: constraint:account.move.line:0
 msgid "You cannot create journal items on closed account."
-msgstr ""
+msgstr "Non è possibile creare registrazioni contabili su conti chiusi."
 
 #. module: account
 #: code:addons/account/account_invoice.py:594
 #, python-format
 msgid "Invoice line account's company and invoice's compnay does not match."
 msgstr ""
+"Il conto dell'azienda delle righe della fattura non coincide con l'azienda "
+"emittente la fattura."
 
 #. module: account
 #: view:account.invoice:0
@@ -6876,7 +7038,7 @@ msgstr "La valuta del conto non e' eguale a quella dell'azienda."
 #: code:addons/account/installer.py:48
 #, python-format
 msgid "Custom"
-msgstr ""
+msgstr "Personalizzazioni"
 
 #. module: account
 #: view:account.analytic.account:0
@@ -6887,7 +7049,7 @@ msgstr "Correnti"
 #: code:addons/account/account_invoice.py:1305
 #, python-format
 msgid "Invoice '%s' is paid partially: %s%s of %s%s (%s%s remaining)."
-msgstr ""
+msgstr "La fattura '%s' è parzialmente pagata: %s%s di %s%s (%s%s residuo)."
 
 #. module: account
 #: field:account.journal,cashbox_line_ids:0
@@ -6903,7 +7065,7 @@ msgstr "Capitale"
 #. module: account
 #: field:account.journal,internal_account_id:0
 msgid "Internal Transfers Account"
-msgstr ""
+msgstr "Conto Trasferimenti Interni"
 
 #. module: account
 #: code:addons/account/wizard/pos_box.py:33
@@ -6920,7 +7082,7 @@ msgstr "Percentuale"
 #. module: account
 #: selection:account.config.settings,tax_calculation_rounding_method:0
 msgid "Round globally"
-msgstr ""
+msgstr "Arrotondamento sul Totale"
 
 #. module: account
 #: selection:account.report.general.ledger,sortby:0
@@ -6952,7 +7114,7 @@ msgstr "Numero fattura"
 #. module: account
 #: field:account.bank.statement,difference:0
 msgid "Difference"
-msgstr ""
+msgstr "Differenza"
 
 #. module: account
 #: help:account.tax,include_base_amount:0
@@ -7021,12 +7183,12 @@ msgstr ""
 #: code:addons/account/wizard/account_report_aged_partner_balance.py:58
 #, python-format
 msgid "User Error!"
-msgstr ""
+msgstr "Errore Utente!"
 
 #. module: account
 #: view:account.open.closed.fiscalyear:0
 msgid "Discard"
-msgstr ""
+msgstr "Annulla"
 
 #. module: account
 #: selection:account.account,type:0
@@ -7044,7 +7206,7 @@ msgstr "Voci Giornale Analitico"
 #. module: account
 #: field:account.config.settings,has_default_company:0
 msgid "Has default company"
-msgstr ""
+msgstr "Ha un'azienda di default"
 
 #. module: account
 #: view:account.fiscalyear.close:0
@@ -7193,6 +7355,8 @@ msgid ""
 "Percentages for Payment Term Line must be between 0 and 1, Example: 0.02 for "
 "2%."
 msgstr ""
+"Le percentuali delle Righe delle Condizioni di Pagamento devono essere "
+"comprese tra 0 e 1, esempio: 0.02 per 2%."
 
 #. module: account
 #: report:account.invoice:0
@@ -7213,7 +7377,7 @@ msgstr "Conto Categoria Costi"
 #. module: account
 #: sql_constraint:account.tax:0
 msgid "Tax Name must be unique per company!"
-msgstr ""
+msgstr "Il nome dell'imposta deve essere unico per azienda!"
 
 #. module: account
 #: view:account.bank.statement:0
@@ -7253,12 +7417,14 @@ msgid ""
 "You cannot provide a secondary currency if it is the same than the company "
 "one."
 msgstr ""
+"Non è possibile indicare una valuta secondaria se è la stessa di quella "
+"principale."
 
 #. module: account
 #: code:addons/account/account_invoice.py:1321
 #, python-format
 msgid "Customer invoice"
-msgstr ""
+msgstr "Fattura cliente"
 
 #. module: account
 #: selection:account.account.type,report_type:0
@@ -7343,13 +7509,13 @@ msgstr "Conto Economico"
 #. module: account
 #: field:account.bank.statement,total_entry_encoding:0
 msgid "Total Transactions"
-msgstr ""
+msgstr "Transazioni Totali"
 
 #. module: account
 #: code:addons/account/account.py:635
 #, python-format
 msgid "You cannot remove an account that contains journal items."
-msgstr ""
+msgstr "Non è possibile eliminare un conto con registrazioni contabili."
 
 #. module: account
 #: code:addons/account/account_move_line.py:1095
@@ -7393,7 +7559,7 @@ msgstr "Manuale"
 #: code:addons/account/wizard/account_report_aged_partner_balance.py:58
 #, python-format
 msgid "You must set a start date."
-msgstr ""
+msgstr "E' necessario impostare una data iniziale."
 
 #. module: account
 #: view:account.automatic.reconcile:0
@@ -7442,7 +7608,7 @@ msgstr "Registrazioni Sezionale"
 #: code:addons/account/wizard/account_invoice_refund.py:147
 #, python-format
 msgid "No period found on the invoice."
-msgstr ""
+msgstr "Nessun periodo trovato nella fattura."
 
 #. module: account
 #: help:account.partner.ledger,page_split:0
@@ -7488,6 +7654,8 @@ msgstr "Tutte le registrazioni"
 #: constraint:account.move.reconcile:0
 msgid "You can only reconcile journal items with the same partner."
 msgstr ""
+"E' possibile solo riconciliare registrazioni contabili con lo stesso "
+"partnere."
 
 #. module: account
 #: view:account.journal.select:0
@@ -7601,7 +7769,7 @@ msgstr ""
 #. module: account
 #: field:account.config.settings,module_account_voucher:0
 msgid "Manage customer payments"
-msgstr ""
+msgstr "Gestione pagamenti clienti"
 
 #. module: account
 #: help:report.invoice.created,origin:0
@@ -7620,6 +7788,8 @@ msgid ""
 "Error!\n"
 "The start date of a fiscal year must precede its end date."
 msgstr ""
+"Errore!\n"
+"La data iniziale di un anno fiscale deve precedere quella finale."
 
 #. module: account
 #: view:account.tax.template:0
@@ -7635,7 +7805,7 @@ msgstr "Fatture Clienti"
 #. module: account
 #: view:account.tax:0
 msgid "Misc"
-msgstr ""
+msgstr "Varie"
 
 #. module: account
 #: view:account.analytic.line:0
@@ -7700,6 +7870,7 @@ msgstr "Documento di origine"
 #, python-format
 msgid "There is no expense account defined for this product: \"%s\" (id:%d)."
 msgstr ""
+"Non c'è un conto di costo definito per questo prodotto: \"%s\" (id:%d)."
 
 #. module: account
 #: constraint:account.account:0
@@ -7717,7 +7888,7 @@ msgstr "Report contabile"
 #. module: account
 #: field:account.analytic.line,currency_id:0
 msgid "Account Currency"
-msgstr ""
+msgstr "Conto Valuta"
 
 #. module: account
 #: report:account.invoice:0
@@ -7731,6 +7902,8 @@ msgid ""
 "You can not delete an invoice which is not cancelled. You should refund it "
 "instead."
 msgstr ""
+"Non è possibile eliminare una fattura che non è annullata. E' necessario "
+"creare invece una nota di credito."
 
 #. module: account
 #: help:account.tax,amount:0
@@ -7782,7 +7955,7 @@ msgstr "Movimenti aperti su conto di spesa"
 #. module: account
 #: view:account.invoice:0
 msgid "Customer Reference"
-msgstr ""
+msgstr "Riferimento cliente"
 
 #. module: account
 #: field:account.account.template,parent_id:0
@@ -7905,7 +8078,7 @@ msgstr "Movimenti Aperti Conto di Ricavo"
 #. module: account
 #: field:account.config.settings,group_proforma_invoices:0
 msgid "Allow pro-forma invoices"
-msgstr ""
+msgstr "Consentire fatture proforma"
 
 #. module: account
 #: view:account.bank.statement:0
@@ -7936,12 +8109,12 @@ msgstr "Crea registrazioni"
 #. module: account
 #: model:ir.model,name:account.model_cash_box_out
 msgid "cash.box.out"
-msgstr ""
+msgstr "cash.box.out"
 
 #. module: account
 #: help:account.config.settings,currency_id:0
 msgid "Main currency of the company."
-msgstr ""
+msgstr "Valuta principale di questa azienda."
 
 #. module: account
 #: model:ir.ui.menu,name:account.menu_finance_reports
@@ -7969,7 +8142,7 @@ msgstr "Sezionale Contabile"
 #. module: account
 #: field:account.config.settings,tax_calculation_rounding_method:0
 msgid "Tax calculation rounding method"
-msgstr ""
+msgstr "Metodo di arrotondamento delle imposte"
 
 #. module: account
 #: model:process.node,name:account.process_node_paidinvoice0
@@ -8021,6 +8194,8 @@ msgid ""
 "There is no default credit account defined \n"
 "on journal \"%s\"."
 msgstr ""
+"Non c'è un conto di credito di default definito \n"
+"nel sezionale \"%s\"."
 
 #. module: account
 #: view:account.invoice.line:0
@@ -8278,7 +8453,7 @@ msgstr "Codice"
 #. module: account
 #: field:account.config.settings,sale_refund_sequence_prefix:0
 msgid "Credit note sequence"
-msgstr ""
+msgstr "Sequenza note di credito"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_validate_account_move
@@ -8292,7 +8467,7 @@ msgstr "Conferma le scritture contabili"
 #. module: account
 #: field:account.journal,centralisation:0
 msgid "Centralised Counterpart"
-msgstr ""
+msgstr "Contropartita Centralizzata"
 
 #. module: account
 #: selection:account.bank.statement.line,type:0
@@ -8348,7 +8523,7 @@ msgstr "Sequenza"
 #. module: account
 #: field:account.config.settings,paypal_account:0
 msgid "Paypal account"
-msgstr ""
+msgstr "Conto Paypal"
 
 #. module: account
 #: selection:account.print.journal,sort_selection:0
@@ -8367,11 +8542,13 @@ msgid ""
 "Error!\n"
 "You cannot create recursive accounts."
 msgstr ""
+"Errore!\n"
+"Non è possibile creare conti ricorsivi."
 
 #. module: account
 #: model:ir.model,name:account.model_cash_box_in
 msgid "cash.box.in"
-msgstr ""
+msgstr "cash.box.in"
 
 #. module: account
 #: help:account.invoice,move_id:0
@@ -8381,7 +8558,7 @@ msgstr "Collegamento alle voci del sezionale generate automaticamente."
 #. module: account
 #: model:ir.model,name:account.model_account_config_settings
 msgid "account.config.settings"
-msgstr ""
+msgstr "account.config.settings"
 
 #. module: account
 #: selection:account.config.settings,period:0
@@ -8404,7 +8581,7 @@ msgstr "Saldo Calcolato"
 #: code:addons/account/static/src/js/account_move_reconciliation.js:89
 #, python-format
 msgid "You must choose at least one record."
-msgstr ""
+msgstr "E' necessario selezionare almeno un record."
 
 #. module: account
 #: field:account.account,parent_id:0
@@ -8479,7 +8656,7 @@ msgstr "Mastro del partner"
 #: code:addons/account/account_invoice.py:1340
 #, python-format
 msgid "%s <b>cancelled</b>."
-msgstr ""
+msgstr "%s <b>annullato</b>."
 
 #. module: account
 #: code:addons/account/account.py:652
@@ -8493,12 +8670,12 @@ msgstr "Attenzione !"
 #: help:account.bank.statement,message_unread:0
 #: help:account.invoice,message_unread:0
 msgid "If checked new messages require your attention."
-msgstr ""
+msgstr "Se selezionato, nuovi messaggi richiedono la tua attenzione"
 
 #. module: account
 #: field:res.company,tax_calculation_rounding_method:0
 msgid "Tax Calculation Rounding Method"
-msgstr ""
+msgstr "Metodo di Arrotondamento calcolo Imposte"
 
 #. module: account
 #: field:account.entries.report,move_line_state:0
@@ -8693,7 +8870,7 @@ msgstr "Registro Costi"
 #. module: account
 #: view:account.config.settings:0
 msgid "No Fiscal Year Defined for This Company"
-msgstr ""
+msgstr "Nessun Anno Fiscale Definito per Questa Azienda"
 
 #. module: account
 #: view:account.invoice:0
@@ -10480,7 +10657,7 @@ msgstr "Utile (Perdita) da visualizzare"
 #: code:addons/account/account_invoice.py:368
 #, python-format
 msgid "There is no Sale/Purchase Journal(s) defined."
-msgstr ""
+msgstr "Non c'è un Sezionale(/i) di Vendita/Acquisto definito."
 
 #. module: account
 #: view:account.move.line.reconcile.select:0
@@ -11396,7 +11573,7 @@ msgstr ""
 #. module: account
 #: selection:account.config.settings,tax_calculation_rounding_method:0
 msgid "Round per line"
-msgstr "Arrotonda per riga"
+msgstr "Arrotondamento per Riga"
 
 #. module: account
 #: help:account.move.line,amount_residual_currency:0
diff --git a/addons/account/i18n/zh_CN.po b/addons/account/i18n/zh_CN.po
index 77efde5acd5..7a4d62d5876 100644
--- a/addons/account/i18n/zh_CN.po
+++ b/addons/account/i18n/zh_CN.po
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2012-12-03 16:02+0000\n"
-"PO-Revision-Date: 2012-12-04 16:27+0000\n"
+"PO-Revision-Date: 2012-12-06 14:09+0000\n"
 "Last-Translator: ccdos <ccdos@163.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-05 05:20+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-07 04:35+0000\n"
+"X-Generator: Launchpad (build 16341)\n"
 
 #. module: account
 #: model:process.transition,name:account.process_transition_supplierreconcilepaid0
@@ -1137,7 +1137,7 @@ msgstr "科目名称"
 #. module: account
 #: field:account.journal,with_last_closing_balance:0
 msgid "Opening With Last Closing Balance"
-msgstr "用末期的期终余额打开"
+msgstr "用上个期末余额作期初"
 
 #. module: account
 #: help:account.tax.code,notprintable:0
@@ -1959,7 +1959,7 @@ msgstr "Pending Accounts"
 #. module: account
 #: view:account.open.closed.fiscalyear:0
 msgid "Cancel Fiscal Year Opening Entries"
-msgstr ""
+msgstr "取消财务年度未结案分录"
 
 #. module: account
 #: report:account.journal.period.print.sale.purchase:0
diff --git a/addons/account_analytic_analysis/i18n/de.po b/addons/account_analytic_analysis/i18n/de.po
index 5f1fd8a54e8..0b0894681b8 100644
--- a/addons/account_analytic_analysis/i18n/de.po
+++ b/addons/account_analytic_analysis/i18n/de.po
@@ -7,14 +7,15 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev_rc3\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2012-12-03 16:02+0000\n"
-"PO-Revision-Date: 2012-02-08 08:41+0000\n"
-"Last-Translator: Ferdinand @ Camptocamp <Unknown>\n"
+"PO-Revision-Date: 2012-12-06 21:29+0000\n"
+"Last-Translator: Thorsten Vocks (OpenBig.org) <thorsten.vocks@big-"
+"consulting.net>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:34+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-07 04:35+0000\n"
+"X-Generator: Launchpad (build 16341)\n"
 
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
@@ -24,17 +25,17 @@ msgstr ""
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
 msgid "Group By..."
-msgstr "Gruppiere nach..."
+msgstr "Gruppierung ..."
 
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
 msgid "To Invoice"
-msgstr ""
+msgstr "Abrechenbar"
 
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
 msgid "Remaining"
-msgstr ""
+msgstr "Verbleibend"
 
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
@@ -58,7 +59,7 @@ msgstr "vorheriger Arbeitstag"
 #. module: account_analytic_analysis
 #: field:account.analytic.account,ca_to_invoice:0
 msgid "Uninvoiced Amount"
-msgstr "Nicht berechnete Beträge"
+msgstr "Abrechenbarer Betrag"
 
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
@@ -69,56 +70,58 @@ msgid ""
 "to\n"
 "                            define the customer invoice price rate."
 msgstr ""
+"Die abzurechnenden Arbeitsstunden werden gemäß der Preisliste des Vertrags "
+"für das beim Mitarbeiter hinterlegte Produkt berechnet."
 
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
 msgid "⇒ Invoice"
-msgstr ""
+msgstr "=> Rechnung"
 
 #. module: account_analytic_analysis
 #: field:account.analytic.account,ca_invoiced:0
 msgid "Invoiced Amount"
-msgstr "Rechnungsbetrag"
+msgstr "Abgerechnet"
 
 #. module: account_analytic_analysis
 #: field:account.analytic.account,last_worked_invoiced_date:0
 msgid "Date of Last Invoiced Cost"
-msgstr "Datum letzte Berechnung"
+msgstr "Datum der letzten Abrechnung"
 
 #. module: account_analytic_analysis
 #: help:account.analytic.account,fix_price_to_invoice:0
 msgid "Sum of quotations for this contract."
-msgstr ""
+msgstr "Summe abzurechnende Beträge"
 
 #. module: account_analytic_analysis
 #: help:account.analytic.account,ca_invoiced:0
 msgid "Total customer invoiced amount for this account."
-msgstr "Gesamtbetrag Kundenrechnungen für dieses Konto"
+msgstr "Bereits abgerechnete Beträge"
 
 #. module: account_analytic_analysis
 #: help:account.analytic.account,timesheet_ca_invoiced:0
 msgid "Sum of timesheet lines invoiced for this contract."
-msgstr ""
+msgstr "Summe abgerechneter Arbeitszeiten"
 
 #. module: account_analytic_analysis
 #: help:account.analytic.account,revenue_per_hour:0
 msgid "Computed using the formula: Invoiced Amount / Total Time"
-msgstr "Berechnet als: Verrechneter Betrag / Gesamt Zeit"
+msgstr "Berechnungsformel:  Abgerechnete Beträge / Abgerechnete Stunden"
 
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
 msgid "Contracts not assigned"
-msgstr ""
+msgstr "Nicht unterzeichnete Verträge"
 
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
 msgid "Partner"
-msgstr ""
+msgstr "Kunde"
 
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
 msgid "Contracts that are not assigned to an account manager."
-msgstr "Verträge, die keinem Account Manager zugeordnet sind."
+msgstr "Verträge ohne verantwortlichen Mitarbeiter"
 
 #. module: account_analytic_analysis
 #: model:ir.actions.act_window,help:account_analytic_analysis.action_account_analytic_overdue
@@ -138,11 +141,25 @@ msgid ""
 "              </p>\n"
 "            "
 msgstr ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Klicken Sie um neuen Vertrag anzulegen.\n"
+"              </p><p>\n"
+"                Sie finden hier die zu verlängernden Verträge, bei denen "
+"entweder das terminierte Vertragsende\n"
+"                bereits überschritten wurde oder die geleistete Arbeitszeit "
+"nicht mehr durch die vertraglich vereinbarte   abrechenbare Arbeitszeit "
+"abgedeckt wird.\n"
+"              </p><p>\n"
+"                OpenERP versetzt automatisch die zu erneuernden Verträge in "
+"den Status Wiedervorlage. Nach der Erneuerung einer Vereinbarung sollte der "
+"Verkäufer den alten Vertrag entweder abschließen oder erneuern. \n"
+"              </p>\n"
+"            "
 
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
 msgid "End Date"
-msgstr "Enddatum"
+msgstr "Ende Datum"
 
 #. module: account_analytic_analysis
 #: help:account.analytic.account,hours_qtt_non_invoiced:0
@@ -156,12 +173,12 @@ msgstr ""
 #. module: account_analytic_analysis
 #: help:account.analytic.account,remaining_hours_to_invoice:0
 msgid "Computed using the formula: Maximum Time - Total Invoiced Time"
-msgstr ""
+msgstr "Berechnungsformel: Maximale Zeit - Abgerechnete Zeit"
 
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
 msgid "Expected"
-msgstr ""
+msgstr "Geplant"
 
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
@@ -174,7 +191,7 @@ msgstr "Analytisches Konto"
 #. module: account_analytic_analysis
 #: help:account.analytic.account,theorical_margin:0
 msgid "Computed using the formula: Theoretical Revenue - Total Costs"
-msgstr ""
+msgstr "Berechnungsformel: Geplanter Umsatz - Gesamte Kosten"
 
 #. module: account_analytic_analysis
 #: field:account.analytic.account,hours_qtt_invoiced:0
@@ -204,7 +221,7 @@ msgstr "Marge (%)"
 #. module: account_analytic_analysis
 #: help:account.analytic.account,remaining_hours:0
 msgid "Computed using the formula: Maximum Time - Total Worked Time"
-msgstr ""
+msgstr "Berechnungsformel: Maximale Zeit - Geleistete Zeit"
 
 #. module: account_analytic_analysis
 #: help:account.analytic.account,hours_quantity:0
@@ -224,17 +241,17 @@ msgstr ""
 #: model:ir.actions.act_window,name:account_analytic_analysis.template_of_contract_action
 #: model:ir.ui.menu,name:account_analytic_analysis.menu_template_of_contract_action
 msgid "Template of Contract"
-msgstr ""
+msgstr "Vertragsvorlage"
 
 #. module: account_analytic_analysis
 #: model:res.groups,name:account_analytic_analysis.group_template_required
 msgid "Mandatory use of templates in contracts"
-msgstr ""
+msgstr "Vertragsvorlage ist verbindlich"
 
 #. module: account_analytic_analysis
 #: field:account.analytic.account,hours_quantity:0
 msgid "Total Worked Time"
-msgstr ""
+msgstr "Gesamte Arbeitszeit"
 
 #. module: account_analytic_analysis
 #: field:account.analytic.account,real_margin:0
@@ -244,18 +261,17 @@ msgstr "Realisierte Marge"
 #. module: account_analytic_analysis
 #: model:ir.model,name:account_analytic_analysis.model_account_analytic_analysis_summary_month
 msgid "Hours summary by month"
-msgstr "Stundenanzahl pro Monat"
+msgstr "Stunden pro Monat"
 
 #. module: account_analytic_analysis
 #: help:account.analytic.account,real_margin_rate:0
 msgid "Computes using the formula: (Real Margin / Total Costs) * 100."
-msgstr ""
-"Berechnung nutzt diese Formel: (absolute Gewinnspanne / Gesamtkosten) * 100"
+msgstr "Berechnungsformel: (Marge / Gesamte Kosten) * 100"
 
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
 msgid "or view"
-msgstr ""
+msgstr "oder Ansicht"
 
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
@@ -272,7 +288,7 @@ msgstr "Monat"
 #: model:ir.actions.act_window,name:account_analytic_analysis.action_hr_tree_invoiced_all
 #: model:ir.ui.menu,name:account_analytic_analysis.menu_action_hr_tree_invoiced_all
 msgid "Time & Materials to Invoice"
-msgstr ""
+msgstr "Abrechenbare Zeiten &  Sachaufwendungen"
 
 #. module: account_analytic_analysis
 #: model:ir.actions.act_window,name:account_analytic_analysis.action_account_analytic_overdue_all
@@ -283,12 +299,12 @@ msgstr "Verträge"
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
 msgid "Start Date"
-msgstr ""
+msgstr "Start Datum"
 
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
 msgid "Invoiced"
-msgstr ""
+msgstr "Abgerechnet"
 
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
@@ -296,8 +312,8 @@ msgid ""
 "The contracts to be renewed because the deadline is passed or the working "
 "hours are higher than the allocated hours"
 msgstr ""
-"Der Vertrag muss erneuert werden, das die Frist abgelaufen ist oder die "
-"geplanten Stunden überschritten sind"
+"Zu erneuernde Verträge, aufgrund Laufzeitende oder Überschreitung der "
+"vereinbarten Stunden"
 
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
@@ -307,7 +323,7 @@ msgstr "Verträge, die zu erneuern sind"
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
 msgid "Timesheets"
-msgstr ""
+msgstr "Stundenzettel"
 
 #. module: account_analytic_analysis
 #: code:addons/account_analytic_analysis/account_analytic_analysis.py:461
@@ -328,7 +344,7 @@ msgstr "Überfällige Mengen"
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
 msgid "Status"
-msgstr ""
+msgstr "Status"
 
 #. module: account_analytic_analysis
 #: field:account.analytic.account,ca_theorical:0
@@ -349,13 +365,12 @@ msgstr "Ein Vertrag ist ein Analyse Konto mit Partner"
 #. module: account_analytic_analysis
 #: model:ir.actions.act_window,name:account_analytic_analysis.action_sales_order
 msgid "Sales Orders"
-msgstr ""
+msgstr "Aufträge"
 
 #. module: account_analytic_analysis
 #: help:account.analytic.account,last_invoice_date:0
 msgid "If invoice from the costs, this is the date of the latest invoiced."
-msgstr ""
-"Wenn Kosten verrechnet werden, dann ist dies das Datum der letzten Rechnung."
+msgstr "Letztmaliges Datum der Kostenabrechnung"
 
 #. module: account_analytic_analysis
 #: help:account.analytic.account,ca_theorical:0
@@ -364,9 +379,8 @@ msgid ""
 "if all these costs have been invoiced at the normal sale price provided by "
 "the pricelist."
 msgstr ""
-"Ausgehend von den entstandenen Projektkosten. Welcher Erlös wäre erzielt "
-"worden, wenn diese Kosten auf der Basis der normalen Preisliste des Verkaufs "
-"abgerechnet worden wären."
+"Theoretischer Erlös, wenn alle Kosten auf Basis der \"Allgemeinen "
+"Preisliste\" abgerechnet worden wären."
 
 #. module: account_analytic_analysis
 #: field:account.analytic.account,user_ids:0
@@ -387,6 +401,16 @@ msgid ""
 "                </p>\n"
 "            "
 msgstr ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                    Klicken Sie zur Erstellung einer Vertragsvorlage.\n"
+"                </p><p>\n"
+"                    Vorlagen sind vordefinierte Verträge für Projekte, aus "
+"denen zur schnellen\n"
+"und einfachen Erstellung neuer Vereinbarungen, die zugrundeliegenden "
+"Einstellungen und Konditionen\n"
+"übernommen werden.\n"
+"                </p>\n"
+"            "
 
 #. module: account_analytic_analysis
 #: model:ir.model,name:account_analytic_analysis.model_account_analytic_analysis_summary_user
@@ -404,6 +428,8 @@ msgid ""
 "Allows you to set the template field as required when creating an analytic "
 "account or a contract."
 msgstr ""
+"Bei Erstellung eines Vertrags oder Projekt ist die Verwendung einer Vorlage "
+"verpflichtend."
 
 #. module: account_analytic_analysis
 #: help:account.analytic.account,hours_qtt_invoiced:0
@@ -434,16 +460,28 @@ msgid ""
 "                </p>\n"
 "            "
 msgstr ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                    Klicken Sie zur Erstellung eines Vertrags.\n"
+"                </p><p>\n"
+"                    Setzen Sie Verträge ein, um hierüber Aufgaben, Vorfälle, "
+"Stundenzettel oder Abrechnungen \n"
+"                    geleisteter Arbeitszeiten, Personalspesen und/oder "
+"Verkaufsaufträge zu verfolgen. OpenERP\n"
+"                    überwacht dabei automatisch, ob Verträge erneuert werden "
+"müssen und benachrichtigt den\n"
+"                    zugewiesenen Verkäufer.\n"
+"                </p>\n"
+"            "
 
 #. module: account_analytic_analysis
 #: field:account.analytic.account,toinvoice_total:0
 msgid "Total to Invoice"
-msgstr ""
+msgstr "Gesamt Abrechnungsbetrag"
 
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
 msgid "Sale Orders"
-msgstr ""
+msgstr "Verkaufsaufträge"
 
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
@@ -453,18 +491,18 @@ msgstr "Offen"
 #. module: account_analytic_analysis
 #: field:account.analytic.account,invoiced_total:0
 msgid "Total Invoiced"
-msgstr ""
+msgstr "Abgerechneter Betrag"
 
 #. module: account_analytic_analysis
 #: help:account.analytic.account,remaining_ca:0
 msgid "Computed using the formula: Max Invoice Price - Invoiced Amount."
 msgstr ""
-"Berechnet auf Basis der Formel: Max. Einkaufspreis - Abgerechneter Betrag"
+"Berechnungsformel: Geplanter Abrechnungsbetrag - Abgerechneter Betrag"
 
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
 msgid "Responsible"
-msgstr ""
+msgstr "Projektleiter"
 
 #. module: account_analytic_analysis
 #: field:account.analytic.account,last_invoice_date:0
@@ -484,16 +522,25 @@ msgid ""
 "              </p>\n"
 "            "
 msgstr ""
+"<p>\n"
+"                Sie finden hier die aufgezeichneten Stundenzettel und "
+"eingekauften Sachmittel, \n"
+"                die für diesen Vertrag abgerechnet werden können. Für neue "
+"abzurechnende\n"
+"                Arbeitszeiten sollten Sie das Menü für die Stundenzettel "
+"benutzen.\n"
+"              </p>\n"
+"            "
 
 #. module: account_analytic_analysis
 #: field:account.analytic.account,hours_qtt_non_invoiced:0
 msgid "Uninvoiced Time"
-msgstr "nicht verrechnete Zeit"
+msgstr "Nicht abgerechnete Zeit"
 
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
 msgid "Invoicing"
-msgstr "Eingangsrechnung"
+msgstr "Abrechnung"
 
 #. module: account_analytic_analysis
 #: field:account.analytic.account,total_cost:0
@@ -507,6 +554,10 @@ msgid ""
 "remaining subtotals which, in turn, are computed as the maximum between "
 "'(Estimation - Invoiced)' and 'To Invoice' amounts"
 msgstr ""
+"Insgesamt verbleibender Abrechnungsbetrag für diesen Vertrag. Der Betrag "
+"errechnet sich aus der Summe der Einzelpositionen, sowie im Umkehrschluss "
+"aus dem Maximalbetrag der Differenz 'Geplant - Abgerechnet' und "
+"'Abzurechnen'."
 
 #. module: account_analytic_analysis
 #: model:ir.actions.act_window,name:account_analytic_analysis.action_account_analytic_overdue
@@ -517,7 +568,7 @@ msgstr "Zu erneuernde Verträge"
 #. module: account_analytic_analysis
 #: help:account.analytic.account,toinvoice_total:0
 msgid " Sum of everything that could be invoiced for this contract."
-msgstr ""
+msgstr " Summe abzurechnender Beträge für diesen Vertrag"
 
 #. module: account_analytic_analysis
 #: field:account.analytic.account,theorical_margin:0
@@ -527,22 +578,22 @@ msgstr "Theoretische Marge"
 #. module: account_analytic_analysis
 #: field:account.analytic.account,remaining_total:0
 msgid "Total Remaining"
-msgstr ""
+msgstr "Summe verbleibende Abrechnung"
 
 #. module: account_analytic_analysis
 #: help:account.analytic.account,real_margin:0
 msgid "Computed using the formula: Invoiced Amount - Total Costs."
-msgstr "Berechnet durch die Formel: Rechnungsbetrag - Gesamt Kosten."
+msgstr "Berechnungsformel: Rechnungsbetrag - Gesamt Kosten."
 
 #. module: account_analytic_analysis
 #: field:account.analytic.account,hours_qtt_est:0
 msgid "Estimation of Hours to Invoice"
-msgstr ""
+msgstr "Geplante abzurechnende Stunden"
 
 #. module: account_analytic_analysis
 #: field:account.analytic.account,fix_price_invoices:0
 msgid "Fixed Price"
-msgstr ""
+msgstr "Festpreis"
 
 #. module: account_analytic_analysis
 #: help:account.analytic.account,last_worked_date:0
@@ -557,12 +608,12 @@ msgstr ""
 #. module: account_analytic_analysis
 #: field:sale.config.settings,group_template_required:0
 msgid "Mandatory use of templates."
-msgstr ""
+msgstr "Zwingende Nutzung von Vorlagen"
 
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
 msgid "Contracts Having a Partner"
-msgstr ""
+msgstr "Verträge mit Kunden"
 
 #. module: account_analytic_analysis
 #: help:account.analytic.account,total_cost:0
@@ -577,7 +628,7 @@ msgstr ""
 #. module: account_analytic_analysis
 #: field:account.analytic.account,est_total:0
 msgid "Total Estimation"
-msgstr ""
+msgstr "Erwartete Gesamtabrechnung"
 
 #. module: account_analytic_analysis
 #: field:account.analytic.account,remaining_ca:0
@@ -605,16 +656,18 @@ msgstr "Gesamtzeit"
 msgid ""
 "the field template of the analytic accounts and contracts will be required."
 msgstr ""
+"ein Auswahl für die Projekt  Vorlage und Vertragseinstellungen sind "
+"erforderlich"
 
 #. module: account_analytic_analysis
 #: field:account.analytic.account,invoice_on_timesheets:0
 msgid "On Timesheets"
-msgstr ""
+msgstr "auf Stundenzettel"
 
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
 msgid "Total"
-msgstr ""
+msgstr "Gesamt"
 
 #~ msgid ""
 #~ "Number of hours that can be invoiced plus those that already have been "
diff --git a/addons/account_analytic_default/i18n/de.po b/addons/account_analytic_default/i18n/de.po
index fa4c27ef43f..c97598df0fe 100644
--- a/addons/account_analytic_default/i18n/de.po
+++ b/addons/account_analytic_default/i18n/de.po
@@ -7,31 +7,32 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2012-12-03 16:02+0000\n"
-"PO-Revision-Date: 2012-01-13 19:25+0000\n"
-"Last-Translator: Ferdinand @ Camptocamp <Unknown>\n"
+"PO-Revision-Date: 2012-12-06 22:26+0000\n"
+"Last-Translator: Thorsten Vocks (OpenBig.org) <thorsten.vocks@big-"
+"consulting.net>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:37+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-07 04:35+0000\n"
+"X-Generator: Launchpad (build 16341)\n"
 
 #. module: account_analytic_default
 #: model:ir.actions.act_window,name:account_analytic_default.analytic_rule_action_partner
 #: model:ir.actions.act_window,name:account_analytic_default.analytic_rule_action_product
 #: model:ir.actions.act_window,name:account_analytic_default.analytic_rule_action_user
 msgid "Analytic Rules"
-msgstr "Analytische Kontierungsrichtlinie"
+msgstr "Kostenstellen Kontierungsregeln"
 
 #. module: account_analytic_default
 #: view:account.analytic.default:0
 msgid "Group By..."
-msgstr "Gruppierung..."
+msgstr "Gruppierung ..."
 
 #. module: account_analytic_default
 #: help:account.analytic.default,date_stop:0
 msgid "Default end date for this Analytic Account."
-msgstr ""
+msgstr "Vorgabe für Ende Datum der Kostenstelle"
 
 #. module: account_analytic_default
 #: model:ir.model,name:account_analytic_default.model_stock_picking
@@ -50,6 +51,9 @@ msgid ""
 "default (e.g. create new customer invoice or Sale order if we select this "
 "partner, it will automatically take this as an analytic account)"
 msgstr ""
+"Wählen Sie einen Partner aus, der bereits eine spezifizierte Kostenstelle "
+"hat (z.B. durch neu definierte Ausgangsrechnung oder einen Verkaufsauftrag  "
+"bei einer Auswahl des  unterzuordnenden Partners)"
 
 #. module: account_analytic_default
 #: view:account.analytic.default:0
@@ -60,7 +64,7 @@ msgstr "Produkt"
 #. module: account_analytic_default
 #: model:ir.model,name:account_analytic_default.model_account_analytic_default
 msgid "Analytic Distribution"
-msgstr "Analytische Verrechnung"
+msgstr "Kostenstellen Distribution"
 
 #. module: account_analytic_default
 #: view:account.analytic.default:0
@@ -86,18 +90,21 @@ msgid ""
 "default (e.g. create new customer invoice or Sale order if we select this "
 "product, it will automatically take this as an analytic account)"
 msgstr ""
+"Wählen Sie ein Produkt mit hinterlegter Standard Kostenstelle (z.B. bei der "
+"Erstellung einer Ausgangsrechnung oder eines Angebots wird bei der Auswahl "
+"des Produkts eine automatische Erkennung der Kostenstelle gestartet)."
 
 #. module: account_analytic_default
 #: field:account.analytic.default,date_stop:0
 msgid "End Date"
-msgstr "Endedatum"
+msgstr "Ende Datum"
 
 #. module: account_analytic_default
 #: view:account.analytic.default:0
 #: model:ir.actions.act_window,name:account_analytic_default.action_analytic_default_list
 #: model:ir.ui.menu,name:account_analytic_default.menu_analytic_default_list
 msgid "Analytic Defaults"
-msgstr "Analytische Buchungsvorlage"
+msgstr "Kostenstellen Buchungsvorlage"
 
 #. module: account_analytic_default
 #: field:account.analytic.default,sequence:0
@@ -111,12 +118,16 @@ msgid ""
 "default (e.g. create new customer invoice or Sale order if we select this "
 "company, it will automatically take this as an analytic account)"
 msgstr ""
+"Wählen Sie ein Unternehmen mit hinterlegter Standard Kostenstelle (z.B. bei "
+"der Erstellung einer Ausgangsrechnung oder eines Angebots wird bei der "
+"Auswahl des Unternehmens eine automatische Erkennung der Kostenstelle "
+"gestartet)."
 
 #. module: account_analytic_default
 #: help:account.analytic.default,user_id:0
 msgid ""
 "Select a user which will use analytic account specified in analytic default."
-msgstr ""
+msgstr "Wählen Sie einen Benutzer mit der hinterlegten Standard Kostenstelle"
 
 #. module: account_analytic_default
 #: model:ir.model,name:account_analytic_default.model_account_invoice_line
@@ -127,17 +138,17 @@ msgstr "Rechnungszeile"
 #: view:account.analytic.default:0
 #: field:account.analytic.default,analytic_id:0
 msgid "Analytic Account"
-msgstr "Analytische Konten"
+msgstr "Kostenstelle"
 
 #. module: account_analytic_default
 #: help:account.analytic.default,date_start:0
 msgid "Default start date for this Analytic Account."
-msgstr ""
+msgstr "Standard Start Datum für Kostenstelle"
 
 #. module: account_analytic_default
 #: view:account.analytic.default:0
 msgid "Accounts"
-msgstr "Konten"
+msgstr "Kostenstellen"
 
 #. module: account_analytic_default
 #: view:account.analytic.default:0
@@ -154,9 +165,7 @@ msgstr "Start Datum"
 #: help:account.analytic.default,sequence:0
 msgid ""
 "Gives the sequence order when displaying a list of analytic distribution"
-msgstr ""
-"Zeigt eine Liste analytischer Konten, in der Reihenfolge wie von Ihnen "
-"festgelegt."
+msgstr "Zeigt eine Liste mit Kostenstellen"
 
 #. module: account_analytic_default
 #: model:ir.model,name:account_analytic_default.model_sale_order_line
diff --git a/addons/account_analytic_plans/i18n/de.po b/addons/account_analytic_plans/i18n/de.po
index 44a0658b311..20f5dd70abc 100644
--- a/addons/account_analytic_plans/i18n/de.po
+++ b/addons/account_analytic_plans/i18n/de.po
@@ -7,14 +7,15 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2012-12-03 16:02+0000\n"
-"PO-Revision-Date: 2012-10-12 23:19+0000\n"
-"Last-Translator: Ferdinand @ Camptocamp <Unknown>\n"
+"PO-Revision-Date: 2012-12-06 22:38+0000\n"
+"Last-Translator: Thorsten Vocks (OpenBig.org) <thorsten.vocks@big-"
+"consulting.net>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:34+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-07 04:35+0000\n"
+"X-Generator: Launchpad (build 16341)\n"
 
 #. module: account_analytic_plans
 #: field:account.analytic.plan.instance,account4_ids:0
@@ -48,7 +49,7 @@ msgstr "Anteil (%)"
 #: code:addons/account_analytic_plans/account_analytic_plans.py:234
 #, python-format
 msgid "The total should be between %s and %s."
-msgstr ""
+msgstr "Die Summe sollte zwischen %s und %s sein."
 
 #. module: account_analytic_plans
 #: view:account.analytic.plan:0
@@ -131,7 +132,7 @@ msgstr "Zeige keine leeren Zeilen"
 #: code:addons/account_analytic_plans/wizard/account_crossovered_analytic.py:61
 #, python-format
 msgid "There are no analytic lines related to account %s."
-msgstr ""
+msgstr "Es gibt keine Kostenstellen Buchungen für das Konto %s."
 
 #. module: account_analytic_plans
 #: field:account.analytic.plan.instance,account3_ids:0
@@ -142,7 +143,7 @@ msgstr "Konto3 ID"
 #: view:account.crossovered.analytic:0
 #: view:analytic.plan.create.model:0
 msgid "or"
-msgstr ""
+msgstr "oder"
 
 #. module: account_analytic_plans
 #: model:ir.model,name:account_analytic_plans.model_account_analytic_line
@@ -281,7 +282,7 @@ msgstr "Bankauszug Buchungen"
 #: code:addons/account_analytic_plans/wizard/analytic_plan_create_model.py:41
 #, python-format
 msgid "Error!"
-msgstr ""
+msgstr "Fehler !"
 
 #. module: account_analytic_plans
 #: report:account.analytic.account.crossovered.analytic:0
@@ -297,7 +298,7 @@ msgstr "Druck Kreuzanalyse"
 #: code:addons/account_analytic_plans/wizard/account_crossovered_analytic.py:61
 #, python-format
 msgid "User Error!"
-msgstr ""
+msgstr "Benutzerfehler !"
 
 #. module: account_analytic_plans
 #: field:account.analytic.plan.instance,account6_ids:0
@@ -316,6 +317,7 @@ msgstr "Analytisches Journal"
 #, python-format
 msgid "Please put a name and a code before saving the model."
 msgstr ""
+"Bitte tragen Sie eine Bezeichnung und ein Kürzel vor dem Speichern ein."
 
 #. module: account_analytic_plans
 #: report:account.analytic.account.crossovered.analytic:0
@@ -347,7 +349,7 @@ msgstr "Journal"
 #: code:addons/account_analytic_plans/account_analytic_plans.py:486
 #, python-format
 msgid "You have to define an analytic journal on the '%s' journal."
-msgstr ""
+msgstr "Sie müssen eine Kostenstelle für das Journal '%s' eintragen"
 
 #. module: account_analytic_plans
 #: code:addons/account_analytic_plans/account_analytic_plans.py:342
@@ -375,7 +377,7 @@ msgstr "Rechnungszeile"
 #: code:addons/account_analytic_plans/wizard/analytic_plan_create_model.py:41
 #, python-format
 msgid "There is no analytic plan defined."
-msgstr ""
+msgstr "Es existieren Kostenstellen und ein Plan"
 
 #. module: account_analytic_plans
 #: model:ir.model,name:account_analytic_plans.model_account_bank_statement
@@ -402,7 +404,7 @@ msgstr "Analytische Verrechnung"
 #: code:addons/account_analytic_plans/account_analytic_plans.py:221
 #, python-format
 msgid "A model with this name and code already exists."
-msgstr ""
+msgstr "Ein Modul mit ähnlichem Name und Kürzel existiert bereits."
 
 #. module: account_analytic_plans
 #: help:account.analytic.plan.line,root_analytic_id:0
diff --git a/addons/account_asset/i18n/de.po b/addons/account_asset/i18n/de.po
index 0fa2625a99e..d299ad86c07 100755
--- a/addons/account_asset/i18n/de.po
+++ b/addons/account_asset/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: 2012-12-03 16:02+0000\n"
-"PO-Revision-Date: 2012-05-10 17:36+0000\n"
-"Last-Translator: Ferdinand-camptocamp <Unknown>\n"
+"PO-Revision-Date: 2012-12-06 23:48+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: 2012-12-04 05:53+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-07 04:36+0000\n"
+"X-Generator: Launchpad (build 16341)\n"
 
 #. module: account_asset
 #: view:account.asset.asset:0
@@ -156,7 +157,7 @@ msgstr "Abschreibungs Datum"
 #. module: account_asset
 #: constraint:account.asset.asset:0
 msgid "Error ! You cannot create recursive assets."
-msgstr ""
+msgstr "Fehler ! Sie können keine rekursiven Anlagengegenstände definieren."
 
 #. module: account_asset
 #: field:asset.asset.report,posted_value:0
@@ -201,7 +202,7 @@ msgstr "# der Abschreibungsbuchungen"
 #. module: account_asset
 #: field:account.asset.asset,method_period:0
 msgid "Number of Months in a Period"
-msgstr ""
+msgstr "Anzahl Monate in Perioden"
 
 #. module: account_asset
 #: view:asset.asset.report:0
@@ -389,7 +390,7 @@ msgstr "Zeit Methode"
 #: view:asset.depreciation.confirmation.wizard:0
 #: view:asset.modify:0
 msgid "or"
-msgstr ""
+msgstr "oder"
 
 #. module: account_asset
 #: field:account.asset.asset,note:0
@@ -446,12 +447,17 @@ msgid ""
 "You can manually close an asset when the depreciation is over. If the last "
 "line of depreciation is posted, the asset automatically goes in that status."
 msgstr ""
+"Wenn eine Anlage angelegt wird, ist der Status \"Entwurf\". Nach Bestätigung "
+"der Anlage wird dies aktiv und Abschreibungen können verbucht werden. Sie "
+"können die Anlage automatisch schließen, wenn die Abschreibungen vorbei "
+"sind.  Nach Verbuchung der letzen Abschreibung wird die Anlage automatisch "
+"geschlossen."
 
 #. module: account_asset
 #: field:account.asset.asset,state:0
 #: field:asset.asset.report,state:0
 msgid "Status"
-msgstr ""
+msgstr "Status"
 
 #. module: account_asset
 #: field:account.asset.asset,partner_id:0
@@ -498,7 +504,7 @@ msgstr "Berechnen"
 #. module: account_asset
 #: view:account.asset.history:0
 msgid "Asset History"
-msgstr ""
+msgstr "Historie Anlagegegüter"
 
 #. module: account_asset
 #: field:asset.asset.report,name:0
@@ -619,7 +625,7 @@ msgstr "Abzuschreibender Betrag"
 #. module: account_asset
 #: field:account.asset.asset,name:0
 msgid "Asset Name"
-msgstr ""
+msgstr "Anlagegut Bezeichnung"
 
 #. module: account_asset
 #: field:account.asset.category,open_asset:0
@@ -670,11 +676,16 @@ msgid ""
 "          </p>\n"
 "        "
 msgstr ""
+"Über diesen Report erhalten Sie einen Überblick über alle Abschreibungen. "
+"Die Suche kann auch zur \n"
+"individuellen und persönlichen Auswertung über das Anlagevermögen benutzt "
+"werden.\n"
+"        "
 
 #. module: account_asset
 #: field:account.asset.asset,purchase_value:0
 msgid "Gross Value"
-msgstr ""
+msgstr "Brutto Erlös"
 
 #. module: account_asset
 #: field:account.asset.category,name:0
diff --git a/addons/account_bank_statement_extensions/i18n/de.po b/addons/account_bank_statement_extensions/i18n/de.po
index 53fda3a1501..f6bc79de2b7 100644
--- a/addons/account_bank_statement_extensions/i18n/de.po
+++ b/addons/account_bank_statement_extensions/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: 2012-12-03 16:02+0000\n"
-"PO-Revision-Date: 2012-02-09 15:02+0000\n"
-"Last-Translator: Ferdinand @ Camptocamp <Unknown>\n"
+"PO-Revision-Date: 2012-12-06 23:53+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: 2012-12-04 05:54+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-07 04:36+0000\n"
+"X-Generator: Launchpad (build 16341)\n"
 
 #. module: account_bank_statement_extensions
 #: view:account.bank.statement.line:0
@@ -59,7 +60,7 @@ msgstr "Storniere ausgewählte Buchungszeilen"
 #. module: account_bank_statement_extensions
 #: field:account.bank.statement.line,val_date:0
 msgid "Value Date"
-msgstr ""
+msgstr "Datum Wertstellung"
 
 #. module: account_bank_statement_extensions
 #: view:account.bank.statement.line:0
@@ -104,7 +105,7 @@ msgstr "Batch Zahlungs Info"
 #. module: account_bank_statement_extensions
 #: field:account.bank.statement.line,state:0
 msgid "Status"
-msgstr ""
+msgstr "Status"
 
 #. module: account_bank_statement_extensions
 #: code:addons/account_bank_statement_extensions/account_bank_statement.py:129
@@ -113,11 +114,13 @@ msgid ""
 "Delete operation not allowed.             Please go to the associated bank "
 "statement in order to delete and/or modify bank statement line."
 msgstr ""
+"Lösche Operation ist nicht erlaubt. Bitte wechseln Sie zum angebundenen "
+"Bankauszug Beleg, um dort die Zahlungsvorschläge zu  beurteilen."
 
 #. module: account_bank_statement_extensions
 #: view:confirm.statement.line:0
 msgid "or"
-msgstr ""
+msgstr "oder"
 
 #. module: account_bank_statement_extensions
 #: view:confirm.statement.line:0
@@ -219,7 +222,7 @@ msgstr "Manuell"
 #. module: account_bank_statement_extensions
 #: view:account.bank.statement.line:0
 msgid "Bank Transaction"
-msgstr ""
+msgstr "Bank Auszug"
 
 #. module: account_bank_statement_extensions
 #: view:account.bank.statement.line:0
@@ -326,7 +329,7 @@ msgstr "Buchungszeilen"
 #: code:addons/account_bank_statement_extensions/account_bank_statement.py:129
 #, python-format
 msgid "Warning!"
-msgstr ""
+msgstr "Warnung !"
 
 #. module: account_bank_statement_extensions
 #: view:account.bank.statement.line.global:0
diff --git a/addons/account_budget/i18n/nl.po b/addons/account_budget/i18n/nl.po
index fd4ab89ce0f..72995709663 100644
--- a/addons/account_budget/i18n/nl.po
+++ b/addons/account_budget/i18n/nl.po
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2012-12-03 16:02+0000\n"
-"PO-Revision-Date: 2012-11-25 20:59+0000\n"
+"PO-Revision-Date: 2012-12-06 11:57+0000\n"
 "Last-Translator: Erwin van der Ploeg (Endian Solutions) <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: 2012-12-04 05:42+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-07 04:36+0000\n"
+"X-Generator: Launchpad (build 16341)\n"
 
 #. module: account_budget
 #: view:account.budget.analytic:0
@@ -367,6 +367,27 @@ msgid ""
 "              </p>\n"
 "            "
 msgstr ""
+"<p>\n"
+"                Een budget is een prognose van uw bedrijfs inkomsten en "
+"uitgaven,\n"
+"                welke wordt verwacht in een bepaalde periode in de toekomst. "
+"Een budget\n"
+"                wordt gedefinieerd op grootboekrekeningen en/of "
+"kostenplaatsen (welke \n"
+"                projecten, afdelingen, productcategorieën, etc. "
+"vertegenwoordigen)\n"
+"              </p><p>\n"
+"                Door deze geldstromen bij te houden is het waarschijnlijk, "
+"dat u niet\n"
+"                te veel uitgeeft en u een grotere kans heeft u financieel "
+"doelen te\n"
+"                realiseren. Definieer een budget door de verwachte opbrengst "
+"in\n"
+"                te geven per kostenplaats en volg de voortgang, gebaseerd op "
+"werkelijke\n"
+"                gerealiseerde gegevens, gedurende die periode.\n"
+"              </p>\n"
+"            "
 
 #. module: account_budget
 #: report:account.budget:0
diff --git a/addons/base_gengo/i18n/nb.po b/addons/base_gengo/i18n/nb.po
new file mode 100644
index 00000000000..935f150894c
--- /dev/null
+++ b/addons/base_gengo/i18n/nb.po
@@ -0,0 +1,256 @@
+# Norwegian Bokmal translation for openobject-addons
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"PO-Revision-Date: 2012-12-06 10:25+0000\n"
+"Last-Translator: Kaare Pettersen <Unknown>\n"
+"Language-Team: Norwegian Bokmal <nb@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2012-12-07 04:36+0000\n"
+"X-Generator: Launchpad (build 16341)\n"
+
+#. module: base_gengo
+#: view:res.company:0
+msgid "Comments for Translator"
+msgstr "Kommentarer til oversetter."
+
+#. module: base_gengo
+#: field:ir.translation,job_id:0
+msgid "Gengo Job ID"
+msgstr "Gengo jobb ID."
+
+#. module: base_gengo
+#: code:addons/base_gengo/wizard/base_gengo_translations.py:114
+#, python-format
+msgid "This language is not supported by the Gengo translation services."
+msgstr "Dette språket er ikke støttet av Gengo oversettings tjenester."
+
+#. module: base_gengo
+#: field:res.company,gengo_comment:0
+msgid "Comments"
+msgstr "Kommentarer."
+
+#. module: base_gengo
+#: field:res.company,gengo_private_key:0
+msgid "Gengo Private Key"
+msgstr "Gengo privat nøkkel."
+
+#. module: base_gengo
+#: model:ir.model,name:base_gengo.model_base_gengo_translations
+msgid "base.gengo.translations"
+msgstr "Base.Gengo.Oversettelser."
+
+#. module: base_gengo
+#: help:res.company,gengo_auto_approve:0
+msgid "Jobs are Automatically Approved by Gengo."
+msgstr "Jobber godkjennes automatisk ved Gengo."
+
+#. module: base_gengo
+#: field:base.gengo.translations,lang_id:0
+msgid "Language"
+msgstr "Språk."
+
+#. module: base_gengo
+#: field:ir.translation,gengo_comment:0
+msgid "Comments & Activity Linked to Gengo"
+msgstr "Kommentarer og aktivitet knyttet til Gengo."
+
+#. module: base_gengo
+#: code:addons/base_gengo/wizard/base_gengo_translations.py:124
+#, python-format
+msgid "Gengo Sync Translation (Response)"
+msgstr ""
+
+#. module: base_gengo
+#: code:addons/base_gengo/wizard/base_gengo_translations.py:72
+#, python-format
+msgid ""
+"Gengo `Public Key` or `Private Key` are missing. Enter your Gengo "
+"authentication parameters under `Settings > Companies > Gengo Parameters`."
+msgstr ""
+
+#. module: base_gengo
+#: selection:ir.translation,gengo_translation:0
+msgid "Translation By Machine"
+msgstr "Oversetting av maskin."
+
+#. module: base_gengo
+#: code:addons/base_gengo/wizard/base_gengo_translations.py:155
+#, python-format
+msgid ""
+"%s\n"
+"\n"
+"--\n"
+" Commented on %s by %s."
+msgstr ""
+"%s\n"
+"\n"
+"--\n"
+"Kommentarer på %s by %s."
+
+#. module: base_gengo
+#: field:ir.translation,gengo_translation:0
+msgid "Gengo Translation Service Level"
+msgstr "Gengo Oversettelse tjeneste nivå."
+
+#. module: base_gengo
+#: constraint:ir.translation:0
+msgid ""
+"The Gengo translation service selected is not supported for this language."
+msgstr ""
+"Den Gengo oversettelses tjeneste som er valgt støttes ikke for dette språket."
+
+#. module: base_gengo
+#: selection:ir.translation,gengo_translation:0
+msgid "Standard"
+msgstr "Standard"
+
+#. module: base_gengo
+#: help:ir.translation,gengo_translation:0
+msgid ""
+"You can select here the service level you want for an automatic translation "
+"using Gengo."
+msgstr ""
+"Du kan velge her tjenestenivået du ønsker for en automatisk oversettelse ved "
+"hjelp av Gengo."
+
+#. module: base_gengo
+#: field:base.gengo.translations,restart_send_job:0
+msgid "Restart Sending Job"
+msgstr ""
+
+#. module: base_gengo
+#: view:ir.translation:0
+msgid "To Approve In Gengo"
+msgstr "Slik godkjenner du I Gengo."
+
+#. module: base_gengo
+#: view:res.company:0
+msgid "Private Key"
+msgstr "Privat nøkkel."
+
+#. module: base_gengo
+#: view:res.company:0
+msgid "Public Key"
+msgstr "Offentlig nøkkel."
+
+#. module: base_gengo
+#: field:res.company,gengo_public_key:0
+msgid "Gengo Public Key"
+msgstr "Gengo offentlig nøkkel."
+
+#. module: base_gengo
+#: code:addons/base_gengo/wizard/base_gengo_translations.py:123
+#, python-format
+msgid "Gengo Sync Translation (Request)"
+msgstr "Gengo synkronisering oversettelse (Forespørsel)"
+
+#. module: base_gengo
+#: view:ir.translation:0
+msgid "Translations"
+msgstr "Oversettelser."
+
+#. module: base_gengo
+#: field:res.company,gengo_auto_approve:0
+msgid "Auto Approve Translation ?"
+msgstr "Automatisk godkjenning oversettelse."
+
+#. module: base_gengo
+#: model:ir.actions.act_window,name:base_gengo.action_wizard_base_gengo_translations
+#: model:ir.ui.menu,name:base_gengo.menu_action_wizard_base_gengo_translations
+msgid "Gengo: Manual Request of Translation"
+msgstr "Gengo: Manuell forespørsel av oversetting."
+
+#. module: base_gengo
+#: code:addons/base_gengo/ir_translation.py:62
+#: code:addons/base_gengo/wizard/base_gengo_translations.py:109
+#, python-format
+msgid "Gengo Authentication Error"
+msgstr ""
+
+#. module: base_gengo
+#: model:ir.model,name:base_gengo.model_res_company
+msgid "Companies"
+msgstr "Firmaer."
+
+#. module: base_gengo
+#: view:ir.translation:0
+msgid ""
+"Note: If the translation state is 'In Progress', it means that the "
+"translation has to be approved to be uploaded in this system. You are "
+"supposed to do that directly by using your Gengo Account"
+msgstr ""
+
+#. module: base_gengo
+#: code:addons/base_gengo/wizard/base_gengo_translations.py:82
+#, python-format
+msgid ""
+"Gengo connection failed with this message:\n"
+"``%s``"
+msgstr ""
+
+#. module: base_gengo
+#: view:res.company:0
+msgid "Gengo Parameters"
+msgstr ""
+
+#. module: base_gengo
+#: view:base.gengo.translations:0
+msgid "Send"
+msgstr "Send."
+
+#. module: base_gengo
+#: selection:ir.translation,gengo_translation:0
+msgid "Ultra"
+msgstr "Ultra."
+
+#. module: base_gengo
+#: model:ir.model,name:base_gengo.model_ir_translation
+msgid "ir.translation"
+msgstr "Ir.Oversettelse."
+
+#. module: base_gengo
+#: view:ir.translation:0
+msgid "Gengo Translation Service"
+msgstr "Gengo oversettelse tjeneste."
+
+#. module: base_gengo
+#: selection:ir.translation,gengo_translation:0
+msgid "Pro"
+msgstr "Profesjonell."
+
+#. module: base_gengo
+#: view:base.gengo.translations:0
+msgid "Gengo Request Form"
+msgstr "Gengo forespørsel form."
+
+#. module: base_gengo
+#: code:addons/base_gengo/wizard/base_gengo_translations.py:114
+#, python-format
+msgid "Warning"
+msgstr "Advarsel."
+
+#. module: base_gengo
+#: help:res.company,gengo_comment:0
+msgid ""
+"This comment will be automatically be enclosed in each an every request sent "
+"to Gengo"
+msgstr ""
+
+#. module: base_gengo
+#: view:base.gengo.translations:0
+msgid "Cancel"
+msgstr "Avbryt."
+
+#. module: base_gengo
+#: view:base.gengo.translations:0
+msgid "or"
+msgstr "Eller."
diff --git a/addons/crm/i18n/pt_BR.po b/addons/crm/i18n/pt_BR.po
index 66f0b5c3767..877d87a19a5 100644
--- a/addons/crm/i18n/pt_BR.po
+++ b/addons/crm/i18n/pt_BR.po
@@ -7,20 +7,19 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: renato.lima@akretion.com\n"
 "POT-Creation-Date: 2012-12-03 16:01+0000\n"
-"PO-Revision-Date: 2012-07-28 18:57+0000\n"
-"Last-Translator: Fábio Martinelli - http://zupy.com.br "
-"<webmaster@guaru.net>\n"
+"PO-Revision-Date: 2012-12-06 16:43+0000\n"
+"Last-Translator: Cristiano Korndörfer <codigo.aberto@dorfer.com.br>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:18+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-07 04:34+0000\n"
+"X-Generator: Launchpad (build 16341)\n"
 
 #. module: crm
 #: view:crm.lead.report:0
 msgid "# Leads"
-msgstr "Nº Prospecções"
+msgstr "Nº de Prospectos"
 
 #. module: crm
 #: help:sale.config.settings,fetchmail_lead:0
@@ -28,6 +27,8 @@ msgid ""
 "Allows you to configure your incoming mail server, and create leads from "
 "incoming emails."
 msgstr ""
+"Permite configurar seu servidor de recebimento de mensagens, e criar "
+"prospectos para e-mails recebidos."
 
 #. module: crm
 #: selection:crm.case.stage,type:0
@@ -36,12 +37,12 @@ msgstr ""
 #: view:crm.lead.report:0
 #: selection:crm.lead.report,type:0
 msgid "Lead"
-msgstr "Prospecção"
+msgstr "Prospecto"
 
 #. module: crm
 #: field:crm.lead,title:0
 msgid "Title"
-msgstr "Título"
+msgstr "Tratamento"
 
 #. module: crm
 #: field:crm.lead2partner,action:0
@@ -58,29 +59,31 @@ msgid ""
 "Phonecall linked to the opportunity <em>%s</em> has been <b>created</b> and "
 "<b>scheduled</b> on <em>%s</em>."
 msgstr ""
+"Chamada Telefônica relacionada à oportunidade <em>%s</em> foi <b>criada</b> "
+"e <b>agendada</b> em <em>%s</em>."
 
 #. module: crm
 #: model:res.groups,name:crm.group_fund_raising
 #: field:sale.config.settings,group_fund_raising:0
 msgid "Manage Fund Raising"
-msgstr ""
+msgstr "Gerenciar Captação de Recursos"
 
 #. module: crm
 #: view:crm.lead2opportunity.partner.mass:0
 msgid "Convert to Opportunities"
-msgstr ""
+msgstr "Converter para Oportunidades"
 
 #. module: crm
 #: view:crm.lead.report:0
 #: field:crm.phonecall.report,delay_close:0
 msgid "Delay to close"
-msgstr "Adiar o fechamento"
+msgstr "Espera para concluir"
 
 #. module: crm
 #: code:addons/crm/crm_lead.py:888
 #, python-format
 msgid "Lead has been <b>converted to an opportunity</b>."
-msgstr ""
+msgstr "Prospecto foi <b>convertido para uma oportunidade</b>."
 
 #. module: crm
 #: view:crm.lead:0
@@ -88,7 +91,7 @@ msgstr ""
 #: view:crm.lead.report:0
 #: view:crm.phonecall.report:0
 msgid "Salesperson"
-msgstr ""
+msgstr "Vendedor"
 
 #. module: crm
 #: model:ir.model,name:crm.model_crm_lead_report
@@ -98,7 +101,7 @@ msgstr "Análise das Prospecções do CRM"
 #. module: crm
 #: model:ir.actions.server,subject:crm.action_email_reminder_customer_lead
 msgid "Reminder on Lead: [[object.id ]]"
-msgstr ""
+msgstr "Lembrete no Prospecto: [[object.id ]]"
 
 #. module: crm
 #: view:crm.lead.report:0
@@ -110,18 +113,18 @@ msgstr "Dia"
 #. module: crm
 #: view:crm.lead:0
 msgid "Company Name"
-msgstr ""
+msgstr "Nome da Empresa"
 
 #. module: crm
 #: model:crm.case.categ,name:crm.categ_oppor6
 msgid "Training"
-msgstr ""
+msgstr "Treinamento"
 
 #. module: crm
 #: model:ir.actions.act_window,name:crm.crm_lead_categ_action
 #: model:ir.ui.menu,name:crm.menu_crm_lead_categ
 msgid "Sales Tags"
-msgstr ""
+msgstr "Marcadores de Vendas"
 
 #. module: crm
 #: view:crm.lead.report:0
@@ -133,7 +136,7 @@ msgstr "Exp. Fechamento"
 #: help:crm.lead,message_unread:0
 #: help:crm.phonecall,message_unread:0
 msgid "If checked new messages require your attention."
-msgstr ""
+msgstr "Se marcado novas mensagens requerem sua atenção"
 
 #. module: crm
 #: help:crm.lead.report,creation_day:0
@@ -173,6 +176,9 @@ msgid ""
 "Holds the Chatter summary (number of messages, ...). This summary is "
 "directly in html format in order to be inserted in kanban views."
 msgstr ""
+"Contém o resumo da conversação (número de mensagens, ...). Este resumo é "
+"gerado diretamente em formato HTML para que possa ser inserido nas visões "
+"kanban."
 
 #. module: crm
 #: code:addons/crm/crm_lead.py:552
@@ -212,17 +218,17 @@ msgstr "Ligação Telefônica"
 #. module: crm
 #: field:crm.lead,opt_out:0
 msgid "Opt-Out"
-msgstr "Opt-Out"
+msgstr "Desistência"
 
 #. module: crm
 #: field:crm.case.stage,fold:0
 msgid "Hide in Views when Empty"
-msgstr ""
+msgstr "Oculto em Visões se Vazio"
 
 #. module: crm
 #: model:ir.actions.server,name:crm.action_email_reminder_lead
 msgid "Reminder to User"
-msgstr ""
+msgstr "Lembrete para Usuário"
 
 #. module: crm
 #: field:crm.segmentation,segmentation_line:0
@@ -244,13 +250,13 @@ msgstr "Sessões"
 #: model:ir.actions.act_window,name:crm.action_report_crm_lead
 #: model:ir.ui.menu,name:crm.menu_report_crm_leads_tree
 msgid "Leads Analysis"
-msgstr "Analisar Prospecções"
+msgstr "Análise de Prospecções"
 
 #. module: crm
 #: code:addons/crm/crm_lead.py:878
 #, python-format
 msgid "<b>%s a call</b> for the <em>%s</em>."
-msgstr ""
+msgstr "<b>%s realizou uma chamada</b> para <em>%s</em>."
 
 #. module: crm
 #: model:ir.actions.act_window,name:crm.crm_case_resource_type_act
@@ -281,13 +287,13 @@ msgid ""
 "If opt-out is checked, this contact has refused to receive emails or "
 "unsubscribed to a campaign."
 msgstr ""
-"If opt-out é marcado, este contato será recusado para receber emails ou "
-"inscrições para uma campanha."
+"Se desistência é marcado, este contato recusou receber e-mails ou inscrições "
+"para uma campanha."
 
 #. module: crm
 #: model:process.transition,name:crm.process_transition_leadpartner0
 msgid "Prospect Partner"
-msgstr "Prospectar Parceiro"
+msgstr "Parceiro de Prospecção"
 
 #. module: crm
 #: code:addons/crm/crm_lead.py:811
@@ -322,6 +328,16 @@ msgid ""
 "              </p>\n"
 "            "
 msgstr ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Clique para definir uma nova segmentação de cliente.\n"
+"              </p><p>\n"
+"                Crie categorias específicas que você pode atribuir a seus\n"
+"                contatos para melhor gerenciar suas interações com eles. A\n"
+"                ferramenta de segmentação pode atribuir categorias a "
+"contatos\n"
+"                de acordo com os critérios que você definir.\n"
+"              </p>\n"
+"            "
 
 #. module: crm
 #: field:crm.opportunity2phonecall,contact_name:0
@@ -335,6 +351,7 @@ msgstr "Contato"
 msgid ""
 "When escalating to this team override the salesman with the team leader."
 msgstr ""
+"Se escalar para esta equipe o vendedor será sobrescrito pelo líder da equipe."
 
 #. module: crm
 #: model:process.transition,name:crm.process_transition_opportunitymeeting0
@@ -350,12 +367,12 @@ msgstr "Número de Dias para concluir o caso"
 #. module: crm
 #: model:process.node,note:crm.process_node_opportunities0
 msgid "When a real project/opportunity is detected"
-msgstr "Quando um projeto/oportunidade é detectada"
+msgstr "Quando um projeto/oportunidade real é detectado"
 
 #. module: crm
 #: field:res.partner,opportunity_ids:0
 msgid "Leads and Opportunities"
-msgstr "Prospecções e Oportunidades"
+msgstr "Prospectos e Oportunidades"
 
 #. module: crm
 #: model:ir.actions.act_window,help:crm.relate_partner_opportunities
@@ -374,11 +391,27 @@ msgid ""
 "              </p>\n"
 "            "
 msgstr ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Clique para criar uma oportunidade relacionada a este "
+"cliente.\n"
+"              </p><p>\n"
+"                Utilize oportunidades para monitorar suas vendas, "
+"acompanhando\n"
+"                vendas em potencial e prevendo melhor seus lucros futuros.\n"
+"              </p><p>\n"
+"                Você poderá planejar encontros e chamadas telefônicas a "
+"partir\n"
+"                destas oportunidades, convertendo as mesmas em cotações, "
+"anexando\n"
+"                documentos relacionados, rastreando todas as discussões e "
+"muito mais.\n"
+"              </p>\n"
+"            "
 
 #. module: crm
 #: model:crm.case.stage,name:crm.stage_lead7
 msgid "Dead"
-msgstr ""
+msgstr "Morta"
 
 #. module: crm
 #: field:crm.case.section,message_unread:0
@@ -386,7 +419,7 @@ msgstr ""
 #: field:crm.lead,message_unread:0
 #: field:crm.phonecall,message_unread:0
 msgid "Unread Messages"
-msgstr ""
+msgstr "Mensagens Não Lidas"
 
 #. module: crm
 #: selection:crm.lead2opportunity.partner,action:0
@@ -394,7 +427,7 @@ msgstr ""
 #: selection:crm.lead2partner,action:0
 #: selection:crm.phonecall2partner,action:0
 msgid "Link to an existing customer"
-msgstr ""
+msgstr "Conectar a um cliente existente"
 
 #. module: crm
 #: field:crm.lead,write_date:0
@@ -404,7 +437,7 @@ msgstr "Data de Atualização"
 #. module: crm
 #: field:crm.case.section,user_id:0
 msgid "Team Leader"
-msgstr "Líder do time"
+msgstr "Lider da Equipe"
 
 #. module: crm
 #: help:crm.case.stage,probability:0
@@ -412,7 +445,7 @@ msgid ""
 "This percentage depicts the default/average probability of the Case for this "
 "stage to be a success"
 msgstr ""
-"Esse percentual representa a probabilidade média padrão do caso, para que "
+"Esse percentual representa a probabilidade média/padrão do caso, para que "
 "este estágio seja um sucesso."
 
 #. module: crm
@@ -435,12 +468,14 @@ msgstr "Nº de Oportunidades"
 #: view:crm.lead:0
 msgid "Leads that are assigned to one of the sale teams I manage, or to me"
 msgstr ""
+"Prospectos que foram atribuídos a alguém das equipes de vendas que eu "
+"gerencio, ou para mim."
 
 #. module: crm
 #: field:crm.lead2opportunity.partner,name:0
 #: field:crm.lead2opportunity.partner.mass,name:0
 msgid "Conversion Action"
-msgstr ""
+msgstr "Ação de Conversão"
 
 #. module: crm
 #: model:ir.actions.act_window,help:crm.crm_case_section_act
@@ -454,6 +489,16 @@ msgid ""
 "              </p>\n"
 "            "
 msgstr ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Clique para definir uma nova equipe de vendas.\n"
+"              </p><p>\n"
+"                Utilize as equipes de vendas para organizar os vendedores "
+"ou\n"
+"                departmentos em equipes separadas. Cada equipe irá "
+"trabalhar\n"
+"                em sua própria lista de oportunidades.\n"
+"              </p>\n"
+"            "
 
 #. module: crm
 #: model:process.transition,note:crm.process_transition_opportunitymeeting0
@@ -501,7 +546,7 @@ msgstr "Mala Direta"
 #. module: crm
 #: view:crm.phonecall:0
 msgid "To Do"
-msgstr "Tarefa"
+msgstr "A Fazer"
 
 #. module: crm
 #: selection:crm.lead.report,creation_month:0
@@ -523,7 +568,7 @@ msgstr "Receita Planejada"
 #. module: crm
 #: model:ir.actions.server,name:crm.actions_server_crm_phonecall_read
 msgid "CRM Phonecall: Mark read"
-msgstr ""
+msgstr "Chamada Telefônica: Marcar como Lida"
 
 #. module: crm
 #: selection:crm.lead.report,creation_month:0
@@ -535,7 +580,7 @@ msgstr "Outubro"
 #. module: crm
 #: view:crm.segmentation:0
 msgid "Included Answers :"
-msgstr "Respostas incluídas :"
+msgstr "Respostas Incluídas :"
 
 #. module: crm
 #: help:crm.phonecall,state:0
@@ -546,6 +591,10 @@ msgid ""
 "                       If the call needs to be done then the status is set "
 "to 'Not Held'."
 msgstr ""
+"A situação é definida como 'A Fazer' quando o caso é criado. Se o caso está "
+"em progresso, a situação é definida como 'Aberto'. Quando a chamada acaba, a "
+"situação é definida como 'Realizada'. Se uma chamada deve ser feita, então a "
+"situação é definida como 'Não Realizada'."
 
 #. module: crm
 #: field:crm.case.section,message_summary:0
@@ -557,12 +606,12 @@ msgstr "Resumo"
 #. module: crm
 #: view:crm.merge.opportunity:0
 msgid "Merge"
-msgstr ""
+msgstr "Mesclar"
 
 #. module: crm
 #: view:crm.case.categ:0
 msgid "Case Category"
-msgstr "Categoria dos Casos"
+msgstr "Categoria do Caso"
 
 #. module: crm
 #: field:crm.lead,partner_address_name:0
@@ -572,7 +621,7 @@ msgstr "Nome de Contato do Parceiro"
 #. module: crm
 #: model:ir.actions.server,name:crm.actions_server_crm_phonecall_unread
 msgid "CRM Phonecall: Mark unread"
-msgstr ""
+msgstr "Chamada Telefônica: Marcar como Não Lida"
 
 #. module: crm
 #: model:ir.actions.server,subject:crm.action_email_reminder_lead
@@ -580,16 +629,18 @@ msgid ""
 "Reminder on Lead: [[object.id ]] [[object.partner_id and 'of ' "
 "+object.partner_id.name or '']]"
 msgstr ""
+"Lembrete no Prospecto: [[object.id ]] [[object.partner_id and 'of ' "
+"+object.partner_id.name or '']]"
 
 #. module: crm
 #: view:crm.segmentation:0
 msgid "Profiling Options"
-msgstr "Filtrando Opções"
+msgstr "Opções de Categorização"
 
 #. module: crm
 #: view:crm.phonecall.report:0
 msgid "#Phone calls"
-msgstr "#Ligações Telefônicas"
+msgstr "Nº de Chamadas Telefônicas"
 
 #. module: crm
 #: sql_constraint:crm.case.section:0
@@ -615,6 +666,14 @@ msgid ""
 "          </p>\n"
 "        "
 msgstr ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"            Clique para adicionar uma nova categoria.\n"
+"          </p><p>\n"
+"            Crie categorias específicas para chamadas telefônicas para "
+"melhor classificar os\n"
+"            tipode de chamada monitorados pelo sistema.\n"
+"          </p>\n"
+"        "
 
 #. module: crm
 #: help:crm.case.section,reply_to:0
@@ -622,8 +681,8 @@ msgid ""
 "The email address put in the 'Reply-To' of all emails sent by OpenERP about "
 "cases in this sales team"
 msgstr ""
-"O endereço de email colocado em 'Responder para' de todos os emails enviados "
-"pelo OpenERP sobre casos na equipe de vendas"
+"O endereço de e-mail colocado em 'Responder para' de todos os e-mails "
+"enviados pelo OpenERP sobre casos desta equipe de vendas"
 
 #. module: crm
 #: field:crm.lead.report,creation_month:0
@@ -634,12 +693,12 @@ msgstr "Mês de Criação"
 #: field:crm.case.section,resource_calendar_id:0
 #: model:ir.ui.menu,name:crm.menu_action_resource_calendar_form
 msgid "Working Time"
-msgstr "Tempo de Trabalho"
+msgstr "Tempo Trabalhado"
 
 #. module: crm
 #: view:crm.segmentation.line:0
 msgid "Partner Segmentation Lines"
-msgstr "Linhas da segmentação de Parceiro"
+msgstr "Linhas de Segmentação do Parceiro"
 
 #. module: crm
 #: model:ir.actions.act_window,name:crm.action_report_crm_phonecall
@@ -676,22 +735,22 @@ msgstr "Mês de criação"
 #. module: crm
 #: help:crm.segmentation,name:0
 msgid "The name of the segmentation."
-msgstr "O nome da seguimentação."
+msgstr "O nome da segmentação."
 
 #. module: crm
 #: model:ir.filters,name:crm.filter_usa_lead
 msgid "Leads from USA"
-msgstr ""
+msgstr "Prospectos dos USA"
 
 #. module: crm
 #: sql_constraint:crm.lead:0
 msgid "The probability of closing the deal should be between 0% and 100%!"
-msgstr ""
+msgstr "A probabilidade de fechamento do acordo deve ser entre 0% e 100%!"
 
 #. module: crm
 #: view:crm.lead:0
 msgid "Leads Generation"
-msgstr "Geração de Propecções"
+msgstr "Geração de Propectos"
 
 #. module: crm
 #: view:board.board:0
@@ -702,7 +761,7 @@ msgstr "Painel de Estatísticas"
 #: code:addons/crm/crm_lead.py:853
 #, python-format
 msgid "Stage changed to <b>%s</b>."
-msgstr ""
+msgstr "Estágio alterado para <b>%s</b>."
 
 #. module: crm
 #: code:addons/crm/crm_lead.py:755
@@ -722,7 +781,7 @@ msgstr "Oportunidade"
 #: code:addons/crm/crm_meeting.py:62
 #, python-format
 msgid "A meeting has been <b>scheduled</b> on <em>%s</em>."
-msgstr ""
+msgstr "Uma reunião foi <b>agendada</b> em <em>%s</em>."
 
 #. module: crm
 #: model:crm.case.resource.type,name:crm.type_lead7
@@ -732,12 +791,12 @@ msgstr "Televisão"
 #. module: crm
 #: model:ir.actions.act_window,name:crm.action_crm_send_mass_convert
 msgid "Convert to opportunities"
-msgstr ""
+msgstr "Converter para oportunidades"
 
 #. module: crm
 #: model:ir.model,name:crm.model_sale_config_settings
 msgid "sale.config.settings"
-msgstr ""
+msgstr "sale.config.settings"
 
 #. module: crm
 #: view:crm.segmentation:0
@@ -747,18 +806,20 @@ msgstr "Parar Processo"
 #. module: crm
 #: field:crm.case.section,alias_id:0
 msgid "Alias"
-msgstr ""
+msgstr "Apelido"
 
 #. module: crm
 #: view:crm.phonecall:0
 msgid "Search Phonecalls"
-msgstr "Procurar Ligação"
+msgstr "Pesquisar Chamadas Telefônicas"
 
 #. module: crm
 #: view:crm.lead.report:0
 msgid ""
 "Leads/Opportunities that are assigned to one of the sale teams I manage"
 msgstr ""
+"Prospectos/Oportunidades que foram atribuídos a alguém das equipes de vendas "
+"que eu gerencio"
 
 #. module: crm
 #: field:crm.partner2opportunity,name:0
@@ -769,7 +830,7 @@ msgstr "Nome da Oportunidade"
 #. module: crm
 #: field:base.action.rule,act_section_id:0
 msgid "Set Team to"
-msgstr "Definir Time para"
+msgstr "Definir Equipe para"
 
 #. module: crm
 #: field:calendar.attendee,categ_id:0
@@ -803,7 +864,7 @@ msgstr "Ano de Criação"
 #: view:crm.phonecall2partner:0
 #: view:crm.phonecall2phonecall:0
 msgid "or"
-msgstr ""
+msgstr "ou"
 
 #. module: crm
 #: field:crm.lead.report,create_date:0
@@ -814,7 +875,7 @@ msgstr "Data de Criação"
 #. module: crm
 #: field:crm.lead,ref2:0
 msgid "Reference 2"
-msgstr "2 Referência"
+msgstr "Referência 2"
 
 #. module: crm
 #: help:crm.case.stage,section_ids:0
@@ -822,6 +883,8 @@ msgid ""
 "Link between stages and sales teams. When set, this limitate the current "
 "stage to the selected sales teams."
 msgstr ""
+"Conexão entre estágios e equipes de vendas. Quando definido, ele limita o "
+"estágio atual às equipes de vendas selecionadas."
 
 #. module: crm
 #: model:ir.actions.server,message:crm.action_email_reminder_lead
@@ -837,6 +900,16 @@ msgid ""
 "Thanks,\n"
 "            "
 msgstr ""
+"Olá [[object.user_id.name]], \n"
+"você pode verificar o seguinte prospecto, ele não está aberto a 5 dias ?\n"
+"\n"
+"Prospecto: [[object.id ]]\n"
+"Descrição:\n"
+"\n"
+"    [[object.description]]\n"
+"\n"
+"Obrigado,\n"
+"            "
 
 #. module: crm
 #: view:crm.case.stage:0
@@ -852,7 +925,7 @@ msgstr "Converter para Oportunidade "
 #. module: crm
 #: view:crm.phonecall:0
 msgid "Unassigned Phonecalls"
-msgstr "Ligações não Atribuídas"
+msgstr "Chamadas Telefônicas não Atribuídas"
 
 #. module: crm
 #: view:crm.lead:0
@@ -904,7 +977,7 @@ msgstr "Perdemos"
 #. module: crm
 #: model:ir.filters,name:crm.filter_draft_lead
 msgid "Draft Leads"
-msgstr ""
+msgstr "Prospectos Não Analisados"
 
 #. module: crm
 #: selection:crm.lead.report,creation_month:0
@@ -916,7 +989,7 @@ msgstr "Março"
 #. module: crm
 #: view:crm.lead:0
 msgid "Send Email"
-msgstr ""
+msgstr "Enviar E-mail"
 
 #. module: crm
 #: code:addons/crm/wizard/crm_lead_to_opportunity.py:100
@@ -944,7 +1017,7 @@ msgstr "Celular"
 #: code:addons/crm/crm_phonecall.py:270
 #, python-format
 msgid "Phonecall has been <b>reset and set as open</b>."
-msgstr ""
+msgstr "A chamada telefônica foi <b>reiniciada e definida como aberta</b>."
 
 #. module: crm
 #: field:crm.lead,ref:0
@@ -957,6 +1030,8 @@ msgid ""
 "Opportunities that are assigned to either me or one of the sale teams I "
 "manage"
 msgstr ""
+"Oportunidades que foram atribuídas a mim ou a alguém das equipes de vendas "
+"que eu gerencio"
 
 #. module: crm
 #: help:crm.case.section,resource_calendar_id:0
@@ -1014,6 +1089,8 @@ msgid ""
 "Allows you to track your customers/suppliers claims and grievances.\n"
 "                    This installs the module crm_claim."
 msgstr ""
+"Permite rastrear as reclamações e queixas de seus clientes/fornecedores.\n"
+"                    O módulo crm_claim será instalado."
 
 #. module: crm
 #: model:crm.case.stage,name:crm.stage_lead6
@@ -1023,7 +1100,7 @@ msgstr "Ganhamos"
 #. module: crm
 #: field:crm.lead.report,delay_expected:0
 msgid "Overpassed Deadline"
-msgstr "Prazo Superado"
+msgstr "Prazo Ultrapassado"
 
 #. module: crm
 #: model:crm.case.section,name:crm.section_sales_department
@@ -1049,7 +1126,7 @@ msgstr "Calcular Segmentação"
 #: selection:crm.phonecall,priority:0
 #: selection:crm.phonecall.report,priority:0
 msgid "Lowest"
-msgstr "Nenhuma"
+msgstr "Mais Baixa"
 
 #. module: crm
 #: code:addons/crm/crm_meeting.py:59
@@ -1058,6 +1135,8 @@ msgid ""
 "Meeting linked to the phonecall <em>%s</em> has been <b>created</b> and "
 "<b>scheduled</b> on <em>%s</em>."
 msgstr ""
+"A reunião conectada à chamada telefônica <em>%s</em> foi <b>criada</b> e "
+"<b>agendada</b> em <em>%s</em>."
 
 #. module: crm
 #: field:crm.lead,create_date:0
@@ -1071,7 +1150,7 @@ msgstr "Data de Criação"
 #: code:addons/crm/crm_lead.py:862
 #, python-format
 msgid "%s has been <b>created</b>."
-msgstr ""
+msgstr "%s foi <b>criada</b>."
 
 #. module: crm
 #: selection:crm.segmentation.line,expr_name:0
@@ -1081,7 +1160,7 @@ msgstr "Total da Compra"
 #. module: crm
 #: view:crm.phonecall.report:0
 msgid "Year of call"
-msgstr "Ano da Ligação"
+msgstr "Ano da Chamada"
 
 #. module: crm
 #: view:crm.case.stage:0
@@ -1095,7 +1174,7 @@ msgstr "Estágio"
 #. module: crm
 #: view:crm.phonecall.report:0
 msgid "Phone Calls that are assigned to me"
-msgstr ""
+msgstr "Chamadas Telefônicas que foram atribuídas a mim"
 
 #. module: crm
 #: field:crm.lead,user_login:0
@@ -1105,7 +1184,7 @@ msgstr "Login do Usuário"
 #. module: crm
 #: view:crm.phonecall.report:0
 msgid "Phone calls which are in pending state"
-msgstr "Ligações Pendentes"
+msgstr "Chamadas Telefônicas que estão em estado pendente"
 
 #. module: crm
 #: view:crm.case.section:0
@@ -1123,11 +1202,13 @@ msgid ""
 "Allows you to communicate with Customer,  process Customer query, and "
 "provide better help and support. This installs the module crm_helpdesk."
 msgstr ""
+"Permite a comunicação com o cliente, processar suas questões e fornecer uma "
+"melhor ajuda e suporte. O módulo crm_helpdesk será instalado."
 
 #. module: crm
 #: view:crm.lead:0
 msgid "Delete"
-msgstr ""
+msgstr "Excluir"
 
 #. module: crm
 #: field:crm.lead,planned_revenue:0
@@ -1139,13 +1220,13 @@ msgstr "Receita Esperada"
 #. module: crm
 #: view:crm.lead:0
 msgid "í"
-msgstr ""
+msgstr "í"
 
 #. module: crm
 #: code:addons/crm/crm_lead.py:867
 #, python-format
 msgid "Opportunity has been <b>lost</b>."
-msgstr ""
+msgstr "A oportunidade foi <b>perdida</b>."
 
 #. module: crm
 #: selection:crm.lead.report,creation_month:0
@@ -1157,7 +1238,7 @@ msgstr "Setembro"
 #. module: crm
 #: help:crm.lead,email_from:0
 msgid "Email address of the contact"
-msgstr ""
+msgstr "Endereço de e-mail do contato"
 
 #. module: crm
 #: field:crm.segmentation,partner_id:0
@@ -1170,18 +1251,18 @@ msgid ""
 "Setting this stage will change the probability automatically on the "
 "opportunity."
 msgstr ""
-"A definição dessa fase vai mudar a probabilidade automaticamente a "
+"A definição dessa fase vai mudar a probabilidade automaticamente na "
 "oportunidade."
 
 #. module: crm
 #: view:crm.lead:0
 msgid "oe_kanban_text_red"
-msgstr ""
+msgstr "oe_kanban_text_red"
 
 #. module: crm
 #: model:ir.ui.menu,name:crm.menu_crm_payment_mode_act
 msgid "Payment Modes"
-msgstr ""
+msgstr "Formas de Pagamento"
 
 #. module: crm
 #: field:crm.lead.report,opening_date:0
@@ -1192,7 +1273,7 @@ msgstr "Data de Abertura"
 #. module: crm
 #: field:crm.lead,company_currency:0
 msgid "Currency"
-msgstr ""
+msgstr "Moeda"
 
 #. module: crm
 #: field:crm.case.channel,name:0
@@ -1226,7 +1307,7 @@ msgid ""
 "sales team. It will not assign this stage to existing teams."
 msgstr ""
 "Se você marcar este campo, esta etapa será proposta por padrão em cada "
-"equipe de vendas. Não irá atribuir esta fase as equipes já existentes."
+"equipe de vendas. Não irá atribuir esta fase às equipes já existentes."
 
 #. module: crm
 #: help:crm.case.stage,type:0
@@ -1234,6 +1315,9 @@ msgid ""
 "This field is used to distinguish stages related to Leads from stages "
 "related to Opportunities, or to specify stages available for both types."
 msgstr ""
+"Este campo é usado para distinguir estágios relacionados a Prospectos de "
+"estágios relacionados a Oportunidades, ou para especificar estágios "
+"disponíveis para ambos."
 
 #. module: crm
 #: help:crm.segmentation,sales_purchase_active:0
@@ -1260,7 +1344,7 @@ msgstr "Situação da Execução"
 #. module: crm
 #: view:crm.opportunity2phonecall:0
 msgid "Log call"
-msgstr "Registrar Ligação"
+msgstr "Registrar chamada"
 
 #. module: crm
 #: field:crm.lead,day_close:0
@@ -1278,6 +1362,8 @@ msgid ""
 "Followers of this salesteam follow automatically all opportunities related "
 "to this salesteam."
 msgstr ""
+"Seguidores desta equipe de vendas seguem automaticamente todas as "
+"oportunidades relacionadas a ela."
 
 #. module: crm
 #: model:ir.model,name:crm.model_crm_partner2opportunity
@@ -1297,12 +1383,12 @@ msgstr "Data"
 #: field:crm.lead,message_is_follower:0
 #: field:crm.phonecall,message_is_follower:0
 msgid "Is a Follower"
-msgstr ""
+msgstr "É um Seguidor"
 
 #. module: crm
 #: model:crm.case.section,name:crm.crm_case_section_4
 msgid "Online Support"
-msgstr ""
+msgstr "Suporte Online"
 
 #. module: crm
 #: view:crm.lead.report:0
@@ -1328,6 +1414,10 @@ msgid ""
 "set to 'Done'. If the case needs to be reviewed then the Status is  set to "
 "'Pending'."
 msgstr ""
+"A Situação é definida como 'Rascunho' quando o caso é criado. Se o caso está "
+"em progresso, a Situação muda para 'Aberto'. Quando o caso termina, a "
+"Situação é definida como 'Concluído'. Se o caso precisa ser revisado, a "
+"Situação é definida como 'Pendente'."
 
 #. module: crm
 #: model:crm.case.section,name:crm.crm_case_section_1
@@ -1337,7 +1427,7 @@ msgstr "Departamento de Vendas/Marketing"
 #. module: crm
 #: view:crm.phonecall.report:0
 msgid "Date of call"
-msgstr "Data da ligação"
+msgstr "Data da chamada"
 
 #. module: crm
 #: help:crm.lead,section_id:0
@@ -1354,18 +1444,18 @@ msgstr "Descrição da Segmentação"
 #. module: crm
 #: view:crm.lead:0
 msgid "Lead Description"
-msgstr ""
+msgstr "Descrição do Prospecto"
 
 #. module: crm
 #: code:addons/crm/crm_lead.py:491
 #, python-format
 msgid "Merged opportunities"
-msgstr "Mesclar oportunidades"
+msgstr "Oportunidades mescladas"
 
 #. module: crm
 #: model:crm.case.categ,name:crm.categ_oppor7
 msgid "Consulting"
-msgstr ""
+msgstr "Consultoria"
 
 #. module: crm
 #: field:crm.case.section,code:0
@@ -1375,12 +1465,12 @@ msgstr "Código"
 #. module: crm
 #: view:sale.config.settings:0
 msgid "Features"
-msgstr ""
+msgstr "Características"
 
 #. module: crm
 #: field:crm.case.section,child_ids:0
 msgid "Child Teams"
-msgstr "Time Filho"
+msgstr "Equipes filhas"
 
 #. module: crm
 #: view:crm.phonecall.report:0
@@ -1390,7 +1480,7 @@ msgstr "Chamadas Telefônicas que estão com situação em aberto"
 #. module: crm
 #: field:crm.lead2opportunity.partner.mass,user_ids:0
 msgid "Salesmen"
-msgstr ""
+msgstr "Vendedor"
 
 #. module: crm
 #: view:crm.lead:0
@@ -1415,17 +1505,17 @@ msgstr "Cancelar"
 #. module: crm
 #: view:crm.lead:0
 msgid "Opportunities Assigned to Me or My Team(s)"
-msgstr ""
+msgstr "Oportunidades Atribuídas a Mim ou às minhas Equipes"
 
 #. module: crm
 #: model:crm.case.categ,name:crm.categ_oppor4
 msgid "Information"
-msgstr ""
+msgstr "Informação"
 
 #. module: crm
 #: view:crm.lead.report:0
 msgid "Leads/Opportunities which are in pending state"
-msgstr "Prospecções/Oportunidades com situação pendente"
+msgstr "Prospectos/Oportunidades com situação pendente"
 
 #. module: crm
 #: model:ir.model,name:crm.model_crm_merge_opportunity
@@ -1435,7 +1525,7 @@ msgstr "Mesclar duas Oportunidades"
 #. module: crm
 #: model:ir.model,name:crm.model_crm_phonecall2partner
 msgid "Phonecall to Partner"
-msgstr "Ligação Telefônica para Parceiro"
+msgstr "Chamada Telefônica para Parceiro"
 
 #. module: crm
 #: model:crm.case.categ,name:crm.categ_oppor8
@@ -1446,18 +1536,18 @@ msgstr "Outros"
 #: field:crm.phonecall,opportunity_id:0
 #: model:ir.model,name:crm.model_crm_lead
 msgid "Lead/Opportunity"
-msgstr "Prospecção/Oportunidade"
+msgstr "Prospecto/Oportunidade"
 
 #. module: crm
 #: model:ir.actions.act_window,name:crm.action_merge_opportunities
 #: model:ir.actions.act_window,name:crm.merge_opportunity_act
 msgid "Merge leads/opportunities"
-msgstr ""
+msgstr "Mesclar prospectos/oportunidades"
 
 #. module: crm
 #: help:crm.case.stage,sequence:0
 msgid "Used to order stages. Lower is better."
-msgstr ""
+msgstr "Usado para ordenar estágios. Mais baixo é melhor."
 
 #. module: crm
 #: model:ir.actions.act_window,name:crm.crm_phonecall_categ_action
@@ -1467,12 +1557,12 @@ msgstr "Categorias de Chamada Telefônica"
 #. module: crm
 #: view:crm.lead.report:0
 msgid "Leads/Opportunities which are in open state"
-msgstr "Prospecções/Oportunidades com situação em aberto"
+msgstr "Prospectos/Oportunidades com situação em aberto"
 
 #. module: crm
 #: model:ir.model,name:crm.model_res_users
 msgid "Users"
-msgstr ""
+msgstr "Usuários"
 
 #. module: crm
 #: constraint:crm.case.section:0
@@ -1483,7 +1573,7 @@ msgstr "Erro! Você não pode criar uma Equipe de Vendas recursiva."
 #: selection:crm.opportunity2phonecall,action:0
 #: selection:crm.phonecall2phonecall,action:0
 msgid "Log a call"
-msgstr "Registrar a Ligação"
+msgstr "Registrar uma Chamada"
 
 #. module: crm
 #: selection:crm.segmentation.line,expr_name:0
@@ -1494,7 +1584,7 @@ msgstr "Valor da Venda"
 #: view:crm.phonecall.report:0
 #: model:ir.actions.act_window,name:crm.act_crm_opportunity_crm_phonecall_new
 msgid "Phone calls"
-msgstr "Ligações Telefônicas"
+msgstr "Chamadas Telefônicas"
 
 #. module: crm
 #: model:ir.actions.act_window,help:crm.action_report_crm_opportunity
@@ -1521,7 +1611,7 @@ msgstr "Nome"
 #. module: crm
 #: view:crm.lead.report:0
 msgid "Leads/Opportunities that are assigned to me"
-msgstr ""
+msgstr "Prospectos/Oportunidades que foram atribuídas a mim"
 
 #. module: crm
 #: view:crm.lead.report:0
@@ -1533,12 +1623,12 @@ msgstr "Meu(s) Caso(s)"
 #: help:crm.lead,message_ids:0
 #: help:crm.phonecall,message_ids:0
 msgid "Messages and communication history"
-msgstr ""
+msgstr "Histórico de mensagens e comunicação"
 
 #. module: crm
 #: view:crm.lead:0
 msgid "Show Countries"
-msgstr ""
+msgstr "Mostrar Países"
 
 #. module: crm
 #: view:crm.lead:0
@@ -1563,22 +1653,24 @@ msgstr "Converter do prospecto para parceiro de negócio"
 #: code:addons/crm/crm_lead.py:871
 #, python-format
 msgid "Opportunity has been <b>won</b>."
-msgstr ""
+msgstr "A oportunidade foi <b>ganha</b>."
 
 #. module: crm
 #: view:crm.phonecall:0
 msgid "Phone Calls that are assigned to me or to my team(s)"
 msgstr ""
+"Chamadas Telefônicas que foram atribuídas a mim ou às minhas equipes de "
+"vendas."
 
 #. module: crm
 #: model:ir.model,name:crm.model_crm_payment_mode
 msgid "CRM Payment Mode"
-msgstr ""
+msgstr "Forma de Pagamento"
 
 #. module: crm
 #: view:crm.lead.report:0
 msgid "Leads/Opportunities which are in done state"
-msgstr "Prospecções/Oportunidades com o situação concluído"
+msgstr "Prospectos/Oportunidades com o situação concluído"
 
 #. module: crm
 #: field:crm.lead.report,delay_close:0
@@ -1596,7 +1688,7 @@ msgstr "Agrupar Por..."
 #. module: crm
 #: view:crm.merge.opportunity:0
 msgid "Merge Leads/Opportunities"
-msgstr ""
+msgstr "Mesclar Prospectos/Oportunidades"
 
 #. module: crm
 #: field:crm.case.section,parent_id:0
@@ -1607,12 +1699,12 @@ msgstr "Equipe Pai"
 #: selection:crm.lead2opportunity.partner,action:0
 #: selection:crm.lead2opportunity.partner.mass,action:0
 msgid "Do not link to a customer"
-msgstr ""
+msgstr "Não conecte a um cliente"
 
 #. module: crm
 #: field:crm.lead,date_action:0
 msgid "Next Action Date"
-msgstr "Próxima Data de Ação"
+msgstr "Data da Próxima Ação"
 
 #. module: crm
 #: selection:crm.segmentation,state:0
@@ -1626,11 +1718,15 @@ msgid ""
 "stage. For example, if a stage is related to the status 'Close', when your "
 "document reaches this stage, it is automatically closed."
 msgstr ""
+"A situação do documento será automaticamente alterada de acordo com o "
+"estágio selecionado. Por exemplo, se um estágio é relacionado à situação "
+"'Fechado', e seu documento muda para este estágio, ele é automaticamente "
+"fechado."
 
 #. module: crm
 #: view:crm.lead2opportunity.partner.mass:0
 msgid "Assign opportunities to"
-msgstr ""
+msgstr "Atribuir oportunidades a"
 
 #. module: crm
 #: field:crm.lead,zip:0
@@ -1645,18 +1741,18 @@ msgstr "Recebidas"
 #. module: crm
 #: view:crm.phonecall.report:0
 msgid "Month of call"
-msgstr "Mês da Ligação"
+msgstr "Mês da chamada"
 
 #. module: crm
 #: code:addons/crm/crm_phonecall.py:289
 #, python-format
 msgid "Partner has been <b>created</b>."
-msgstr ""
+msgstr "O parceiro foi <b>criado</b>."
 
 #. module: crm
 #: field:sale.config.settings,module_crm_claim:0
 msgid "Manage Customer Claims"
-msgstr ""
+msgstr "Gerenciar Reclamações de Clientes"
 
 #. module: crm
 #: model:ir.actions.act_window,help:crm.action_report_crm_lead
@@ -1665,11 +1761,15 @@ msgid ""
 "the treatment delays or number of leads per state. You can sort out your "
 "leads analysis by different groups to get accurate grained analysis."
 msgstr ""
+"A Análise de Prospecções permite a você verificar diferentes informações de "
+"CRM como atrasos de tratamento ou o número de prospecto por estado. Você "
+"pode classificar sua análise de prospectos em diferentes grupos para obter "
+"uma análise mais precisa."
 
 #. module: crm
 #: model:crm.case.categ,name:crm.categ_oppor3
 msgid "Services"
-msgstr ""
+msgstr "Serviços"
 
 #. module: crm
 #: selection:crm.lead,priority:0
@@ -1677,7 +1777,7 @@ msgstr ""
 #: selection:crm.phonecall,priority:0
 #: selection:crm.phonecall.report,priority:0
 msgid "Highest"
-msgstr "Urgente"
+msgstr "Mais Alto"
 
 #. module: crm
 #: help:crm.lead.report,creation_year:0
@@ -1689,7 +1789,7 @@ msgstr "Ano de criação"
 #: view:crm.lead:0
 #: field:crm.lead,description:0
 msgid "Notes"
-msgstr "Observações"
+msgstr "Notas"
 
 #. module: crm
 #: field:crm.segmentation.line,expr_value:0
@@ -1714,7 +1814,7 @@ msgstr "Responder-Para"
 #. module: crm
 #: view:crm.lead:0
 msgid "Display"
-msgstr ""
+msgstr "Exibir"
 
 #. module: crm
 #: view:board.board:0
@@ -1729,7 +1829,7 @@ msgstr "Prospecto convertido em parceiro de negócio"
 #. module: crm
 #: model:ir.actions.server,name:crm.actions_server_crm_lead_unread
 msgid "CRM Lead: Mark unread"
-msgstr ""
+msgstr "Prospecto: Marcar como Não Lido"
 
 #. module: crm
 #: view:crm.case.channel:0
@@ -1755,12 +1855,12 @@ msgstr "Informações Adicionais"
 #. module: crm
 #: view:crm.lead:0
 msgid "Fund Raising"
-msgstr ""
+msgstr "Captação de Recursos"
 
 #. module: crm
 #: view:crm.lead:0
 msgid "Edit..."
-msgstr ""
+msgstr "Editar..."
 
 #. module: crm
 #: model:crm.case.resource.type,name:crm.type_lead5
@@ -1786,19 +1886,20 @@ msgstr "Prioridade"
 #. module: crm
 #: model:ir.model,name:crm.model_crm_lead2opportunity_partner
 msgid "Lead To Opportunity Partner"
-msgstr "Prospecção para Oportunidade de Parceiro"
+msgstr "Prospecto para Oportunidade de Parceiro"
 
 #. module: crm
 #: help:crm.lead,partner_id:0
 msgid "Linked partner (optional). Usually created when converting the lead."
 msgstr ""
+"Parceiro conectado (opcional). Normalmente criado na conversão de prospecto."
 
 #. module: crm
 #: field:crm.lead,payment_mode:0
 #: view:crm.payment.mode:0
 #: model:ir.actions.act_window,name:crm.action_crm_payment_mode
 msgid "Payment Mode"
-msgstr ""
+msgstr "Forma de Pagamento"
 
 #. module: crm
 #: model:ir.model,name:crm.model_crm_lead2opportunity_partner_mass
@@ -1808,19 +1909,19 @@ msgstr "Prospectos para Oportunidades  em lote"
 #. module: crm
 #: view:sale.config.settings:0
 msgid "On Mail Server"
-msgstr ""
+msgstr "No Servidor de E-mail"
 
 #. module: crm
 #: model:ir.actions.act_window,name:crm.open_board_statistical_dash
 #: model:ir.ui.menu,name:crm.menu_board_statistics_dash
 msgid "CRM"
-msgstr ""
+msgstr "CRM"
 
 #. module: crm
 #: model:ir.actions.act_window,name:crm.crm_segmentation_tree-act
 #: model:ir.ui.menu,name:crm.menu_crm_segmentation-act
 msgid "Contacts Segmentation"
-msgstr ""
+msgstr "Segmentação de Contatos"
 
 #. module: crm
 #: model:process.node,note:crm.process_node_meeting0
@@ -1835,7 +1936,7 @@ msgstr "Televendas"
 #. module: crm
 #: view:crm.lead:0
 msgid "Leads Assigned to Me or My Team(s)"
-msgstr ""
+msgstr "Prospectos Atribuídos a Mim ou a Minhas Equipes"
 
 #. module: crm
 #: model:ir.model,name:crm.model_crm_segmentation_line
@@ -1856,20 +1957,19 @@ msgstr "Receitas Esperadas"
 #. module: crm
 #: view:crm.lead:0
 msgid "Referrer"
-msgstr "Referenciador"
+msgstr "Referência"
 
 #. module: crm
 #: help:crm.lead,type:0
 #: help:crm.lead.report,type:0
 msgid "Type is used to separate Leads and Opportunities"
-msgstr "Tipo é utilizado para separar Prospecções e Oportunidades"
+msgstr "Tipo é utilizado para separar Prospectos e Oportunidades"
 
 #. module: crm
 #: view:crm.phonecall2partner:0
 msgid "Are you sure you want to create a partner based on this Phonecall ?"
 msgstr ""
-"Tem certeza que você quer criar uma parceiro baseado nesta chamada "
-"telefônica?"
+"Tem certeza que você quer criar um parceiro baseado nesta chamada telefônica?"
 
 #. module: crm
 #: selection:crm.lead.report,creation_month:0
@@ -1881,12 +1981,12 @@ msgstr "Julho"
 #. module: crm
 #: view:crm.lead:0
 msgid "Lead / Customer"
-msgstr "Prospecção / Cliente"
+msgstr "Prospecto / Cliente"
 
 #. module: crm
 #: model:crm.case.section,name:crm.crm_case_section_2
 msgid "Support Department"
-msgstr ""
+msgstr "Departamento de Suporte"
 
 #. module: crm
 #: view:crm.lead.report:0
@@ -1903,7 +2003,7 @@ msgstr "Equipe de Vendas"
 #. module: crm
 #: model:ir.model,name:crm.model_crm_lead2partner
 msgid "Lead to Partner"
-msgstr "Prospecção para Parceiro"
+msgstr "Prospecto para Parceiro"
 
 #. module: crm
 #: view:crm.segmentation:0
@@ -1920,13 +2020,13 @@ msgstr "Equipe"
 #. module: crm
 #: view:crm.lead.report:0
 msgid "Leads/Opportunities which are in New state"
-msgstr "Prospecções/Oportunidades com situação Novo"
+msgstr "Prospectos/Oportunidades com situação Novo"
 
 #. module: crm
 #: code:addons/crm/crm_lead.py:883
 #, python-format
 msgid "%s <b>partner</b> is now set to <em>%s</em>."
-msgstr ""
+msgstr "%s <b>parceiro</b> foi definido para <em>%s</em>."
 
 #. module: crm
 #: selection:crm.phonecall,state:0
@@ -1963,13 +2063,13 @@ msgstr "Prospectos"
 #. module: crm
 #: model:crm.case.categ,name:crm.categ_oppor5
 msgid "Design"
-msgstr ""
+msgstr "Desenho"
 
 #. module: crm
 #: selection:crm.lead2opportunity.partner,name:0
 #: selection:crm.lead2opportunity.partner.mass,name:0
 msgid "Merge with existing opportunities"
-msgstr ""
+msgstr "Mesclar com uma oportunidade existente"
 
 #. module: crm
 #: model:ir.actions.act_window,help:crm.crm_case_category_act_oppor11
@@ -1986,12 +2086,24 @@ msgid ""
 "            </p>\n"
 "          "
 msgstr ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"              Clique para criar uma nova oportunidade.\n"
+"            </p><p>\n"
+"              O OpenERP auxilia você a monitorar suas vendas para "
+"acompanhar\n"
+"              vendas em potencial e prever melhor suas futuras receitas.\n"
+"            </p><p>\n"
+"              Você poderá planejar reuniões e chamadas telefônicas a partir\n"
+"              de oportunidades, convertê-las em cotações, anexar documentos\n"
+"              relacionados, rastrear todas as discussões e muito mais.\n"
+"            </p>\n"
+"          "
 
 #. module: crm
 #: view:crm.phonecall.report:0
 #: selection:crm.phonecall.report,state:0
 msgid "Todo"
-msgstr "Por fazer"
+msgstr "A Fazer"
 
 #. module: crm
 #: field:crm.lead,user_email:0
@@ -2004,12 +2116,14 @@ msgid ""
 "The name of the future partner company that will be created while converting "
 "the lead into opportunity"
 msgstr ""
+"O nome da futura empresa parceira que será criada quando o prospecto for "
+"convertido para oportunidade"
 
 #. module: crm
 #: field:crm.opportunity2phonecall,note:0
 #: field:crm.phonecall2phonecall,note:0
 msgid "Note"
-msgstr "Observação"
+msgstr "Notas"
 
 #. module: crm
 #: selection:crm.lead,priority:0
@@ -2037,7 +2151,7 @@ msgstr "Oportunidades em Aberto"
 #. module: crm
 #: model:crm.case.resource.type,name:crm.type_lead2
 msgid "Email Campaign - Services"
-msgstr ""
+msgstr "Campanha po E-mail - Serviços"
 
 #. module: crm
 #: selection:crm.case.stage,state:0
@@ -2070,6 +2184,23 @@ msgid ""
 "          </p>\n"
 "        "
 msgstr ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"            Clique para criar um prospecto não qualificado. \n"
+"          </p><p>\n"
+"            Utilize prospectos se você necessita de uma etapa de "
+"qualificação\n"
+"            antes de criar uma oportunidade ou um cliente. Pode ser um "
+"cartão\n"
+"            de visitas que você recebeu, um formulário de contato preenchido "
+"em\n"
+"            seu site, um arquivo de prospectos não qualificados que você "
+"importou, etc.\n"
+"          </p><p>\n"
+"            Um vez qualificado, o prospecto pode ser convertido em uma\n"
+"            oportunidade de negócios e/ou um novo cliente em seu livro \n"
+"            de endereços.\n"
+"          </p>\n"
+"        "
 
 #. module: crm
 #: field:crm.lead,email_cc:0
@@ -2083,7 +2214,7 @@ msgstr "CC Global"
 #: model:ir.ui.menu,name:crm.menu_crm_case_phone
 #: model:ir.ui.menu,name:crm.menu_crm_config_phonecall
 msgid "Phone Calls"
-msgstr "Ligações Telefônicas"
+msgstr "Chamadas Telefônicas"
 
 #. module: crm
 #: view:crm.case.stage:0
@@ -2124,13 +2255,13 @@ msgstr "Expressão Obrigatória"
 #: selection:crm.lead2partner,action:0
 #: selection:crm.phonecall2partner,action:0
 msgid "Create a new customer"
-msgstr ""
+msgstr "Criar um novo cliente"
 
 #. module: crm
 #: field:crm.lead2opportunity.partner,action:0
 #: field:crm.lead2opportunity.partner.mass,action:0
 msgid "Related Customer"
-msgstr ""
+msgstr "Cliente Relacionado"
 
 #. module: crm
 #: field:crm.lead.report,deadline_day:0
@@ -2140,12 +2271,12 @@ msgstr "Fechamento Esperado"
 #. module: crm
 #: model:crm.case.categ,name:crm.categ_oppor2
 msgid "Software"
-msgstr ""
+msgstr "Aplicativos"
 
 #. module: crm
 #: field:crm.case.section,change_responsible:0
 msgid "Reassign Escalated"
-msgstr "Reatribuir Encaminhamentos"
+msgstr "Reatribuir Escalados"
 
 #. module: crm
 #: view:crm.lead.report:0
@@ -2178,12 +2309,12 @@ msgstr "Cidade"
 #. module: crm
 #: selection:crm.case.stage,type:0
 msgid "Both"
-msgstr ""
+msgstr "Ambos"
 
 #. module: crm
 #: view:crm.phonecall:0
 msgid "Call Done"
-msgstr ""
+msgstr "Chamada Concluída"
 
 #. module: crm
 #: view:crm.phonecall:0
@@ -2194,23 +2325,23 @@ msgstr "Responsável"
 #. module: crm
 #: model:ir.actions.server,name:crm.action_email_reminder_customer_lead
 msgid "Reminder to Customer"
-msgstr ""
+msgstr "Lembrete para Cliente"
 
 #. module: crm
 #: model:crm.case.section,name:crm.crm_case_section_3
 msgid "Direct Marketing"
-msgstr ""
+msgstr "Marketing Direto"
 
 #. module: crm
 #: model:crm.case.categ,name:crm.categ_oppor1
 msgid "Product"
-msgstr ""
+msgstr "Produto"
 
 #. module: crm
 #: code:addons/crm/crm_phonecall.py:284
 #, python-format
 msgid "Phonecall has been <b>created and opened</b>."
-msgstr ""
+msgstr "A Chamada Telefônica foi <b>criada e aberta</b>."
 
 #. module: crm
 #: field:base.action.rule,trg_max_history:0
@@ -2220,12 +2351,12 @@ msgstr "Histórico Máximo de Comunicação"
 #. module: crm
 #: view:crm.lead2opportunity.partner.mass:0
 msgid "Conversion Options"
-msgstr ""
+msgstr "Opções de Conversão"
 
 #. module: crm
 #: view:crm.lead:0
 msgid "Address"
-msgstr ""
+msgstr "Endereço"
 
 #. module: crm
 #: help:crm.case.section,alias_id:0
@@ -2233,11 +2364,13 @@ msgid ""
 "The email address associated with this team. New emails received will "
 "automatically create new leads assigned to the team."
 msgstr ""
+"O endereço de e-mail associado a esta equipe. Novos e-mails recebidos "
+"criarão automaticamente novos prospectos atribuídos à equipe."
 
 #. module: crm
 #: view:crm.lead:0
 msgid "Unassigned Opportunities"
-msgstr "Oportunidades não Atribuídas"
+msgstr "Oportunidades Não Atribuídas"
 
 #. module: crm
 #: view:crm.lead:0
@@ -2292,13 +2425,13 @@ msgstr "Continuar Processo"
 #: model:ir.actions.act_window,name:crm.action_crm_lead2opportunity_partner
 #: model:ir.actions.act_window,name:crm.phonecall2opportunity_act
 msgid "Convert to opportunity"
-msgstr ""
+msgstr "Converter para Oportunidade"
 
 #. module: crm
 #: field:crm.opportunity2phonecall,user_id:0
 #: field:crm.phonecall2phonecall,user_id:0
 msgid "Assign To"
-msgstr "Atribuído Para"
+msgstr "Atribuir Para"
 
 #. module: crm
 #: field:crm.lead,date_action_last:0
@@ -2327,6 +2460,19 @@ msgid ""
 "          </p>\n"
 "        "
 msgstr ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"            Clique para agendar uma chamada \n"
+"          </p><p>\n"
+"            O OpenERP permite definir facilmente todas as chamadas a serem "
+"feitas\n"
+"            pela sua equipe de vendas e acompanhá-las baseando-se no seu "
+"resumo.\n"
+"          </p><p>  \n"
+"            Você pode utilizar o recurso de importação para importar uma "
+"nova lista\n"
+"            de prospectos para qualificar.\n"
+"          </p>\n"
+"        "
 
 #. module: crm
 #: help:crm.case.stage,fold:0
@@ -2334,12 +2480,14 @@ msgid ""
 "This stage is not visible, for example in status bar or kanban view, when "
 "there are no records in that stage to display."
 msgstr ""
+"Este estágio não é visível, por exemplo na barra de status ou visão kanban, "
+"quando não há registros definidos no mesmo para visualizar."
 
 #. module: crm
 #: field:crm.lead.report,nbr:0
 #: field:crm.phonecall.report,nbr:0
 msgid "# of Cases"
-msgstr "# de Casos"
+msgstr "Nº de Casos"
 
 #. module: crm
 #: help:crm.phonecall,section_id:0
@@ -2349,12 +2497,12 @@ msgstr "Equipe de Vendas ao qual pertence o Caso."
 #. module: crm
 #: model:crm.case.resource.type,name:crm.type_lead6
 msgid "Banner Ads"
-msgstr ""
+msgstr "Anúncios em Banners"
 
 #. module: crm
 #: field:crm.merge.opportunity,opportunity_ids:0
 msgid "Leads/Opportunities"
-msgstr ""
+msgstr "Prospectos/Oportunidades"
 
 #. module: crm
 #: field:crm.lead,fax:0
@@ -2374,12 +2522,12 @@ msgstr "Empresa"
 #. module: crm
 #: view:base.action.rule:0
 msgid "Conditions on Communication History"
-msgstr ""
+msgstr "Condições no Histórico de Comunicações"
 
 #. module: crm
 #: view:crm.lead:0
 msgid "Unassigned Leads"
-msgstr "Propecções não Atribuídas"
+msgstr "Propectos não Atribuídos"
 
 #. module: crm
 #: field:crm.case.categ,object_id:0
@@ -2389,17 +2537,17 @@ msgstr "Nome do Objeto"
 #. module: crm
 #: view:crm.phonecall:0
 msgid "Phone Calls Assigned to Me or My Team(s)"
-msgstr ""
+msgstr "Chamadas Telefônicas Atribuídas a Mim ou Minhas Equipes"
 
 #. module: crm
 #: view:crm.lead:0
 msgid "Reset"
-msgstr ""
+msgstr "Reiniciar"
 
 #. module: crm
 #: view:sale.config.settings:0
 msgid "After-Sale Services"
-msgstr ""
+msgstr "Serviços Pós-Venda"
 
 #. module: crm
 #: model:ir.actions.server,message:crm.action_email_reminder_customer_lead
@@ -2415,6 +2563,16 @@ msgid ""
 "Thanks,\n"
 "            "
 msgstr ""
+"Olá [[object.partner_id and object.partner_id.name or '']], \n"
+"o seu prospecto abaixo não está aberto há 5 dias.\n"
+"\n"
+"Prospecto: [[object.id ]]\n"
+"Descrição:\n"
+"\n"
+"    [[object.description]]\n"
+"\n"
+"Atenciosamente,\n"
+"            "
 
 #. module: crm
 #: view:crm.phonecall2opportunity:0
@@ -2431,13 +2589,13 @@ msgstr "Mensagens"
 #. module: crm
 #: help:crm.lead,channel_id:0
 msgid "Communication channel (mail, direct, phone, ...)"
-msgstr "Canal de comunicação (email, diretamente, telefone, ...)"
+msgstr "Canal de comunicação (e-mail, diretamente, telefone, ...)"
 
 #. module: crm
 #: field:crm.opportunity2phonecall,name:0
 #: field:crm.phonecall2phonecall,name:0
 msgid "Call summary"
-msgstr "Resumo da ligação"
+msgstr "Resumo da chamada"
 
 #. module: crm
 #: selection:crm.case.stage,state:0
@@ -2446,7 +2604,7 @@ msgstr "Resumo da ligação"
 #: selection:crm.phonecall,state:0
 #: selection:crm.phonecall.report,state:0
 msgid "Cancelled"
-msgstr "Cancelado"
+msgstr "Cancelada"
 
 #. module: crm
 #: field:crm.lead,color:0
@@ -2469,12 +2627,12 @@ msgstr ""
 #. module: crm
 #: field:crm.case.stage,state:0
 msgid "Related Status"
-msgstr ""
+msgstr "Situação Relacionada"
 
 #. module: crm
 #: field:crm.phonecall,name:0
 msgid "Call Summary"
-msgstr "Resumo da Ligação"
+msgstr "Resumo da Chamada"
 
 #. module: crm
 #: field:crm.segmentation.line,expr_operator:0
@@ -2485,12 +2643,12 @@ msgstr "Operador"
 #: view:crm.lead:0
 #: model:ir.actions.act_window,name:crm.opportunity2phonecall_act
 msgid "Schedule/Log Call"
-msgstr "Agendar/Registrar Ligações"
+msgstr "Agendar/Registrar Chamada"
 
 #. module: crm
 #: view:crm.merge.opportunity:0
 msgid "Select Leads/Opportunities"
-msgstr ""
+msgstr "Selecionar Prospetos/Oportunidades"
 
 #. module: crm
 #: selection:crm.phonecall,state:0
@@ -2510,7 +2668,7 @@ msgstr "Confirmar"
 #. module: crm
 #: view:crm.lead:0
 msgid "Unread messages"
-msgstr ""
+msgstr "Mensagens não lidas"
 
 #. module: crm
 #: field:crm.phonecall.report,section_id:0
@@ -2527,12 +2685,12 @@ msgstr "Expressão Opcional"
 #: field:crm.lead,message_follower_ids:0
 #: field:crm.phonecall,message_follower_ids:0
 msgid "Followers"
-msgstr ""
+msgstr "Seguidores"
 
 #. module: crm
 #: field:sale.config.settings,fetchmail_lead:0
 msgid "Create leads from incoming mails"
-msgstr ""
+msgstr "Criar prospectos a partir de e-mails recebidos"
 
 #. module: crm
 #: view:crm.lead:0
@@ -2560,7 +2718,7 @@ msgstr "Chamada Agendada"
 #: view:crm.lead.report:0
 #: view:crm.phonecall.report:0
 msgid "My Sales Team(s)"
-msgstr "Minha Equipe de Vendas"
+msgstr "Minha(s) Equipe(s) de Vendas"
 
 #. module: crm
 #: help:crm.segmentation,exclusif:0
@@ -2583,7 +2741,7 @@ msgstr "Criar oportunidades de negócios a partir de prospectos"
 #. module: crm
 #: model:crm.case.resource.type,name:crm.type_lead3
 msgid "Email Campaign - Products"
-msgstr ""
+msgstr "Campanha por E-mail - Produtos"
 
 #. module: crm
 #: field:base.action.rule,act_categ_id:0
@@ -2607,16 +2765,27 @@ msgid ""
 "          </p>\n"
 "        "
 msgstr ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"            Clique para registrar o resumo de sua chamada telefônica. \n"
+"          </p><p>\n"
+"            O OpenERP permite registrar chamadas recebidas para rastrear o\n"
+"            histórico de comunicações com o cliente ou para informar outro\n"
+"            membro da equipe.\n"
+"          </p><p>\n"
+"            Para acompanhar uma chamada, você pode disparar uma solicitação\n"
+"            outra chamada, uma reunião ou uma oportunidade.\n"
+"          </p>\n"
+"        "
 
 #. module: crm
 #: model:process.node,note:crm.process_node_leads0
 msgid "Very first contact with new prospect"
-msgstr "Primeiro contato com a nova prospecção"
+msgstr "O primeiro contato com um novo prospecto"
 
 #. module: crm
 #: view:res.partner:0
 msgid "Calls"
-msgstr ""
+msgstr "Chamadas"
 
 #. module: crm
 #: field:crm.case.stage,on_change:0
@@ -2626,7 +2795,7 @@ msgstr "Mudar Probabilidade Automaticamente"
 #. module: crm
 #: view:crm.phonecall.report:0
 msgid "My Phone Calls"
-msgstr ""
+msgstr "Minhas Chamadas Telefônicas"
 
 #. module: crm
 #: model:crm.case.stage,name:crm.stage_lead3
@@ -2652,12 +2821,24 @@ msgid ""
 "              </p>\n"
 "            "
 msgstr ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Clique para definir um novo marcador de vendas.\n"
+"              </p><p>\n"
+"                Crie marcadores específicos que combinam com as atividades\n"
+"                da empresa para melhor classificar e analisar seus "
+"prospectos\n"
+"                e oportunidades. Estas categorias podem refletir a "
+"estrutura\n"
+"                de seus produtos ou os diferente tipos de venda "
+"disponíveis.\n"
+"              </p>\n"
+"            "
 
 #. module: crm
 #: code:addons/crm/wizard/crm_lead_to_partner.py:48
 #, python-format
 msgid "A partner is already defined."
-msgstr "O parceiro já foi definido"
+msgstr "Um parceiro já foi definido."
 
 #. module: crm
 #: view:sale.config.settings:0
@@ -2705,12 +2886,12 @@ msgstr "Agendar Reunião"
 #. module: crm
 #: field:crm.lead.report,deadline_year:0
 msgid "Ex. Closing Year"
-msgstr "Ex Fechamento Anual"
+msgstr "Expectativa de Fechamento Anual"
 
 #. module: crm
 #: model:ir.actions.client,name:crm.action_client_crm_menu
 msgid "Open Sale Menu"
-msgstr ""
+msgstr "Abrir Menu de Venda"
 
 #. module: crm
 #: field:crm.lead,date_open:0
@@ -2728,7 +2909,7 @@ msgstr "Membros da Equipe"
 #: view:crm.opportunity2phonecall:0
 #: view:crm.phonecall2phonecall:0
 msgid "Schedule/Log a Call"
-msgstr "Agendar/Registrar uma Ligação"
+msgstr "Agendar/Registrar uma Chamada"
 
 #. module: crm
 #: field:crm.lead,planned_cost:0
@@ -2738,7 +2919,7 @@ msgstr "Custos Planejados"
 #. module: crm
 #: help:crm.lead,date_deadline:0
 msgid "Estimate of the date on which the opportunity will be won."
-msgstr ""
+msgstr "Estimativa de data em que a oportunidade será ganha."
 
 #. module: crm
 #: help:crm.lead,email_cc:0
@@ -2747,15 +2928,15 @@ msgid ""
 "outbound emails for this record before being sent. Separate multiple email "
 "addresses with a comma"
 msgstr ""
-"Estes endereços de email serão adicionados para o campo CC de todas entradas "
-"e saídas de emails para este registro antes de ser enviado. Separe múltiplos "
-"endereços de email com vírgula."
+"Estes endereços de e-mail serão adicionados no campo CC de todas as entradas "
+"e saídas de e-mails para este registro antes de serem enviados. Separe "
+"múltiplos endereços de e-mail com vírgula."
 
 #. module: crm
 #: model:ir.actions.act_window,name:crm.crm_case_categ_phone_incoming0
 #: model:ir.ui.menu,name:crm.menu_crm_case_phone_inbound
 msgid "Logged Calls"
-msgstr "Ligações Registradas"
+msgstr "Chamadas Registradas"
 
 #. module: crm
 #: field:crm.partner2opportunity,probability:0
@@ -2768,7 +2949,7 @@ msgstr "Probabilidade de Sucesso"
 #: selection:crm.phonecall,state:0
 #: selection:crm.phonecall.report,state:0
 msgid "Draft"
-msgstr "Provisório"
+msgstr "Rascunho"
 
 #. module: crm
 #: model:ir.actions.act_window,name:crm.crm_case_section_act_tree
@@ -2815,7 +2996,7 @@ msgstr "Complemento"
 #. module: crm
 #: field:sale.config.settings,module_crm_helpdesk:0
 msgid "Manage Helpdesk and Support"
-msgstr ""
+msgstr "Gerenciar Helpdesk e Suporte"
 
 #. module: crm
 #: view:crm.phonecall2partner:0
@@ -2848,7 +3029,7 @@ msgstr "Novembro"
 #: field:crm.phonecall,message_comment_ids:0
 #: help:crm.phonecall,message_comment_ids:0
 msgid "Comments and emails"
-msgstr ""
+msgstr "Comentários e e-mails"
 
 #. module: crm
 #: model:crm.case.stage,name:crm.stage_lead5
@@ -2881,7 +3062,7 @@ msgstr "Anúncios Twitter"
 #. module: crm
 #: field:crm.case.stage,case_default:0
 msgid "Common to All Teams"
-msgstr "Comum a todas as equipes"
+msgstr "Comum a Todas as Equipes"
 
 #. module: crm
 #: field:crm.lead.report,creation_day:0
@@ -2896,12 +3077,12 @@ msgstr "Receitas Programadas"
 #. module: crm
 #: model:ir.actions.server,name:crm.actions_server_crm_lead_read
 msgid "CRM Lead: Mark read"
-msgstr ""
+msgstr "Prospecto: Marcar como Lido"
 
 #. module: crm
 #: model:ir.model,name:crm.model_crm_phonecall2phonecall
 msgid "Phonecall To Phonecall"
-msgstr "Ligação para Ligação"
+msgstr "Chamada Telefônica para Chamada Telefônica"
 
 #. module: crm
 #: help:crm.lead.report,deadline_year:0
@@ -2911,13 +3092,13 @@ msgstr "Ano esperado para fechamento"
 #. module: crm
 #: model:ir.model,name:crm.model_crm_case_stage
 msgid "Stage of case"
-msgstr "Estágio do Caso"
+msgstr "Estágio do caso"
 
 #. module: crm
 #: selection:crm.opportunity2phonecall,action:0
 #: selection:crm.phonecall2phonecall,action:0
 msgid "Schedule a call"
-msgstr "Agendar a Ligação"
+msgstr "Agendar uma chamada"
 
 #. module: crm
 #: view:crm.lead:0
@@ -2928,7 +3109,7 @@ msgstr "Categorização"
 #: view:crm.lead:0
 #: view:crm.phonecall2phonecall:0
 msgid "Log Call"
-msgstr "Registrar Ligação"
+msgstr "Registrar Chamada"
 
 #. module: crm
 #: model:ir.model,name:crm.model_base_action_rule
@@ -2939,6 +3120,7 @@ msgstr "Regras de Ação"
 #: help:sale.config.settings,group_fund_raising:0
 msgid "Allows you to trace and manage your activities for fund raising."
 msgstr ""
+"Permite rastrear e gerenciar suas atividades de captação de recursos."
 
 #. module: crm
 #: field:crm.meeting,phonecall_id:0
@@ -2950,6 +3132,8 @@ msgstr "Chamada Telefônica"
 #: view:crm.phonecall.report:0
 msgid "Phone calls that are assigned to one of the sale teams I manage"
 msgstr ""
+"Chamadas telefônicas que foram atribuídas a alguém das equipes de vendas que "
+"gerencio."
 
 #. module: crm
 #: view:crm.lead:0
@@ -2960,7 +3144,7 @@ msgstr "Data de Criação"
 #: view:crm.lead:0
 #: view:crm.phonecall2opportunity:0
 msgid "at"
-msgstr ""
+msgstr "em"
 
 #. module: crm
 #: model:crm.case.stage,name:crm.stage_lead1
@@ -3027,11 +3211,25 @@ msgid ""
 "              </p>\n"
 "            "
 msgstr ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Clique para definir um novo canal.\n"
+"              </p><p>\n"
+"                Utilize canais para rastrear a fonte de seus prospectos e "
+"oportunidades.\n"
+"                Canais são mais usados em relatórios para analisar o "
+"desempenho de vendas\n"
+"                relacionado aos esforços de marketing.\n"
+"              </p><p>\n"
+"                Alguns exemplos de canais: website da empresa, campanha por "
+"telefone,\n"
+"                revenda, etc.\n"
+"              </p>\n"
+"            "
 
 #. module: crm
 #: view:crm.lead:0
 msgid "Internal Notes"
-msgstr ""
+msgstr "Notas Internas"
 
 #. module: crm
 #: view:crm.lead:0
@@ -3056,7 +3254,7 @@ msgstr "Indicado por"
 #. module: crm
 #: view:crm.phonecall:0
 msgid "Reset to Todo"
-msgstr "Voltar para Pendente"
+msgstr "Devolver para A Fazer"
 
 #. module: crm
 #: field:crm.case.section,working_hours:0
@@ -3067,7 +3265,7 @@ msgstr "Horas Trabalhadas"
 #: view:crm.phonecall:0
 #: field:res.partner,phonecall_ids:0
 msgid "Phonecalls"
-msgstr "Ligações Telefônicas"
+msgstr "Chamadas Telefônicas"
 
 #. module: crm
 #: view:crm.lead:0
@@ -3095,13 +3293,14 @@ msgstr "Agendar uma Reunião"
 #. module: crm
 #: model:crm.case.stage,name:crm.stage_lead8
 msgid "Lost"
-msgstr "Perda"
+msgstr "Perdido"
 
 #. module: crm
 #: code:addons/crm/wizard/crm_lead_to_opportunity.py:100
 #, python-format
 msgid "Closed/Cancelled leads cannot be converted into opportunities."
 msgstr ""
+"Prospectos fechados/cancelados não podem ser convertidos para oportunidades."
 
 #. module: crm
 #: field:crm.lead,country_id:0
@@ -3143,7 +3342,7 @@ msgstr "Avaliação"
 #. module: crm
 #: model:ir.model,name:crm.model_crm_phonecall_report
 msgid "Phone calls by user and section"
-msgstr "Ligações Telefônicas por usuário e seção"
+msgstr "Chamada telefônicas por usuário e seção"
 
 #. module: crm
 #: code:addons/crm/crm_meeting.py:55
@@ -3152,6 +3351,8 @@ msgid ""
 "Meeting linked to the opportunity <em>%s</em> has been <b>created</b> and "
 "<b>scheduled</b> on <em>%s</em>."
 msgstr ""
+"Uma reunião relacionada à oportunidade <em>%s</em> foi <b>criada</b> e "
+"<b>agendada</b> em <em>%s</em>."
 
 #. module: crm
 #: view:crm.lead:0
@@ -3203,6 +3404,16 @@ msgid ""
 "              </p>\n"
 "            "
 msgstr ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Clique para definir um novo estágio de "
+"prospecto/oportunidade.\n"
+"              </p><p>\n"
+"                Os estágios permitirão aos vendedores determinar facilmente "
+"como\n"
+"                um prospecto ou oportunidade específica está posicionado no\n"
+"                ciclo de vendas.\n"
+"              </p>\n"
+"            "
 
 #, python-format
 #~ msgid ""
diff --git a/addons/crm_partner_assign/i18n/nb.po b/addons/crm_partner_assign/i18n/nb.po
new file mode 100644
index 00000000000..56497c83f58
--- /dev/null
+++ b/addons/crm_partner_assign/i18n/nb.po
@@ -0,0 +1,931 @@
+# Norwegian Bokmal translation for openobject-addons
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"PO-Revision-Date: 2012-12-06 10:55+0000\n"
+"Last-Translator: Kaare Pettersen <Unknown>\n"
+"Language-Team: Norwegian Bokmal <nb@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2012-12-07 04:36+0000\n"
+"X-Generator: Launchpad (build 16341)\n"
+
+#. module: crm_partner_assign
+#: field:crm.lead.report.assign,delay_close:0
+msgid "Delay to Close"
+msgstr "Forsinkelse til lukking."
+
+#. module: crm_partner_assign
+#: field:crm.lead.forward.to.partner,author_id:0
+msgid "Author"
+msgstr "Forfatter."
+
+#. module: crm_partner_assign
+#: field:crm.lead.report.assign,planned_revenue:0
+msgid "Planned Revenue"
+msgstr "Planlagt omsetning."
+
+#. module: crm_partner_assign
+#: help:crm.lead.forward.to.partner,type:0
+msgid ""
+"Message type: email for email message, notification for system message, "
+"comment for other messages such as user replies"
+msgstr ""
+
+#. module: crm_partner_assign
+#: field:crm.lead.report.assign,nbr:0
+msgid "# of Cases"
+msgstr "# av Saker."
+
+#. module: crm_partner_assign
+#: view:crm.lead.report.assign:0
+#: view:crm.partner.report.assign:0
+msgid "Group By..."
+msgstr "Grupper etter ..."
+
+#. module: crm_partner_assign
+#: help:crm.lead.forward.to.partner,body:0
+msgid "Automatically sanitized HTML contents"
+msgstr ""
+
+#. module: crm_partner_assign
+#: view:crm.lead:0
+msgid "Forward"
+msgstr "Fremover."
+
+#. module: crm_partner_assign
+#: view:res.partner:0
+msgid "Geo Localize"
+msgstr "Geo lokalisert."
+
+#. module: crm_partner_assign
+#: view:crm.lead.forward.to.partner:0
+msgid "Body"
+msgstr "Kropp."
+
+#. module: crm_partner_assign
+#: help:crm.lead.forward.to.partner,email_from:0
+msgid ""
+"Email address of the sender. This field is set when no matching partner is "
+"found for incoming emails."
+msgstr ""
+
+#. module: crm_partner_assign
+#: view:crm.partner.report.assign:0
+msgid "Date Partnership"
+msgstr "Dato Partnerskap."
+
+#. module: crm_partner_assign
+#: selection:crm.lead.report.assign,type:0
+msgid "Lead"
+msgstr "Fører."
+
+#. module: crm_partner_assign
+#: view:crm.lead.report.assign:0
+msgid "Delay to close"
+msgstr "Forsinket til lukking."
+
+#. module: crm_partner_assign
+#: selection:crm.lead.forward.to.partner,history_mode:0
+msgid "Whole Story"
+msgstr "Hele historien."
+
+#. module: crm_partner_assign
+#: view:crm.lead.report.assign:0
+#: field:crm.lead.report.assign,company_id:0
+msgid "Company"
+msgstr "Firma."
+
+#. module: crm_partner_assign
+#: field:crm.lead.forward.to.partner,notification_ids:0
+msgid "Notifications"
+msgstr "Varsling."
+
+#. module: crm_partner_assign
+#: field:crm.lead.report.assign,date_assign:0
+msgid "Partner Date"
+msgstr "Partner dato."
+
+#. module: crm_partner_assign
+#: view:crm.lead.report.assign:0
+#: view:crm.partner.report.assign:0
+#: view:res.partner:0
+msgid "Salesperson"
+msgstr "Salgsman."
+
+#. module: crm_partner_assign
+#: selection:crm.lead.report.assign,priority:0
+msgid "Highest"
+msgstr "Høyest."
+
+#. module: crm_partner_assign
+#: view:crm.lead.report.assign:0
+#: field:crm.lead.report.assign,day:0
+msgid "Day"
+msgstr "Dag."
+
+#. module: crm_partner_assign
+#: help:crm.lead.forward.to.partner,message_id:0
+msgid "Message unique identifier"
+msgstr "Unik melding identifikator."
+
+#. module: crm_partner_assign
+#: field:res.partner,date_review_next:0
+msgid "Next Partner Review"
+msgstr "Neste partner anmeldelse."
+
+#. module: crm_partner_assign
+#: field:crm.lead.forward.to.partner,favorite_user_ids:0
+msgid "Favorite"
+msgstr "Favoritt."
+
+#. module: crm_partner_assign
+#: selection:crm.lead.forward.to.partner,history_mode:0
+msgid "Latest email"
+msgstr "Siste e-posten."
+
+#. module: crm_partner_assign
+#: field:crm.lead,partner_latitude:0
+#: field:res.partner,partner_latitude:0
+msgid "Geo Latitude"
+msgstr ""
+
+#. module: crm_partner_assign
+#: selection:crm.lead.report.assign,state:0
+msgid "Cancelled"
+msgstr "Kansellert."
+
+#. module: crm_partner_assign
+#: view:crm.lead:0
+msgid "Geo Assignation"
+msgstr ""
+
+#. module: crm_partner_assign
+#: model:ir.model,name:crm_partner_assign.model_crm_lead_forward_to_partner
+msgid "Email composition wizard"
+msgstr ""
+
+#. module: crm_partner_assign
+#: field:crm.partner.report.assign,turnover:0
+msgid "Turnover"
+msgstr "Omsetning."
+
+#. module: crm_partner_assign
+#: field:crm.lead.report.assign,date_closed:0
+msgid "Close Date"
+msgstr "Lukkingsdato."
+
+#. module: crm_partner_assign
+#: help:res.partner,partner_weight:0
+msgid ""
+"Gives the probability to assign a lead to this partner. (0 means no "
+"assignation.)"
+msgstr ""
+
+#. module: crm_partner_assign
+#: view:res.partner:0
+msgid "Partner Activation"
+msgstr "Partner Aktivisering."
+
+#. module: crm_partner_assign
+#: selection:crm.lead.forward.to.partner,type:0
+msgid "System notification"
+msgstr "System varsling."
+
+#. module: crm_partner_assign
+#: code:addons/crm_partner_assign/wizard/crm_forward_to_partner.py:77
+#, python-format
+msgid "Lead forward"
+msgstr "Fører framover."
+
+#. module: crm_partner_assign
+#: field:crm.lead.report.assign,probability:0
+msgid "Avg Probability"
+msgstr ""
+
+#. module: crm_partner_assign
+#: view:res.partner:0
+msgid "Previous"
+msgstr "Forrige."
+
+#. module: crm_partner_assign
+#: code:addons/crm_partner_assign/partner_geo_assign.py:36
+#, python-format
+msgid "Network error"
+msgstr "Nettverks feil."
+
+#. module: crm_partner_assign
+#: field:crm.lead.forward.to.partner,email_from:0
+msgid "From"
+msgstr "Fra."
+
+#. module: crm_partner_assign
+#: model:ir.actions.act_window,name:crm_partner_assign.res_partner_grade_action
+#: model:ir.ui.menu,name:crm_partner_assign.menu_res_partner_grade_action
+#: view:res.partner.grade:0
+msgid "Partner Grade"
+msgstr ""
+
+#. module: crm_partner_assign
+#: view:crm.lead.report.assign:0
+#: view:crm.partner.report.assign:0
+msgid "Section"
+msgstr "Seksjon."
+
+#. module: crm_partner_assign
+#: view:crm.lead.forward.to.partner:0
+msgid "Send"
+msgstr "Send."
+
+#. module: crm_partner_assign
+#: view:res.partner:0
+msgid "Next"
+msgstr "Neste."
+
+#. module: crm_partner_assign
+#: view:crm.lead.report.assign:0
+#: field:crm.lead.report.assign,priority:0
+msgid "Priority"
+msgstr "Prioritet."
+
+#. module: crm_partner_assign
+#: help:crm.lead.forward.to.partner,author_id:0
+msgid ""
+"Author of the message. If not set, email_from may hold an email address that "
+"did not match any partner."
+msgstr ""
+
+#. module: crm_partner_assign
+#: help:crm.lead.forward.to.partner,favorite_user_ids:0
+msgid "Users that set this message in their favorites"
+msgstr "Brukere som setter denne meldingen i sine favoritter."
+
+#. module: crm_partner_assign
+#: field:crm.lead.report.assign,delay_expected:0
+msgid "Overpassed Deadline"
+msgstr "Passert frist."
+
+#. module: crm_partner_assign
+#: field:crm.lead.forward.to.partner,type:0
+#: field:crm.lead.report.assign,type:0
+msgid "Type"
+msgstr "Type."
+
+#. module: crm_partner_assign
+#: selection:crm.lead.forward.to.partner,type:0
+msgid "Email"
+msgstr "E-post."
+
+#. module: crm_partner_assign
+#: help:crm.lead,partner_assigned_id:0
+msgid "Partner this case has been forwarded/assigned to."
+msgstr "Partner, denne saken har blitt videresendt / tildelt."
+
+#. module: crm_partner_assign
+#: selection:crm.lead.report.assign,priority:0
+msgid "Lowest"
+msgstr "Laveste."
+
+#. module: crm_partner_assign
+#: view:crm.partner.report.assign:0
+msgid "Date Invoice"
+msgstr "Faktura dato."
+
+#. module: crm_partner_assign
+#: field:crm.lead.forward.to.partner,template_id:0
+msgid "Template"
+msgstr "Mal."
+
+#. module: crm_partner_assign
+#: view:crm.lead.report.assign:0
+msgid "Assign Date"
+msgstr "Tildel dato."
+
+#. module: crm_partner_assign
+#: view:crm.lead.report.assign:0
+msgid "Leads Analysis"
+msgstr "Fører analyse."
+
+#. module: crm_partner_assign
+#: field:crm.lead.report.assign,creation_date:0
+msgid "Creation Date"
+msgstr "Opprettelses dato."
+
+#. module: crm_partner_assign
+#: model:ir.model,name:crm_partner_assign.model_res_partner_activation
+msgid "res.partner.activation"
+msgstr ""
+
+#. module: crm_partner_assign
+#: field:crm.lead.forward.to.partner,parent_id:0
+msgid "Parent Message"
+msgstr "Partner melding."
+
+#. module: crm_partner_assign
+#: field:crm.lead.forward.to.partner,res_id:0
+msgid "Related Document ID"
+msgstr "Relatert dokument ID."
+
+#. module: crm_partner_assign
+#: selection:crm.lead.report.assign,state:0
+msgid "Pending"
+msgstr "Venter."
+
+#. module: crm_partner_assign
+#: view:crm.lead:0
+msgid "Partner Assignation"
+msgstr ""
+
+#. module: crm_partner_assign
+#: help:crm.lead.report.assign,type:0
+msgid "Type is used to separate Leads and Opportunities"
+msgstr "Typen brukes til å skille fører og muligheter."
+
+#. module: crm_partner_assign
+#: selection:crm.lead.report.assign,month:0
+msgid "July"
+msgstr "Juli."
+
+#. module: crm_partner_assign
+#: view:crm.partner.report.assign:0
+msgid "Date Review"
+msgstr "Anmeldelse dato."
+
+#. module: crm_partner_assign
+#: view:crm.lead.report.assign:0
+#: field:crm.lead.report.assign,stage_id:0
+msgid "Stage"
+msgstr "Fase."
+
+#. module: crm_partner_assign
+#: view:crm.lead.report.assign:0
+#: field:crm.lead.report.assign,state:0
+msgid "Status"
+msgstr "Status."
+
+#. module: crm_partner_assign
+#: field:crm.lead.forward.to.partner,to_read:0
+msgid "To read"
+msgstr "Å lese."
+
+#. module: crm_partner_assign
+#: code:addons/crm_partner_assign/wizard/crm_forward_to_partner.py:77
+#, python-format
+msgid "Fwd"
+msgstr ""
+
+#. module: crm_partner_assign
+#: view:res.partner:0
+msgid "Geo Localization"
+msgstr "Geo lokalisering."
+
+#. module: crm_partner_assign
+#: view:crm.lead.report.assign:0
+#: view:crm.partner.report.assign:0
+msgid "Opportunities Assignment Analysis"
+msgstr "Tilordnet muligheter analyse."
+
+#. module: crm_partner_assign
+#: view:crm.lead.forward.to.partner:0
+#: view:res.partner:0
+msgid "Cancel"
+msgstr "Avbryt."
+
+#. module: crm_partner_assign
+#: field:crm.lead.forward.to.partner,history_mode:0
+msgid "Send history"
+msgstr "Send historie."
+
+#. module: crm_partner_assign
+#: view:res.partner:0
+msgid "Close"
+msgstr "Lukk."
+
+#. module: crm_partner_assign
+#: selection:crm.lead.report.assign,month:0
+msgid "March"
+msgstr "Mars."
+
+#. module: crm_partner_assign
+#: model:ir.actions.act_window,name:crm_partner_assign.action_report_crm_opportunity_assign
+#: model:ir.ui.menu,name:crm_partner_assign.menu_report_crm_opportunities_assign_tree
+msgid "Opp. Assignment Analysis"
+msgstr ""
+
+#. module: crm_partner_assign
+#: help:crm.lead.report.assign,delay_close:0
+msgid "Number of Days to close the case"
+msgstr "Antall dager til sak lukkes."
+
+#. module: crm_partner_assign
+#: help:crm.lead.forward.to.partner,notified_partner_ids:0
+msgid ""
+"Partners that have a notification pushing this message in their mailboxes"
+msgstr ""
+
+#. module: crm_partner_assign
+#: selection:crm.lead.forward.to.partner,type:0
+msgid "Comment"
+msgstr "Kommentar."
+
+#. module: crm_partner_assign
+#: field:res.partner,partner_weight:0
+msgid "Weight"
+msgstr "Vekt."
+
+#. module: crm_partner_assign
+#: selection:crm.lead.report.assign,month:0
+msgid "April"
+msgstr "April."
+
+#. module: crm_partner_assign
+#: view:crm.lead.report.assign:0
+#: field:crm.lead.report.assign,grade_id:0
+#: view:crm.partner.report.assign:0
+#: field:crm.partner.report.assign,grade_id:0
+msgid "Grade"
+msgstr ""
+
+#. module: crm_partner_assign
+#: selection:crm.lead.report.assign,month:0
+msgid "December"
+msgstr "Desember."
+
+#. module: crm_partner_assign
+#: help:crm.lead.forward.to.partner,vote_user_ids:0
+msgid "Users that voted for this message"
+msgstr "Brukere som stemte på denne beskjeden."
+
+#. module: crm_partner_assign
+#: view:crm.lead.report.assign:0
+#: field:crm.lead.report.assign,month:0
+msgid "Month"
+msgstr "Måned."
+
+#. module: crm_partner_assign
+#: field:crm.lead.report.assign,opening_date:0
+msgid "Opening Date"
+msgstr "Åpningsdato."
+
+#. module: crm_partner_assign
+#: field:crm.lead.forward.to.partner,child_ids:0
+msgid "Child Messages"
+msgstr ""
+
+#. module: crm_partner_assign
+#: field:crm.partner.report.assign,date_review:0
+#: field:res.partner,date_review:0
+msgid "Latest Partner Review"
+msgstr ""
+
+#. module: crm_partner_assign
+#: field:crm.lead.forward.to.partner,subject:0
+msgid "Subject"
+msgstr "Emne."
+
+#. module: crm_partner_assign
+#: view:crm.lead.forward.to.partner:0
+msgid "or"
+msgstr "Eller."
+
+#. module: crm_partner_assign
+#: field:crm.lead.forward.to.partner,body:0
+msgid "Contents"
+msgstr "Innhold."
+
+#. module: crm_partner_assign
+#: field:crm.lead.forward.to.partner,vote_user_ids:0
+msgid "Votes"
+msgstr ""
+
+#. module: crm_partner_assign
+#: view:crm.lead.report.assign:0
+msgid "#Opportunities"
+msgstr ""
+
+#. module: crm_partner_assign
+#: field:crm.partner.report.assign,date_partnership:0
+#: field:res.partner,date_partnership:0
+msgid "Partnership Date"
+msgstr ""
+
+#. module: crm_partner_assign
+#: view:crm.lead:0
+msgid "Team"
+msgstr ""
+
+#. module: crm_partner_assign
+#: selection:crm.lead.report.assign,state:0
+msgid "Draft"
+msgstr ""
+
+#. module: crm_partner_assign
+#: selection:crm.lead.report.assign,priority:0
+msgid "Low"
+msgstr ""
+
+#. module: crm_partner_assign
+#: view:crm.lead.report.assign:0
+#: selection:crm.lead.report.assign,state:0
+msgid "Closed"
+msgstr ""
+
+#. module: crm_partner_assign
+#: model:ir.actions.act_window,name:crm_partner_assign.action_crm_send_mass_forward
+msgid "Mass forward to partner"
+msgstr ""
+
+#. module: crm_partner_assign
+#: view:res.partner:0
+#: field:res.partner,opportunity_assigned_ids:0
+msgid "Assigned Opportunities"
+msgstr ""
+
+#. module: crm_partner_assign
+#: field:crm.lead,date_assign:0
+msgid "Assignation Date"
+msgstr ""
+
+#. module: crm_partner_assign
+#: field:crm.lead.report.assign,probability_max:0
+msgid "Max Probability"
+msgstr ""
+
+#. module: crm_partner_assign
+#: selection:crm.lead.report.assign,month:0
+msgid "August"
+msgstr ""
+
+#. module: crm_partner_assign
+#: help:crm.lead.forward.to.partner,record_name:0
+msgid "Name get of the related document."
+msgstr ""
+
+#. module: crm_partner_assign
+#: selection:crm.lead.report.assign,priority:0
+msgid "Normal"
+msgstr ""
+
+#. module: crm_partner_assign
+#: view:res.partner:0
+msgid "Escalate"
+msgstr ""
+
+#. module: crm_partner_assign
+#: selection:crm.lead.report.assign,month:0
+msgid "June"
+msgstr ""
+
+#. module: crm_partner_assign
+#: help:crm.lead.report.assign,delay_open:0
+msgid "Number of Days to open the case"
+msgstr ""
+
+#. module: crm_partner_assign
+#: field:crm.lead.report.assign,delay_open:0
+msgid "Delay to Open"
+msgstr ""
+
+#. module: crm_partner_assign
+#: field:crm.lead.report.assign,user_id:0
+#: field:crm.partner.report.assign,user_id:0
+msgid "User"
+msgstr ""
+
+#. module: crm_partner_assign
+#: field:res.partner.grade,active:0
+msgid "Active"
+msgstr ""
+
+#. module: crm_partner_assign
+#: selection:crm.lead.report.assign,month:0
+msgid "November"
+msgstr ""
+
+#. module: crm_partner_assign
+#: view:crm.lead.report.assign:0
+msgid "Extended Filters..."
+msgstr ""
+
+#. module: crm_partner_assign
+#: field:crm.lead,partner_longitude:0
+#: field:res.partner,partner_longitude:0
+msgid "Geo Longitude"
+msgstr ""
+
+#. module: crm_partner_assign
+#: field:crm.partner.report.assign,opp:0
+msgid "# of Opportunity"
+msgstr ""
+
+#. module: crm_partner_assign
+#: view:crm.lead.report.assign:0
+msgid "Lead Assign"
+msgstr ""
+
+#. module: crm_partner_assign
+#: selection:crm.lead.report.assign,month:0
+msgid "October"
+msgstr ""
+
+#. module: crm_partner_assign
+#: view:crm.lead:0
+msgid "Assignation"
+msgstr ""
+
+#. module: crm_partner_assign
+#: selection:crm.lead.report.assign,month:0
+msgid "January"
+msgstr ""
+
+#. module: crm_partner_assign
+#: view:crm.lead.forward.to.partner:0
+msgid "Send Mail"
+msgstr ""
+
+#. module: crm_partner_assign
+#: field:crm.lead.forward.to.partner,date:0
+msgid "Date"
+msgstr ""
+
+#. module: crm_partner_assign
+#: view:crm.lead.report.assign:0
+msgid "Planned Revenues"
+msgstr ""
+
+#. module: crm_partner_assign
+#: view:res.partner:0
+msgid "Partner Review"
+msgstr ""
+
+#. module: crm_partner_assign
+#: field:crm.partner.report.assign,period_id:0
+msgid "Invoice Period"
+msgstr ""
+
+#. module: crm_partner_assign
+#: model:ir.model,name:crm_partner_assign.model_res_partner_grade
+msgid "res.partner.grade"
+msgstr ""
+
+#. module: crm_partner_assign
+#: field:crm.lead.forward.to.partner,message_id:0
+msgid "Message-Id"
+msgstr ""
+
+#. module: crm_partner_assign
+#: view:crm.lead.forward.to.partner:0
+#: field:crm.lead.forward.to.partner,attachment_ids:0
+msgid "Attachments"
+msgstr ""
+
+#. module: crm_partner_assign
+#: field:crm.lead.forward.to.partner,record_name:0
+msgid "Message Record Name"
+msgstr ""
+
+#. module: crm_partner_assign
+#: field:res.partner.activation,sequence:0
+#: field:res.partner.grade,sequence:0
+msgid "Sequence"
+msgstr ""
+
+#. module: crm_partner_assign
+#: code:addons/crm_partner_assign/partner_geo_assign.py:37
+#, python-format
+msgid ""
+"Cannot contact geolocation servers. Please make sure that your internet "
+"connection is up and running (%s)."
+msgstr ""
+
+#. module: crm_partner_assign
+#: selection:crm.lead.report.assign,month:0
+msgid "September"
+msgstr ""
+
+#. module: crm_partner_assign
+#: field:res.partner.grade,name:0
+msgid "Grade Name"
+msgstr ""
+
+#. module: crm_partner_assign
+#: help:crm.lead,date_assign:0
+msgid "Last date this case was forwarded/assigned to a partner"
+msgstr ""
+
+#. module: crm_partner_assign
+#: selection:crm.lead.report.assign,state:0
+#: view:res.partner:0
+msgid "Open"
+msgstr ""
+
+#. module: crm_partner_assign
+#: field:crm.lead.forward.to.partner,subtype_id:0
+msgid "Subtype"
+msgstr ""
+
+#. module: crm_partner_assign
+#: field:res.partner,date_localization:0
+msgid "Geo Localization Date"
+msgstr ""
+
+#. module: crm_partner_assign
+#: view:crm.lead.report.assign:0
+msgid "Current"
+msgstr ""
+
+#. module: crm_partner_assign
+#: model:ir.model,name:crm_partner_assign.model_crm_lead
+msgid "Lead/Opportunity"
+msgstr ""
+
+#. module: crm_partner_assign
+#: field:crm.lead.forward.to.partner,notified_partner_ids:0
+msgid "Notified partners"
+msgstr ""
+
+#. module: crm_partner_assign
+#: view:crm.lead.forward.to.partner:0
+#: model:ir.actions.act_window,name:crm_partner_assign.crm_lead_forward_to_partner_act
+msgid "Forward to Partner"
+msgstr ""
+
+#. module: crm_partner_assign
+#: field:crm.lead.report.assign,section_id:0
+#: field:crm.partner.report.assign,section_id:0
+msgid "Sales Team"
+msgstr ""
+
+#. module: crm_partner_assign
+#: selection:crm.lead.report.assign,month:0
+msgid "May"
+msgstr ""
+
+#. module: crm_partner_assign
+#: field:crm.lead.report.assign,probable_revenue:0
+msgid "Probable Revenue"
+msgstr ""
+
+#. module: crm_partner_assign
+#: view:crm.partner.report.assign:0
+#: field:crm.partner.report.assign,activation:0
+#: view:res.partner:0
+#: field:res.partner,activation:0
+#: view:res.partner.activation:0
+msgid "Activation"
+msgstr ""
+
+#. module: crm_partner_assign
+#: view:crm.lead:0
+#: field:crm.lead,partner_assigned_id:0
+msgid "Assigned Partner"
+msgstr ""
+
+#. module: crm_partner_assign
+#: field:res.partner,grade_id:0
+msgid "Partner Level"
+msgstr ""
+
+#. module: crm_partner_assign
+#: selection:crm.lead.report.assign,type:0
+msgid "Opportunity"
+msgstr ""
+
+#. module: crm_partner_assign
+#: field:crm.lead.report.assign,partner_id:0
+msgid "Customer"
+msgstr ""
+
+#. module: crm_partner_assign
+#: selection:crm.lead.report.assign,month:0
+msgid "February"
+msgstr ""
+
+#. module: crm_partner_assign
+#: field:res.partner.activation,name:0
+msgid "Name"
+msgstr ""
+
+#. module: crm_partner_assign
+#: model:ir.actions.act_window,name:crm_partner_assign.res_partner_activation_act
+#: model:ir.ui.menu,name:crm_partner_assign.res_partner_activation_config_mi
+msgid "Partner Activations"
+msgstr ""
+
+#. module: crm_partner_assign
+#: view:crm.lead.report.assign:0
+#: field:crm.lead.report.assign,country_id:0
+#: view:crm.partner.report.assign:0
+#: field:crm.partner.report.assign,country_id:0
+msgid "Country"
+msgstr ""
+
+#. module: crm_partner_assign
+#: view:crm.lead.report.assign:0
+#: field:crm.lead.report.assign,year:0
+msgid "Year"
+msgstr ""
+
+#. module: crm_partner_assign
+#: view:res.partner:0
+msgid "Convert to Opportunity"
+msgstr ""
+
+#. module: crm_partner_assign
+#: view:crm.lead:0
+msgid "Geo Assign"
+msgstr ""
+
+#. module: crm_partner_assign
+#: view:crm.lead.report.assign:0
+msgid "Delay to open"
+msgstr ""
+
+#. module: crm_partner_assign
+#: model:ir.actions.act_window,name:crm_partner_assign.action_report_crm_partner_assign
+#: model:ir.ui.menu,name:crm_partner_assign.menu_report_crm_partner_assign_tree
+msgid "Partnership Analysis"
+msgstr ""
+
+#. module: crm_partner_assign
+#: help:crm.lead.forward.to.partner,notification_ids:0
+msgid ""
+"Technical field holding the message notifications. Use notified_partner_ids "
+"to access notified partners."
+msgstr ""
+
+#. module: crm_partner_assign
+#: view:crm.partner.report.assign:0
+msgid "Partner assigned Analysis"
+msgstr ""
+
+#. module: crm_partner_assign
+#: model:ir.model,name:crm_partner_assign.model_crm_lead_report_assign
+msgid "CRM Lead Report"
+msgstr ""
+
+#. module: crm_partner_assign
+#: field:crm.lead.forward.to.partner,composition_mode:0
+msgid "Composition mode"
+msgstr ""
+
+#. module: crm_partner_assign
+#: field:crm.lead.forward.to.partner,model:0
+msgid "Related Document Model"
+msgstr ""
+
+#. module: crm_partner_assign
+#: selection:crm.lead.forward.to.partner,history_mode:0
+msgid "Case Information"
+msgstr ""
+
+#. module: crm_partner_assign
+#: help:crm.lead.forward.to.partner,to_read:0
+msgid "Functional field to search for messages the current user has to read"
+msgstr ""
+
+#. module: crm_partner_assign
+#: model:ir.model,name:crm_partner_assign.model_crm_partner_report_assign
+msgid "CRM Partner Report"
+msgstr ""
+
+#. module: crm_partner_assign
+#: selection:crm.lead.report.assign,priority:0
+msgid "High"
+msgstr ""
+
+#. module: crm_partner_assign
+#: field:crm.lead.forward.to.partner,partner_ids:0
+msgid "Additional contacts"
+msgstr ""
+
+#. module: crm_partner_assign
+#: help:crm.lead.forward.to.partner,parent_id:0
+msgid "Initial thread message."
+msgstr ""
+
+#. module: crm_partner_assign
+#: field:crm.lead.report.assign,create_date:0
+msgid "Create Date"
+msgstr ""
+
+#. module: crm_partner_assign
+#: field:crm.lead.forward.to.partner,filter_id:0
+msgid "Filters"
+msgstr ""
+
+#. module: crm_partner_assign
+#: view:crm.lead.report.assign:0
+#: field:crm.lead.report.assign,partner_assigned_id:0
+#: view:crm.partner.report.assign:0
+#: field:crm.partner.report.assign,partner_id:0
+#: model:ir.model,name:crm_partner_assign.model_res_partner
+msgid "Partner"
+msgstr ""
diff --git a/addons/crm_todo/i18n/pt_BR.po b/addons/crm_todo/i18n/pt_BR.po
index 03e62a86157..eb001f1426c 100644
--- a/addons/crm_todo/i18n/pt_BR.po
+++ b/addons/crm_todo/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: 2012-12-03 16:03+0000\n"
-"PO-Revision-Date: 2012-02-16 14:02+0000\n"
-"Last-Translator: Rafael Sales - http://www.tompast.com.br <Unknown>\n"
+"PO-Revision-Date: 2012-12-06 13:12+0000\n"
+"Last-Translator: Cristiano Korndörfer <codigo.aberto@dorfer.com.br>\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: 2012-12-04 05:54+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-07 04:36+0000\n"
+"X-Generator: Launchpad (build 16341)\n"
 
 #. module: crm_todo
 #: model:ir.model,name:crm_todo.model_project_task
@@ -30,7 +30,7 @@ msgstr "Período de Tempo"
 #. module: crm_todo
 #: view:crm.lead:0
 msgid "Lead"
-msgstr ""
+msgstr "Prospecto"
 
 #. module: crm_todo
 #: view:crm.lead:0
@@ -67,12 +67,12 @@ msgstr "Cancelar"
 #. module: crm_todo
 #: model:ir.model,name:crm_todo.model_crm_lead
 msgid "Lead/Opportunity"
-msgstr ""
+msgstr "Prospecto/Oportunidade"
 
 #. module: crm_todo
 #: field:project.task,lead_id:0
 msgid "Lead / Opportunity"
-msgstr "Prospecção / Oportunidade"
+msgstr "Prospecto / Oportunidade"
 
 #. module: crm_todo
 #: view:crm.lead:0
diff --git a/addons/fleet/i18n/zh_CN.po b/addons/fleet/i18n/zh_CN.po
index deb6b1cac2f..660ab4702c1 100644
--- a/addons/fleet/i18n/zh_CN.po
+++ b/addons/fleet/i18n/zh_CN.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-11-24 02:52+0000\n"
-"PO-Revision-Date: 2012-11-30 11:52+0000\n"
+"PO-Revision-Date: 2012-12-06 13:05+0000\n"
 "Last-Translator: ccdos <ccdos@163.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: 2012-12-01 05:09+0000\n"
-"X-Generator: Launchpad (build 16319)\n"
+"X-Launchpad-Export-Date: 2012-12-07 04:36+0000\n"
+"X-Generator: Launchpad (build 16341)\n"
 
 #. module: fleet
 #: selection:fleet.vehicle,fuel_type:0
@@ -553,7 +553,7 @@ msgstr "合同状态"
 #. module: fleet
 #: field:fleet.vehicle,contract_renewal_total:0
 msgid "Total of contracts due or overdue minus one"
-msgstr ""
+msgstr "到期或逾期合同汇总"
 
 #. module: fleet
 #: field:fleet.vehicle.cost,cost_subtype:0
@@ -1804,6 +1804,13 @@ msgid ""
 "              </p>\n"
 "            "
 msgstr ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                单击创建一个服务入口。\n"
+"              </p><p>\n"
+"                OpenERP 帮你跟踪所有汽车上完成的服务的。\n"
+"                服务有多种类型：偶然维修，定期维护保养，等等。\n"
+"              </p>\n"
+"            "
 
 #. module: fleet
 #: field:fleet.vehicle,co2:0
diff --git a/addons/hr/i18n/zh_CN.po b/addons/hr/i18n/zh_CN.po
index 73ae9ff29c1..f0589308cb7 100644
--- a/addons/hr/i18n/zh_CN.po
+++ b/addons/hr/i18n/zh_CN.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-06 04:40+0000\n"
+"X-Launchpad-Export-Date: 2012-12-07 04:36+0000\n"
 "X-Generator: Launchpad (build 16341)\n"
 
 #. module: hr
diff --git a/addons/hr_holidays/i18n/zh_CN.po b/addons/hr_holidays/i18n/zh_CN.po
index ac24ea47bd7..0cfbe531066 100644
--- a/addons/hr_holidays/i18n/zh_CN.po
+++ b/addons/hr_holidays/i18n/zh_CN.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-06 04:40+0000\n"
+"X-Launchpad-Export-Date: 2012-12-07 04:36+0000\n"
 "X-Generator: Launchpad (build 16341)\n"
 
 #. module: hr_holidays
diff --git a/addons/knowledge/i18n/pt_BR.po b/addons/knowledge/i18n/pt_BR.po
index 9e6ef1b8f05..f5d05c9e705 100644
--- a/addons/knowledge/i18n/pt_BR.po
+++ b/addons/knowledge/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: 2012-11-24 02:53+0000\n"
-"PO-Revision-Date: 2012-12-04 15:13+0000\n"
+"PO-Revision-Date: 2012-12-06 16:47+0000\n"
 "Last-Translator: Cristiano Korndörfer <codigo.aberto@dorfer.com.br>\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: 2012-12-05 05:20+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-07 04:36+0000\n"
+"X-Generator: Launchpad (build 16341)\n"
 
 #. module: knowledge
 #: view:knowledge.config.settings:0
@@ -25,7 +25,7 @@ msgstr "Documentos"
 #. module: knowledge
 #: model:ir.model,name:knowledge.model_knowledge_config_settings
 msgid "knowledge.config.settings"
-msgstr ""
+msgstr "knowledge.config.settings"
 
 #. module: knowledge
 #: help:knowledge.config.settings,module_document_webdav:0
@@ -65,6 +65,11 @@ msgid ""
 "and a document dashboard.\n"
 "                This installs the module document."
 msgstr ""
+"Este é um sistema de gerenciamento de documentos completo, com: autenticação "
+"de usuários,\n"
+"                pesquisa completa de documentos (pptx e docx não são "
+"suportados), e um painel de documentos.\n"
+"                O módulo document será instalado."
 
 #. module: knowledge
 #: field:knowledge.config.settings,module_document_page:0
diff --git a/addons/mail/i18n/fr.po b/addons/mail/i18n/fr.po
index f68fb4599dc..37dff92a21f 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: 2012-12-03 16:01+0000\n"
-"PO-Revision-Date: 2012-12-04 11:00+0000\n"
+"PO-Revision-Date: 2012-12-06 17:21+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: 2012-12-05 05:20+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-07 04:36+0000\n"
+"X-Generator: Launchpad (build 16341)\n"
 
 #. module: mail
 #: field:res.partner,notification_email_send:0
@@ -1490,7 +1490,7 @@ msgstr ""
 #: model:ir.ui.menu,name:mail.mail_feeds
 #: model:ir.ui.menu,name:mail.mail_feeds_main
 msgid "Messaging"
-msgstr ""
+msgstr "Messagerie"
 
 #. module: mail
 #: view:mail.alias:0
diff --git a/addons/note/i18n/pt_BR.po b/addons/note/i18n/pt_BR.po
index 9fc11184337..31164a9ba2b 100644
--- a/addons/note/i18n/pt_BR.po
+++ b/addons/note/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: 2012-12-03 16:02+0000\n"
-"PO-Revision-Date: 2012-11-14 04:29+0000\n"
-"Last-Translator: Guilherme R. Santos <Unknown>\n"
+"PO-Revision-Date: 2012-12-06 12:58+0000\n"
+"Last-Translator: Cristiano Korndörfer <codigo.aberto@dorfer.com.br>\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: 2012-12-04 05:54+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-07 04:36+0000\n"
+"X-Generator: Launchpad (build 16341)\n"
 
 #. module: note
 #: field:note.note,memo:0
@@ -31,7 +31,7 @@ msgstr "Estágio das Notas"
 #: model:note.stage,name:note.demo_note_stage_04
 #: model:note.stage,name:note.note_stage_02
 msgid "This Week"
-msgstr ""
+msgstr "Esta Semana"
 
 #. module: note
 #: model:ir.model,name:note.model_base_config_settings
@@ -41,7 +41,7 @@ msgstr "base.config.settings"
 #. module: note
 #: model:ir.model,name:note.model_note_tag
 msgid "Note Tag"
-msgstr "Tag da Nota"
+msgstr "Marcador da Nota"
 
 #. module: note
 #: model:res.groups,name:note.group_note_fancy
@@ -123,7 +123,7 @@ msgstr "Estágios das Notas"
 #. module: note
 #: field:note.note,message_unread:0
 msgid "Unread Messages"
-msgstr "Mensagens não lidas"
+msgstr "Mensagens Não Lidas"
 
 #. module: note
 #: field:note.note,current_partner_id:0
@@ -133,7 +133,7 @@ msgstr "desconhecido"
 #. module: note
 #: view:note.note:0
 msgid "By sticky note Category"
-msgstr ""
+msgstr "Por Categoria de lembrete"
 
 #. module: note
 #: help:note.note,message_unread:0
@@ -148,7 +148,7 @@ msgstr "Nome do Estágio"
 #. module: note
 #: field:note.note,message_is_follower:0
 msgid "Is a Follower"
-msgstr "É um seguidor"
+msgstr "É um Seguidor"
 
 #. module: note
 #: model:note.stage,name:note.demo_note_stage_02
@@ -175,12 +175,12 @@ msgstr "Categorias"
 #: field:note.note,message_comment_ids:0
 #: help:note.note,message_comment_ids:0
 msgid "Comments and emails"
-msgstr "Comentários e emails"
+msgstr "Comentários e e-mails"
 
 #. module: note
 #: field:note.tag,name:0
 msgid "Tag Name"
-msgstr "Nome da Tag"
+msgstr "Nome do Marcador"
 
 #. module: note
 #: field:note.note,message_ids:0
@@ -257,7 +257,7 @@ msgstr "Sequencia"
 #. module: note
 #: field:note.note,tag_ids:0
 msgid "Tags"
-msgstr "Tags"
+msgstr "Marcadores"
 
 #. module: note
 #: view:note.note:0
@@ -275,6 +275,9 @@ msgid ""
 "Holds the Chatter summary (number of messages, ...). This summary is "
 "directly in html format in order to be inserted in kanban views."
 msgstr ""
+"Contém o resumo da conversação (número de mensagens, ...). Este resumo é "
+"gerado diretamente em formato HTML para que possa ser inserido nas visões "
+"kanban."
 
 #. module: note
 #: field:base.config.settings,group_note_fancy:0
diff --git a/addons/note_pad/i18n/pt_BR.po b/addons/note_pad/i18n/pt_BR.po
new file mode 100644
index 00000000000..30a66801956
--- /dev/null
+++ b/addons/note_pad/i18n/pt_BR.po
@@ -0,0 +1,28 @@
+# Brazilian Portuguese translation for openobject-addons
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-11-24 02:53+0000\n"
+"PO-Revision-Date: 2012-12-06 13:00+0000\n"
+"Last-Translator: Cristiano Korndörfer <codigo.aberto@dorfer.com.br>\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: 2012-12-07 04:36+0000\n"
+"X-Generator: Launchpad (build 16341)\n"
+
+#. module: note_pad
+#: model:ir.model,name:note_pad.model_note_note
+msgid "Note"
+msgstr "Nota"
+
+#. module: note_pad
+#: field:note.note,note_pad_url:0
+msgid "Pad Url"
+msgstr "Url do Pad"
diff --git a/addons/pad/i18n/pt_BR.po b/addons/pad/i18n/pt_BR.po
index fe4c8062dd5..65f6e824e97 100644
--- a/addons/pad/i18n/pt_BR.po
+++ b/addons/pad/i18n/pt_BR.po
@@ -8,31 +8,31 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-12-03 16:03+0000\n"
-"PO-Revision-Date: 2011-01-19 19:50+0000\n"
-"Last-Translator: Emerson <Unknown>\n"
+"PO-Revision-Date: 2012-12-06 13:03+0000\n"
+"Last-Translator: Cristiano Korndörfer <codigo.aberto@dorfer.com.br>\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: 2012-12-04 05:53+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-07 04:36+0000\n"
+"X-Generator: Launchpad (build 16341)\n"
 
 #. module: pad
 #. openerp-web
 #: code:addons/pad/static/src/xml/pad.xml:27
 #, python-format
 msgid "&Ntilde;"
-msgstr ""
+msgstr "Ñ"
 
 #. module: pad
 #: model:ir.model,name:pad.model_pad_common
 msgid "pad.common"
-msgstr ""
+msgstr "pad.common"
 
 #. module: pad
 #: help:res.company,pad_key:0
 msgid "Etherpad lite api key."
-msgstr ""
+msgstr "chave da api do Etherpad lite."
 
 #. module: pad
 #: model:ir.model,name:pad.model_res_company
@@ -47,26 +47,28 @@ msgid ""
 "You must configure the etherpad through the menu Setting > Companies > "
 "Companies, in the configuration tab of your company."
 msgstr ""
+"Você deve configurar o etherpad através do menu Configuração > Empresas > "
+"Empresas, na aba de configuração da sua empresa."
 
 #. module: pad
 #: view:res.company:0
 msgid "Pads"
-msgstr ""
+msgstr "Pads"
 
 #. module: pad
 #: field:res.company,pad_server:0
 msgid "Pad Server"
-msgstr ""
+msgstr "Servidor Pad"
 
 #. module: pad
 #: field:res.company,pad_key:0
 msgid "Pad Api Key"
-msgstr ""
+msgstr "Chave da Api Pad"
 
 #. module: pad
 #: help:res.company,pad_server:0
 msgid "Etherpad lite server. Example: beta.primarypad.com"
-msgstr ""
+msgstr "Servidor Etherpad lite. Exemplo: beta.primarypad.com"
 
 #, python-format
 #~ msgid "Write"
diff --git a/addons/pad_project/i18n/pt_BR.po b/addons/pad_project/i18n/pt_BR.po
index 4237a4de38e..176293a343c 100644
--- a/addons/pad_project/i18n/pt_BR.po
+++ b/addons/pad_project/i18n/pt_BR.po
@@ -8,24 +8,24 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-11-24 02:53+0000\n"
-"PO-Revision-Date: 2012-08-13 03:40+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"PO-Revision-Date: 2012-12-06 13:08+0000\n"
+"Last-Translator: Cristiano Korndörfer <codigo.aberto@dorfer.com.br>\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: 2012-11-25 06:32+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-07 04:36+0000\n"
+"X-Generator: Launchpad (build 16341)\n"
 
 #. module: pad_project
 #: constraint:project.task:0
 msgid "Error ! Task end-date must be greater then task start-date"
-msgstr "Erro ! A data final deve ser maior do que a data inicial"
+msgstr "Erro ! A data final da tarefa deve ser maior do que a data inicial"
 
 #. module: pad_project
 #: field:project.task,description_pad:0
 msgid "Description PAD"
-msgstr ""
+msgstr "Descrição do Pad"
 
 #. module: pad_project
 #: model:ir.model,name:pad_project.model_project_task
diff --git a/addons/portal/i18n/fr.po b/addons/portal/i18n/fr.po
index 6c3ab1ed8e0..252fb6924d2 100644
--- a/addons/portal/i18n/fr.po
+++ b/addons/portal/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: 2012-12-03 16:03+0000\n"
-"PO-Revision-Date: 2011-09-26 12:28+0000\n"
-"Last-Translator: Numérigraphe <Unknown>\n"
+"PO-Revision-Date: 2012-12-06 17:21+0000\n"
+"Last-Translator: Quentin THEURET <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: 2012-12-04 05:53+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-07 04:36+0000\n"
+"X-Generator: Launchpad (build 16341)\n"
 
 #. module: portal
 #: view:portal.payment.acquirer:0
@@ -304,7 +304,7 @@ msgstr "Courriel requis"
 #. module: portal
 #: model:ir.ui.menu,name:portal.portal_messages
 msgid "Messaging"
-msgstr ""
+msgstr "Messagerie"
 
 #. module: portal
 #: code:addons/portal/wizard/portal_wizard.py:195
diff --git a/addons/portal_claim/i18n/pt_BR.po b/addons/portal_claim/i18n/pt_BR.po
new file mode 100644
index 00000000000..2969563a759
--- /dev/null
+++ b/addons/portal_claim/i18n/pt_BR.po
@@ -0,0 +1,44 @@
+# Brazilian Portuguese translation for openobject-addons
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-11-24 02:53+0000\n"
+"PO-Revision-Date: 2012-12-06 13:10+0000\n"
+"Last-Translator: Cristiano Korndörfer <codigo.aberto@dorfer.com.br>\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: 2012-12-07 04:36+0000\n"
+"X-Generator: Launchpad (build 16341)\n"
+
+#. module: portal_claim
+#: model:ir.actions.act_window,help:portal_claim.crm_case_categ_claim0
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to register a new claim. \n"
+"              </p><p>\n"
+"                You can track your claims from this menu and the action we\n"
+"                will take.\n"
+"              </p>\n"
+"            "
+msgstr ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Clique para registrar uma nova reclamação. \n"
+"              </p><p>\n"
+"                Você pode acompanhar suas reclamações através deste menu e a "
+"ação\n"
+"                que tomaremos.\n"
+"              </p>\n"
+"            "
+
+#. module: portal_claim
+#: model:ir.actions.act_window,name:portal_claim.crm_case_categ_claim0
+#: model:ir.ui.menu,name:portal_claim.portal_after_sales_claims
+msgid "Claims"
+msgstr "Reclamações"
diff --git a/addons/portal_sale/i18n/pt_BR.po b/addons/portal_sale/i18n/pt_BR.po
index 65598ecb25e..51625447fc5 100644
--- a/addons/portal_sale/i18n/pt_BR.po
+++ b/addons/portal_sale/i18n/pt_BR.po
@@ -8,29 +8,29 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-12-03 16:03+0000\n"
-"PO-Revision-Date: 2012-12-04 21:39+0000\n"
+"PO-Revision-Date: 2012-12-06 17:05+0000\n"
 "Last-Translator: Cristiano Korndörfer <codigo.aberto@dorfer.com.br>\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: 2012-12-05 05:20+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-07 04:36+0000\n"
+"X-Generator: Launchpad (build 16341)\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
 #: model:ir.actions.act_window,help:portal_sale.portal_action_invoices
 msgid "We haven't sent you any invoice."
-msgstr "Não foi enviada nenhuma fatura."
+msgstr "Não foi enviada nenhuma fatura para você."
 
 #. module: portal_sale
 #: model:ir.actions.act_window,help:portal_sale.action_orders_portal
 msgid "We haven't sent you any sale order."
-msgstr "Não foi enviado nenhum pedido de venda."
+msgstr "Não foi enviado nenhum pedido de venda para você."
 
 #. module: portal_sale
 #: model:res.groups,name:portal_sale.group_payment_options
@@ -48,11 +48,13 @@ 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 "
+"'Quotation' or 'Order'} (Ref ${object.name or 'n/a' })"
 
 #. module: portal_sale
 #: model:ir.actions.act_window,help:portal_sale.action_quotations_portal
 msgid "We haven't sent you any quotation."
-msgstr "Não foi enviada nenhuma cotação."
+msgstr "Não foi enviada nenhuma cotação para você."
 
 #. module: portal_sale
 #: model:ir.ui.menu,name:portal_sale.portal_sales_orders
@@ -183,6 +185,129 @@ 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>Olá${object.partner_id.name and ' ' or ''}${object.partner_id.name or "
+"''},</p>\n"
+"\n"
+"    <p>Uma nova fatura está disponível para você: </p>\n"
+"    \n"
+"    <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
+"       &nbsp;&nbsp;<strong>REFERÊNCIAS</strong><br />\n"
+"       &nbsp;&nbsp;Número da Fatura: <strong>${object.number}</strong><br "
+"/>\n"
+"       &nbsp;&nbsp;Total Faturado: <strong>${object.amount_total} "
+"${object.currency_id.name}</strong><br />\n"
+"       &nbsp;&nbsp;Data de Faturamento: ${object.date_invoice}<br />\n"
+"       % if object.origin:\n"
+"       &nbsp;&nbsp;Pedido de Referência: ${object.origin}<br />\n"
+"       % endif\n"
+"       % if object.user_id:\n"
+"       &nbsp;&nbsp;Seu contato: <a href=\"mailto:${object.user_id.email or "
+"''}?subject=Invoice%20${object.number}\">${object.user_id.name}</a>\n"
+"       % endif\n"
+"    </p>  \n"
+"\n"
+"    <%\n"
+"    action = 'portal_sale.portal_action_invoices'\n"
+"    object.partner_id.signup_prepare()\n"
+"    signup_url = "
+"object.partner_id._get_signup_url_for_action(action=action,view_type='form',r"
+"es_id=object.id)[object.partner_id.id]\n"
+"    %>\n"
+"    % if signup_url:\n"
+"    <p>\n"
+"    Você pode acessar o documento da fatura e pagar online através do nosso "
+"Portal de Atendimento:\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}\">Ver Fatura</a>\n"
+"    % endif\n"
+"    \n"
+"    % if object.company_id.paypal_account and object.type in ('out_invoice', "
+"'in_refund'):\n"
+"    <% \n"
+"    comp_name = quote(object.company_id.name)\n"
+"    inv_number = quote(object.number)\n"
+"    paypal_account = quote(object.company_id.paypal_account)\n"
+"    inv_amount = quote(str(object.residual))\n"
+"    cur_name = quote(object.currency_id.name)\n"
+"    paypal_url = \"https://www.paypal.com/cgi-"
+"bin/webscr?cmd=_xclick&amp;business=%s&amp;item_name=%s%%20Invoice%%20%s&amp;"
+"\" \\\n"
+"                 "
+"\"invoice=%s&amp;amount=%s&amp;currency_code=%s&amp;button_subtype=services&a"
+"mp;no_note=1&amp;bn=OpenERP_Invoice_PayNow_%s\" % \\\n"
+"                 "
+"(paypal_account,comp_name,inv_number,inv_number,inv_amount,cur_name,cur_name)"
+"\n"
+"    %>\n"
+"    <br/>\n"
+"    <p>Também é possível pagar diretamente pelo Paypal:</p>\n"
+"        <a style=\"margin-left: 120px;\" href=\"${paypal_url}\">\n"
+"            <img class=\"oe_edi_paypal_button\" "
+"src=\"https://www.paypal.com/pt_BR/BR/i/btn/btn_paynowCC_LG.gif\"/>\n"
+"        </a>\n"
+"    % endif\n"
+"    \n"
+"    <br/>\n"
+"    <p>Se você possui alguma dúvida ou sugestão, entre em contato "
+"conosco.</p>\n"
+"    <p>Obrigado por escolher ${object.company_id.name or 'nossa "
+"empresa'}!</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: "
+"#FFF;\">\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"
+"                Telefone:&nbsp; ${object.company_id.phone}\n"
+"            </div>\n"
+"        % endif\n"
+"        % if object.company_id.website:\n"
+"            <div>\n"
+"                Site :&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:res.groups,comment:portal_sale.group_payment_options
@@ -203,11 +328,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} Invoice (Ref ${object.number or 'n/a' })"
 
 #. module: portal_sale
 #: model:ir.model,name:portal_sale.model_mail_mail
@@ -381,6 +508,134 @@ 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>Olá${object.partner_id.name and ' ' or ''}${object.partner_id.name or "
+"''},</p>\n"
+"    \n"
+"    <p>Esta é sua ${object.state in ('draft', 'sent') and 'quotation' or "
+"'order confirmation'} de ${object.company_id.name}: </p>\n"
+"\n"
+"    <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
+"       &nbsp;&nbsp;<strong>REFERÊNCIAS</strong><br />\n"
+"       &nbsp;&nbsp;Número do Pedido: <strong>${object.name}</strong><br />\n"
+"       &nbsp;&nbsp;Valor Total do Pedido: <strong>${object.amount_total} "
+"${object.pricelist_id.currency_id.name}</strong><br />\n"
+"       &nbsp;&nbsp;Data do Pedido: ${object.date_order}<br />\n"
+"       % if object.origin:\n"
+"       &nbsp;&nbsp;Referência do Pedido: ${object.origin}<br />\n"
+"       % endif\n"
+"       % if object.client_order_ref:\n"
+"       &nbsp;&nbsp;Sua referência: ${object.client_order_ref}<br />\n"
+"       % endif\n"
+"       % if object.user_id:\n"
+"       &nbsp;&nbsp;Seu contato: <a href=\"mailto:${object.user_id.email or "
+"''}?subject=Order%20${object.name}\">${object.user_id.name}</a>\n"
+"       % endif\n"
+"    </p>\n"
+"\n"
+"    <%\n"
+"    action = 'portal_sale.action_quotations_portal' if object.state in "
+"('draft', 'sent') else 'portal_sale.action_orders_portal'\n"
+"    object.partner_id.signup_prepare()\n"
+"    signup_url = "
+"object.partner_id._get_signup_url_for_action(action=action,view_type='form',r"
+"es_id=object.id)[object.partner_id.id]\n"
+"    %>\n"
+"    % if signup_url:\n"
+"    <p>\n"
+"    Você pode acessar o documento e pagar online através do nosso Portal de "
+"Atendimento:\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}\">View ${object.state in ('draft', 'sent') "
+"and 'Quotation' or 'Order'}</a>\n"
+"    % endif\n"
+"\n"
+"    % if object.order_policy in ('prepaid','manual') and "
+"object.company_id.paypal_account and object.state != 'draft':\n"
+"    <%\n"
+"    comp_name = quote(object.company_id.name)\n"
+"    order_name = quote(object.name)\n"
+"    paypal_account = quote(object.company_id.paypal_account)\n"
+"    order_amount = quote(str(object.residual))\n"
+"    cur_name = quote(object.pricelist_id.currency_id.name)\n"
+"    paypal_url = \"https://www.paypal.com/cgi-"
+"bin/webscr?cmd=_xclick&amp;business=%s&amp;item_name=%s%%20Order%%20%s\" \\\n"
+"       "
+"\"&amp;invoice=%s&amp;amount=%s&amp;currency_code=%s&amp;button_subtype=servi"
+"ces&amp;no_note=1\" \\\n"
+"       \"&amp;bn=OpenERP_Order_PayNow_%s\" % \\\n"
+"       "
+"(paypal_account,comp_name,order_name,order_name,order_amount,cur_name,cur_nam"
+"e)\n"
+"    %>\n"
+"    <br/>\n"
+"    <p>Também é possível pagar diretamente pelo Paypal:</p>\n"
+"        <a style=\"margin-left: 120px;\" href=\"${paypal_url}\">\n"
+"            <img class=\"oe_edi_paypal_button\" "
+"src=\"https://www.paypal.com/pt_BR/BR/i/btn/btn_paynowCC_LG.gif\"/>\n"
+"        </a>\n"
+"    % endif\n"
+"\n"
+"    <br/>\n"
+"    <p>Se você possui alguma dúvida ou sugestão, entre em contato "
+"conosco.</p>\n"
+"    <p>Obrigado por escolher ${object.company_id.name or 'nossa "
+"empresa'}!</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: "
+"#FFF;\">\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"
+"                Telefone:&nbsp; ${object.company_id.phone}\n"
+"            </div>\n"
+"        % endif\n"
+"        % if object.company_id.website:\n"
+"            <div>\n"
+"                Site :&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.model,name:portal_sale.model_account_invoice
@@ -398,3 +653,5 @@ msgid ""
 "${(object.name or '').replace('/','_')}_${object.state == 'draft' and "
 "'draft' or ''}"
 msgstr ""
+"${(object.name or '').replace('/','_')}_${object.state == 'draft' and "
+"'draft' or ''}"
diff --git a/addons/project/i18n/pt_BR.po b/addons/project/i18n/pt_BR.po
index cdc9fb60ac4..7a01ea56051 100644
--- a/addons/project/i18n/pt_BR.po
+++ b/addons/project/i18n/pt_BR.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: pt_BR\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2012-12-03 16:02+0000\n"
-"PO-Revision-Date: 2012-12-04 14:58+0000\n"
+"PO-Revision-Date: 2012-12-06 18:51+0000\n"
 "Last-Translator: Cristiano Korndörfer <codigo.aberto@dorfer.com.br>\n"
 "Language-Team: <pt@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-05 05:18+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-07 04:34+0000\n"
+"X-Generator: Launchpad (build 16341)\n"
 
 #. module: project
 #: view:project.project:0
@@ -262,7 +262,7 @@ msgstr "Contrato/Analítico"
 #. module: project
 #: view:project.config.settings:0
 msgid "Project Management"
-msgstr "Gerência de Projeto"
+msgstr "Gerenciamento de Projetos"
 
 #. module: project
 #: model:ir.actions.act_window,name:project.action_project_task_delegate
@@ -452,7 +452,7 @@ msgstr "Validar tempo planejado"
 #. module: project
 #: field:project.config.settings,module_pad:0
 msgid "Use integrated collaborative note pads on task"
-msgstr ""
+msgstr "Utilizar as notas colaborativas pads nas tarefas"
 
 #. module: project
 #: model:process.node,note:project.process_node_opentask0
@@ -467,7 +467,7 @@ msgstr "Apelido"
 #. module: project
 #: view:project.task:0
 msgid "oe_kanban_text_red"
-msgstr ""
+msgstr "oe_kanban_text_red"
 
 #. module: project
 #: view:project.task:0
@@ -669,7 +669,7 @@ msgstr ""
 "Você pode definir\n"
 "                  projetos internos (R&amp;D, Melhoria no Processo de "
 "Vendas),\n"
-"                  projetos pessoais (Meus A Fazer) ou ou para clientes.\n"
+"                  projetos pessoais (Meus A Fazer) ou para clientes.\n"
 "                </p><p>\n"
 "                  Você poderá colaborar com os projetos de usuários "
 "internos\n"
@@ -823,7 +823,7 @@ msgstr "Tarefas delegadas"
 #. module: project
 #: model:ir.model,name:project.model_project_task_work
 msgid "Project Task Work"
-msgstr "Tarefa de Projeto em Andamento"
+msgstr "Trabalho da Tarefa do Projeto"
 
 #. module: project
 #: code:addons/project/wizard/project_task_delegate.py:81
@@ -877,7 +877,7 @@ msgstr "Filtros Extendidos..."
 #. module: project
 #: model:ir.ui.menu,name:project.menu_tasks_config
 msgid "GTD"
-msgstr ""
+msgstr "GTD"
 
 #. module: project
 #: help:project.task,state:0
@@ -888,6 +888,10 @@ msgid ""
 "the case needs to be reviewed then the status is                       set "
 "to 'Pending'."
 msgstr ""
+"A situação é definida como 'Rascunho' quando o caso é criado. Se o caso está "
+"em progresso, a situação muda para 'Aberto'. Quando o caso termina, a "
+"situação é definida como 'Concluído'. Se o caso precisa ser revisado, a "
+"situação é definida como 'Pendente'."
 
 #. module: project
 #: model:ir.model,name:project.model_res_company
@@ -928,7 +932,7 @@ msgstr ""
 #. module: project
 #: view:project.task:0
 msgid "10"
-msgstr ""
+msgstr "10"
 
 #. module: project
 #: code:addons/project/project.py:566
@@ -1109,7 +1113,7 @@ msgstr "Reabrir projeto"
 #. module: project
 #: help:project.project,priority:0
 msgid "Gives the sequence order when displaying the list of projects"
-msgstr "Fornece a ordem sequencial ao exibir a lista de projectos"
+msgstr "Fornece a ordem sequencial ao exibir a lista de projetos"
 
 #. module: project
 #: constraint:project.project:0
@@ -1143,7 +1147,7 @@ msgstr "Tarefas Pai"
 #. module: project
 #: model:ir.actions.server,name:project.actions_server_project_read
 msgid "Project: Mark read"
-msgstr "Projeto: Marcar Lido"
+msgstr "Projeto: Marcar como Lido"
 
 #. module: project
 #: model:process.node,name:project.process_node_opentask0
@@ -1205,6 +1209,10 @@ msgid ""
 "stage. For example, if a stage is related to the status 'Close', when your "
 "document reaches this stage, it is automatically closed."
 msgstr ""
+"A situação do seu documento é automaticamente alterada de acordo com o "
+"estágio selecionado. Por exemplo, se um estágio é relacionado à situação "
+"'Fechado', e seu documento muda para este estágio, ele é automaticamente "
+"fechado."
 
 #. module: project
 #: view:project.task:0
@@ -1380,7 +1388,7 @@ msgstr "Unidade de Tempo de Trabalho"
 #. module: project
 #: view:project.project:0
 msgid "Projects in which I am a member."
-msgstr "Projetos nos quais eu sou um membro."
+msgstr "Projetos dos quais eu sou um membro."
 
 #. module: project
 #: selection:project.task,priority:0
@@ -1442,7 +1450,7 @@ msgstr "Ativo"
 #. module: project
 #: model:ir.model,name:project.model_project_category
 msgid "Category of project's task, issue, ..."
-msgstr "Categoria da tarefa ou incidente do projeto"
+msgstr "Categoria da tarefa do projeto, incidente, ..."
 
 #. module: project
 #: help:project.project,resource_calendar_id:0
@@ -1574,7 +1582,7 @@ msgstr "Horas Totais"
 #. module: project
 #: model:ir.model,name:project.model_project_config_settings
 msgid "project.config.settings"
-msgstr ""
+msgstr "project.config.settings"
 
 #. module: project
 #: view:project.project:0
@@ -1613,6 +1621,11 @@ msgid ""
 "                (by default, http://ietherpad.com/).\n"
 "                This installs the module pad."
 msgstr ""
+"Permite à empresa personalizar qual instalação de Pad (bloco de notas) deve "
+"ser utilizada\n"
+"                para conectar novos pads (por padrão, "
+"http://ietherpad.com/).\n"
+"                O módulo pad será instalado."
 
 #. module: project
 #: field:project.task,id:0
@@ -1722,6 +1735,12 @@ msgid ""
 "                editing and deleting either ways.\n"
 "                This installs the module project_timesheet."
 msgstr ""
+"Permite transferir as entradas dentro de tarefas definidas no Gerenciamento "
+"de Projetos\n"
+"                para entradas de planilha de horas com uma data e usuário "
+"específicos, com o\n"
+"                efeito de criar, editar e excluir de várias formas.\n"
+"                O módulo project_timesheet será instalado."
 
 #. module: project
 #: field:project.config.settings,module_project_issue:0
@@ -1999,6 +2018,13 @@ msgid ""
 "'Manufacture'.\n"
 "                This installs the module project_mrp."
 msgstr ""
+"Este recurso cria automaticamente tarefas de projeto a partir de serviços em "
+"um pedido de venda.\n"
+"                Mais precisamente, tarefas são criadas para linhas de "
+"obtenção com o produto do tipo 'Serviço',\n"
+"                método de obtenção 'Fazer pedido' e método de fornecimento "
+"'Fabricação'.\n"
+"                O módulo project_mrp será instalado."
 
 #. module: project
 #: help:project.task.delegate,planned_hours:0
@@ -2099,7 +2125,7 @@ msgstr "Janeiro"
 #. module: project
 #: model:ir.actions.server,name:project.actions_server_project_unread
 msgid "Project: Mark unread"
-msgstr "Projeto: Marcar não lido"
+msgstr "Projeto: Marcar como não lido"
 
 #. module: project
 #: field:project.task.delegate,prefix:0
@@ -2173,6 +2199,9 @@ msgid ""
 "resource allocation.\n"
 "                This installs the module project_long_term."
 msgstr ""
+"Um módulo de gerenciamento de projetos a longo prazo que rastreia o "
+"planejamento, agendamento e alocação de recursos.\n"
+"                O módulo project_long_term será instalado."
 
 #. module: project
 #: selection:report.project.task.user,month:0
@@ -2200,17 +2229,20 @@ msgid ""
 "Provides timesheet support for the issues/bugs management in project.\n"
 "                This installs the module project_issue_sheet."
 msgstr ""
+"Fornece suporte a planilha de horas para o gerenciamento de "
+"incidentes/problemas em um projeto.\n"
+"                O módulo project_issue_sheet será instalado."
 
 #. module: project
 #: selection:project.project,privacy_visibility:0
 msgid "Followers Only"
-msgstr ""
+msgstr "Somente Seguidores"
 
 #. module: project
 #: view:board.board:0
 #: field:project.project,task_count:0
 msgid "Open Tasks"
-msgstr ""
+msgstr "Tarefas Abertas"
 
 #. module: project
 #: field:project.project,priority:0
diff --git a/addons/project_gtd/i18n/pt_BR.po b/addons/project_gtd/i18n/pt_BR.po
index acc789c6945..fff929d7eec 100644
--- a/addons/project_gtd/i18n/pt_BR.po
+++ b/addons/project_gtd/i18n/pt_BR.po
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2012-12-03 16:04+0000\n"
-"PO-Revision-Date: 2012-01-16 14:06+0000\n"
-"Last-Translator: Rafael Sales - http://www.tompast.com.br <Unknown>\n"
+"PO-Revision-Date: 2012-12-06 17:34+0000\n"
+"Last-Translator: Cristiano Korndörfer <codigo.aberto@dorfer.com.br>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:37+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-07 04:35+0000\n"
+"X-Generator: Launchpad (build 16341)\n"
 
 #. module: project_gtd
 #: view:project.task:0
@@ -81,7 +81,7 @@ msgstr "Hoje"
 #. module: project_gtd
 #: view:project.task:0
 msgid "Timeframe"
-msgstr ""
+msgstr "Período"
 
 #. module: project_gtd
 #: model:project.gtd.timebox,name:project_gtd.timebox_lt
@@ -194,7 +194,7 @@ msgstr "project.gtd.timebox"
 #: code:addons/project_gtd/wizard/project_gtd_empty.py:52
 #, python-format
 msgid "Error!"
-msgstr ""
+msgstr "Erro!"
 
 #. module: project_gtd
 #: model:ir.actions.act_window,name:project_gtd.open_gtd_timebox_tree
@@ -224,7 +224,7 @@ msgstr "Seleção de tarefas"
 #. module: project_gtd
 #: view:project.task:0
 msgid "Display"
-msgstr ""
+msgstr "Exibir"
 
 #. module: project_gtd
 #: model:project.gtd.context,name:project_gtd.context_office
@@ -297,7 +297,7 @@ msgstr "Para reabrir as tarefas"
 #. module: project_gtd
 #: view:project.timebox.fill.plan:0
 msgid "or"
-msgstr ""
+msgstr "ou"
 
 #~ msgid ""
 #~ "The Object name must start with x_ and not contain any special character !"
diff --git a/addons/project_issue/i18n/pt_BR.po b/addons/project_issue/i18n/pt_BR.po
index c271005eca0..3bafb098d83 100644
--- a/addons/project_issue/i18n/pt_BR.po
+++ b/addons/project_issue/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: 2012-12-03 16:02+0000\n"
-"PO-Revision-Date: 2012-12-04 16:20+0000\n"
+"PO-Revision-Date: 2012-12-06 19:01+0000\n"
 "Last-Translator: Cristiano Korndörfer <codigo.aberto@dorfer.com.br>\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: 2012-12-05 05:20+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-07 04:36+0000\n"
+"X-Generator: Launchpad (build 16341)\n"
 
 #. module: project_issue
 #: model:project.category,name:project_issue.project_issue_category_03
@@ -45,7 +45,7 @@ msgstr "Agrupar Por..."
 #. module: project_issue
 #: field:project.issue,working_hours_open:0
 msgid "Working Hours to Open the Issue"
-msgstr "Horas Trabalhadas para Abrir o Caso"
+msgstr "Horas Trabalhadas para Abrir o Incidente"
 
 #. module: project_issue
 #: field:project.issue,date_open:0
@@ -82,7 +82,7 @@ msgstr "<b>escalado</b>."
 #. module: project_issue
 #: model:ir.actions.server,name:project_issue.actions_server_project_issue_unread
 msgid "Issue: Mark unread"
-msgstr "Incidente: Marcar não lido"
+msgstr "Incidente: Marcar como não lido"
 
 #. module: project_issue
 #: field:project.issue,email_cc:0
@@ -111,7 +111,7 @@ msgid ""
 "You cannot escalate this issue.\n"
 "The relevant Project has not configured the Escalation Project!"
 msgstr ""
-"Você não pode escalonar este caso.\n"
+"Você não pode escalonar este incidente.\n"
 "O Projeto em questão não foi configurado como Projeto Escalonado!"
 
 #. module: project_issue
@@ -210,7 +210,7 @@ msgstr "Data do Fechamento"
 #. module: project_issue
 #: view:project.issue:0
 msgid "Issue Tracker Search"
-msgstr "Rastreador de Incidentes"
+msgstr "Pesquisar no Rastreador de Incidentes"
 
 #. module: project_issue
 #: field:project.issue,color:0
@@ -248,8 +248,8 @@ msgid ""
 "If any issue is escalated from the current Project, it will be listed under "
 "the project selected here."
 msgstr ""
-"Se esta questão for escalonada do Projeto atual, ela será listada abaixo do "
-"projeto selecionado aqui."
+"Se qualquer incidente for escalonado do Projeto atual, ele será listado "
+"abaixo do projeto selecionado aqui."
 
 #. module: project_issue
 #: view:project.issue:0
@@ -264,10 +264,11 @@ msgid ""
 "analyse the time required to open or close an issue, the number of email to "
 "exchange and the time spent on average by issues."
 msgstr ""
-"Este relatório nos casos do projeto te permitem analisar a qualidade do seu "
-"suporte ou do pós-venda. Você pode rastrear as questões por período. Você "
-"pode analisar o tempo necessário para abrir ou fechar uma questão, o número "
-"de emails trocados e o tempo gasto em média por questão."
+"Este relatório nos incidentes de projeto permite analisar a qualidade do seu "
+"suporte ou dos serviços pós-venda. Você pode rastrear os incidentes por "
+"período. Você pode analisar o tempo necessário para abrir ou fechar um "
+"incidente, o número de e-mails trocados e o tempo gasto em média por "
+"incidente."
 
 #. module: project_issue
 #: view:project.issue:0
@@ -354,7 +355,7 @@ msgstr "%s (cópia)"
 #. module: project_issue
 #: view:project.issue:0
 msgid "Unassigned Issues"
-msgstr "Questões não atribuídas"
+msgstr "Incidentes não atribuídos"
 
 #. module: project_issue
 #: field:project.issue,create_date:0
@@ -372,7 +373,7 @@ msgstr "Versões"
 #. module: project_issue
 #: view:project.issue:0
 msgid "To Do Issues"
-msgstr "Questões a Serem Feitas"
+msgstr "Incidentes A Serem Feitos"
 
 #. module: project_issue
 #: model:ir.model,name:project_issue.model_project_issue_version
@@ -414,7 +415,7 @@ msgstr "Fase"
 #: model:ir.ui.menu,name:project_issue.menu_project_issue_report_tree
 #: view:project.issue.report:0
 msgid "Issues Analysis"
-msgstr "Análise de Questões"
+msgstr "Análise de Incidentes"
 
 #. module: project_issue
 #: code:addons/project_issue/project_issue.py:493
@@ -425,7 +426,7 @@ msgstr "Sem Assunto"
 #. module: project_issue
 #: model:ir.actions.act_window,name:project_issue.action_view_my_project_issue_tree
 msgid "My Project Issues"
-msgstr "Minhas Questões do Projeto"
+msgstr "Meus Incidentes do Projeto"
 
 #. module: project_issue
 #: view:project.issue:0
@@ -460,7 +461,7 @@ msgstr "Nº de Incidentes"
 #. module: project_issue
 #: model:ir.actions.server,name:project_issue.actions_server_project_issue_read
 msgid "Issue: Mark read"
-msgstr "Incidente: Marcar lido"
+msgstr "Incidente: Marcar como lido"
 
 #. module: project_issue
 #: selection:project.issue.report,month:0
@@ -475,7 +476,7 @@ msgstr "Marcadores"
 #. module: project_issue
 #: view:project.issue:0
 msgid "Issue Tracker Tree"
-msgstr "Árvore de Rastreamento de Questões"
+msgstr "Árvore do Rastreador de Incidentes"
 
 #. module: project_issue
 #: model:project.category,name:project_issue.project_issue_category_01
@@ -532,7 +533,7 @@ msgstr "E-mail do Usuário"
 #. module: project_issue
 #: view:project.issue.report:0
 msgid "#Number of Project Issues"
-msgstr "#Número de Questões de Projeto"
+msgstr "Número de Incidentes do Projeto"
 
 #. module: project_issue
 #: help:project.issue,channel_id:0
@@ -589,7 +590,7 @@ msgstr "Status"
 #. module: project_issue
 #: view:project.issue.report:0
 msgid "#Project Issues"
-msgstr "#Questões do Projeto"
+msgstr "Nº de Incidentes do Projeto"
 
 #. module: project_issue
 #: selection:project.issue.report,month:0
@@ -625,7 +626,7 @@ msgstr "Histórico de mensagens e comunicação"
 #. module: project_issue
 #: view:project.issue:0
 msgid "New Issues"
-msgstr "Novas Questões"
+msgstr "Novos Incidentes"
 
 #. module: project_issue
 #: field:project.issue,day_close:0
@@ -646,6 +647,10 @@ msgid ""
 "the case needs to be reviewed then the status is                       set "
 "to 'Pending'."
 msgstr ""
+"A situação é definida como 'Rascunho' quando o caso é criado. Se o caso está "
+"em progresso, a situação muda para 'Aberto'. Quando o caso termina, a "
+"situação é definida como 'Concluído'. Se o caso precisa ser revisado, a "
+"situação é definida como 'Pendente'."
 
 #. module: project_issue
 #: field:project.issue,active:0
@@ -693,7 +698,7 @@ msgstr "Janeiro"
 #. module: project_issue
 #: view:project.issue:0
 msgid "Feature Tracker Tree"
-msgstr "Árvore de Recursos"
+msgstr "Árvore do Rastreador de Recursos"
 
 #. module: project_issue
 #: help:project.issue,email_from:0
@@ -778,7 +783,7 @@ msgstr "A fazer"
 #: model:ir.model,name:project_issue.model_project_issue
 #: view:project.issue.report:0
 msgid "Project Issue"
-msgstr "Questões do Projeto"
+msgstr "Incidente do Projeto"
 
 #. module: project_issue
 #: view:project.issue:0
@@ -820,12 +825,12 @@ msgstr "Estágio alterado para <b>%s</b>."
 #. module: project_issue
 #: model:project.category,name:project_issue.project_issue_category_02
 msgid "PBCK"
-msgstr ""
+msgstr "PBCK"
 
 #. module: project_issue
 #: view:project.issue:0
 msgid "Feature Tracker Search"
-msgstr "Procurar Recurso"
+msgstr "Pesquisar no Rastreador de Recursos"
 
 #. module: project_issue
 #: view:project.issue:0
@@ -845,7 +850,7 @@ msgstr "Maio"
 #. module: project_issue
 #: model:ir.model,name:project_issue.model_project_config_settings
 msgid "project.config.settings"
-msgstr ""
+msgstr "project.config.settings"
 
 #. module: project_issue
 #: view:project.issue.report:0
@@ -925,7 +930,7 @@ msgstr "Referências"
 #. module: project_issue
 #: field:project.issue,working_hours_close:0
 msgid "Working Hours to Close the Issue"
-msgstr "Horas de Trabalho para Concluir a Questão"
+msgstr "Horas de Trabalho para Concluir o Incidente"
 
 #. module: project_issue
 #: field:project.issue,id:0
@@ -940,7 +945,7 @@ msgstr "project.issue.report"
 #. module: project_issue
 #: help:project.issue.report,delay_close:0
 msgid "Number of Days to close the project issue"
-msgstr "Número de dias para fechar a questão do projeto."
+msgstr "Número de dias para fechar o incidente do projeto."
 
 #. module: project_issue
 #: field:project.issue.report,working_hours_close:0
diff --git a/addons/project_issue_sheet/i18n/pt_BR.po b/addons/project_issue_sheet/i18n/pt_BR.po
index be8ee860908..6e3418f9dc8 100644
--- a/addons/project_issue_sheet/i18n/pt_BR.po
+++ b/addons/project_issue_sheet/i18n/pt_BR.po
@@ -8,21 +8,20 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-12-03 16:04+0000\n"
-"PO-Revision-Date: 2012-08-13 03:17+0000\n"
-"Last-Translator: Fábio Martinelli - http://zupy.com.br "
-"<webmaster@guaru.net>\n"
+"PO-Revision-Date: 2012-12-06 17:36+0000\n"
+"Last-Translator: Cristiano Korndörfer <codigo.aberto@dorfer.com.br>\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: 2012-12-04 05:49+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-07 04:36+0000\n"
+"X-Generator: Launchpad (build 16341)\n"
 
 #. module: project_issue_sheet
 #: code:addons/project_issue_sheet/project_issue_sheet.py:57
 #, python-format
 msgid "The Analytic Account is pending !"
-msgstr ""
+msgstr "A Conta Analítica está pendente !"
 
 #. module: project_issue_sheet
 #: model:ir.model,name:project_issue_sheet.model_account_analytic_line
@@ -42,7 +41,7 @@ msgstr "Linha da Planilhao de Horas"
 #. module: project_issue_sheet
 #: view:project.issue:0
 msgid "on_change_project(project_id)"
-msgstr ""
+msgstr "on_change_project(project_id)"
 
 #. module: project_issue_sheet
 #: code:addons/project_issue_sheet/project_issue_sheet.py:57
diff --git a/addons/project_timesheet/i18n/pt_BR.po b/addons/project_timesheet/i18n/pt_BR.po
index 52c6c4495a3..2e15734e772 100644
--- a/addons/project_timesheet/i18n/pt_BR.po
+++ b/addons/project_timesheet/i18n/pt_BR.po
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2012-12-03 16:04+0000\n"
-"PO-Revision-Date: 2011-01-26 00:43+0000\n"
-"Last-Translator: Adriano Prado <adrianojprado@hotmail.com>\n"
+"PO-Revision-Date: 2012-12-06 17:53+0000\n"
+"Last-Translator: Cristiano Korndörfer <codigo.aberto@dorfer.com.br>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:39+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-07 04:36+0000\n"
+"X-Generator: Launchpad (build 16341)\n"
 
 #. module: project_timesheet
 #: view:report.timesheet.task.user:0
@@ -43,6 +43,8 @@ msgid ""
 "You cannot delete a partner which is assigned to project, but you can "
 "uncheck the active box."
 msgstr ""
+"Não é possível excluir um parceiro que está atribuído a um projeto, mas você "
+"pode desmarcar a caixa 'Ativo'."
 
 #. module: project_timesheet
 #: model:ir.model,name:project_timesheet.model_project_task_work
@@ -55,11 +57,13 @@ msgstr "Tarefa de Projeto em Andamento"
 msgid ""
 "You cannot select a Analytic Account which is in Close or Cancelled state."
 msgstr ""
+"Não é possível selecionar uma Conta Analítica que está nas situações Fechada "
+"ou Cancelada."
 
 #. module: project_timesheet
 #: view:report.timesheet.task.user:0
 msgid "Group By..."
-msgstr "Agrupado Por..."
+msgstr "Agrupar Por..."
 
 #. module: project_timesheet
 #: model:process.node,note:project_timesheet.process_node_triggerinvoice0
@@ -76,7 +80,7 @@ msgstr "Outubro"
 #: view:project.project:0
 #, python-format
 msgid "Timesheets"
-msgstr ""
+msgstr "Planilhas de Horas"
 
 #. module: project_timesheet
 #: view:project.project:0
@@ -94,11 +98,19 @@ msgid ""
 "              </p>\n"
 "            "
 msgstr ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Clique para adicionar um contrato de cliente.\n"
+"              </p><p>\n"
+"                Você encontrará aqui os contratos relacionados a\n"
+"                seus projetos de clientes para acompanhar o processo\n"
+"                de faturamento.\n"
+"              </p>\n"
+"            "
 
 #. module: project_timesheet
 #: view:account.analytic.line:0
 msgid "Analytic Account/Project"
-msgstr ""
+msgstr "Conta Analítica/Projeto"
 
 #. module: project_timesheet
 #: view:account.analytic.line:0
@@ -118,6 +130,9 @@ msgid ""
 "employee.\n"
 "Fill in the HR Settings tab of the employee form."
 msgstr ""
+"Por favor defina produto e propriedades da conta de produto no colaborador "
+"relacionado.\n"
+"Preencha na aba de Configurações de RH do formulário do colaborador."
 
 #. module: project_timesheet
 #: model:ir.model,name:project_timesheet.model_account_analytic_line
@@ -151,6 +166,8 @@ msgid ""
 "Please define journal on the related employee.\n"
 "Fill in the timesheet tab of the employee form."
 msgstr ""
+"Por favor informe o diário no colaborador relacionado\n"
+"Preencha na aba de apontamento de horas no formulário do colaborador."
 
 #. module: project_timesheet
 #: model:ir.ui.menu,name:project_timesheet.menu_hr_timesheet_sign_in
@@ -170,7 +187,7 @@ msgstr "Contratos a Renovar"
 #. module: project_timesheet
 #: view:project.project:0
 msgid "Hours"
-msgstr ""
+msgstr "Horas"
 
 #. module: project_timesheet
 #: view:report.timesheet.task.user:0
@@ -231,6 +248,13 @@ msgid ""
 "              </p>\n"
 "            "
 msgstr ""
+"<p>\n"
+"                Você encontra aqui planilhas de horas e compras feitas para "
+"contratos que podem ser faturados para o cliente.\n"
+"                Se você deseja registrar novos trabalhos para faturar, você "
+"deve utilizar o menu de planilha de horas.\n"
+"              </p>\n"
+"            "
 
 #. module: project_timesheet
 #: model:process.node,name:project_timesheet.process_node_timesheettask0
@@ -291,7 +315,7 @@ msgstr "Codifique quanto tempo você gastou em sua tarefa"
 #: code:addons/project_timesheet/project_timesheet.py:85
 #, python-format
 msgid "Please define employee for user \"%s\". You must create one."
-msgstr ""
+msgstr "Defina um colaborador para o usuário \"%s\". Você deve criá-lo."
 
 #. module: project_timesheet
 #: model:ir.model,name:project_timesheet.model_res_partner
@@ -339,6 +363,8 @@ msgid ""
 "<p>Timesheets on this project may be invoiced to %s, according to the terms "
 "defined in the contract.</p>"
 msgstr ""
+"<p>Planilhas de horas deste projeto devem ser faturadas para %s, de acordo "
+"com os termos definidos no contrato.</p>"
 
 #. module: project_timesheet
 #: model:process.node,note:project_timesheet.process_node_taskwork0
@@ -371,7 +397,7 @@ msgstr "Depois da tarefa concluída, Criar sua nota fiscal"
 #: code:addons/project_timesheet/project_timesheet.py:266
 #, python-format
 msgid "Invalid Action!"
-msgstr ""
+msgstr "Ação Inválida!"
 
 #. module: project_timesheet
 #: view:report.timesheet.task.user:0
@@ -386,6 +412,8 @@ msgid ""
 "<p class=\"oe_view_nocontent_create\">Record your timesheets for the project "
 "'%s'.</p>"
 msgstr ""
+"<p class=\"oe_view_nocontent_create\">Registre suas planilhas de horas para "
+"o projeto '%s'.</p>"
 
 #. module: project_timesheet
 #: field:report.timesheet.task.user,timesheet_hrs:0
diff --git a/addons/sale/i18n/es_AR.po b/addons/sale/i18n/es_AR.po
index 6ae6cb1889f..d602a97bc3f 100644
--- a/addons/sale/i18n/es_AR.po
+++ b/addons/sale/i18n/es_AR.po
@@ -7,19 +7,19 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.0_rc3\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2012-12-03 16:02+0000\n"
-"PO-Revision-Date: 2010-09-21 22:36+0000\n"
-"Last-Translator: Margarita Manterola <ubuntu@marga.com.ar>\n"
+"PO-Revision-Date: 2012-12-06 20:57+0000\n"
+"Last-Translator: Guillermo Bisheimer <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: 2012-12-04 05:31+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-07 04:35+0000\n"
+"X-Generator: Launchpad (build 16341)\n"
 
 #. module: sale
 #: model:ir.model,name:sale.model_account_config_settings
 msgid "account.config.settings"
-msgstr ""
+msgstr "account.config.settings"
 
 #. module: sale
 #: view:sale.order.line:0
@@ -27,11 +27,13 @@ msgid ""
 "Sale Order Lines that are confirmed, done or in exception state and haven't "
 "yet been invoiced"
 msgstr ""
+"Lineas de orden de venta que están confirmadas, realizadas o con el estado "
+"de excepción y que aún no han sido facturadas"
 
 #. module: sale
 #: view:sale.order:0
 msgid "UoS"
-msgstr ""
+msgstr "UdV"
 
 #. module: sale
 #: report:sale.order:0
@@ -42,21 +44,22 @@ msgstr ""
 #: view:sale.report:0
 #: field:sale.report,user_id:0
 msgid "Salesperson"
-msgstr ""
+msgstr "Vendedor"
 
 #. module: sale
 #: help:sale.order,pricelist_id:0
 msgid "Pricelist for current sales order."
-msgstr ""
+msgstr "Tarifa para la orden de venta actual."
 
 #. module: sale
 #: view:sale.report:0
 #: field:sale.report,day:0
 msgid "Day"
-msgstr ""
+msgstr "Día"
 
 #. module: sale
 #: model:process.transition.action,name:sale.process_transition_action_cancelorder0
+#: view:sale.order:0
 msgid "Cancel Order"
 msgstr "Cancelar orden"
 
@@ -64,28 +67,28 @@ msgstr "Cancelar orden"
 #: code:addons/sale/wizard/sale_make_invoice_advance.py:101
 #, python-format
 msgid "Incorrect Data"
-msgstr ""
+msgstr "Datos incorrectos"
 
 #. module: sale
 #: code:addons/sale/wizard/sale_make_invoice_advance.py:102
 #, python-format
 msgid "The value of Advance Amount must be positive."
-msgstr ""
+msgstr "El valor del monto de adelanto debe ser positivo"
 
 #. module: sale
 #: help:sale.order,message_unread:0
 msgid "If checked new messages require your attention."
-msgstr ""
+msgstr "Si está marcado, nuevos mensajes requieren su atención."
 
 #. module: sale
 #: view:res.partner:0
 msgid "False"
-msgstr ""
+msgstr "Falso"
 
 #. module: sale
 #: report:sale.order:0
 msgid "Tax"
-msgstr ""
+msgstr "Impuesto"
 
 #. module: sale
 #: help:sale.order,state:0
@@ -99,6 +102,7 @@ msgid ""
 msgstr ""
 
 #. module: sale
+#: field:sale.order,project_id:0
 #: view:sale.report:0
 #: field:sale.report,analytic_account_id:0
 #: field:sale.shop,project_id:0
@@ -111,17 +115,19 @@ msgid ""
 "Holds the Chatter summary (number of messages, ...). This summary is "
 "directly in html format in order to be inserted in kanban views."
 msgstr ""
+"Guarda el resumen del Chatter (número de mensajes, ...). Este resumen está "
+"en formato HTML para ser insertado directamente en las vistas kanban."
 
 #. module: sale
 #: view:sale.report:0
 #: field:sale.report,product_uom_qty:0
 msgid "# of Qty"
-msgstr ""
+msgstr "# de cantidad"
 
 #. module: sale
 #: help:sale.config.settings,group_discount_per_so_line:0
 msgid "Allows you to apply some discount per sale order line."
-msgstr ""
+msgstr "Permite aplicar un descuento por cada línea de una orden de venta."
 
 #. module: sale
 #: help:sale.config.settings,group_sale_pricelist:0
@@ -129,6 +135,9 @@ msgid ""
 "Allows to manage different prices based on rules per category of customers.\n"
 "Example: 10% for retailers, promotion of 5 EUR on this product, etc."
 msgstr ""
+"Permite manejar diferentes precios basados en reglas según categorías de "
+"cliente.\n"
+"Por ejemplo: 10% para revendedores, promoción de 5 EUR en este producto, etc."
 
 #. module: sale
 #: field:sale.shop,payment_default_id:0
@@ -139,17 +148,17 @@ msgstr "Término de pago predeterminado"
 #: code:addons/sale/sale.py:662
 #, python-format
 msgid "Invoice <b>paid</b>."
-msgstr ""
+msgstr "Factura <b>pagada</b>"
 
 #. module: sale
 #: field:sale.config.settings,group_uom:0
 msgid "Allow using different units of measures"
-msgstr ""
+msgstr "Permitir el uso de diferentes unidades de medida"
 
 #. module: sale
 #: selection:sale.advance.payment.inv,advance_payment_method:0
 msgid "Percentage"
-msgstr ""
+msgstr "Porcentaje"
 
 #. module: sale
 #: report:sale.order:0
@@ -161,6 +170,7 @@ msgstr "Desc.(%)"
 #, python-format
 msgid "Please define income account for this product: \"%s\" (id:%d)."
 msgstr ""
+"Por favor devina la cuenta de ingresos para este producto: \"%s\" (id:%d)."
 
 #. module: sale
 #: view:sale.report:0
@@ -171,12 +181,12 @@ msgstr "Precio total"
 #. module: sale
 #: help:sale.make.invoice,grouped:0
 msgid "Check the box to group the invoices for the same customers"
-msgstr ""
+msgstr "Marque esta opción para agrupar las facturas de los mismos clientes."
 
 #. module: sale
 #: view:sale.order:0
 msgid "My Sale Orders"
-msgstr ""
+msgstr "Mis pedidos de venta"
 
 #. module: sale
 #: help:sale.config.settings,timesheet:0
@@ -202,47 +212,49 @@ msgstr "Referencia de la orden"
 #. module: sale
 #: view:sale.order:0
 msgid "Other Information"
-msgstr ""
+msgstr "Otra información"
 
 #. module: sale
 #: code:addons/sale/wizard/sale_line_invoice.py:109
 #: code:addons/sale/wizard/sale_make_invoice.py:42
 #, python-format
 msgid "Warning!"
-msgstr ""
+msgstr "¡Advertencia!"
 
 #. module: sale
 #: view:sale.config.settings:0
 msgid "Invoicing Process"
-msgstr ""
+msgstr "Proceso de facturación"
 
 #. module: sale
 #: view:sale.order:0
 msgid "Sales Order done"
-msgstr ""
+msgstr "Orden de venta lista"
 
 #. module: sale
 #: model:ir.actions.act_window,name:sale.act_res_partner_2_sale_order
 #: view:res.partner:0
 msgid "Quotations and Sales"
-msgstr ""
+msgstr "Presupuestos y ventas"
 
 #. module: sale
 #: help:sale.config.settings,group_uom:0
 msgid ""
 "Allows you to select and maintain different units of measure for products."
 msgstr ""
+"Permite seleccionar y mantener diferentes unidades de medida para los "
+"productos."
 
 #. module: sale
 #: model:ir.model,name:sale.model_sale_make_invoice
 msgid "Sales Make Invoice"
-msgstr ""
+msgstr "Ventas. Realizar factura"
 
 #. module: sale
 #: code:addons/sale/sale.py:293
 #, python-format
 msgid "Pricelist Warning!"
-msgstr ""
+msgstr "¡Advertencia de la lista de precios!"
 
 #. module: sale
 #: field:sale.order.line,discount:0
@@ -252,7 +264,7 @@ msgstr "Descuento (%)"
 #. module: sale
 #: view:sale.order.line.make.invoice:0
 msgid "Create & View Invoice"
-msgstr ""
+msgstr "Crear y visualizar factura"
 
 #. module: sale
 #: view:board.board:0
@@ -263,7 +275,7 @@ msgstr "Mis cotizaciones"
 #. module: sale
 #: field:sale.config.settings,module_warning:0
 msgid "Allow configuring alerts by customer or products"
-msgstr ""
+msgstr "Permitir configurar alertas por cliente o productos"
 
 #. module: sale
 #: field:sale.shop,name:0
@@ -288,23 +300,23 @@ msgstr ""
 #. module: sale
 #: view:sale.order:0
 msgid "Quotation "
-msgstr ""
+msgstr "Presupuesto "
 
 #. module: sale
 #: code:addons/sale/wizard/sale_make_invoice_advance.py:106
 #, python-format
 msgid "Advance of %s %%"
-msgstr ""
+msgstr "Adelanto del %s %%"
 
 #. module: sale
-#: model:ir.actions.act_window,name:sale.action_orders_exception
+#: model:ir.actions.act_window,name:sale.action_order_tree2
 msgid "Sales in Exception"
 msgstr "Ventas en excepción"
 
 #. module: sale
 #: help:sale.order.line,address_allotment_id:0
 msgid "A partner to whom the particular product needs to be allotted."
-msgstr ""
+msgstr "Un partner al cual debe asignarse el producto."
 
 #. module: sale
 #: view:sale.order:0
@@ -318,7 +330,7 @@ msgstr "Estado"
 #. module: sale
 #: selection:sale.report,month:0
 msgid "August"
-msgstr ""
+msgstr "Agosto"
 
 #. module: sale
 #: model:ir.actions.act_window,help:sale.action_orders
@@ -334,63 +346,71 @@ msgid ""
 "              </p>\n"
 "            "
 msgstr ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Hacer click para crear un presupuesto que pueda ser "
+"convertido en una orden de venta.\n"
+"              </p><p>\n"
+"                OpenERP le ayudará a manejar eficientemente el flujo de "
+"venta completo:\n"
+"                presupuesto, orden de venta, despacho, facturación y pago.\n"
+"              </p>\n"
+"            "
 
 #. module: sale
 #: selection:sale.report,month:0
 msgid "June"
-msgstr ""
+msgstr "Junio"
 
 #. module: sale
 #: model:ir.model,name:sale.model_sale_report
 msgid "Sales Orders Statistics"
-msgstr ""
+msgstr "Estadísticas de pedidos de venta"
 
 #. module: sale
 #: help:sale.order,project_id:0
 msgid "The analytic account related to a sales order."
-msgstr ""
+msgstr "La cuenta analítica relacionada con una orden de venta."
 
 #. module: sale
 #: selection:sale.report,month:0
 msgid "October"
-msgstr ""
+msgstr "Octubre"
 
 #. module: sale
 #: field:sale.order,message_summary:0
 msgid "Summary"
-msgstr ""
+msgstr "Resumen"
 
 #. module: sale
 #: view:sale.order:0
 msgid "View Invoice"
-msgstr ""
+msgstr "Ver factura"
 
 #. module: sale
 #: code:addons/sale/wizard/sale_make_invoice_advance.py:113
 #: code:addons/sale/wizard/sale_make_invoice_advance.py:115
 #, python-format
 msgid "Advance of %s %s"
-msgstr ""
+msgstr "Avance del %s %s"
 
 #. module: sale
-#: model:ir.actions.act_window,name:sale.action_quotations
-#: model:ir.ui.menu,name:sale.menu_sale_quotations
+#: view:board.board:0
+#: model:ir.actions.act_window,name:sale.action_quotation_for_sale
 #: view:sale.order:0
 #: view:sale.report:0
 msgid "Quotations"
-msgstr ""
+msgstr "Presupuestos"
 
 #. module: sale
 #: field:sale.advance.payment.inv,qtty:0
 #: report:sale.order:0
-#: field:sale.order.line,product_uom_qty:0
 msgid "Quantity"
 msgstr "Cantidad"
 
 #. module: sale
 #: help:sale.order,partner_shipping_id:0
 msgid "Delivery address for current sales order."
-msgstr ""
+msgstr "Dirección de envío para la orden de venta actual."
 
 #. module: sale
 #: report:sale.order:0
@@ -400,7 +420,7 @@ msgstr "IVA :"
 #. module: sale
 #: selection:sale.report,month:0
 msgid "September"
-msgstr ""
+msgstr "Setiembre"
 
 #. module: sale
 #: field:sale.order,fiscal_position:0
@@ -408,6 +428,7 @@ msgid "Fiscal Position"
 msgstr "Posición fiscal"
 
 #. module: sale
+#: selection:sale.order,state:0
 #: selection:sale.report,state:0
 msgid "In Progress"
 msgstr "En proceso"
@@ -416,7 +437,7 @@ msgstr "En proceso"
 #: code:addons/sale/sale.py:667
 #, python-format
 msgid "Draft Invoice of %s %s <b>waiting for validation</b>."
-msgstr ""
+msgstr "Borrador de factura %s %s <b>esperando validación</b>."
 
 #. module: sale
 #: model:process.transition,note:sale.process_transition_confirmquotation0
@@ -424,12 +445,15 @@ msgid ""
 "The salesman confirms the quotation. The state of the sales order becomes "
 "'In progress' or 'Manual in progress'."
 msgstr ""
+"El vendedor confirma el presupuesto. El estado de la orden de venta se "
+"convierte 'En proceso' o 'Manual en proceso'."
 
 #. module: sale
 #: code:addons/sale/sale.py:843
 #, python-format
 msgid "You cannot cancel a sale order line that has already been invoiced."
 msgstr ""
+"No se puede cancelar una linea de una orden de venta que ya fue facturada."
 
 #. module: sale
 #: report:sale.order:0
@@ -439,7 +463,7 @@ msgstr "Tel. :"
 #. module: sale
 #: help:sale.order,partner_invoice_id:0
 msgid "Invoice address for current sales order."
-msgstr ""
+msgstr "Dirección de facturación para la orden de venta activa."
 
 #. module: sale
 #: model:ir.model,name:sale.model_sale_config_settings
@@ -494,7 +518,6 @@ msgid "or"
 msgstr ""
 
 #. module: sale
-#: field:sale.order,invoice_exists:0
 #: field:sale.order,invoiced_rate:0
 #: field:sale.order.line,invoiced:0
 msgid "Invoiced"
@@ -596,6 +619,7 @@ msgstr ""
 
 #. module: sale
 #: model:ir.model,name:sale.model_sale_order_line
+#: field:stock.move,sale_line_id:0
 msgid "Sales Order Line"
 msgstr ""
 
@@ -615,7 +639,6 @@ msgid "Order N°"
 msgstr "Orden Nº"
 
 #. module: sale
-#: view:sale.order:0
 #: field:sale.order,order_line:0
 msgid "Order Lines"
 msgstr "Líneas de la orden"
@@ -713,6 +736,7 @@ msgstr ""
 
 #. module: sale
 #: view:sale.order.line:0
+#: field:sale.report,shipped:0
 msgid "Shipped"
 msgstr ""
 
@@ -724,7 +748,6 @@ msgid ""
 msgstr ""
 
 #. module: sale
-#: model:ir.model,name:sale.model_res_partner
 #: view:sale.report:0
 #: field:sale.report,partner_id:0
 msgid "Partner"
@@ -761,7 +784,7 @@ msgid "You cannot confirm a sale order which has no line."
 msgstr ""
 
 #. module: sale
-#: code:addons/sale/sale.py:966
+#: code:addons/sale/sale.py:1124
 #, python-format
 msgid ""
 "You have to select a pricelist or a customer in the sales form !\n"
@@ -869,6 +892,7 @@ msgid "Your Reference"
 msgstr "Su referencia"
 
 #. module: sale
+#: view:sale.order:0
 #: view:sale.order.line:0
 msgid "Qty"
 msgstr "Ctd"
@@ -880,9 +904,10 @@ msgstr ""
 
 #. module: sale
 #: model:process.transition.action,name:sale.process_transition_action_cancel0
+#: model:process.transition.action,name:sale.process_transition_action_cancel1
+#: model:process.transition.action,name:sale.process_transition_action_cancel2
 #: view:sale.advance.payment.inv:0
 #: view:sale.make.invoice:0
-#: view:sale.order:0
 #: view:sale.order.line:0
 #: view:sale.order.line.make.invoice:0
 msgid "Cancel"
@@ -903,10 +928,9 @@ msgstr ""
 
 #. module: sale
 #: model:process.transition,name:sale.process_transition_invoice0
+#: model:process.transition,name:sale.process_transition_invoiceafterdelivery0
 #: model:process.transition.action,name:sale.process_transition_action_createinvoice0
 #: view:sale.advance.payment.inv:0
-#: view:sale.order:0
-#: field:sale.order,order_policy:0
 #: view:sale.order.line:0
 msgid "Create Invoice"
 msgstr "Crear factura"
@@ -933,6 +957,7 @@ msgstr ""
 
 #. module: sale
 #: report:sale.order:0
+#: view:sale.order.line:0
 msgid "Price"
 msgstr "Precio"
 
@@ -1015,7 +1040,7 @@ msgstr "Confirmar cotización"
 #: model:ir.actions.act_window,name:sale.action_order_line_tree2
 #: model:ir.ui.menu,name:sale.menu_invoicing_sales_order_lines
 msgid "Order Lines to Invoice"
-msgstr ""
+msgstr "Lineas de pedido a facturar"
 
 #. module: sale
 #: view:sale.order:0
@@ -1068,6 +1093,7 @@ msgid "Sale Order"
 msgstr "Orden de Venta"
 
 #. module: sale
+#: view:sale.order:0
 #: field:sale.order,amount_tax:0
 #: field:sale.order.line,tax_id:0
 msgid "Taxes"
@@ -1135,6 +1161,7 @@ msgstr ""
 #. module: sale
 #: model:ir.actions.act_window,name:sale.action_sale_order_make_invoice
 #: model:ir.actions.act_window,name:sale.action_view_sale_order_line_make_invoice
+#: view:sale.order:0
 msgid "Make Invoices"
 msgstr ""
 
@@ -1239,7 +1266,7 @@ msgstr ""
 
 #. module: sale
 #: model:process.node,name:sale.process_node_quotation0
-#: view:sale.order:0
+#: selection:sale.order,state:0
 #: selection:sale.report,state:0
 msgid "Quotation"
 msgstr "Cotización"
@@ -1385,10 +1412,8 @@ msgid "Customer Invoices"
 msgstr ""
 
 #. module: sale
-#: model:ir.actions.act_window,name:sale.open_board_sales
-#: model:ir.ui.menu,name:sale.menu_dashboard_sales
+#: model:ir.actions.act_window,name:sale.act_res_partner_2_sale_order
 #: model:process.process,name:sale.process_process_salesprocess0
-#: view:res.partner:0
 #: view:sale.order:0
 #: view:sale.report:0
 msgid "Sales"
@@ -1410,7 +1435,6 @@ msgid "Unit Price"
 msgstr "Precio unitario"
 
 #. module: sale
-#: view:sale.order:0
 #: selection:sale.order,state:0
 #: view:sale.order.line:0
 #: selection:sale.order.line,state:0
@@ -1419,10 +1443,8 @@ msgid "Done"
 msgstr "Realizada"
 
 #. module: sale
-#: code:addons/sale/wizard/sale_line_invoice.py:123
 #: model:process.node,name:sale.process_node_invoice0
-#: view:sale.order:0
-#, python-format
+#: model:process.node,name:sale.process_node_invoiceafterdelivery0
 msgid "Invoice"
 msgstr "Factura"
 
@@ -1498,6 +1520,7 @@ msgid "Product UoS"
 msgstr "UdV del producto"
 
 #. module: sale
+#: selection:sale.order,state:0
 #: selection:sale.report,state:0
 msgid "Manual In Progress"
 msgstr "Manual en proceso"
@@ -1642,7 +1665,7 @@ msgid "Invoice Exception"
 msgstr "Excepción de factura"
 
 #. module: sale
-#: code:addons/sale/sale.py:888
+#: code:addons/sale/sale.py:1017
 #, python-format
 msgid "No Customer Defined !"
 msgstr "¡No se ha definido un cliente!"
@@ -1719,6 +1742,7 @@ msgstr ""
 
 #. module: sale
 #: model:ir.actions.act_window,name:sale.action_shop_form
+#: model:ir.ui.menu,name:sale.menu_action_shop_form
 #: field:sale.order,shop_id:0
 #: view:sale.report:0
 #: field:sale.report,shop_id:0
@@ -1742,15 +1766,12 @@ msgid "Contract Features"
 msgstr ""
 
 #. module: sale
-#: code:addons/sale/sale.py:273
-#: code:addons/sale/sale.py:576
 #: model:ir.model,name:sale.model_sale_order
 #: model:process.node,name:sale.process_node_order0
 #: model:process.node,name:sale.process_node_saleorder0
-#: field:res.partner,sale_order_ids:0
 #: model:res.request.link,name:sale.req_link_sale_order
 #: view:sale.order:0
-#, python-format
+#: field:stock.picking,sale_id:0
 msgid "Sales Order"
 msgstr ""
 
@@ -1785,6 +1806,7 @@ msgid "Followers"
 msgstr ""
 
 #. module: sale
+#: view:sale.order:0
 #: field:sale.order.line,invoice_lines:0
 msgid "Invoice Lines"
 msgstr "Líneas de Facturación"
@@ -1796,7 +1818,6 @@ msgid "# of Lines"
 msgstr "# de líneas"
 
 #. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_line_product_tree
 #: view:sale.order:0
 #: view:sale.order.line:0
 msgid "Sales Order Lines"
@@ -1870,7 +1891,7 @@ msgid ""
 msgstr ""
 
 #. module: sale
-#: code:addons/sale/wizard/sale_line_invoice.py:109
+#: code:addons/sale/wizard/sale_line_invoice.py:111
 #, python-format
 msgid ""
 "Invoice cannot be created for this Sales Order Line due to one of the "
@@ -1890,6 +1911,8 @@ msgid "Weight"
 msgstr "Peso"
 
 #. module: sale
+#: view:sale.open.invoice:0
+#: view:sale.order:0
 #: field:sale.order,invoice_ids:0
 msgid "Invoices"
 msgstr "Facturas"
@@ -1921,7 +1944,10 @@ msgid "Untaxed Amount"
 msgstr "Importe sin impuestos"
 
 #. module: sale
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:202
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:163
+#: model:ir.actions.act_window,name:sale.action_view_sale_advance_payment_inv
+#: view:sale.advance.payment.inv:0
+#: view:sale.order:0
 #, python-format
 msgid "Advance Invoice"
 msgstr "Avanzar factura"
@@ -1962,6 +1988,8 @@ msgid "Email Templates"
 msgstr ""
 
 #. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_form
+#: model:ir.ui.menu,name:sale.menu_sale_order
 #: view:sale.order:0
 msgid "Sales Orders"
 msgstr "Órdenes de venta"
@@ -1999,7 +2027,7 @@ msgid "January"
 msgstr ""
 
 #. module: sale
-#: model:ir.actions.act_window,name:sale.action_orders_in_progress
+#: model:ir.actions.act_window,name:sale.action_order_tree4
 msgid "Sales Order in Progress"
 msgstr "Órdenes de venta en proceso"
 
@@ -2172,6 +2200,7 @@ msgid "Quotation N°"
 msgstr "Cotización Nº"
 
 #. module: sale
+#: field:sale.order,picked_rate:0
 #: view:sale.report:0
 msgid "Picked"
 msgstr "Entregada"
diff --git a/addons/sale/i18n/hr.po b/addons/sale/i18n/hr.po
index f4c3dceb198..1bc9fffe042 100644
--- a/addons/sale/i18n/hr.po
+++ b/addons/sale/i18n/hr.po
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2012-12-03 16:02+0000\n"
-"PO-Revision-Date: 2012-12-03 16:08+0000\n"
+"PO-Revision-Date: 2012-12-06 13:18+0000\n"
 "Last-Translator: Krešimir Jeđud <kresimir.jedud@infokom.hr>\n"
 "Language-Team: Vinteh <>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:31+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-07 04:35+0000\n"
+"X-Generator: Launchpad (build 16341)\n"
 "Language: hr\n"
 
 #. module: sale
@@ -60,6 +60,7 @@ msgstr "Dan"
 
 #. module: sale
 #: model:process.transition.action,name:sale.process_transition_action_cancelorder0
+#: view:sale.order:0
 msgid "Cancel Order"
 msgstr "Otkaži narudžbu"
 
@@ -102,6 +103,7 @@ msgid ""
 msgstr ""
 
 #. module: sale
+#: field:sale.order,project_id:0
 #: view:sale.report:0
 #: field:sale.report,analytic_account_id:0
 #: field:sale.shop,project_id:0
@@ -300,7 +302,7 @@ msgid "Advance of %s %%"
 msgstr ""
 
 #. module: sale
-#: model:ir.actions.act_window,name:sale.action_orders_exception
+#: model:ir.actions.act_window,name:sale.action_order_tree2
 msgid "Sales in Exception"
 msgstr "Prodaje u iznimci"
 
@@ -376,8 +378,8 @@ msgid "Advance of %s %s"
 msgstr ""
 
 #. module: sale
-#: model:ir.actions.act_window,name:sale.action_quotations
-#: model:ir.ui.menu,name:sale.menu_sale_quotations
+#: view:board.board:0
+#: model:ir.actions.act_window,name:sale.action_quotation_for_sale
 #: view:sale.order:0
 #: view:sale.report:0
 msgid "Quotations"
@@ -386,14 +388,13 @@ msgstr "Ponude"
 #. module: sale
 #: field:sale.advance.payment.inv,qtty:0
 #: report:sale.order:0
-#: field:sale.order.line,product_uom_qty:0
 msgid "Quantity"
 msgstr "Količina"
 
 #. module: sale
 #: help:sale.order,partner_shipping_id:0
 msgid "Delivery address for current sales order."
-msgstr ""
+msgstr "Adresa dostave za trenutni prodajni nalog"
 
 #. module: sale
 #: report:sale.order:0
@@ -411,6 +412,7 @@ msgid "Fiscal Position"
 msgstr "Porezna pozicija"
 
 #. module: sale
+#: selection:sale.order,state:0
 #: selection:sale.report,state:0
 msgid "In Progress"
 msgstr "U tijeku"
@@ -501,7 +503,6 @@ msgid "or"
 msgstr ""
 
 #. module: sale
-#: field:sale.order,invoice_exists:0
 #: field:sale.order,invoiced_rate:0
 #: field:sale.order.line,invoiced:0
 msgid "Invoiced"
@@ -603,6 +604,7 @@ msgstr ""
 
 #. module: sale
 #: model:ir.model,name:sale.model_sale_order_line
+#: field:stock.move,sale_line_id:0
 msgid "Sales Order Line"
 msgstr "Stavka prodajnog naloga"
 
@@ -622,7 +624,6 @@ msgid "Order N°"
 msgstr "Narudžba broj"
 
 #. module: sale
-#: view:sale.order:0
 #: field:sale.order,order_line:0
 msgid "Order Lines"
 msgstr "Stavke narudžbe"
@@ -720,6 +721,7 @@ msgstr "Datum narudžbe"
 
 #. module: sale
 #: view:sale.order.line:0
+#: field:sale.report,shipped:0
 msgid "Shipped"
 msgstr "Otpremljeno"
 
@@ -731,7 +733,6 @@ msgid ""
 msgstr ""
 
 #. module: sale
-#: model:ir.model,name:sale.model_res_partner
 #: view:sale.report:0
 #: field:sale.report,partner_id:0
 msgid "Partner"
@@ -768,7 +769,7 @@ msgid "You cannot confirm a sale order which has no line."
 msgstr "Ne možete potvrditi prodajni nalog koji nema stavku."
 
 #. module: sale
-#: code:addons/sale/sale.py:966
+#: code:addons/sale/sale.py:1124
 #, python-format
 msgid ""
 "You have to select a pricelist or a customer in the sales form !\n"
@@ -878,6 +879,7 @@ msgid "Your Reference"
 msgstr "Vaša referenca"
 
 #. module: sale
+#: view:sale.order:0
 #: view:sale.order.line:0
 msgid "Qty"
 msgstr "Količina"
@@ -889,9 +891,10 @@ msgstr "Moje stavke prodajnog naloga"
 
 #. module: sale
 #: model:process.transition.action,name:sale.process_transition_action_cancel0
+#: model:process.transition.action,name:sale.process_transition_action_cancel1
+#: model:process.transition.action,name:sale.process_transition_action_cancel2
 #: view:sale.advance.payment.inv:0
 #: view:sale.make.invoice:0
-#: view:sale.order:0
 #: view:sale.order.line:0
 #: view:sale.order.line.make.invoice:0
 msgid "Cancel"
@@ -912,10 +915,9 @@ msgstr ""
 
 #. module: sale
 #: model:process.transition,name:sale.process_transition_invoice0
+#: model:process.transition,name:sale.process_transition_invoiceafterdelivery0
 #: model:process.transition.action,name:sale.process_transition_action_createinvoice0
 #: view:sale.advance.payment.inv:0
-#: view:sale.order:0
-#: field:sale.order,order_policy:0
 #: view:sale.order.line:0
 msgid "Create Invoice"
 msgstr "Napravi fakturu"
@@ -942,6 +944,7 @@ msgstr ""
 
 #. module: sale
 #: report:sale.order:0
+#: view:sale.order.line:0
 msgid "Price"
 msgstr "Cijena"
 
@@ -1077,6 +1080,7 @@ msgid "Sale Order"
 msgstr "Prodajna narudžba"
 
 #. module: sale
+#: view:sale.order:0
 #: field:sale.order,amount_tax:0
 #: field:sale.order.line,tax_id:0
 msgid "Taxes"
@@ -1146,6 +1150,7 @@ msgstr ""
 #. module: sale
 #: model:ir.actions.act_window,name:sale.action_sale_order_make_invoice
 #: model:ir.actions.act_window,name:sale.action_view_sale_order_line_make_invoice
+#: view:sale.order:0
 msgid "Make Invoices"
 msgstr "Napravi fakture"
 
@@ -1250,7 +1255,7 @@ msgstr "Analiza prodaje"
 
 #. module: sale
 #: model:process.node,name:sale.process_node_quotation0
-#: view:sale.order:0
+#: selection:sale.order,state:0
 #: selection:sale.report,state:0
 msgid "Quotation"
 msgstr "Ponuda"
@@ -1399,10 +1404,8 @@ msgid "Customer Invoices"
 msgstr "Izlazni računi"
 
 #. module: sale
-#: model:ir.actions.act_window,name:sale.open_board_sales
-#: model:ir.ui.menu,name:sale.menu_dashboard_sales
+#: model:ir.actions.act_window,name:sale.act_res_partner_2_sale_order
 #: model:process.process,name:sale.process_process_salesprocess0
-#: view:res.partner:0
 #: view:sale.order:0
 #: view:sale.report:0
 msgid "Sales"
@@ -1424,7 +1427,6 @@ msgid "Unit Price"
 msgstr "Jedinična cijena"
 
 #. module: sale
-#: view:sale.order:0
 #: selection:sale.order,state:0
 #: view:sale.order.line:0
 #: selection:sale.order.line,state:0
@@ -1433,10 +1435,8 @@ msgid "Done"
 msgstr "Završeno"
 
 #. module: sale
-#: code:addons/sale/wizard/sale_line_invoice.py:123
 #: model:process.node,name:sale.process_node_invoice0
-#: view:sale.order:0
-#, python-format
+#: model:process.node,name:sale.process_node_invoiceafterdelivery0
 msgid "Invoice"
 msgstr "Faktura"
 
@@ -1512,6 +1512,7 @@ msgid "Product UoS"
 msgstr "Proizvod - jedinica prodaje"
 
 #. module: sale
+#: selection:sale.order,state:0
 #: selection:sale.report,state:0
 msgid "Manual In Progress"
 msgstr "Ručni postupak u tijeku"
@@ -1659,7 +1660,7 @@ msgid "Invoice Exception"
 msgstr "Iznimka fakture"
 
 #. module: sale
-#: code:addons/sale/sale.py:888
+#: code:addons/sale/sale.py:1017
 #, python-format
 msgid "No Customer Defined !"
 msgstr "Nije definiran kupac !"
@@ -1736,6 +1737,7 @@ msgstr ""
 
 #. module: sale
 #: model:ir.actions.act_window,name:sale.action_shop_form
+#: model:ir.ui.menu,name:sale.menu_action_shop_form
 #: field:sale.order,shop_id:0
 #: view:sale.report:0
 #: field:sale.report,shop_id:0
@@ -1759,15 +1761,12 @@ msgid "Contract Features"
 msgstr ""
 
 #. module: sale
-#: code:addons/sale/sale.py:273
-#: code:addons/sale/sale.py:576
 #: model:ir.model,name:sale.model_sale_order
 #: model:process.node,name:sale.process_node_order0
 #: model:process.node,name:sale.process_node_saleorder0
-#: field:res.partner,sale_order_ids:0
 #: model:res.request.link,name:sale.req_link_sale_order
 #: view:sale.order:0
-#, python-format
+#: field:stock.picking,sale_id:0
 msgid "Sales Order"
 msgstr "Prodajni nalog"
 
@@ -1802,6 +1801,7 @@ msgid "Followers"
 msgstr ""
 
 #. module: sale
+#: view:sale.order:0
 #: field:sale.order.line,invoice_lines:0
 msgid "Invoice Lines"
 msgstr "Stavke fakture"
@@ -1813,7 +1813,6 @@ msgid "# of Lines"
 msgstr "# linija"
 
 #. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_line_product_tree
 #: view:sale.order:0
 #: view:sale.order.line:0
 msgid "Sales Order Lines"
@@ -1887,7 +1886,7 @@ msgid ""
 msgstr ""
 
 #. module: sale
-#: code:addons/sale/wizard/sale_line_invoice.py:109
+#: code:addons/sale/wizard/sale_line_invoice.py:111
 #, python-format
 msgid ""
 "Invoice cannot be created for this Sales Order Line due to one of the "
@@ -1911,6 +1910,8 @@ msgid "Weight"
 msgstr "Težina"
 
 #. module: sale
+#: view:sale.open.invoice:0
+#: view:sale.order:0
 #: field:sale.order,invoice_ids:0
 msgid "Invoices"
 msgstr "Fakture"
@@ -1942,7 +1943,10 @@ msgid "Untaxed Amount"
 msgstr "Iznos bez poreza"
 
 #. module: sale
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:202
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:163
+#: model:ir.actions.act_window,name:sale.action_view_sale_advance_payment_inv
+#: view:sale.advance.payment.inv:0
+#: view:sale.order:0
 #, python-format
 msgid "Advance Invoice"
 msgstr "Faktura predujma"
@@ -1983,6 +1987,8 @@ msgid "Email Templates"
 msgstr "Email predlošci"
 
 #. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_form
+#: model:ir.ui.menu,name:sale.menu_sale_order
 #: view:sale.order:0
 msgid "Sales Orders"
 msgstr "Prodajni nalozi"
@@ -2020,7 +2026,7 @@ msgid "January"
 msgstr "Siječanj"
 
 #. module: sale
-#: model:ir.actions.act_window,name:sale.action_orders_in_progress
+#: model:ir.actions.act_window,name:sale.action_order_tree4
 msgid "Sales Order in Progress"
 msgstr "Prodajni nalozi u tijeku"
 
@@ -2199,6 +2205,7 @@ msgid "Quotation N°"
 msgstr "Ponuda broj"
 
 #. module: sale
+#: field:sale.order,picked_rate:0
 #: view:sale.report:0
 msgid "Picked"
 msgstr "Odabran"
diff --git a/addons/sale/i18n/pt_BR.po b/addons/sale/i18n/pt_BR.po
index dacd67b5907..034499bc17f 100644
--- a/addons/sale/i18n/pt_BR.po
+++ b/addons/sale/i18n/pt_BR.po
@@ -8,20 +8,19 @@ msgstr ""
 "Project-Id-Version: pt_BR\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2012-12-03 16:02+0000\n"
-"PO-Revision-Date: 2012-07-28 16:28+0000\n"
-"Last-Translator: Fábio Martinelli - http://zupy.com.br "
-"<webmaster@guaru.net>\n"
+"PO-Revision-Date: 2012-12-06 18:10+0000\n"
+"Last-Translator: Cristiano Korndörfer <codigo.aberto@dorfer.com.br>\n"
 "Language-Team: <pt@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:31+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-07 04:35+0000\n"
+"X-Generator: Launchpad (build 16341)\n"
 
 #. module: sale
 #: model:ir.model,name:sale.model_account_config_settings
 msgid "account.config.settings"
-msgstr ""
+msgstr "account.config.settings"
 
 #. module: sale
 #: view:sale.order.line:0
@@ -46,7 +45,7 @@ msgstr "UdV"
 #: view:sale.report:0
 #: field:sale.report,user_id:0
 msgid "Salesperson"
-msgstr ""
+msgstr "Vendedor"
 
 #. module: sale
 #: help:sale.order,pricelist_id:0
@@ -61,6 +60,7 @@ msgstr "Dia"
 
 #. module: sale
 #: model:process.transition.action,name:sale.process_transition_action_cancelorder0
+#: view:sale.order:0
 msgid "Cancel Order"
 msgstr "Cancelar Pedido"
 
@@ -68,23 +68,23 @@ msgstr "Cancelar Pedido"
 #: code:addons/sale/wizard/sale_make_invoice_advance.py:101
 #, python-format
 msgid "Incorrect Data"
-msgstr ""
+msgstr "Dados Incorretos"
 
 #. module: sale
 #: code:addons/sale/wizard/sale_make_invoice_advance.py:102
 #, python-format
 msgid "The value of Advance Amount must be positive."
-msgstr ""
+msgstr "O valor da Soma Avançada deve ser positivo."
 
 #. module: sale
 #: help:sale.order,message_unread:0
 msgid "If checked new messages require your attention."
-msgstr ""
+msgstr "Se marcado novas mensagens requerem sua atenção"
 
 #. module: sale
 #: view:res.partner:0
 msgid "False"
-msgstr ""
+msgstr "Falso"
 
 #. module: sale
 #: report:sale.order:0
@@ -101,8 +101,15 @@ msgid ""
 "The 'Waiting Schedule' status is set when the invoice is confirmed           "
 "    but waiting for the scheduler to run on the order date."
 msgstr ""
+"Informa a situação da cotação ou pedido de venda.              \n"
+"A situação excepcional é definida automaticamente quando uma operação de "
+"cancelamento ocorre                na validação da fatura (Exceção da "
+"Fatura) ou no processo de lista de separação (Exceção de Envio).\n"
+"A situação 'Aguardando Agendamento' é definida quando a fatura é confirmada  "
+"             mas aguarda pelo processamento na data de pedido."
 
 #. module: sale
+#: field:sale.order,project_id:0
 #: view:sale.report:0
 #: field:sale.report,analytic_account_id:0
 #: field:sale.shop,project_id:0
@@ -115,17 +122,20 @@ msgid ""
 "Holds the Chatter summary (number of messages, ...). This summary is "
 "directly in html format in order to be inserted in kanban views."
 msgstr ""
+"Contém o resumo da conversação (número de mensagens, ...). Este resumo é "
+"gerado diretamente em formato HTML para que possa ser inserido nas visões "
+"kanban."
 
 #. module: sale
 #: view:sale.report:0
 #: field:sale.report,product_uom_qty:0
 msgid "# of Qty"
-msgstr "# de Qtd"
+msgstr "Nº de Qtd"
 
 #. module: sale
 #: help:sale.config.settings,group_discount_per_so_line:0
 msgid "Allows you to apply some discount per sale order line."
-msgstr ""
+msgstr "Permite aplicar algum desconto por linha do pedido de venda."
 
 #. module: sale
 #: help:sale.config.settings,group_sale_pricelist:0
@@ -133,6 +143,9 @@ msgid ""
 "Allows to manage different prices based on rules per category of customers.\n"
 "Example: 10% for retailers, promotion of 5 EUR on this product, etc."
 msgstr ""
+"Permite gerenciar diferentes preços baseado em regras por categoria de "
+"cliente.\n"
+"Exemplo: 10% para varejistas, promoção de R$ 15 neste produto, etc."
 
 #. module: sale
 #: field:sale.shop,payment_default_id:0
@@ -143,17 +156,17 @@ msgstr "Condição de Pagamento Padrão"
 #: code:addons/sale/sale.py:662
 #, python-format
 msgid "Invoice <b>paid</b>."
-msgstr ""
+msgstr "Fatura <b>paga</b>."
 
 #. module: sale
 #: field:sale.config.settings,group_uom:0
 msgid "Allow using different units of measures"
-msgstr ""
+msgstr "Permite utilizar diferentes unidades de medida"
 
 #. module: sale
 #: selection:sale.advance.payment.inv,advance_payment_method:0
 msgid "Percentage"
-msgstr ""
+msgstr "Porcentagem"
 
 #. module: sale
 #: report:sale.order:0
@@ -165,6 +178,7 @@ msgstr "Desc. (%)"
 #, python-format
 msgid "Please define income account for this product: \"%s\" (id:%d)."
 msgstr ""
+"Por favor defina conta de recebimento para este produto: \"%s\" (id:%d)."
 
 #. module: sale
 #: view:sale.report:0
@@ -301,7 +315,7 @@ msgid "Advance of %s %%"
 msgstr ""
 
 #. module: sale
-#: model:ir.actions.act_window,name:sale.action_orders_exception
+#: model:ir.actions.act_window,name:sale.action_order_tree2
 msgid "Sales in Exception"
 msgstr "Vendas em Exceção"
 
@@ -377,8 +391,8 @@ msgid "Advance of %s %s"
 msgstr ""
 
 #. module: sale
-#: model:ir.actions.act_window,name:sale.action_quotations
-#: model:ir.ui.menu,name:sale.menu_sale_quotations
+#: view:board.board:0
+#: model:ir.actions.act_window,name:sale.action_quotation_for_sale
 #: view:sale.order:0
 #: view:sale.report:0
 msgid "Quotations"
@@ -387,7 +401,6 @@ msgstr "Cotações"
 #. module: sale
 #: field:sale.advance.payment.inv,qtty:0
 #: report:sale.order:0
-#: field:sale.order.line,product_uom_qty:0
 msgid "Quantity"
 msgstr "Quantidade"
 
@@ -412,6 +425,7 @@ msgid "Fiscal Position"
 msgstr "Posição Fiscal"
 
 #. module: sale
+#: selection:sale.order,state:0
 #: selection:sale.report,state:0
 msgid "In Progress"
 msgstr "Em Progresso"
@@ -501,7 +515,6 @@ msgid "or"
 msgstr ""
 
 #. module: sale
-#: field:sale.order,invoice_exists:0
 #: field:sale.order,invoiced_rate:0
 #: field:sale.order.line,invoiced:0
 msgid "Invoiced"
@@ -603,6 +616,7 @@ msgstr ""
 
 #. module: sale
 #: model:ir.model,name:sale.model_sale_order_line
+#: field:stock.move,sale_line_id:0
 msgid "Sales Order Line"
 msgstr "Linha de Pedido de Vendas"
 
@@ -622,7 +636,6 @@ msgid "Order N°"
 msgstr "Pedido N°"
 
 #. module: sale
-#: view:sale.order:0
 #: field:sale.order,order_line:0
 msgid "Order Lines"
 msgstr "Itens do Pedido"
@@ -720,6 +733,7 @@ msgstr "Data do Pedido"
 
 #. module: sale
 #: view:sale.order.line:0
+#: field:sale.report,shipped:0
 msgid "Shipped"
 msgstr "Enviado"
 
@@ -731,7 +745,6 @@ msgid ""
 msgstr ""
 
 #. module: sale
-#: model:ir.model,name:sale.model_res_partner
 #: view:sale.report:0
 #: field:sale.report,partner_id:0
 msgid "Partner"
@@ -770,7 +783,7 @@ msgstr ""
 "pedido."
 
 #. module: sale
-#: code:addons/sale/sale.py:966
+#: code:addons/sale/sale.py:1124
 #, python-format
 msgid ""
 "You have to select a pricelist or a customer in the sales form !\n"
@@ -883,6 +896,7 @@ msgid "Your Reference"
 msgstr "Sua Referência"
 
 #. module: sale
+#: view:sale.order:0
 #: view:sale.order.line:0
 msgid "Qty"
 msgstr "Qtd"
@@ -894,9 +908,10 @@ msgstr "Minhas linhas de Pedido de Venda"
 
 #. module: sale
 #: model:process.transition.action,name:sale.process_transition_action_cancel0
+#: model:process.transition.action,name:sale.process_transition_action_cancel1
+#: model:process.transition.action,name:sale.process_transition_action_cancel2
 #: view:sale.advance.payment.inv:0
 #: view:sale.make.invoice:0
-#: view:sale.order:0
 #: view:sale.order.line:0
 #: view:sale.order.line.make.invoice:0
 msgid "Cancel"
@@ -917,10 +932,9 @@ msgstr ""
 
 #. module: sale
 #: model:process.transition,name:sale.process_transition_invoice0
+#: model:process.transition,name:sale.process_transition_invoiceafterdelivery0
 #: model:process.transition.action,name:sale.process_transition_action_createinvoice0
 #: view:sale.advance.payment.inv:0
-#: view:sale.order:0
-#: field:sale.order,order_policy:0
 #: view:sale.order.line:0
 msgid "Create Invoice"
 msgstr "Criar Nota Fiscal"
@@ -947,6 +961,7 @@ msgstr ""
 
 #. module: sale
 #: report:sale.order:0
+#: view:sale.order.line:0
 msgid "Price"
 msgstr "Preço"
 
@@ -1082,6 +1097,7 @@ msgid "Sale Order"
 msgstr "Pedido de Venda"
 
 #. module: sale
+#: view:sale.order:0
 #: field:sale.order,amount_tax:0
 #: field:sale.order.line,tax_id:0
 msgid "Taxes"
@@ -1151,6 +1167,7 @@ msgstr ""
 #. module: sale
 #: model:ir.actions.act_window,name:sale.action_sale_order_make_invoice
 #: model:ir.actions.act_window,name:sale.action_view_sale_order_line_make_invoice
+#: view:sale.order:0
 msgid "Make Invoices"
 msgstr "Gerar Nota Fiscal"
 
@@ -1255,7 +1272,7 @@ msgstr "Análise de Vendas"
 
 #. module: sale
 #: model:process.node,name:sale.process_node_quotation0
-#: view:sale.order:0
+#: selection:sale.order,state:0
 #: selection:sale.report,state:0
 msgid "Quotation"
 msgstr "Cotação"
@@ -1404,10 +1421,8 @@ msgid "Customer Invoices"
 msgstr "Faturas de Clientes"
 
 #. module: sale
-#: model:ir.actions.act_window,name:sale.open_board_sales
-#: model:ir.ui.menu,name:sale.menu_dashboard_sales
+#: model:ir.actions.act_window,name:sale.act_res_partner_2_sale_order
 #: model:process.process,name:sale.process_process_salesprocess0
-#: view:res.partner:0
 #: view:sale.order:0
 #: view:sale.report:0
 msgid "Sales"
@@ -1429,7 +1444,6 @@ msgid "Unit Price"
 msgstr "Preço Unitário"
 
 #. module: sale
-#: view:sale.order:0
 #: selection:sale.order,state:0
 #: view:sale.order.line:0
 #: selection:sale.order.line,state:0
@@ -1438,10 +1452,8 @@ msgid "Done"
 msgstr "Concluído"
 
 #. module: sale
-#: code:addons/sale/wizard/sale_line_invoice.py:123
 #: model:process.node,name:sale.process_node_invoice0
-#: view:sale.order:0
-#, python-format
+#: model:process.node,name:sale.process_node_invoiceafterdelivery0
 msgid "Invoice"
 msgstr "Fatura"
 
@@ -1517,6 +1529,7 @@ msgid "Product UoS"
 msgstr "UdS Produto"
 
 #. module: sale
+#: selection:sale.order,state:0
 #: selection:sale.report,state:0
 msgid "Manual In Progress"
 msgstr "Em Andamento Manual"
@@ -1665,7 +1678,7 @@ msgid "Invoice Exception"
 msgstr "Exceção de Faturamento"
 
 #. module: sale
-#: code:addons/sale/sale.py:888
+#: code:addons/sale/sale.py:1017
 #, python-format
 msgid "No Customer Defined !"
 msgstr "Sem Cliente definido!"
@@ -1742,6 +1755,7 @@ msgstr ""
 
 #. module: sale
 #: model:ir.actions.act_window,name:sale.action_shop_form
+#: model:ir.ui.menu,name:sale.menu_action_shop_form
 #: field:sale.order,shop_id:0
 #: view:sale.report:0
 #: field:sale.report,shop_id:0
@@ -1765,15 +1779,12 @@ msgid "Contract Features"
 msgstr ""
 
 #. module: sale
-#: code:addons/sale/sale.py:273
-#: code:addons/sale/sale.py:576
 #: model:ir.model,name:sale.model_sale_order
 #: model:process.node,name:sale.process_node_order0
 #: model:process.node,name:sale.process_node_saleorder0
-#: field:res.partner,sale_order_ids:0
 #: model:res.request.link,name:sale.req_link_sale_order
 #: view:sale.order:0
-#, python-format
+#: field:stock.picking,sale_id:0
 msgid "Sales Order"
 msgstr "Pedido de Venda"
 
@@ -1808,6 +1819,7 @@ msgid "Followers"
 msgstr ""
 
 #. module: sale
+#: view:sale.order:0
 #: field:sale.order.line,invoice_lines:0
 msgid "Invoice Lines"
 msgstr "Linhas da Nota Fiscal"
@@ -1819,7 +1831,6 @@ msgid "# of Lines"
 msgstr "# de Linhas"
 
 #. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_line_product_tree
 #: view:sale.order:0
 #: view:sale.order.line:0
 msgid "Sales Order Lines"
@@ -1893,7 +1904,7 @@ msgid ""
 msgstr ""
 
 #. module: sale
-#: code:addons/sale/wizard/sale_line_invoice.py:109
+#: code:addons/sale/wizard/sale_line_invoice.py:111
 #, python-format
 msgid ""
 "Invoice cannot be created for this Sales Order Line due to one of the "
@@ -1917,6 +1928,8 @@ msgid "Weight"
 msgstr "Peso"
 
 #. module: sale
+#: view:sale.open.invoice:0
+#: view:sale.order:0
 #: field:sale.order,invoice_ids:0
 msgid "Invoices"
 msgstr "Notas Fiscais"
@@ -1948,7 +1961,10 @@ msgid "Untaxed Amount"
 msgstr "Total de Mercadorias"
 
 #. module: sale
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:202
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:163
+#: model:ir.actions.act_window,name:sale.action_view_sale_advance_payment_inv
+#: view:sale.advance.payment.inv:0
+#: view:sale.order:0
 #, python-format
 msgid "Advance Invoice"
 msgstr "Avançar Fatura"
@@ -1989,6 +2005,8 @@ msgid "Email Templates"
 msgstr "Modelos de Email"
 
 #. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_form
+#: model:ir.ui.menu,name:sale.menu_sale_order
 #: view:sale.order:0
 msgid "Sales Orders"
 msgstr "Pedidos de Venda"
@@ -2026,7 +2044,7 @@ msgid "January"
 msgstr "Janeiro"
 
 #. module: sale
-#: model:ir.actions.act_window,name:sale.action_orders_in_progress
+#: model:ir.actions.act_window,name:sale.action_order_tree4
 msgid "Sales Order in Progress"
 msgstr "Pedido de Venda em Processamento"
 
@@ -2205,6 +2223,7 @@ msgid "Quotation N°"
 msgstr "Cotação N°"
 
 #. module: sale
+#: field:sale.order,picked_rate:0
 #: view:sale.report:0
 msgid "Picked"
 msgstr "Separado"
diff --git a/addons/sale_crm/i18n/pt_BR.po b/addons/sale_crm/i18n/pt_BR.po
index 59f9661f271..9d18e5ea12e 100644
--- a/addons/sale_crm/i18n/pt_BR.po
+++ b/addons/sale_crm/i18n/pt_BR.po
@@ -7,21 +7,20 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2012-12-03 16:04+0000\n"
-"PO-Revision-Date: 2012-07-28 19:41+0000\n"
-"Last-Translator: Fábio Martinelli - http://zupy.com.br "
-"<webmaster@guaru.net>\n"
+"PO-Revision-Date: 2012-12-06 17:59+0000\n"
+"Last-Translator: Cristiano Korndörfer <codigo.aberto@dorfer.com.br>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:19+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-07 04:34+0000\n"
+"X-Generator: Launchpad (build 16341)\n"
 
 #. module: sale_crm
 #: code:addons/sale_crm/wizard/crm_make_sale.py:90
 #, python-format
 msgid "Insufficient Data!"
-msgstr ""
+msgstr "Dados insuficientes!"
 
 #. module: sale_crm
 #: view:crm.lead:0
@@ -32,27 +31,27 @@ msgstr "Converter em Cotação"
 #. module: sale_crm
 #: model:ir.model,name:sale_crm.model_account_invoice_report
 msgid "Invoices Statistics"
-msgstr ""
+msgstr "Estatísticas das Faturas"
 
 #. module: sale_crm
 #: field:crm.make.sale,close:0
 msgid "Mark Won"
-msgstr ""
+msgstr "Marcar como Vencido"
 
 #. module: sale_crm
 #: field:res.users,default_section_id:0
 msgid "Default Sales Team"
-msgstr ""
+msgstr "Equipe de Vendas Padrão"
 
 #. module: sale_crm
 #: view:sale.order:0
 msgid "My Sales Team(s)"
-msgstr "Minha Equipe de Vendas"
+msgstr "Minha(s) Equipe(s) de Vendas"
 
 #. module: sale_crm
 #: model:ir.model,name:sale_crm.model_res_users
 msgid "Users"
-msgstr ""
+msgstr "Usuários"
 
 #. module: sale_crm
 #: help:crm.make.sale,close:0
@@ -65,7 +64,7 @@ msgstr ""
 #. module: sale_crm
 #: field:sale.order,categ_ids:0
 msgid "Categories"
-msgstr ""
+msgstr "Categorias"
 
 #. module: sale_crm
 #: code:addons/sale_crm/wizard/crm_make_sale.py:124
@@ -87,12 +86,12 @@ msgstr "_Criar"
 #. module: sale_crm
 #: model:ir.model,name:sale_crm.model_crm_make_sale
 msgid "Make sales"
-msgstr "Criar vendas"
+msgstr "Fazer vendas"
 
 #. module: sale_crm
 #: model:ir.model,name:sale_crm.model_account_invoice
 msgid "Invoice"
-msgstr ""
+msgstr "Fatura"
 
 #. module: sale_crm
 #: code:addons/sale_crm/wizard/crm_make_sale.py:93
@@ -104,7 +103,7 @@ msgstr "Oportunidade: %s"
 #: code:addons/sale_crm/wizard/crm_make_sale.py:110
 #, python-format
 msgid "Opportunity has been <b>converted</b> to the quotation <em>%s</em>."
-msgstr ""
+msgstr "A oportunidade foi <b>convertida</b> para a cotação <em>%s</em>."
 
 #. module: sale_crm
 #: field:crm.make.sale,shop_id:0
@@ -115,7 +114,7 @@ msgstr "Estabelecimento"
 #: code:addons/sale_crm/wizard/crm_make_sale.py:90
 #, python-format
 msgid "No addresse(s) defined for this customer."
-msgstr ""
+msgstr "Nenhum endereço definido para o cliente."
 
 #. module: sale_crm
 #: view:account.invoice:0
@@ -129,7 +128,7 @@ msgstr "Equipe de Vendas"
 #. module: sale_crm
 #: view:crm.lead:0
 msgid "Create Quotation"
-msgstr ""
+msgstr "Criar Cotação"
 
 #. module: sale_crm
 #: model:ir.actions.act_window,name:sale_crm.action_crm_make_sale
@@ -149,7 +148,7 @@ msgstr "Pedido de Venda"
 #. module: sale_crm
 #: view:crm.make.sale:0
 msgid "or"
-msgstr ""
+msgstr "ou"
 
 #~ msgid "Crm opportunity quotation"
 #~ msgstr "Cotação da oportunidade de Crm"
diff --git a/addons/share/i18n/pt_BR.po b/addons/share/i18n/pt_BR.po
index 180b2314799..e3b3ef2ce95 100644
--- a/addons/share/i18n/pt_BR.po
+++ b/addons/share/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: 2012-12-03 16:04+0000\n"
-"PO-Revision-Date: 2012-12-04 22:27+0000\n"
+"PO-Revision-Date: 2012-12-06 12:47+0000\n"
 "Last-Translator: Cristiano Korndörfer <codigo.aberto@dorfer.com.br>\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: 2012-12-05 05:20+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-07 04:36+0000\n"
+"X-Generator: Launchpad (build 16341)\n"
 
 #. module: share
 #: code:addons/share/wizard/share_wizard.py:837
@@ -161,7 +161,7 @@ msgstr "Informações de acesso"
 #. module: share
 #: view:share.wizard:0
 msgid "Share"
-msgstr "Compartilhamento"
+msgstr "Compartilhar"
 
 #. module: share
 #: code:addons/share/wizard/share_wizard.py:566
@@ -192,13 +192,14 @@ msgstr "Próximo"
 #, python-format
 msgid "Action and Access Mode are required to create a shared access."
 msgstr ""
+"Ação e Modo de Acesso são necessários para criar um acesso compartilhado."
 
 #. module: share
 #: code:addons/share/wizard/share_wizard.py:845
 #: code:addons/share/wizard/share_wizard.py:877
 #, python-format
 msgid "Username"
-msgstr "Nome de usuário"
+msgstr "Nome do Usuário"
 
 #. module: share
 #: view:share.wizard:0
@@ -215,7 +216,7 @@ msgstr "Convidar"
 #. module: share
 #: view:share.wizard:0
 msgid "Embedded code options"
-msgstr "Opções de código embutido"
+msgstr "Opções de código incorporado"
 
 #. module: share
 #: view:share.wizard:0
@@ -269,7 +270,7 @@ msgstr ""
 #: code:addons/share/wizard/share_wizard.py:77
 #, python-format
 msgid "Direct link or embed code"
-msgstr "Link direto ou código embutido"
+msgstr "Link direto ou código incorporado"
 
 #. module: share
 #: code:addons/share/wizard/share_wizard.py:851
@@ -280,6 +281,9 @@ msgid ""
 "Sales, HR, etc.)\n"
 "It is open source and can be found on http://www.openerp.com."
 msgstr ""
+"OpenERP é um poderoso e acessível conjunto de Aplicações de Negócios (CRM, "
+"Vendas, RH, etc.)\n"
+"Ele é de código aberto e pode ser encontrado em http://www.openerp.com."
 
 #. module: share
 #: field:share.wizard,action_id:0
@@ -290,6 +294,7 @@ msgstr "Ação para compartilhar"
 #: help:share.wizard,record_name:0
 msgid "Name of the shared record, if sharing a precise record"
 msgstr ""
+"Nome do registro compartilhado, se compartilhando um registro preciso."
 
 #. module: share
 #: field:res.users,share:0
@@ -306,29 +311,31 @@ msgstr "desconhecido"
 #: code:addons/share/wizard/share_wizard.py:652
 #, python-format
 msgid "Sharing access cannot be created."
-msgstr ""
+msgstr "O acesso ao compartilhamento não pode ser criado."
 
 #. module: share
 #: code:addons/share/wizard/share_wizard.py:775
 #, python-format
 msgid "Record id not found"
-msgstr ""
+msgstr "Id do registro não encontrado"
 
 #. module: share
 #: help:res.groups,share:0
 msgid "Group created to set access rights for sharing data with some users."
 msgstr ""
+"Grupo criado para definir direitos de acesso para dados compartilhados com "
+"alguns usuários."
 
 #. module: share
 #: view:res.groups:0
 msgid "Share Groups"
-msgstr ""
+msgstr "Grupos de Compartilhamento"
 
 #. module: share
 #: help:share.wizard,action_id:0
 msgid ""
 "The action that opens the screen containing the data you wish to share."
-msgstr ""
+msgstr "A ação que abre uma tela contendo os dados que deseja compartilhar."
 
 #. module: share
 #: code:addons/share/wizard/share_wizard.py:541
@@ -345,17 +352,23 @@ msgstr "Criado"
 #: help:share.wizard,name:0
 msgid "Title for the share (displayed to users as menu and shortcut name)"
 msgstr ""
+"Título para o compartilhamento (exibido aos usuários como um menu e atalho "
+"para o nome)"
 
 #. module: share
 #: code:addons/share/wizard/share_wizard.py:631
 #, python-format
 msgid "Indirect sharing filter created by user %s (%s) for group %s"
 msgstr ""
+"Filtro de compartilhamento indireto criado pelo usuário %s (%s) para o grupo "
+"%s"
 
 #. module: share
 #: help:share.wizard,share_root_url:0
 msgid "Main access page for users that are granted shared access"
 msgstr ""
+"Página de acesso principal para usuários que possuem acesso a "
+"compartilhamentos"
 
 #. module: share
 #: code:addons/share/wizard/share_wizard.py:206
@@ -364,11 +377,13 @@ msgid ""
 "You must configure your email address in the user preferences before using "
 "the Share button."
 msgstr ""
+"Você deve configurar o seu endereço de e-mail nas preferências de usuário "
+"antes de utilizar o botão Compartilhar."
 
 #. module: share
 #: model:res.groups,name:share.group_share_user
 msgid "User"
-msgstr ""
+msgstr "Usuário"
 
 #. module: share
 #: code:addons/share/wizard/share_wizard.py:653
@@ -378,23 +393,26 @@ msgid ""
 "supported at the moment.\n"
 "You may want to try a simpler filter."
 msgstr ""
+"Desculpe, a tela e filtro atuais que você está tentando compartilhar não são "
+"suportados no momento.\n"
+"Tente um filtro mais simples."
 
 #. module: share
 #: view:share.wizard:0
 msgid "Use this link"
-msgstr ""
+msgstr "Utilize esta ligação"
 
 #. module: share
 #: code:addons/share/wizard/share_wizard.py:847
 #: code:addons/share/wizard/share_wizard.py:879
 #, python-format
 msgid "Database"
-msgstr "Base de Dados"
+msgstr "Banco de Dados"
 
 #. module: share
 #: view:share.wizard:0
 msgid "Share with these People (one email per line)"
-msgstr ""
+msgstr "Compartilhar com estas Pessoas (um e-mail por linha)"
 
 #. module: share
 #: field:share.wizard,domain:0
@@ -404,7 +422,7 @@ msgstr "Domínio"
 #. module: share
 #: view:res.groups:0
 msgid "{'search_default_no_share':1}"
-msgstr ""
+msgstr "{'search_default_no_share':1}"
 
 #. module: share
 #: view:share.wizard:0
@@ -417,6 +435,8 @@ msgstr "Resumo"
 msgid ""
 "Embed this code in your documents to provide a link to the shared document."
 msgstr ""
+"Incorpore este código em seus documentos para fornecer uma ligação para o "
+"documento compartilhado."
 
 #. module: share
 #: code:addons/share/wizard/share_wizard.py:508
@@ -428,17 +448,18 @@ msgstr "Copiado o acesso para o compartilhamento"
 #: code:addons/share/wizard/share_wizard.py:812
 #, python-format
 msgid "Invitation"
-msgstr ""
+msgstr "Convite"
 
 #. module: share
 #: model:ir.actions.act_window,name:share.action_share_wizard_step1
 msgid "Share your documents"
-msgstr ""
+msgstr "Compartilhe seus documentos"
 
 #. module: share
 #: view:share.wizard:0
 msgid "Or insert the following code where you want to embed your documents"
 msgstr ""
+"Ou insira o código seguinte onde você pretende incorporar seus documentos"
 
 #. module: share
 #: code:addons/share/wizard/share_wizard.py:881
@@ -447,6 +468,8 @@ msgid ""
 "The documents have been automatically added to your current OpenERP "
 "documents.\n"
 msgstr ""
+"Os documentos foram adicionados automaticamente aos seus documentos do "
+"OpenERP atuais.\n"
 
 #. module: share
 #: model:ir.model,name:share.model_share_wizard_result_line
@@ -456,7 +479,7 @@ msgstr "share.wizard.result.line"
 #. module: share
 #: field:share.wizard,embed_code:0
 msgid "Code"
-msgstr ""
+msgstr "Código"
 
 #. module: share
 #: help:share.wizard,user_type:0
@@ -472,21 +495,23 @@ msgid ""
 "I have shared %s (%s) with you!\n"
 "\n"
 msgstr ""
+"Eu compartilhei %s (%s) com você!\n"
+"\n"
 
 #. module: share
 #: field:share.wizard,view_type:0
 msgid "Current View Type"
-msgstr ""
+msgstr "Tipo de Visão Atual"
 
 #. module: share
 #: selection:share.wizard,access_mode:0
 msgid "Can view"
-msgstr ""
+msgstr "Pode visualizar"
 
 #. module: share
 #: selection:share.wizard,access_mode:0
 msgid "Can edit"
-msgstr ""
+msgstr "Pode editar"
 
 #. module: share
 #: view:share.wizard:0
@@ -499,6 +524,8 @@ msgid ""
 "External user with limited access, created only for the purpose of sharing "
 "data."
 msgstr ""
+"Usuário externo tem acesso limitado, criado apenas com o propósito de "
+"compartilhar dados."
 
 #. module: share
 #: model:ir.actions.act_window,name:share.action_share_wizard
@@ -511,7 +538,7 @@ msgstr "Assistente de Compartilhamento"
 #: code:addons/share/wizard/share_wizard.py:788
 #, python-format
 msgid "Shared access created!"
-msgstr ""
+msgstr "Acesso ao compartilhamento criado!"
 
 #. module: share
 #: model:res.groups,comment:share.group_share_user
@@ -520,6 +547,10 @@ msgid ""
 "Members of this groups have access to the sharing wizard, which allows them "
 "to invite external users to view or edit some of their documents."
 msgstr ""
+"\n"
+"Membros destes grupos tem acesso ao assistente de compartilhamento, que lhes "
+"permite convidar usuários externos para visualizar ou editar alguns de seus "
+"documentos."
 
 #. module: share
 #: code:addons/share/wizard/share_wizard.py:848
@@ -528,11 +559,13 @@ msgid ""
 "The documents have been automatically added to your subscriptions.\n"
 "\n"
 msgstr ""
+"Os documentos foram adicionados automaticamente à sua assinatura.\n"
+"\n"
 
 #. module: share
 #: model:ir.model,name:share.model_res_users
 msgid "Users"
-msgstr ""
+msgstr "Usuários"
 
 #. module: share
 #: code:addons/share/wizard/share_wizard.py:871
@@ -541,16 +574,18 @@ msgid ""
 "I've shared %s with you!\n"
 "\n"
 msgstr ""
+"Eu compartilhei %s com você!\n"
+"\n"
 
 #. module: share
 #: model:ir.model,name:share.model_res_groups
 msgid "Access Groups"
-msgstr ""
+msgstr "Grupos de Acesso"
 
 #. module: share
 #: field:share.wizard,invite:0
 msgid "Invite users to OpenSocial record"
-msgstr ""
+msgstr "Convide usuários para registro no OpenSocial"
 
 #. module: share
 #: code:addons/share/wizard/share_wizard.py:846
@@ -565,17 +600,17 @@ msgstr "Senha"
 #: field:share.wizard,new_users:0
 #, python-format
 msgid "Emails"
-msgstr ""
+msgstr "E-mails"
 
 #. module: share
 #: field:share.wizard,embed_option_search:0
 msgid "Display search view"
-msgstr ""
+msgstr "Mostrar a visão de pesquisa"
 
 #. module: share
 #: field:share.wizard,message:0
 msgid "Personal Message"
-msgstr ""
+msgstr "Mensagem Pessoal"
 
 #. module: share
 #: code:addons/share/wizard/share_wizard.py:830
@@ -585,24 +620,24 @@ msgid ""
 "The current user must have an email address configured in User Preferences "
 "to be able to send outgoing emails."
 msgstr ""
-"O usuário atual deve ter um endereço de email configurado nas Preferências "
-"de Usuário para poder enviar emails."
+"O usuário atual deve ter um endereço de e-mail configurado nas Preferências "
+"de Usuário para poder enviar e-mails."
 
 #. module: share
 #: code:addons/share/wizard/share_wizard.py:205
 #, python-format
 msgid "No email address configured"
-msgstr ""
+msgstr "Nenhum endereço de e-mail configurado."
 
 #. module: share
 #: field:share.wizard.result.line,login:0
 msgid "Login"
-msgstr ""
+msgstr "Entrar"
 
 #. module: share
 #: view:res.users:0
 msgid "Regular users only (no share user)"
-msgstr ""
+msgstr "Somente usuários regulares (sem usuário de compartilhamento)"
 
 #. module: share
 #: field:share.wizard,access_mode:0
@@ -612,7 +647,7 @@ msgstr "Modo de Acesso"
 #. module: share
 #: view:share.wizard:0
 msgid "Sharing: preparation"
-msgstr ""
+msgstr "Compartilhamento: preparação"
 
 #. module: share
 #: model:ir.model,name:share.model_ir_model_access
@@ -622,12 +657,12 @@ msgstr ""
 #. module: share
 #: view:share.wizard:0
 msgid "or"
-msgstr ""
+msgstr "ou"
 
 #. module: share
 #: help:share.wizard,access_mode:0
 msgid "Access rights to be granted on the shared documents."
-msgstr ""
+msgstr "Direitos de acesso a serem aplicados nos documentos compartilhados."
 
 #~ msgid "You can not have two users with the same login !"
 #~ msgstr "Você não pode ter dois usuários com o mesmo login !"
diff --git a/addons/web/i18n/es.po b/addons/web/i18n/es.po
index 7f99091ef4e..94a5ba81645 100644
--- a/addons/web/i18n/es.po
+++ b/addons/web/i18n/es.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openerp-web\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-11-30 18:13+0000\n"
-"PO-Revision-Date: 2012-12-04 20:16+0000\n"
-"Last-Translator: Santi (Pexego) <santiago@pexego.es>\n"
+"PO-Revision-Date: 2012-12-06 19:10+0000\n"
+"Last-Translator: Eduardo Alberto Calvo <Unknown>\n"
 "Language-Team: Spanish <es@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-05 05:42+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-07 04:47+0000\n"
+"X-Generator: Launchpad (build 16341)\n"
 
 #. module: web
 #. openerp-web
@@ -609,7 +609,7 @@ msgstr "Formatos de Exportación"
 #: code:addons/web/static/src/xml/base.xml:952
 #, python-format
 msgid "On change:"
-msgstr "On change:"
+msgstr "Al cambiar:"
 
 #. module: web
 #. openerp-web
@@ -863,7 +863,7 @@ msgstr "Preferencias"
 #: code:addons/web/static/src/js/view_form.js:434
 #, python-format
 msgid "Wrong on change format: %s"
-msgstr ""
+msgstr "Error en el cambio de formato: %s"
 
 #. module: web
 #. openerp-web
@@ -1255,7 +1255,7 @@ msgstr "Agrupar por: %s"
 #: code:addons/web/static/src/js/view_form.js:151
 #, python-format
 msgid "No data provided."
-msgstr ""
+msgstr "No se han facilitado datos"
 
 #. module: web
 #. openerp-web
@@ -1326,7 +1326,7 @@ msgstr "%(page)d/%(page_count)d"
 #: code:addons/web/static/src/js/chrome.js:397
 #, python-format
 msgid "The confirmation does not match the password"
-msgstr ""
+msgstr "La confirmación no coincide con la contraseña"
 
 #. module: web
 #. openerp-web
@@ -1417,7 +1417,7 @@ msgstr "es igual a"
 #: code:addons/web/static/src/js/views.js:1455
 #, python-format
 msgid "Could not serialize XML"
-msgstr ""
+msgstr "No pudo serializar el XML"
 
 #. module: web
 #. openerp-web
@@ -2229,7 +2229,7 @@ msgstr "No se encontró contenido para el campo '%s' en '%s:%s'"
 #: code:addons/web/static/src/xml/base.xml:304
 #, python-format
 msgid "Database Management"
-msgstr ""
+msgstr "Administración base de datos"
 
 #. module: web
 #. openerp-web
@@ -2315,7 +2315,7 @@ msgstr "Agregar condición"
 #: code:addons/web/static/src/js/coresetup.js:620
 #, python-format
 msgid "Still loading..."
-msgstr ""
+msgstr "Aún cargando..."
 
 #. module: web
 #. openerp-web
@@ -2331,6 +2331,7 @@ msgstr ""
 #, python-format
 msgid "The o2m record must be saved before an action can be used"
 msgstr ""
+"El registro O2M debe guardarse antes que una acción pueda ser utilizada"
 
 #. module: web
 #. openerp-web
@@ -2414,7 +2415,7 @@ msgstr "Editar Flujo de trabajo"
 #: code:addons/web/static/src/js/views.js:1172
 #, python-format
 msgid "Do you really want to delete this attachment ?"
-msgstr ""
+msgstr "¿Realmente quiere borrar este adjunto?"
 
 #. module: web
 #. openerp-web
diff --git a/addons/web/i18n/fa.po b/addons/web/i18n/fa.po
index 2ae05a69b08..7464ed229e1 100644
--- a/addons/web/i18n/fa.po
+++ b/addons/web/i18n/fa.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openerp-web\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-11-30 18:13+0000\n"
-"PO-Revision-Date: 2012-11-28 01:51+0000\n"
+"PO-Revision-Date: 2012-12-06 15:39+0000\n"
 "Last-Translator: fshahy <fshahy@gmail.com>\n"
 "Language-Team: Persian <fa@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-01 05:20+0000\n"
-"X-Generator: Launchpad (build 16319)\n"
+"X-Launchpad-Export-Date: 2012-12-07 04:47+0000\n"
+"X-Generator: Launchpad (build 16341)\n"
 
 #. module: web
 #. openerp-web
@@ -68,14 +68,14 @@ msgstr ""
 #: code:addons/web/static/src/xml/base.xml:282
 #, python-format
 msgid "Master password:"
-msgstr ""
+msgstr "کلمه عبور اصلی:"
 
 #. module: web
 #. openerp-web
 #: code:addons/web/static/src/xml/base.xml:274
 #, python-format
 msgid "Change Master Password"
-msgstr ""
+msgstr "تغییر کلمه عبور اصلی"
 
 #. module: web
 #. openerp-web
@@ -96,14 +96,14 @@ msgstr ""
 #: code:addons/web/static/src/js/chrome.js:537
 #, python-format
 msgid "Access Denied"
-msgstr ""
+msgstr "امکان دسترسی وجود ندارد"
 
 #. module: web
 #. openerp-web
 #: code:addons/web/static/src/js/coresetup.js:594
 #, python-format
 msgid "about an hour ago"
-msgstr ""
+msgstr "حدود یک ساعت قبل"
 
 #. module: web
 #. openerp-web
@@ -112,7 +112,7 @@ msgstr ""
 #: code:addons/web/static/src/xml/base.xml:216
 #, python-format
 msgid "Backup Database"
-msgstr ""
+msgstr "تهیه کپی پشتیبان از پایگاه داده"
 
 #. module: web
 #. openerp-web
@@ -147,14 +147,14 @@ msgstr "فایل"
 #: code:addons/web/controllers/main.py:842
 #, python-format
 msgid "You cannot leave any password empty."
-msgstr ""
+msgstr "هیچ یک از فیلد های کلمه عبور نباید خالی باشد."
 
 #. module: web
 #. openerp-web
 #: code:addons/web/static/src/js/chrome.js:681
 #, python-format
 msgid "Invalid username or password"
-msgstr ""
+msgstr "نام کاربر یا گذرواژهٔ نامعتبر"
 
 #. module: web
 #. openerp-web
@@ -163,7 +163,7 @@ msgstr ""
 #: code:addons/web/static/src/xml/base.xml:260
 #, python-format
 msgid "Master Password:"
-msgstr ""
+msgstr "کلمه عبور اصلی:"
 
 #. module: web
 #. openerp-web
@@ -171,14 +171,14 @@ msgstr ""
 #: code:addons/web/static/src/xml/base.xml:1349
 #, python-format
 msgid "Select"
-msgstr ""
+msgstr "انتخاب"
 
 #. module: web
 #. openerp-web
 #: code:addons/web/static/src/js/chrome.js:549
 #, python-format
 msgid "Database restored successfully"
-msgstr ""
+msgstr "پایگاه داده با موفقیت بازیابی شد"
 
 #. module: web
 #. openerp-web
@@ -192,7 +192,7 @@ msgstr "نسخه"
 #: code:addons/web/static/src/xml/base.xml:564
 #, python-format
 msgid "Latest Modification Date:"
-msgstr ""
+msgstr "تاریخ آخرین تغییر"
 
 #. module: web
 #. openerp-web
@@ -213,7 +213,7 @@ msgstr ""
 #: code:addons/web/static/src/xml/base.xml:1583
 #, python-format
 msgid "Share with all users"
-msgstr ""
+msgstr "اشتراک با همه کاربران"
 
 #. module: web
 #. openerp-web
@@ -221,7 +221,7 @@ msgstr ""
 #: code:addons/web/static/src/js/view_form.js:319
 #, python-format
 msgid "Form"
-msgstr ""
+msgstr "فرم"
 
 #. module: web
 #. openerp-web
@@ -270,14 +270,14 @@ msgstr "تعریف نشده"
 #: code:addons/web/static/src/js/view_form.js:4831
 #, python-format
 msgid "File Upload"
-msgstr ""
+msgstr "آپلود فایل"
 
 #. module: web
 #. openerp-web
 #: code:addons/web/static/src/js/coresetup.js:598
 #, python-format
 msgid "about a month ago"
-msgstr ""
+msgstr "حدود یک ماه قبل"
 
 #. module: web
 #. openerp-web
diff --git a/addons/web/i18n/hr.po b/addons/web/i18n/hr.po
index e3624445143..ffeb92a4850 100644
--- a/addons/web/i18n/hr.po
+++ b/addons/web/i18n/hr.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openerp-web\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-11-30 18:13+0000\n"
-"PO-Revision-Date: 2012-11-24 19:05+0000\n"
+"PO-Revision-Date: 2012-12-06 17:55+0000\n"
 "Last-Translator: Goran Kliska <gkliska@gmail.com>\n"
 "Language-Team: Croatian <hr@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-01 05:21+0000\n"
-"X-Generator: Launchpad (build 16319)\n"
+"X-Launchpad-Export-Date: 2012-12-07 04:47+0000\n"
+"X-Generator: Launchpad (build 16341)\n"
 
 #. module: web
 #. openerp-web
@@ -68,7 +68,7 @@ msgstr ""
 #: code:addons/web/static/src/xml/base.xml:282
 #, python-format
 msgid "Master password:"
-msgstr "Glavna zaporka"
+msgstr "Glavna lozinka"
 
 #. module: web
 #. openerp-web
@@ -154,7 +154,7 @@ msgstr ""
 #: code:addons/web/static/src/js/chrome.js:681
 #, python-format
 msgid "Invalid username or password"
-msgstr "Neispravno korisničko ime ili zaporka."
+msgstr "Neispravno korisničko ime ili lozinka."
 
 #. module: web
 #. openerp-web
@@ -163,7 +163,7 @@ msgstr "Neispravno korisničko ime ili zaporka."
 #: code:addons/web/static/src/xml/base.xml:260
 #, python-format
 msgid "Master Password:"
-msgstr "Glavna zaporka"
+msgstr "Glavna lozinka"
 
 #. module: web
 #. openerp-web
@@ -250,7 +250,7 @@ msgstr "nije ispravan broj"
 #: code:addons/web/static/src/xml/base.xml:325
 #, python-format
 msgid "New Password:"
-msgstr "Nova zaporka:"
+msgstr "Nova lozinka:"
 
 #. module: web
 #. openerp-web
@@ -328,7 +328,7 @@ msgstr "Dupliciraj bazu podataka"
 #: code:addons/web/static/src/xml/base.xml:336
 #, python-format
 msgid "Change Password"
-msgstr "Promijeni zaporku"
+msgstr "Promijeni lozinku"
 
 #. module: web
 #. openerp-web
@@ -688,7 +688,7 @@ msgstr "Snimljeni izvozi"
 #: code:addons/web/static/src/xml/base.xml:320
 #, python-format
 msgid "Old Password:"
-msgstr "Stara zaporka:"
+msgstr "Stara lozinka:"
 
 #. module: web
 #. openerp-web
diff --git a/addons/web_kanban/i18n/fa.po b/addons/web_kanban/i18n/fa.po
index 30f38bb2149..3dc8dff6f37 100644
--- a/addons/web_kanban/i18n/fa.po
+++ b/addons/web_kanban/i18n/fa.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openerp-web\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-11-30 18:13+0000\n"
-"PO-Revision-Date: 2012-11-27 22:58+0000\n"
+"PO-Revision-Date: 2012-12-06 15:32+0000\n"
 "Last-Translator: fshahy <fshahy@gmail.com>\n"
 "Language-Team: Persian <fa@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-01 05:21+0000\n"
-"X-Generator: Launchpad (build 16319)\n"
+"X-Launchpad-Export-Date: 2012-12-07 04:47+0000\n"
+"X-Generator: Launchpad (build 16341)\n"
 
 #. module: web_kanban
 #. openerp-web
@@ -29,7 +29,7 @@ msgstr "ویرایش ستون"
 #: code:addons/web_kanban/static/src/js/kanban.js:413
 #, python-format
 msgid "An error has occured while moving the record to this group."
-msgstr ""
+msgstr "هنگام انتقال رکورد به این گروه خزایی رخ داده است."
 
 #. module: web_kanban
 #. openerp-web
@@ -150,7 +150,7 @@ msgstr "یا"
 #: code:addons/web_kanban/static/src/xml/web_kanban.xml:51
 #, python-format
 msgid "99+"
-msgstr ""
+msgstr "+۹۹"
 
 #. module: web_kanban
 #. openerp-web
diff --git a/addons/web_view_editor/i18n/fa.po b/addons/web_view_editor/i18n/fa.po
index 1d24a464f0b..13194e4c508 100644
--- a/addons/web_view_editor/i18n/fa.po
+++ b/addons/web_view_editor/i18n/fa.po
@@ -8,21 +8,21 @@ msgstr ""
 "Project-Id-Version: openerp-web\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-11-30 18:13+0000\n"
-"PO-Revision-Date: 2012-11-27 22:58+0000\n"
+"PO-Revision-Date: 2012-12-06 15:25+0000\n"
 "Last-Translator: fshahy <fshahy@gmail.com>\n"
 "Language-Team: Persian <fa@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-01 05:21+0000\n"
-"X-Generator: Launchpad (build 16319)\n"
+"X-Launchpad-Export-Date: 2012-12-07 04:47+0000\n"
+"X-Generator: Launchpad (build 16341)\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 ""
+msgstr "فیلدهای زیر معتبر نیستند."
 
 #. module: web_view_editor
 #. openerp-web
@@ -36,7 +36,7 @@ msgstr "ایجاد"
 #: code:addons/web_view_editor/static/src/js/view_editor.js:986
 #, python-format
 msgid "New Field"
-msgstr ""
+msgstr "فیلد جدید"
 
 #. module: web_view_editor
 #. openerp-web
@@ -71,7 +71,7 @@ msgstr "ذخیره"
 #: code:addons/web_view_editor/static/src/js/view_editor.js:393
 #, python-format
 msgid "Select an element"
-msgstr ""
+msgstr "یک مورد را انتخاب کنید."
 
 #. module: web_view_editor
 #. openerp-web
@@ -86,7 +86,7 @@ msgstr "به روز رسانی"
 #: code:addons/web_view_editor/static/src/js/view_editor.js:263
 #, python-format
 msgid "Please select view in list :"
-msgstr ""
+msgstr "لطفا نما را از لیست انتخاب کنید."
 
 #. module: web_view_editor
 #. openerp-web

From 767fad5f96155b07e9261ddf9dd4e684e4b69dc8 Mon Sep 17 00:00:00 2001
From: "Quentin (OpenERP)" <qdp-launchpad@openerp.com>
Date: Fri, 7 Dec 2012 09:57:46 +0100
Subject: [PATCH 095/110] [REF] account_followup: use payment_amount_due
 instead of credit field

bzr revid: qdp-launchpad@openerp.com-20121207085746-fcnkni42jruaiqlu
---
 addons/account_followup/account_followup.py            | 4 ++++
 addons/account_followup/account_followup_customers.xml | 4 ++--
 addons/account_followup/tests/test_account_followup.py | 7 +++----
 3 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/addons/account_followup/account_followup.py b/addons/account_followup/account_followup.py
index c6c9bd8e079..0d748384672 100644
--- a/addons/account_followup/account_followup.py
+++ b/addons/account_followup/account_followup.py
@@ -309,6 +309,10 @@ class res_partner(osv.osv):
 
 
     def _get_amounts_and_date(self, cr, uid, ids, name, arg, context=None):
+        '''
+        Function that computes values for the followup functional fields. Note that 'payment_amount_due'
+        is similar to 'credit' field on res.partner except it filters on user's company.
+        '''
         res = {}
         company = self.pool.get('res.users').browse(cr, uid, uid, context=context).company_id
         current_date = fields.date.context_today(cr, uid, context)
diff --git a/addons/account_followup/account_followup_customers.xml b/addons/account_followup/account_followup_customers.xml
index 3a7b5315b62..0471eb52fbe 100644
--- a/addons/account_followup/account_followup_customers.xml
+++ b/addons/account_followup/account_followup_customers.xml
@@ -67,9 +67,9 @@
                     <page string="Payment Follow-up" groups="account.group_account_invoice" name="followup_tab">
                         <div class="oe_right oe_button_box" name="followup_button">
                             <button name="do_button_print" type="object" string="Print Overdue Payments" groups="account.group_account_user" 
-                                help="Print overdue payments report independent of follow-up line" attrs="{'invisible':[('credit', '&lt;=', 0.0)]}" />
+                                help="Print overdue payments report independent of follow-up line" attrs="{'invisible':[('payment_amount_due', '&lt;=', 0.0)]}" />
                             <button name="do_partner_mail" type="object" string="Send Overdue Email" groups="account.group_account_user"
-                                help="If not specified by the latest follow-up level, it will send from the default email template" attrs="{'invisible':[('credit', '&lt;=', 0.0)]}"/>
+                                help="If not specified by the latest follow-up level, it will send from the default email template" attrs="{'invisible':[('payment_amount_due', '&lt;=', 0.0)]}"/>
                         </div>
                         <p attrs="{'invisible':[('latest_followup_date','=', False)]}">
                             The <field name="latest_followup_date"  class = "oe_inline"/>, the latest payment follow-up
diff --git a/addons/account_followup/tests/test_account_followup.py b/addons/account_followup/tests/test_account_followup.py
index c46977bd6b5..4495ffa6469 100644
--- a/addons/account_followup/tests/test_account_followup.py
+++ b/addons/account_followup/tests/test_account_followup.py
@@ -108,7 +108,7 @@ class TestAccountFollowup(TransactionCase):
     def test_03_filter_on_credit(self):
         """ Check the partners can be filtered on having credits """
         cr, uid = self.cr, self.uid
-        ids = self.partner.search(cr, uid, [('credit', '>=', 0.0)])
+        ids = self.partner.search(cr, uid, [('payment_amount_due', '>=', 0.0)])
         self.assertIn(self.partner_id, ids)
         
     def test_04_action_done(self):
@@ -153,7 +153,6 @@ class TestAccountFollowup(TransactionCase):
                                                       }, context={"followup_id": self.followup_id})
         self.wizard.do_process(cr, uid, [self.wizard_id], context={"followup_id": self.followup_id})
         partner_ref = self.partner.browse(cr, uid, self.partner_id)
-        print partner_ref.credit, partner_ref.payment_next_action_date, partner_ref.payment_responsible_id
-        self.assertEqual(0, self.partner.browse(cr, uid, self.partner_id).credit, "Credit != 0")
+        self.assertEqual(0, self.partner.browse(cr, uid, self.partner_id).payment_amount_due, "Amount Due != 0")
         self.assertFalse(self.partner.browse(cr, uid, self.partner_id).payment_next_action_date, "Next action date not cleared")
-        
\ No newline at end of file
+        

From 5f933e0188f2bc69f4e2b394844667d187cda26f Mon Sep 17 00:00:00 2001
From: Raphael Collet <rco@openerp.com>
Date: Fri, 7 Dec 2012 11:23:21 +0100
Subject: [PATCH 096/110] [IMP] resource: small improvement of Stuart's
 time_diff function

bzr revid: rco@openerp.com-20121207102321-3e4rp9562on0zspg
---
 addons/resource/faces/pcalendar.py | 14 +++++---------
 1 file changed, 5 insertions(+), 9 deletions(-)

diff --git a/addons/resource/faces/pcalendar.py b/addons/resource/faces/pcalendar.py
index 4b023911b1e..de7bf251c1b 100644
--- a/addons/resource/faces/pcalendar.py
+++ b/addons/resource/faces/pcalendar.py
@@ -893,17 +893,13 @@ class Calendar(object):
     #@-node:_build_mapping
     #@+node:_recalc_working_time
     def _recalc_working_time(self):
+        def time_diff(times):
+            diff = times[1] - times[0]
+            if diff <= 0:           # happens when times span across midnight
+                diff += 24*60
+            return diff
         def slot_sum_time(day):
             slots = self.working_times.get(day, DEFAULT_WORKING_DAYS[day])
-            def time_diff(times):
-                (start, end) = times
-                if end == start:
-                    return 24*60    # 24 hours
-
-                diff = end - start
-                if end < start:
-                    diff += (24*60)
-                return diff
             return sum(map(time_diff, slots))
 
         self.day_times = map(slot_sum_time, range(0, 7))

From ecd2cd1e05657cd2927821a82308cd1f32370ba4 Mon Sep 17 00:00:00 2001
From: Raphael Collet <rco@openerp.com>
Date: Fri, 7 Dec 2012 11:27:18 +0100
Subject: [PATCH 097/110] [IMP] resource: improve conversion function hours
 (float) -> datetime.time

bzr revid: rco@openerp.com-20121207102718-jxojya78wnb8jmgc
---
 addons/resource/resource.py | 16 ++++++----------
 1 file changed, 6 insertions(+), 10 deletions(-)

diff --git a/addons/resource/resource.py b/addons/resource/resource.py
index b3bfcea9664..25d5af09d90 100644
--- a/addons/resource/resource.py
+++ b/addons/resource/resource.py
@@ -275,14 +275,10 @@ class resource_calendar_attendance(osv.osv):
     }
 resource_calendar_attendance()
 
-def convert_timeformat(time_string):
-    split_list = str(time_string).split('.')
-    hour_part = split_list[0]
-    mins_part = split_list[1]
-    round_mins = int(round(float(mins_part) * 60,-2))
-    return time(int(hour_part), round_mins)
-    #converted_string = hour_part + ':' + str(round_mins)[0:2]
-    #return converted_string
+def float_time(hours):
+    """ convert a number of hours (float) into a datetime.time """
+    minutes = int(round(hours * 60))
+    return time(minutes / 60, minutes % 60)
 
 class resource_resource(osv.osv):
     _name = "resource.resource"
@@ -406,8 +402,8 @@ class resource_resource(osv.osv):
                     day = int(week['dayofweek'])
                 else:
                     raise osv.except_osv(_('Configuration Error!'),_('Make sure the Working time has been configured with proper week days!'))
-                hour_from = convert_timeformat(week['hour_from'])
-                hour_to = convert_timeformat(week['hour_to'])
+                hour_from = float_time(week['hour_from'])
+                hour_to = float_time(week['hour_to'])
                 wktime_local.append((day, hour_from, hour_to))
 
         # We now have working hours _in local time_.  Non-working days are an

From 58e256093da6477525a89b0a39af2a0366ff44bc Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Fri, 7 Dec 2012 11:49:33 +0100
Subject: [PATCH 099/110] [FIX] board: missed JS-ification of context and
 domains evaluations

various contexts and domains would remain unevaluated during the loading of board actions, leading to errors down the line

bzr revid: xmo@openerp.com-20121207104933-p1fmog7ohljs9wfc
---
 addons/board/static/src/js/dashboard.js | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

diff --git a/addons/board/static/src/js/dashboard.js b/addons/board/static/src/js/dashboard.js
index 13a51cc663e..0a38c744738 100644
--- a/addons/board/static/src/js/dashboard.js
+++ b/addons/board/static/src/js/dashboard.js
@@ -176,18 +176,21 @@ instance.web.form.DashBoard = instance.web.form.FormWidget.extend({
             action = result,
             view_mode = action_attrs.view_mode;
 
-        if (action_attrs.context && action_attrs.context['dashboard_merge_domains_contexts'] === false) {
+        // evaluate action_attrs context and domain
+        action_attrs.context = instance.web.pyeval.eval(
+            'context', action_attrs.context || {});
+        action_attrs.domain = instance.web.pyeval.eval(
+            'domain', action_attrs.domain || [], action_attrs.context);
+        if (action_attrs.context['dashboard_merge_domains_contexts'] === false) {
             // TODO: replace this 6.1 workaround by attribute on <action/>
             action.context = action_attrs.context || {};
             action.domain = action_attrs.domain || [];
         } else {
-            if (action_attrs.context) {
-                action.context = _.extend((action.context || {}), action_attrs.context);
-            }
-            if (action_attrs.domain) {
-                action.domain = action.domain || [];
-                action.domain.unshift.apply(action.domain, action_attrs.domain);
-            }
+            action.context = instance.web.pyeval.eval(
+                'contexts', [action.context || {}, action_attrs.context]);
+            action.domain = instance.web.pyeval.eval(
+                'domains', [action_attrs.domain, action.domain || []],
+                action.context)
         }
 
         var action_orig = _.extend({ flags : {} }, action);

From 6ed367c09386236941a46c913ff8d1ff1eb1a564 Mon Sep 17 00:00:00 2001
From: Raphael Collet <rco@openerp.com>
Date: Fri, 7 Dec 2012 13:19:25 +0100
Subject: [PATCH 100/110] [IMP] resource: small code improvements

bzr revid: rco@openerp.com-20121207121925-ju6mdv66k4zsw5yk
---
 addons/resource/resource.py | 34 +++++++++++++---------------------
 1 file changed, 13 insertions(+), 21 deletions(-)

diff --git a/addons/resource/resource.py b/addons/resource/resource.py
index 25d5af09d90..1effc9ced2b 100644
--- a/addons/resource/resource.py
+++ b/addons/resource/resource.py
@@ -373,35 +373,27 @@ class resource_resource(osv.osv):
         if not calendar_id:
             # Calendar is not specified: working days: some sane default
             wktime_local = [
-                (0,     time(8,0),     time(12,0)),
-                (0,     time(13,0),    time(17,0)),
-                (1,     time(8,0),     time(12,0)),
-                (1,     time(13,0),    time(17,0)),
-                (2,     time(8,0),     time(12,0)),
-                (2,     time(13,0),    time(17,0)),
-                (3,     time(8,0),     time(12,0)),
-                (3,     time(13,0),    time(17,0)),
-                (4,     time(8,0),     time(12,0)),
-                (4,     time(13,0),    time(17,0)),
+                (0, time( 8, 0), time(12, 0)),
+                (0, time(13, 0), time(17, 0)),
+                (1, time( 8, 0), time(12, 0)),
+                (1, time(13, 0), time(17, 0)),
+                (2, time( 8, 0), time(12, 0)),
+                (2, time(13, 0), time(17, 0)),
+                (3, time( 8, 0), time(12, 0)),
+                (3, time(13, 0), time(17, 0)),
+                (4, time( 8, 0), time(12, 0)),
+                (4, time(13, 0), time(17, 0)),
             ]
-            #return [('fri', '8:0-12:0','13:0-17:0'), ('thu', '8:0-12:0','13:0-17:0'), ('wed', '8:0-12:0','13:0-17:0'), 
-            #       ('mon', '8:0-12:0','13:0-17:0'), ('tue', '8:0-12:0','13:0-17:0')]
         else:
             resource_attendance_pool = self.pool.get('resource.calendar.attendance')
-            non_working = ""
-            wktime_local = []
-
             week_ids = resource_attendance_pool.search(cr, uid, [('calendar_id', '=', calendar_id)], context=context)
             weeks = resource_attendance_pool.read(cr, uid, week_ids, ['dayofweek', 'hour_from', 'hour_to'], context=context)
             # Convert time formats into appropriate format required
             # and create lists inside wktime_local.
+            wktime_local = []
             for week in weeks:
-                res_str = ""
-                day = None
-                if week['dayofweek']:
-                    day = int(week['dayofweek'])
-                else:
-                    raise osv.except_osv(_('Configuration Error!'),_('Make sure the Working time has been configured with proper week days!'))
+                day = int(week['dayofweek'])
+                assert day in xrange(7)
                 hour_from = float_time(week['hour_from'])
                 hour_to = float_time(week['hour_to'])
                 wktime_local.append((day, hour_from, hour_to))

From aff07dfa3b1af822536a88f5feb5be6046f29696 Mon Sep 17 00:00:00 2001
From: Raphael Collet <rco@openerp.com>
Date: Fri, 7 Dec 2012 13:23:51 +0100
Subject: [PATCH 101/110] [IMP] resource: improve code that computes working
 hours in local times

bzr revid: rco@openerp.com-20121207122351-eitc7zej6ss2035j
---
 addons/resource/resource.py | 54 +++++++++++++++----------------------
 1 file changed, 22 insertions(+), 32 deletions(-)

diff --git a/addons/resource/resource.py b/addons/resource/resource.py
index 1effc9ced2b..29909476511 100644
--- a/addons/resource/resource.py
+++ b/addons/resource/resource.py
@@ -403,54 +403,44 @@ class resource_resource(osv.osv):
         # start time and an end time.  We will convert these to UTC for time
         # calculation purposes.
 
-        # We need to get this into a dict
-        # which will be in the following format:
-        #   {   'day':  [(time(9,0), time(17,0)), ...], ... }
-        wktime_utc = {}
+        # We need to get this into a dict which will be in the following format:
+        #   {0: [(time(9, 0), time(17, 0)), ...], ...}
+        wktime_utc = dict((day, []) for day in range(0, 7))
 
         # NOTE: This may break with regards to DST!
         for (day, start, end) in wktime_local:
             # Convert start time to UTC
             start_dt_local = datetime.combine(date.today(), start.replace(tzinfo=tz))
             start_dt_utc = start_dt_local.astimezone(pytz.utc)
-            start_dt_day = (day + (start_dt_utc.date() - start_dt_local.date()).days) % 7
+            start_day = (day + (start_dt_utc.date() - start_dt_local.date()).days) % 7
 
             # Convert end time to UTC
             end_dt_local = datetime.combine(date.today(), end.replace(tzinfo=tz))
             end_dt_utc = end_dt_local.astimezone(pytz.utc)
-            end_dt_day = (day + (end_dt_utc.date() - end_dt_local.date()).days) % 7
+            end_day = (day + (end_dt_utc.date() - end_dt_local.date()).days) % 7
 
             # Are start and end still on the same day?
-            if start_dt_day == end_dt_day:
-                day_name = week_days[start_dt_day]
-                if day_name not in wktime_utc:
-                    wktime_utc[day_name] = []
-                wktime_utc[day_name].append((start_dt_utc.time(), end_dt_utc.time()))
+            if start_day == end_day:
+                wktime_utc[start_day].append((start_dt_utc.time(), end_dt_utc.time()))
             else:
-                day_start_name = week_days[start_dt_day]
-                if day_start_name not in wktime_utc:
-                    wktime_utc[day_start_name] = []
-                # We go until midnight that day
-                wktime_utc[day_start_name].append((start_dt_utc.time(), time(0,0)))
+                # We go until midnight on the start day
+                wktime_utc[start_day].append((start_dt_utc.time(), time(0, 0)))
+                # Then resume from midnight on the end day
+                wktime_utc[end_day].append((time(0, 0), end_dt_utc.time()))
 
-                day_end_name = week_days[end_dt_day]
-                if day_end_name not in wktime_utc:
-                    wktime_utc[day_end_name] = []
-                # Then resume from midnight that day
-                wktime_utc[day_end_name].append((time(0,0), end_dt_utc.time()))
-
-        # Now having gotten a list of times together, generate the final output
+        # Now having gotten a list of times together, generate the final output:
+        #   [('mon', '08:00-12:00', '13:00-17:00', ...), ...]
         wktime_cal = []
-        for day, times in wktime_utc.iteritems():
-            # Sort the times
-            times.sort()
-            wktime = ['{0}-{1}'.format(s.strftime('%H:%M'), e.strftime('%H:%M')) for (s, e) in times]
-            wktime.insert(0, day)
+        for day, day_name in enumerate(week_days):
+            # retrieve the times and sort them
+            times = sorted(wktime_utc[day])
+            wktime = [day_name]
+            if times:
+                for s, e in times:
+                    wktime.append('{0}-{1}'.format(s.strftime('%H:%M'), e.strftime('%H:%M')))
+            else:
+                wktime.append(None)
             wktime_cal.append(tuple(wktime))
-        # Finally, add in non-working days
-        for day in week_days:
-            if day not in wktime_utc:
-                wktime_cal.append((day, None))
 
         return wktime_cal
 

From 1626eca850dde534ba68c15488eea9a4d28ecca6 Mon Sep 17 00:00:00 2001
From: "Quentin (OpenERP)" <qdp-launchpad@openerp.com>
Date: Fri, 7 Dec 2012 14:41:10 +0100
Subject: [PATCH 102/110] [IMP] product: set the product.uom names to be
 optionnaly plural, so that you can display the field after a value without
 having to care for the singular/plural

bzr revid: qdp-launchpad@openerp.com-20121207134110-xx0482e7kiemsl4s
---
 addons/product/product_data.xml | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/addons/product/product_data.xml b/addons/product/product_data.xml
index 8e5280d036a..49362e380f4 100644
--- a/addons/product/product_data.xml
+++ b/addons/product/product_data.xml
@@ -33,13 +33,13 @@
         -->
         <record id="product_uom_unit" model="product.uom">
             <field name="category_id" ref="product_uom_categ_unit"/>
-            <field name="name">Unit</field>
+            <field name="name">Unit(s)</field>
             <field name="factor" eval="1.0"/>
             <field name="rounding" eval="1.0"/>
         </record>
        <record id="product_uom_dozen" model="product.uom">
             <field name="category_id" ref="product.product_uom_categ_unit"/>
-            <field name="name">Dozen</field>
+            <field name="name">Dozen(s)</field>
             <field name="factor_inv" eval="12"/>
             <field name="uom_type">bigger</field>
         </record>
@@ -55,13 +55,13 @@
             <field name="uom_type">smaller</field>
         </record>
         <record id="product_uom_hour" model="product.uom">
-            <field name="name">Hour</field>
+            <field name="name">Hour(s)</field>
             <field eval="uom_categ_wtime" name="category_id"/>
             <field name="factor" eval="8.0"/>
             <field name="uom_type">smaller</field>
         </record>
         <record id="product_uom_day" model="product.uom">
-            <field name="name">Day</field>
+            <field name="name">Day(s)</field>
             <field eval="uom_categ_wtime" name="category_id"/>
             <field name="factor" eval="1.0"/>
         </record>
@@ -91,7 +91,7 @@
             <field name="uom_type">smaller</field>
         </record>
         <record id="product_uom_litre" model="product.uom">
-            <field name="name">Litre</field>
+            <field name="name">Liter(s)</field>
             <field name="category_id" ref="product_uom_categ_vol"/>
             <field name="factor">1.0</field>
         </record>

From 87644c5c3ddcb694b8136cf791fc17eddaf77c58 Mon Sep 17 00:00:00 2001
From: "Quentin (OpenERP)" <qdp-launchpad@openerp.com>
Date: Fri, 7 Dec 2012 15:43:17 +0100
Subject: [PATCH 103/110] [FIX] account: traceback when opening the report
 'general ledger' on a given list of account.account + fixed the
 fields_view_get

bzr revid: qdp-launchpad@openerp.com-20121207144317-vgm0gjf0y4iliv78
---
 addons/account/wizard/account_report_common.py | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/addons/account/wizard/account_report_common.py b/addons/account/wizard/account_report_common.py
index 4438484aaaf..2c1448b5e6f 100644
--- a/addons/account/wizard/account_report_common.py
+++ b/addons/account/wizard/account_report_common.py
@@ -24,6 +24,7 @@ from lxml import etree
 
 from osv import fields, osv
 from tools.translate import _
+from openerp.osv.orm import setup_modifiers
 
 class account_common_report(osv.osv_memory):
     _name = "account.common.report"
@@ -67,16 +68,16 @@ class account_common_report(osv.osv_memory):
         (_check_company_id, 'The fiscalyear, periods or chart of account chosen have to belong to the same company.', ['chart_account_id','fiscalyear_id','period_from','period_to']),
     ]
 
-
     def fields_view_get(self, cr, uid, view_id=None, view_type='form', context=None, toolbar=False, submenu=False):
         if context is None:context = {}
         res = super(account_common_report, self).fields_view_get(cr, uid, view_id=view_id, view_type=view_type, context=context, toolbar=toolbar, submenu=False)
-        if context.get('active_model', False) == 'account.account' and view_id:
+        if context.get('active_model', False) == 'account.account':
             doc = etree.XML(res['arch'])
             nodes = doc.xpath("//field[@name='chart_account_id']")
             for node in nodes:
                 node.set('readonly', '1')
                 node.set('help', 'If you print the report from Account list/form view it will not consider Charts of account')
+                setup_modifiers(node, res['fields']['chart_account_id'])
             res['arch'] = etree.tostring(doc)
         return res
 
@@ -121,8 +122,8 @@ class account_common_report(osv.osv_memory):
         now = time.strftime('%Y-%m-%d')
         company_id = False
         ids = context.get('active_ids', [])
-        if ids:
-            company_id = self.browse(cr, uid, ids[0], context=context).company_id.id
+        if ids and context.get('active_model') == 'account.account':
+            company_id = self.pool.get('account.account').browse(cr, uid, ids[0], context=context).company_id.id
         fiscalyears = self.pool.get('account.fiscalyear').search(cr, uid, [('date_start', '<', now), ('date_stop', '>', now), ('company_id', '=', company_id)], limit=1)
         return fiscalyears and fiscalyears[0] or False
 

From 87e36fb9f706846831beda36e4eedea200a0495c Mon Sep 17 00:00:00 2001
From: "Quentin (OpenERP)" <qdp-launchpad@openerp.com>
Date: Fri, 7 Dec 2012 15:54:48 +0100
Subject: [PATCH 104/110] [FIX] project_timesheet: fixing the redbot

bzr revid: qdp-launchpad@openerp.com-20121207145448-2vgdjrekxt2cp4gn
---
 addons/project_timesheet/test/work_timesheet.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/project_timesheet/test/work_timesheet.yml b/addons/project_timesheet/test/work_timesheet.yml
index 4867f92b4b1..d8367e9f7d8 100644
--- a/addons/project_timesheet/test/work_timesheet.yml
+++ b/addons/project_timesheet/test/work_timesheet.yml
@@ -18,5 +18,5 @@
     task_ids = self.browse(cr, uid, task_work, context)
     assert task_ids.user_id.id == ref("base.user_demo"), 'Error, The User in Timesheet is not Correct'
     assert task_ids.date == start, 'Error, The Date in Timesheet is not ok'
-    assert task_ids.product_uom_id.name == "Hour", 'Error, The Hour in Timesheet is not ok'
+    assert task_ids.product_uom_id.name == "Hour(s)", 'Error, The Hour in Timesheet is not ok'
 

From 635d5cbf0ed0feadb6415ac382af23daf6c20660 Mon Sep 17 00:00:00 2001
From: Raphael Collet <rco@openerp.com>
Date: Fri, 7 Dec 2012 16:08:36 +0100
Subject: [PATCH 105/110] [REV] undo
 revid:rco@openerp.com-20121207124917-cy3hz9x7aymd1cdt, because a potentially
 better patch is in line

bzr revid: rco@openerp.com-20121207150836-vsmee753v1w6yw6j
---
 addons/resource/faces/pcalendar.py |   7 +-
 addons/resource/resource.py        | 131 +++++++++++------------------
 2 files changed, 51 insertions(+), 87 deletions(-)

diff --git a/addons/resource/faces/pcalendar.py b/addons/resource/faces/pcalendar.py
index de7bf251c1b..c82c49d4816 100644
--- a/addons/resource/faces/pcalendar.py
+++ b/addons/resource/faces/pcalendar.py
@@ -893,14 +893,9 @@ class Calendar(object):
     #@-node:_build_mapping
     #@+node:_recalc_working_time
     def _recalc_working_time(self):
-        def time_diff(times):
-            diff = times[1] - times[0]
-            if diff <= 0:           # happens when times span across midnight
-                diff += 24*60
-            return diff
         def slot_sum_time(day):
             slots = self.working_times.get(day, DEFAULT_WORKING_DAYS[day])
-            return sum(map(time_diff, slots))
+            return sum(map(lambda slot: slot[1] - slot[0], slots))
 
         self.day_times = map(slot_sum_time, range(0, 7))
         self.week_time = sum(self.day_times)
diff --git a/addons/resource/resource.py b/addons/resource/resource.py
index 5f65e7e65d8..45fd9c20bc9 100644
--- a/addons/resource/resource.py
+++ b/addons/resource/resource.py
@@ -19,7 +19,7 @@
 #
 ##############################################################################
 
-from datetime import datetime, timedelta, time, date
+from datetime import datetime, timedelta
 import math
 from faces import *
 from osv import fields, osv
@@ -28,7 +28,6 @@ from tools.translate import _
 from itertools import groupby
 from operator import itemgetter
 
-import pytz
 
 class resource_calendar(osv.osv):
     _name = "resource.calendar"
@@ -275,10 +274,13 @@ class resource_calendar_attendance(osv.osv):
     }
 resource_calendar_attendance()
 
-def float_time(hours):
-    """ convert a number of hours (float) into a datetime.time """
-    minutes = int(round(hours * 60))
-    return time(minutes / 60, minutes % 60)
+def convert_timeformat(time_string):
+    split_list = str(time_string).split('.')
+    hour_part = split_list[0]
+    mins_part = split_list[1]
+    round_mins = int(round(float(mins_part) * 60,-2))
+    converted_string = hour_part + ':' + str(round_mins)[0:2]
+    return converted_string
 
 class resource_resource(osv.osv):
     _name = "resource.resource"
@@ -364,84 +366,51 @@ class resource_resource(osv.osv):
         Change the format of working calendar from 'Openerp' format to bring it into 'Faces' format.
         @param calendar_id : working calendar of the project
         """
-        tz = pytz.utc
-        if context and ('tz' in context):
-            tz = pytz.timezone(context['tz'])
-
-        wktime_local = None
-        week_days = ['mon', 'tue', 'wed', 'thu', 'fri', 'sat', 'sun']
         if not calendar_id:
-            # Calendar is not specified: working days: some sane default
-            wktime_local = [
-                (0, time( 8, 0), time(12, 0)),
-                (0, time(13, 0), time(17, 0)),
-                (1, time( 8, 0), time(12, 0)),
-                (1, time(13, 0), time(17, 0)),
-                (2, time( 8, 0), time(12, 0)),
-                (2, time(13, 0), time(17, 0)),
-                (3, time( 8, 0), time(12, 0)),
-                (3, time(13, 0), time(17, 0)),
-                (4, time( 8, 0), time(12, 0)),
-                (4, time(13, 0), time(17, 0)),
-            ]
-        else:
-            resource_attendance_pool = self.pool.get('resource.calendar.attendance')
-            week_ids = resource_attendance_pool.search(cr, uid, [('calendar_id', '=', calendar_id)], context=context)
-            weeks = resource_attendance_pool.read(cr, uid, week_ids, ['dayofweek', 'hour_from', 'hour_to'], context=context)
-            # Convert time formats into appropriate format required
-            # and create lists inside wktime_local.
-            wktime_local = []
-            for week in weeks:
-                day = int(week['dayofweek'])
-                assert day in xrange(7)
-                hour_from = float_time(week['hour_from'])
-                hour_to = float_time(week['hour_to'])
-                wktime_local.append((day, hour_from, hour_to))
-
-        # We now have working hours _in local time_.  Non-working days are an
-        # empty list, while working days are a list of tuples, consisting of a
-        # start time and an end time.  We will convert these to UTC for time
-        # calculation purposes.
-
-        # We need to get this into a dict which will be in the following format:
-        #   {0: [(time(9, 0), time(17, 0)), ...], ...}
-        wktime_utc = dict((day, []) for day in range(0, 7))
-
-        # NOTE: This may break with regards to DST!
-        for (day, start, end) in wktime_local:
-            # Convert start time to UTC
-            start_dt_local = datetime.combine(date.today(), start.replace(tzinfo=tz))
-            start_dt_utc = start_dt_local.astimezone(pytz.utc)
-            start_day = (day + (start_dt_utc.date() - start_dt_local.date()).days) % 7
-
-            # Convert end time to UTC
-            end_dt_local = datetime.combine(date.today(), end.replace(tzinfo=tz))
-            end_dt_utc = end_dt_local.astimezone(pytz.utc)
-            end_day = (day + (end_dt_utc.date() - end_dt_local.date()).days) % 7
-
-            # Are start and end still on the same day?
-            if start_day == end_day:
-                wktime_utc[start_day].append((start_dt_utc.time(), end_dt_utc.time()))
-            else:
-                # We go until midnight on the start day
-                wktime_utc[start_day].append((start_dt_utc.time(), time(0, 0)))
-                # Then resume from midnight on the end day
-                wktime_utc[end_day].append((time(0, 0), end_dt_utc.time()))
-
-        # Now having gotten a list of times together, generate the final output:
-        #   [('mon', '08:00-12:00', '13:00-17:00', ...), ...]
+            # Calendar is not specified: working days: 24/7
+            return [('fri', '8:0-12:0','13:0-17:0'), ('thu', '8:0-12:0','13:0-17:0'), ('wed', '8:0-12:0','13:0-17:0'),
+                   ('mon', '8:0-12:0','13:0-17:0'), ('tue', '8:0-12:0','13:0-17:0')]
+        resource_attendance_pool = self.pool.get('resource.calendar.attendance')
+        time_range = "8:00-8:00"
+        non_working = ""
+        week_days = {"0": "mon", "1": "tue", "2": "wed","3": "thu", "4": "fri", "5": "sat", "6": "sun"}
+        wk_days = {}
+        wk_time = {}
+        wktime_list = []
         wktime_cal = []
-        for day, day_name in enumerate(week_days):
-            # retrieve the times and sort them
-            times = sorted(wktime_utc[day])
-            wktime = [day_name]
-            if times:
-                for s, e in times:
-                    wktime.append('{0}-{1}'.format(s.strftime('%H:%M'), e.strftime('%H:%M')))
+        week_ids = resource_attendance_pool.search(cr, uid, [('calendar_id', '=', calendar_id)], context=context)
+        weeks = resource_attendance_pool.read(cr, uid, week_ids, ['dayofweek', 'hour_from', 'hour_to'], context=context)
+        # Convert time formats into appropriate format required
+        # and create a list like [('mon', '8:00-12:00'), ('mon', '13:00-18:00')]
+        for week in weeks:
+            res_str = ""
+            day = None
+            if week_days.get(week['dayofweek'],False):
+                day = week_days[week['dayofweek']]
+                wk_days[week['dayofweek']] = week_days[week['dayofweek']]
             else:
-                wktime.append(None)
-            wktime_cal.append(tuple(wktime))
-
+                raise osv.except_osv(_('Configuration Error!'),_('Make sure the Working time has been configured with proper week days!'))
+            hour_from_str = convert_timeformat(week['hour_from'])
+            hour_to_str = convert_timeformat(week['hour_to'])
+            res_str = hour_from_str + '-' + hour_to_str
+            wktime_list.append((day, res_str))
+        # Convert into format like [('mon', '8:00-12:00', '13:00-18:00')]
+        for item in wktime_list:
+            if wk_time.has_key(item[0]):
+                wk_time[item[0]].append(item[1])
+            else:
+                wk_time[item[0]] = [item[0]]
+                wk_time[item[0]].append(item[1])
+        for k,v in wk_time.items():
+            wktime_cal.append(tuple(v))
+        # Add for the non-working days like: [('sat, sun', '8:00-8:00')]
+        for k, v in wk_days.items():
+            if week_days.has_key(k):
+                week_days.pop(k)
+        for v in week_days.itervalues():
+            non_working += v + ','
+        if non_working:
+            wktime_cal.append((non_working[:-1], time_range))
         return wktime_cal
 
 resource_resource()

From d2863fbd59c0873ab0e042ca31112587b1c0b6bb Mon Sep 17 00:00:00 2001
From: niv-openerp <nicolas.vanhoren@openerp.com>
Date: Fri, 7 Dec 2012 16:46:40 +0100
Subject: [PATCH 106/110] [IMP] added "disabled" on buttons in list view during
 execution of asynchrnous operation

bzr revid: nicolas.vanhoren@openerp.com-20121207154640-609iwn2y093kw171
---
 addons/web/static/src/js/view_list.js | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/addons/web/static/src/js/view_list.js b/addons/web/static/src/js/view_list.js
index 671b076451c..04ff8b48923 100644
--- a/addons/web/static/src/js/view_list.js
+++ b/addons/web/static/src/js/view_list.js
@@ -952,12 +952,18 @@ instance.web.ListView.List = instance.web.Class.extend( /** @lends instance.web.
                       field = $target.closest('td').data('field'),
                        $row = $target.closest('tr'),
                   record_id = self.row_id($row);
+                
+                if ($target.attr('disabled')) {
+                    return;
+                }
+                $target.attr('disabled', 'disabled');
 
                 // note: $.data converts data to number if it's composed only
                 // of digits, nice when storing actual numbers, not nice when
                 // storing strings composed only of digits. Force the action
                 // name to be a string
                 $(self).trigger('action', [field.toString(), record_id, function (id) {
+                    $target.removeAttr('disabled');
                     return self.reload_record(self.records.get(id));
                 }]);
             })

From 82b17c82a45b1d39d98b85d2c1331834a64cba95 Mon Sep 17 00:00:00 2001
From: Christophe CHAUVET <christophe.chauvet@syleam.fr>
Date: Fri, 7 Dec 2012 17:21:10 +0100
Subject: [PATCH 107/110] [IMP] Remove completly the OIDS, cause WITHOUT OIDS
 is activate by default

bzr revid: christophe.chauvet@syleam.fr-20121207162110-75hbq71zc6ufeby9
---
 openerp/osv/orm.py | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/openerp/osv/orm.py b/openerp/osv/orm.py
index 40c15a217c7..1dd3552fc95 100644
--- a/openerp/osv/orm.py
+++ b/openerp/osv/orm.py
@@ -2287,7 +2287,7 @@ class BaseModel(object):
                          if view_type == 'tree' or not action[2].get('multi')]
             resprint = [clean(print_) for print_ in resprint
                         if view_type == 'tree' or not print_[2].get('multi')]
-            #When multi="True" set it will display only in More of the list view
+            #When multi="True" set it will display only in More of the list view 
             resrelate = [clean(action) for action in resrelate
                          if (action[2].get('multi') and view_type == 'tree') or (not action[2].get('multi') and view_type == 'form')]
 
@@ -2681,17 +2681,17 @@ class BaseModel(object):
 
         order = orderby or groupby
         data_ids = self.search(cr, uid, [('id', 'in', alldata.keys())], order=order, context=context)
-
+        
         # the IDs of records that have groupby field value = False or '' should be included too
         data_ids += set(alldata.keys()).difference(data_ids)
-
-        if groupby:
+        
+        if groupby:   
             data = self.read(cr, uid, data_ids, [groupby], context=context)
             # restore order of the search as read() uses the default _order (this is only for groups, so the footprint of data should be small):
             data_dict = dict((d['id'], d[groupby] ) for d in data)
             result = [{'id': i, groupby: data_dict[i]} for i in data_ids]
         else:
-            result = [{'id': i} for i in data_ids]
+            result = [{'id': i} for i in data_ids] 
 
         for d in result:
             if groupby:
@@ -3234,7 +3234,7 @@ class BaseModel(object):
 
 
     def _create_table(self, cr):
-        cr.execute('CREATE TABLE "%s" (id SERIAL NOT NULL, PRIMARY KEY(id)) WITHOUT OIDS' % (self._table,))
+        cr.execute('CREATE TABLE "%s" (id SERIAL NOT NULL, PRIMARY KEY(id))' % (self._table,))
         cr.execute(("COMMENT ON TABLE \"%s\" IS %%s" % self._table), (self._description,))
         _schema.debug("Table '%s': created", self._table)
 
@@ -3318,7 +3318,7 @@ class BaseModel(object):
                 raise except_orm('Programming Error', ('Many2Many destination model does not exist: `%s`') % (f._obj,))
             dest_model = self.pool.get(f._obj)
             ref = dest_model._table
-            cr.execute('CREATE TABLE "%s" ("%s" INTEGER NOT NULL, "%s" INTEGER NOT NULL, UNIQUE("%s","%s")) WITHOUT OIDS' % (m2m_tbl, col1, col2, col1, col2))
+            cr.execute('CREATE TABLE "%s" ("%s" INTEGER NOT NULL, "%s" INTEGER NOT NULL, UNIQUE("%s","%s"))' % (m2m_tbl, col1, col2, col1, col2))
             # create foreign key references with ondelete=cascade, unless the targets are SQL views
             cr.execute("SELECT relkind FROM pg_class WHERE relkind IN ('v') AND relname=%s", (ref,))
             if not cr.fetchall():
@@ -3835,7 +3835,7 @@ class BaseModel(object):
                 if operation in ('read','unlink'):
                     # No need to warn about deleting an already deleted record.
                     # And no error when reading a record that was deleted, to prevent spurious
-                    # errors for non-transactional search/read sequences coming from clients
+                    # errors for non-transactional search/read sequences coming from clients 
                     return
                 _logger.warning('Failed operation on deleted record(s): %s, uid: %s, model: %s', operation, uid, self._name)
                 raise except_orm(_('Missing document(s)'),
@@ -4322,12 +4322,12 @@ class BaseModel(object):
                 del vals[self._inherits[table]]
 
             record_id = tocreate[table].pop('id', None)
-
+            
             # When linking/creating parent records, force context without 'no_store_function' key that
-            # defers stored functions computing, as these won't be computed in batch at the end of create().
+            # defers stored functions computing, as these won't be computed in batch at the end of create(). 
             parent_context = dict(context)
             parent_context.pop('no_store_function', None)
-
+            
             if record_id is None or not record_id:
                 record_id = self.pool.get(table).create(cr, user, tocreate[table], context=parent_context)
             else:
@@ -4376,7 +4376,7 @@ class BaseModel(object):
                 upd0 = upd0 + ',"' + field + '"'
                 upd1 = upd1 + ',' + self._columns[field]._symbol_set[0]
                 upd2.append(self._columns[field]._symbol_set[1](vals[field]))
-                #for the function fields that receive a value, we set them directly in the database
+                #for the function fields that receive a value, we set them directly in the database 
                 #(they may be required), but we also need to trigger the _fct_inv()
                 if (hasattr(self._columns[field], '_fnct_inv')) and not isinstance(self._columns[field], fields.related):
                     #TODO: this way to special case the related fields is really creepy but it shouldn't be changed at

From ec9aceb72df15e5be7baceec8fb72747bfcc47bf Mon Sep 17 00:00:00 2001
From: Olivier Dony <odo@openerp.com>
Date: Fri, 7 Dec 2012 18:46:32 +0100
Subject: [PATCH 108/110] [IMP] report_webkit: remove deprecated/unused
 lib_path for wkhtmltopdf

Replaced by autodetection on system PATH + optional
system config parameters via ir.config.parameter

bzr revid: odo@openerp.com-20121207174632-xkizj5hf83aymgxe
---
 addons/report_webkit/company.py | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/addons/report_webkit/company.py b/addons/report_webkit/company.py
index a8dc71f220f..f9ae4191528 100644
--- a/addons/report_webkit/company.py
+++ b/addons/report_webkit/company.py
@@ -29,9 +29,9 @@
 #
 ##############################################################################
 
-from osv import fields, osv
+from openerp.osv import fields, osv
 
-class ResCompany(osv.osv):
+class res_company(osv.osv):
     """Override company to add Header object link a company can have many header and logos"""
 
     _inherit = "res.company"
@@ -50,10 +50,6 @@ class ResCompany(osv.osv):
                                                     'html_id',
                                                     'Available html',
                                                 ),
-                'lib_path' : fields.char('Webkit Executable Path (Deprecated)', size=264,
-                                         help="This option is now deprecated in favor of autodetection of webkit location",
-                                         invisible=1),
     }
-ResCompany()
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

From f5fd0fc0815190b3e80854a8ad0afa7a5d1271c4 Mon Sep 17 00:00:00 2001
From: Olivier Dony <odo@openerp.com>
Date: Fri, 7 Dec 2012 18:50:47 +0100
Subject: [PATCH 109/110] [FIX] report_webkit: fix incorrect usage of
 get_module_resource()

As of 7.0 get_module_resource() enforces that its first argument
should be a module name, followed by extra path components.

+ minimal lint cleanup

bzr revid: odo@openerp.com-20121207175047-ghv0ic3auq8owt0t
---
 addons/l10n_ch/report/report_webkit_html.py | 16 ++++++----------
 addons/report_webkit/webkit_report.py       | 17 +++++++----------
 2 files changed, 13 insertions(+), 20 deletions(-)

diff --git a/addons/l10n_ch/report/report_webkit_html.py b/addons/l10n_ch/report/report_webkit_html.py
index 6b6a84e0cf4..9f650227313 100644
--- a/addons/l10n_ch/report/report_webkit_html.py
+++ b/addons/l10n_ch/report/report_webkit_html.py
@@ -20,7 +20,6 @@
 ##############################################################################
 
 import time
-import sys
 import os
 import re
 
@@ -40,13 +39,10 @@ from tools import mod10r
 from tools.translate import _
 from tools.config import config
 
-import wizard
-import addons
+from openerp import addons
 import pooler
 
 
-
-
 class l10n_ch_report_webkit_html(report_sxw.rml_parse):
     def __init__(self, cr, uid, name, context):
         super(l10n_ch_report_webkit_html, self).__init__(cr, uid, name, context=context)
@@ -78,12 +74,12 @@ class l10n_ch_report_webkit_html(report_sxw.rml_parse):
 
     def police_absolute_path(self, inner_path):
         """Will get the ocrb police absolute path"""
-        path = addons.get_module_resource(os.path.join('l10n_ch', 'report', inner_path))
+        path = addons.get_module_resource('l10n_ch', 'report', inner_path)
         return  path
 
     def bvr_absolute_path(self) :
         """Will get the ocrb police absolute path"""
-        path = addons.get_module_resource(os.path.join('l10n_ch', 'report', 'bvr1.jpg'))
+        path = addons.get_module_resource('l10n_ch', 'report', 'bvr1.jpg')
         return  path
 
     def headheight(self):
@@ -167,7 +163,7 @@ class BVRWebKitParser(webkit_report.WebKitParser):
         """generate the PDF"""
         context = context or {}
         if report_xml.report_type != 'webkit':
-            return super(WebKitParser,self).create_single_pdf(cursor, uid, ids, data, report_xml, context=context)
+            return super(BVRWebKitParser,self).create_single_pdf(cursor, uid, ids, data, report_xml, context=context)
         self.parser_instance = self.parser(cursor,
                                             uid,
                                             self.name2,
@@ -177,7 +173,7 @@ class BVRWebKitParser(webkit_report.WebKitParser):
         self.parser_instance.set_context(objs, data, ids, report_xml.report_type)
         template =  False
         if report_xml.report_file :
-            path = addons.get_module_resource(report_xml.report_file)
+            path = addons.get_module_resource(*report_xml.report_file.split(os.path.sep))
             if os.path.exists(path) :
                 template = file(path).read()
         if not template and report_xml.report_webkit_data :
@@ -203,7 +199,7 @@ class BVRWebKitParser(webkit_report.WebKitParser):
         company = user.company_id
         body_mako_tpl = mako_template(template)
         #BVR specific
-        bvr_path = addons.get_module_resource(os.path.join('l10n_ch','report','bvr.mako'))
+        bvr_path = addons.get_module_resource('l10n_ch','report','bvr.mako')
         body_bvr_tpl = mako_template(file(bvr_path).read())
         helper = report_helper.WebKitHelper(cursor, uid, report_xml.id, context)
         ##BVR Specific
diff --git a/addons/report_webkit/webkit_report.py b/addons/report_webkit/webkit_report.py
index b03289c8748..eca33e1f941 100644
--- a/addons/report_webkit/webkit_report.py
+++ b/addons/report_webkit/webkit_report.py
@@ -106,7 +106,6 @@ class WebKitParser(report_sxw):
             webkit_header = report_xml.webkit_header
         tmp_dir = tempfile.gettempdir()
         out_filename = tempfile.mktemp(suffix=".pdf", prefix="webkit.tmp.")
-        files = []
         file_to_del = [out_filename]
         if comm_path:
             command = [comm_path]
@@ -220,7 +219,7 @@ class WebKitParser(report_sxw):
         template =  False
 
         if report_xml.report_file :
-            path = addons.get_module_resource(report_xml.report_file)
+            path = addons.get_module_resource(*report_xml.report_file.split(os.path.sep))
             if os.path.exists(path) :
                 template = file(path).read()
         if not template and report_xml.report_webkit_data :
@@ -242,8 +241,6 @@ class WebKitParser(report_sxw):
         css = report_xml.webkit_header.css
         if not css :
             css = ''
-        user = self.pool.get('res.users').browse(cursor, uid, uid)
-        company= user.company_id
 
         #default_filters=['unicode', 'entity'] can be used to set global filter
         body_mako_tpl = mako_template(template)
@@ -257,7 +254,7 @@ class WebKitParser(report_sxw):
                                                 _=self.translate_call,
                                                 **self.parser_instance.localcontext)
                     htmls.append(html)
-                except Exception, e:
+                except Exception:
                     msg = exceptions.text_error_template().render()
                     _logger.error(msg)
                     raise except_osv(_('Webkit render!'), msg)
@@ -268,7 +265,7 @@ class WebKitParser(report_sxw):
                                             _=self.translate_call,
                                             **self.parser_instance.localcontext)
                 htmls.append(html)
-            except Exception, e:
+            except Exception:
                 msg = exceptions.text_error_template().render()
                 _logger.error(msg)
                 raise except_osv(_('Webkit render!'), msg)
@@ -279,7 +276,7 @@ class WebKitParser(report_sxw):
                                         _=self.translate_call,
                                         _debug=False,
                                         **self.parser_instance.localcontext)
-        except Exception, e:
+        except Exception:
             raise except_osv(_('Webkit render!'),
                 exceptions.text_error_template().render())
         foot = False
@@ -301,7 +298,7 @@ class WebKitParser(report_sxw):
                                            _debug=tools.ustr("\n".join(htmls)),
                                            _=self.translate_call,
                                            **self.parser_instance.localcontext)
-            except Exception, e:
+            except Exception:
                 msg = exceptions.text_error_template().render()
                 _logger.error(msg)
                 raise except_osv(_('Webkit render!'), msg)
@@ -327,8 +324,8 @@ class WebKitParser(report_sxw):
             report_xml.report_rml = None
             report_xml.report_rml_content = None
             report_xml.report_sxw_content_data = None
-            report_rml.report_sxw_content = None
-            report_rml.report_sxw = None
+            report_xml.report_sxw_content = None
+            report_xml.report_sxw = None
         else:
             return super(WebKitParser, self).create(cursor, uid, ids, data, context)
         if report_xml.report_type != 'webkit' :

From a325343c420739b8961f973b4695c85be71cd609 Mon Sep 17 00:00:00 2001
From: Launchpad Translations on behalf of openerp <>
Date: Sat, 8 Dec 2012 05:21:10 +0000
Subject: [PATCH 110/110] Launchpad automatic translations update.

bzr revid: launchpad_translations_on_behalf_of_openerp-20121208045847-0s126yjr8uwtmumb
bzr revid: launchpad_translations_on_behalf_of_openerp-20121208045953-wihh2b6ioie9o11i
bzr revid: launchpad_translations_on_behalf_of_openerp-20121208052110-nf16120fhniyh9zh
---
 addons/account/i18n/fr.po                     |   34 +-
 addons/account/i18n/it.po                     |   45 +-
 addons/account_analytic_plans/i18n/de.po      |    2 +-
 addons/account_asset/i18n/de.po               |    2 +-
 addons/account_asset/i18n/zh_CN.po            |   22 +-
 .../i18n/de.po                                |    2 +-
 addons/account_check_writing/i18n/de.po       |   25 +-
 addons/account_followup/i18n/de.po            |  465 +++++--
 addons/account_followup/i18n/pt.po            |   14 +-
 addons/account_payment/i18n/de.po             |   44 +-
 addons/account_voucher/i18n/de.po             |  133 +-
 addons/auth_anonymous/i18n/fr.po              |   30 +
 addons/auth_oauth/i18n/fr.po                  |  135 ++
 addons/base_calendar/i18n/pt_BR.po            |   18 +-
 addons/base_crypt/i18n/fr.po                  |   10 +-
 addons/base_crypt/i18n/ru.po                  |   10 +-
 addons/base_import/i18n/fr.po                 |   10 +-
 addons/base_import/i18n/nb.po                 | 1172 +++++++++++++++++
 addons/base_setup/i18n/fr.po                  |   18 +-
 addons/crm_claim/i18n/pt_BR.po                |  116 +-
 addons/crm_helpdesk/i18n/pt_BR.po             |   61 +-
 addons/crm_profiling/i18n/pt_BR.po            |   13 +-
 addons/event_project/i18n/pt_BR.po            |   10 +-
 addons/event_sale/i18n/pt_BR.po               |   94 ++
 addons/google_base_account/i18n/pt_BR.po      |   21 +-
 addons/google_docs/i18n/pt_BR.po              |   25 +-
 addons/marketing/i18n/pt_BR.po                |   35 +-
 addons/portal_claim/i18n/pt_BR.po             |   15 +-
 addons/portal_crm/i18n/pt_BR.po               |   13 +-
 .../purchase_double_validation/i18n/pt_BR.po  |   21 +-
 addons/sale/i18n/es_AR.po                     |   33 +-
 addons/sale_analytic_plans/i18n/pt_BR.po      |   10 +-
 addons/sale_journal/i18n/pt_BR.po             |   17 +-
 addons/web/i18n/es.po                         |    6 +-
 addons/web/i18n/fa.po                         |   16 +-
 addons/web/i18n/pt.po                         |   72 +-
 addons/web/i18n/pt_BR.po                      |   10 +-
 addons/web_calendar/i18n/pt.po                |   16 +-
 addons/web_diagram/i18n/pt.po                 |   10 +-
 addons/web_graph/i18n/zh_CN.po                |   10 +-
 addons/web_kanban/i18n/pt.po                  |   14 +-
 addons/web_view_editor/i18n/pt.po             |   14 +-
 openerp/addons/base/i18n/es_DO.po             |  218 ++-
 openerp/addons/base/i18n/it.po                |    8 +-
 openerp/addons/base/i18n/pt.po                |  209 +--
 openerp/addons/base/i18n/pt_BR.po             |  306 +++--
 46 files changed, 2845 insertions(+), 739 deletions(-)
 create mode 100644 addons/auth_anonymous/i18n/fr.po
 create mode 100644 addons/auth_oauth/i18n/fr.po
 create mode 100644 addons/base_import/i18n/nb.po
 create mode 100644 addons/event_sale/i18n/pt_BR.po

diff --git a/addons/account/i18n/fr.po b/addons/account/i18n/fr.po
index 27801a0da69..ab240056600 100644
--- a/addons/account/i18n/fr.po
+++ b/addons/account/i18n/fr.po
@@ -7,15 +7,15 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2012-12-03 16:02+0000\n"
-"PO-Revision-Date: 2012-12-03 20:35+0000\n"
+"PO-Revision-Date: 2012-12-07 15:21+0000\n"
 "Last-Translator: Frederic Clementi - Camptocamp.com "
 "<frederic.clementi@camptocamp.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:21+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-08 04:59+0000\n"
+"X-Generator: Launchpad (build 16341)\n"
 
 #. module: account
 #: code:addons/account/wizard/account_fiscalyear_close.py:41
@@ -184,7 +184,7 @@ msgstr ""
 #: code:addons/account/static/src/xml/account_move_reconciliation.xml:30
 #, python-format
 msgid "Reconcile"
-msgstr "Lettrer"
+msgstr "Let."
 
 #. module: account
 #: field:account.bank.statement,name:0
@@ -988,12 +988,12 @@ msgstr ""
 #. module: account
 #: report:account.analytic.account.quantity_cost_ledger:0
 msgid "J.C./Move name"
-msgstr "J.C. / Nom du mouvement"
+msgstr "J.C. / description de l'écriture"
 
 #. module: account
 #: view:account.account:0
 msgid "Account Code and Name"
-msgstr ""
+msgstr "Code et Nom du Compte"
 
 #. module: account
 #: model:mail.message.subtype,name:account.mt_invoice_new
@@ -2993,7 +2993,7 @@ msgstr "Relevés"
 #. module: account
 #: report:account.analytic.account.journal:0
 msgid "Move Name"
-msgstr "Nom de la transaction"
+msgstr "Description de l'écriture"
 
 #. module: account
 #: model:ir.model,name:account.model_account_move_line_reconcile_writeoff
@@ -3008,7 +3008,7 @@ msgstr "Ligne d'écriture lettrée (écriture d'écart)"
 #: field:account.move.line,account_tax_id:0
 #: view:account.tax:0
 msgid "Tax"
-msgstr "Impôts et taxes"
+msgstr "Taxes"
 
 #. module: account
 #: view:account.analytic.account:0
@@ -4350,7 +4350,7 @@ msgstr ""
 #: field:account.move.reconcile,name:0
 #: field:account.subscription,name:0
 msgid "Name"
-msgstr "Nom"
+msgstr "Decription"
 
 #. module: account
 #: code:addons/account/installer.py:94
@@ -4918,7 +4918,7 @@ msgstr "Nom du compte"
 #. module: account
 #: help:account.fiscalyear.close,report_name:0
 msgid "Give name of the new entries"
-msgstr "Indique le nom à donner aux nouvelles écritures"
+msgstr "Indique la description à donner aux nouvelles écritures"
 
 #. module: account
 #: model:ir.model,name:account.model_account_invoice_report
@@ -4982,12 +4982,12 @@ msgstr "Le nom de la période doit être unique par société!"
 #. module: account
 #: help:wizard.multi.charts.accounts,currency_id:0
 msgid "Currency as per company's country."
-msgstr ""
+msgstr "Devise selon le pays de la société"
 
 #. module: account
 #: view:account.tax:0
 msgid "Tax Computation"
-msgstr ""
+msgstr "Calcul des taxes"
 
 #. module: account
 #: view:wizard.multi.charts.accounts:0
@@ -6246,7 +6246,7 @@ msgstr "Comptes fils"
 #: code:addons/account/account_move_line.py:1107
 #, python-format
 msgid "Move name (id): %s (%s)"
-msgstr "Nom du mouvement (id): %s (%s)"
+msgstr "Description de l'écriture (id): %s (%s)"
 
 #. module: account
 #: view:account.move.line.reconcile:0
@@ -6258,7 +6258,7 @@ msgstr "Ajustement"
 #. module: account
 #: field:res.partner,debit:0
 msgid "Total Payable"
-msgstr "Total à payer"
+msgstr "Total dû"
 
 #. module: account
 #: model:account.account.type,name:account.data_account_type_income
@@ -7850,7 +7850,7 @@ msgstr ""
 #. module: account
 #: field:account.fiscalyear.close,report_name:0
 msgid "Name of new entries"
-msgstr "Nom des nouvelles écritures"
+msgstr "Description des nouvelles écritures"
 
 #. module: account
 #: view:account.use.model:0
@@ -7865,7 +7865,7 @@ msgstr ""
 #. module: account
 #: help:account.config.settings,currency_id:0
 msgid "Main currency of the company."
-msgstr ""
+msgstr "Devise de a société"
 
 #. module: account
 #: model:ir.ui.menu,name:account.menu_finance_reports
@@ -8843,7 +8843,7 @@ msgstr ""
 #: field:account.move.line,reconcile_partial_id:0
 #: view:account.move.line.reconcile:0
 msgid "Partial Reconcile"
-msgstr "Rapprochement partiel"
+msgstr "Let.P"
 
 #. module: account
 #: model:ir.model,name:account.model_account_analytic_inverted_balance
diff --git a/addons/account/i18n/it.po b/addons/account/i18n/it.po
index 6bc1a0ac2bc..af3d00e9615 100644
--- a/addons/account/i18n/it.po
+++ b/addons/account/i18n/it.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2012-12-03 16:02+0000\n"
-"PO-Revision-Date: 2012-12-06 21:42+0000\n"
+"PO-Revision-Date: 2012-12-07 22:37+0000\n"
 "Last-Translator: Sergio Corato <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: 2012-12-07 04:35+0000\n"
+"X-Launchpad-Export-Date: 2012-12-08 04:59+0000\n"
 "X-Generator: Launchpad (build 16341)\n"
 
 #. module: account
@@ -3156,7 +3156,7 @@ msgstr "Movimento contabile di riconciliazione (storno)"
 #: field:account.move.line,account_tax_id:0
 #: view:account.tax:0
 msgid "Tax"
-msgstr "Tassa"
+msgstr "Imposta"
 
 #. module: account
 #: view:account.analytic.account:0
@@ -8012,7 +8012,7 @@ msgstr "Raggruppare per anno data fattura"
 #. module: account
 #: field:account.config.settings,purchase_tax_rate:0
 msgid "Purchase tax (%)"
-msgstr ""
+msgstr "Imposta sugli acquisti (%)"
 
 #. module: account
 #: help:res.partner,credit:0
@@ -8359,6 +8359,8 @@ msgid ""
 "This date will be used as the invoice date for credit note and period will "
 "be chosen accordingly!"
 msgstr ""
+"Questa data sarà usata come data fattura per la nota di credito e il periodo "
+"sarà scelto di conseguenza!"
 
 #. module: account
 #: view:product.template:0
@@ -8372,6 +8374,8 @@ msgid ""
 "You have to set a code for the bank account defined on the selected chart of "
 "accounts."
 msgstr ""
+"E' necessario selezionare un codice per il conto bancario definito sul piano "
+"dei conti selezionato."
 
 #. module: account
 #: model:ir.ui.menu,name:account.menu_manual_reconcile
@@ -8797,6 +8801,7 @@ msgstr "Bilancio Analitico Invertito -"
 msgid ""
 "Is this reconciliation produced by the opening of a new fiscal year ?."
 msgstr ""
+"La riconciliazione è prodotto dall'apertura di un nuovo anno fiscale ?."
 
 #. module: account
 #: view:account.analytic.line:0
@@ -8901,7 +8906,7 @@ msgstr "Sezionale Note di Credito Fornitori"
 #: code:addons/account/account.py:1292
 #, python-format
 msgid "Please define a sequence on the journal."
-msgstr ""
+msgstr "E' necessario definire una sequenza per il sezionale."
 
 #. module: account
 #: help:account.tax.template,amount:0
@@ -8930,6 +8935,9 @@ msgid ""
 "recalls.\n"
 "                This installs the module account_followup."
 msgstr ""
+"Consente di automatizzare le lettere per le fatture non pagate, non richiami "
+"multi-livello.\n"
+"                Installa il modulo account_followup."
 
 #. module: account
 #: field:account.automatic.reconcile,period_id:0
@@ -8974,12 +8982,12 @@ msgstr "Totale imponibile"
 #: code:addons/account/wizard/account_report_common.py:153
 #, python-format
 msgid "Select a starting and an ending period."
-msgstr ""
+msgstr "Selezionare un periodo iniziale e uno finale."
 
 #. module: account
 #: field:account.config.settings,sale_sequence_next:0
 msgid "Next invoice number"
-msgstr ""
+msgstr "Numero di fattura successivo"
 
 #. module: account
 #: model:ir.ui.menu,name:account.menu_finance_generic_reporting
@@ -9128,7 +9136,7 @@ msgstr "Import automatico dei movimenti bancari"
 #: code:addons/account/account_invoice.py:370
 #, python-format
 msgid "Unknown Error!"
-msgstr ""
+msgstr "Errore Sconosciuto!"
 
 #. module: account
 #: model:ir.model,name:account.model_account_move_bank_reconcile
@@ -9138,7 +9146,7 @@ msgstr "Riconciliazione movimenti bancari"
 #. module: account
 #: view:account.config.settings:0
 msgid "Apply"
-msgstr ""
+msgstr "Conferma"
 
 #. module: account
 #: field:account.financial.report,account_type_ids:0
@@ -9154,6 +9162,8 @@ msgid ""
 "You cannot use this general account in this journal, check the tab 'Entry "
 "Controls' on the related journal."
 msgstr ""
+"Non è possibile usare questo conto generale in questo sezionale, controllare "
+"la sezione 'Voci di controllo' nel relativo sezionale."
 
 #. module: account
 #: view:account.payment.term.line:0
@@ -9366,6 +9376,8 @@ msgstr "Il codice del conto deve essere unico per ogni azienda!"
 #: help:product.template,property_account_expense:0
 msgid "This account will be used to value outgoing stock using cost price."
 msgstr ""
+"Questo conto sarà utilizzato per valutare le merci in uscita utilizzando il "
+"prezzo di costo."
 
 #. module: account
 #: view:account.invoice:0
@@ -9403,7 +9415,7 @@ msgstr "Conti consentiti (vuoto per non effettuare nessun controllo)"
 #. module: account
 #: field:account.config.settings,sale_tax_rate:0
 msgid "Sales tax (%)"
-msgstr ""
+msgstr "Imposta sulle vendite (%)"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_analytic_account_tree2
@@ -9469,6 +9481,8 @@ msgid ""
 "This allows you to check writing and printing.\n"
 "                This installs the module account_check_writing."
 msgstr ""
+"Permette di verificare la scrittura e la stampa.\n"
+"                Installa il modulo account_check_writing."
 
 #. module: account
 #: model:res.groups,name:account.group_account_invoice
@@ -9546,6 +9560,9 @@ msgid ""
 "created. If you leave that field empty, it will use the same journal as the "
 "current invoice."
 msgstr ""
+"E' possibile selezionare qui il sezionale da utilizzare per le note di "
+"credito che saranno create. Se questa casella viene lasciata vuota, verrà "
+"utilizzato lo stesso sezionale della fattura corrente."
 
 #. module: account
 #: help:account.bank.statement.line,sequence:0
@@ -9578,7 +9595,7 @@ msgstr "Modello errato !"
 #: view:account.tax.code.template:0
 #: view:account.tax.template:0
 msgid "Tax Template"
-msgstr ""
+msgstr "Modello Imposta"
 
 #. module: account
 #: field:account.invoice.refund,period:0
@@ -9598,6 +9615,10 @@ msgid ""
 "some non legal fields or you must unreconcile first.\n"
 "%s."
 msgstr ""
+"Non è possibile fare questa modifica su una registrazione riconciliata. E' "
+"possibile cambiare solo alcuni campi non fiscali, altrimenti è necessario "
+"prima annullare la riconciliazione.\n"
+"%s."
 
 #. module: account
 #: help:account.financial.report,sign:0
@@ -9644,7 +9665,7 @@ msgstr "Le Bozze di fatture sono marcate, convalidate e stampate."
 #: field:account.bank.statement,message_is_follower:0
 #: field:account.invoice,message_is_follower:0
 msgid "Is a Follower"
-msgstr ""
+msgstr "E' un Follower"
 
 #. module: account
 #: view:account.move:0
diff --git a/addons/account_analytic_plans/i18n/de.po b/addons/account_analytic_plans/i18n/de.po
index 20f5dd70abc..5defd9b28f1 100644
--- a/addons/account_analytic_plans/i18n/de.po
+++ b/addons/account_analytic_plans/i18n/de.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-07 04:35+0000\n"
+"X-Launchpad-Export-Date: 2012-12-08 04:59+0000\n"
 "X-Generator: Launchpad (build 16341)\n"
 
 #. module: account_analytic_plans
diff --git a/addons/account_asset/i18n/de.po b/addons/account_asset/i18n/de.po
index d299ad86c07..daf6bdb23fd 100755
--- a/addons/account_asset/i18n/de.po
+++ b/addons/account_asset/i18n/de.po
@@ -15,7 +15,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-07 04:36+0000\n"
+"X-Launchpad-Export-Date: 2012-12-08 04:59+0000\n"
 "X-Generator: Launchpad (build 16341)\n"
 
 #. module: account_asset
diff --git a/addons/account_asset/i18n/zh_CN.po b/addons/account_asset/i18n/zh_CN.po
index a3c6589613e..3cae4c25678 100644
--- a/addons/account_asset/i18n/zh_CN.po
+++ b/addons/account_asset/i18n/zh_CN.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-12-03 16:02+0000\n"
-"PO-Revision-Date: 2012-05-10 17:45+0000\n"
-"Last-Translator: 开阖软件     Jeff Wang <jeff@osbzr.com>\n"
+"PO-Revision-Date: 2012-12-07 15:37+0000\n"
+"Last-Translator: ccdos <ccdos@163.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: 2012-12-04 05:54+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-08 04:59+0000\n"
+"X-Generator: Launchpad (build 16341)\n"
 
 #. module: account_asset
 #: view:account.asset.asset:0
@@ -153,7 +153,7 @@ msgstr "折旧日期"
 #. module: account_asset
 #: constraint:account.asset.asset:0
 msgid "Error ! You cannot create recursive assets."
-msgstr ""
+msgstr "错误！你不能创建循环的固定资产."
 
 #. module: account_asset
 #: field:asset.asset.report,posted_value:0
@@ -198,7 +198,7 @@ msgstr "折旧行编号"
 #. module: account_asset
 #: field:account.asset.asset,method_period:0
 msgid "Number of Months in a Period"
-msgstr ""
+msgstr "在一个周期内的月数"
 
 #. module: account_asset
 #: view:asset.asset.report:0
@@ -441,7 +441,7 @@ msgstr ""
 #: field:account.asset.asset,state:0
 #: field:asset.asset.report,state:0
 msgid "Status"
-msgstr ""
+msgstr "状态"
 
 #. module: account_asset
 #: field:account.asset.asset,partner_id:0
@@ -488,7 +488,7 @@ msgstr "计算"
 #. module: account_asset
 #: view:account.asset.history:0
 msgid "Asset History"
-msgstr ""
+msgstr "资产历史"
 
 #. module: account_asset
 #: field:asset.asset.report,name:0
@@ -607,7 +607,7 @@ msgstr "要折旧的金额"
 #. module: account_asset
 #: field:account.asset.asset,name:0
 msgid "Asset Name"
-msgstr ""
+msgstr "资产名称"
 
 #. module: account_asset
 #: field:account.asset.category,open_asset:0
@@ -662,7 +662,7 @@ msgstr ""
 #. module: account_asset
 #: field:account.asset.asset,purchase_value:0
 msgid "Gross Value"
-msgstr ""
+msgstr "总值"
 
 #. module: account_asset
 #: field:account.asset.category,name:0
@@ -708,7 +708,7 @@ msgstr "新建固定资产会计凭证"
 #. module: account_asset
 #: field:account.asset.depreciation.line,sequence:0
 msgid "Sequence"
-msgstr ""
+msgstr "编号"
 
 #. module: account_asset
 #: help:account.asset.category,method_period:0
diff --git a/addons/account_bank_statement_extensions/i18n/de.po b/addons/account_bank_statement_extensions/i18n/de.po
index f6bc79de2b7..a8f9e63205b 100644
--- a/addons/account_bank_statement_extensions/i18n/de.po
+++ b/addons/account_bank_statement_extensions/i18n/de.po
@@ -15,7 +15,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-07 04:36+0000\n"
+"X-Launchpad-Export-Date: 2012-12-08 04:59+0000\n"
 "X-Generator: Launchpad (build 16341)\n"
 
 #. module: account_bank_statement_extensions
diff --git a/addons/account_check_writing/i18n/de.po b/addons/account_check_writing/i18n/de.po
index 3a5606680bb..6e288e877b9 100644
--- a/addons/account_check_writing/i18n/de.po
+++ b/addons/account_check_writing/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: 2012-12-03 16:02+0000\n"
-"PO-Revision-Date: 2012-05-10 18:06+0000\n"
+"PO-Revision-Date: 2012-12-07 09:04+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: 2012-12-04 05:54+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-08 04:59+0000\n"
+"X-Generator: Launchpad (build 16341)\n"
 
 #. module: account_check_writing
 #: selection:res.company,check_layout:0
@@ -107,6 +107,19 @@ msgid ""
 "              </p>\n"
 "            "
 msgstr ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                 Klicken Sie, um einen neuen Scheck erstellen.\n"
+"               </ p>\n"
+"                 Mit dem Scheck Formular können Sie Zahlungen an Lieferanten "
+"per Scheck \n"
+"                 anweisen, durchführen und verfolgen. Wenn Sie einen "
+"Lieferanten auswählen, \n"
+"                 sowie Zahlungsmethode und Betrag , macht OpenERP Ihnen den "
+"Vorschlag, \n"
+"                 diese Zahlung mit einer offenen Rechnung Ihres Lieferanten "
+"auszugleichen.\n"
+"               </ p>\n"
+"            "
 
 #. module: account_check_writing
 #: field:account.voucher,allow_check:0
@@ -128,7 +141,7 @@ msgstr "Benutze Vordruck"
 #. module: account_check_writing
 #: model:ir.actions.report.xml,name:account_check_writing.account_print_check_bottom
 msgid "Print Check (Bottom)"
-msgstr ""
+msgstr "Scheck drucken (Unterteil)"
 
 #. module: account_check_writing
 #: report:account.print.check.bottom:0
@@ -140,7 +153,7 @@ msgstr "Fälligkeit"
 #. module: account_check_writing
 #: model:ir.actions.report.xml,name:account_check_writing.account_print_check_middle
 msgid "Print Check (Middle)"
-msgstr ""
+msgstr "Scheck drucken (Mittelteil)"
 
 #. module: account_check_writing
 #: model:ir.model,name:account_check_writing.model_res_company
@@ -156,7 +169,7 @@ msgstr "Saldenausgleich"
 #. module: account_check_writing
 #: model:ir.actions.report.xml,name:account_check_writing.account_print_check_top
 msgid "Print Check (Top)"
-msgstr ""
+msgstr "Scheck drucken (Oberteil)"
 
 #. module: account_check_writing
 #: report:account.print.check.bottom:0
diff --git a/addons/account_followup/i18n/de.po b/addons/account_followup/i18n/de.po
index 6293620420f..db45401dbc0 100644
--- a/addons/account_followup/i18n/de.po
+++ b/addons/account_followup/i18n/de.po
@@ -7,31 +7,31 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2012-12-03 16:02+0000\n"
-"PO-Revision-Date: 2012-02-15 22:50+0000\n"
+"PO-Revision-Date: 2012-12-07 21:18+0000\n"
 "Last-Translator: Thorsten Vocks (OpenBig.org) <thorsten.vocks@big-"
 "consulting.net>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:19+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-08 04:58+0000\n"
+"X-Generator: Launchpad (build 16341)\n"
 
 #. module: account_followup
 #: view:account_followup.followup.line:0
 #: field:account_followup.followup.line,manual_action:0
 msgid "Manual Action"
-msgstr ""
+msgstr "Manuelle Folgeaktion"
 
 #. module: account_followup
 #: help:res.partner,latest_followup_level_id:0
 msgid "The maximum follow-up level"
-msgstr ""
+msgstr "Maximale Mahnstufe"
 
 #. module: account_followup
 #: view:res.partner:0
 msgid "Group by"
-msgstr ""
+msgstr "Gruppierung ..."
 
 #. module: account_followup
 #: view:account_followup.stat:0
@@ -47,27 +47,27 @@ msgstr "Mahnung"
 #. module: account_followup
 #: view:account_followup.followup.line:0
 msgid "%(date)s"
-msgstr ""
+msgstr "%(date)s"
 
 #. module: account_followup
 #: field:res.partner,payment_next_action_date:0
 msgid "Next Action Date"
-msgstr ""
+msgstr "Nächste Zahlungserinnerung"
 
 #. module: account_followup
 #: field:account_followup.sending.results,needprinting:0
 msgid "Needs Printing"
-msgstr ""
+msgstr "Ausdruck ist erforderlich"
 
 #. module: account_followup
 #: view:res.partner:0
 msgid "⇾ Mark as Done"
-msgstr ""
+msgstr "-> Als erledigt markieren"
 
 #. module: account_followup
 #: field:account_followup.followup.line,manual_action_note:0
 msgid "Action To Do"
-msgstr ""
+msgstr "Folgeaktion"
 
 #. module: account_followup
 #: model:email.template,body_html:account_followup.email_template_account_followup_level0
@@ -145,11 +145,85 @@ 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>Guten Tag ${object.name},</p>\n"
+"    <p>\n"
+"    unter der Annahme, dass unsere Konten korrekt gebucht sind, sind "
+"offensichtlich folgende Beträge nicht bezahlt.\n"
+"    Bitte nehmen Sie innerhalb der nächsten 8 Tage einen Kontoausgleich "
+"vor.\n"
+"\n"
+"    Sollte sich unsere Mahnung mit Ihrer Zahlung überschneiden, betrachten "
+"Sie diesen Vorgang als erledigt.\n"
+"    Bitte zögern Sie bei Rückfragen nicht, unsere Finanzabteilung per EMail "
+"oder Telefon  zu kontaktieren.\n"
+"\n"
+"<br/>\n"
+"Viele Grüsse\n"
+"\n"
+"   <br/>\n"
+"${user.name}\n"
+"\n"
+"<br/>\n"
+"<br/>\n"
+"<%\n"
+"    from openerp.addons.account_followup.report import "
+"account_followup_print\n"
+"    rml_parse = account_followup_print.report_rappel(object._cr, user.id, "
+"\"followup_rml_parser\")\n"
+"    final_res = rml_parse._lines_get_with_partner(object, "
+"user.company_id.id)\n"
+"    followup_table = ''\n"
+"    for currency_dict in final_res:\n"
+"        currency_symbol = currency_dict.get('line', [{'currency_id': "
+"user.company_id.currency_id}])[0]['currency_id'].symbol\n"
+"        followup_table += '''\n"
+"        <table border=\"2\" width=100%%>\n"
+"        <tr>\n"
+"            <td>Rechnungsdatum</td>\n"
+"            <td>Referenz</td>\n"
+"            <td>Fällig am</td>\n"
+"            <td>Betrag (%s)</td>\n"
+"            <td>EUR</td>\n"
+"        </tr>\n"
+"        ''' % (currency_symbol)\n"
+"        total = 0\n"
+"        for aml in currency_dict['line']:\n"
+"            block = aml['blocked'] and 'X' or ' '\n"
+"            total += aml['balance']\n"
+"            strbegin = \"<TD> \"\n"
+"            strend = \"</TD> \"\n"
+"            date = aml['date_maturity'] or aml['date']\n"
+"            if date <= ctx['current_date'] and aml['balance'] > 0:\n"
+"                strbegin = \"<TD><B>\"\n"
+"                strend = \"</B></TD>\"\n"
+"            followup_table +=\"<TR>\" + strbegin + str(aml['date']) + strend "
+"+ strbegin + aml['ref'] + strend + strbegin + str(date) + strend + strbegin "
+"+ str(aml['balance']) + strend + strbegin + block + strend + \"</TR>\"\n"
+"        total = rml_parse.formatLang(total, dp='Account', "
+"currency_obj=object.company_id.currency_id)\n"
+"        followup_table += '''<tr> </tr>\n"
+"                        </table>\n"
+"                        <center>fälliger Gesamtbetrag: %s </center>''' % "
+"(total)\n"
+"\n"
+"%>\n"
+"\n"
+"${followup_table}\n"
+"\n"
+"    <br/>\n"
+"\n"
+"</div>\n"
+"            "
 
 #. module: account_followup
 #: view:res.partner:0
 msgid "Follow-ups to do"
-msgstr ""
+msgstr "Anstehende Mahnungen"
 
 #. module: account_followup
 #: field:account_followup.followup,company_id:0
@@ -189,36 +263,52 @@ msgid ""
 "Best Regards,\n"
 "        "
 msgstr ""
+"\n"
+"Sehr geehrte(r) %(partner_name)s,\n"
+"\n"
+"trotz verschiedener Zahlungserinnerungen, wurde Ihr Konto bislang nicht "
+"ausgegelichen.\n"
+"\n"
+"Sollte in den nächsten 8 Tagen keine Zahlung eingehen, ergreifen wir ohne "
+"weitere Vorwarnung die erforderlichen Maßnahmen des gesetzlichen "
+"Mahnverfahrens. Voraussichtlich wird dieser Schritt nicht erforderlich sein, "
+"sie sehen alle fälligen Rechnungen in der unteren Liste.\n"
+"\n"
+"Bei weiteren Fragestellungen zu der Rechnung, zögern Sie bitte nicht unsere "
+"Finanzbuchhaltung anzusprechen. \n"
+"\n"
+"Best Regards,\n"
+"        "
 
 #. module: account_followup
 #: view:account_followup.followup.line:0
 msgid "days overdue, do the following actions:"
-msgstr ""
+msgstr "bei fällig, tun Sie folgendes:"
 
 #. module: account_followup
 #: view:account_followup.followup.line:0
 msgid "Follow-up Steps"
-msgstr ""
+msgstr "Mahnstufen"
 
 #. module: account_followup
 #: field:account_followup.print,email_body:0
 msgid "Email Body"
-msgstr ""
+msgstr "Text der E-Mail"
 
 #. module: account_followup
 #: help:res.partner,payment_responsible_id:0
 msgid "Responsible for making sure the action happens."
-msgstr ""
+msgstr "Verantwortlicher Mitarbeiter für die Durchführung"
 
 #. module: account_followup
 #: view:res.partner:0
 msgid "Overdue amount"
-msgstr ""
+msgstr "Überfälliger Betrag"
 
 #. module: account_followup
 #: model:ir.actions.act_window,name:account_followup.action_account_followup_print
 msgid "Send Follow-Ups"
-msgstr ""
+msgstr "Sende Mahnungen"
 
 #. module: account_followup
 #: report:account_followup.followup.print:0
@@ -228,7 +318,7 @@ msgstr "Betrag"
 #. module: account_followup
 #: view:res.partner:0
 msgid "No Responsible"
-msgstr ""
+msgstr "Kein Verantwortlicher"
 
 #. module: account_followup
 #: view:account_followup.stat.by.partner:0
@@ -243,12 +333,12 @@ msgstr "Gesamt Soll"
 #. module: account_followup
 #: field:res.partner,payment_next_action:0
 msgid "Next Action"
-msgstr ""
+msgstr "Nächste Aktion"
 
 #. module: account_followup
 #: view:account_followup.followup.line:0
 msgid ": Partner Name"
-msgstr ""
+msgstr ": Partner Name"
 
 #. module: account_followup
 #: view:account_followup.followup:0
@@ -283,12 +373,12 @@ msgstr "Datum:"
 #. module: account_followup
 #: view:res.partner:0
 msgid "I am responsible"
-msgstr ""
+msgstr "Ich bin verantwortlich"
 
 #. module: account_followup
 #: sql_constraint:account_followup.followup:0
 msgid "Only one follow-up per company is allowed"
-msgstr ""
+msgstr "Es ist nur ein Mahnverfahren je Unternehmen zulässig"
 
 #. module: account_followup
 #: model:account_followup.followup.line,description:account_followup.demo_followup_line4
@@ -311,11 +401,33 @@ msgid ""
 "Best Regards,\n"
 "            "
 msgstr ""
+"\n"
+"Sehr geehrte(r)  %(partner_name)s,\n"
+"\n"
+"trotz mehrerer Mahnungen, ist Ihr Konto leider immer noch nicht "
+"ausgeglichen.\n"
+"\n"
+"Sofern keine vollständige Bezahlung innerhalb der nächsten 8 Tage "
+"vorgenommen wird, \n"
+"werden wir unsererseits die erforderlichen rechtlichen Schritte für das "
+"gesetzliche\n"
+"Mahnverfahren ohne weitere Ankündigung in die Wege leiten.\n"
+"\n"
+"Wir sind zuversichtlich, dass diese Aktion nicht erforderlich sein wird. "
+"Sämtliche Details der \n"
+"fälligen Rechnungen sind in diesem Schreiben aufgelistet.\n"
+"\n"
+"Bei Fragen zu dieser Angelegenheit, zögern Sie bitte nicht, unsere "
+"Buchhaltung unter #\n"
+"(+49) 4471 840 9000 zu kontaktieren.\n"
+"\n"
+"Freundliche Grüsse\n"
+"            "
 
 #. module: account_followup
 #: help:account_followup.followup.line,send_letter:0
 msgid "When processing, it will print a letter"
-msgstr ""
+msgstr "Bei Verarbeitung wird ein Anschreiben gedruckt"
 
 #. module: account_followup
 #: view:account_followup.stat:0
@@ -325,22 +437,22 @@ msgstr "Kein Verzug"
 #. module: account_followup
 #: view:res.partner:0
 msgid "Without responsible"
-msgstr ""
+msgstr "Ohne Verantwortlichen"
 
 #. module: account_followup
 #: view:account_followup.print:0
 msgid "Send emails and generate letters"
-msgstr ""
+msgstr "Sende Emails und erstelle Anschreiben"
 
 #. module: account_followup
 #: model:ir.actions.act_window,name:account_followup.action_customer_followup
 msgid "Manual Follow-Ups"
-msgstr ""
+msgstr "Manuelle Mahnung"
 
 #. module: account_followup
 #: view:account_followup.followup.line:0
 msgid "%(partner_name)s"
-msgstr ""
+msgstr "%(partner_name)s"
 
 #. module: account_followup
 #: field:account_followup.stat,debit:0
@@ -350,17 +462,17 @@ msgstr "Forderung"
 #. module: account_followup
 #: model:ir.model,name:account_followup.model_account_followup_stat
 msgid "Follow-up Statistics"
-msgstr ""
+msgstr "Statistik Mahnungen"
 
 #. module: account_followup
 #: view:res.partner:0
 msgid "Send Overdue Email"
-msgstr ""
+msgstr "Sende fällige Rechnungen"
 
 #. module: account_followup
 #: model:ir.model,name:account_followup.model_account_followup_followup_line
 msgid "Follow-up Criteria"
-msgstr ""
+msgstr "Mahnkriterien"
 
 #. module: account_followup
 #: help:account_followup.followup.line,sequence:0
@@ -373,34 +485,34 @@ msgstr ""
 #: code:addons/account_followup/wizard/account_followup_print.py:166
 #, python-format
 msgid " will be sent"
-msgstr ""
+msgstr " wird gesendet"
 
 #. module: account_followup
 #: view:account_followup.followup.line:0
 msgid ": User's Company Name"
-msgstr ""
+msgstr ": Benutzer Unternehmen"
 
 #. module: account_followup
 #: view:account_followup.followup.line:0
 #: field:account_followup.followup.line,send_letter:0
 msgid "Send a Letter"
-msgstr ""
+msgstr "Sende Anschreiben"
 
 #. module: account_followup
 #: model:ir.actions.act_window,name:account_followup.action_account_followup_definition_form
 msgid "Payment Follow-ups"
-msgstr ""
+msgstr "Mahnwesen"
 
 #. module: account_followup
 #: field:account_followup.followup.line,delay:0
 msgid "Due Days"
-msgstr ""
+msgstr "Zahlungsverzug"
 
 #. module: account_followup
 #: code:addons/account_followup/wizard/account_followup_print.py:155
 #, python-format
 msgid "Nobody"
-msgstr ""
+msgstr "Niemand"
 
 #. module: account_followup
 #: field:account.move.line,followup_line_id:0
@@ -417,12 +529,12 @@ msgstr "Letzte Erinnerung"
 #: model:ir.actions.act_window,name:account_followup.action_account_manual_reconcile_receivable
 #: model:ir.ui.menu,name:account_followup.menu_manual_reconcile_followup
 msgid "Reconcile Invoices & Payments"
-msgstr ""
+msgstr "Ausgleich Rechnungen & Zahlungen"
 
 #. module: account_followup
 #: model:ir.ui.menu,name:account_followup.account_followup_s
 msgid "Do Manual Follow-Ups"
-msgstr ""
+msgstr "Erstelle händische Mahnung"
 
 #. module: account_followup
 #: report:account_followup.followup.print:0
@@ -432,17 +544,17 @@ msgstr "Limit"
 #. module: account_followup
 #: field:account_followup.print,email_conf:0
 msgid "Send Email Confirmation"
-msgstr ""
+msgstr "Sende Email Bestätigung"
 
 #. module: account_followup
 #: view:res.partner:0
 msgid "Print Overdue Payments"
-msgstr ""
+msgstr "Drucke fällige Zahlungen"
 
 #. module: account_followup
 #: field:account_followup.stat.by.partner,date_followup:0
 msgid "Latest follow-up"
-msgstr ""
+msgstr "Letzte Mahnung"
 
 #. module: account_followup
 #: field:account_followup.print,partner_lang:0
@@ -453,13 +565,13 @@ msgstr "Sende EMail in Sprache d. Partners"
 #: code:addons/account_followup/wizard/account_followup_print.py:169
 #, python-format
 msgid " email(s) sent"
-msgstr ""
+msgstr " gesendete Email(s)"
 
 #. module: account_followup
 #: model:ir.model,name:account_followup.model_account_followup_print
 #: model:ir.model,name:account_followup.model_account_followup_print_all
 msgid "Print Follow-up & Send Mail to Customers"
-msgstr ""
+msgstr "Drucke Erinnerungen & Sende Emails"
 
 #. module: account_followup
 #: model:account_followup.followup.line,description:account_followup.demo_followup_line1
@@ -499,17 +611,17 @@ msgstr "gedruckte Mitteilung"
 #. module: account_followup
 #: field:res.partner,latest_followup_level_id_without_lit:0
 msgid "Latest Follow-up Level without litigation"
-msgstr ""
+msgstr "Letzte Mahnstufe vor Mahnverfahren"
 
 #. module: account_followup
 #: view:res.partner:0
 msgid "Partners with Credits"
-msgstr ""
+msgstr "Kunden mit Guthaben"
 
 #. module: account_followup
 #: help:account_followup.followup.line,send_email:0
 msgid "When processing, it will send an email"
-msgstr ""
+msgstr "Bei Durchführung wird Email gesendet"
 
 #. module: account_followup
 #: view:account_followup.stat.by.partner:0
@@ -519,7 +631,7 @@ msgstr "Zu erinnernde Partner"
 #. module: account_followup
 #: view:res.partner:0
 msgid "Print overdue payments report independent of follow-up line"
-msgstr ""
+msgstr "Drucke fällige Zahlungen ohne Mahnstufe"
 
 #. module: account_followup
 #: field:account_followup.followup.line,followup_id:0
@@ -531,12 +643,12 @@ msgstr "Mahnungen"
 #: code:addons/account_followup/account_followup.py:227
 #, python-format
 msgid "Email not sent because of email address of partner not filled in"
-msgstr ""
+msgstr "Email wurde aufgrund fehlender Mailadresse nicht gesendet"
 
 #. module: account_followup
 #: model:ir.model,name:account_followup.model_account_followup_followup
 msgid "Account Follow-up"
-msgstr ""
+msgstr "Mahnwesen"
 
 #. module: account_followup
 #: help:res.partner,payment_next_action_date:0
@@ -545,11 +657,15 @@ msgid ""
 "the current date if the action fields are empty and the partner gets a "
 "follow-up level that requires a manual action. "
 msgstr ""
+"Folgendermassen können Sie eine weitere Mahnung schreiben. Tragen Sie das "
+"aktuelle Datum  ein und lassen Sie alle weiteren Felder unausgefüllt damit "
+"der Partner hierdurch eine Mahnstufe erhält, die eine manuelle Aktion "
+"erfordert. "
 
 #. module: account_followup
 #: model:ir.model,name:account_followup.model_account_followup_sending_results
 msgid "Results from the sending of the different letters and emails"
-msgstr ""
+msgstr "Ergebnis der Versendung von Anschreiben und EMails"
 
 #. module: account_followup
 #: constraint:account_followup.followup.line:0
@@ -564,12 +680,12 @@ msgstr ""
 #: code:addons/account_followup/wizard/account_followup_print.py:172
 #, python-format
 msgid " manual action(s) assigned:"
-msgstr ""
+msgstr " manuell zugewiesene Aktion:"
 
 #. module: account_followup
 #: view:res.partner:0
 msgid "Search Partner"
-msgstr ""
+msgstr "Suche Partner"
 
 #. module: account_followup
 #: view:res.partner:0
@@ -580,32 +696,38 @@ msgid ""
 "                            order to not include it in the next payment\n"
 "                            follow-ups."
 msgstr ""
+"Unten sehen Sie die Vorgangshistorie für diesen \n"
+"                            Kunden. Einer Rechnung kann zugewiesen werden, "
+"daß Sie per\n"
+"                            gesetzlichem  Mahnverfahren weiter verfolgt "
+"wird, um weitere\n"
+"                            Versendungen von Mahnungen zu vermeiden."
 
 #. module: account_followup
 #: model:ir.ui.menu,name:account_followup.account_followup_print_menu
 msgid "Send Letters and Emails"
-msgstr ""
+msgstr "Sende Mahnschreiben und Emails"
 
 #. module: account_followup
 #: view:account_followup.followup:0
 msgid "Search Follow-up"
-msgstr ""
+msgstr "Suche Mahnungen"
 
 #. module: account_followup
 #: view:res.partner:0
 msgid "Account Move line"
-msgstr ""
+msgstr "Buchungszeile"
 
 #. module: account_followup
 #: code:addons/account_followup/wizard/account_followup_print.py:240
 #, python-format
 msgid "Send Letters and Emails: Actions Summary"
-msgstr ""
+msgstr "Versende Mahnschreiben und Emails: Zusammenfassung"
 
 #. module: account_followup
 #: view:account_followup.print:0
 msgid "or"
-msgstr ""
+msgstr "oder"
 
 #. module: account_followup
 #: field:account_followup.stat,blocked:0
@@ -615,17 +737,17 @@ msgstr "Abgewiesen"
 #. module: account_followup
 #: sql_constraint:account_followup.followup.line:0
 msgid "Days of the follow-up levels must be different"
-msgstr ""
+msgstr "Tage der Mahnstufen müssen verschieden sein"
 
 #. module: account_followup
 #: view:res.partner:0
 msgid "Click to mark the action as done."
-msgstr ""
+msgstr "Klicken Sie um Aktion abzuschließen"
 
 #. module: account_followup
 #: model:ir.ui.menu,name:account_followup.menu_action_followup_stat_follow
 msgid "Follow-Ups Analysis"
-msgstr ""
+msgstr "Statistik Mahnungen"
 
 #. module: account_followup
 #: help:account_followup.print,date:0
@@ -643,7 +765,7 @@ msgstr "Datum für Versand der Mahnung(en)"
 #. module: account_followup
 #: field:res.partner,payment_responsible_id:0
 msgid "Follow-up Responsible"
-msgstr ""
+msgstr "Verantwortlich für Mahnung"
 
 #. module: account_followup
 #: report:account_followup.followup.print:0
@@ -659,12 +781,12 @@ msgstr "Erinnerung an zu zahlende Rechnungen"
 #. module: account_followup
 #: model:ir.ui.menu,name:account_followup.account_followup_menu
 msgid "Follow-up Levels"
-msgstr ""
+msgstr "Mahnstufen"
 
 #. module: account_followup
 #: view:res.partner:0
 msgid "Future Follow-ups"
-msgstr ""
+msgstr "Zukünftige Mahnungen"
 
 #. module: account_followup
 #: view:account_followup.followup:0
@@ -678,11 +800,19 @@ msgid ""
 "certain\n"
 "                        amount of days."
 msgstr ""
+"Um Kunden an die Zahlung Ihrer offenen Rechnungen zu erinnern, können Sie\n"
+"                        je nach Fristüberschreitung unterschiedliche "
+"Mahnaktionen auslösen .\n"
+"                        Diese werden zusammengefasst in verschiedenen "
+"Mahnstufen,\n"
+"                        die in Abhängigkeit Ihres maximalen Verzugs bei "
+"Überschreitung\n"
+"                        ausgelöst werden."
 
 #. module: account_followup
 #: view:account_followup.stat:0
 msgid "Follow-up Entries with period in current year"
-msgstr ""
+msgstr "Mahnungen mit Rechnung aus diesem Jahr"
 
 #. module: account_followup
 #: field:account.move.line,followup_date:0
@@ -692,13 +822,13 @@ msgstr "Letzte Mahnung"
 #. module: account_followup
 #: view:account_followup.sending.results:0
 msgid "Download Letters"
-msgstr ""
+msgstr "Herunterladen Abschreiben"
 
 #. module: account_followup
 #: field:account_followup.print,company_id:0
 #: field:res.partner,unreconciled_aml_ids:0
 msgid "unknown"
-msgstr ""
+msgstr "unbekannt"
 
 #. module: account_followup
 #: code:addons/account_followup/account_followup.py:245
@@ -709,7 +839,7 @@ msgstr ""
 #. module: account_followup
 #: model:ir.model,name:account_followup.model_email_template
 msgid "Email Templates"
-msgstr ""
+msgstr "EMail Vorlagen"
 
 #. module: account_followup
 #: help:account_followup.followup.line,manual_action:0
@@ -717,18 +847,20 @@ msgid ""
 "When processing, it will set the manual action to be taken for that "
 "customer. "
 msgstr ""
+"Bei Durchführung wird das manuelle Verfahren für diesen Kunden vorgeschlagen "
 
 #. module: account_followup
 #: code:addons/account_followup/wizard/account_followup_print.py:171
 #, python-format
 msgid " email(s) should have been sent, but "
-msgstr ""
+msgstr " EMail(s) sollten ausgetauscht werden, aber "
 
 #. module: account_followup
 #: help:account_followup.print,test_print:0
 msgid ""
 "Check if you want to print follow-ups without changing follow-ups level."
 msgstr ""
+"Möchten Sie Ausdrucke von Mahnungen ohne Wechsel der Stufe generieren."
 
 #. module: account_followup
 #: model:ir.model,name:account_followup.model_account_move_line
@@ -743,12 +875,12 @@ msgstr "Summe:"
 #. module: account_followup
 #: field:account_followup.followup.line,email_template_id:0
 msgid "Email Template"
-msgstr ""
+msgstr "EMail Vorlage"
 
 #. module: account_followup
 #: view:account_followup.followup.line:0
 msgid "%(user_signature)s"
-msgstr ""
+msgstr "%(user_signature)s"
 
 #. module: account_followup
 #: model:ir.model,name:account_followup.model_res_company
@@ -764,7 +896,7 @@ msgstr "Zusammenfassung"
 #: view:account_followup.followup.line:0
 #: field:account_followup.followup.line,send_email:0
 msgid "Send an Email"
-msgstr ""
+msgstr "Sende eine Email"
 
 #. module: account_followup
 #: model:account_followup.followup.line,description:account_followup.demo_followup_line2
@@ -790,6 +922,25 @@ msgid ""
 "Best Regards,\n"
 "        "
 msgstr ""
+"\n"
+"Sehr geehrte(r) %partner_name,\n"
+"\n"
+"wir haben mit Enttäuschung feststellen müssen, dass trotz erfolgter Mahnung, "
+"Ihr Konto weiterhin überfällig ist.\n"
+"\n"
+"Es ist in Ihrem eigenen Interesse sehr wichtig, dass die sofortige Zahlung "
+"erfolgt, sonst müssen wir in Betracht ziehen, \n"
+"dass wir nicht mehr in der Lage sein werden, Ihr Unternehmen mit Waren / "
+"Dienstleistungen zu beliefern. Bitte ergreifen Sie \n"
+"geeignete Maßnahmen, um die Durchführung dieser Zahlung in den nächsten 8 "
+"Tagen vorzunehmen.\n"
+"\n"
+"Wenn es ein Problem mit der Zahlung der Rechnung gibt, die uns aktuell nicht "
+"bewusst ist, zögern Sie bitte nicht, unsere Buchhaltung unter (+49) 4471 "
+"8409000 zu kontaktieren. damit wir die Angelegenheit schnell lösen können.\n"
+"\n"
+"Details fälliger Zahlungen werden dann weiter unten gedruckt.\n"
+"        "
 
 #. module: account_followup
 #: report:account_followup.followup.print:0
@@ -881,12 +1032,14 @@ msgid ""
 "The maximum follow-up level without taking into account the account move "
 "lines with litigation"
 msgstr ""
+"Die höchstmögliche Mahnstufe, ohne dass die Rechnung dem gesetzlichen "
+"Mahnverfahren übergeben wird."
 
 #. module: account_followup
 #: view:account_followup.stat:0
 #: field:res.partner,latest_followup_date:0
 msgid "Latest Follow-up Date"
-msgstr ""
+msgstr "Letzte Mahnung"
 
 #. module: account_followup
 #: model:email.template,body_html:account_followup.email_template_account_followup_level1
@@ -970,6 +1123,88 @@ 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>Sehr geehrte(r) ${object.name},</p>\n"
+"   <p>\n"
+"   \t Wir sind enttäuscht, dass trotz Mahnung, Ihr Konto immer noch "
+"überfällige Rechnungen ausweist.\n"
+"\n"
+"Es ist wichtig, dass die sofortige Zahlung erfolgt, sonst müssen wir in "
+"Betracht ziehen, Ihr Kundenkonto zu sperren, \n"
+"wodurch wir dann leider gezwungen sind, Ihr Unternehmen vorerst nicht mehr "
+"mit Waren / Dienstleistungen zu \n"
+"beliefern. Bitte ergreifen Sie geeignete Maßnahmen, um eine Zahlung in den "
+"nächsten 8 Tagen durchzuführen.\n"
+"\n"
+"Wenn es ein Problem mit der Zahlung der Rechnung(en) gibt, die uns nicht "
+"bekannt ist, zögern Sie nicht, \n"
+"unsere Buchhaltung unter (+49) 4471 8409000 zu kontaktieren, damit wir die "
+"Angelegenheit lösen können.\n"
+"\n"
+"Details zu den fälligen Zahlungen finden Sie unten.\n"
+" </p>\n"
+"<br/>\n"
+"Mit freundlichen Grüßen\n"
+"    \n"
+"<br/>\n"
+"${user.name}\n"
+"    \n"
+"<br/>\n"
+"<br/>\n"
+"\n"
+"   \n"
+"<%\n"
+"    from openerp.addons.account_followup.report import "
+"account_followup_print\n"
+"    rml_parse = account_followup_print.report_rappel(object._cr, user.id, "
+"\"followup_rml_parser\")\n"
+"    final_res = rml_parse._lines_get_with_partner(object, "
+"user.company_id.id)\n"
+"    followup_table = ''\n"
+"    for currency_dict in final_res:\n"
+"        currency_symbol = currency_dict.get('line', [{'currency_id': "
+"user.company_id.currency_id}])[0]['currency_id'].symbol\n"
+"        followup_table += '''\n"
+"        <table border=\"2\" width=100%%>\n"
+"        <tr>\n"
+"            <td>Rechnungsdatum</td>\n"
+"            <td>Rechnungsnummer</td>\n"
+"            <td>fällig am</td>\n"
+"            <td>Betrag(%s)</td>\n"
+"            <td>EUR</td>\n"
+"        </tr>\n"
+"        ''' % (currency_symbol)\n"
+"        total = 0\n"
+"        for aml in currency_dict['line']:\n"
+"            block = aml['blocked'] and 'X' or ' '\n"
+"            total += aml['balance']\n"
+"            strbegin = \"<TD> \"\n"
+"            strend = \"</TD> \"\n"
+"            date = aml['date_maturity'] or aml['date']\n"
+"            if date <= ctx['current_date'] and aml['balance'] > 0:\n"
+"                strbegin = \"<TD><B>\"\n"
+"                strend = \"</B></TD>\"\n"
+"            followup_table +=\"<TR>\" + strbegin + str(aml['date']) + strend "
+"+ strbegin + aml['ref'] + strend + strbegin + str(date) + strend + strbegin "
+"+ str(aml['balance']) + strend + strbegin + block + strend + \"</TR>\"\n"
+"        total = rml_parse.formatLang(total, dp='Account', "
+"currency_obj=object.company_id.currency_id)\n"
+"        followup_table += '''<tr> </tr>\n"
+"                        </table>\n"
+"                        <center>Fälliger Betrag: %s </center>''' % (total)\n"
+"\n"
+"%>\n"
+"\n"
+"${followup_table}\n"
+"\n"
+"    <br/>\n"
+"\n"
+"</div>\n"
+"            "
 
 #. module: account_followup
 #: field:account.move.line,result:0
@@ -982,17 +1217,17 @@ msgstr "Saldo"
 #. module: account_followup
 #: help:res.partner,payment_note:0
 msgid "Payment Note"
-msgstr ""
+msgstr "Zahlungsmitteilung"
 
 #. module: account_followup
 #: view:res.partner:0
 msgid "My Follow-ups"
-msgstr ""
+msgstr "Meine Mahnungen"
 
 #. module: account_followup
 #: view:account_followup.followup.line:0
 msgid "%(company_name)s"
-msgstr ""
+msgstr "%(company_name)s"
 
 #. module: account_followup
 #: field:account_followup.stat,date_move_last:0
@@ -1014,12 +1249,12 @@ msgstr "Periode"
 #: code:addons/account_followup/wizard/account_followup_print.py:231
 #, python-format
 msgid "%s partners have no credits and as such the action is cleared"
-msgstr ""
+msgstr "%s Partner haben kein Guthaben, insofern wurde die Aktion gelöscht"
 
 #. module: account_followup
 #: model:ir.actions.report.xml,name:account_followup.account_followup_followup_report
 msgid "Follow-up Report"
-msgstr ""
+msgstr "Statistik Mahnungen"
 
 #. module: account_followup
 #: view:res.partner:0
@@ -1027,6 +1262,8 @@ msgid ""
 ", the latest payment follow-up\n"
 "                            was:"
 msgstr ""
+", die letzte Mahnung\n"
+"                              war:"
 
 #. module: account_followup
 #: view:account_followup.print:0
@@ -1036,7 +1273,7 @@ msgstr "Abbrechen"
 #. module: account_followup
 #: view:account_followup.sending.results:0
 msgid "Close"
-msgstr ""
+msgstr "Schließen"
 
 #. module: account_followup
 #: view:account_followup.stat:0
@@ -1053,33 +1290,33 @@ msgstr "Höchste Mahnstufe"
 #: code:addons/account_followup/wizard/account_followup_print.py:171
 #, python-format
 msgid " had unknown email address(es)"
-msgstr ""
+msgstr " es ergab()en sich unbekannte Emailanschrift(en)"
 
 #. module: account_followup
 #: view:res.partner:0
 msgid "Responsible"
-msgstr ""
+msgstr "Verantwortlicher"
 
 #. module: account_followup
 #: model:ir.ui.menu,name:account_followup.menu_finance_followup
 #: view:res.partner:0
 msgid "Payment Follow-up"
-msgstr ""
+msgstr "Mahnwesen"
 
 #. module: account_followup
 #: view:account_followup.followup.line:0
 msgid ": Current Date"
-msgstr ""
+msgstr ": Heutiges Datum"
 
 #. module: account_followup
 #: field:res.partner,payment_amount_due:0
 msgid "Total amount due"
-msgstr ""
+msgstr "Fälliger Gesamtbetrag"
 
 #. module: account_followup
 #: field:account_followup.followup.line,name:0
 msgid "Follow-Up Action"
-msgstr ""
+msgstr "Mahnung"
 
 #. module: account_followup
 #: view:account_followup.stat:0
@@ -1098,12 +1335,12 @@ msgstr "Beschreibung"
 #: model:email.template,subject:account_followup.email_template_account_followup_level1
 #: model:email.template,subject:account_followup.email_template_account_followup_level2
 msgid "${user.company_id.name} Payment Follow-up"
-msgstr ""
+msgstr "${user.company_id.name} Mahnwesen"
 
 #. module: account_followup
 #: view:account_followup.sending.results:0
 msgid "Summary of actions"
-msgstr ""
+msgstr "Zusammenfassung Mahnungen"
 
 #. module: account_followup
 #: report:account_followup.followup.print:0
@@ -1113,7 +1350,7 @@ msgstr "Ref."
 #. module: account_followup
 #: view:account_followup.followup.line:0
 msgid "After"
-msgstr ""
+msgstr "Danach"
 
 #. module: account_followup
 #: view:account_followup.stat:0
@@ -1126,6 +1363,8 @@ msgid ""
 "If not specified by the latest follow-up level, it will send from the "
 "default follow-up of overdue invoices template"
 msgstr ""
+"Falls nicht automatisch durch die Mahnstufe vorgegeben, wird die Standard "
+"Mahnvorlage für Anschreiben und EMail angewendet."
 
 #. module: account_followup
 #: model:ir.actions.act_window,help:account_followup.action_account_manual_reconcile_receivable
@@ -1135,6 +1374,11 @@ msgid ""
 "                </p>\n"
 "            "
 msgstr ""
+"<p>\n"
+"                    Es wurden keine Buchungsbelege in diesem Journal "
+"gefunden.\n"
+"                </p>\n"
+"            "
 
 #. module: account_followup
 #: view:account.move.line:0
@@ -1144,12 +1388,12 @@ msgstr "Partnereinträge"
 #. module: account_followup
 #: view:account_followup.stat:0
 msgid "Follow-up lines"
-msgstr ""
+msgstr "Mahnpositionen"
 
 #. module: account_followup
 #: field:account_followup.followup.line,manual_action_responsible_id:0
 msgid "Assign a Responsible"
-msgstr ""
+msgstr "Zuweisen eines Verantwortlichen"
 
 #. module: account_followup
 #: view:account_followup.print:0
@@ -1157,6 +1401,9 @@ msgid ""
 "This action will send follow-up emails, print the letters and\n"
 "                        set the manual actions per customers."
 msgstr ""
+"Hierdurch werden Mahnungen als EMails versendet, Anschreiben ausgedruckt und "
+"die manuell zu\n"
+"bearbeiteten Mahnungen der Kunden ausgelöst."
 
 #. module: account_followup
 #: help:account_followup.print,partner_lang:0
@@ -1179,6 +1426,14 @@ msgid ""
 "installed\n"
 "                            using to top right icon."
 msgstr ""
+"Schreiben Sie hier eine allgemeingültige Einführung,\n"
+"                            in Abhängigkeit von der Mahnstufe. Sie können "
+"dabei\n"
+"                            die folgenden Schlüsselwörter verwenden. "
+"Vergessen Sie\n"
+"                            allerdings dann nicht alle Sprachen, die Sie "
+"verwenden, mit Hilfe\n"
+"                            des oberen rechten Knopfs zu installierenn."
 
 #. module: account_followup
 #: view:account_followup.stat:0
@@ -1194,7 +1449,7 @@ msgstr "Name"
 #. module: account_followup
 #: field:res.partner,latest_followup_level_id:0
 msgid "Latest Follow-up Level"
-msgstr ""
+msgstr "Letzte Mahnstufe"
 
 #. module: account_followup
 #: field:account_followup.stat,date_move:0
@@ -1205,18 +1460,18 @@ msgstr "Erste Zahlung:"
 #. module: account_followup
 #: model:ir.model,name:account_followup.model_account_followup_stat_by_partner
 msgid "Follow-up Statistics by Partner"
-msgstr ""
+msgstr "Statistik Mahnwesen nach Partner"
 
 #. module: account_followup
 #: code:addons/account_followup/wizard/account_followup_print.py:172
 #, python-format
 msgid " letter(s) in report"
-msgstr ""
+msgstr " Geschäftsformulare Ansicht"
 
 #. module: account_followup
 #: view:res.partner:0
 msgid "Customer Followup"
-msgstr ""
+msgstr "Kunden Historie"
 
 #. module: account_followup
 #: model:ir.actions.act_window,help:account_followup.action_account_followup_definition_form
@@ -1232,6 +1487,17 @@ msgid ""
 "              </p>\n"
 "          "
 msgstr ""
+"p class = \"oe_view_nocontent_create\">\n"
+"                 Klicken Sie, um zu definieren Follow-up Ebenen und die "
+"damit verbundenen Aktionen.\n"
+"               </ p>\n"
+"                 Für jeden Schritt fest, welche Aktionen ergriffen werden "
+"und verzögern in Tagen. es ist\n"
+"                 möglich, Print-und E-Mail-Vorlagen verwenden, um bestimmte "
+"Nachrichten zu senden\n"
+"                 der Kunde.\n"
+"               </ p>\n"
+"          "
 
 #. module: account_followup
 #: model:email.template,body_html:account_followup.email_template_account_followup_level2
@@ -1320,6 +1586,11 @@ msgid ""
 "set when the action fields are empty and the partner gets a follow-up level "
 "that requires a manual action. "
 msgstr ""
+"Dies ist die nächste Aktion, die durch den Anwender getroffen werden muss. "
+"Die Aktion wird jetzt automatisch so eingestellt, \r\n"
+"dass erst wenn die Aktion Felder leer sind und der Partner eine automatische "
+"Mahnstufe erhält, ein manueller Eingriff \r\n"
+"erforderlich sein wird. "
 
 #. module: account_followup
 #: code:addons/account_followup/wizard/account_followup_print.py:166
@@ -1330,7 +1601,7 @@ msgstr ""
 #. module: account_followup
 #: view:res.partner:0
 msgid "The"
-msgstr ""
+msgstr "Der"
 
 #. module: account_followup
 #: view:account_followup.print:0
@@ -1388,12 +1659,12 @@ msgstr ""
 #. module: account_followup
 #: view:res.partner:0
 msgid "Accounting"
-msgstr ""
+msgstr "Finanzbuchhaltung"
 
 #. module: account_followup
 #: field:res.partner,payment_note:0
 msgid "Customer Payment Promise"
-msgstr ""
+msgstr "Kundenzahlung Versprechen"
 
 #~ msgid "All payable entries"
 #~ msgstr "Alle offenen Posten"
diff --git a/addons/account_followup/i18n/pt.po b/addons/account_followup/i18n/pt.po
index a41462e57b6..234b3bf1191 100644
--- a/addons/account_followup/i18n/pt.po
+++ b/addons/account_followup/i18n/pt.po
@@ -7,20 +7,20 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2012-12-03 16:02+0000\n"
-"PO-Revision-Date: 2010-12-16 00:03+0000\n"
-"Last-Translator: OpenERP Administrators <Unknown>\n"
+"PO-Revision-Date: 2012-12-07 10:43+0000\n"
+"Last-Translator: Andrei Talpa (multibase.pt) <andrei.talpa@multibase.pt>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:19+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-08 04:58+0000\n"
+"X-Generator: Launchpad (build 16341)\n"
 
 #. module: account_followup
 #: view:account_followup.followup.line:0
 #: field:account_followup.followup.line,manual_action:0
 msgid "Manual Action"
-msgstr ""
+msgstr "Ação manual"
 
 #. module: account_followup
 #: help:res.partner,latest_followup_level_id:0
@@ -30,7 +30,7 @@ msgstr ""
 #. module: account_followup
 #: view:res.partner:0
 msgid "Group by"
-msgstr ""
+msgstr "Agrupar por"
 
 #. module: account_followup
 #: view:account_followup.stat:0
@@ -398,7 +398,7 @@ msgstr ""
 #: code:addons/account_followup/wizard/account_followup_print.py:155
 #, python-format
 msgid "Nobody"
-msgstr ""
+msgstr "Ninguém"
 
 #. module: account_followup
 #: field:account.move.line,followup_line_id:0
diff --git a/addons/account_payment/i18n/de.po b/addons/account_payment/i18n/de.po
index 30fd5d1eef5..c61aa961d60 100644
--- a/addons/account_payment/i18n/de.po
+++ b/addons/account_payment/i18n/de.po
@@ -7,14 +7,15 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2012-12-03 16:02+0000\n"
-"PO-Revision-Date: 2012-02-08 08:52+0000\n"
-"Last-Translator: Ferdinand @ Camptocamp <Unknown>\n"
+"PO-Revision-Date: 2012-12-07 15:45+0000\n"
+"Last-Translator: Thorsten Vocks (OpenBig.org) <thorsten.vocks@big-"
+"consulting.net>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:35+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-08 04:59+0000\n"
+"X-Generator: Launchpad (build 16341)\n"
 
 #. module: account_payment
 #: model:ir.actions.act_window,help:account_payment.action_payment_order_tree
@@ -28,6 +29,15 @@ msgid ""
 "              </p>\n"
 "            "
 msgstr ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Klicken Sie zur Erstellung eines Zahlungsauftrags.\n"
+"              </p><p>\n"
+"                 Ein Zahlungsauftrag ist eine Zahlungsaufforderung aus Ihrem "
+"Unternehmen zur Zahlung \n"
+"                 einer Lieferantenrechnung oder einer Rückerstattung durch "
+"eine Kundengutschrift.\n"
+"              </p>\n"
+"            "
 
 #. module: account_payment
 #: field:payment.line,currency:0
@@ -123,13 +133,16 @@ msgid ""
 "You cannot cancel an invoice which has already been imported in a payment "
 "order. Remove it from the following payment order : %s."
 msgstr ""
+"Sie können keine Rechnung stornieren, die Sie bereits in einen "
+"Zahlungsauftrag übernommen haben. Entfernen Sie die Rechnung vom "
+"Zahlungsauftrag: %s ."
 
 #. module: account_payment
 #: code:addons/account_payment/account_invoice.py:43
 #: code:addons/account_payment/account_move_line.py:110
 #, python-format
 msgid "Error!"
-msgstr ""
+msgstr "Fehler !"
 
 #. module: account_payment
 #: report:payment.order:0
@@ -194,6 +207,9 @@ msgid ""
 " Once the bank is confirmed the status is set to 'Confirmed'.\n"
 " Then the order is paid the status is 'Done'."
 msgstr ""
+"Wenn ein Zahlungsauftrag erstellt wird ist der Status 'Entwurf'.\n"
+" Durch Bestätigung wechselt der Status in 'Bestätigt'.\n"
+" Durch die tatsächliche Freigabe zu Zahlung wechselt der"
 
 #. module: account_payment
 #: view:payment.order:0
@@ -219,7 +235,7 @@ msgstr "Strukturiert"
 #. module: account_payment
 #: view:account.bank.statement:0
 msgid "Import Payment Lines"
-msgstr ""
+msgstr "Import von Zahlungspositionen"
 
 #. module: account_payment
 #: view:payment.line:0
@@ -262,7 +278,7 @@ msgstr ""
 #. module: account_payment
 #: field:payment.order,date_created:0
 msgid "Creation Date"
-msgstr ""
+msgstr "Datum Erstellung"
 
 #. module: account_payment
 #: help:payment.mode,journal:0
@@ -369,7 +385,7 @@ msgstr "Beleg Zahlungsvorschlag"
 #: code:addons/account_payment/account_move_line.py:110
 #, python-format
 msgid "There is no partner defined on the entry line."
-msgstr ""
+msgstr "Es gibt keinen Partner als Zahlungsempfänger für diese Position."
 
 #. module: account_payment
 #: help:payment.mode,name:0
@@ -401,7 +417,7 @@ msgstr "Entwurf"
 #: view:payment.order:0
 #: field:payment.order,state:0
 msgid "Status"
-msgstr ""
+msgstr "Status"
 
 #. module: account_payment
 #: help:payment.line,communication2:0
@@ -449,7 +465,7 @@ msgstr "Suche"
 #. module: account_payment
 #: field:payment.order,user_id:0
 msgid "Responsible"
-msgstr ""
+msgstr "Verantwortlicher"
 
 #. module: account_payment
 #: field:payment.line,date:0
@@ -464,7 +480,7 @@ msgstr "Summe:"
 #. module: account_payment
 #: field:payment.order,date_done:0
 msgid "Execution Date"
-msgstr ""
+msgstr "Datum Ausführung"
 
 #. module: account_payment
 #: view:account.payment.populate.statement:0
@@ -582,7 +598,7 @@ msgstr "Verwendungszweck 2"
 #. module: account_payment
 #: field:payment.order,date_scheduled:0
 msgid "Scheduled Date"
-msgstr ""
+msgstr "Geplantes Datum"
 
 #. module: account_payment
 #: view:account.payment.make.payment:0
@@ -677,14 +693,14 @@ msgstr "Bezahlung"
 #. module: account_payment
 #: field:payment.order,date_prefered:0
 msgid "Preferred Date"
-msgstr ""
+msgstr "bevorzugtes Datum"
 
 #. module: account_payment
 #: view:account.payment.make.payment:0
 #: view:account.payment.populate.statement:0
 #: view:payment.order.create:0
 msgid "or"
-msgstr ""
+msgstr "oder"
 
 #. module: account_payment
 #: help:payment.mode,bank_id:0
diff --git a/addons/account_voucher/i18n/de.po b/addons/account_voucher/i18n/de.po
index 074cbcaa580..769536fd4a2 100644
--- a/addons/account_voucher/i18n/de.po
+++ b/addons/account_voucher/i18n/de.po
@@ -7,15 +7,15 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2012-12-03 16:01+0000\n"
-"PO-Revision-Date: 2012-05-10 17:49+0000\n"
+"PO-Revision-Date: 2012-12-07 20:51+0000\n"
 "Last-Translator: Thorsten Vocks (OpenBig.org) <thorsten.vocks@big-"
 "consulting.net>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:41+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-08 04:59+0000\n"
+"X-Generator: Launchpad (build 16341)\n"
 
 #. module: account_voucher
 #: field:account.bank.statement.line,voucher_id:0
@@ -64,7 +64,7 @@ msgstr "Berechnet als Differenz zwischen Belege und Belegzeilen"
 #. module: account_voucher
 #: view:account.voucher:0
 msgid "(Update)"
-msgstr ""
+msgstr "(Aktualisieren)"
 
 #. module: account_voucher
 #: code:addons/account_voucher/account_voucher.py:1093
@@ -99,7 +99,7 @@ msgstr "März"
 #. module: account_voucher
 #: field:account.voucher,message_unread:0
 msgid "Unread Messages"
-msgstr ""
+msgstr "Ungelesene Nachrichten"
 
 #. module: account_voucher
 #: view:account.voucher:0
@@ -109,7 +109,7 @@ msgstr "Bezahle Rechnung"
 #. module: account_voucher
 #: view:account.voucher:0
 msgid "Are you sure you want to cancel this receipt?"
-msgstr ""
+msgstr "Sind Sie sicher, dass Sie diesen Beleg löschen wollen ?"
 
 #. module: account_voucher
 #: view:account.voucher:0
@@ -130,7 +130,7 @@ msgstr "Gruppiere je Jahr der Rechnung"
 #: view:sale.receipt.report:0
 #: field:sale.receipt.report,user_id:0
 msgid "Salesperson"
-msgstr ""
+msgstr "Verkäufer"
 
 #. module: account_voucher
 #: view:account.voucher:0
@@ -144,6 +144,8 @@ msgid ""
 "You can not change the journal as you already reconciled some statement "
 "lines!"
 msgstr ""
+"Dieses Journal kann nicht geändert werden, da bereits Auszugspositionen "
+"ausgeglichen wurden."
 
 #. module: account_voucher
 #: view:account.voucher:0
@@ -161,6 +163,13 @@ msgid ""
 "              </p>\n"
 "            "
 msgstr ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                 Klicken Sie zur Erfassung eines Kaufbeleg.\n"
+"               </ p>\n"
+"                 Wenn der Kaufbeleg bestätigt wird, können Sie die\n"
+"                 Lieferanten Bezahlung erfassen.\n"
+"               </ p>\n"
+"            "
 
 #. module: account_voucher
 #: view:account.voucher:0
@@ -210,7 +219,7 @@ msgstr "Anmerkungen"
 #. module: account_voucher
 #: field:account.voucher,message_ids:0
 msgid "Messages"
-msgstr ""
+msgstr "Mitteilungen"
 
 #. module: account_voucher
 #: selection:account.voucher,type:0
@@ -228,7 +237,7 @@ msgstr "Journal Buchung"
 #: code:addons/account_voucher/account_voucher.py:964
 #, python-format
 msgid "Error!"
-msgstr ""
+msgstr "Fehler !"
 
 #. module: account_voucher
 #: field:account.voucher.line,amount:0
@@ -272,11 +281,19 @@ msgid ""
 "              </p>\n"
 "            "
 msgstr ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Klicken Sie zur Erstellung eines Kaufbeleg.\n"
+"              </p><p>\n"
+"                 Wenn Sie den Kaufbeleg bestätigt haben, können Sie optional "
+"die\n"
+"                 Einzahlung sofort oder später erfassen.\n"
+"              </p>\n"
+"            "
 
 #. module: account_voucher
 #: help:account.voucher,message_unread:0
 msgid "If checked new messages require your attention."
-msgstr ""
+msgstr "Benachrichtigung erfordert handeln"
 
 #. module: account_voucher
 #: model:ir.model,name:account_voucher.model_account_bank_statement_line
@@ -298,7 +315,7 @@ msgstr "Steuer"
 #: code:addons/account_voucher/account_voucher.py:864
 #, python-format
 msgid "Invalid Action!"
-msgstr ""
+msgstr "Diese Aktion ist fehlerhaft !"
 
 #. module: account_voucher
 #: field:account.voucher,comment:0
@@ -316,6 +333,9 @@ msgid ""
 "Holds the Chatter summary (number of messages, ...). This summary is "
 "directly in html format in order to be inserted in kanban views."
 msgstr ""
+"Beinhaltet die Chatter Zusammenfassung (Anzahl der Nachrichten, ...). Diese "
+"Zusammenfassung ist im HTML-Format, um in Kanban Karten Ansichten eingefügt "
+"zu werden."
 
 #. module: account_voucher
 #: view:account.voucher:0
@@ -325,7 +345,7 @@ msgstr "Zahlungsinformation"
 #. module: account_voucher
 #: view:account.voucher:0
 msgid "(update)"
-msgstr ""
+msgstr "(aktualisieren)"
 
 #. module: account_voucher
 #: view:account.voucher:0
@@ -361,6 +381,9 @@ msgid ""
 "settings, to manage automatically the booking of accounting entries related "
 "to differences between exchange rates."
 msgstr ""
+"Sie sollten in den Einstellungen für die Buchhaltung das 'Kursgewinn Konto' "
+"einstellen, um automatisch die entstehenden erforderlichen Buchungen für "
+"Wechselkursdifferenzen zu generieren."
 
 #. module: account_voucher
 #: view:account.voucher:0
@@ -397,7 +420,7 @@ msgstr "Konto belasten (Soll)"
 #: code:addons/account_voucher/account_voucher.py:1558
 #, python-format
 msgid "Unable to change journal !"
-msgstr ""
+msgstr "Es ist nicht möglich das Journal zu ändern !"
 
 #. module: account_voucher
 #: view:sale.receipt.report:0
@@ -527,12 +550,22 @@ msgid ""
 "              </p>\n"
 "            "
 msgstr ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                 Klicken Sie zur Eingabe einer Einzahlung.\n"
+"               </ p>\n"
+"                 Erfassen Sie den Kunden, die Zahlungsmethode und den "
+"Betrag, bevor Sie dann entweder \n"
+"                 einfach nur die Zahlung bestätigen oder den automatischen "
+"Vorschlag der auszugleichenden \n"
+"                 Rechnungen bzw. Verkaufsbelege übernehmen und buchen.\n"
+"               </ p>\n"
+"            "
 
 #. module: account_voucher
 #: field:account.config.settings,expense_currency_exchange_account_id:0
 #: field:res.company,expense_currency_exchange_account_id:0
 msgid "Loss Exchange Rate Account"
-msgstr ""
+msgstr "Kursverlust Konto"
 
 #. module: account_voucher
 #: view:account.voucher:0
@@ -566,6 +599,9 @@ msgid ""
 "settings, to manage automatically the booking of accounting entries related "
 "to differences between exchange rates."
 msgstr ""
+"Sie sollten das Kursverlust Konto in den Einstellungen der Buchhaltung "
+"definieren, um automatisch die Buchungen für die Kursverluste aus "
+"Wechselkursänderungen zu generieren."
 
 #. module: account_voucher
 #: view:account.voucher:0
@@ -575,7 +611,7 @@ msgstr "Aufwandspositionen"
 #. module: account_voucher
 #: view:account.voucher:0
 msgid "Sale voucher"
-msgstr ""
+msgstr "Verkauf Belege"
 
 #. module: account_voucher
 #: help:account.voucher,is_multi_currency:0
@@ -589,7 +625,7 @@ msgstr ""
 #. module: account_voucher
 #: view:account.invoice:0
 msgid "Register Payment"
-msgstr ""
+msgstr "Erfassen Einzahlung"
 
 #. module: account_voucher
 #: field:account.statement.from.invoice.lines,line_ids:0
@@ -627,17 +663,17 @@ msgstr "Kreditoren und Debitoren"
 #. module: account_voucher
 #: view:account.voucher:0
 msgid "Voucher Payment"
-msgstr ""
+msgstr "Zahlung Belege"
 
 #. module: account_voucher
 #: field:sale.receipt.report,state:0
 msgid "Voucher Status"
-msgstr ""
+msgstr "Belegstatus"
 
 #. module: account_voucher
 #: view:account.voucher:0
 msgid "Are you sure to unreconcile this record?"
-msgstr ""
+msgstr "Möchten Sie wirklich den Ausgleich stornieren?"
 
 #. module: account_voucher
 #: field:account.voucher,company_id:0
@@ -661,7 +697,7 @@ msgstr "OP-Ausgleich Saldo"
 #: code:addons/account_voucher/account_voucher.py:960
 #, python-format
 msgid "Configuration Error !"
-msgstr ""
+msgstr "Konfigurationsfehler !"
 
 #. module: account_voucher
 #: view:account.voucher:0
@@ -678,14 +714,14 @@ msgstr "Bruttobetrag"
 #. module: account_voucher
 #: view:account.voucher:0
 msgid "Purchase Voucher"
-msgstr ""
+msgstr "Einkauf Belege"
 
 #. module: account_voucher
 #: view:account.voucher:0
 #: field:account.voucher,state:0
 #: view:sale.receipt.report:0
 msgid "Status"
-msgstr ""
+msgstr "Status"
 
 #. module: account_voucher
 #: view:account.voucher:0
@@ -696,7 +732,7 @@ msgstr "Zuordnung"
 #: view:account.statement.from.invoice.lines:0
 #: view:account.voucher:0
 msgid "or"
-msgstr ""
+msgstr "oder"
 
 #. module: account_voucher
 #: selection:sale.receipt.report,month:0
@@ -721,7 +757,7 @@ msgstr "Oktober"
 #: code:addons/account_voucher/account_voucher.py:961
 #, python-format
 msgid "Please activate the sequence of selected journal !"
-msgstr ""
+msgstr "Bitte aktivieren Sie die Nummernfolge für das gewählte Journal !"
 
 #. module: account_voucher
 #: selection:sale.receipt.report,month:0
@@ -779,7 +815,7 @@ msgstr "Betrag Ausgeglichen"
 #: field:account.voucher,message_comment_ids:0
 #: help:account.voucher,message_comment_ids:0
 msgid "Comments and emails"
-msgstr ""
+msgstr "Kommentare und EMails"
 
 #. module: account_voucher
 #: model:ir.actions.act_window,help:account_voucher.action_vendor_payment
@@ -792,6 +828,14 @@ msgid ""
 "              </p>\n"
 "            "
 msgstr ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                 Klicken Sie zur Eingabe einer Lieferanten Zahlung.\n"
+"               </ p>\n"
+"                 OpenERP hilft bei der Ermittlung der offenen Rechnungen für "
+"Zahlungsvorschläge \n"
+"                 und hilft bei der Verfolgung von Zahlungen .\n"
+"               </ p>\n"
+"            "
 
 #. module: account_voucher
 #: selection:account.voucher,pay_now:0
@@ -828,18 +872,18 @@ msgstr "Unternehmen"
 #. module: account_voucher
 #: field:account.voucher,message_summary:0
 msgid "Summary"
-msgstr ""
+msgstr "Zusammenfassung"
 
 #. module: account_voucher
 #: field:account.voucher,active:0
 msgid "Active"
-msgstr ""
+msgstr "Aktiv"
 
 #. module: account_voucher
 #: code:addons/account_voucher/account_voucher.py:965
 #, python-format
 msgid "Please define a sequence on the journal."
-msgstr ""
+msgstr "Bitte definieren Sie eine Nummernfolge für dieses Journal."
 
 #. module: account_voucher
 #: view:account.voucher:0
@@ -855,7 +899,7 @@ msgstr "Gruppiert je Rechnungsdatum"
 #: code:addons/account_voucher/account_voucher.py:1093
 #, python-format
 msgid "Wrong bank statement line"
-msgstr ""
+msgstr "Falsche Bankauszugposition"
 
 #. module: account_voucher
 #: view:account.voucher:0
@@ -952,7 +996,7 @@ msgstr "Abbrechen"
 #. module: account_voucher
 #: model:ir.actions.client,name:account_voucher.action_client_invoice_menu
 msgid "Open Invoicing Menu"
-msgstr ""
+msgstr "Offene Rechnungen Auswahl"
 
 #. module: account_voucher
 #: selection:account.voucher,state:0
@@ -972,6 +1016,8 @@ msgstr "Buchungsjournale"
 #, python-format
 msgid "Please define default credit/debit accounts on the journal \"%s\"."
 msgstr ""
+"Bitte definieren Sie je ein Standard  Soll / Haben Konto für das Journal "
+"\"%s\"."
 
 #. module: account_voucher
 #: model:ir.actions.act_window,name:account_voucher.act_pay_voucher
@@ -1021,6 +1067,16 @@ msgid ""
 "          </p>\n"
 "        "
 msgstr ""
+"<p>\n"
+"             Durch diese Statistik können Sie sich einen Überblick über die "
+"abgerechneten Rechnungen \n"
+"             verschaffen sowie den Status der nicht termingerechten "
+"Zahlungen bewerten. Die \n"
+"             Sucheinstellung kann verwendet werden, um Statistiken zu "
+"personalisieren \n"
+"             und bedarfsgerecht anzupassen.\n"
+"          </p>\n"
+"        "
 
 #. module: account_voucher
 #: view:account.voucher:0
@@ -1050,7 +1106,7 @@ msgstr "Mai"
 #. module: account_voucher
 #: view:account.voucher:0
 msgid "Sale Receipt"
-msgstr ""
+msgstr "Verkauf Buchungsbelege"
 
 #. module: account_voucher
 #: view:account.voucher:0
@@ -1143,7 +1199,7 @@ msgstr "Jahr"
 #: field:account.config.settings,income_currency_exchange_account_id:0
 #: field:res.company,income_currency_exchange_account_id:0
 msgid "Gain Exchange Rate Account"
-msgstr ""
+msgstr "Kursverlust Konto"
 
 #. module: account_voucher
 #: selection:sale.receipt.report,month:0
@@ -1163,7 +1219,7 @@ msgstr "Standard Typ"
 #. module: account_voucher
 #: help:account.voucher,message_ids:0
 msgid "Messages and communication history"
-msgstr ""
+msgstr "Nachrichten und Kommunikation Historie"
 
 #. module: account_voucher
 #: model:ir.model,name:account_voucher.model_account_statement_from_invoice_lines
@@ -1187,12 +1243,14 @@ msgid ""
 "The amount of the voucher must be the same amount as the one on the "
 "statement line."
 msgstr ""
+"Der Betrag für diesen Beleg sollte identisch sein mit demjenigen auf dem "
+"Bankauszug."
 
 #. module: account_voucher
 #: code:addons/account_voucher/account_voucher.py:864
 #, python-format
 msgid "Cannot delete voucher(s) which are already opened or paid."
-msgstr ""
+msgstr "Offene oder bezahlte Belege können nicht storniert werden"
 
 #. module: account_voucher
 #: help:account.voucher,date:0
@@ -1202,7 +1260,7 @@ msgstr "Tatsächliches Buchungsdatum"
 #. module: account_voucher
 #: model:mail.message.subtype,name:account_voucher.mt_voucher
 msgid "Status Change"
-msgstr ""
+msgstr "Status Änderung"
 
 #. module: account_voucher
 #: selection:account.voucher,payment_option:0
@@ -1251,7 +1309,7 @@ msgstr "Offener Saldo"
 #: code:addons/account_voucher/account_voucher.py:1001
 #, python-format
 msgid "Insufficient Configuration!"
-msgstr ""
+msgstr "Unzureichende Konfiguration !"
 
 #. module: account_voucher
 #: help:account.voucher,active:0
@@ -1260,6 +1318,9 @@ msgid ""
 "inactive, which allow to hide the customer/supplier payment while the bank "
 "statement isn't confirmed."
 msgstr ""
+"Standardmäßig werden die Zahlungsausgleiche aus Bank Belegen als inaktiv "
+"gesetzt, um Kunden / Lieferanten Bezahlung zu verbergen, während der "
+"Kontoauszug noch nicht endgültig bestätigt wurde."
 
 #~ msgid "On Account of :"
 #~ msgstr "Bezug Konto:"
diff --git a/addons/auth_anonymous/i18n/fr.po b/addons/auth_anonymous/i18n/fr.po
new file mode 100644
index 00000000000..32042501573
--- /dev/null
+++ b/addons/auth_anonymous/i18n/fr.po
@@ -0,0 +1,30 @@
+# French translation for openobject-addons
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-11-24 02:52+0000\n"
+"PO-Revision-Date: 2012-12-07 10:27+0000\n"
+"Last-Translator: Quentin THEURET <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: 2012-12-08 04:59+0000\n"
+"X-Generator: Launchpad (build 16341)\n"
+
+#. module: auth_anonymous
+#. openerp-web
+#: code:addons/auth_anonymous/static/src/xml/auth_anonymous.xml:9
+#, python-format
+msgid "Login"
+msgstr "Connexion"
+
+#. module: auth_anonymous
+#: model:res.groups,name:auth_anonymous.group_anonymous
+msgid "Anonymous Group"
+msgstr ""
diff --git a/addons/auth_oauth/i18n/fr.po b/addons/auth_oauth/i18n/fr.po
new file mode 100644
index 00000000000..c6aaa187365
--- /dev/null
+++ b/addons/auth_oauth/i18n/fr.po
@@ -0,0 +1,135 @@
+# French translation for openobject-addons
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"PO-Revision-Date: 2012-12-07 10:28+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: French <fr@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2012-12-08 04:59+0000\n"
+"X-Generator: Launchpad (build 16341)\n"
+
+#. module: auth_oauth
+#: field:auth.oauth.provider,validation_endpoint:0
+msgid "Validation URL"
+msgstr ""
+
+#. module: auth_oauth
+#: field:auth.oauth.provider,auth_endpoint:0
+msgid "Authentication URL"
+msgstr ""
+
+#. module: auth_oauth
+#: model:ir.model,name:auth_oauth.model_base_config_settings
+msgid "base.config.settings"
+msgstr ""
+
+#. module: auth_oauth
+#: field:auth.oauth.provider,name:0
+msgid "Provider name"
+msgstr ""
+
+#. module: auth_oauth
+#: field:auth.oauth.provider,scope:0
+msgid "Scope"
+msgstr ""
+
+#. module: auth_oauth
+#: field:res.users,oauth_provider_id:0
+msgid "OAuth Provider"
+msgstr ""
+
+#. module: auth_oauth
+#: field:auth.oauth.provider,css_class:0
+msgid "CSS class"
+msgstr ""
+
+#. module: auth_oauth
+#: field:auth.oauth.provider,body:0
+msgid "Body"
+msgstr ""
+
+#. module: auth_oauth
+#: model:ir.model,name:auth_oauth.model_res_users
+msgid "Users"
+msgstr ""
+
+#. module: auth_oauth
+#: field:auth.oauth.provider,sequence:0
+msgid "unknown"
+msgstr ""
+
+#. module: auth_oauth
+#: field:res.users,oauth_access_token:0
+msgid "OAuth Access Token"
+msgstr ""
+
+#. module: auth_oauth
+#: field:auth.oauth.provider,client_id:0
+#: field:base.config.settings,auth_oauth_facebook_client_id:0
+#: field:base.config.settings,auth_oauth_google_client_id:0
+msgid "Client ID"
+msgstr ""
+
+#. module: auth_oauth
+#: model:ir.ui.menu,name:auth_oauth.menu_oauth_providers
+msgid "OAuth Providers"
+msgstr ""
+
+#. module: auth_oauth
+#: model:ir.model,name:auth_oauth.model_auth_oauth_provider
+msgid "OAuth2 provider"
+msgstr ""
+
+#. module: auth_oauth
+#: field:res.users,oauth_uid:0
+msgid "OAuth User ID"
+msgstr ""
+
+#. module: auth_oauth
+#: field:base.config.settings,auth_oauth_facebook_enabled:0
+msgid "Allow users to sign in with Facebook"
+msgstr ""
+
+#. module: auth_oauth
+#: sql_constraint:res.users:0
+msgid "OAuth UID must be unique per provider"
+msgstr ""
+
+#. module: auth_oauth
+#: help:res.users,oauth_uid:0
+msgid "Oauth Provider user_id"
+msgstr ""
+
+#. module: auth_oauth
+#: field:auth.oauth.provider,data_endpoint:0
+msgid "Data URL"
+msgstr ""
+
+#. module: auth_oauth
+#: view:auth.oauth.provider:0
+msgid "arch"
+msgstr ""
+
+#. module: auth_oauth
+#: model:ir.actions.act_window,name:auth_oauth.action_oauth_provider
+msgid "Providers"
+msgstr ""
+
+#. module: auth_oauth
+#: field:base.config.settings,auth_oauth_google_enabled:0
+msgid "Allow users to sign in with Google"
+msgstr ""
+
+#. module: auth_oauth
+#: field:auth.oauth.provider,enabled:0
+msgid "Allowed"
+msgstr ""
diff --git a/addons/base_calendar/i18n/pt_BR.po b/addons/base_calendar/i18n/pt_BR.po
index de4755bc3f8..b3eba080425 100644
--- a/addons/base_calendar/i18n/pt_BR.po
+++ b/addons/base_calendar/i18n/pt_BR.po
@@ -8,14 +8,15 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-12-03 16:03+0000\n"
-"PO-Revision-Date: 2012-12-01 11:25+0000\n"
-"Last-Translator: Luiz Fernando M.França <Unknown>\n"
+"PO-Revision-Date: 2012-12-07 22:49+0000\n"
+"Last-Translator: Fábio Martinelli - http://zupy.com.br "
+"<webmaster@guaru.net>\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: 2012-12-04 05:50+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-08 04:59+0000\n"
+"X-Generator: Launchpad (build 16341)\n"
 
 #. module: base_calendar
 #: selection:calendar.alarm,trigger_related:0
@@ -364,6 +365,9 @@ msgid ""
 "Holds the Chatter summary (number of messages, ...). This summary is "
 "directly in html format in order to be inserted in kanban views."
 msgstr ""
+"Contém o resumo da conversação (número de mensagens, ...). Este resumo é "
+"gerado diretamente em formato HTML para que possa ser inserido nas visões "
+"kanban."
 
 #. module: base_calendar
 #: code:addons/base_calendar/base_calendar.py:388
@@ -518,7 +522,7 @@ msgstr "Email"
 #. module: base_calendar
 #: model:ir.actions.server,name:base_calendar.actions_server_crm_meeting_unread
 msgid "CRM Meeting: Mark unread"
-msgstr ""
+msgstr "CRM Reunião : Marcar como não lida"
 
 #. module: base_calendar
 #: selection:calendar.alarm,state:0
@@ -1061,7 +1065,7 @@ msgstr "Intervalo"
 #. module: base_calendar
 #: model:ir.actions.server,name:base_calendar.actions_server_crm_meeting_read
 msgid "CRM Meeting: Mark read"
-msgstr ""
+msgstr "CRM Reunião: Marcar como lida"
 
 #. module: base_calendar
 #: selection:calendar.event,week_list:0
@@ -1173,7 +1177,7 @@ msgstr "Detalhes do Lembrete"
 #. module: base_calendar
 #: model:crm.meeting.type,name:base_calendar.categ_meet3
 msgid "Off-site Meeting"
-msgstr ""
+msgstr "Reunião Externa"
 
 #. module: base_calendar
 #: view:crm.meeting:0
diff --git a/addons/base_crypt/i18n/fr.po b/addons/base_crypt/i18n/fr.po
index 0b79cb416de..f22023e61bc 100644
--- a/addons/base_crypt/i18n/fr.po
+++ b/addons/base_crypt/i18n/fr.po
@@ -8,19 +8,19 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-12-03 16:03+0000\n"
-"PO-Revision-Date: 2011-02-15 15:37+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"PO-Revision-Date: 2012-12-07 10:31+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: 2012-12-04 05:53+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-08 04:59+0000\n"
+"X-Generator: Launchpad (build 16341)\n"
 
 #. module: base_crypt
 #: model:ir.model,name:base_crypt.model_res_users
 msgid "Users"
-msgstr ""
+msgstr "Utilisateurs"
 
 #, python-format
 #~ msgid "Error"
diff --git a/addons/base_crypt/i18n/ru.po b/addons/base_crypt/i18n/ru.po
index 084cc086f5f..9701a6ba556 100644
--- a/addons/base_crypt/i18n/ru.po
+++ b/addons/base_crypt/i18n/ru.po
@@ -8,19 +8,19 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-12-03 16:03+0000\n"
-"PO-Revision-Date: 2011-03-15 23:59+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"PO-Revision-Date: 2012-12-07 08:15+0000\n"
+"Last-Translator: Denis Karataev <dskarataev@gmail.com>\n"
 "Language-Team: Russian <ru@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:53+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-08 04:59+0000\n"
+"X-Generator: Launchpad (build 16341)\n"
 
 #. module: base_crypt
 #: model:ir.model,name:base_crypt.model_res_users
 msgid "Users"
-msgstr ""
+msgstr "Пользователи"
 
 #~ msgid "res.users"
 #~ msgstr "res.users"
diff --git a/addons/base_import/i18n/fr.po b/addons/base_import/i18n/fr.po
index 520af932a87..c851c081b58 100644
--- a/addons/base_import/i18n/fr.po
+++ b/addons/base_import/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: 2012-11-24 02:52+0000\n"
-"PO-Revision-Date: 2012-11-29 15:28+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"PO-Revision-Date: 2012-12-07 10:31+0000\n"
+"Last-Translator: Numérigraphe <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: 2012-11-30 05:08+0000\n"
-"X-Generator: Launchpad (build 16319)\n"
+"X-Launchpad-Export-Date: 2012-12-08 04:59+0000\n"
+"X-Generator: Launchpad (build 16341)\n"
 
 #. module: base_import
 #. openerp-web
@@ -1016,7 +1016,7 @@ msgstr ""
 #: code:addons/base_import/static/src/xml/import.xml:170
 #, python-format
 msgid "CSV file for Products"
-msgstr ""
+msgstr "Fichier CSV des articles"
 
 #. module: base_import
 #. openerp-web
diff --git a/addons/base_import/i18n/nb.po b/addons/base_import/i18n/nb.po
new file mode 100644
index 00000000000..415341ab9f2
--- /dev/null
+++ b/addons/base_import/i18n/nb.po
@@ -0,0 +1,1172 @@
+# Norwegian Bokmal translation for openobject-addons
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-11-24 02:52+0000\n"
+"PO-Revision-Date: 2012-12-07 10:50+0000\n"
+"Last-Translator: Kaare Pettersen <Unknown>\n"
+"Language-Team: Norwegian Bokmal <nb@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2012-12-08 04:59+0000\n"
+"X-Generator: Launchpad (build 16341)\n"
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/js/import.js:420
+#, python-format
+msgid "Get all possible values"
+msgstr "Få alle mulige verdier."
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:71
+#, python-format
+msgid "Need to import data from an other application?"
+msgstr "Behov for å importere data fra en annen applikasjon?"
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:163
+#, python-format
+msgid ""
+"When you use External IDs, you can import CSV files \n"
+"                        with the \"External ID\" column to define the "
+"External \n"
+"                        ID of each record you import. Then, you will be able "
+"\n"
+"                        to make a reference to that record with columns like "
+"\n"
+"                        \"Field/External ID\". The following two CSV files "
+"give \n"
+"                        you an example for Products and their Categories."
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:271
+#, python-format
+msgid ""
+"How to export/import different tables from an SQL \n"
+"                        application to OpenERP?"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/js/import.js:310
+#, python-format
+msgid "Relation Fields"
+msgstr "Forhold feltene."
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:142
+#, python-format
+msgid ""
+"Country/Database ID: the unique OpenERP ID for a \n"
+"                        record, defined by the ID postgresql column"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:155
+#, python-format
+msgid ""
+"Use \n"
+"                        Country/Database ID: You should rarely use this \n"
+"                        notation. It's mostly used by developers as it's "
+"main \n"
+"                        advantage is to never have conflicts (you may have \n"
+"                        several records with the same name, but they always "
+"\n"
+"                        have a unique Database ID)"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:146
+#, python-format
+msgid ""
+"For the country \n"
+"                        Belgium, you can use one of these 3 ways to import:"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:303
+#, python-format
+msgid "company_1,Bigees,True"
+msgstr "Selskapet_1,Bigees,Sant."
+
+#. module: base_import
+#: model:ir.model,name:base_import.model_base_import_tests_models_m2o
+msgid "base_import.tests.models.m2o"
+msgstr "Base_import_tester.modeller.m2o."
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:297
+#, python-format
+msgid ""
+"copy \n"
+"                        (select 'company_'||id as \"External "
+"ID\",company_name \n"
+"                        as \"Name\",'True' as \"Is a Company\" from "
+"companies) TO \n"
+"                        '/tmp/company.csv' with CSV HEADER;"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:206
+#, python-format
+msgid "CSV file for Manufacturer, Retailer"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:160
+#, python-format
+msgid ""
+"Use \n"
+"                        Country/External ID: Use External ID when you import "
+"\n"
+"                        data from a third party application."
+msgstr ""
+
+#. 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 ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:80
+#, python-format
+msgid "XXX/External ID"
+msgstr "XXX/Ekstern ID."
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:351
+#, python-format
+msgid "Don't Import"
+msgstr "Ikke importer."
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:24
+#, python-format
+msgid "Select the"
+msgstr "Velg."
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:100
+#, python-format
+msgid ""
+"Note that if your CSV file \n"
+"                        has a tabulation as separator, OpenERP will not \n"
+"                        detect the separations. You will need to change the "
+"\n"
+"                        file format options in your spreadsheet application. "
+"\n"
+"                        See the following question."
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:141
+#, python-format
+msgid "Country: the name or code of the country"
+msgstr "Land: Navnet eller koden for dette landet."
+
+#. module: base_import
+#: model:ir.model,name:base_import.model_base_import_tests_models_o2m_child
+msgid "base_import.tests.models.o2m.child"
+msgstr "Basen_import.tester.modeller.o2m.barn."
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:239
+#, python-format
+msgid "Can I import several times the same record?"
+msgstr "Kan jeg importere flere ganger fra den samme posten?"
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:15
+#, python-format
+msgid "Validate"
+msgstr "Valider."
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:55
+#, python-format
+msgid "Map your data to OpenERP"
+msgstr "Kartlegge dine data til OpenERP."
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:153
+#, python-format
+msgid ""
+"Use Country: This is \n"
+"                        the easiest way when your data come from CSV files \n"
+"                        that have been created manually."
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:127
+#, python-format
+msgid ""
+"What's the difference between Database ID and \n"
+"                        External ID?"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:138
+#, python-format
+msgid ""
+"For example, to \n"
+"                        reference the country of a contact, OpenERP proposes "
+"\n"
+"                        you 3 different fields to import:"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:175
+#, python-format
+msgid "What can I do if I have multiple matches for a field?"
+msgstr "Hva kan jeg gjøre hvis jeg har flere treff for et felt?"
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:302
+#, python-format
+msgid "External ID,Name,Is a Company"
+msgstr "Ekstern ID, navn, er et selskap."
+
+#. module: base_import
+#: field:base_import.tests.models.preview,somevalue:0
+msgid "Some Value"
+msgstr "Noen verdi."
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:231
+#, python-format
+msgid ""
+"The following CSV file shows how to import \n"
+"                        suppliers and their respective contacts"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:109
+#, python-format
+msgid ""
+"How can I change the CSV file format options when \n"
+"                        saving in my spreadsheet application?"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:320
+#, python-format
+msgid ""
+"As you can see in this file, Fabien and Laurence \n"
+"                        are working for the Bigees company (company_1) and \n"
+"                        Eric is working for the Organi company. The relation "
+"\n"
+"                        between persons and companies is done using the \n"
+"                        External ID of the companies. We had to prefix the \n"
+"                        \"External ID\" by the name of the table to avoid a "
+"\n"
+"                        conflict of ID between persons and companies "
+"(person_1 \n"
+"                        and company_1 who shared the same ID 1 in the "
+"orignial \n"
+"                        database)."
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:308
+#, python-format
+msgid ""
+"copy (select \n"
+"                        'person_'||id as \"External ID\",person_name as \n"
+"                        \"Name\",'False' as \"Is a "
+"Company\",'company_'||company_id\n"
+"                         as \"Related Company/External ID\" from persons) TO "
+"\n"
+"                        '/tmp/person.csv' with CSV"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:148
+#, python-format
+msgid "Country: Belgium"
+msgstr "Land: Belgia."
+
+#. module: base_import
+#: model:ir.model,name:base_import.model_base_import_tests_models_char_stillreadonly
+msgid "base_import.tests.models.char.stillreadonly"
+msgstr "Base_Import.tester.modeller.røye.fortsattlesebare."
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:314
+#, python-format
+msgid ""
+"External ID,Name,Is a \n"
+"                        Company,Related Company/External ID"
+msgstr ""
+"Ekstern ID, Navn, Er en\n"
+"Firma, Relatert firma/Ekstern ID."
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:233
+#, python-format
+msgid "Suppliers and their respective contacts"
+msgstr "Leverandører og deres respektive kontakter."
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:179
+#, python-format
+msgid ""
+"If for example you have two product categories \n"
+"                        with the child name \"Sellable\" (ie. \"Misc. \n"
+"                        Products/Sellable\" & \"Other Products/Sellable\"),\n"
+"                        your validation is halted but you may still import \n"
+"                        your data. However, we recommend you do not import "
+"the \n"
+"                        data because they will all be linked to the first \n"
+"                        'Sellable' category found in the Product Category "
+"list \n"
+"                        (\"Misc. Products/Sellable\"). We recommend you "
+"modify \n"
+"                        one of the duplicates' values or your product "
+"category \n"
+"                        hierarchy."
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:306
+#, python-format
+msgid ""
+"To create the CSV file for persons, linked to \n"
+"                        companies, we will use the following SQL command in "
+"\n"
+"                        PSQL:"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:119
+#, python-format
+msgid ""
+"Microsoft Excel will allow \n"
+"                        you to modify only the encoding when saving \n"
+"                        (in 'Save As' dialog box > click 'Tools' dropdown \n"
+"                        list > Encoding tab)."
+msgstr ""
+
+#. module: base_import
+#: field:base_import.tests.models.preview,othervalue:0
+msgid "Other Variable"
+msgstr "Annet variabel."
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:82
+#, python-format
+msgid ""
+"will also be used to update the original\n"
+"                        import if you need to re-import modified data\n"
+"                        later, it's thus good practice to specify it\n"
+"                        whenever possible"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:26
+#, python-format
+msgid ""
+"file to import. If you need a sample importable file, you\n"
+"            can use the export tool to generate one."
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:148
+#, python-format
+msgid ""
+"Country/Database \n"
+"                        ID: 21"
+msgstr ""
+"Land/database\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 "Base_import.tester.modeller.char."
+
+#. module: base_import
+#: help:base_import.import,file:0
+msgid "File to check and/or import, raw binary (not base64)"
+msgstr "Filen for å kontrollere og / eller import, rå binære (ikke base64."
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:230
+#, python-format
+msgid "Purchase orders with their respective purchase order lines"
+msgstr "Innkjøpsordrer med sine respektive kjøpsordre linjer."
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:60
+#, python-format
+msgid ""
+"If the file contains\n"
+"                the column names, OpenERP can try auto-detecting the\n"
+"                field corresponding to the column. This makes imports\n"
+"                simpler especially when the file has many columns."
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:26
+#, python-format
+msgid ".CSV"
+msgstr ".CSV"
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:360
+#, python-format
+msgid ""
+". The issue is\n"
+"            usually an incorrect file encoding."
+msgstr ""
+". Problemet er\n"
+"vanligvis en feil fil koding."
+
+#. module: base_import
+#: model:ir.model,name:base_import.model_base_import_tests_models_m2o_required
+msgid "base_import.tests.models.m2o.required"
+msgstr "Base_import.tester.modeller.m2o.påkrevd."
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:212
+#, python-format
+msgid ""
+"How can I import a one2many relationship (e.g. several \n"
+"                        Order Lines of a Sale Order)?"
+msgstr ""
+
+#. module: base_import
+#: model:ir.model,name:base_import.model_base_import_tests_models_char_noreadonly
+msgid "base_import.tests.models.char.noreadonly"
+msgstr "Base_import.tester.modeller.char.ikkelesebare."
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:113
+#, python-format
+msgid ""
+"If you edit and save CSV files in speadsheet \n"
+"                        applications, your computer's regional settings will "
+"\n"
+"                        be applied for the separator and delimiter. \n"
+"                        We suggest you use OpenOffice or LibreOffice Calc \n"
+"                        as they will allow you to modify all three options \n"
+"                        (in 'Save As' dialog box > Check the box 'Edit "
+"filter \n"
+"                        settings' > Save)."
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:30
+#, python-format
+msgid "CSV File:"
+msgstr "CSV fil:"
+
+#. module: base_import
+#: model:ir.model,name:base_import.model_base_import_tests_models_preview
+msgid "base_import.tests.models.preview"
+msgstr "Base_import.tester.modeller.forhåndsvisning."
+
+#. module: base_import
+#: model:ir.model,name:base_import.model_base_import_tests_models_char_required
+msgid "base_import.tests.models.char.required"
+msgstr "Base_import.tester.modeller.char.påkrevd."
+
+#. module: base_import
+#: code:addons/base_import/models.py:112
+#, python-format
+msgid "Database ID"
+msgstr "Database 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 "Det vil produsere følgende CSV-filen:"
+
+#. 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 "Her er starten på filen vi ikke kunne importere:"
+
+#. module: base_import
+#: field:base_import.import,file_type:0
+msgid "File Type"
+msgstr "Fil type."
+
+#. module: base_import
+#: model:ir.model,name:base_import.model_base_import_import
+msgid "base_import.import"
+msgstr "Base_Import.Import."
+
+#. module: base_import
+#: model:ir.model,name:base_import.model_base_import_tests_models_o2m
+msgid "base_import.tests.models.o2m"
+msgstr "Base_import.tester.modeller.o2m"
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:360
+#, python-format
+msgid "Import preview failed due to:"
+msgstr "Import forhåndsvisning mislyktes på grunn av:"
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:144
+#, python-format
+msgid ""
+"Country/External ID: the ID of this record \n"
+"                        referenced in another application (or the .XML file "
+"\n"
+"                        that imported it)"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:35
+#, python-format
+msgid "Reload data to check changes."
+msgstr "Lad data til å sjekke endringer."
+
+#. module: base_import
+#: model:ir.model,name:base_import.model_base_import_tests_models_char_readonly
+msgid "base_import.tests.models.char.readonly"
+msgstr "Base_import.tester.modeller.char.lesbare."
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:131
+#, python-format
+msgid ""
+"Some fields define a relationship with another \n"
+"                        object. For example, the country of a contact is a \n"
+"                        link to a record of the 'Country' object. When you \n"
+"                        want to import such fields, OpenERP will have to \n"
+"                        recreate links between the different records. \n"
+"                        To help you import such fields, OpenERP provides 3 \n"
+"                        mechanisms. You must use one and only one mechanism "
+"\n"
+"                        per field you want to import."
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:201
+#, python-format
+msgid ""
+"The tags should be separated by a comma without any \n"
+"                        spacing. For example, if you want you customer to be "
+"\n"
+"                        lined to both tags 'Manufacturer' and 'Retailer' \n"
+"                        then you will encode it as follow \"Manufacturer,\n"
+"                        Retailer\" in the same column of your CSV file."
+msgstr ""
+
+#. module: base_import
+#: code:addons/base_import/models.py:264
+#, python-format
+msgid "You must configure at least one field to import"
+msgstr "Du må konfigurere minst ett felt for å importere."
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:304
+#, python-format
+msgid "company_2,Organi,True"
+msgstr "Firma_2,organisasjon,sant."
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:58
+#, python-format
+msgid ""
+"The first row of the\n"
+"                file contains the label of the column"
+msgstr ""
+"den første raden av\n"
+"filen inneholder etiketten av kolonnen."
+
+#. module: base_import
+#: model:ir.model,name:base_import.model_base_import_tests_models_char_states
+msgid "base_import.tests.models.char.states"
+msgstr "Base_import.tester.modeller.char.stater."
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:7
+#, python-format
+msgid "Import a CSV File"
+msgstr "Importer en CSV fil."
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/js/import.js:74
+#, python-format
+msgid "Quoting:"
+msgstr "Siterer:"
+
+#. 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 "Base_import.tester.modeller.m2o.påkrevd.relatert."
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:293
+#, python-format
+msgid ")."
+msgstr ")."
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:18
+#: code:addons/base_import/static/src/xml/import.xml:396
+#, python-format
+msgid "Import"
+msgstr "Importer."
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/js/import.js:407
+#, python-format
+msgid "Here are the possible values:"
+msgstr "Her er de mulige verdiene."
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:82
+#, python-format
+msgid "The"
+msgstr "Den."
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/js/import.js:227
+#, python-format
+msgid ""
+"A single column was found in the file, this often means the file separator "
+"is incorrect"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:293
+#, python-format
+msgid "dump of such a PostgreSQL database"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:301
+#, python-format
+msgid "This SQL command will create the following CSV file:"
+msgstr "Dette SQL-kommandoen vil skape følgende CSV-filen:"
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:228
+#, python-format
+msgid ""
+"The following CSV file shows how to import purchase \n"
+"                        orders with their respective purchase order lines:"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:91
+#, python-format
+msgid ""
+"What can I do when the Import preview table isn't \n"
+"                        displayed correctly?"
+msgstr ""
+
+#. module: base_import
+#: field:base_import.tests.models.char,value:0
+#: field:base_import.tests.models.char.noreadonly,value:0
+#: field:base_import.tests.models.char.readonly,value:0
+#: field:base_import.tests.models.char.required,value:0
+#: field:base_import.tests.models.char.states,value:0
+#: field:base_import.tests.models.char.stillreadonly,value:0
+#: field:base_import.tests.models.m2o,value:0
+#: field:base_import.tests.models.m2o.related,value:0
+#: field:base_import.tests.models.m2o.required,value:0
+#: field:base_import.tests.models.m2o.required.related,value:0
+#: field:base_import.tests.models.o2m,value:0
+#: field:base_import.tests.models.o2m.child,parent_id:0
+#: field:base_import.tests.models.o2m.child,value:0
+msgid "unknown"
+msgstr "Ukjent."
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:317
+#, python-format
+msgid "person_2,Laurence,False,company_1"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:149
+#, python-format
+msgid "Country/External ID: base.be"
+msgstr "Land/Ekstern ID: Base.være."
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:288
+#, python-format
+msgid ""
+"As an example, suppose you have a SQL database \n"
+"                        with two tables you want to import: companies and \n"
+"                        persons. Each person belong to one company, so you \n"
+"                        will have to recreate the link between a person and "
+"\n"
+"                        the company he work for. (If you want to test this \n"
+"                        example, here is a"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/js/import.js:396
+#, python-format
+msgid "(%d more)"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:227
+#, python-format
+msgid "File for some Quotations"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/js/import.js:72
+#, python-format
+msgid "Encoding:"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:280
+#, python-format
+msgid ""
+"To manage relations between tables, \n"
+"                        you can use the \"External ID\" facilities of "
+"OpenERP. \n"
+"                        The \"External ID\" of a record is the unique "
+"identifier \n"
+"                        of this record in another application. This "
+"\"External \n"
+"                        ID\" must be unique accoss all the records of all \n"
+"                        objects, so it's a good practice to prefix this \n"
+"                        \"External ID\" with the name of the application or "
+"\n"
+"                        table. (like 'company_1', 'person_1' instead of '1')"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:295
+#, python-format
+msgid ""
+"We will first export all companies and their \n"
+"                        \"External ID\". In PSQL, write the following "
+"command:"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/js/import.js:373
+#, python-format
+msgid "Everything seems valid."
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:188
+#, python-format
+msgid ""
+"However if you do not wish to change your \n"
+"                        configuration of product categories, we recommend "
+"you \n"
+"                        use make use of the external ID for this field \n"
+"                        'Category'."
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/js/import.js:390
+#, python-format
+msgid "at row %d"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:197
+#, python-format
+msgid ""
+"How can I import a many2many relationship field \n"
+"                        (e.g. a customer that has multiple tags)?"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:80
+#, python-format
+msgid "XXX/ID"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:275
+#, python-format
+msgid ""
+"If you need to import data from different tables, \n"
+"                        you will have to recreate relations between records "
+"\n"
+"                        belonging to different tables. (e.g. if you import \n"
+"                        companies and persons, you will have to recreate the "
+"\n"
+"                        link between each person and the company they work \n"
+"                        for)."
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:150
+#, python-format
+msgid ""
+"According to your need, you should use \n"
+"                        one of these 3 ways to reference records in "
+"relations. \n"
+"                        Here is when you should use one or the other, \n"
+"                        according to your need:"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:319
+#, python-format
+msgid "person_4,Ramsy,False,company_3"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:261
+#, python-format
+msgid ""
+"If you do not set all fields in your CSV file, \n"
+"                        OpenERP will assign the default value for every non "
+"\n"
+"                        defined fields. But if you\n"
+"                        set fields with empty values in your CSV file, "
+"OpenERP \n"
+"                        will set the EMPTY value in the field, instead of \n"
+"                        assigning the default value."
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:20
+#, python-format
+msgid "Cancel"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:257
+#, python-format
+msgid ""
+"What happens if I do not provide a value for a \n"
+"                        specific field?"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:68
+#, python-format
+msgid "Frequently Asked Questions"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:305
+#, python-format
+msgid "company_3,Boum,True"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:249
+#, python-format
+msgid ""
+"This feature \n"
+"                        allows you to use the Import/Export tool of OpenERP "
+"to \n"
+"                        modify a batch of records in your favorite "
+"spreadsheet \n"
+"                        application."
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:77
+#, python-format
+msgid ""
+"column in OpenERP. When you\n"
+"                        import an other record that links to the first\n"
+"                        one, use"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:242
+#, python-format
+msgid ""
+"If you import a file that contains one of the \n"
+"                        column \"External ID\" or \"Database ID\", records "
+"that \n"
+"                        have already been imported will be modified instead "
+"of \n"
+"                        being created. This is very usefull as it allows you "
+"\n"
+"                        to import several times the same CSV file while "
+"having \n"
+"                        made some changes in between two imports. OpenERP "
+"will \n"
+"                        take care of creating or modifying each record \n"
+"                        depending if it's new or not."
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:169
+#, python-format
+msgid "CSV file for categories"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/js/import.js:309
+#, python-format
+msgid "Normal Fields"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:74
+#, python-format
+msgid ""
+"In order to re-create relationships between\n"
+"                        different records, you should use the unique\n"
+"                        identifier from the original application and\n"
+"                        map it to the"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:170
+#, python-format
+msgid "CSV file for Products"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:216
+#, python-format
+msgid ""
+"If you want to import sales order having several \n"
+"                        order lines; for each order line, you need to "
+"reserve \n"
+"                        a specific row in the CSV file. The first order line "
+"\n"
+"                        will be imported on the same row as the information "
+"\n"
+"                        relative to order. Any additional lines will need an "
+"\n"
+"                        addtional row that does not have any information in "
+"\n"
+"                        the fields relative to the order."
+msgstr ""
+
+#. module: base_import
+#: model:ir.model,name:base_import.model_base_import_tests_models_m2o_related
+msgid "base_import.tests.models.m2o.related"
+msgstr ""
+
+#. module: base_import
+#: field:base_import.tests.models.preview,name:0
+msgid "Name"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:80
+#, python-format
+msgid "to the original unique identifier."
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:318
+#, python-format
+msgid "person_3,Eric,False,company_2"
+msgstr ""
+
+#. module: base_import
+#: field:base_import.import,res_model:0
+msgid "Model"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:77
+#: code:addons/base_import/static/src/xml/import.xml:82
+#, python-format
+msgid "ID"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:329
+#, python-format
+msgid ""
+"The two files produced are ready to be imported in \n"
+"                        OpenERP without any modifications. After having \n"
+"                        imported these two CSV files, you will have 4 "
+"contacts \n"
+"                        and 3 companies. (the firsts two contacts are linked "
+"\n"
+"                        to the first company). You must first import the \n"
+"                        companies and then the persons."
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:95
+#, python-format
+msgid ""
+"By default the Import preview is set on commas as \n"
+"                        field separators and quotation marks as text \n"
+"                        delimiters. If your csv file does not have these \n"
+"                        settings, you can modify the File Format Options \n"
+"                        (displayed under the Browse CSV file bar after you \n"
+"                        select your file)."
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/js/import.js:73
+#, python-format
+msgid "Separator:"
+msgstr ""
+
+#. module: base_import
+#: field:base_import.import,file_name:0
+msgid "File Name"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/models.py:80
+#: code:addons/base_import/models.py:111
+#: code:addons/base_import/static/src/xml/import.xml:77
+#: code:addons/base_import/static/src/xml/import.xml:82
+#, python-format
+msgid "External ID"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:39
+#, python-format
+msgid "File Format Options…"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/js/import.js:392
+#, python-format
+msgid "between rows %d and %d"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:19
+#, python-format
+msgid "or"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:223
+#, python-format
+msgid ""
+"As an example, here is \n"
+"                        purchase.order_functional_error_line_cant_adpat.CSV "
+"\n"
+"                        file of some quotations you can import, based on "
+"demo \n"
+"                        data."
+msgstr ""
+
+#. module: base_import
+#: field:base_import.import,file:0
+msgid "File"
+msgstr ""
diff --git a/addons/base_setup/i18n/fr.po b/addons/base_setup/i18n/fr.po
index bbfaae1ef10..23520b8dc12 100644
--- a/addons/base_setup/i18n/fr.po
+++ b/addons/base_setup/i18n/fr.po
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2012-11-24 02:52+0000\n"
-"PO-Revision-Date: 2012-12-04 10:03+0000\n"
+"PO-Revision-Date: 2012-12-07 10:32+0000\n"
 "Last-Translator: WANTELLET Sylvain <Swantellet@tetra-info.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-05 05:19+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-08 04:58+0000\n"
+"X-Generator: Launchpad (build 16341)\n"
 
 #. module: base_setup
 #: view:sale.config.settings:0
@@ -63,12 +63,12 @@ msgstr "Membre"
 #. module: base_setup
 #: view:base.config.settings:0
 msgid "Portal access"
-msgstr ""
+msgstr "Accès au portail"
 
 #. module: base_setup
 #: view:base.config.settings:0
 msgid "Authentication"
-msgstr ""
+msgstr "Authentification"
 
 #. module: base_setup
 #: view:sale.config.settings:0
@@ -80,7 +80,7 @@ msgstr "Devis et bons de commande"
 #: model:ir.actions.act_window,name:base_setup.action_general_configuration
 #: model:ir.ui.menu,name:base_setup.menu_general_configuration
 msgid "General Settings"
-msgstr ""
+msgstr "Paramètres généraux"
 
 #. module: base_setup
 #: selection:base.setup.terminology,partner:0
@@ -95,7 +95,7 @@ msgstr ""
 #. module: base_setup
 #: field:sale.config.settings,module_crm:0
 msgid "CRM"
-msgstr ""
+msgstr "CRM"
 
 #. module: base_setup
 #: selection:base.setup.terminology,partner:0
@@ -125,7 +125,7 @@ msgstr ""
 #. module: base_setup
 #: field:sale.config.settings,module_web_linkedin:0
 msgid "Get contacts automatically from linkedIn"
-msgstr ""
+msgstr "Récupérer les contacts automatiquement de LinkedIn"
 
 #. module: base_setup
 #: field:sale.config.settings,module_plugin_thunderbird:0
@@ -145,7 +145,7 @@ msgstr ""
 #. module: base_setup
 #: view:base.config.settings:0
 msgid "Import / Export"
-msgstr ""
+msgstr "Import / Export"
 
 #. module: base_setup
 #: view:sale.config.settings:0
diff --git a/addons/crm_claim/i18n/pt_BR.po b/addons/crm_claim/i18n/pt_BR.po
index f3d7fdc7395..30cd4e9f304 100644
--- a/addons/crm_claim/i18n/pt_BR.po
+++ b/addons/crm_claim/i18n/pt_BR.po
@@ -8,14 +8,15 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-12-03 16:03+0000\n"
-"PO-Revision-Date: 2012-02-16 01:30+0000\n"
-"Last-Translator: Gustavo T <Unknown>\n"
+"PO-Revision-Date: 2012-12-07 22:40+0000\n"
+"Last-Translator: Fábio Martinelli - http://zupy.com.br "
+"<webmaster@guaru.net>\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: 2012-12-04 05:49+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-08 04:59+0000\n"
+"X-Generator: Launchpad (build 16341)\n"
 
 #. module: crm_claim
 #: help:crm.claim.stage,fold:0
@@ -23,6 +24,8 @@ msgid ""
 "This stage is not visible, for example in status bar or kanban view, when "
 "there are no records in that stage to display."
 msgstr ""
+"Este estágio não é visível, por exemplo na barra de status ou visão kanban, "
+"quando não há registros definidos no mesmo para visualizar."
 
 #. module: crm_claim
 #: field:crm.claim.report,nbr:0
@@ -46,11 +49,13 @@ msgid ""
 "Allows you to configure your incoming mail server, and create claims from "
 "incoming emails."
 msgstr ""
+"Permite configurar o servidor de e-mails recebidos, e criar solicitações a "
+"partir de e-mails recebidos."
 
 #. module: crm_claim
 #: model:ir.model,name:crm_claim.model_crm_claim_stage
 msgid "Claim stages"
-msgstr ""
+msgstr "Estágios de Solicitações"
 
 #. module: crm_claim
 #: selection:crm.claim.report,month:0
@@ -65,7 +70,7 @@ msgstr "Adiar o fechamento"
 #. module: crm_claim
 #: field:crm.claim,message_unread:0
 msgid "Unread Messages"
-msgstr ""
+msgstr "Mensagens não lidas"
 
 #. module: crm_claim
 #: field:crm.claim,resolution:0
@@ -91,6 +96,15 @@ msgid ""
 "              </p>\n"
 "            "
 msgstr ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Clique para criar uma categoria de solicitação.\n"
+"              </p><p>\n"
+"                Crie categorias de solicitações para melhor gerenciar e "
+"classificar as solicitações,\n"
+"                Alguns exemplos de solicitações podem ser: ação preventiva, "
+"ação corretiva.\n"
+"              </p>\n"
+"            "
 
 #. module: crm_claim
 #: view:crm.claim.report:0
@@ -100,7 +114,7 @@ msgstr "Nº da Solicitação"
 #. module: crm_claim
 #: field:crm.claim.stage,name:0
 msgid "Stage Name"
-msgstr ""
+msgstr "Nome do Estágio"
 
 #. module: crm_claim
 #: model:ir.actions.act_window,help:crm_claim.action_report_crm_claim
@@ -114,7 +128,7 @@ msgstr ""
 #. module: crm_claim
 #: view:crm.claim.report:0
 msgid "Salesperson"
-msgstr ""
+msgstr "Vendedor"
 
 #. module: crm_claim
 #: selection:crm.claim,priority:0
@@ -158,7 +172,7 @@ msgstr "Preventiva"
 #. module: crm_claim
 #: help:crm.claim,message_unread:0
 msgid "If checked new messages require your attention."
-msgstr ""
+msgstr "Se marcado novas mensagens solicitarão sua atenção."
 
 #. module: crm_claim
 #: field:crm.claim.report,date_closed:0
@@ -168,7 +182,7 @@ msgstr "Data de Fechamento"
 #. module: crm_claim
 #: view:res.partner:0
 msgid "False"
-msgstr ""
+msgstr "Falso"
 
 #. module: crm_claim
 #: field:crm.claim,ref:0
@@ -191,6 +205,9 @@ msgid ""
 "Holds the Chatter summary (number of messages, ...). This summary is "
 "directly in html format in order to be inserted in kanban views."
 msgstr ""
+"Contém o resumo da conversação (número de mensagens, ...). Este resumo é "
+"gerado diretamente em formato HTML para que possa ser inserido nas visões "
+"kanban."
 
 #. module: crm_claim
 #: view:crm.claim:0
@@ -249,12 +266,12 @@ msgstr "Prioridade"
 #. module: crm_claim
 #: field:crm.claim.stage,fold:0
 msgid "Hide in Views when Empty"
-msgstr ""
+msgstr "Ocultar nas visões quando estiver vazio"
 
 #. module: crm_claim
 #: field:crm.claim,message_follower_ids:0
 msgid "Followers"
-msgstr ""
+msgstr "Seguidores"
 
 #. module: crm_claim
 #: view:crm.claim:0
@@ -268,7 +285,7 @@ msgstr "Nova"
 #. module: crm_claim
 #: field:crm.claim.stage,section_ids:0
 msgid "Sections"
-msgstr ""
+msgstr "Seções"
 
 #. module: crm_claim
 #: field:crm.claim,email_from:0
@@ -304,7 +321,7 @@ msgstr "Assunto da Solicitação"
 #. module: crm_claim
 #: model:crm.claim.stage,name:crm_claim.stage_claim3
 msgid "Rejected"
-msgstr ""
+msgstr "Rejeitada"
 
 #. module: crm_claim
 #: field:crm.claim,date_action_next:0
@@ -315,7 +332,7 @@ msgstr "Data da próxima ação"
 #: code:addons/crm_claim/crm_claim.py:243
 #, python-format
 msgid "Claim has been <b>created</b>."
-msgstr ""
+msgstr "A solicitação foi <b>criada</b>."
 
 #. module: crm_claim
 #: selection:crm.claim.report,month:0
@@ -349,13 +366,13 @@ msgstr "Datas"
 #. module: crm_claim
 #: help:crm.claim,email_from:0
 msgid "Destination email for email gateway."
-msgstr ""
+msgstr "Email de destino para o servidor de email."
 
 #. module: crm_claim
 #: code:addons/crm_claim/crm_claim.py:199
 #, python-format
 msgid "No Subject"
-msgstr ""
+msgstr "Sem Assunto"
 
 #. module: crm_claim
 #: help:crm.claim.stage,state:0
@@ -365,11 +382,15 @@ msgid ""
 "is related to the status 'Close', when your document reaches this stage, it "
 "will be automatically have the 'closed' status."
 msgstr ""
+"O estado relacionado para o estágio. A situação do documento muda "
+"automaticamente em relação à fase selecionada. Por exemplo, se uma etapa "
+"está relacionada ao \"Fechamento\", quando o documento chega a esta fase, "
+"ficará automaticamente com a situação de 'fechado'."
 
 #. module: crm_claim
 #: view:crm.claim:0
 msgid "Settle"
-msgstr ""
+msgstr "Resolução"
 
 #. module: crm_claim
 #: model:ir.ui.menu,name:crm_claim.menu_claim_stage_view
@@ -395,7 +416,7 @@ msgstr "Relatório de Solicitações no CRM"
 #. module: crm_claim
 #: view:sale.config.settings:0
 msgid "Configure"
-msgstr ""
+msgstr "Configurar"
 
 #. module: crm_claim
 #: model:crm.case.resource.type,name:crm_claim.type_claim1
@@ -441,6 +462,8 @@ msgid ""
 "If you check this field, this stage will be proposed by default on each "
 "sales team. It will not assign this stage to existing teams."
 msgstr ""
+"Se você marcar este campo, esta etapa será proposta por padrão em cada "
+"equipe de vendas. Não irá atribuir esta fase às equipes já existentes."
 
 #. module: crm_claim
 #: field:crm.claim,categ_id:0
@@ -497,7 +520,7 @@ msgstr "Fechada"
 #. module: crm_claim
 #: view:crm.claim:0
 msgid "Reject"
-msgstr ""
+msgstr "Rejeitar"
 
 #. module: crm_claim
 #: view:res.partner:0
@@ -507,7 +530,7 @@ msgstr "Solicitações de Parceiros"
 #. module: crm_claim
 #: view:crm.claim.stage:0
 msgid "Claim Stage"
-msgstr ""
+msgstr "Estágio da Solicitação"
 
 #. module: crm_claim
 #: view:crm.claim:0
@@ -525,7 +548,7 @@ msgstr "Pendente"
 #: field:crm.claim.report,state:0
 #: field:crm.claim.stage,state:0
 msgid "Status"
-msgstr ""
+msgstr "Situação"
 
 #. module: crm_claim
 #: selection:crm.claim.report,month:0
@@ -541,7 +564,7 @@ msgstr "Normal"
 #. module: crm_claim
 #: help:crm.claim.stage,sequence:0
 msgid "Used to order stages. Lower is better."
-msgstr ""
+msgstr "Usado para ordenar estágios. Mais baixo é melhor."
 
 #. module: crm_claim
 #: selection:crm.claim.report,month:0
@@ -561,7 +584,7 @@ msgstr "Telefone"
 #. module: crm_claim
 #: field:crm.claim,message_is_follower:0
 msgid "Is a Follower"
-msgstr ""
+msgstr "É um Seguidor"
 
 #. module: crm_claim
 #: field:crm.claim.report,user_id:0
@@ -583,6 +606,17 @@ msgid ""
 "              </p>\n"
 "            "
 msgstr ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Clique para configurar um novo estágio na resolução de "
+"solicitações. \n"
+"              </p><p>\n"
+"                Você pode criar estágios para categorizar a situação de "
+"cada\n"
+"                solicitação inserida no sistema. Os estágios definem todos "
+"os passos\n"
+"                necessários para resolver a solicitação.\n"
+"              </p>\n"
+"            "
 
 #. module: crm_claim
 #: help:crm.claim,state:0
@@ -593,6 +627,10 @@ msgid ""
 "the case needs to be reviewed then the status is                       set "
 "to 'Pending'."
 msgstr ""
+"A situação é definida como 'Provisória' quando o caso é criado. Se o caso "
+"está em progresso, a situação muda para 'Aberto'. Quando o caso termina, a "
+"situação é definida como 'Concluído'. Se o caso precisa ser revisado, a "
+"situação é definida como 'Pendente'."
 
 #. module: crm_claim
 #: field:crm.claim,active:0
@@ -613,7 +651,7 @@ msgstr "Filtros Extendidos..."
 #: field:crm.claim,message_comment_ids:0
 #: help:crm.claim,message_comment_ids:0
 msgid "Comments and emails"
-msgstr ""
+msgstr "Comentários e e-mails"
 
 #. module: crm_claim
 #: view:crm.claim:0
@@ -626,6 +664,8 @@ msgid ""
 "Responsible sales team. Define Responsible user and Email account for mail "
 "gateway."
 msgstr ""
+"Responsável da Equipe de Vendas. Definir o usuário e email para o servidor "
+"de emails."
 
 #. module: crm_claim
 #: selection:crm.claim.report,month:0
@@ -646,7 +686,7 @@ msgstr "Data da Solicitação"
 #. module: crm_claim
 #: field:crm.claim,message_summary:0
 msgid "Summary"
-msgstr ""
+msgstr "Resumo"
 
 #. module: crm_claim
 #: model:ir.actions.act_window,name:crm_claim.crm_claim_categ_action
@@ -656,7 +696,7 @@ msgstr "Categorias de Solicitações"
 #. module: crm_claim
 #: field:crm.claim.stage,case_default:0
 msgid "Common to All Teams"
-msgstr ""
+msgstr "Comum a Todas as Equipes"
 
 #. module: crm_claim
 #: view:crm.claim:0
@@ -695,7 +735,7 @@ msgstr "Solicitação"
 #. module: crm_claim
 #: view:crm.claim.report:0
 msgid "My Company"
-msgstr ""
+msgstr "Minha Empresa"
 
 #. module: crm_claim
 #: view:crm.claim.report:0
@@ -751,7 +791,7 @@ msgstr "Solicitações em aberto"
 #: code:addons/crm_claim/crm_claim.py:247
 #, python-format
 msgid "Claim has been <b>refused</b>."
-msgstr ""
+msgstr "A solicitação foi <b>recusada</b>."
 
 #. module: crm_claim
 #: field:crm.claim,cause:0
@@ -792,7 +832,7 @@ msgstr "Ações de Resolução"
 #. module: crm_claim
 #: field:crm.claim.stage,case_refused:0
 msgid "Refused stage"
-msgstr ""
+msgstr "Estágio Recusado"
 
 #. module: crm_claim
 #: model:ir.actions.act_window,help:crm_claim.crm_case_categ_claim0
@@ -818,7 +858,7 @@ msgstr "Nº de Emails"
 #: code:addons/crm_claim/crm_claim.py:253
 #, python-format
 msgid "Stage changed to <b>%s</b>."
-msgstr ""
+msgstr "Estágio alterado para <b>%s</b>."
 
 #. module: crm_claim
 #: view:crm.claim.report:0
@@ -833,7 +873,7 @@ msgstr "Fevereiro"
 #. module: crm_claim
 #: model:ir.model,name:crm_claim.model_sale_config_settings
 msgid "sale.config.settings"
-msgstr ""
+msgstr "sale.config.settings"
 
 #. module: crm_claim
 #: view:crm.claim.report:0
@@ -859,22 +899,22 @@ msgstr "Meu(s) Caso(s)"
 #. module: crm_claim
 #: model:crm.claim.stage,name:crm_claim.stage_claim2
 msgid "Settled"
-msgstr ""
+msgstr "Resolvido"
 
 #. module: crm_claim
 #: help:crm.claim,message_ids:0
 msgid "Messages and communication history"
-msgstr ""
+msgstr "Histórico de mensagens e comunicação"
 
 #. module: crm_claim
 #: field:sale.config.settings,fetchmail_claim:0
 msgid "Create claims from incoming mails"
-msgstr ""
+msgstr "Criar solicitações a partir de emails"
 
 #. module: crm_claim
 #: field:crm.claim.stage,sequence:0
 msgid "Sequence"
-msgstr ""
+msgstr "Seqüência"
 
 #. module: crm_claim
 #: view:crm.claim:0
@@ -909,11 +949,13 @@ msgid ""
 "Link between stages and sales teams. When set, this limitate the current "
 "stage to the selected sales teams."
 msgstr ""
+"Conexão entre estágios e equipes de vendas. Quando definido, ele limita o "
+"estágio atual às equipes de vendas selecionadas."
 
 #. module: crm_claim
 #: help:crm.claim.stage,case_refused:0
 msgid "Refused stages are specific stages for done."
-msgstr ""
+msgstr "Estágios de Recusados são específicos para concluídos."
 
 #~ msgid "Partner Contact"
 #~ msgstr "Contato do Parceiro"
diff --git a/addons/crm_helpdesk/i18n/pt_BR.po b/addons/crm_helpdesk/i18n/pt_BR.po
index 309261244c0..579e1536875 100644
--- a/addons/crm_helpdesk/i18n/pt_BR.po
+++ b/addons/crm_helpdesk/i18n/pt_BR.po
@@ -8,14 +8,15 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-11-24 02:52+0000\n"
-"PO-Revision-Date: 2012-02-16 01:24+0000\n"
-"Last-Translator: Gustavo T <Unknown>\n"
+"PO-Revision-Date: 2012-12-07 23:04+0000\n"
+"Last-Translator: Fábio Martinelli - http://zupy.com.br "
+"<webmaster@guaru.net>\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: 2012-11-25 06:28+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-08 04:59+0000\n"
+"X-Generator: Launchpad (build 16341)\n"
 
 #. module: crm_helpdesk
 #: field:crm.helpdesk.report,delay_close:0
@@ -31,7 +32,7 @@ msgstr "# de Casos"
 #: code:addons/crm_helpdesk/crm_helpdesk.py:152
 #, python-format
 msgid "Case has been <b>created</b>."
-msgstr ""
+msgstr "O caso foi <b>criado</b>."
 
 #. module: crm_helpdesk
 #: view:crm.helpdesk:0
@@ -42,7 +43,7 @@ msgstr "Agrupar Por..."
 #. module: crm_helpdesk
 #: help:crm.helpdesk,email_from:0
 msgid "Destination email for email gateway"
-msgstr ""
+msgstr "Email de destino para o servidor."
 
 #. module: crm_helpdesk
 #: selection:crm.helpdesk.report,month:0
@@ -52,7 +53,7 @@ msgstr "Março"
 #. module: crm_helpdesk
 #: field:crm.helpdesk,message_unread:0
 msgid "Unread Messages"
-msgstr ""
+msgstr "Mensagens não lidas"
 
 #. module: crm_helpdesk
 #: field:crm.helpdesk,company_id:0
@@ -69,7 +70,7 @@ msgstr "Emails dos Observadores"
 #. module: crm_helpdesk
 #: view:crm.helpdesk.report:0
 msgid "Salesperson"
-msgstr ""
+msgstr "Vendedor"
 
 #. module: crm_helpdesk
 #: selection:crm.helpdesk,priority:0
@@ -112,7 +113,7 @@ msgstr "Cancelado"
 #. module: crm_helpdesk
 #: help:crm.helpdesk,message_unread:0
 msgid "If checked new messages require your attention."
-msgstr ""
+msgstr "Se marcado novas mensagens solicitarão sua atenção."
 
 #. module: crm_helpdesk
 #: model:ir.actions.act_window,name:crm_helpdesk.action_report_crm_helpdesk
@@ -142,6 +143,9 @@ msgid ""
 "Holds the Chatter summary (number of messages, ...). This summary is "
 "directly in html format in order to be inserted in kanban views."
 msgstr ""
+"Contém o resumo da conversação (número de mensagens, ...). Este resumo é "
+"gerado diretamente em formato HTML para que possa ser inserido nas visões "
+"kanban."
 
 #. module: crm_helpdesk
 #: view:crm.helpdesk:0
@@ -182,7 +186,7 @@ msgstr "Prioridade"
 #. module: crm_helpdesk
 #: field:crm.helpdesk,message_follower_ids:0
 msgid "Followers"
-msgstr ""
+msgstr "Seguidores"
 
 #. module: crm_helpdesk
 #: view:crm.helpdesk:0
@@ -284,6 +288,8 @@ msgid ""
 "Helpdesk requests that are assigned to me or to one of the sale teams I "
 "manage"
 msgstr ""
+"Pedidos de helpdesk que são atribuídas a mim ou para uma das equipes de "
+"venda que eu administro"
 
 #. module: crm_helpdesk
 #: view:crm.helpdesk.report:0
@@ -406,7 +412,7 @@ msgstr "Pendente"
 #: view:crm.helpdesk.report:0
 #: field:crm.helpdesk.report,state:0
 msgid "Status"
-msgstr ""
+msgstr "Situação"
 
 #. module: crm_helpdesk
 #: selection:crm.helpdesk.report,month:0
@@ -451,6 +457,21 @@ msgid ""
 "              </p>\n"
 "            "
 msgstr ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Clique para criar um novo caso. \n"
+"              </p><p>\n"
+"                Helpdesk e Suporte permite que você acompanhe suas "
+"intervenções.\n"
+"              </p><p>\n"
+"                Use o Sistema de Casos do OpenERP para gerenciar suas "
+"atividades\n"
+"                de suporte. Casos podem ser conectados através de um email: "
+"novos\n"
+"                emails podem criar casos, cada um deles registra o histórico "
+"de\n"
+"                comunicação com o cliente.\n"
+"              </p>\n"
+"            "
 
 #. module: crm_helpdesk
 #: field:crm.helpdesk,planned_revenue:0
@@ -460,7 +481,7 @@ msgstr "Receita Planejada"
 #. module: crm_helpdesk
 #: field:crm.helpdesk,message_is_follower:0
 msgid "Is a Follower"
-msgstr ""
+msgstr "É um Seguidor"
 
 #. module: crm_helpdesk
 #: field:crm.helpdesk.report,user_id:0
@@ -491,7 +512,7 @@ msgstr "Pedidos de Chamados"
 #: field:crm.helpdesk,message_comment_ids:0
 #: help:crm.helpdesk,message_comment_ids:0
 msgid "Comments and emails"
-msgstr ""
+msgstr "Comentários e e-mails"
 
 #. module: crm_helpdesk
 #: help:crm.helpdesk,section_id:0
@@ -499,6 +520,8 @@ msgid ""
 "Responsible sales team. Define Responsible user and Email account for mail "
 "gateway."
 msgstr ""
+"Responsável da Equipe de Vendas. Definir o usuário e email para o servidor "
+"de emails."
 
 #. module: crm_helpdesk
 #: selection:crm.helpdesk.report,month:0
@@ -513,7 +536,7 @@ msgstr "Janeiro"
 #. module: crm_helpdesk
 #: field:crm.helpdesk,message_summary:0
 msgid "Summary"
-msgstr ""
+msgstr "Resumo"
 
 #. module: crm_helpdesk
 #: view:crm.helpdesk:0
@@ -529,7 +552,7 @@ msgstr "Diversos"
 #. module: crm_helpdesk
 #: view:crm.helpdesk.report:0
 msgid "My Company"
-msgstr ""
+msgstr "Minha Empresa"
 
 #. module: crm_helpdesk
 #: view:crm.helpdesk:0
@@ -674,11 +697,15 @@ msgid ""
 "        \n"
 "If the case needs to be reviewed then the status is set to 'Pending'."
 msgstr ""
+"A situação é definida como 'Provisório', quando o caso é criado.\n"
+"Se o caso está em andamento, a situação é definida como 'Aberto'.\n"
+"Quando o caso finaliza, a situação muda para 'Concluído'.\n"
+"Se o caso necessitar de revisão então a situação será 'Pendente\"."
 
 #. module: crm_helpdesk
 #: help:crm.helpdesk,message_ids:0
 msgid "Messages and communication history"
-msgstr ""
+msgstr "Histórico de mensagens e comunicação"
 
 #. module: crm_helpdesk
 #: model:ir.actions.act_window,help:crm_helpdesk.crm_helpdesk_categ_action
@@ -720,7 +747,7 @@ msgstr "Última Ação"
 #. module: crm_helpdesk
 #: view:crm.helpdesk:0
 msgid "Assigned to Me or My Sales Team(s)"
-msgstr ""
+msgstr "Associado a Mim ou a Minha Equipe de Vendas"
 
 #. module: crm_helpdesk
 #: field:crm.helpdesk,duration:0
diff --git a/addons/crm_profiling/i18n/pt_BR.po b/addons/crm_profiling/i18n/pt_BR.po
index 8936b3846c8..ae565f1fbdc 100644
--- a/addons/crm_profiling/i18n/pt_BR.po
+++ b/addons/crm_profiling/i18n/pt_BR.po
@@ -7,14 +7,15 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2012-12-03 16:03+0000\n"
-"PO-Revision-Date: 2012-05-10 17:19+0000\n"
-"Last-Translator: Adriano Prado <adrianojprado@hotmail.com>\n"
+"PO-Revision-Date: 2012-12-07 22:42+0000\n"
+"Last-Translator: Fábio Martinelli - http://zupy.com.br "
+"<webmaster@guaru.net>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:40+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-08 04:59+0000\n"
+"X-Generator: Launchpad (build 16341)\n"
 
 #. module: crm_profiling
 #: view:crm_profiling.questionnaire:0
@@ -151,7 +152,7 @@ msgstr "Use as Regras de Criação de Perfil"
 #. module: crm_profiling
 #: constraint:crm.segmentation:0
 msgid "Error ! You cannot create recursive profiles."
-msgstr ""
+msgstr "Erro! Você não pode criar perfis recursivos."
 
 #. module: crm_profiling
 #: field:crm.segmentation,answer_yes:0
@@ -200,7 +201,7 @@ msgstr "Salvar Dados"
 #. module: crm_profiling
 #: view:open.questionnaire:0
 msgid "or"
-msgstr ""
+msgstr "ou"
 
 #~ msgid ""
 #~ "The Object name must start with x_ and not contain any special character !"
diff --git a/addons/event_project/i18n/pt_BR.po b/addons/event_project/i18n/pt_BR.po
index 31e7bd93e6b..2e0168cb054 100644
--- a/addons/event_project/i18n/pt_BR.po
+++ b/addons/event_project/i18n/pt_BR.po
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2012-02-08 00:36+0000\n"
-"PO-Revision-Date: 2012-05-10 18:12+0000\n"
-"Last-Translator: Adriano Prado <adrianojprado@hotmail.com>\n"
+"PO-Revision-Date: 2012-12-07 19:29+0000\n"
+"Last-Translator: Cristiano Korndörfer <codigo.aberto@dorfer.com.br>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-10-30 05:20+0000\n"
-"X-Generator: Launchpad (build 16206)\n"
+"X-Launchpad-Export-Date: 2012-12-08 04:59+0000\n"
+"X-Generator: Launchpad (build 16341)\n"
 
 #. module: event_project
 #: model:ir.model,name:event_project.model_event_project
@@ -24,7 +24,7 @@ msgstr "Evento de Projeto"
 #. module: event_project
 #: field:event.project,date:0
 msgid "Date End"
-msgstr "Data de término"
+msgstr "Data de Término"
 
 #. module: event_project
 #: view:event.project:0
diff --git a/addons/event_sale/i18n/pt_BR.po b/addons/event_sale/i18n/pt_BR.po
new file mode 100644
index 00000000000..fd2ea6ffcfd
--- /dev/null
+++ b/addons/event_sale/i18n/pt_BR.po
@@ -0,0 +1,94 @@
+# Brazilian Portuguese translation for openobject-addons
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"PO-Revision-Date: 2012-12-07 19:28+0000\n"
+"Last-Translator: Cristiano Korndörfer <codigo.aberto@dorfer.com.br>\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: 2012-12-08 04:59+0000\n"
+"X-Generator: Launchpad (build 16341)\n"
+
+#. module: event_sale
+#: model:ir.model,name:event_sale.model_product_product
+msgid "Product"
+msgstr "Produto"
+
+#. module: event_sale
+#: help:product.product,event_ok:0
+msgid ""
+"Determine if a product needs to create automatically an event registration "
+"at the confirmation of a sale order line."
+msgstr ""
+"Determina se um produto precisa criar automaticamente um registro de evento "
+"na confirmação de uma linha de ordem de venda."
+
+#. module: event_sale
+#: help:sale.order.line,event_id:0
+msgid ""
+"Choose an event and it will automatically create a registration for this "
+"event."
+msgstr ""
+"Escolha um evento e será criado automaticamente um registro para ele."
+
+#. module: event_sale
+#: field:product.product,event_type_id:0
+msgid "Type of Event"
+msgstr "Tipo de Evento"
+
+#. module: event_sale
+#: model:event.event,name:event_sale.event_technical_training
+msgid "Technical training in Grand-Rosiere"
+msgstr "Treinamento técnico em Grand-Rosiere"
+
+#. module: event_sale
+#: help:product.product,event_type_id:0
+msgid ""
+"Filter the list of event on this category only, in the sale order lines"
+msgstr ""
+"Filtrar a lista de eventos somente desta categoria nas linhas de ordens de "
+"vendas"
+
+#. module: event_sale
+#: field:sale.order.line,event_ok:0
+msgid "event_ok"
+msgstr "event_ok"
+
+#. module: event_sale
+#: code:addons/event_sale/event_sale.py:88
+#, python-format
+msgid "The registration %s has been created from the Sale Order %s."
+msgstr "O registro %s foi criado pela Ordem de Venda %s."
+
+#. module: event_sale
+#: field:product.product,event_ok:0
+msgid "Event Subscription"
+msgstr "Assinatura de Evento"
+
+#. module: event_sale
+#: field:sale.order.line,event_type_id:0
+msgid "Event Type"
+msgstr "Tipo de Evento"
+
+#. module: event_sale
+#: model:product.template,name:event_sale.event_product_product_template
+msgid "Technical Training"
+msgstr "Treinamento Técnico"
+
+#. module: event_sale
+#: field:sale.order.line,event_id:0
+msgid "Event"
+msgstr "Evento"
+
+#. module: event_sale
+#: model:ir.model,name:event_sale.model_sale_order_line
+msgid "Sales Order Line"
+msgstr "Linha da Ordem de Vendas"
diff --git a/addons/google_base_account/i18n/pt_BR.po b/addons/google_base_account/i18n/pt_BR.po
index aa9303c93cf..617274741d6 100644
--- a/addons/google_base_account/i18n/pt_BR.po
+++ b/addons/google_base_account/i18n/pt_BR.po
@@ -8,14 +8,15 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-12-03 16:03+0000\n"
-"PO-Revision-Date: 2012-07-28 22:59+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"PO-Revision-Date: 2012-12-07 22:43+0000\n"
+"Last-Translator: Fábio Martinelli - http://zupy.com.br "
+"<webmaster@guaru.net>\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: 2012-12-04 05:54+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-08 04:59+0000\n"
+"X-Generator: Launchpad (build 16341)\n"
 
 #. module: google_base_account
 #: field:res.users,gmail_user:0
@@ -36,12 +37,12 @@ msgstr "Erro de importação dos contatos Google!"
 #. module: google_base_account
 #: model:ir.model,name:google_base_account.model_res_users
 msgid "Users"
-msgstr ""
+msgstr "Usuários"
 
 #. module: google_base_account
 #: view:google.login:0
 msgid "or"
-msgstr ""
+msgstr "ou"
 
 #. module: google_base_account
 #: view:google.login:0
@@ -57,7 +58,7 @@ msgstr "Senha do Google"
 #: code:addons/google_base_account/wizard/google_login.py:77
 #, python-format
 msgid "Error!"
-msgstr ""
+msgstr "Erro!"
 
 #. module: google_base_account
 #: view:res.users:0
@@ -67,13 +68,13 @@ msgstr "Conta do Google"
 #. module: google_base_account
 #: view:res.users:0
 msgid "Synchronization"
-msgstr ""
+msgstr "Sincronização"
 
 #. module: google_base_account
 #: code:addons/google_base_account/wizard/google_login.py:77
 #, python-format
 msgid "Authentication failed. Check the user and password."
-msgstr ""
+msgstr "Falha na Autenticação. Verifique o Nome de Usuário e Senha."
 
 #. module: google_base_account
 #: code:addons/google_base_account/wizard/google_login.py:29
@@ -93,7 +94,7 @@ msgstr "Contatos do Google"
 #. module: google_base_account
 #: view:google.login:0
 msgid "Cancel"
-msgstr ""
+msgstr "Cancelar"
 
 #. module: google_base_account
 #: field:google.login,user:0
diff --git a/addons/google_docs/i18n/pt_BR.po b/addons/google_docs/i18n/pt_BR.po
index d280f28bcba..f3cb6eda1b8 100644
--- a/addons/google_docs/i18n/pt_BR.po
+++ b/addons/google_docs/i18n/pt_BR.po
@@ -8,14 +8,15 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-11-24 02:52+0000\n"
-"PO-Revision-Date: 2012-12-04 13:17+0000\n"
-"Last-Translator: Cristiano Korndörfer <codigo.aberto@dorfer.com.br>\n"
+"PO-Revision-Date: 2012-12-07 22:47+0000\n"
+"Last-Translator: Fábio Martinelli - http://zupy.com.br "
+"<webmaster@guaru.net>\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: 2012-12-05 05:20+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-08 04:59+0000\n"
+"X-Generator: Launchpad (build 16341)\n"
 
 #. module: google_docs
 #: code:addons/google_docs/google_docs.py:136
@@ -198,6 +199,22 @@ msgid ""
 "`drawings:123456789`\n"
 "...\n"
 msgstr ""
+"\n"
+"Este é o ID do modelo de documento no Google. Você pode encontra-lo graças a "
+"essa URL: \n"
+"*para um documento de texto com uma url como "
+"`https://docs.google.com/a/openerp.com/document/d/123456789/edit`, o ID é "
+"`document:123456789`\n"
+"*para uma planilha com url como "
+"`https://docs.google.com/a/openerp.com/spreadsheet/ccc?key=123456789#gid=0`, "
+"o ID é `spreadsheet:123456789`\n"
+"*para uma apresentação (slide show) com url como "
+"`https://docs.google.com/a/openerp.com/presentation/d/123456789/edit#slide=id"
+".p`, o ID é `presentation:123456789`\n"
+"*para um documento de desenho com url como "
+"`https://docs.google.com/a/openerp.com/drawings/d/123456789/edit`, o ID é "
+"`drawings:123456789`\n"
+"...\n"
 
 #. module: google_docs
 #: model:ir.model,name:google_docs.model_ir_attachment
diff --git a/addons/marketing/i18n/pt_BR.po b/addons/marketing/i18n/pt_BR.po
index 9084c2b3348..d8732ad349b 100644
--- a/addons/marketing/i18n/pt_BR.po
+++ b/addons/marketing/i18n/pt_BR.po
@@ -8,19 +8,19 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-11-24 02:53+0000\n"
-"PO-Revision-Date: 2012-02-16 01:34+0000\n"
-"Last-Translator: Rafael Sales - http://www.tompast.com.br <Unknown>\n"
+"PO-Revision-Date: 2012-12-07 17:00+0000\n"
+"Last-Translator: Cristiano Korndörfer <codigo.aberto@dorfer.com.br>\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: 2012-11-25 06:25+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-08 04:59+0000\n"
+"X-Generator: Launchpad (build 16341)\n"
 
 #. module: marketing
 #: model:ir.model,name:marketing.model_marketing_config_settings
 msgid "marketing.config.settings"
-msgstr ""
+msgstr "marketing.config.settings"
 
 #. module: marketing
 #: help:marketing.config.settings,module_marketing_campaign_crm_demo:0
@@ -29,12 +29,15 @@ msgid ""
 "Campaigns.\n"
 "                This installs the module marketing_campaign_crm_demo."
 msgstr ""
+"Instala dados de demonstração como prospectos, campanhas e segmentos para "
+"Campanhas de Marketing.\n"
+"                O módulo marketing_campaign_crm_demo será instalado."
 
 #. module: marketing
 #: model:ir.actions.act_window,name:marketing.action_marketing_configuration
 #: view:marketing.config.settings:0
 msgid "Configure Marketing"
-msgstr ""
+msgstr "Configurar Marketing"
 
 #. module: marketing
 #: model:ir.ui.menu,name:marketing.menu_marketing_configuration
@@ -44,17 +47,17 @@ msgstr "Marketing"
 #. module: marketing
 #: field:marketing.config.settings,module_marketing_campaign:0
 msgid "Marketing campaigns"
-msgstr ""
+msgstr "Campanhas de marketing"
 
 #. module: marketing
 #: view:marketing.config.settings:0
 msgid "or"
-msgstr ""
+msgstr "ou"
 
 #. module: marketing
 #: view:marketing.config.settings:0
 msgid "Campaigns"
-msgstr ""
+msgstr "Campanhas"
 
 #. module: marketing
 #: model:res.groups,name:marketing.group_marketing_manager
@@ -69,7 +72,7 @@ msgstr "Usuário"
 #. module: marketing
 #: view:marketing.config.settings:0
 msgid "Campaigns Settings"
-msgstr ""
+msgstr "Configurações das Campanhas"
 
 #. module: marketing
 #: field:marketing.config.settings,module_crm_profiling:0
@@ -79,12 +82,12 @@ msgstr ""
 #. module: marketing
 #: view:marketing.config.settings:0
 msgid "Cancel"
-msgstr ""
+msgstr "Cancelar"
 
 #. module: marketing
 #: view:marketing.config.settings:0
 msgid "Apply"
-msgstr ""
+msgstr "Aplicar"
 
 #. module: marketing
 #: help:marketing.config.settings,module_marketing_campaign:0
@@ -94,6 +97,10 @@ msgid ""
 "CRM leads.\n"
 "                This installs the module marketing_campaign."
 msgstr ""
+"Fornece automação de prospectos através de campanhas de marketing.\n"
+"                As campanhas podem ser definidas em qualquer recurso, não "
+"somente nos prospectos.\n"
+"                O módulo marketing_campaign será instalado."
 
 #. module: marketing
 #: help:marketing.config.settings,module_crm_profiling:0
@@ -101,11 +108,13 @@ msgid ""
 "Allows users to perform segmentation within partners.\n"
 "                This installs the module crm_profiling."
 msgstr ""
+"Permite aos usuários realizar segmentação dos parceiros.\n"
+"                O módulo crm_profiling será instalado."
 
 #. module: marketing
 #: field:marketing.config.settings,module_marketing_campaign_crm_demo:0
 msgid "Demo data for marketing campaigns"
-msgstr ""
+msgstr "Dados de demonstração para campanhas de marketing"
 
 #~ msgid "Image"
 #~ msgstr "Imagem"
diff --git a/addons/portal_claim/i18n/pt_BR.po b/addons/portal_claim/i18n/pt_BR.po
index 2969563a759..9d31bfff9cb 100644
--- a/addons/portal_claim/i18n/pt_BR.po
+++ b/addons/portal_claim/i18n/pt_BR.po
@@ -8,13 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-11-24 02:53+0000\n"
-"PO-Revision-Date: 2012-12-06 13:10+0000\n"
-"Last-Translator: Cristiano Korndörfer <codigo.aberto@dorfer.com.br>\n"
+"PO-Revision-Date: 2012-12-07 22:52+0000\n"
+"Last-Translator: Fábio Martinelli - http://zupy.com.br "
+"<webmaster@guaru.net>\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: 2012-12-07 04:36+0000\n"
+"X-Launchpad-Export-Date: 2012-12-08 04:59+0000\n"
 "X-Generator: Launchpad (build 16341)\n"
 
 #. module: portal_claim
@@ -29,10 +30,10 @@ msgid ""
 "            "
 msgstr ""
 "<p class=\"oe_view_nocontent_create\">\n"
-"                Clique para registrar uma nova reclamação. \n"
+"                Clique para registrar uma nova solicitação. \n"
 "              </p><p>\n"
-"                Você pode acompanhar suas reclamações através deste menu e a "
-"ação\n"
+"                Você pode acompanhar suas solicitações através deste menu e "
+"a ação\n"
 "                que tomaremos.\n"
 "              </p>\n"
 "            "
@@ -41,4 +42,4 @@ msgstr ""
 #: model:ir.actions.act_window,name:portal_claim.crm_case_categ_claim0
 #: model:ir.ui.menu,name:portal_claim.portal_after_sales_claims
 msgid "Claims"
-msgstr "Reclamações"
+msgstr "Solicitações"
diff --git a/addons/portal_crm/i18n/pt_BR.po b/addons/portal_crm/i18n/pt_BR.po
index caeaab7de1c..fe132418635 100644
--- a/addons/portal_crm/i18n/pt_BR.po
+++ b/addons/portal_crm/i18n/pt_BR.po
@@ -8,14 +8,15 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-12-03 16:03+0000\n"
-"PO-Revision-Date: 2012-12-04 14:52+0000\n"
-"Last-Translator: Cristiano Korndörfer <codigo.aberto@dorfer.com.br>\n"
+"PO-Revision-Date: 2012-12-07 22:51+0000\n"
+"Last-Translator: Fábio Martinelli - http://zupy.com.br "
+"<webmaster@guaru.net>\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: 2012-12-05 05:20+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-08 04:59+0000\n"
+"X-Generator: Launchpad (build 16341)\n"
 
 #. module: portal_crm
 #: selection:portal_crm.crm_contact_us,type:0
@@ -527,6 +528,10 @@ msgid ""
 "set to 'Done'. If the case needs to be reviewed then the Status is  set to "
 "'Pending'."
 msgstr ""
+"A Situação é definida como 'Provisória' quando o caso é criado. Se o caso "
+"está em progresso, a Situação muda para 'Aberto'. Quando o caso termina, a "
+"Situação é definida como 'Concluído'. Se o caso precisa ser revisado, a "
+"Situação é definida como 'Pendente'."
 
 #. module: portal_crm
 #: help:portal_crm.crm_contact_us,message_ids:0
diff --git a/addons/purchase_double_validation/i18n/pt_BR.po b/addons/purchase_double_validation/i18n/pt_BR.po
index 8946c584996..e1cdaefbab0 100644
--- a/addons/purchase_double_validation/i18n/pt_BR.po
+++ b/addons/purchase_double_validation/i18n/pt_BR.po
@@ -8,46 +8,45 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-11-24 02:54+0000\n"
-"PO-Revision-Date: 2012-07-28 21:05+0000\n"
-"Last-Translator: Fábio Martinelli - http://zupy.com.br "
-"<webmaster@guaru.net>\n"
+"PO-Revision-Date: 2012-12-07 16:41+0000\n"
+"Last-Translator: Cristiano Korndörfer <codigo.aberto@dorfer.com.br>\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: 2012-11-25 06:31+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-08 04:59+0000\n"
+"X-Generator: Launchpad (build 16341)\n"
 
 #. module: purchase_double_validation
 #: model:ir.model,name:purchase_double_validation.model_purchase_config_settings
 msgid "purchase.config.settings"
-msgstr ""
+msgstr "purchase.config.settings"
 
 #. module: purchase_double_validation
 #: view:purchase.order:0
 msgid "Purchase orders which are not approved yet."
-msgstr ""
+msgstr "Pedidos de compra que ainda não foram aprovados"
 
 #. module: purchase_double_validation
 #: field:purchase.config.settings,limit_amount:0
 msgid "limit to require a second approval"
-msgstr ""
+msgstr "limitar para solicitar uma segunda aprovação"
 
 #. module: purchase_double_validation
 #: view:board.board:0
 #: model:ir.actions.act_window,name:purchase_double_validation.purchase_waiting
 msgid "Purchase Orders Waiting Approval"
-msgstr ""
+msgstr "Pedidos de Compra Aguardando Aprovação"
 
 #. module: purchase_double_validation
 #: view:purchase.order:0
 msgid "To Approve"
-msgstr ""
+msgstr "Para Aprovar"
 
 #. module: purchase_double_validation
 #: help:purchase.config.settings,limit_amount:0
 msgid "Amount after which validation of purchase is required."
-msgstr ""
+msgstr "Valor a partir do qual é solicitada validação da compra."
 
 #~ msgid "Configure Limit Amount for Purchase"
 #~ msgstr "Configura o Valor Limite para Compra"
diff --git a/addons/sale/i18n/es_AR.po b/addons/sale/i18n/es_AR.po
index d602a97bc3f..4b332db4bff 100644
--- a/addons/sale/i18n/es_AR.po
+++ b/addons/sale/i18n/es_AR.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.0_rc3\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2012-12-03 16:02+0000\n"
-"PO-Revision-Date: 2012-12-06 20:57+0000\n"
+"PO-Revision-Date: 2012-12-07 11:48+0000\n"
 "Last-Translator: Guillermo Bisheimer <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: 2012-12-07 04:35+0000\n"
+"X-Launchpad-Export-Date: 2012-12-08 04:59+0000\n"
 "X-Generator: Launchpad (build 16341)\n"
 
 #. module: sale
@@ -127,7 +127,7 @@ msgstr "# de cantidad"
 #. module: sale
 #: help:sale.config.settings,group_discount_per_so_line:0
 msgid "Allows you to apply some discount per sale order line."
-msgstr "Permite aplicar un descuento por cada línea de una orden de venta."
+msgstr "Permite aplicar un descuento a las líneas de una orden de venta."
 
 #. module: sale
 #: help:sale.config.settings,group_sale_pricelist:0
@@ -473,7 +473,7 @@ msgstr ""
 #. module: sale
 #: selection:sale.order,order_policy:0
 msgid "Before Delivery"
-msgstr ""
+msgstr "Antes del envío"
 
 #. module: sale
 #: code:addons/sale/sale.py:804
@@ -482,11 +482,13 @@ msgid ""
 "There is no Fiscal Position defined or Income category account defined for "
 "default properties of Product categories."
 msgstr ""
+"No hay una posición fiscal o cuenta de ingresos definida para las "
+"propiedades por defecto de las categorías de producto."
 
 #. module: sale
 #: model:res.groups,name:sale.group_delivery_invoice_address
 msgid "Addresses in Sale Orders"
-msgstr ""
+msgstr "Direcciones en órdenes de venta"
 
 #. module: sale
 #: field:sale.order,project_id:0
@@ -496,12 +498,12 @@ msgstr ""
 #. module: sale
 #: model:res.groups,name:sale.group_invoice_so_lines
 msgid "Enable Invoicing Sale order lines"
-msgstr ""
+msgstr "Habilitar facturación de líneas de ordenes de venta"
 
 #. module: sale
 #: view:sale.report:0
 msgid "Ordered month of the sales order"
-msgstr ""
+msgstr "Pedidos de venta ordenados por meses"
 
 #. module: sale
 #: code:addons/sale/sale.py:496
@@ -509,13 +511,14 @@ msgstr ""
 msgid ""
 "You cannot group sales having different currencies for the same partner."
 msgstr ""
+"No puede agrupar ventas con diferentes monedas para el mismo cliente."
 
 #. module: sale
 #: view:sale.advance.payment.inv:0
 #: view:sale.make.invoice:0
 #: view:sale.order.line.make.invoice:0
 msgid "or"
-msgstr ""
+msgstr "o"
 
 #. module: sale
 #: field:sale.order,invoiced_rate:0
@@ -526,12 +529,12 @@ msgstr "Facturada"
 #. module: sale
 #: model:res.groups,name:sale.group_analytic_accounting
 msgid "Analytic Accounting for Sales"
-msgstr ""
+msgstr "Cuenta analítica para las ventas"
 
 #. module: sale
 #: field:sale.order,date_confirm:0
 msgid "Confirmation Date"
-msgstr ""
+msgstr "Fecha de confirmación"
 
 #. module: sale
 #: field:sale.order.line,address_allotment_id:0
@@ -541,22 +544,22 @@ msgstr "Partner de Distribución"
 #. module: sale
 #: model:ir.actions.act_window,name:sale.action_view_sale_advance_payment_inv
 msgid "Invoice Order"
-msgstr ""
+msgstr "Facturar orden"
 
 #. module: sale
 #: selection:sale.report,month:0
 msgid "March"
-msgstr ""
+msgstr "Marzo"
 
 #. module: sale
 #: model:ir.actions.server,name:sale.actions_server_sale_order_read
 msgid "Sale: Mark read"
-msgstr ""
+msgstr "Venta: Marcar como leído"
 
 #. module: sale
 #: help:sale.order,amount_total:0
 msgid "The total amount."
-msgstr ""
+msgstr "El importe total."
 
 #. module: sale
 #: field:sale.config.settings,module_sale_journal:0
@@ -571,7 +574,7 @@ msgstr "Subtotal"
 #. module: sale
 #: field:sale.config.settings,group_discount_per_so_line:0
 msgid "Allow setting a discount on the sale order lines"
-msgstr ""
+msgstr "Permite aplicar un descuento a las lineas de una orden de venta"
 
 #. module: sale
 #: report:sale.order:0
diff --git a/addons/sale_analytic_plans/i18n/pt_BR.po b/addons/sale_analytic_plans/i18n/pt_BR.po
index f96aab820db..59fcd3e6a65 100644
--- a/addons/sale_analytic_plans/i18n/pt_BR.po
+++ b/addons/sale_analytic_plans/i18n/pt_BR.po
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2012-12-03 16:04+0000\n"
-"PO-Revision-Date: 2011-01-13 15:19+0000\n"
-"Last-Translator: Emerson <Unknown>\n"
+"PO-Revision-Date: 2012-12-07 16:43+0000\n"
+"Last-Translator: Cristiano Korndörfer <codigo.aberto@dorfer.com.br>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:40+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-08 04:59+0000\n"
+"X-Generator: Launchpad (build 16341)\n"
 
 #. module: sale_analytic_plans
 #: field:sale.order.line,analytics_id:0
@@ -24,7 +24,7 @@ msgstr "Distribuição Analítica"
 #. module: sale_analytic_plans
 #: model:ir.model,name:sale_analytic_plans.model_sale_order
 msgid "Sales Order"
-msgstr ""
+msgstr "Pedido de Venda"
 
 #. module: sale_analytic_plans
 #: model:ir.model,name:sale_analytic_plans.model_sale_order_line
diff --git a/addons/sale_journal/i18n/pt_BR.po b/addons/sale_journal/i18n/pt_BR.po
index de40cfdd6a2..8740e9c90c9 100644
--- a/addons/sale_journal/i18n/pt_BR.po
+++ b/addons/sale_journal/i18n/pt_BR.po
@@ -7,15 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2012-12-03 16:04+0000\n"
-"PO-Revision-Date: 2012-07-28 19:50+0000\n"
-"Last-Translator: Fábio Martinelli - http://zupy.com.br "
-"<webmaster@guaru.net>\n"
+"PO-Revision-Date: 2012-12-07 16:45+0000\n"
+"Last-Translator: Cristiano Korndörfer <codigo.aberto@dorfer.com.br>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:35+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-08 04:59+0000\n"
+"X-Generator: Launchpad (build 16341)\n"
 
 #. module: sale_journal
 #: field:sale_journal.invoice.type,note:0
@@ -32,6 +31,8 @@ msgstr "Tipo de Fatura"
 msgid ""
 "This invoicing type will be used, by default, to invoice the current partner."
 msgstr ""
+"Este tipo de faturamento será utilizado como padrão em faturas do parceiro "
+"atual."
 
 #. module: sale_journal
 #: view:res.partner:0
@@ -46,7 +47,7 @@ msgstr "Faturamento"
 #. module: sale_journal
 #: model:ir.model,name:sale_journal.model_stock_picking_in
 msgid "Incoming Shipments"
-msgstr ""
+msgstr "Recebimentos"
 
 #. module: sale_journal
 #: help:sale_journal.invoice.type,active:0
@@ -104,7 +105,7 @@ msgstr ""
 #. module: sale_journal
 #: help:sale.order,invoice_type_id:0
 msgid "Generate invoice based on the selected option."
-msgstr ""
+msgstr "Gerar fatura baseada na opção selecionada."
 
 #. module: sale_journal
 #: view:sale.order:0
@@ -138,7 +139,7 @@ msgstr "Pedido de Venda"
 #. module: sale_journal
 #: model:ir.model,name:sale_journal.model_stock_picking_out
 msgid "Delivery Orders"
-msgstr ""
+msgstr "Ordens de Entrega"
 
 #~ msgid "Invalid XML for View Architecture!"
 #~ msgstr "Invalido XML para Arquitetura da View"
diff --git a/addons/web/i18n/es.po b/addons/web/i18n/es.po
index 94a5ba81645..c098fde8581 100644
--- a/addons/web/i18n/es.po
+++ b/addons/web/i18n/es.po
@@ -8,13 +8,13 @@ msgstr ""
 "Project-Id-Version: openerp-web\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-11-30 18:13+0000\n"
-"PO-Revision-Date: 2012-12-06 19:10+0000\n"
+"PO-Revision-Date: 2012-12-07 19:11+0000\n"
 "Last-Translator: Eduardo Alberto Calvo <Unknown>\n"
 "Language-Team: Spanish <es@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-07 04:47+0000\n"
+"X-Launchpad-Export-Date: 2012-12-08 05:21+0000\n"
 "X-Generator: Launchpad (build 16341)\n"
 
 #. module: web
@@ -2373,7 +2373,7 @@ msgstr "Disparador activado desde la vista de búsqueda"
 #: code:addons/web/static/src/js/search.js:980
 #, python-format
 msgid "Filter"
-msgstr ""
+msgstr "Filtro"
 
 #. module: web
 #. openerp-web
diff --git a/addons/web/i18n/fa.po b/addons/web/i18n/fa.po
index 7464ed229e1..7ca8bae970d 100644
--- a/addons/web/i18n/fa.po
+++ b/addons/web/i18n/fa.po
@@ -8,13 +8,13 @@ msgstr ""
 "Project-Id-Version: openerp-web\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-11-30 18:13+0000\n"
-"PO-Revision-Date: 2012-12-06 15:39+0000\n"
+"PO-Revision-Date: 2012-12-07 13:23+0000\n"
 "Last-Translator: fshahy <fshahy@gmail.com>\n"
 "Language-Team: Persian <fa@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-07 04:47+0000\n"
+"X-Launchpad-Export-Date: 2012-12-08 05:21+0000\n"
 "X-Generator: Launchpad (build 16341)\n"
 
 #. module: web
@@ -36,7 +36,7 @@ msgstr "%d دقیقه پیش"
 #: code:addons/web/static/src/js/coresetup.js:621
 #, python-format
 msgid "Still loading...<br />Please be patient."
-msgstr ""
+msgstr "در حال بارگذاری...</ br>  لطفا صبر کنید."
 
 #. module: web
 #. openerp-web
@@ -59,7 +59,7 @@ msgstr "کوچکتر یا مساوی"
 #: code:addons/web/static/src/js/chrome.js:393
 #, python-format
 msgid "Please enter your previous password"
-msgstr ""
+msgstr "لطفا کلمه عبور قبلی خود را وارد کنید."
 
 #. module: web
 #. openerp-web
@@ -82,7 +82,7 @@ msgstr "تغییر کلمه عبور اصلی"
 #: code:addons/web/static/src/js/chrome.js:491
 #, python-format
 msgid "Do you really want to delete the database: %s ?"
-msgstr ""
+msgstr "آیا پایگاه داده حذف شود: %s ؟"
 
 #. module: web
 #. openerp-web
@@ -120,7 +120,7 @@ msgstr "تهیه کپی پشتیبان از پایگاه داده"
 #: code:addons/web/static/src/js/dates.js:53
 #, python-format
 msgid "'%s' is not a valid date"
-msgstr ""
+msgstr "'%s' یک تاریخ معتبر نیست"
 
 #. module: web
 #. openerp-web
@@ -134,7 +134,7 @@ msgstr ""
 #: code:addons/web/static/src/js/coresetup.js:592
 #, python-format
 msgid "about a minute ago"
-msgstr ""
+msgstr "حدود یک دقیقه قبل"
 
 #. module: web
 #. openerp-web
@@ -154,7 +154,7 @@ msgstr "هیچ یک از فیلد های کلمه عبور نباید خالی 
 #: code:addons/web/static/src/js/chrome.js:681
 #, python-format
 msgid "Invalid username or password"
-msgstr "نام کاربر یا گذرواژهٔ نامعتبر"
+msgstr "نام کاربری یا کلمه عبور معتبر نیست"
 
 #. module: web
 #. openerp-web
diff --git a/addons/web/i18n/pt.po b/addons/web/i18n/pt.po
index 2f23aadfef2..c9cdd12c09b 100644
--- a/addons/web/i18n/pt.po
+++ b/addons/web/i18n/pt.po
@@ -8,13 +8,13 @@ msgstr ""
 "Project-Id-Version: openerp-web\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-11-30 18:13+0000\n"
-"PO-Revision-Date: 2012-12-05 10:11+0000\n"
-"Last-Translator: Rui Franco (multibase.pt) <Unknown>\n"
+"PO-Revision-Date: 2012-12-07 11:24+0000\n"
+"Last-Translator: Virgílio Oliveira <virgilio.oliveira@multibase.pt>\n"
 "Language-Team: Portuguese <pt@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-06 04:54+0000\n"
+"X-Launchpad-Export-Date: 2012-12-08 05:21+0000\n"
 "X-Generator: Launchpad (build 16341)\n"
 
 #. module: web
@@ -519,7 +519,7 @@ msgstr "Operador não suportado %s no domínio %s"
 #: code:addons/web/static/src/js/formats.js:242
 #, python-format
 msgid "'%s' is not a correct float"
-msgstr ""
+msgstr "'%s' não é um número fracional correto"
 
 #. module: web
 #. openerp-web
@@ -547,14 +547,14 @@ msgstr "Criar e editar"
 #: code:addons/web/static/src/js/pyeval.js:731
 #, python-format
 msgid "Unknown nonliteral type "
-msgstr ""
+msgstr "Tipo não literal desconhecido "
 
 #. module: web
 #. openerp-web
 #: code:addons/web/static/src/js/view_form.js:2345
 #, python-format
 msgid "Resource error"
-msgstr ""
+msgstr "Erro de recurso"
 
 #. module: web
 #. openerp-web
@@ -596,7 +596,7 @@ msgstr "Para mais informações visite"
 #: code:addons/web/static/src/xml/base.xml:1834
 #, python-format
 msgid "Add All Info..."
-msgstr ""
+msgstr "Adicionar toda  a informação..."
 
 #. module: web
 #. openerp-web
@@ -624,7 +624,7 @@ msgstr "Campos %s modelo"
 #: code:addons/web/static/src/js/view_list.js:890
 #, python-format
 msgid "Setting 'id' attribute on existing record %s"
-msgstr ""
+msgstr "Atribuição do atributo 'id' no registo %s já existente"
 
 #. module: web
 #. openerp-web
@@ -676,7 +676,7 @@ msgstr ""
 #: code:addons/web/static/src/js/view_form.js:1238
 #, python-format
 msgid "Field '%s' specified in view could not be found."
-msgstr ""
+msgstr "Campo '%s' especificado na vista não foi encontrado."
 
 #. module: web
 #. openerp-web
@@ -718,7 +718,7 @@ msgstr "Aplicar"
 #: code:addons/web/static/src/xml/base.xml:1361
 #, python-format
 msgid "Save & New"
-msgstr ""
+msgstr "Gravar & criar"
 
 #. module: web
 #. openerp-web
@@ -733,7 +733,7 @@ msgstr "Guardar como"
 #: code:addons/web/static/src/js/view_form.js:2316
 #, python-format
 msgid "E-mail error"
-msgstr ""
+msgstr "Erro de e-mail"
 
 #. module: web
 #. openerp-web
@@ -861,7 +861,7 @@ msgstr "Preferências"
 #: code:addons/web/static/src/js/view_form.js:434
 #, python-format
 msgid "Wrong on change format: %s"
-msgstr ""
+msgstr "Erro na alteração de formato: %s"
 
 #. module: web
 #. openerp-web
@@ -890,7 +890,7 @@ msgstr "Modificadores:"
 #: code:addons/web/static/src/xml/base.xml:605
 #, python-format
 msgid "Delete this attachment"
-msgstr ""
+msgstr "Apagar este anexo"
 
 #. module: web
 #. openerp-web
@@ -922,7 +922,7 @@ msgstr "Nome de utilizador"
 #: code:addons/web/static/src/js/chrome.js:481
 #, python-format
 msgid "Duplicating database"
-msgstr ""
+msgstr "Duplicando a base de dados"
 
 #. module: web
 #. openerp-web
@@ -936,7 +936,7 @@ msgstr "A senha foi alterada com êxito"
 #: code:addons/web/static/src/js/view_list_editable.js:781
 #, python-format
 msgid "The form's data can not be discarded"
-msgstr ""
+msgstr "A informação no formulário não pode ser descartada"
 
 #. module: web
 #. openerp-web
@@ -971,6 +971,10 @@ msgid ""
 "\n"
 "%s"
 msgstr ""
+"Falha na avaliação local\n"
+"%s\n"
+"\n"
+"%s"
 
 #. module: web
 #. openerp-web
@@ -1012,7 +1016,7 @@ msgstr "Erro, a senha não foi alterada!"
 #: code:addons/web/static/src/js/view_form.js:4810
 #, python-format
 msgid "The selected file exceed the maximum file size of %s."
-msgstr ""
+msgstr "O ficheiro selecionado excede o tamanho máximo de %s."
 
 #. module: web
 #. openerp-web
@@ -1061,7 +1065,7 @@ msgstr "Cópia de segurança"
 #: code:addons/web/static/src/js/dates.js:80
 #, python-format
 msgid "'%s' is not a valid time"
-msgstr ""
+msgstr "'%s' não é uma hora válida"
 
 #. module: web
 #. openerp-web
@@ -1249,7 +1253,7 @@ msgstr "Agrupar por: %s"
 #: code:addons/web/static/src/js/view_form.js:151
 #, python-format
 msgid "No data provided."
-msgstr ""
+msgstr "Ausência de dados"
 
 #. module: web
 #. openerp-web
@@ -1278,7 +1282,7 @@ msgstr "Deve escolher pelo menos um registo."
 #: code:addons/web/static/src/js/coresetup.js:622
 #, python-format
 msgid "Don't leave yet,<br />it's still loading..."
-msgstr ""
+msgstr "Não se vá embora já<br />porque ainda está carregando..."
 
 #. module: web
 #. openerp-web
@@ -1292,7 +1296,7 @@ msgstr "Pesquisa inválida"
 #: code:addons/web/static/src/js/view_list.js:959
 #, python-format
 msgid "Could not find id in dataset"
-msgstr ""
+msgstr "O ID não foi encontrado"
 
 #. module: web
 #. openerp-web
@@ -1320,7 +1324,7 @@ msgstr "%(page)d/%(page_count)d"
 #: code:addons/web/static/src/js/chrome.js:397
 #, python-format
 msgid "The confirmation does not match the password"
-msgstr ""
+msgstr "A confirmação não coincide com a senha"
 
 #. module: web
 #. openerp-web
@@ -1411,7 +1415,7 @@ msgstr "é igual a"
 #: code:addons/web/static/src/js/views.js:1455
 #, python-format
 msgid "Could not serialize XML"
-msgstr ""
+msgstr "Não foi possível serializar o XML"
 
 #. module: web
 #. openerp-web
@@ -1432,7 +1436,7 @@ msgstr "Confirme a nova senha de administração:"
 #: code:addons/web/static/src/js/coresetup.js:625
 #, python-format
 msgid "Maybe you should consider reloading the application by pressing F5..."
-msgstr ""
+msgstr "Talvez deva pensar em recarregar a aplicação carregando em F5..."
 
 #. module: web
 #. openerp-web
@@ -1522,7 +1526,7 @@ msgstr "Não foi possível eliminar a base de dados!"
 #: code:addons/web/static/src/js/formats.js:227
 #, python-format
 msgid "'%s' is not a correct integer"
-msgstr ""
+msgstr "'%s' não é um número inteiro correto"
 
 #. module: web
 #. openerp-web
@@ -1543,7 +1547,7 @@ msgstr "Campo desconhecido %s no domínio %s"
 #: code:addons/web/static/src/js/views.js:1421
 #, python-format
 msgid "Node [%s] is not a JSONified XML node"
-msgstr ""
+msgstr "O nó [%s] não é do tipo JSONified XML"
 
 #. module: web
 #. openerp-web
@@ -1608,7 +1612,7 @@ msgstr "--- Não importar ---"
 #: code:addons/web/static/src/xml/base.xml:1654
 #, python-format
 msgid "Import-Compatible Export"
-msgstr ""
+msgstr "Exportação compatível com importação"
 
 #. module: web
 #. openerp-web
@@ -1622,7 +1626,7 @@ msgstr "%d anos atrás"
 #: code:addons/web/static/src/js/view_list.js:1019
 #, python-format
 msgid "Unknown m2m command %s"
-msgstr ""
+msgstr "Comando m2m %s desconhecio"
 
 #. module: web
 #. openerp-web
@@ -1652,7 +1656,7 @@ msgstr "Por favor introduza a sua nova senha"
 #: code:addons/web/static/src/js/views.js:1463
 #, python-format
 msgid "Could not parse string to xml"
-msgstr ""
+msgstr "Não foi possível passar o texto para XML"
 
 #. module: web
 #. openerp-web
@@ -1724,7 +1728,7 @@ msgstr "A importação falhou devido a:"
 #: code:addons/web/static/src/xml/base.xml:533
 #, python-format
 msgid "JS Tests"
-msgstr ""
+msgstr "Testes JS"
 
 #. module: web
 #. openerp-web
@@ -1930,7 +1934,7 @@ msgstr "Tipo:"
 #: code:addons/web/static/src/js/chrome.js:538
 #, python-format
 msgid "Incorrect super-administrator password"
-msgstr ""
+msgstr "Senha de super-administrador incorreta"
 
 #. module: web
 #. openerp-web
@@ -2043,7 +2047,7 @@ msgstr "'%s' não é uma data/hora correta"
 #: code:addons/web/static/src/js/views.js:1471
 #, python-format
 msgid "Could not find a DOM Parser: %s"
-msgstr ""
+msgstr "Não foi encontrado o interpretador de DOM: %s"
 
 #. module: web
 #. openerp-web
@@ -2403,7 +2407,7 @@ msgstr "Editar fluxo de trabalho"
 #: code:addons/web/static/src/js/views.js:1172
 #, python-format
 msgid "Do you really want to delete this attachment ?"
-msgstr ""
+msgstr "Quer mesmo apagar este anexo?"
 
 #. module: web
 #. openerp-web
@@ -2469,7 +2473,7 @@ msgstr ""
 #: code:addons/web/static/src/xml/base.xml:555
 #, python-format
 msgid "Creation User:"
-msgstr ""
+msgstr "Utilizador de criação:"
 
 #. module: web
 #. openerp-web
@@ -2535,7 +2539,7 @@ msgstr "Pesquisar %(field)s por: %(value)s"
 #: code:addons/web/static/src/xml/base.xml:1252
 #, python-format
 msgid "Delete this file"
-msgstr ""
+msgstr "Apagar este ficheiro"
 
 #. module: web
 #. openerp-web
diff --git a/addons/web/i18n/pt_BR.po b/addons/web/i18n/pt_BR.po
index d444a608ce5..f8935f2490f 100644
--- a/addons/web/i18n/pt_BR.po
+++ b/addons/web/i18n/pt_BR.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openerp-web\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-11-30 18:13+0000\n"
-"PO-Revision-Date: 2012-12-03 19:25+0000\n"
-"Last-Translator: Cristiano Korndörfer <codigo.aberto@dorfer.com.br>\n"
+"PO-Revision-Date: 2012-12-07 21:03+0000\n"
+"Last-Translator: Luiz Fernando M.França (Sig Informática) <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: 2012-12-04 05:59+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-08 05:21+0000\n"
+"X-Generator: Launchpad (build 16341)\n"
 
 #. module: web
 #. openerp-web
@@ -860,7 +860,7 @@ msgstr "Preferências"
 #: code:addons/web/static/src/js/view_form.js:434
 #, python-format
 msgid "Wrong on change format: %s"
-msgstr ""
+msgstr "Formato invalido para on change: %s"
 
 #. module: web
 #. openerp-web
diff --git a/addons/web_calendar/i18n/pt.po b/addons/web_calendar/i18n/pt.po
index 6f593051230..b233679470e 100644
--- a/addons/web_calendar/i18n/pt.po
+++ b/addons/web_calendar/i18n/pt.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openerp-web\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-11-30 18:13+0000\n"
-"PO-Revision-Date: 2012-12-04 12:40+0000\n"
-"Last-Translator: Andrei Talpa (multibase.pt) <andrei.talpa@multibase.pt>\n"
+"PO-Revision-Date: 2012-12-07 10:00+0000\n"
+"Last-Translator: Rui Franco (multibase.pt) <Unknown>\n"
 "Language-Team: Portuguese <pt@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-05 05:43+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-08 05:21+0000\n"
+"X-Generator: Launchpad (build 16341)\n"
 
 #. module: web_calendar
 #. openerp-web
@@ -64,7 +64,7 @@ msgstr "Semana"
 #: code:addons/web_calendar/static/src/js/calendar.js:161
 #, python-format
 msgid "Full day"
-msgstr ""
+msgstr "Dia inteiro"
 
 #. module: web_calendar
 #. openerp-web
@@ -79,7 +79,7 @@ msgstr "Descrição"
 #: code:addons/web_calendar/static/src/js/calendar.js:158
 #, python-format
 msgid "Event will be deleted permanently, are you sure?"
-msgstr ""
+msgstr "O evento será eliminado. Confirma?"
 
 #. module: web_calendar
 #. openerp-web
@@ -136,7 +136,7 @@ msgstr ""
 #: code:addons/web_calendar/static/src/js/calendar.js:80
 #, python-format
 msgid "Filter"
-msgstr ""
+msgstr "Filtro"
 
 #. module: web_calendar
 #. openerp-web
@@ -179,7 +179,7 @@ msgstr "Mês"
 #: code:addons/web_calendar/static/src/js/calendar.js:166
 #, python-format
 msgid "Disabled"
-msgstr ""
+msgstr "Inativo"
 
 #. module: web_calendar
 #. openerp-web
diff --git a/addons/web_diagram/i18n/pt.po b/addons/web_diagram/i18n/pt.po
index 419465502fb..7efdfd009e0 100644
--- a/addons/web_diagram/i18n/pt.po
+++ b/addons/web_diagram/i18n/pt.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openerp-web\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-11-24 01:23+0000\n"
-"PO-Revision-Date: 2012-06-05 19:47+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"PO-Revision-Date: 2012-12-07 09:55+0000\n"
+"Last-Translator: Rui Franco (multibase.pt) <Unknown>\n"
 "Language-Team: Portuguese <pt@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:41+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-08 05:21+0000\n"
+"X-Generator: Launchpad (build 16341)\n"
 
 #. module: web_diagram
 #. openerp-web
@@ -75,7 +75,7 @@ msgstr "Atividade"
 #: code:addons/web_diagram/static/src/js/diagram.js:422
 #, python-format
 msgid "%d / %d"
-msgstr ""
+msgstr "%d / %d"
 
 #. module: web_diagram
 #. openerp-web
diff --git a/addons/web_graph/i18n/zh_CN.po b/addons/web_graph/i18n/zh_CN.po
index 92f3ba7cf22..5e34ec779bd 100644
--- a/addons/web_graph/i18n/zh_CN.po
+++ b/addons/web_graph/i18n/zh_CN.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openerp-web\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-11-30 18:13+0000\n"
-"PO-Revision-Date: 2012-11-29 19:33+0000\n"
-"Last-Translator: Wei \"oldrev\" Li <oldrev@gmail.com>\n"
+"PO-Revision-Date: 2012-12-07 15:34+0000\n"
+"Last-Translator: ccdos <ccdos@163.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: 2012-12-01 05:21+0000\n"
-"X-Generator: Launchpad (build 16319)\n"
+"X-Launchpad-Export-Date: 2012-12-08 05:21+0000\n"
+"X-Generator: Launchpad (build 16341)\n"
 
 #. module: web_graph
 #. openerp-web
@@ -50,7 +50,7 @@ msgstr "内部"
 #: code:addons/web_graph/static/src/xml/web_graph.xml:3
 #, python-format
 msgid "&iacute;"
-msgstr ""
+msgstr "&iacute;"
 
 #. module: web_graph
 #. openerp-web
diff --git a/addons/web_kanban/i18n/pt.po b/addons/web_kanban/i18n/pt.po
index be4550f243a..0bd5bc83ef5 100644
--- a/addons/web_kanban/i18n/pt.po
+++ b/addons/web_kanban/i18n/pt.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openerp-web\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-11-30 18:13+0000\n"
-"PO-Revision-Date: 2012-12-04 12:44+0000\n"
+"PO-Revision-Date: 2012-12-07 09:57+0000\n"
 "Last-Translator: Andrei Talpa (multibase.pt) <andrei.talpa@multibase.pt>\n"
 "Language-Team: Portuguese <pt@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-05 05:43+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-08 05:21+0000\n"
+"X-Generator: Launchpad (build 16341)\n"
 
 #. module: web_kanban
 #. openerp-web
@@ -29,7 +29,7 @@ msgstr "Editar coluna"
 #: code:addons/web_kanban/static/src/js/kanban.js:413
 #, python-format
 msgid "An error has occured while moving the record to this group."
-msgstr ""
+msgstr "Ocorreu um erro ao mover o registo para este grupo."
 
 #. module: web_kanban
 #. openerp-web
@@ -86,7 +86,7 @@ msgstr "Adicionar uma nova coluna"
 #: code:addons/web_kanban/static/src/xml/web_kanban.xml:40
 #, python-format
 msgid "Fold"
-msgstr ""
+msgstr "Dobrar"
 
 #. module: web_kanban
 #. openerp-web
@@ -100,7 +100,7 @@ msgstr "Adicionar"
 #: code:addons/web_kanban/static/src/xml/web_kanban.xml:35
 #, python-format
 msgid "Quick create"
-msgstr ""
+msgstr "Criação rápida"
 
 #. module: web_kanban
 #. openerp-web
@@ -114,7 +114,7 @@ msgstr "Tem certeza que quer remover este registo?"
 #: code:addons/web_kanban/static/src/js/kanban.js:688
 #, python-format
 msgid "Unfold"
-msgstr ""
+msgstr "Desdobrar"
 
 #. module: web_kanban
 #. openerp-web
diff --git a/addons/web_view_editor/i18n/pt.po b/addons/web_view_editor/i18n/pt.po
index 64d597fea5c..9dd7a23756e 100644
--- a/addons/web_view_editor/i18n/pt.po
+++ b/addons/web_view_editor/i18n/pt.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openerp-web\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-11-30 18:13+0000\n"
-"PO-Revision-Date: 2012-12-04 12:42+0000\n"
-"Last-Translator: Andrei Talpa (multibase.pt) <andrei.talpa@multibase.pt>\n"
+"PO-Revision-Date: 2012-12-07 09:56+0000\n"
+"Last-Translator: Rui Franco (multibase.pt) <Unknown>\n"
 "Language-Team: Portuguese <pt@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-05 05:43+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-08 05:21+0000\n"
+"X-Generator: Launchpad (build 16341)\n"
 
 #. module: web_view_editor
 #. openerp-web
@@ -71,7 +71,7 @@ msgstr "Guardar"
 #: code:addons/web_view_editor/static/src/js/view_editor.js:393
 #, python-format
 msgid "Select an element"
-msgstr ""
+msgstr "Selecione um elemento"
 
 #. module: web_view_editor
 #. openerp-web
@@ -86,7 +86,7 @@ msgstr "Atualizar"
 #: code:addons/web_view_editor/static/src/js/view_editor.js:263
 #, python-format
 msgid "Please select view in list :"
-msgstr ""
+msgstr "Por favor, selecione uma vista da lista"
 
 #. module: web_view_editor
 #. openerp-web
@@ -150,7 +150,7 @@ msgstr "Quer mesmo remover este nó?"
 #: code:addons/web_view_editor/static/src/js/view_editor.js:390
 #, python-format
 msgid "Can't Update View"
-msgstr ""
+msgstr "Não é possível atualizar a vista"
 
 #. module: web_view_editor
 #. openerp-web
diff --git a/openerp/addons/base/i18n/es_DO.po b/openerp/addons/base/i18n/es_DO.po
index 73c03ec05ae..8855ee6a517 100644
--- a/openerp/addons/base/i18n/es_DO.po
+++ b/openerp/addons/base/i18n/es_DO.po
@@ -8,13 +8,13 @@ msgstr ""
 "Project-Id-Version: openobject-server\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-12-03 16:01+0000\n"
-"PO-Revision-Date: 2012-12-06 20:42+0000\n"
+"PO-Revision-Date: 2012-12-07 15:49+0000\n"
 "Last-Translator: Carlos Matos Villar <carlosmvillar19@hotmail.com>\n"
 "Language-Team: Spanish (Dominican Republic) <es_DO@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-07 04:34+0000\n"
+"X-Launchpad-Export-Date: 2012-12-08 04:58+0000\n"
 "X-Generator: Launchpad (build 16341)\n"
 
 #. module: base
@@ -9141,7 +9141,7 @@ msgstr ""
 #. module: base
 #: view:res.lang:0
 msgid "2.  %a ,%A         ==> Fri, Friday"
-msgstr ""
+msgstr "2. %a ,%A ==> Vie, Viernes"
 
 #. module: base
 #: code:addons/base/ir/ir_translation.py:341
@@ -9150,6 +9150,8 @@ msgid ""
 "Translation features are unavailable until you install an extra OpenERP "
 "translation."
 msgstr ""
+"Las Características de Traducción no están disponibles hasta que usted "
+"instala una traducción extra en OpenERP."
 
 #. module: base
 #: model:ir.module.module,description:base.module_l10n_nl
@@ -9193,16 +9195,56 @@ msgid ""
 "\n"
 "    "
 msgstr ""
+"\n"
+"Este es el modulo para gestionar el plan de cuenta para Neerlandés en "
+"OpenERP.\n"
+"============================================================================="
+"=======\n"
+"\n"
+"Lea los cambios en el archivo __openerp__.py para la versión de "
+"informació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"
+"    "
 
 #. module: base
 #: help:ir.rule,global:0
 msgid "If no group is specified the rule is global and applied to everyone"
 msgstr ""
+"Si no se especifica ningún grupo, la regla es global y se aplica a todo el "
+"mundo."
 
 #. module: base
 #: model:res.country,name:base.td
 msgid "Chad"
-msgstr ""
+msgstr "Chad"
 
 #. module: base
 #: help:ir.cron,priority:0
@@ -9210,31 +9252,33 @@ msgid ""
 "The priority of the job, as an integer: 0 means higher priority, 10 means "
 "lower priority."
 msgstr ""
+"Prioridad del trabajo, expresada con un entero: 0 significa la máxima "
+"prioridad, 10 significa la prioridad más baja."
 
 #. module: base
 #: model:ir.model,name:base.model_workflow_transition
 msgid "workflow.transition"
-msgstr ""
+msgstr "workflow.transition"
 
 #. module: base
 #: view:res.lang:0
 msgid "%a - Abbreviated weekday name."
-msgstr ""
+msgstr "%a - Nombre abreviado del día de la semana."
 
 #. module: base
 #: view:ir.ui.menu:0
 msgid "Submenus"
-msgstr ""
+msgstr "Submenús"
 
 #. module: base
 #: report:ir.module.reference:0
 msgid "Introspection report on objects"
-msgstr ""
+msgstr "Introspección informe sobre los objetos"
 
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_web_analytics
 msgid "Google Analytics"
-msgstr ""
+msgstr "Google Analytics"
 
 #. module: base
 #: model:ir.module.module,description:base.module_note
@@ -9257,83 +9301,84 @@ msgstr ""
 #. module: base
 #: model:res.country,name:base.dm
 msgid "Dominica"
-msgstr ""
+msgstr "Dominica"
 
 #. module: base
 #: field:ir.translation,name:0
 msgid "Translated field"
-msgstr ""
+msgstr "Campos Traducidos"
 
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_stock_location
 msgid "Advanced Routes"
-msgstr ""
+msgstr "Rutas avanzadas"
 
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_pad
 msgid "Collaborative Pads"
-msgstr ""
+msgstr "Pads colaborativos"
 
 #. module: base
 #: model:res.country,name:base.np
 msgid "Nepal"
-msgstr ""
+msgstr "Nepal"
 
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_document_page
 msgid "Document Page"
-msgstr ""
+msgstr "Página de Documentos"
 
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_l10n_ar
 msgid "Argentina Localization Chart Account"
-msgstr ""
+msgstr "Plan de Cuenta Localización Argentina"
 
 #. module: base
 #: field:ir.module.module,description_html:0
 msgid "Description HTML"
-msgstr ""
+msgstr "HTML de Descripción"
 
 #. module: base
 #: help:res.groups,implied_ids:0
 msgid "Users of this group automatically inherit those groups"
 msgstr ""
+"Los usuarios de este grupo automaticamente heredan de aquellos grupos"
 
 #. module: base
 #: model:ir.module.module,summary:base.module_note
 msgid "Sticky notes, Collaborative, Memos"
-msgstr ""
+msgstr "Notas adesivas, Colaborativas, Memos"
 
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_hr_attendance
 #: model:res.groups,name:base.group_hr_attendance
 msgid "Attendances"
-msgstr ""
+msgstr "Asistencias"
 
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_warning
 msgid "Warning Messages and Alerts"
-msgstr ""
+msgstr "Mensajes de aviso y alertas"
 
 #. 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 ""
+msgstr "Vistas personalizadas"
 
 #. module: base
 #: view:base.module.import:0
 #: model:ir.actions.act_window,name:base.action_view_base_module_import
 msgid "Module Import"
-msgstr ""
+msgstr "Importación de módulo"
 
 #. 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 ""
+msgstr "Enlaces de acciones"
 
 #. module: base
 #: help:res.partner,lang:0
@@ -9341,6 +9386,9 @@ 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 ""
+"Si el lenguaje seleccionado esta cargado en el sistema, todos los documentos "
+"relacionados a este contacto serán impresos en este lenguaje. Si no, este "
+"será Ingles."
 
 #. module: base
 #: model:ir.module.module,description:base.module_hr_evaluation
@@ -9378,7 +9426,7 @@ msgstr ""
 #. module: base
 #: model:ir.ui.menu,name:base.menu_view_base_module_update
 msgid "Update Modules List"
-msgstr ""
+msgstr "Actualizar lista de módulos"
 
 #. module: base
 #: code:addons/base/module/module.py:338
@@ -9386,11 +9434,13 @@ msgstr ""
 msgid ""
 "Unable to upgrade module \"%s\" because an external dependency is not met: %s"
 msgstr ""
+"Imposible actualizar el módulo \"%s\" porqué hay una dependencia externa no "
+"resuelta: %s"
 
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_account
 msgid "eInvoicing"
-msgstr ""
+msgstr "Facturación electrónica"
 
 #. module: base
 #: code:addons/base/res/res_users.py:175
@@ -9401,37 +9451,41 @@ msgid ""
 "sure to save and close all forms before switching to a different company. "
 "(You can click on Cancel in the User Preferences now)"
 msgstr ""
+"Tenga en cuenta que los documentos que se muestran actualmente pueden no ser "
+"relevantes después de cambiar a otra compañía. Asegúrese de guardar y cerrar "
+"todas los formularios modificados antes de cambiar a una compañía diferente "
+"(ahora puede hacer clic en Cancelar en las preferencias del usuario)"
 
 #. module: base
 #: code:addons/orm.py:2821
 #, python-format
 msgid "The value \"%s\" for the field \"%s.%s\" is not in the selection"
-msgstr ""
+msgstr "El valor \"%s\" para el campo \"%s.%s\" no está en la selección"
 
 #. module: base
 #: view:ir.actions.configuration.wizard:0
 msgid "Continue"
-msgstr ""
+msgstr "Siguiente"
 
 #. module: base
 #: selection:base.language.install,lang:0
 msgid "Thai / ภาษาไทย"
-msgstr ""
+msgstr "Tailandés / ภาษาไทย"
 
 #. module: base
 #: view:res.lang:0
 msgid "%j - Day of the year [001,366]."
-msgstr ""
+msgstr "%j - Día del año [001,366]."
 
 #. module: base
 #: selection:base.language.install,lang:0
 msgid "Slovenian / slovenščina"
-msgstr ""
+msgstr "Esloveno / slovenščina"
 
 #. module: base
 #: field:res.currency,position:0
 msgid "Symbol Position"
-msgstr ""
+msgstr "Posición de Simbolo"
 
 #. module: base
 #: model:ir.module.module,description:base.module_l10n_de
@@ -9445,16 +9499,20 @@ msgid ""
 "German accounting chart and localization.\n"
 "    "
 msgstr ""
+"\n"
+"Plan de cuentas y localización alemana.\n"
+"===============================\n"
+"    "
 
 #. module: base
 #: field:ir.actions.report.xml,attachment_use:0
 msgid "Reload from Attachment"
-msgstr ""
+msgstr "Recargar desde adjunto"
 
 #. module: base
 #: model:res.country,name:base.mx
 msgid "Mexico"
-msgstr ""
+msgstr "México"
 
 #. module: base
 #: code:addons/orm.py:3871
@@ -9465,11 +9523,15 @@ msgid ""
 "\n"
 "(Document type: %s)"
 msgstr ""
+"Para este tipo de documentos, usted solo puede acceder a archivos que usted "
+"mismo creó.\n"
+"\n"
+"(Tipo de Documento: %s)"
 
 #. module: base
 #: view:base.language.export:0
 msgid "documentation"
-msgstr ""
+msgstr "documentación"
 
 #. module: base
 #: help:ir.model,osv_memory:0
@@ -9477,62 +9539,64 @@ msgid ""
 "This field specifies whether the model is transient or not (i.e. if records "
 "are automatically deleted from the database or not)"
 msgstr ""
+"Este campo especifica si el modelo es trascendente o no (Ejemplo: Si los "
+"archivos son automáticamente eliminados desde la base de datos o no)"
 
 #. module: base
 #: code:addons/base/ir/ir_mail_server.py:441
 #, python-format
 msgid "Missing SMTP Server"
-msgstr ""
+msgstr "Servidor SMTP ausente"
 
 #. module: base
 #: field:ir.attachment,name:0
 msgid "Attachment Name"
-msgstr ""
+msgstr "Nombre del adjunto"
 
 #. module: base
 #: field:base.language.export,data:0
 #: field:base.language.import,data:0
 msgid "File"
-msgstr ""
+msgstr "Archivo"
 
 #. module: base
 #: model:ir.actions.act_window,name:base.action_view_base_module_upgrade_install
 msgid "Module Upgrade Install"
-msgstr ""
+msgstr "Instalar actualizar módulo"
 
 #. module: base
 #: model:ir.model,name:base.model_ir_actions_configuration_wizard
 msgid "ir.actions.configuration.wizard"
-msgstr ""
+msgstr "ir.actions.configuration.wizard"
 
 #. module: base
 #: view:res.lang:0
 msgid "%b - Abbreviated month name."
-msgstr ""
+msgstr "%b - Nombre abreviado del mes."
 
 #. module: base
 #: code:addons/base/ir/ir_model.py:721
 #, python-format
 msgid "Sorry, you are not allowed to delete this document."
-msgstr ""
+msgstr "Lo sentimos, usted no tiene permitod eliminar este documento."
 
 #. module: base
 #: constraint:ir.rule:0
 msgid "Rules can not be applied on the Record Rules model."
-msgstr ""
+msgstr "Las reglas no pueden ser aplicadas en el archivo modelo de reglas."
 
 #. module: base
 #: field:res.partner,supplier:0
 #: field:res.partner.address,is_supplier_add:0
 #: model:res.partner.category,name:base.res_partner_category_1
 msgid "Supplier"
-msgstr ""
+msgstr "Proveedor"
 
 #. module: base
 #: view:ir.actions.server:0
 #: selection:ir.actions.server,state:0
 msgid "Multi Actions"
-msgstr ""
+msgstr "Multi acciones"
 
 #. module: base
 #: model:ir.module.module,summary:base.module_mail
@@ -9559,91 +9623,109 @@ msgid ""
 "* Show all costs associated to a vehicle or to a type of service\n"
 "* Analysis graph for costs\n"
 msgstr ""
+"\n"
+"Vehículo, Alquiler, seguros, costos\n"
+"================================\n"
+"Con este modulo, OpenERP les ayuda a administrar todos sus vehículos, \n"
+"los contratos asociados a esos vehículos así como el servicio, log de\n"
+"entradas de combustible, costos y algunas otras características necesarias "
+"para la gestión \n"
+"de sus fletes de vehículo(s)\n"
+"\n"
+"Características Principales\n"
+"------------------\n"
+"*Agrega vehículos a sus fletes\n"
+"*Gestiona contratos para vehículos\n"
+"*Recordatorios cuando un contrato alcanza su fecha de expiración\n"
+"*Agregar servicios, entradas de log de combustible, valores de cuenta "
+"kilómetros para todos los vehículos\n"
+"*Muestra todo el costo asociado a un vehículo o a un tipo de servicio\n"
+"*Análisis gráficos para costos\n"
 
 #. module: base
 #: field:multi_company.default,company_dest_id:0
 msgid "Default Company"
-msgstr ""
+msgstr "Compañía por defecto"
 
 #. module: base
 #: selection:base.language.install,lang:0
 msgid "Spanish (EC) / Español (EC)"
-msgstr ""
+msgstr "Español (EC) / Español (EC)"
 
 #. module: base
 #: help:ir.ui.view,xml_id:0
 msgid "ID of the view defined in xml file"
-msgstr ""
+msgstr "El ID de la vista definido en el archivo xml."
 
 #. module: base
 #: model:ir.model,name:base.model_base_module_import
 msgid "Import Module"
-msgstr ""
+msgstr "Importar módulo"
 
 #. module: base
 #: model:res.country,name:base.as
 msgid "American Samoa"
-msgstr ""
+msgstr "Samoa Americana"
 
 #. module: base
 #: view:ir.attachment:0
 msgid "My Document(s)"
-msgstr ""
+msgstr "Mis Documentos"
 
 #. module: base
 #: help:ir.actions.act_window,res_model:0
 msgid "Model name of the object to open in the view window"
-msgstr ""
+msgstr "Nombre del modelo del objeto a abrir en la ventana de la vista."
 
 #. module: base
 #: field:ir.model.fields,selectable:0
 msgid "Selectable"
-msgstr ""
+msgstr "Seleccionable"
 
 #. module: base
 #: code:addons/base/ir/ir_mail_server.py:220
 #, python-format
 msgid "Everything seems properly set up!"
-msgstr ""
+msgstr "¡Todo parece correctamente configurado!"
 
 #. module: base
 #: view:res.request.link:0
 msgid "Request Link"
-msgstr ""
+msgstr "Solicitar enlace"
 
 #. module: base
 #: view:ir.attachment:0
 #: selection:ir.attachment,type:0
 #: field:ir.module.module,url:0
 msgid "URL"
-msgstr ""
+msgstr "URL"
 
 #. module: base
 #: help:res.country,name:0
 msgid "The full name of the country."
-msgstr ""
+msgstr "El nombre completo del país."
 
 #. module: base
 #: selection:ir.actions.server,state:0
 msgid "Iteration"
-msgstr ""
+msgstr "Iteración"
 
 #. module: base
 #: code:addons/orm.py:4213
 #: code:addons/orm.py:4314
 #, python-format
 msgid "UserError"
-msgstr ""
+msgstr "Error de usuario"
 
 #. module: base
 #: model:ir.module.module,summary:base.module_project_issue
 msgid "Support, Bug Tracker, Helpdesk"
-msgstr ""
+msgstr "Soporte, Rastreador de Bug, Ayudante de Escritorio"
 
 #. module: base
 #: model:res.country,name:base.ae
 msgid "United Arab Emirates"
-msgstr ""
+msgstr "Emiratos Árabes Unidos"
 
 #. module: base
 #: help:ir.ui.menu,needaction_enabled:0
@@ -9659,21 +9741,23 @@ msgstr ""
 msgid ""
 "Unable to delete this document because it is used as a default property"
 msgstr ""
+"No se ha podido eliminar este documento ya que se utiliza como una propiedad "
+"por defecto"
 
 #. module: base
 #: model:res.partner.category,name:base.res_partner_category_5
 msgid "Silver"
-msgstr ""
+msgstr "Plateado"
 
 #. module: base
 #: field:res.partner.title,shortcut:0
 msgid "Abbreviation"
-msgstr ""
+msgstr "Abreviación"
 
 #. module: base
 #: model:ir.ui.menu,name:base.menu_crm_case_job_req_main
 msgid "Recruitment"
-msgstr ""
+msgstr "Proceso de selección"
 
 #. module: base
 #: model:ir.module.module,description:base.module_l10n_gr
@@ -9685,11 +9769,17 @@ msgid ""
 "Greek accounting chart and localization.\n"
 "    "
 msgstr ""
+"\n"
+"Módulo para administrar el plan de cuentas para Grecia.\n"
+"============================================\n"
+"\n"
+"Plan de cuentas y localización griego.\n"
+"    "
 
 #. module: base
 #: view:ir.values:0
 msgid "Action Reference"
-msgstr ""
+msgstr "Referencia de la acción"
 
 #. module: base
 #: model:ir.module.module,description:base.module_auth_ldap
diff --git a/openerp/addons/base/i18n/it.po b/openerp/addons/base/i18n/it.po
index 2ff4d0bb006..be466b17360 100644
--- a/openerp/addons/base/i18n/it.po
+++ b/openerp/addons/base/i18n/it.po
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2012-12-03 16:01+0000\n"
-"PO-Revision-Date: 2012-12-01 13:29+0000\n"
+"PO-Revision-Date: 2012-12-07 22:25+0000\n"
 "Last-Translator: Sergio Corato <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: 2012-12-04 04:57+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-08 04:58+0000\n"
+"X-Generator: Launchpad (build 16341)\n"
 
 #. module: base
 #: model:ir.module.module,description:base.module_account_check_writing
@@ -92,7 +92,7 @@ msgstr ""
 #. module: base
 #: model:ir.module.module,summary:base.module_point_of_sale
 msgid "Touchscreen Interface for Shops"
-msgstr "Interfaccia Touchscreen per Negozzi"
+msgstr "Interfaccia Touchscreen per Negozi"
 
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_l10n_in_hr_payroll
diff --git a/openerp/addons/base/i18n/pt.po b/openerp/addons/base/i18n/pt.po
index cc2a07de61f..1ee4820f500 100644
--- a/openerp/addons/base/i18n/pt.po
+++ b/openerp/addons/base/i18n/pt.po
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.0\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2012-12-03 16:01+0000\n"
-"PO-Revision-Date: 2012-12-04 13:10+0000\n"
+"PO-Revision-Date: 2012-12-07 10:59+0000\n"
 "Last-Translator: Rui Franco (multibase.pt) <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: 2012-12-05 05:18+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-08 04:58+0000\n"
+"X-Generator: Launchpad (build 16341)\n"
 
 #. module: base
 #: model:ir.module.module,description:base.module_account_check_writing
@@ -268,7 +268,7 @@ msgstr "Criado"
 #. module: base
 #: field:ir.actions.report.xml,report_xsl:0
 msgid "XSL Path"
-msgstr ""
+msgstr "Caminho do XSL"
 
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_l10n_tr
@@ -570,7 +570,7 @@ msgstr ""
 #. module: base
 #: view:workflow.transition:0
 msgid "Workflow Transition"
-msgstr ""
+msgstr "Transição do fluxo de trabalho"
 
 #. module: base
 #: model:res.country,name:base.gf
@@ -580,7 +580,7 @@ msgstr "Guiana Francesa"
 #. module: base
 #: model:ir.module.module,summary:base.module_hr
 msgid "Jobs, Departments, Employees Details"
-msgstr ""
+msgstr "Funções, departamentos, informações sobre os empregados"
 
 #. module: base
 #: model:ir.module.module,description:base.module_analytic
@@ -872,7 +872,7 @@ msgstr "Roménia - Contabilidade"
 #. module: base
 #: model:ir.model,name:base.model_res_config_settings
 msgid "res.config.settings"
-msgstr ""
+msgstr "res.config.settings"
 
 #. module: base
 #: help:res.partner,image_small:0
@@ -1271,7 +1271,7 @@ msgstr "Ilhas Caimão"
 #. module: base
 #: view:ir.rule:0
 msgid "Record Rule"
-msgstr ""
+msgstr "Regra de gravação"
 
 #. module: base
 #: model:res.country,name:base.kr
@@ -1314,7 +1314,7 @@ msgstr "Visível"
 #. module: base
 #: model:ir.actions.client,name:base.action_client_base_menu
 msgid "Open Settings Menu"
-msgstr ""
+msgstr "Abrir o menu de configuração"
 
 #. module: base
 #: selection:base.language.install,lang:0
@@ -1616,7 +1616,7 @@ msgstr "%Y - ."
 #. module: base
 #: view:res.company:0
 msgid "Report Footer Configuration"
-msgstr ""
+msgstr "Configuração do rodapé de relatório"
 
 #. module: base
 #: field:ir.translation,comments:0
@@ -1775,7 +1775,7 @@ msgstr ""
 #. module: base
 #: field:res.partner,image_small:0
 msgid "Small-sized image"
-msgstr ""
+msgstr "Imagem pequena"
 
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_stock
@@ -1897,7 +1897,7 @@ msgstr ""
 #. module: base
 #: selection:ir.translation,state:0
 msgid "Translation in Progress"
-msgstr ""
+msgstr "Tradução em progresso"
 
 #. module: base
 #: model:ir.model,name:base.model_ir_rule
@@ -1912,7 +1912,7 @@ msgstr "Dias"
 #. module: base
 #: model:ir.module.module,summary:base.module_fleet
 msgid "Vehicle, leasing, insurances, costs"
-msgstr ""
+msgstr "Veículo, 'leasing', seguros, custos"
 
 #. module: base
 #: view:ir.model.access:0
@@ -1999,7 +1999,7 @@ msgstr "Criar tarefas no SO"
 #: code:addons/base/ir/ir_model.py:316
 #, python-format
 msgid "This column contains module data and cannot be removed!"
-msgstr ""
+msgstr "Esta coluna contém dados do módulo e não pode ser removida!"
 
 #. module: base
 #: field:ir.attachment,res_model:0
@@ -2744,7 +2744,7 @@ msgstr "ID do Registo"
 #. module: base
 #: view:ir.filters:0
 msgid "My Filters"
-msgstr ""
+msgstr "Os meus filtros"
 
 #. module: base
 #: field:ir.actions.server,email:0
@@ -2797,7 +2797,7 @@ msgstr "Argumentos enviados ao cliente junto com a tag vista"
 #. module: base
 #: model:ir.module.module,summary:base.module_contacts
 msgid "Contacts, People and Companies"
-msgstr ""
+msgstr "Contactos, pessoas e empresas"
 
 #. module: base
 #: model:res.country,name:base.tt
@@ -2830,7 +2830,7 @@ msgstr "Gestor"
 #: code:addons/base/ir/ir_model.py:718
 #, python-format
 msgid "Sorry, you are not allowed to access this document."
-msgstr ""
+msgstr "Infelizmente, não está autorizado a aceder a este documento."
 
 #. module: base
 #: model:res.country,name:base.py
@@ -2845,7 +2845,7 @@ msgstr "Fiji"
 #. module: base
 #: view:ir.actions.report.xml:0
 msgid "Report Xml"
-msgstr ""
+msgstr "XML de Relatório"
 
 #. module: base
 #: model:ir.module.module,description:base.module_purchase
@@ -2916,7 +2916,7 @@ msgstr "Herdado"
 #: code:addons/base/ir/ir_fields.py:147
 #, python-format
 msgid "yes"
-msgstr ""
+msgstr "sim"
 
 #. module: base
 #: field:ir.model.fields,serialization_field_id:0
@@ -3007,7 +3007,7 @@ msgstr ""
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_web_linkedin
 msgid "LinkedIn Integration"
-msgstr ""
+msgstr "Integração com o LinkedIn"
 
 #. module: base
 #: code:addons/orm.py:2021
@@ -3252,7 +3252,7 @@ msgstr "Suécia"
 #. module: base
 #: field:ir.actions.report.xml,report_file:0
 msgid "Report File"
-msgstr ""
+msgstr "Ficheiro de relatório"
 
 #. module: base
 #: selection:ir.actions.act_window.view,view_mode:0
@@ -3285,7 +3285,7 @@ msgstr ""
 #: code:addons/orm.py:3839
 #, python-format
 msgid "Missing document(s)"
-msgstr ""
+msgstr "Documento(s) em falta"
 
 #. module: base
 #: model:ir.model,name:base.model_res_partner_bank_type
@@ -3300,6 +3300,8 @@ msgid ""
 "For more details about translating OpenERP in your language, please refer to "
 "the"
 msgstr ""
+"Para mais informações acerca da tradução do OpenERP para o seu idioma, por "
+"favor, veja em"
 
 #. module: base
 #: field:res.partner,image:0
@@ -3486,7 +3488,7 @@ msgstr "workflow.activity"
 #. module: base
 #: view:base.language.export:0
 msgid "Export Complete"
-msgstr ""
+msgstr "Exportação concluída"
 
 #. module: base
 #: help:ir.ui.view_sc,res_id:0
@@ -3577,6 +3579,8 @@ msgstr "Malta"
 msgid ""
 "Only users with the following access level are currently allowed to do that"
 msgstr ""
+"Apenas utilizadores com o nível de acesso indicado de seguida estão "
+"autorizados a fazer isso"
 
 #. module: base
 #: field:ir.actions.server,fields_lines:0
@@ -3667,7 +3671,7 @@ msgstr "Antártida"
 #. module: base
 #: view:res.partner:0
 msgid "Persons"
-msgstr ""
+msgstr "Pessoas"
 
 #. module: base
 #: view:base.language.import:0
@@ -4144,7 +4148,7 @@ msgstr "Partilhar qualquer documento"
 #. module: base
 #: model:ir.module.module,summary:base.module_crm
 msgid "Leads, Opportunities, Phone Calls"
-msgstr ""
+msgstr "Dicas, oportunidades, telefonemas"
 
 #. module: base
 #: view:res.lang:0
@@ -4269,7 +4273,7 @@ msgstr "Campo base"
 #. module: base
 #: model:ir.module.category,name:base.module_category_managing_vehicles_and_contracts
 msgid "Managing vehicles and contracts"
-msgstr ""
+msgstr "Gestão de veículos e contratos"
 
 #. module: base
 #: model:ir.module.module,description:base.module_base_setup
@@ -4519,7 +4523,7 @@ msgstr "Tipo de Sequência"
 #. module: base
 #: view:base.language.export:0
 msgid "Unicode/UTF-8"
-msgstr ""
+msgstr "Unicode/UTF-8"
 
 #. module: base
 #: selection:base.language.install,lang:0
@@ -4531,12 +4535,12 @@ msgstr "Hindi / हिंदी"
 #: 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 ""
+msgstr "Carregar uma tradução"
 
 #. module: base
 #: field:ir.module.module,latest_version:0
 msgid "Installed Version"
-msgstr ""
+msgstr "Versão instalada"
 
 #. module: base
 #: field:ir.module.module,license:0
@@ -4679,7 +4683,7 @@ msgstr "ir.actions.report.xml"
 #. module: base
 #: model:res.country,name:base.ps
 msgid "Palestinian Territory, Occupied"
-msgstr ""
+msgstr "Palestina"
 
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_l10n_ch
@@ -4836,12 +4840,12 @@ msgstr ""
 #. module: base
 #: selection:base.language.install,lang:0
 msgid "Portuguese (BR) / Português (BR)"
-msgstr ""
+msgstr "Português (BR)"
 
 #. module: base
 #: model:ir.model,name:base.model_ir_needaction_mixin
 msgid "ir.needaction_mixin"
-msgstr ""
+msgstr "ir.needaction_mixin"
 
 #. module: base
 #: view:base.language.export:0
@@ -4861,13 +4865,13 @@ msgstr "Aplicações para uma Indústria Específica"
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_google_docs
 msgid "Google Docs integration"
-msgstr ""
+msgstr "Integração com o Google Docs"
 
 #. module: base
 #: code:addons/base/ir/ir_fields.py:328
 #, python-format
 msgid "name"
-msgstr ""
+msgstr "nome"
 
 #. module: base
 #: model:ir.module.module,description:base.module_mrp_operations
@@ -4923,7 +4927,7 @@ msgstr "Lesoto"
 #. module: base
 #: view:base.language.export:0
 msgid ", or your preferred text editor"
-msgstr ""
+msgstr ", ou o seu editor de texto preferido"
 
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_crm_partner_assign
@@ -4990,12 +4994,12 @@ msgstr "Definir como Nulo"
 #. module: base
 #: view:res.users:0
 msgid "Save"
-msgstr ""
+msgstr "Gravar"
 
 #. module: base
 #: field:ir.actions.report.xml,report_xml:0
 msgid "XML Path"
-msgstr ""
+msgstr "Caminho do XML"
 
 #. module: base
 #: model:res.country,name:base.bj
@@ -5077,7 +5081,7 @@ msgstr "Segurança"
 #. module: base
 #: selection:base.language.install,lang:0
 msgid "Portuguese / Português"
-msgstr ""
+msgstr "Português"
 
 #. module: base
 #: code:addons/base/ir/ir_model.py:364
@@ -5168,7 +5172,7 @@ msgstr "Taxas"
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_email_template
 msgid "Email Templates"
-msgstr ""
+msgstr "Modelos de mensagens"
 
 #. module: base
 #: model:res.country,name:base.sy
@@ -5273,7 +5277,7 @@ msgstr ""
 #. module: base
 #: view:res.company:0
 msgid "Preview Header/Footer"
-msgstr ""
+msgstr "Antevisão do Cabeçalho/Rodapé"
 
 #. module: base
 #: field:ir.ui.menu,parent_id:0
@@ -5311,7 +5315,7 @@ msgstr ""
 #. module: base
 #: model:ir.model,name:base.model_res_partner_address
 msgid "res.partner.address"
-msgstr ""
+msgstr "res.partner.address"
 
 #. module: base
 #: view:ir.rule:0
@@ -5350,7 +5354,7 @@ msgstr "Histórico"
 #. module: base
 #: model:res.country,name:base.im
 msgid "Isle of Man"
-msgstr ""
+msgstr "Ilha de Man"
 
 #. module: base
 #: help:ir.actions.client,res_model:0
@@ -5513,7 +5517,7 @@ msgstr ""
 #. module: base
 #: model:res.groups,name:base.group_sale_salesman_all_leads
 msgid "See all Leads"
-msgstr ""
+msgstr "Ver todas as dicas"
 
 #. module: base
 #: model:res.country,name:base.ci
@@ -5590,7 +5594,7 @@ msgstr "Configuração de precisão decimal"
 #: 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_ur"
 
 #. module: base
 #: model:ir.ui.menu,name:base.menu_translation_app
@@ -5743,7 +5747,7 @@ msgstr ""
 #. module: base
 #: view:ir.translation:0
 msgid "Comments"
-msgstr ""
+msgstr "Comentários"
 
 #. module: base
 #: model:res.country,name:base.et
@@ -5753,7 +5757,7 @@ msgstr "Etiópia"
 #. module: base
 #: model:ir.module.category,name:base.module_category_authentication
 msgid "Authentication"
-msgstr ""
+msgstr "Autenticação"
 
 #. module: base
 #: model:res.country,name:base.sj
@@ -5787,7 +5791,7 @@ msgstr "Título"
 #: code:addons/base/ir/ir_fields.py:147
 #, python-format
 msgid "true"
-msgstr ""
+msgstr "verdadeiro"
 
 #. module: base
 #: model:ir.model,name:base.model_base_language_install
@@ -5797,7 +5801,7 @@ msgstr "Instalar Idioma"
 #. module: base
 #: model:res.partner.category,name:base.res_partner_category_11
 msgid "Services"
-msgstr ""
+msgstr "Serviços"
 
 #. module: base
 #: view:ir.translation:0
@@ -5901,7 +5905,7 @@ msgstr ""
 #: code:addons/base/ir/workflow/workflow.py:99
 #, python-format
 msgid "Operation forbidden"
-msgstr ""
+msgstr "Operação proibida"
 
 #. module: base
 #: view:ir.actions.server:0
@@ -5993,7 +5997,7 @@ msgstr ""
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_l10n_be_hr_payroll
 msgid "Belgium - Payroll"
-msgstr ""
+msgstr "Bélgica - folha de pagamentos"
 
 #. module: base
 #: view:workflow.activity:0
@@ -6025,7 +6029,7 @@ msgstr "Nome do Recurso"
 #. module: base
 #: field:res.partner,is_company:0
 msgid "Is a Company"
-msgstr ""
+msgstr "É uma empresa"
 
 #. module: base
 #: selection:ir.cron,interval_type:0
@@ -6076,6 +6080,7 @@ msgstr ""
 msgid ""
 "Administrative divisions of a country. E.g. Fed. State, Departement, Canton"
 msgstr ""
+"Divisões administrativas de um país. Exemplos: Distrito, Concelho, Freguesia"
 
 #. module: base
 #: view:res.partner.bank:0
@@ -6105,7 +6110,7 @@ msgstr ""
 #. module: base
 #: sql_constraint:ir.filters:0
 msgid "Filter names must be unique"
-msgstr ""
+msgstr "Os nomes dos filtros devem ser únicos"
 
 #. module: base
 #: help:multi_company.default,object_id:0
@@ -6120,7 +6125,7 @@ msgstr ""
 #. module: base
 #: field:ir.filters,is_default:0
 msgid "Default filter"
-msgstr ""
+msgstr "Filtro padrão"
 
 #. module: base
 #: report:ir.module.reference:0
@@ -6237,7 +6242,7 @@ msgstr ""
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_auth_reset_password
 msgid "Reset Password"
-msgstr ""
+msgstr "Repor a senha"
 
 #. module: base
 #: view:ir.attachment:0
@@ -6254,7 +6259,7 @@ msgstr "Malásia"
 #: code:addons/base/ir/ir_sequence.py:131
 #, python-format
 msgid "Increment number must not be zero."
-msgstr ""
+msgstr "O valor de incremento não pode ser zero."
 
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_account_cancel
@@ -6454,7 +6459,7 @@ msgstr "ir.cron"
 #. module: base
 #: model:res.country,name:base.cw
 msgid "Curaçao"
-msgstr ""
+msgstr "Curaçao"
 
 #. module: base
 #: view:ir.sequence:0
@@ -6601,7 +6606,7 @@ msgstr "Israel"
 #: code:addons/base/res/res_config.py:444
 #, python-format
 msgid "Cannot duplicate configuration!"
-msgstr ""
+msgstr "Não se pode duplicar a configuração!"
 
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_l10n_syscohada
@@ -6655,7 +6660,7 @@ msgstr ""
 #. module: base
 #: model:res.groups,name:base.group_partner_manager
 msgid "Contact Creation"
-msgstr ""
+msgstr "Criação de contacto"
 
 #. module: base
 #: view:ir.module.module:0
@@ -6711,7 +6716,7 @@ msgstr ""
 #. module: base
 #: view:ir.sequence:0
 msgid "Week of the Year: %(woy)s"
-msgstr ""
+msgstr "Semana (do ano): %(woy)s"
 
 #. module: base
 #: field:res.users,id:0
@@ -6780,7 +6785,7 @@ msgstr "Títulos do Parceiro"
 #: code:addons/base/ir/ir_fields.py:228
 #, python-format
 msgid "Use the format '%s'"
-msgstr ""
+msgstr "Use o formato '%s'"
 
 #. module: base
 #: help:ir.actions.act_window,auto_refresh:0
@@ -6812,12 +6817,12 @@ msgstr "WorkItems"
 #: code:addons/base/res/res_bank.py:195
 #, python-format
 msgid "Invalid Bank Account Type Name format."
-msgstr ""
+msgstr "Formato inválido para o nome do tipo de conta bancária."
 
 #. module: base
 #: view:ir.filters:0
 msgid "Filters visible only for one user"
-msgstr ""
+msgstr "Filtros visíveis só para o utilizador"
 
 #. module: base
 #: model:ir.model,name:base.model_ir_attachment
@@ -6837,7 +6842,7 @@ msgstr ""
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_auth_anonymous
 msgid "Anonymous"
-msgstr ""
+msgstr "Anónimo"
 
 #. module: base
 #: model:ir.module.module,description:base.module_base_import
@@ -6993,7 +6998,7 @@ msgstr "Somália"
 #. module: base
 #: model:res.partner.title,shortcut:base.res_partner_title_doctor
 msgid "Dr."
-msgstr ""
+msgstr "Dr."
 
 #. module: base
 #: model:res.groups,name:base.group_user
@@ -7058,7 +7063,7 @@ msgstr "Copiar de"
 #. module: base
 #: field:ir.model.data,display_name:0
 msgid "Record Name"
-msgstr ""
+msgstr "Nome do registo"
 
 #. module: base
 #: model:ir.model,name:base.model_ir_actions_client
@@ -7074,7 +7079,7 @@ msgstr "Território Britânico do Oceano Índico"
 #. module: base
 #: model:ir.actions.server,name:base.action_server_module_immediate_install
 msgid "Module Immediate Install"
-msgstr ""
+msgstr "Instalação imediata do módulo"
 
 #. module: base
 #: view:ir.actions.server:0
@@ -7201,7 +7206,7 @@ msgstr "Em múltiplos docs"
 #: view:res.users:0
 #: view:wizard.ir.model.menu.create:0
 msgid "or"
-msgstr ""
+msgstr "ou"
 
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_account_accountant
@@ -7344,7 +7349,7 @@ msgstr ""
 #. module: base
 #: model:res.partner.category,name:base.res_partner_category_14
 msgid "Manufacturer"
-msgstr ""
+msgstr "Fabricante"
 
 #. module: base
 #: help:res.users,company_id:0
@@ -7794,7 +7799,7 @@ msgstr "init"
 #: view:res.partner:0
 #: field:res.partner,user_id:0
 msgid "Salesperson"
-msgstr ""
+msgstr "Vendedor"
 
 #. module: base
 #: view:res.lang:0
@@ -7852,7 +7857,7 @@ msgstr "Password opcional para autenticação SMTP"
 #: code:addons/base/ir/ir_model.py:719
 #, python-format
 msgid "Sorry, you are not allowed to modify this document."
-msgstr ""
+msgstr "Infelizmente, não pode alterar este documento."
 
 #. module: base
 #: code:addons/base/res/res_config.py:350
@@ -7942,7 +7947,7 @@ msgstr "Francês (CH) / Français (CH)"
 #. module: base
 #: model:res.partner.category,name:base.res_partner_category_13
 msgid "Distributor"
-msgstr ""
+msgstr "Distribuidor"
 
 #. module: base
 #: help:ir.actions.server,subject:0
@@ -8157,7 +8162,7 @@ msgstr "Contabilidade Analítica"
 #. module: base
 #: model:ir.model,name:base.model_ir_model_constraint
 msgid "ir.model.constraint"
-msgstr ""
+msgstr "ir.model.constraint"
 
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_web_graph
@@ -8190,7 +8195,7 @@ msgstr "Bélgica - Contabilidade"
 #. module: base
 #: view:ir.model.access:0
 msgid "Access Control"
-msgstr ""
+msgstr "Controlo de acesso"
 
 #. module: base
 #: model:res.country,name:base.kw
@@ -8294,7 +8299,7 @@ msgstr "Filipinas"
 #. module: base
 #: model:ir.module.module,summary:base.module_hr_timesheet_sheet
 msgid "Timesheets, Attendances, Activities"
-msgstr ""
+msgstr "Folhas de horas, assiduidade, atividades"
 
 #. module: base
 #: model:res.country,name:base.ma
@@ -8407,7 +8412,7 @@ msgstr "Relatório de introspeção em objetos"
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_web_analytics
 msgid "Google Analytics"
-msgstr ""
+msgstr "Google Analytics"
 
 #. module: base
 #: model:ir.module.module,description:base.module_note
@@ -8435,7 +8440,7 @@ msgstr "Dominica"
 #. module: base
 #: field:ir.translation,name:0
 msgid "Translated field"
-msgstr ""
+msgstr "Traduzir campo"
 
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_stock_location
@@ -8649,7 +8654,7 @@ msgstr ""
 #. module: base
 #: view:base.language.export:0
 msgid "documentation"
-msgstr ""
+msgstr "documentação"
 
 #. module: base
 #: help:ir.model,osv_memory:0
@@ -8694,7 +8699,7 @@ msgstr "%b - Nome do mês abreviado."
 #: code:addons/base/ir/ir_model.py:721
 #, python-format
 msgid "Sorry, you are not allowed to delete this document."
-msgstr ""
+msgstr "Infelizmente, não pode apagar este documento."
 
 #. module: base
 #: constraint:ir.rule:0
@@ -8768,7 +8773,7 @@ msgstr "Samoa Americana"
 #. module: base
 #: view:ir.attachment:0
 msgid "My Document(s)"
-msgstr ""
+msgstr "Os meus documentos"
 
 #. module: base
 #: help:ir.actions.act_window,res_model:0
@@ -8850,7 +8855,7 @@ msgstr ""
 #. module: base
 #: field:res.partner.title,shortcut:0
 msgid "Abbreviation"
-msgstr ""
+msgstr "Abreviatura"
 
 #. module: base
 #: model:ir.ui.menu,name:base.menu_crm_case_job_req_main
@@ -9047,7 +9052,7 @@ msgstr ""
 #. module: base
 #: model:ir.module.category,name:base.module_category_warehouse_management
 msgid "Warehouse"
-msgstr ""
+msgstr "Armazém"
 
 #. module: base
 #: field:ir.exports,resource:0
@@ -9096,7 +9101,7 @@ msgstr "Relatório"
 #. module: base
 #: model:res.partner.title,shortcut:base.res_partner_title_prof
 msgid "Prof."
-msgstr ""
+msgstr "Prof."
 
 #. module: base
 #: code:addons/base/ir/ir_mail_server.py:239
@@ -9228,7 +9233,7 @@ msgstr "Ref. do Parceiro"
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_hr_expense
 msgid "Expense Management"
-msgstr ""
+msgstr "Gestão de despesas"
 
 #. module: base
 #: field:ir.attachment,create_date:0
@@ -9307,7 +9312,7 @@ msgstr "Modelos"
 #: code:addons/base/module/module.py:472
 #, python-format
 msgid "The `base` module cannot be uninstalled"
-msgstr ""
+msgstr "O módulo \"base\" não pode ser desinstalado"
 
 #. module: base
 #: code:addons/base/ir/ir_cron.py:390
@@ -9334,7 +9339,7 @@ msgstr "osv_memory.autovacuum"
 #: code:addons/base/ir/ir_model.py:720
 #, python-format
 msgid "Sorry, you are not allowed to create this kind of document."
-msgstr ""
+msgstr "Infelizmente, não pode criar este tipo de documento."
 
 #. module: base
 #: field:base.language.export,lang:0
@@ -9376,7 +9381,7 @@ msgstr "%H - Hora (24-horas) [00,23]."
 #. module: base
 #: field:ir.model.fields,on_delete:0
 msgid "On Delete"
-msgstr ""
+msgstr "Ao apagar"
 
 #. module: base
 #: code:addons/base/ir/ir_model.py:340
@@ -9584,7 +9589,7 @@ msgstr "O código da moeda deve ser único por empresa!"
 #: code:addons/base/module/wizard/base_export_language.py:38
 #, python-format
 msgid "New Language (Empty translation template)"
-msgstr ""
+msgstr "Novo idioma (modelo de tradução limpo)"
 
 #. module: base
 #: model:ir.module.module,description:base.module_auth_reset_password
@@ -9654,7 +9659,7 @@ msgstr "Egipto"
 #. module: base
 #: view:ir.attachment:0
 msgid "Creation"
-msgstr ""
+msgstr "Criação"
 
 #. module: base
 #: help:ir.actions.server,model_id:0
@@ -9726,7 +9731,7 @@ msgstr ""
 #. module: base
 #: field:res.partner,use_parent_address:0
 msgid "Use Company Address"
-msgstr ""
+msgstr "Usar o endereço da empresa"
 
 #. module: base
 #: model:ir.module.module,summary:base.module_hr_holidays
@@ -10107,7 +10112,7 @@ msgstr "Gravar Regras"
 #. module: base
 #: view:multi_company.default:0
 msgid "Multi Company"
-msgstr ""
+msgstr "Multi-empresas"
 
 #. module: base
 #: model:ir.module.category,name:base.module_category_portal
@@ -10118,13 +10123,13 @@ msgstr "Portal"
 #. module: base
 #: selection:ir.translation,state:0
 msgid "To Translate"
-msgstr ""
+msgstr "Para traduzir"
 
 #. module: base
 #: code:addons/base/ir/ir_fields.py:295
 #, python-format
 msgid "See all possible values"
-msgstr ""
+msgstr "Ver todos os valores possíveis"
 
 #. module: base
 #: model:ir.module.module,description:base.module_claim_from_delivery
@@ -10291,7 +10296,7 @@ msgstr "Itália"
 #. module: base
 #: model:res.groups,name:base.group_sale_salesman
 msgid "See Own Leads"
-msgstr ""
+msgstr "Ver as próprias dicas"
 
 #. module: base
 #: view:ir.actions.todo:0
@@ -10523,7 +10528,7 @@ msgstr ""
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_sale_stock
 msgid "Sales and Warehouse Management"
-msgstr ""
+msgstr "Gestão de vendas e de armazém"
 
 #. module: base
 #: field:ir.model.fields,model:0
@@ -10664,7 +10669,7 @@ msgstr ""
 #: code:addons/base/ir/ir_model.py:1023
 #, python-format
 msgid "Permission Denied"
-msgstr ""
+msgstr "Permissão negada"
 
 #. module: base
 #: field:ir.ui.menu,child_id:0
@@ -10809,7 +10814,7 @@ msgstr ""
 #. module: base
 #: model:res.country,name:base.bl
 msgid "Saint Barthélémy"
-msgstr ""
+msgstr "Saint Barthélémy"
 
 #. module: base
 #: selection:ir.module.module,license:0
@@ -10890,12 +10895,12 @@ msgstr ""
 #: 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 ""
+msgstr "Empresa padrão por objeto"
 
 #. module: base
 #: field:ir.ui.menu,needaction_counter:0
 msgid "Number of actions the user has to perform"
-msgstr ""
+msgstr "Número de ações que o utilizador tem de realizar"
 
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_web_hello
@@ -11195,7 +11200,7 @@ msgstr "Operações de Produção"
 #. module: base
 #: view:base.language.export:0
 msgid "Here is the exported translation file:"
-msgstr ""
+msgstr "Aqui está o ficheiro de tradução:"
 
 #. module: base
 #: field:ir.actions.report.xml,report_rml_content:0
@@ -11465,7 +11470,7 @@ msgstr "ir.fields.converter"
 #: code:addons/base/res/res_partner.py:436
 #, python-format
 msgid "Couldn't create contact without email address !"
-msgstr ""
+msgstr "Não foi possível criar o contacto sem o endereço eletrónico!"
 
 #. module: base
 #: model:ir.module.category,name:base.module_category_manufacturing
@@ -11717,7 +11722,7 @@ msgstr "UK - Contabilidade"
 #. module: base
 #: model:res.partner.title,shortcut:base.res_partner_title_madam
 msgid "Mrs."
-msgstr ""
+msgstr "Srª."
 
 #. module: base
 #: code:addons/base/ir/ir_model.py:424
@@ -11753,7 +11758,7 @@ msgstr "Repetição da Expressão"
 #. module: base
 #: model:res.partner.category,name:base.res_partner_category_16
 msgid "Retailer"
-msgstr ""
+msgstr "Revendedor"
 
 #. module: base
 #: view:ir.model.fields:0
diff --git a/openerp/addons/base/i18n/pt_BR.po b/openerp/addons/base/i18n/pt_BR.po
index 2c18674f450..ad649948427 100644
--- a/openerp/addons/base/i18n/pt_BR.po
+++ b/openerp/addons/base/i18n/pt_BR.po
@@ -7,14 +7,15 @@ msgstr ""
 "Project-Id-Version: pt_BR\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2012-12-03 16:01+0000\n"
-"PO-Revision-Date: 2012-12-03 09:37+0000\n"
-"Last-Translator: Cristiano Korndörfer <codigo.aberto@dorfer.com.br>\n"
+"PO-Revision-Date: 2012-12-07 22:22+0000\n"
+"Last-Translator: Fábio Martinelli - http://zupy.com.br "
+"<webmaster@guaru.net>\n"
 "Language-Team: <pt@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:02+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-08 04:58+0000\n"
+"X-Generator: Launchpad (build 16341)\n"
 
 #. module: base
 #: model:ir.module.module,description:base.module_account_check_writing
@@ -3424,7 +3425,7 @@ msgstr "Armênia"
 #. module: base
 #: model:ir.module.module,summary:base.module_hr_evaluation
 msgid "Periodical Evaluations, Appraisals, Surveys"
-msgstr ""
+msgstr "Avaliações Periódicas, Pesquisas,  Avaliações"
 
 #. module: base
 #: model:ir.actions.act_window,name:base.ir_property_form
@@ -4184,7 +4185,7 @@ msgstr "%x - Representação apropriada para data."
 #. module: base
 #: view:res.partner:0
 msgid "Tag"
-msgstr ""
+msgstr "Tag"
 
 #. module: base
 #: view:res.lang:0
@@ -4396,7 +4397,7 @@ msgstr "Compartilhar Qualquer Documento"
 #. module: base
 #: model:ir.module.module,summary:base.module_crm
 msgid "Leads, Opportunities, Phone Calls"
-msgstr ""
+msgstr "Prospectos, Oportunidades, Ligações Telefônicas"
 
 #. module: base
 #: view:res.lang:0
@@ -5119,7 +5120,7 @@ msgstr "Este arquivo foi gerado usando o universal"
 #. module: base
 #: model:res.partner.category,name:base.res_partner_category_7
 msgid "IT Services"
-msgstr ""
+msgstr "Serviços de TI"
 
 #. module: base
 #: model:ir.module.category,name:base.module_category_specific_industry_applications
@@ -5181,7 +5182,7 @@ msgstr "Saltar"
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_event_sale
 msgid "Events Sales"
-msgstr ""
+msgstr "Venda de Eventos"
 
 #. module: base
 #: model:res.country,name:base.ls
@@ -5191,7 +5192,7 @@ msgstr "Lesoto"
 #. module: base
 #: view:base.language.export:0
 msgid ", or your preferred text editor"
-msgstr ""
+msgstr ", ou seu editor de texto preferido"
 
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_crm_partner_assign
@@ -5488,7 +5489,7 @@ msgstr "Data"
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_event_moodle
 msgid "Event Moodle"
-msgstr ""
+msgstr "Evento Moodle"
 
 #. module: base
 #: model:ir.module.module,description:base.module_email_template
@@ -5539,7 +5540,7 @@ msgstr ""
 #. module: base
 #: model:ir.ui.menu,name:base.menu_partner_category_form
 msgid "Partner Tags"
-msgstr ""
+msgstr "Tags de Parceiros"
 
 #. module: base
 #: view:res.company:0
@@ -5587,7 +5588,7 @@ msgstr "res.partner.address"
 #. module: base
 #: view:ir.rule:0
 msgid "Write Access Right"
-msgstr ""
+msgstr "Permissão de Escrita"
 
 #. module: base
 #: model:ir.actions.act_window,help:base.action_res_groups
@@ -5666,6 +5667,14 @@ msgid ""
 "wizard if the delivery is to be invoiced.\n"
 "    "
 msgstr ""
+"\n"
+"Assistente de faturamento para entrega.\n"
+"============================\n"
+"\n"
+"Quando você enviar ou entregar mercadorias, este módulo ativa "
+"automaticamente o\n"
+"assistente de  faturamento se a entrega deve ser faturada.\n"
+"    "
 
 #. module: base
 #: selection:ir.translation,type:0
@@ -5703,6 +5712,10 @@ msgid ""
 "=======================\n"
 "    "
 msgstr ""
+"\n"
+"Permitir que usuários se cadastrem.\n"
+"=======================\n"
+"    "
 
 #. module: base
 #: model:res.country,name:base.zm
@@ -5717,7 +5730,7 @@ msgstr "Iniciar o Assistente de Configuração"
 #. module: base
 #: model:ir.module.module,summary:base.module_mrp
 msgid "Manufacturing Orders, Bill of Materials, Routing"
-msgstr ""
+msgstr "Ordens de produção, lista de materiais, roteamento"
 
 #. module: base
 #: view:ir.module.module:0
@@ -6209,6 +6222,12 @@ msgid ""
 "Allows users to create custom dashboard.\n"
 "    "
 msgstr ""
+"\n"
+"Permite que o usuário crie um painel personalizado.\n"
+"========================================\n"
+"\n"
+"Permite aos usuários criar um painel personalizado.\n"
+"    "
 
 #. module: base
 #: model:ir.actions.act_window,name:base.ir_access_act
@@ -6358,7 +6377,7 @@ msgstr "'%s' não parece ser um número para o campo '%% (field)s'"
 #: help:res.country.state,name:0
 msgid ""
 "Administrative divisions of a country. E.g. Fed. State, Departement, Canton"
-msgstr ""
+msgstr "Divisões administrativas de um país. Ex: Estados, Cidades"
 
 #. module: base
 #: view:res.partner.bank:0
@@ -6537,7 +6556,7 @@ msgstr "Malásia"
 #: code:addons/base/ir/ir_sequence.py:131
 #, python-format
 msgid "Increment number must not be zero."
-msgstr ""
+msgstr "Número de incremento não deve ser zero."
 
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_account_cancel
@@ -6782,6 +6801,13 @@ msgid ""
 "using the\n"
 "FTP client.\n"
 msgstr ""
+"\n"
+"Esta é uma interface FTP com sistema de gerenciamento de documentos.\n"
+"================================================================\n"
+"\n"
+"Com este módulo você pode não apenas acessar documentos através do OpenERP\n"
+"mas também conectar-se a eles através do sistema de arquivos usando um\n"
+"cliente FTP.\n"
 
 #. module: base
 #: field:ir.model.fields,size:0
@@ -7093,7 +7119,7 @@ msgstr "Itens de trabalho"
 #: code:addons/base/res/res_bank.py:195
 #, python-format
 msgid "Invalid Bank Account Type Name format."
-msgstr ""
+msgstr "Formato de Tipo de Conta Bancária inválido"
 
 #. module: base
 #: view:ir.filters:0
@@ -7841,7 +7867,7 @@ msgstr "Senha"
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_portal_claim
 msgid "Portal Claim"
-msgstr ""
+msgstr "Portal de Solicitações"
 
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_l10n_pe
@@ -8356,7 +8382,7 @@ msgstr "Tipo de campos"
 #. module: base
 #: model:ir.module.module,summary:base.module_hr_recruitment
 msgid "Jobs, Recruitment, Applications, Job Interviews"
-msgstr ""
+msgstr "Empregos, Recrutamento, Candidaturas, Entrevistas de Emprego"
 
 #. module: base
 #: code:addons/base/module/module.py:513
@@ -8401,7 +8427,7 @@ msgstr "Aviso!"
 #. module: base
 #: view:ir.rule:0
 msgid "Full Access Right"
-msgstr ""
+msgstr "Todos os direitos de acesso"
 
 #. module: base
 #: field:res.partner.category,parent_id:0
@@ -8506,7 +8532,7 @@ msgstr "Kuwait"
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_account_followup
 msgid "Payment Follow-up Management"
-msgstr ""
+msgstr "Gestão de acompanhamento de pagamentos"
 
 #. module: base
 #: field:workflow.workitem,inst_id:0
@@ -8602,7 +8628,7 @@ msgstr "Filipinas"
 #. module: base
 #: model:ir.module.module,summary:base.module_hr_timesheet_sheet
 msgid "Timesheets, Attendances, Activities"
-msgstr ""
+msgstr "Planilhas, Atendimentos, Atividades"
 
 #. module: base
 #: model:res.country,name:base.ma
@@ -9421,6 +9447,17 @@ msgid ""
 "\n"
 "    "
 msgstr ""
+"\n"
+"Este módulo mostra os processos básicos envolvidos nos módulos selecionados "
+"e na seqüência em que ocorrem.\n"
+"============================================================================="
+"===================\n"
+"\n"
+" **Nota: ** Isso se aplica aos módulos contendo modulename_process.xml.\n"
+"\n"
+"**Ex: ** produto / processo / product_process.xml.\n"
+"\n"
+"    "
 
 #. module: base
 #: view:res.lang:0
@@ -9482,7 +9519,7 @@ msgstr "Nenhum"
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_hr_holidays
 msgid "Leave Management"
-msgstr ""
+msgstr "Gerenciamento de Folgas"
 
 #. module: base
 #: model:res.company,overdue_msg:base.main_company
@@ -9965,6 +10002,13 @@ msgid ""
 "Allow administrator to click a button to send a \"Reset Password\" request "
 "to a user.\n"
 msgstr ""
+"\n"
+"Trocar Senha\n"
+"==============\n"
+"\n"
+"Permite aos usuários trocar sua senha a partir da pagina de login.\n"
+"Permite ao administrador clicar no botão para requisitar ao usuário que "
+"troque sua senha.\n"
 
 #. module: base
 #: help:ir.actions.server,email:0
@@ -10108,7 +10152,7 @@ msgstr "Usar o endereço da empresa"
 #. module: base
 #: model:ir.module.module,summary:base.module_hr_holidays
 msgid "Holidays, Allocation and Leave Requests"
-msgstr ""
+msgstr "Pedidos de Alocação de férias e licenças"
 
 #. module: base
 #: model:ir.module.module,description:base.module_web_hello
@@ -10357,7 +10401,7 @@ msgstr ""
 #. module: base
 #: sql_constraint:ir.model.constraint:0
 msgid "Constraints with the same name are unique per module."
-msgstr ""
+msgstr "Constraints com o mesmo nome são únicas por módulo."
 
 #. module: base
 #: model:ir.module.module,description:base.module_report_intrastat
@@ -10402,7 +10446,7 @@ msgstr "res.request"
 #. module: base
 #: field:res.partner,image_medium:0
 msgid "Medium-sized image"
-msgstr ""
+msgstr "Imagem de tamanho Médio"
 
 #. module: base
 #: view:ir.model:0
@@ -10429,7 +10473,7 @@ msgstr "Conteúdo do arquivo"
 #: view:ir.model.relation:0
 #: model:ir.ui.menu,name:base.ir_model_relation_menu
 msgid "ManyToMany Relations"
-msgstr ""
+msgstr "Relação muitos para muitos"
 
 #. module: base
 #: model:res.country,name:base.pa
@@ -10467,7 +10511,7 @@ msgstr "Ilhas Pitcairn"
 #. module: base
 #: field:res.partner,category_id:0
 msgid "Tags"
-msgstr ""
+msgstr "Marcadores"
 
 #. module: base
 #: view:base.module.upgrade:0
@@ -10487,7 +10531,7 @@ msgstr "Registro de Regras"
 #. module: base
 #: view:multi_company.default:0
 msgid "Multi Company"
-msgstr ""
+msgstr "Multi-Empresa"
 
 #. module: base
 #: model:ir.module.category,name:base.module_category_portal
@@ -10498,13 +10542,13 @@ msgstr "Portal"
 #. module: base
 #: selection:ir.translation,state:0
 msgid "To Translate"
-msgstr ""
+msgstr "Para traduzir"
 
 #. module: base
 #: code:addons/base/ir/ir_fields.py:295
 #, python-format
 msgid "See all possible values"
-msgstr ""
+msgstr "Ver valores válidos"
 
 #. module: base
 #: model:ir.module.module,description:base.module_claim_from_delivery
@@ -10539,7 +10583,7 @@ msgstr ""
 #. module: base
 #: help:ir.model.constraint,name:0
 msgid "PostgreSQL constraint or foreign key name."
-msgstr ""
+msgstr "Nome da constraint PostgreSQL ou chave estrangeira(FK)"
 
 #. module: base
 #: view:res.lang:0
@@ -10559,12 +10603,12 @@ msgstr "Guiné Bissau"
 #. module: base
 #: field:ir.actions.report.xml,header:0
 msgid "Add RML Header"
-msgstr ""
+msgstr "Adicionar cabeçalho RML"
 
 #. module: base
 #: help:res.company,rml_footer:0
 msgid "Footer text displayed at the bottom of all reports."
-msgstr ""
+msgstr "Texto a ser mostrado no rodapé de todos os relatórios."
 
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_note_pad
@@ -10675,7 +10719,7 @@ msgstr "Itália"
 #. module: base
 #: model:res.groups,name:base.group_sale_salesman
 msgid "See Own Leads"
-msgstr ""
+msgstr "Ver seus Leads"
 
 #. module: base
 #: view:ir.actions.todo:0
@@ -10705,6 +10749,8 @@ msgid ""
 "Insufficient fields to generate a Calendar View for %s, missing a date_stop "
 "or a date_delay"
 msgstr ""
+"Campos insuficiente para gerar uma visão de calendário (% s), faltando um "
+"date_stop ou um date_delay"
 
 #. module: base
 #: field:workflow.activity,action:0
@@ -10771,6 +10817,7 @@ msgstr "ir.translation"
 msgid ""
 "Please contact your system administrator if you think this is an error."
 msgstr ""
+"Contacte seu administrador do sistema se você acha que isto é um erro."
 
 #. module: base
 #: code:addons/base/module/module.py:519
@@ -10778,7 +10825,7 @@ msgstr ""
 #: model:ir.actions.act_window,name:base.action_view_base_module_upgrade
 #, python-format
 msgid "Apply Schedule Upgrade"
-msgstr ""
+msgstr "Aplicar atualizações agendas"
 
 #. module: base
 #: view:workflow.activity:0
@@ -10811,6 +10858,8 @@ msgid ""
 "One of the documents you are trying to access has been deleted, please try "
 "again after refreshing."
 msgstr ""
+"Um dos documentos que você está tentando acessar foi excluído. Atualize sua "
+"tela."
 
 #. module: base
 #: model:ir.model,name:base.model_ir_mail_server
@@ -10823,6 +10872,8 @@ msgid ""
 "If the target model uses the need action mechanism, this field gives the "
 "number of actions the current user has to perform."
 msgstr ""
+"Se o modelo de destino necessita do mecanismo de ação, este campo indica o "
+"número de ações que o usuário atual tem para executar."
 
 #. module: base
 #: selection:base.language.install,lang:0
@@ -10919,7 +10970,7 @@ msgstr ""
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_sale_stock
 msgid "Sales and Warehouse Management"
-msgstr ""
+msgstr "Gestão de vendas e armazens"
 
 #. module: base
 #: field:ir.model.fields,model:0
@@ -10965,7 +11016,7 @@ msgstr ""
 #. module: base
 #: help:res.partner,ean13:0
 msgid "BarCode"
-msgstr ""
+msgstr "Código de barras"
 
 #. module: base
 #: help:ir.model.fields,model_id:0
@@ -10986,7 +11037,7 @@ msgstr "Martinica(França)"
 #. module: base
 #: help:res.partner,is_company:0
 msgid "Check if the contact is a company, otherwise it is a person"
-msgstr ""
+msgstr "Marque se o contato é uma empresa."
 
 #. module: base
 #: view:ir.sequence.type:0
@@ -10997,7 +11048,7 @@ msgstr "Tipo de Sequências"
 #: code:addons/base/res/res_bank.py:195
 #, python-format
 msgid "Formating Error"
-msgstr ""
+msgstr "Erro de Formatação"
 
 #. module: base
 #: model:res.country,name:base.ye
@@ -11068,7 +11119,7 @@ msgstr ""
 #: code:addons/base/ir/ir_model.py:1023
 #, python-format
 msgid "Permission Denied"
-msgstr ""
+msgstr "Permissão negada"
 
 #. module: base
 #: field:ir.ui.menu,child_id:0
@@ -11139,7 +11190,7 @@ msgstr "E-mail"
 #. module: base
 #: model:res.partner.category,name:base.res_partner_category_12
 msgid "Office Supplies"
-msgstr ""
+msgstr "Materiais de escritório"
 
 #. module: base
 #: code:addons/custom.py:550
@@ -11227,7 +11278,7 @@ msgstr "Equador"
 #. module: base
 #: view:ir.rule:0
 msgid "Read Access Right"
-msgstr ""
+msgstr "Direitos de leitura"
 
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_analytic_user_function
@@ -11287,18 +11338,18 @@ msgstr "Arabic / الْعَرَبيّة"
 #. module: base
 #: selection:ir.translation,state:0
 msgid "Translated"
-msgstr ""
+msgstr "Traduzido"
 
 #. 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 ""
+msgstr "Empresa Padrão por Objeto"
 
 #. module: base
 #: field:ir.ui.menu,needaction_counter:0
 msgid "Number of actions the user has to perform"
-msgstr ""
+msgstr "Número de ações que o usuário tem para realizar"
 
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_web_hello
@@ -11328,7 +11379,7 @@ msgstr "Domínio"
 #: code:addons/base/ir/ir_fields.py:167
 #, python-format
 msgid "Use '1' for yes and '0' for no"
-msgstr ""
+msgstr "Use '1' para sim e '0' para não"
 
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_marketing_campaign
@@ -11349,7 +11400,7 @@ msgstr ""
 #: code:addons/base/ir/ir_fields.py:314
 #, python-format
 msgid "Invalid database id '%s' for the field '%%(field)s'"
-msgstr ""
+msgstr "Base de dados invalida(%s) para o campo '%%(field)s'"
 
 #. module: base
 #: view:res.lang:0
@@ -11408,7 +11459,7 @@ msgstr ""
 #. module: base
 #: view:ir.filters:0
 msgid "Shared"
-msgstr ""
+msgstr "Compartilhado"
 
 #. module: base
 #: code:addons/base/module/module.py:336
@@ -11486,6 +11537,9 @@ msgid ""
 "Allow users to sign up through OAuth2 Provider.\n"
 "===============================================\n"
 msgstr ""
+"\n"
+"Permite que os usuários se inscrevam através de um serviço OAuth2.\n"
+"============================================================\n"
 
 #. module: base
 #: view:ir.cron:0
@@ -11507,12 +11561,12 @@ msgstr "Porto Rico"
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_web_tests_demo
 msgid "Demonstration of web/javascript tests"
-msgstr ""
+msgstr "Demonstração de testes web/jsvascript"
 
 #. module: base
 #: field:workflow.transition,signal:0
 msgid "Signal (Button Name)"
-msgstr ""
+msgstr "Sinal(Nome do botão)"
 
 #. module: base
 #: view:ir.actions.act_window:0
@@ -11542,7 +11596,7 @@ msgstr "Granada"
 #. module: base
 #: help:res.partner,customer:0
 msgid "Check this box if this contact is a customer."
-msgstr ""
+msgstr "Marque se o contato é um cliente."
 
 #. module: base
 #: view:ir.actions.server:0
@@ -11570,7 +11624,7 @@ msgstr ""
 #. module: base
 #: field:res.users,partner_id:0
 msgid "Related Partner"
-msgstr ""
+msgstr "Parceiro Relacionado"
 
 #. module: base
 #: code:addons/osv.py:151
@@ -11598,13 +11652,13 @@ msgstr "Operações de Produção"
 #. module: base
 #: view:base.language.export:0
 msgid "Here is the exported translation file:"
-msgstr ""
+msgstr "Aqui está o arquivo de tradução exportado:"
 
 #. 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 "Conteúdo RML"
 
 #. module: base
 #: view:res.lang:0
@@ -11762,6 +11816,13 @@ msgid ""
 "\n"
 "The decimal precision is configured per company.\n"
 msgstr ""
+"\n"
+"Configurar a precisão dos valores para diferentes tipos de uso: "
+"contabilidade, vendas, compras.\n"
+"============================================================================="
+"=========\n"
+"\n"
+"A precisão decimal é configurada por empresa.\n"
 
 #. module: base
 #: selection:res.company,paper_format:0
@@ -11771,7 +11832,7 @@ msgstr "A4"
 #. module: base
 #: view:res.config.installer:0
 msgid "Configuration Installer"
-msgstr ""
+msgstr "Instalador de configuração"
 
 #. module: base
 #: field:res.partner,customer:0
@@ -11858,17 +11919,20 @@ msgid ""
 "(if you delete a native ACL, it will be re-created when you reload the "
 "module."
 msgstr ""
+"Se você desmarcar o campo ativo, ele irá desativar a ACL sem excluí-lo.(Se "
+"você excluir uma ACL nativa, ela será recriada quando você recarregar o "
+"módulo)."
 
 #. module: base
 #: model:ir.model,name:base.model_ir_fields_converter
 msgid "ir.fields.converter"
-msgstr ""
+msgstr "ir.fields.converter"
 
 #. module: base
 #: code:addons/base/res/res_partner.py:436
 #, python-format
 msgid "Couldn't create contact without email address !"
-msgstr ""
+msgstr "Não posso criar contatos sem endereço de email!"
 
 #. module: base
 #: model:ir.module.category,name:base.module_category_manufacturing
@@ -11890,12 +11954,12 @@ msgstr "Cancelar Instalação"
 #. module: base
 #: model:ir.model,name:base.model_ir_model_relation
 msgid "ir.model.relation"
-msgstr ""
+msgstr "ir.model.relation"
 
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_account_check_writing
 msgid "Check Writing"
-msgstr ""
+msgstr "Verifique a redação"
 
 #. module: base
 #: model:ir.module.module,description:base.module_plugin_outlook
@@ -12120,7 +12184,7 @@ msgstr "UK - Contabilidade"
 #. module: base
 #: model:res.partner.title,shortcut:base.res_partner_title_madam
 msgid "Mrs."
-msgstr ""
+msgstr "Sra."
 
 #. module: base
 #: code:addons/base/ir/ir_model.py:424
@@ -12141,7 +12205,7 @@ msgstr "Ref. Usuário"
 #: code:addons/base/ir/ir_fields.py:227
 #, python-format
 msgid "'%s' does not seem to be a valid datetime for field '%%(field)s'"
-msgstr ""
+msgstr "'%s' não parece ser um campo datetime válido '%%(field)s'"
 
 #. module: base
 #: model:res.partner.bank.type.field,name:base.bank_normal_field_bic
@@ -12156,7 +12220,7 @@ msgstr "Expressão de repetição"
 #. module: base
 #: model:res.partner.category,name:base.res_partner_category_16
 msgid "Retailer"
-msgstr ""
+msgstr "Varejista"
 
 #. module: base
 #: view:ir.model.fields:0
@@ -12207,6 +12271,8 @@ msgstr ""
 msgid ""
 "Please make sure no workitems refer to an activity before deleting it!"
 msgstr ""
+"Certifique-se de que não há itens de trabalho para a atividade antes de "
+"excluí-la!"
 
 #. module: base
 #: model:res.country,name:base.tr
@@ -12295,7 +12361,7 @@ msgstr "Informações da Conexão"
 #. module: base
 #: model:res.partner.title,name:base.res_partner_title_prof
 msgid "Professor"
-msgstr ""
+msgstr "Professor"
 
 #. module: base
 #: model:res.country,name:base.hm
@@ -12324,7 +12390,7 @@ msgstr "Ajuda você a lidar com suas cotações, pedidos e faturamento."
 #. module: base
 #: field:res.users,login_date:0
 msgid "Latest connection"
-msgstr ""
+msgstr "Última conecção"
 
 #. module: base
 #: field:res.groups,implied_ids:0
@@ -12407,7 +12473,7 @@ msgstr "Binário"
 #. module: base
 #: model:res.partner.title,name:base.res_partner_title_doctor
 msgid "Doctor"
-msgstr ""
+msgstr "Doutor"
 
 #. module: base
 #: model:ir.module.module,description:base.module_mrp_repair
@@ -12464,7 +12530,7 @@ msgstr "Outros Parceiros"
 #: view:workflow.workitem:0
 #: field:workflow.workitem,state:0
 msgid "Status"
-msgstr ""
+msgstr "Estado"
 
 #. module: base
 #: model:ir.actions.act_window,name:base.action_currency_form
@@ -12476,7 +12542,7 @@ msgstr "Moedas"
 #. module: base
 #: model:res.partner.category,name:base.res_partner_category_8
 msgid "Consultancy Services"
-msgstr ""
+msgstr "Serviços de consultoria"
 
 #. module: base
 #: help:ir.values,value:0
@@ -12496,7 +12562,7 @@ msgstr "O nome do grupo deve ser único!"
 #. module: base
 #: help:ir.translation,module:0
 msgid "Module this term belongs to"
-msgstr ""
+msgstr "Este termo pertence ao módulo"
 
 #. module: base
 #: model:ir.module.module,description:base.module_web_view_editor
@@ -12591,7 +12657,7 @@ msgstr "Aquisições"
 #. module: base
 #: model:res.partner.category,name:base.res_partner_category_6
 msgid "Bronze"
-msgstr ""
+msgstr "Bronze"
 
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_hr_payroll_account
@@ -12621,12 +12687,12 @@ msgstr "Mês de Criação"
 #. module: base
 #: field:ir.module.module,demo:0
 msgid "Demo Data"
-msgstr ""
+msgstr "Dados de Demonstração"
 
 #. module: base
 #: model:res.partner.title,shortcut:base.res_partner_title_mister
 msgid "Mr."
-msgstr ""
+msgstr "Sr."
 
 #. module: base
 #: model:res.country,name:base.mv
@@ -12636,7 +12702,7 @@ msgstr "Ilhas Maldivas"
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_portal_crm
 msgid "Portal CRM"
-msgstr ""
+msgstr "Portal CRM"
 
 #. module: base
 #: model:ir.ui.menu,name:base.next_id_4
@@ -12781,7 +12847,7 @@ msgstr ""
 #. module: base
 #: field:ir.actions.report.xml,report_sxw:0
 msgid "SXW Path"
-msgstr ""
+msgstr "Endereço do SXW"
 
 #. module: base
 #: model:ir.module.module,description:base.module_account_asset
@@ -12814,7 +12880,7 @@ msgstr "Banco"
 #: 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 "Ponto de Venda"
 
 #. module: base
 #: model:ir.module.module,description:base.module_mail
@@ -13011,7 +13077,7 @@ msgstr "Filtrar em meus documentos"
 #. module: base
 #: model:ir.module.module,summary:base.module_project_gtd
 msgid "Personal Tasks, Contexts, Timeboxes"
-msgstr ""
+msgstr "Tarefas pessoais, Contextos, Planilhas"
 
 #. module: base
 #: model:ir.module.module,description:base.module_l10n_cr
@@ -13059,7 +13125,7 @@ msgstr "Gabão"
 #. module: base
 #: model:ir.module.module,summary:base.module_stock
 msgid "Inventory, Logistic, Storage"
-msgstr ""
+msgstr "Inventário, Logística, Armazenamento"
 
 #. module: base
 #: view:ir.actions.act_window:0
@@ -13123,7 +13189,7 @@ msgstr "Chipre"
 #. module: base
 #: field:res.users,new_password:0
 msgid "Set Password"
-msgstr ""
+msgstr "Definir Senha"
 
 #. module: base
 #: field:ir.actions.server,subject:0
@@ -13171,7 +13237,7 @@ msgstr "Preferências"
 #. module: base
 #: model:res.partner.category,name:base.res_partner_category_9
 msgid "Components Buyer"
-msgstr ""
+msgstr "Comprador de componentes"
 
 #. module: base
 #: view:ir.module.module:0
@@ -13179,6 +13245,8 @@ msgid ""
 "Do you confirm the uninstallation of this module? This will permanently "
 "erase all data currently stored by the module!"
 msgstr ""
+"Confirma a desinstalação deste módulo? Isto apagará de forma permanente "
+"todos os dados armazenados para este módulo!"
 
 #. module: base
 #: help:ir.cron,function:0
@@ -13245,7 +13313,7 @@ msgstr "Servidores de email de saída"
 #. module: base
 #: model:ir.ui.menu,name:base.menu_custom
 msgid "Technical"
-msgstr ""
+msgstr "Técnico"
 
 #. module: base
 #: model:res.country,name:base.cn
@@ -13493,7 +13561,7 @@ msgstr "Ação a ser Executada"
 #: field:ir.model,modules:0
 #: field:ir.model.fields,modules:0
 msgid "In Modules"
-msgstr ""
+msgstr "Nos Módulos"
 
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_contacts
@@ -13592,7 +13660,7 @@ msgstr "Zaire"
 #. module: base
 #: model:ir.module.module,summary:base.module_project
 msgid "Projects, Tasks"
-msgstr ""
+msgstr "Projetos, Tarefas"
 
 #. module: base
 #: field:workflow.instance,res_id:0
@@ -13610,7 +13678,7 @@ msgstr "Informação"
 #: code:addons/base/ir/ir_fields.py:147
 #, python-format
 msgid "false"
-msgstr ""
+msgstr "falso"
 
 #. module: base
 #: model:ir.module.module,description:base.module_account_analytic_analysis
@@ -13676,6 +13744,8 @@ msgid ""
 "The user this filter is private to. When left empty the filter is public and "
 "available to all users."
 msgstr ""
+"O usuário de que este filtro é exclusivo, Quando em branco o filtro é "
+"público e disponível para todos os usuários."
 
 #. module: base
 #: field:ir.actions.act_window,auto_refresh:0
@@ -13705,6 +13775,8 @@ msgid ""
 "Automatically set to let administators find new terms that might need to be "
 "translated"
 msgstr ""
+"Automaticamente definida para permitir que administradores encontrem novos "
+"termos que talvez precisem ser traduzidos"
 
 #. module: base
 #: code:addons/base/ir/ir_model.py:84
@@ -13835,6 +13907,8 @@ msgid ""
 "the user will have access to all records of everyone in the sales "
 "application."
 msgstr ""
+"o usuário terá acesso a todos os registros de todos os usuários no módulo de "
+"vendas."
 
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_event
@@ -13889,6 +13963,8 @@ msgid ""
 "                                the rightmost column (value) contains the "
 "translations"
 msgstr ""
+"Formato CSV: você pode editá-lo diretamente com o seu software de planilha "
+"favorito,"
 
 #. module: base
 #: model:ir.module.module,description:base.module_account_chart
@@ -13998,6 +14074,8 @@ msgid ""
 "Check this to define the report footer manually.  Otherwise it will be "
 "filled in automatically."
 msgstr ""
+"Marque esta opção para definir o rodapé do relatório manualmente. Caso "
+"contrário, será preenchido automaticamente."
 
 #. module: base
 #: view:res.partner:0
@@ -14012,7 +14090,7 @@ msgstr "Instalar Módulos"
 #. module: base
 #: model:ir.ui.menu,name:base.menu_import_crm
 msgid "Import & Synchronize"
-msgstr ""
+msgstr "Importar & Sincronizar"
 
 #. module: base
 #: view:res.partner:0
@@ -14043,7 +14121,7 @@ msgstr "Origem"
 #: field:ir.model.constraint,date_init:0
 #: field:ir.model.relation,date_init:0
 msgid "Initialization Date"
-msgstr ""
+msgstr "Data de Inicialização"
 
 #. module: base
 #: model:res.country,name:base.vu
@@ -14157,7 +14235,7 @@ msgstr ""
 #: code:addons/base/ir/ir_fields.py:147
 #, python-format
 msgid "no"
-msgstr ""
+msgstr "não"
 
 #. module: base
 #: field:ir.actions.server,trigger_obj_id:0
@@ -14187,7 +14265,7 @@ msgstr "Configuração do Sistema pronta"
 #: view:ir.config_parameter:0
 #: model:ir.ui.menu,name:base.ir_config_menu
 msgid "System Parameters"
-msgstr ""
+msgstr "Parâmetros do Sistema"
 
 #. module: base
 #: model:ir.module.module,description:base.module_l10n_ch
@@ -14256,7 +14334,7 @@ msgstr "Ação em Multiplos Docs."
 #: model:ir.actions.act_window,name:base.action_partner_title_partner
 #: model:ir.ui.menu,name:base.menu_partner_title_partner
 msgid "Titles"
-msgstr ""
+msgstr "Títulos"
 
 #. module: base
 #: model:ir.module.module,description:base.module_anonymization
@@ -14320,7 +14398,7 @@ msgstr "Luxemburgo"
 #. module: base
 #: model:ir.module.module,summary:base.module_base_calendar
 msgid "Personal & Shared Calendar"
-msgstr ""
+msgstr "Calendários Pessoais & Compartilhados"
 
 #. module: base
 #: selection:res.request,priority:0
@@ -14397,7 +14475,7 @@ msgstr ""
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_base_gengo
 msgid "Automated Translations through Gengo API"
-msgstr ""
+msgstr "Traduções automáticas através Gengo API"
 
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_account_payment
@@ -14432,7 +14510,7 @@ msgstr "Tailândia"
 #. module: base
 #: model:ir.module.module,summary:base.module_account_voucher
 msgid "Send Invoices and Track Payments"
-msgstr ""
+msgstr "Enviar Faturas e Rastrear Pagamentos"
 
 #. module: base
 #: model:ir.ui.menu,name:base.menu_crm_config_lead
@@ -14557,12 +14635,12 @@ msgstr "Taxa de Câmbio"
 #: view:base.module.upgrade:0
 #: field:base.module.upgrade,module_info:0
 msgid "Modules to Update"
-msgstr ""
+msgstr "Módulos a serem Atualizados"
 
 #. module: base
 #: model:ir.ui.menu,name:base.menu_custom_multicompany
 msgid "Multi-Companies"
-msgstr ""
+msgstr "Multi-Empresas"
 
 #. module: base
 #: field:workflow,osv:0
@@ -14677,7 +14755,7 @@ msgstr "Uso de ação"
 #. module: base
 #: field:ir.module.module,name:0
 msgid "Technical Name"
-msgstr ""
+msgstr "Nome Técnico"
 
 #. module: base
 #: model:ir.model,name:base.model_workflow_workitem
@@ -14726,7 +14804,7 @@ msgstr "Contabilidade - Alemã"
 #. module: base
 #: view:ir.sequence:0
 msgid "Day of the Year: %(doy)s"
-msgstr ""
+msgstr "Dia do Ano: %(doy)s"
 
 #. module: base
 #: field:ir.ui.menu,web_icon:0
@@ -14749,6 +14827,8 @@ msgid ""
 "If this field is empty, the view applies to all users. Otherwise, the view "
 "applies to the users of those groups only."
 msgstr ""
+"Se este campo estiver vazio, a view se aplica a todos os usuários. Caso "
+"contrário, a view se aplica aos usuários desses grupos apenas."
 
 #. module: base
 #: selection:base.language.install,lang:0
@@ -14786,7 +14866,7 @@ msgstr ""
 #. module: base
 #: view:base.language.export:0
 msgid "Export Settings"
-msgstr ""
+msgstr "Configurações da Exportação"
 
 #. module: base
 #: field:ir.actions.act_window,src_model:0
@@ -14796,7 +14876,7 @@ msgstr ""
 #. module: base
 #: view:ir.sequence:0
 msgid "Day of the Week (0:Monday): %(weekday)s"
-msgstr ""
+msgstr "Dia da Semana (0:Segunda): %(weekday)s"
 
 #. module: base
 #: code:addons/base/module/wizard/base_module_upgrade.py:84
@@ -14810,7 +14890,7 @@ msgstr "Dependência não atendida!"
 #: code:addons/base/ir/ir_model.py:1023
 #, python-format
 msgid "Administrator access is required to uninstall a module"
-msgstr ""
+msgstr "Somente Administradores podem desinstalar um módulo"
 
 #. module: base
 #: model:ir.model,name:base.model_base_module_configuration
@@ -14826,6 +14906,10 @@ msgid ""
 "\n"
 "(Document type: %s, Operation: %s)"
 msgstr ""
+"A operação solicitada não pode ser concluída devido a restrições de "
+"segurança. Por favor, informe ao administrador do sistema.\n"
+"\n"
+"(Tipo de documento: %s, Operação: %s)"
 
 #. module: base
 #: model:ir.module.module,description:base.module_idea
@@ -14996,7 +15080,7 @@ msgstr "Serviços Pós-Venda"
 #. module: base
 #: field:base.language.import,code:0
 msgid "ISO Code"
-msgstr ""
+msgstr "Código ISO"
 
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_l10n_fr
@@ -15011,7 +15095,7 @@ msgstr "Executar"
 #. module: base
 #: selection:res.partner,type:0
 msgid "Shipping"
-msgstr ""
+msgstr "Expedição"
 
 #. module: base
 #: model:ir.module.module,description:base.module_project_mrp
@@ -15213,7 +15297,7 @@ msgstr "Janela Atual"
 #: model:ir.module.category,name:base.module_category_hidden
 #: view:res.users:0
 msgid "Technical Settings"
-msgstr ""
+msgstr "Configurações Técnicas"
 
 #. module: base
 #: model:ir.module.category,description:base.module_category_accounting_and_finance
@@ -15232,7 +15316,7 @@ msgstr "Plug-in Thunderbird"
 #. module: base
 #: model:ir.module.module,summary:base.module_event
 msgid "Trainings, Conferences, Meetings, Exhibitions, Registrations"
-msgstr ""
+msgstr "Treinamentos, Conferências, Reuniões, Exposições, Inscrições"
 
 #. module: base
 #: model:ir.model,name:base.model_res_country
@@ -15250,7 +15334,7 @@ msgstr "País"
 #. module: base
 #: model:res.partner.category,name:base.res_partner_category_15
 msgid "Wholesaler"
-msgstr ""
+msgstr "Atacadista"
 
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_base_vat
@@ -15315,7 +15399,7 @@ msgstr "Espanhol (SV) / Español (SV)"
 #. module: base
 #: model:ir.actions.act_window,name:base.open_module_tree
 msgid "Install a Module"
-msgstr ""
+msgstr "Instalar um Módulo"
 
 #. module: base
 #: field:ir.module.module,auto_install:0
@@ -15557,7 +15641,7 @@ msgstr "Seicheles"
 #. module: base
 #: model:res.partner.category,name:base.res_partner_category_4
 msgid "Gold"
-msgstr ""
+msgstr "Ouro"
 
 #. module: base
 #: code:addons/base/res/res_company.py:159
@@ -15584,7 +15668,7 @@ msgstr "Informações Gerais"
 #. module: base
 #: field:ir.model.data,complete_name:0
 msgid "Complete ID"
-msgstr ""
+msgstr "ID completo"
 
 #. module: base
 #: model:res.country,name:base.tc
@@ -15685,7 +15769,7 @@ msgstr ""
 #. module: base
 #: view:res.partner:0
 msgid "Internal Notes"
-msgstr ""
+msgstr "Notas Internas"
 
 #. module: base
 #: selection:res.partner.address,type:0
@@ -15706,7 +15790,7 @@ msgstr "Requisição de Compra"
 #. module: base
 #: selection:ir.actions.act_window,target:0
 msgid "Inline Edit"
-msgstr ""
+msgstr "Edição em linha"
 
 #. module: base
 #: selection:ir.cron,interval_type:0
@@ -15727,7 +15811,7 @@ msgstr "Parceiros "
 #. module: base
 #: view:res.partner:0
 msgid "Is a Company?"
-msgstr ""
+msgstr "É uma empresa?"
 
 #. module: base
 #: code:addons/base/res/res_company.py:159
@@ -15749,7 +15833,7 @@ msgstr "Criar Objeto"
 #. module: base
 #: model:res.country,name:base.ss
 msgid "South Sudan"
-msgstr ""
+msgstr "Sudão do Sul"
 
 #. module: base
 #: field:ir.filters,context:0
@@ -15835,7 +15919,7 @@ msgstr "Russo / русский язык"
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_auth_signup
 msgid "Signup"
-msgstr ""
+msgstr "Inscrever-se"
 
 #~ msgid "SMS - Gateway: clickatell"
 #~ msgstr "SMS - Gateway: clickatell"