[MERGE]with lp:~openerp-dev/openobject-addons/trunk-dev-addons1

bzr revid: jam@tinyerp.com-20110110124301-yn0bq5dr759x9px9

addons/account/account.py

@@ -131,7 +131,7 @@ class account_account_type(osv.osv):
     _name = "account.account.type"
     _description = "Account Type"
     _columns = {
-        'name': fields.char('Acc. Type Name', size=64, required=True, translate=True),
+        'name': fields.char('Acc. Type Name', size=64, required=True),
         'code': fields.char('Code', size=32, required=True),
         'close_method': fields.selection([('none', 'None'), ('balance', 'Balance'), ('detail', 'Detail'), ('unreconciled', 'Unreconciled')], 'Deferral Method', required=True, help="""Set here the method that will be used to generate the end of year journal entries for all the accounts of this type.
 

addons/account/account_installer.xml

@@ -28,7 +28,7 @@
                         <field name="charts"/>
                             <group colspan="4" groups="base.group_extended">
                                 <separator col="4" colspan="4" string="Configure Fiscal Year"/>
-                                <field name="company_id" colspan="4" widget="selection" groups="base.group_multi_company"/>
+                                <field name="company_id" colspan="4" widget="selection"/><!-- we assume that this wizard will be run only by administrators and as this field may cause problem if hidden (because of the default company of the user removed from the selection because already configured), we simply choosed to remove the group "multi company" of it --> 
                                 <field name="date_start" on_change="on_change_start_date(date_start)"/>
                                 <field name="date_stop"/>
                                 <field name="period" colspan="4"/>

addons/account/account_move_line.py

@@ -57,7 +57,7 @@ class account_move_line(osv.osv):
 
         if context.get('date_from', False) and context.get('date_to', False):
             if initial_bal:
-                where_move_lines_by_date = " OR " +obj+".move_id IN (SELECT id FROM account_move WHERE date < '" +context['date_from']+"')"
+                where_move_lines_by_date = " AND " +obj+".move_id IN (SELECT id FROM account_move WHERE date < '" +context['date_from']+"')"
             else:
                 where_move_lines_by_date = " AND " +obj+".move_id IN (SELECT id FROM account_move WHERE date >= '" +context['date_from']+"' AND date <= '"+context['date_to']+"')"
 
@@ -87,7 +87,7 @@ class account_move_line(osv.osv):
                 ids = ','.join([str(x) for x in context['periods']])
                 query = obj+".state <> 'draft' AND "+obj+".period_id IN (SELECT id FROM account_period WHERE fiscalyear_id IN (%s) AND id IN (%s)) %s %s" % (fiscalyear_clause, ids, where_move_state, where_move_lines_by_date)
         else:
-            query = obj+".state <> 'draft' AND "+obj+".period_id IN (SELECT id FROM account_period WHERE fiscalyear_id IN (%s) %s %s)" % (fiscalyear_clause, where_move_state, where_move_lines_by_date)
+            query = obj+".state <> 'draft' AND "+obj+".period_id IN (SELECT id FROM account_period WHERE fiscalyear_id IN (%s)) %s %s" % (fiscalyear_clause, where_move_state, where_move_lines_by_date)
 
         if context.get('journal_ids', False):
             query += ' AND '+obj+'.journal_id IN (%s)' % ','.join(map(str, context['journal_ids']))
@@ -100,6 +100,57 @@ class account_move_line(osv.osv):
 
         return query
 
+    def _amount_residual(self, cr, uid, ids, field_names, args, context=None):
+        """
+           This function returns the residual amount on a receivable or payable account.move.line. 
+           By default, it returns an amount in the currency of this journal entry (maybe different 
+           of the company currency), but if you pass 'residual_in_company_currency' = True in the 
+           context then the returned amount will be in company currency.
+        """
+        res = {}
+        if context is None:
+            context = {}
+        cur_obj = self.pool.get('res.currency')
+        for move_line in self.browse(cr, uid, ids, context=context):
+            res[move_line.id] = {
+                'amount_residual': 0.0,
+                'amount_residual_currency': 0.0,
+            }
+ 
+            if move_line.reconcile_id:
+                continue
+            if not move_line.account_id.type in ('payable', 'receivable'):
+                #this function does not suport to be used on move lines not related to payable or receivable accounts
+                continue
+            
+            if move_line.currency_id:
+                move_line_total = move_line.amount_currency
+                sign = move_line.amount_currency < 0 and -1 or 1
+            else:
+                move_line_total = move_line.debit - move_line.credit
+                sign = (move_line.debit - move_line.credit) < 0 and -1 or 1
+            line_total_in_company_currency =  move_line.debit - move_line.credit
+            context_unreconciled = context.copy()
+            if move_line.reconcile_partial_id:
+                for payment_line in move_line.reconcile_partial_id.line_partial_ids:
+                    if payment_line.id == move_line.id:
+                        continue
+                    if payment_line.currency_id and move_line.currency_id and payment_line.currency_id.id == move_line.currency_id.id:
+                            move_line_total += payment_line.amount_currency
+                    else:
+                        if move_line.currency_id:
+                            context_unreconciled.update({'date': payment_line.date})
+                            amount_in_foreign_currency = cur_obj.compute(cr, uid, move_line.company_id.currency_id.id, move_line.currency_id.id, (payment_line.debit - payment_line.credit), round=False, context=context_unreconciled)
+                            move_line_total += amount_in_foreign_currency
+                        else:
+                            move_line_total += (payment_line.debit - payment_line.credit)
+                    line_total_in_company_currency += (payment_line.debit - payment_line.credit)
+
+            result = move_line_total
+            res[move_line.id]['amount_residual_currency'] =  sign * (move_line.currency_id and self.pool.get('res.currency').round(cr, uid, move_line.currency_id, result) or result)
+            res[move_line.id]['amount_residual'] = sign * line_total_in_company_currency
+        return res
+
     def default_get(self, cr, uid, fields, context=None):
         data = self._default_get(cr, uid, fields, context=context)
         for f in data.keys():
@@ -433,6 +484,8 @@ class account_move_line(osv.osv):
         'reconcile_id': fields.many2one('account.move.reconcile', 'Reconcile', readonly=True, ondelete='set null', select=2),
         'reconcile_partial_id': fields.many2one('account.move.reconcile', 'Partial Reconcile', readonly=True, ondelete='set null', select=2),
         'amount_currency': fields.float('Amount Currency', help="The amount expressed in an optional other currency if it is a multi-currency entry.", digits_compute=dp.get_precision('Account')),
+        'amount_residual_currency': fields.function(_amount_residual, method=True, string='Residual Amount', multi="residual", help="The residual amount on a receivable or payable of a journal entry expressed in its currency (maybe different of the company currency)."),
+        'amount_residual': fields.function(_amount_residual, method=True, string='Residual Amount', multi="residual", help="The residual amount on a receivable or payable of a journal entry expressed in the company currency."),
         'currency_id': fields.many2one('res.currency', 'Currency', help="The optional other currency if it is a multi-currency entry."),
         'period_id': fields.many2one('account.period', 'Period', required=True, select=2),
         'journal_id': fields.many2one('account.journal', 'Journal', required=True, select=1),
@@ -676,6 +729,7 @@ class account_move_line(osv.osv):
             company_list.append(line.company_id.id)
 
         for line in self.browse(cr, uid, ids, context=context):
+            company_currency_id = line.company_id.currency_id
             if line.reconcile_id:
                 raise osv.except_osv(_('Warning'), _('Already Reconciled!'))
             if line.reconcile_partial_id:
@@ -688,8 +742,7 @@ class account_move_line(osv.osv):
             else:
                 unmerge.append(line.id)
                 total += (line.debit or 0.0) - (line.credit or 0.0)
-
-        if not total:
+        if self.pool.get('res.currency').is_zero(cr, uid, company_currency_id, total):
             res = self.reconcile(cr, uid, merges+unmerge, context=context)
             return res
         r_id = move_rec_obj.create(cr, uid, {
@@ -771,6 +824,19 @@ class account_move_line(osv.osv):
                 libelle = context['comment']
             else:
                 libelle = _('Write-Off')
+
+            cur_obj = self.pool.get('res.currency')
+            cur_id = False
+            amount_currency_writeoff = 0.0
+            if context.get('company_currency_id',False) != context.get('currency_id',False):
+                cur_id = context.get('currency_id',False)
+                for line in unrec_lines:
+                    if line.currency_id and line.currency_id.id == context.get('currency_id',False):
+                        amount_currency_writeoff += line.amount_currency
+                    else:
+                        tmp_amount = cur_obj.compute(cr, uid, line.account_id.company_id.currency_id.id, context.get('currency_id',False), abs(line.debit-line.credit), context={'date': line.date})
+                        amount_currency_writeoff += (line.debit > 0) and tmp_amount or -tmp_amount
+
             writeoff_lines = [
                 (0, 0, {
                     'name': libelle,
@@ -779,8 +845,8 @@ class account_move_line(osv.osv):
                     'account_id': account_id,
                     'date': date,
                     'partner_id': partner_id,
-                    'currency_id': account.currency_id.id or False,
-                    'amount_currency': account.currency_id.id and -currency or 0.0
+                    'currency_id': cur_id or (account.currency_id.id or False),
+                    'amount_currency': amount_currency_writeoff and -1 * amount_currency_writeoff or (account.currency_id.id and -1 * currency or 0.0)
                 }),
                 (0, 0, {
                     'name': libelle,
@@ -789,7 +855,9 @@ class account_move_line(osv.osv):
                     'account_id': writeoff_acc_id,
                     'analytic_account_id': context.get('analytic_id', False),
                     'date': date,
-                    'partner_id': partner_id
+                    'partner_id': partner_id,
+                    'currency_id': cur_id or (account.currency_id.id or False),
+                    'amount_currency': amount_currency_writeoff and amount_currency_writeoff or (account.currency_id.id and currency or 0.0)
                 })
             ]
 
@@ -802,6 +870,8 @@ class account_move_line(osv.osv):
             })
 
             writeoff_line_ids = self.search(cr, uid, [('move_id', '=', writeoff_move_id), ('account_id', '=', account_id)])
+            if account_id == writeoff_acc_id:
+                writeoff_line_ids = [writeoff_line_ids[1]]
             ids += writeoff_line_ids
 
         r_id = move_rec_obj.create(cr, uid, {
@@ -1283,4 +1353,4 @@ class account_move_line(osv.osv):
 
 account_move_line()
 
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

addons/account/account_view.xml

@@ -2449,7 +2449,7 @@
                           <attribute name='string'></attribute>
                   </xpath>
                 <group string="res_config_contents" position="replace">
-                    <field name="company_id" widget="selection" groups="base.group_multi_company"/>
+                    <field name="company_id" widget="selection"/> <!-- we assume that this wizard will be run only by administrators and as this field may cause problem if hidden (because of the default company of the user removed from the selection because already configured), we simply choosed to remove the group "multi company" of it --> 
                     <field name ="code_digits" groups="base.group_extended"/>
                     <field name="chart_template_id" widget="selection" on_change="onchange_chart_template_id(chart_template_id)"/>
                     <field name ="seq_journal" groups="base.group_extended"/>

addons/account/invoice.py

@@ -88,32 +88,14 @@ class account_invoice(osv.osv):
         return [('none', _('Free Reference'))]
 
     def _amount_residual(self, cr, uid, ids, name, args, context=None):
-        res = {}
-        if context is None:
-            context = {}
-
-        cur_obj = self.pool.get('res.currency')
-        data_inv = self.browse(cr, uid, ids, context=context)
-        for inv in data_inv:
-            if inv.reconciled:
-                res[inv.id] = 0.0
-                continue
-            inv_total = inv.amount_total
-            context_unreconciled = context.copy()
-            for lines in inv.move_lines:
-                if lines.currency_id and lines.currency_id.id == inv.currency_id.id:
-                    if inv.type in ('out_invoice','in_refund'):
-                        inv_total += lines.amount_currency
-                    else:
-                        inv_total -= lines.amount_currency
-                else:
-                   context_unreconciled.update({'date': lines.date})
-                   amount_in_invoice_currency = cur_obj.compute(cr, uid, inv.company_id.currency_id.id, inv.currency_id.id,abs(lines.debit-lines.credit),round=False,context=context_unreconciled)
-                   inv_total -= amount_in_invoice_currency
-
-            result = inv_total
-            res[inv.id] =  self.pool.get('res.currency').round(cr, uid, inv.currency_id, result)
-        return res
+        result = {}
+        for invoice in self.browse(cr, uid, ids, context=context):
+            result[invoice.id] = 0.0
+            if invoice.move_id:
+                for m in invoice.move_id.line_id:
+                    if m.account_id.type in ('receivable','payable'):
+                        result[invoice.id] = m.amount_residual_currency
+        return result
 
     # Give Journal Items related to the payment reconciled to this invoice
     # Return ids of partial and total payments related to the selected invoices

addons/account/report/common_report_header.py

@@ -64,8 +64,8 @@ class common_report_header(object):
     def _get_target_move(self, data):
         if data.get('form', False) and data['form'].get('target_move', False):
             if data['form']['target_move'] == 'all':
-                return 'All Entries'
-            return 'All Posted Entries'
+                return _('All Entries')
+            return _('All Posted Entries')
         return ''
 
     def _get_end_date(self, data):
@@ -94,10 +94,10 @@ class common_report_header(object):
     def _get_filter(self, data):
         if data.get('form', False) and data['form'].get('filter', False):
             if data['form']['filter'] == 'filter_date':
-                return 'Date'
+                return _('Date')
             elif data['form']['filter'] == 'filter_period':
-                return 'Periods'
-        return 'No Filter'
+                return _('Periods')
+        return _('No Filter')
 
     def _sum_debit_period(self, period_id, journal_id=None):
         journals = journal_id or self.journal_ids

addons/account/wizard/account_move_journal.py

@@ -101,9 +101,12 @@ class account_move_journal(osv.osv_memory):
             period = period_pool.browse(cr, uid, [period_id], ['name'])[0]['name']
             period_string = _("Period: %s") % tools.ustr(period)
 
+        separator_string = _("Open Journal Items !")
+        cancel_string = _("Cancel")
+        open_string = _("Open")
         view = """<?xml version="1.0" encoding="utf-8"?>
         <form string="Standard entries">
-            <separator string="Open Journal Items !" colspan="4"/>
+            <separator string="%s" colspan="4"/>
             <field name="target_move" />
             <newline/>
             <group colspan="4" >
@@ -113,10 +116,10 @@ class account_move_journal(osv.osv_memory):
             </group>
             <group colspan="4" col="4">
                 <label string ="" colspan="2"/>
-                <button icon="gtk-cancel" special="cancel" string="Cancel"/>
-                <button icon="terp-gtk-go-back-rtl" string="Open" name="action_open_window" default_focus="1" type="object"/>
+                <button icon="gtk-cancel" special="cancel" string="%s"/>
+                <button icon="terp-gtk-go-back-rtl" string="%s" name="action_open_window" default_focus="1" type="object"/>
             </group>
-        </form>""" % (journal_string, period_string)
+        </form>""" % (separator_string, journal_string, period_string, cancel_string, open_string)
 
         view = etree.fromstring(view.encode('utf8'))
         xarch, xfields = self._view_look_dom_arch(cr, uid, view, view_id, context=context)

addons/account_accountant/i18n/account_accountant.pot

@@ -4,10 +4,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
+"Project-Id-Version: OpenERP Server 6.0.0-rc2\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-21 19:43:19+0000\n"
-"PO-Revision-Date: 2010-12-21 19:43:19+0000\n"
+"POT-Creation-Date: 2011-01-03 16:56:46+0000\n"
+"PO-Revision-Date: 2011-01-03 16:56:46+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"

addons/account_accountant/i18n/da.po

@@ -7,14 +7,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2010-12-21 19:43+0000\n"
+"POT-Creation-Date: 2011-01-03 16:56+0000\n"
 "PO-Revision-Date: 2010-11-17 08:53+0000\n"
 "Last-Translator: Martin Pihl <martinpihl@gmail.com>\n"
 "Language-Team: Danish <da@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-24 05:57+0000\n"
+"X-Launchpad-Export-Date: 2011-01-06 05:36+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_accountant

addons/account_accountant/i18n/de.po

@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2010-12-21 19:43+0000\n"
+"POT-Creation-Date: 2011-01-03 16:56+0000\n"
 "PO-Revision-Date: 2010-12-25 19:02+0000\n"
 "Last-Translator: Thorsten Vocks (OpenBig.org) <thorsten.vocks@big-"
 "consulting.net>\n"
@@ -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: 2010-12-26 04:52+0000\n"
+"X-Launchpad-Export-Date: 2011-01-06 05:36+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_accountant

addons/account_accountant/i18n/el.po

@@ -7,14 +7,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2010-12-21 19:43+0000\n"
+"POT-Creation-Date: 2011-01-03 16:56+0000\n"
 "PO-Revision-Date: 2010-12-29 13:17+0000\n"
 "Last-Translator: Dimitris Andavoglou <dimitrisand@gmail.com>\n"
 "Language-Team: Greek <el@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-31 05:28+0000\n"
+"X-Launchpad-Export-Date: 2011-01-06 05:36+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_accountant

addons/account_accountant/i18n/es.po

@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2010-12-21 19:43+0000\n"
+"POT-Creation-Date: 2011-01-03 16:56+0000\n"
 "PO-Revision-Date: 2010-12-26 08:18+0000\n"
 "Last-Translator: Jordi Esteve (www.zikzakmedia.com) "
 "<jesteve@zikzakmedia.com>\n"
@@ -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: 2010-12-27 04:41+0000\n"
+"X-Launchpad-Export-Date: 2011-01-06 05:36+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_accountant

addons/account_accountant/i18n/es_EC.po

@@ -7,14 +7,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2010-12-21 19:43+0000\n"
+"POT-Creation-Date: 2011-01-03 16:56+0000\n"
 "PO-Revision-Date: 2010-12-28 05:07+0000\n"
 "Last-Translator: Cristian Salamea (Gnuthink) <ovnicraft@gmail.com>\n"
 "Language-Team: Spanish (Ecuador) <es_EC@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-29 04:58+0000\n"
+"X-Launchpad-Export-Date: 2011-01-06 05:36+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_accountant

addons/account_accountant/i18n/fa.po

@@ -0,0 +1,33 @@
+# Persian translation for openobject-addons
+# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2011-01-03 16:56+0000\n"
+"PO-Revision-Date: 2011-01-08 06:17+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\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: 2011-01-09 04:54+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+
+#. module: account_accountant
+#: model:ir.module.module,description:account_accountant.module_meta_information
+msgid ""
+"\n"
+"This module gives the admin user the access to all the accounting features "
+"like the journal\n"
+"items and the chart of accounts.\n"
+"    "
+msgstr ""
+
+#. module: account_accountant
+#: model:ir.module.module,shortdesc:account_accountant.module_meta_information
+msgid "Accountant"
+msgstr ""

addons/account_accountant/i18n/fr.po

@@ -7,14 +7,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2010-12-21 19:43+0000\n"
-"PO-Revision-Date: 2010-12-22 14:09+0000\n"
-"Last-Translator: Aline (OpenERP) <Unknown>\n"
+"POT-Creation-Date: 2011-01-03 16:56+0000\n"
+"PO-Revision-Date: 2011-01-09 13:32+0000\n"
+"Last-Translator: Raphaël Valyi - http://www.akretion.com <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: 2010-12-24 05:57+0000\n"
+"X-Launchpad-Export-Date: 2011-01-10 05:19+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_accountant
@@ -26,6 +26,11 @@ msgid ""
 "items and the chart of accounts.\n"
 "    "
 msgstr ""
+"\n"
+"Ce module donne à l'administrateur les accès à toutes les fonctionnalités "
+"comptables tels que les lignes\n"
+"d'écriture et le plan comptable.\n"
+"    "
 
 #. module: account_accountant
 #: model:ir.module.module,shortdesc:account_accountant.module_meta_information

addons/account_accountant/i18n/hi.po

@@ -7,14 +7,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2010-12-21 19:43+0000\n"
+"POT-Creation-Date: 2011-01-03 16:56+0000\n"
 "PO-Revision-Date: 2010-12-20 08:28+0000\n"
 "Last-Translator: Sanjay Kumar <Unknown>\n"
 "Language-Team: Hindi <hi@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-24 05:57+0000\n"
+"X-Launchpad-Export-Date: 2011-01-06 05:36+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_accountant

addons/account_accountant/i18n/it.po

@@ -7,14 +7,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2010-12-21 19:43+0000\n"
+"POT-Creation-Date: 2011-01-03 16:56+0000\n"
 "PO-Revision-Date: 2010-12-03 07:39+0000\n"
 "Last-Translator: Davide Corio - Domsense <davide.corio@domsense.com>\n"
 "Language-Team: Italian <it@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-24 05:57+0000\n"
+"X-Launchpad-Export-Date: 2011-01-06 05:36+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_accountant

addons/account_accountant/i18n/lv.po

@@ -7,14 +7,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2010-12-21 19:43+0000\n"
+"POT-Creation-Date: 2011-01-03 16:56+0000\n"
 "PO-Revision-Date: 2010-12-24 01:51+0000\n"
 "Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: Latvian <lv@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-25 04:52+0000\n"
+"X-Launchpad-Export-Date: 2011-01-06 05:36+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_accountant

addons/account_accountant/i18n/mn.po

@@ -7,14 +7,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2010-12-21 19:43+0000\n"
+"POT-Creation-Date: 2011-01-03 16:56+0000\n"
 "PO-Revision-Date: 2010-12-21 14:24+0000\n"
 "Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: Mongolian <mn@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-24 05:57+0000\n"
+"X-Launchpad-Export-Date: 2011-01-06 05:36+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_accountant

addons/account_accountant/i18n/nl.po

@@ -7,14 +7,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2010-12-21 19:43+0000\n"
-"PO-Revision-Date: 2010-11-26 11:13+0000\n"
-"Last-Translator: OpenERP Administrators <Unknown>\n"
+"POT-Creation-Date: 2011-01-03 16:56+0000\n"
+"PO-Revision-Date: 2011-01-05 16:17+0000\n"
+"Last-Translator: Jan Verlaan (Veritos) <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: 2010-12-24 05:57+0000\n"
+"X-Launchpad-Export-Date: 2011-01-06 05:36+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_accountant
@@ -26,6 +26,11 @@ msgid ""
 "items and the chart of accounts.\n"
 "    "
 msgstr ""
+"\n"
+"Deze module geeft de administrator toegang tot alle accounting functies "
+"zoals de journaal\n"
+"items en het grootboekschema.\n"
+"    "
 
 #. module: account_accountant
 #: model:ir.module.module,shortdesc:account_accountant.module_meta_information

addons/account_accountant/i18n/nl_BE.po

@@ -7,14 +7,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2010-12-21 19:43+0000\n"
+"POT-Creation-Date: 2011-01-03 16:56+0000\n"
 "PO-Revision-Date: 2010-12-17 09:40+0000\n"
 "Last-Translator: Niels Huylebroeck <Unknown>\n"
 "Language-Team: Dutch (Belgium) <nl_BE@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-24 05:57+0000\n"
+"X-Launchpad-Export-Date: 2011-01-06 05:36+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_accountant

addons/account_accountant/i18n/pl.po

@@ -7,14 +7,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2010-12-21 19:43+0000\n"
+"POT-Creation-Date: 2011-01-03 16:56+0000\n"
 "PO-Revision-Date: 2010-11-19 09:15+0000\n"
 "Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: Polish <pl@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-24 05:57+0000\n"
+"X-Launchpad-Export-Date: 2011-01-06 05:36+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_accountant

addons/account_accountant/i18n/pt.po

@@ -7,14 +7,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2010-12-21 19:43+0000\n"
+"POT-Creation-Date: 2011-01-03 16:56+0000\n"
 "PO-Revision-Date: 2010-11-27 07:13+0000\n"
 "Last-Translator: OpenERP Administrators <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: 2010-12-24 05:57+0000\n"
+"X-Launchpad-Export-Date: 2011-01-06 05:36+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_accountant

addons/account_accountant/i18n/pt_BR.po

@@ -7,14 +7,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2010-12-21 19:43+0000\n"
-"PO-Revision-Date: 2010-11-25 19:41+0000\n"
-"Last-Translator: OpenERP Administrators <Unknown>\n"
+"POT-Creation-Date: 2011-01-03 16:56+0000\n"
+"PO-Revision-Date: 2011-01-05 16:44+0000\n"
+"Last-Translator: Emerson <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: 2010-12-24 05:57+0000\n"
+"X-Launchpad-Export-Date: 2011-01-06 05:36+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_accountant
@@ -26,6 +26,11 @@ msgid ""
 "items and the chart of accounts.\n"
 "    "
 msgstr ""
+"\n"
+"Este módulo concede ao administrador acesso para todas as funcionalidades "
+"financeiras como diários\n"
+"e plano de contas\n"
+"    "
 
 #. module: account_accountant
 #: model:ir.module.module,shortdesc:account_accountant.module_meta_information

addons/account_accountant/i18n/ro.po

@@ -7,14 +7,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2010-12-21 19:43+0000\n"
+"POT-Creation-Date: 2011-01-03 16:56+0000\n"
 "PO-Revision-Date: 2010-11-27 07:29+0000\n"
 "Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: Romanian <ro@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-24 05:57+0000\n"
+"X-Launchpad-Export-Date: 2011-01-06 05:36+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_accountant

addons/account_accountant/i18n/ru.po

@@ -7,14 +7,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2010-12-21 19:43+0000\n"
-"PO-Revision-Date: 2010-11-23 09:22+0000\n"
+"POT-Creation-Date: 2011-01-03 16:56+0000\n"
+"PO-Revision-Date: 2011-01-03 17:56+0000\n"
 "Last-Translator: Chertykov Denis <chertykov@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: 2010-12-24 05:57+0000\n"
+"X-Launchpad-Export-Date: 2011-01-06 05:36+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_accountant
@@ -26,6 +26,10 @@ msgid ""
 "items and the chart of accounts.\n"
 "    "
 msgstr ""
+"\n"
+"Этот модуль дает администратору доступ ко всем функциям \n"
+"бухучета (журналам, планам счетов и т.п.)\n"
+"    "
 
 #. module: account_accountant
 #: model:ir.module.module,shortdesc:account_accountant.module_meta_information

addons/account_accountant/i18n/sk.po

@@ -7,14 +7,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2010-12-21 19:43+0000\n"
+"POT-Creation-Date: 2011-01-03 16:56+0000\n"
 "PO-Revision-Date: 2010-12-09 09:40+0000\n"
 "Last-Translator: Radoslav Sloboda <rado.sloboda@gmail.com>\n"
 "Language-Team: Slovak <sk@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-24 05:57+0000\n"
+"X-Launchpad-Export-Date: 2011-01-06 05:36+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_accountant

addons/account_accountant/i18n/sl.po

@@ -7,14 +7,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2010-12-21 19:43+0000\n"
+"POT-Creation-Date: 2011-01-03 16:56+0000\n"
 "PO-Revision-Date: 2010-12-26 08:13+0000\n"
 "Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: Slovenian <sl@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-27 04:41+0000\n"
+"X-Launchpad-Export-Date: 2011-01-06 05:36+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_accountant

addons/account_accountant/i18n/sr.po

@@ -7,14 +7,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2010-12-21 19:43+0000\n"
+"POT-Creation-Date: 2011-01-03 16:56+0000\n"
 "PO-Revision-Date: 2010-11-13 08:31+0000\n"
 "Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: Serbian <sr@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-24 05:57+0000\n"
+"X-Launchpad-Export-Date: 2011-01-06 05:36+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_accountant

addons/account_accountant/i18n/sr@latin.po

@@ -7,14 +7,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2010-12-21 19:43+0000\n"
+"POT-Creation-Date: 2011-01-03 16:56+0000\n"
 "PO-Revision-Date: 2010-12-23 15:11+0000\n"
 "Last-Translator: Olivier Dony (OpenERP) <Unknown>\n"
 "Language-Team: Serbian latin <sr@latin@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-24 05:57+0000\n"
+"X-Launchpad-Export-Date: 2011-01-06 05:36+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_accountant

addons/account_accountant/i18n/sv.po

@@ -7,14 +7,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2010-12-21 19:43+0000\n"
-"PO-Revision-Date: 2010-11-24 09:42+0000\n"
-"Last-Translator: OpenERP Administrators <Unknown>\n"
+"POT-Creation-Date: 2011-01-03 16:56+0000\n"
+"PO-Revision-Date: 2011-01-09 00:30+0000\n"
+"Last-Translator: Magnus Brandt (mba), Aspirix AB <Unknown>\n"
 "Language-Team: Swedish <sv@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-24 05:57+0000\n"
+"X-Launchpad-Export-Date: 2011-01-10 05:19+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_accountant
@@ -26,6 +26,11 @@ msgid ""
 "items and the chart of accounts.\n"
 "    "
 msgstr ""
+"\n"
+"Denna modul ger administratören tillgång till bokföringsfunktioner som "
+"journaler\n"
+"och kontoplan.\n"
+"    "
 
 #. module: account_accountant
 #: model:ir.module.module,shortdesc:account_accountant.module_meta_information

addons/account_accountant/i18n/tr.po

@@ -7,14 +7,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2010-12-21 19:43+0000\n"
-"PO-Revision-Date: 2010-11-24 09:40+0000\n"
-"Last-Translator: OpenERP Administrators <Unknown>\n"
+"POT-Creation-Date: 2011-01-03 16:56+0000\n"
+"PO-Revision-Date: 2011-01-09 15:37+0000\n"
+"Last-Translator: Arif Aydogmus <arifaydogmus@gmail.com>\n"
 "Language-Team: Turkish <tr@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-24 05:57+0000\n"
+"X-Launchpad-Export-Date: 2011-01-10 05:19+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_accountant
@@ -26,6 +26,10 @@ msgid ""
 "items and the chart of accounts.\n"
 "    "
 msgstr ""
+"\n"
+"Bu modül Admin kullanıcısının muhasebesel tüm özelliklere erişmesini sağlar. "
+"(Ör: Yevmiyeler, Muhasebe Hesap Planları vd)\n"
+"    "
 
 #. module: account_accountant
 #: model:ir.module.module,shortdesc:account_accountant.module_meta_information

addons/account_accountant/i18n/uk.po

@@ -7,14 +7,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2010-12-21 19:43+0000\n"
+"POT-Creation-Date: 2011-01-03 16:56+0000\n"
 "PO-Revision-Date: 2010-11-18 10:08+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Ukrainian <uk@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-24 05:57+0000\n"
+"X-Launchpad-Export-Date: 2011-01-06 05:36+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_accountant

addons/account_accountant/i18n/vi.po

@@ -7,14 +7,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2010-12-21 19:43+0000\n"
+"POT-Creation-Date: 2011-01-03 16:56+0000\n"
 "PO-Revision-Date: 2010-12-25 18:42+0000\n"
 "Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: Vietnamese <vi@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-26 04:52+0000\n"
+"X-Launchpad-Export-Date: 2011-01-06 05:36+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_accountant

addons/account_accountant/i18n/zh_CN.po

@@ -7,14 +7,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2010-12-21 19:43+0000\n"
+"POT-Creation-Date: 2011-01-03 16:56+0000\n"
 "PO-Revision-Date: 2010-12-21 15:14+0000\n"
 "Last-Translator: Wei \"oldrev\" Li <oldrev@gmail.com>\n"
 "Language-Team: Chinese (Simplified) <zh_CN@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-24 05:57+0000\n"
+"X-Launchpad-Export-Date: 2011-01-06 05:36+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_accountant

addons/account_analytic_analysis/i18n/account_analytic_analysis.pot

@@ -4,10 +4,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
+"Project-Id-Version: OpenERP Server 6.0.0-rc2\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-21 19:43:19+0000\n"
-"PO-Revision-Date: 2010-12-21 19:43:19+0000\n"
+"POT-Creation-Date: 2011-01-03 16:56:46+0000\n"
+"PO-Revision-Date: 2011-01-03 16:56:46+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -31,16 +31,12 @@ msgid "Computed using the formula: Maximum Quantity - Hours Tot."
 msgstr ""
 
 #. module: account_analytic_analysis
-#: code:addons/account_analytic_analysis/account_analytic_analysis.py:0
+#: code:addons/account_analytic_analysis/account_analytic_analysis.py:532
+#: code:addons/account_analytic_analysis/account_analytic_analysis.py:703
 #, python-format
 msgid "AccessError"
 msgstr ""
 
-#. module: account_analytic_analysis
-#: field:account.analytic.account,ca_theorical:0
-msgid "Theorical Revenue"
-msgstr ""
-
 #. module: account_analytic_analysis
 #: help:account.analytic.account,last_invoice_date:0
 msgid "Date of the last invoice created for this analytic account."
@@ -69,13 +65,13 @@ msgid "Computed using the formula: Theorial Revenue - Total Costs"
 msgstr ""
 
 #. module: account_analytic_analysis
-#: field:account.analytic.account,theorical_margin:0
-msgid "Theorical Margin"
+#: field:account.analytic.account,real_margin_rate:0
+msgid "Real Margin Rate (%)"
 msgstr ""
 
 #. module: account_analytic_analysis
-#: field:account.analytic.account,real_margin_rate:0
-msgid "Real Margin Rate (%)"
+#: field:account.analytic.account,ca_theorical:0
+msgid "Theoretical Revenue"
 msgstr ""
 
 #. module: account_analytic_analysis
@@ -108,6 +104,11 @@ msgstr ""
 msgid "Remaining Hours"
 msgstr ""
 
+#. module: account_analytic_analysis
+#: field:account.analytic.account,theorical_margin:0
+msgid "Theoretical Margin"
+msgstr ""
+
 #. module: account_analytic_analysis
 #: help:account.analytic.account,ca_theorical:0
 msgid "Based on the costs you had on the project, what would have been the revenue if all these costs have been invoiced at the normal sale price provided by the pricelist."
@@ -155,7 +156,8 @@ msgid "Invoiced Amount"
 msgstr ""
 
 #. module: account_analytic_analysis
-#: code:addons/account_analytic_analysis/account_analytic_analysis.py:0
+#: code:addons/account_analytic_analysis/account_analytic_analysis.py:533
+#: code:addons/account_analytic_analysis/account_analytic_analysis.py:704
 #, python-format
 msgid "You try to bypass an access rule (Document type: %s)."
 msgstr ""
@@ -175,6 +177,11 @@ msgstr ""
 msgid "Real Margin"
 msgstr ""
 
+#. module: account_analytic_analysis
+#: constraint:account.analytic.account:0
+msgid "Error! The currency has to be the same as the currency of the selected company"
+msgstr ""
+
 #. module: account_analytic_analysis
 #: help:account.analytic.account,ca_invoiced:0
 msgid "Total customer invoiced amount for this account."

addons/account_analytic_analysis/i18n/ar.po

@@ -6,14 +6,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-21 19:43+0000\n"
+"POT-Creation-Date: 2011-01-03 16:56+0000\n"
 "PO-Revision-Date: 2009-02-03 06:22+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-24 05:31+0000\n"
+"X-Launchpad-Export-Date: 2011-01-06 05:10+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_analytic_analysis
@@ -34,16 +34,12 @@ msgid "Computed using the formula: Maximum Quantity - Hours Tot."
 msgstr ""
 
 #. module: account_analytic_analysis
-#: code:addons/account_analytic_analysis/account_analytic_analysis.py:0
+#: code:addons/account_analytic_analysis/account_analytic_analysis.py:532
+#: code:addons/account_analytic_analysis/account_analytic_analysis.py:703
 #, python-format
 msgid "AccessError"
 msgstr ""
 
-#. module: account_analytic_analysis
-#: field:account.analytic.account,ca_theorical:0
-msgid "Theorical Revenue"
-msgstr ""
-
 #. module: account_analytic_analysis
 #: help:account.analytic.account,last_invoice_date:0
 msgid "Date of the last invoice created for this analytic account."
@@ -72,13 +68,13 @@ msgid "Computed using the formula: Theorial Revenue - Total Costs"
 msgstr ""
 
 #. module: account_analytic_analysis
-#: field:account.analytic.account,theorical_margin:0
-msgid "Theorical Margin"
+#: field:account.analytic.account,real_margin_rate:0
+msgid "Real Margin Rate (%)"
 msgstr ""
 
 #. module: account_analytic_analysis
-#: field:account.analytic.account,real_margin_rate:0
-msgid "Real Margin Rate (%)"
+#: field:account.analytic.account,ca_theorical:0
+msgid "Theoretical Revenue"
 msgstr ""
 
 #. module: account_analytic_analysis
@@ -115,6 +111,11 @@ msgstr ""
 msgid "Remaining Hours"
 msgstr ""
 
+#. module: account_analytic_analysis
+#: field:account.analytic.account,theorical_margin:0
+msgid "Theoretical Margin"
+msgstr ""
+
 #. module: account_analytic_analysis
 #: help:account.analytic.account,ca_theorical:0
 msgid ""
@@ -165,7 +166,8 @@ msgid "Invoiced Amount"
 msgstr ""
 
 #. module: account_analytic_analysis
-#: code:addons/account_analytic_analysis/account_analytic_analysis.py:0
+#: code:addons/account_analytic_analysis/account_analytic_analysis.py:533
+#: code:addons/account_analytic_analysis/account_analytic_analysis.py:704
 #, python-format
 msgid "You try to bypass an access rule (Document type: %s)."
 msgstr ""
@@ -185,6 +187,13 @@ msgstr ""
 msgid "Real Margin"
 msgstr ""
 
+#. module: account_analytic_analysis
+#: constraint:account.analytic.account:0
+msgid ""
+"Error! The currency has to be the same as the currency of the selected "
+"company"
+msgstr ""
+
 #. module: account_analytic_analysis
 #: help:account.analytic.account,ca_invoiced:0
 msgid "Total customer invoiced amount for this account."

addons/account_analytic_analysis/i18n/bg.po

@@ -6,14 +6,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-21 19:43+0000\n"
+"POT-Creation-Date: 2011-01-03 16:56+0000\n"
 "PO-Revision-Date: 2010-09-09 07:15+0000\n"
 "Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-24 05:31+0000\n"
+"X-Launchpad-Export-Date: 2011-01-06 05:10+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_analytic_analysis
@@ -36,16 +36,12 @@ msgid "Computed using the formula: Maximum Quantity - Hours Tot."
 msgstr ""
 
 #. module: account_analytic_analysis
-#: code:addons/account_analytic_analysis/account_analytic_analysis.py:0
+#: code:addons/account_analytic_analysis/account_analytic_analysis.py:532
+#: code:addons/account_analytic_analysis/account_analytic_analysis.py:703
 #, python-format
 msgid "AccessError"
 msgstr ""
 
-#. module: account_analytic_analysis
-#: field:account.analytic.account,ca_theorical:0
-msgid "Theorical Revenue"
-msgstr ""
-
 #. module: account_analytic_analysis
 #: help:account.analytic.account,last_invoice_date:0
 msgid "Date of the last invoice created for this analytic account."
@@ -73,16 +69,16 @@ msgstr "Дата на последната фактура"
 msgid "Computed using the formula: Theorial Revenue - Total Costs"
 msgstr "Изчислено по формулата: Теоритична възвръщаемост - Всички разходи"
 
-#. module: account_analytic_analysis
-#: field:account.analytic.account,theorical_margin:0
-msgid "Theorical Margin"
-msgstr ""
-
 #. module: account_analytic_analysis
 #: field:account.analytic.account,real_margin_rate:0
 msgid "Real Margin Rate (%)"
 msgstr "Реална норма на Маржа (%)"
 
+#. module: account_analytic_analysis
+#: field:account.analytic.account,ca_theorical:0
+msgid "Theoretical Revenue"
+msgstr ""
+
 #. module: account_analytic_analysis
 #: help:account.analytic.account,last_worked_invoiced_date:0
 msgid ""
@@ -117,6 +113,11 @@ msgstr ""
 msgid "Remaining Hours"
 msgstr ""
 
+#. module: account_analytic_analysis
+#: field:account.analytic.account,theorical_margin:0
+msgid "Theoretical Margin"
+msgstr ""
+
 #. module: account_analytic_analysis
 #: help:account.analytic.account,ca_theorical:0
 msgid ""
@@ -170,7 +171,8 @@ msgid "Invoiced Amount"
 msgstr "Сума по фактура"
 
 #. module: account_analytic_analysis
-#: code:addons/account_analytic_analysis/account_analytic_analysis.py:0
+#: code:addons/account_analytic_analysis/account_analytic_analysis.py:533
+#: code:addons/account_analytic_analysis/account_analytic_analysis.py:704
 #, python-format
 msgid "You try to bypass an access rule (Document type: %s)."
 msgstr ""
@@ -190,6 +192,13 @@ msgstr "Часове по фактура"
 msgid "Real Margin"
 msgstr "Реален Марж"
 
+#. module: account_analytic_analysis
+#: constraint:account.analytic.account:0
+msgid ""
+"Error! The currency has to be the same as the currency of the selected "
+"company"
+msgstr ""
+
 #. module: account_analytic_analysis
 #: help:account.analytic.account,ca_invoiced:0
 msgid "Total customer invoiced amount for this account."

addons/account_analytic_analysis/i18n/bs.po

@@ -6,14 +6,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-21 19:43+0000\n"
+"POT-Creation-Date: 2011-01-03 16:56+0000\n"
 "PO-Revision-Date: 2010-08-02 20:29+0000\n"
 "Last-Translator: mga (Open ERP) <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-24 05:31+0000\n"
+"X-Launchpad-Export-Date: 2011-01-06 05:10+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_analytic_analysis
@@ -37,16 +37,12 @@ msgid "Computed using the formula: Maximum Quantity - Hours Tot."
 msgstr "Izračunato korištenjem forume: Maksimalna količina - Ukupno sati"
 
 #. module: account_analytic_analysis
-#: code:addons/account_analytic_analysis/account_analytic_analysis.py:0
+#: code:addons/account_analytic_analysis/account_analytic_analysis.py:532
+#: code:addons/account_analytic_analysis/account_analytic_analysis.py:703
 #, python-format
 msgid "AccessError"
 msgstr ""
 
-#. module: account_analytic_analysis
-#: field:account.analytic.account,ca_theorical:0
-msgid "Theorical Revenue"
-msgstr "Teoretski/mogući prihod"
-
 #. module: account_analytic_analysis
 #: help:account.analytic.account,last_invoice_date:0
 msgid "Date of the last invoice created for this analytic account."
@@ -74,16 +70,16 @@ msgstr "Posljednji datum fakture"
 msgid "Computed using the formula: Theorial Revenue - Total Costs"
 msgstr "Izračunato korištenjem formule: Teorijski prihod - Ukupni troškovi"
 
-#. module: account_analytic_analysis
-#: field:account.analytic.account,theorical_margin:0
-msgid "Theorical Margin"
-msgstr "Teorijska granica"
-
 #. module: account_analytic_analysis
 #: field:account.analytic.account,real_margin_rate:0
 msgid "Real Margin Rate (%)"
 msgstr "Stopa stvarne granice (%)"
 
+#. module: account_analytic_analysis
+#: field:account.analytic.account,ca_theorical:0
+msgid "Theoretical Revenue"
+msgstr ""
+
 #. module: account_analytic_analysis
 #: help:account.analytic.account,last_worked_invoiced_date:0
 msgid ""
@@ -122,6 +118,11 @@ msgstr ""
 msgid "Remaining Hours"
 msgstr "Preostali sati"
 
+#. module: account_analytic_analysis
+#: field:account.analytic.account,theorical_margin:0
+msgid "Theoretical Margin"
+msgstr ""
+
 #. module: account_analytic_analysis
 #: help:account.analytic.account,ca_theorical:0
 msgid ""
@@ -174,7 +175,8 @@ msgid "Invoiced Amount"
 msgstr "Fakturirani iznos"
 
 #. module: account_analytic_analysis
-#: code:addons/account_analytic_analysis/account_analytic_analysis.py:0
+#: code:addons/account_analytic_analysis/account_analytic_analysis.py:533
+#: code:addons/account_analytic_analysis/account_analytic_analysis.py:704
 #, python-format
 msgid "You try to bypass an access rule (Document type: %s)."
 msgstr ""
@@ -194,6 +196,13 @@ msgstr "Fakturirani sati"
 msgid "Real Margin"
 msgstr "Stvarna granica"
 
+#. module: account_analytic_analysis
+#: constraint:account.analytic.account:0
+msgid ""
+"Error! The currency has to be the same as the currency of the selected "
+"company"
+msgstr ""
+
 #. module: account_analytic_analysis
 #: help:account.analytic.account,ca_invoiced:0
 msgid "Total customer invoiced amount for this account."
@@ -304,6 +313,9 @@ msgstr ""
 #~ msgid "My Current Accounts"
 #~ msgstr "Moji tekući računi"
 
+#~ msgid "Theorical Revenue"
+#~ msgstr "Teoretski/mogući prihod"
+
 #~ msgid "Hours summary by user"
 #~ msgstr "Ukupno sati po korisniku"
 
@@ -316,6 +328,9 @@ msgstr ""
 #~ msgid "Invalid model name in the action definition."
 #~ msgstr "Pogrešan model name u definisanju radnje"
 
+#~ msgid "Theorical Margin"
+#~ msgstr "Teorijska granica"
+
 #~ msgid "Current Analytic Accounts"
 #~ msgstr "Tekući analitički računi"
 

addons/account_analytic_analysis/i18n/ca.po

@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev_rc3\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-21 19:43+0000\n"
+"POT-Creation-Date: 2011-01-03 16:56+0000\n"
 "PO-Revision-Date: 2010-10-30 11:09+0000\n"
 "Last-Translator: Jordi Esteve (www.zikzakmedia.com) "
 "<jesteve@zikzakmedia.com>\n"
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-24 05:31+0000\n"
+"X-Launchpad-Export-Date: 2011-01-06 05:10+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_analytic_analysis
@@ -37,16 +37,12 @@ msgid "Computed using the formula: Maximum Quantity - Hours Tot."
 msgstr "Calculat utilitzant la fórmula: Quantitat máxima - Hores totals."
 
 #. module: account_analytic_analysis
-#: code:addons/account_analytic_analysis/account_analytic_analysis.py:0
+#: code:addons/account_analytic_analysis/account_analytic_analysis.py:532
+#: code:addons/account_analytic_analysis/account_analytic_analysis.py:703
 #, python-format
 msgid "AccessError"
 msgstr ""
 
-#. module: account_analytic_analysis
-#: field:account.analytic.account,ca_theorical:0
-msgid "Theorical Revenue"
-msgstr "Ingressos teòrics"
-
 #. module: account_analytic_analysis
 #: help:account.analytic.account,last_invoice_date:0
 msgid "Date of the last invoice created for this analytic account."
@@ -74,16 +70,16 @@ msgstr "Data última factura"
 msgid "Computed using the formula: Theorial Revenue - Total Costs"
 msgstr "Calculat utilitzant la fórmula: Ingressos teòrics - Costos totals"
 
-#. module: account_analytic_analysis
-#: field:account.analytic.account,theorical_margin:0
-msgid "Theorical Margin"
-msgstr "Marge teòric"
-
 #. module: account_analytic_analysis
 #: field:account.analytic.account,real_margin_rate:0
 msgid "Real Margin Rate (%)"
 msgstr "Taxa de marge real (%)"
 
+#. module: account_analytic_analysis
+#: field:account.analytic.account,ca_theorical:0
+msgid "Theoretical Revenue"
+msgstr ""
+
 #. module: account_analytic_analysis
 #: help:account.analytic.account,last_worked_invoiced_date:0
 msgid ""
@@ -122,6 +118,11 @@ msgstr ""
 msgid "Remaining Hours"
 msgstr "Hores restants"
 
+#. module: account_analytic_analysis
+#: field:account.analytic.account,theorical_margin:0
+msgid "Theoretical Margin"
+msgstr ""
+
 #. module: account_analytic_analysis
 #: help:account.analytic.account,ca_theorical:0
 msgid ""
@@ -175,7 +176,8 @@ msgid "Invoiced Amount"
 msgstr "Import facturat"
 
 #. module: account_analytic_analysis
-#: code:addons/account_analytic_analysis/account_analytic_analysis.py:0
+#: code:addons/account_analytic_analysis/account_analytic_analysis.py:533
+#: code:addons/account_analytic_analysis/account_analytic_analysis.py:704
 #, python-format
 msgid "You try to bypass an access rule (Document type: %s)."
 msgstr "Ha intentat saltar-se una regla d'accés (tipus document: %s)."
@@ -195,6 +197,13 @@ msgstr "Hores facturades"
 msgid "Real Margin"
 msgstr "Marge real"
 
+#. module: account_analytic_analysis
+#: constraint:account.analytic.account:0
+msgid ""
+"Error! The currency has to be the same as the currency of the selected "
+"company"
+msgstr ""
+
 #. module: account_analytic_analysis
 #: help:account.analytic.account,ca_invoiced:0
 msgid "Total customer invoiced amount for this account."
@@ -310,6 +319,9 @@ msgstr ""
 #~ msgid "Invalid XML for View Architecture!"
 #~ msgstr "XML invàlid per a la definició de la vista!"
 
+#~ msgid "Theorical Revenue"
+#~ msgstr "Ingressos teòrics"
+
 #~ msgid ""
 #~ "The Object name must start with x_ and not contain any special character !"
 #~ msgstr ""
@@ -319,6 +331,9 @@ msgstr ""
 #~ msgid "New Analytic Account"
 #~ msgstr "Nou compte analític"
 
+#~ msgid "Theorical Margin"
+#~ msgstr "Marge teòric"
+
 #~ msgid "Current Analytic Accounts"
 #~ msgstr "Comptes analítics actuals"