[MERGE] Merge with lp:openobject-addons

bzr revid: sbh@tinyerp.com-20110601103949-lhzpnstpexkxca91
2011-06-01 16:09:49 +05:30 · 2011-06-01 16:09:49 +05:30 · 3a6010b706
parent d27ae843a3 7d60eddba8
commit 3a6010b706
5052 changed files with 112500 additions and 44152 deletions
--- a/addons/account/openerp.py
+++ b/addons/account/openerp.py
@ -59,6 +59,7 @@ module named account_voucher.
        'account_menuitem.xml',
        'report/account_invoice_report_view.xml',
        'report/account_entries_report_view.xml',
+        'report/account_treasury_report_view.xml',
        'report/account_report_view.xml',
        'report/account_analytic_entries_report_view.xml',
        'wizard/account_move_bank_reconcile_view.xml',
--- a/addons/account/account.py
+++ b/addons/account/account.py
@ -102,7 +102,7 @@ class account_payment_term_line(osv.osv):
                                   ('fixed', 'Fixed Amount')], 'Valuation',
                                   required=True, help="""Select here the kind of valuation related to this payment term line. Note that you should have your last line with the type 'Balance' to ensure that the whole amount will be threated."""),

-        'value_amount': fields.float('Value Amount', help="For Value percent enter % ratio between 0-1."),
+        'value_amount': fields.float('Value Amount', digits_compute=dp.get_precision('Payment Term'), help="For Value percent enter % ratio between 0-1."),
        'days': fields.integer('Number of Days', required=True, help="Number of days to add before computation of the day of month." \
            "If Date=15/01, Number of Days=22, Day of Month=-1, then the due date is 28/02."),
        'days2': fields.integer('Day of the Month', required=True, help="Day of the month, set -1 for the last day of the current month. If it's positive, it gives the day of the next month. Set 0 for net days (otherwise it's based on the beginning of the month)."),
@ -879,7 +879,7 @@ class account_period(osv.osv):
    _defaults = {
        'state': 'draft',
    }
-    _order = "date_start"
+    _order = "date_start, special desc"

    def _check_duration(self,cr,uid,ids,context=None):
        obj_period = self.browse(cr, uid, ids[0], context=context)
@ -926,9 +926,8 @@ class account_period(osv.osv):

    def action_draft(self, cr, uid, ids, *args):
        mode = 'draft'
-        for id in ids:
-            cr.execute('update account_journal_period set state=%s where period_id=%s', (mode, id))
-            cr.execute('update account_period set state=%s where id=%s', (mode, id))
+        cr.execute('update account_journal_period set state=%s where period_id in %s', (mode, tuple(ids),))
+        cr.execute('update account_period set state=%s where id in %s', (mode, tuple(ids),))
        return True

    def name_search(self, cr, user, name, args=None, operator='ilike', context=None, limit=100):
@ -961,7 +960,10 @@ class account_period(osv.osv):
            raise osv.except_osv(_('Error'), _('You should have chosen periods that belongs to the same company'))
        if period_date_start > period_date_stop:
            raise osv.except_osv(_('Error'), _('Start period should be smaller then End period'))
-        return self.search(cr, uid, [('date_start', '>=', period_date_start), ('date_stop', '<=', period_date_stop), ('company_id', '=', company1_id)])
+        #for period from = january, we want to exclude the opening period (but it has same date_from, so we have to check if period_from is special or not to include that clause or not in the search).
+        if period_from.special:
+            return self.search(cr, uid, [('date_start', '>=', period_date_start), ('date_stop', '<=', period_date_stop), ('company_id', '=', company1_id)])
+        return self.search(cr, uid, [('date_start', '>=', period_date_start), ('date_stop', '<=', period_date_stop), ('company_id', '=', company1_id), ('special', '=', False)])

 account_period()

@ -1562,14 +1564,15 @@ class account_tax_code(osv.osv):
                       (parent_ids,) + where_params)
        res=dict(cr.fetchall())
        obj_precision = self.pool.get('decimal.precision')
+        res2 = {} 
        for record in self.browse(cr, uid, ids, context=context):
            def _rec_get(record):
                amount = res.get(record.id, 0.0)
                for rec in record.child_ids:
                    amount += _rec_get(rec) * rec.sign
                return amount
-            res[record.id] = round(_rec_get(record), obj_precision.precision_get(cr, uid, 'Account'))
-        return res
+            res2[record.id] = round(_rec_get(record), obj_precision.precision_get(cr, uid, 'Account'))
+        return res2

    def _sum_year(self, cr, uid, ids, name, args, context=None):
        if context is None:
@ -2146,8 +2149,8 @@ class account_model_line(osv.osv):
    _description = "Account Model Entries"
    _columns = {
        'name': fields.char('Name', size=64, required=True),
-        'sequence': fields.integer('Sequence', required=True, help="The sequence field is used to order the resources from lower sequences to higher ones"),
-        'quantity': fields.float('Quantity', digits_compute=dp.get_precision('Account'), help="The optional quantity on entries"),
+        'sequence': fields.integer('Sequence', required=True, help="The sequence field is used to order the resources from lower sequences to higher ones."),
+        'quantity': fields.float('Quantity', digits_compute=dp.get_precision('Account'), help="The optional quantity on entries."),
        'debit': fields.float('Debit', digits_compute=dp.get_precision('Account')),
        'credit': fields.float('Credit', digits_compute=dp.get_precision('Account')),
        'account_id': fields.many2one('account.account', 'Account', required=True, ondelete="cascade"),
@ -2156,7 +2159,7 @@ class account_model_line(osv.osv):
        'amount_currency': fields.float('Amount Currency', help="The amount expressed in an optional other currency."),
        'currency_id': fields.many2one('res.currency', 'Currency'),
        'partner_id': fields.many2one('res.partner', 'Partner'),
-        'date_maturity': fields.selection([('today','Date of the day'), ('partner','Partner Payment Term')], 'Maturity date', help="The maturity date of the generated entries for this model. You can choose between the creation date or the creation date of the entries plus the partner payment terms."),
+        'date_maturity': fields.selection([('today','Date of the day'), ('partner','Partner Payment Term')], 'Maturity Date', help="The maturity date of the generated entries for this model. You can choose between the creation date or the creation date of the entries plus the partner payment terms."),
    }
    _order = 'sequence'
    _sql_constraints = [
@ -2659,8 +2662,6 @@ class wizard_multi_charts_accounts(osv.osv_memory):

    def fields_view_get(self, cr, uid, view_id=None, view_type='form', context=None, toolbar=False, submenu=False):
        res = super(wizard_multi_charts_accounts, self).fields_view_get(cr, uid, view_id=view_id, view_type=view_type, context=context, toolbar=toolbar,submenu=False)
-        configured_cmp = []
-        unconfigured_cmp = []
        cmp_select = []
        company_ids = self.pool.get('res.company').search(cr, uid, [], context=context)
        #display in the widget selection of companies, only the companies that haven't been configured yet (but don't care about the demo chart of accounts)
@ -2668,12 +2669,12 @@ class wizard_multi_charts_accounts(osv.osv_memory):
        configured_cmp = [r[0] for r in cr.fetchall()]
        unconfigured_cmp = list(set(company_ids)-set(configured_cmp))
        for field in res['fields']:
-           if field == 'company_id':
-               res['fields'][field]['domain'] = unconfigured_cmp
-               res['fields'][field]['selection'] = [('', '')]
-               if unconfigured_cmp:
-                   cmp_select = [(line.id, line.name) for line in self.pool.get('res.company').browse(cr, uid, unconfigured_cmp)]
-                   res['fields'][field]['selection'] = cmp_select
+            if field == 'company_id':
+                res['fields'][field]['domain'] = unconfigured_cmp
+                res['fields'][field]['selection'] = [('', '')]
+                if unconfigured_cmp:
+                    cmp_select = [(line.id, line.name) for line in self.pool.get('res.company').browse(cr, uid, unconfigured_cmp)]
+                    res['fields'][field]['selection'] = cmp_select
        return res

    def execute(self, cr, uid, ids, context=None):
@ -2681,7 +2682,6 @@ class wizard_multi_charts_accounts(osv.osv_memory):
        obj_acc = self.pool.get('account.account')
        obj_acc_tax = self.pool.get('account.tax')
        obj_journal = self.pool.get('account.journal')
-        obj_sequence = self.pool.get('ir.sequence')
        obj_acc_template = self.pool.get('account.account.template')
        obj_fiscal_position_template = self.pool.get('account.fiscal.position.template')
        obj_fiscal_position = self.pool.get('account.fiscal.position')
@ -2689,9 +2689,7 @@ class wizard_multi_charts_accounts(osv.osv_memory):
        analytic_journal_obj = self.pool.get('account.analytic.journal')
        obj_tax_code = self.pool.get('account.tax.code')
        obj_tax_code_template = self.pool.get('account.tax.code.template')
-        obj_acc_journal_view = self.pool.get('account.journal.view')
-        ir_values = self.pool.get('ir.values')
-        obj_product = self.pool.get('product.product')
+        ir_values_obj = self.pool.get('ir.values')
        # Creating Account
        obj_acc_root = obj_multi.chart_template_id.account_root_id
        tax_code_root_id = obj_multi.chart_template_id.tax_code_root_id.id
@ -2924,15 +2922,20 @@ class wizard_multi_charts_accounts(osv.osv_memory):
        ref_acc_bank = obj_multi.chart_template_id.bank_account_view_id

        current_num = 1
+        valid = True
        for line in obj_multi.bank_accounts_id:
            #create the account_account for this bank journal
            tmp = line.acc_name
            dig = obj_multi.code_digits
-            if ref_acc_bank.code:
-                try:
-                    new_code = str(int(ref_acc_bank.code.ljust(dig,'0')) + current_num)
-                except:
-                    new_code = str(ref_acc_bank.code.ljust(dig-len(str(current_num)),'0')) + str(current_num)
+            if not ref_acc_bank.code:
+                raise osv.except_osv(_('Configuration Error !'), _('The bank account defined on the selected chart of account hasn\'t a code.'))
+            while True:
+                new_code = str(ref_acc_bank.code.ljust(dig-len(str(current_num)), '0')) + str(current_num)
+                ids = obj_acc.search(cr, uid, [('code', '=', new_code), ('company_id', '=', company_id)])
+                if not ids:
+                    break
+                else:
+                    current_num += 1
            vals = {
                'name': tmp,
                'currency_id': line.currency_id and line.currency_id.id or False,
@ -2946,8 +2949,6 @@ class wizard_multi_charts_accounts(osv.osv_memory):
            acc_cash_id  = obj_acc.create(cr,uid,vals)

            #create the bank journal
-            analytical_bank_ids = analytic_journal_obj.search(cr,uid,[('type','=','situation')])
-            analytical_journal_bank = analytical_bank_ids and analytical_bank_ids[0] or False
            vals_journal = {
                'name': vals['name'],
                'code': _('BNK') + str(current_num),
@ -2965,6 +2966,7 @@ class wizard_multi_charts_accounts(osv.osv_memory):
            vals_journal['default_debit_account_id'] = acc_cash_id
            obj_journal.create(cr, uid, vals_journal)
            current_num += 1
+            valid = True

        #create the properties
        property_obj = self.pool.get('ir.property')
@ -3029,10 +3031,10 @@ class wizard_multi_charts_accounts(osv.osv_memory):
                    obj_ac_fp.create(cr, uid, vals_acc)

        if obj_multi.sale_tax:
-            ir_values.set(cr, uid, key='default', key2=False, name="taxes_id", company=obj_multi.company_id.id,
+            ir_values_obj.set(cr, uid, key='default', key2=False, name="taxes_id", company=obj_multi.company_id.id,
                            models =[('product.product',False)], value=[tax_template_to_tax[obj_multi.sale_tax.id]])
        if obj_multi.purchase_tax:
-            ir_values.set(cr, uid, key='default', key2=False, name="supplier_taxes_id", company=obj_multi.company_id.id,
+            ir_values_obj.set(cr, uid, key='default', key2=False, name="supplier_taxes_id", company=obj_multi.company_id.id,
                            models =[('product.product',False)], value=[tax_template_to_tax[obj_multi.purchase_tax.id]])

 wizard_multi_charts_accounts()
--- a/addons/account/account_analytic_line.py
+++ b/addons/account/account_analytic_line.py
@ -32,7 +32,7 @@ class account_analytic_line(osv.osv):
        'product_uom_id': fields.many2one('product.uom', 'UoM'),
        'product_id': fields.many2one('product.product', 'Product'),
        'general_account_id': fields.many2one('account.account', 'General Account', required=True, ondelete='restrict'),
-        'move_id': fields.many2one('account.move.line', 'Move Line', ondelete='restrict', select=True),
+        'move_id': fields.many2one('account.move.line', 'Move Line', ondelete='cascade', select=True),
        'journal_id': fields.many2one('account.analytic.journal', 'Analytic Journal', required=True, ondelete='restrict', select=True),
        'code': fields.char('Code', size=8),
        'ref': fields.char('Ref.', size=64),
--- a/addons/account/account_bank_statement.py
+++ b/addons/account/account_bank_statement.py
@ -161,6 +161,7 @@ class account_bank_statement(osv.osv):
        'balance_start': _default_balance_start,
        'journal_id': _default_journal_id,
        'period_id': _get_period,
+        'company_id': lambda self,cr,uid,c: self.pool.get('res.company')._company_default_get(cr, uid, 'account.bank.statement',context=c),
    }

    def onchange_date(self, cr, user, ids, date, context=None):
@ -460,7 +461,7 @@ class account_bank_statement_line(osv.osv):
            select=True, required=True, ondelete='cascade'),
        'analytic_account_id': fields.many2one('account.analytic.account', 'Analytic Account'),
        'move_ids': fields.many2many('account.move',
-            'account_bank_statement_line_move_rel', 'statement_id','move_id',
+            'account_bank_statement_line_move_rel', 'statement_line_id','move_id',
            'Moves'),
        'ref': fields.char('Reference', size=32),
        'note': fields.text('Notes'),
--- a/addons/account/account_cash_statement.py
+++ b/addons/account/account_cash_statement.py
@ -320,6 +320,7 @@ class account_cash_statement(osv.osv):
        """ Changes statement state to Running.
        @return: True
        """
+        obj_seq = self.pool.get('ir.sequence')
        if context is None:
            context = {}
        statement_pool = self.pool.get('account.bank.statement')
@ -329,15 +330,18 @@ class account_cash_statement(osv.osv):
                raise osv.except_osv(_('Error !'), (_('User %s does not have rights to access %s journal !') % (statement.user_id.name, statement.journal_id.name)))

            if statement.name and statement.name == '/':
-                number = self.pool.get('ir.sequence').get(cr, uid, 'account.cash.statement')
+                if statement.journal_id.sequence_id:
+                    c = {'fiscalyear_id': statement.period_id.fiscalyear_id.id}
+                    st_number = obj_seq.get_id(cr, uid, statement.journal_id.sequence_id.id, context=c)
+                else:
+                    st_number = obj_seq.get(cr, uid, 'account.cash.statement')
                vals.update({
-                    'name': number
+                    'name': st_number
                })

            vals.update({
                'date': time.strftime("%Y-%m-%d %H:%M:%S"),
                'state': 'open',
-
            })
            self.write(cr, uid, [statement.id], vals, context=context)
        return True
--- a/addons/account/account_invoice_view.xml
+++ b/addons/account/account_invoice_view.xml
@ -123,6 +123,7 @@
                    <field name="date_invoice"/>
                    <field name="number"/>
                    <field name="partner_id" groups="base.group_user"/>
+                    <field name="reference" invisible="1"/>
                    <field name="name"/>
                    <field name="journal_id" invisible="1"/>
                    <field name="period_id" invisible="1" groups="account.group_account_user"/>
@ -377,6 +378,10 @@
                        <field name="period_id" select='1' string="Period"/>
                    </group>
                    <newline/>
+                    <group expand="0" string="Extended Filters..." name = "extended filter" >
+                        <field name="reference" select="1" string="Invoice Reference"/>
+                    </group>
+                    <newline/>
                    <group expand="0" string="Group By...">
                        <filter string="Partner" icon="terp-partner" domain="[]" context="{'group_by':'partner_id'}"/>
                        <filter string="Responsible" icon="terp-personal" domain="[]"  context="{'group_by':'user_id'}"/>
--- a/addons/account/account_move_line.py
+++ b/addons/account/account_move_line.py
@ -68,7 +68,6 @@ class account_move_line(osv.osv):
        if state:
            if state.lower() not in ['all']:
                where_move_state= " AND "+obj+".move_id IN (SELECT id FROM account_move WHERE account_move.state = '"+state+"')"
-
        if context.get('period_from', False) and context.get('period_to', False) and not context.get('periods', False):
            if initial_bal:
                period_company_id = fiscalperiod_obj.browse(cr, uid, context['period_from'], context=context).company_id.id
@ -82,17 +81,20 @@ class account_move_line(osv.osv):
                period_ids = fiscalperiod_obj.search(cr, uid, [('id', 'in', context['periods'])], order='date_start', limit=1)
                if period_ids and period_ids[0]:
                    first_period = fiscalperiod_obj.browse(cr, uid, period_ids[0], context=context)
-                    # Find the old periods where date start of those periods less then Start period
-                    periods = fiscalperiod_obj.search(cr, uid, [('date_start', '<', first_period.date_start)])
-                    periods = ','.join([str(x) for x in periods])
-                    if 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, periods, where_move_state, where_move_lines_by_date)
+                    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 date_start <= '%s' AND id NOT IN (%s)) %s %s" % (fiscalyear_clause, first_period.date_start, ids, where_move_state, where_move_lines_by_date)
            else:
                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)

+        if initial_bal and not context.get('periods', False) and not where_move_lines_by_date:
+            #we didn't pass any filter in the context, and the initial balance can't be computed using only the fiscalyear otherwise entries will be summed twice
+            #so we have to invalidate this query
+            raise osv.except_osv(_('Warning !'),_("You haven't supplied enough argument to compute the initial balance"))
+
+
        if context.get('journal_ids', False):
            query += ' AND '+obj+'.journal_id IN (%s)' % ','.join(map(str, context['journal_ids']))

@ -1198,10 +1200,11 @@ class account_move_line(osv.osv):
    def _update_check(self, cr, uid, ids, context=None):
        done = {}
        for line in self.browse(cr, uid, ids, context=context):
+            err_msg = _('Move name (id): %s (%s)') % (line.move_id.name, str(line.move_id.id))
            if line.move_id.state <> 'draft' and (not line.journal_id.entry_posted):
-                raise osv.except_osv(_('Error !'), _('You can not do this modification on a confirmed entry ! Please note that you can just change some non important fields !'))
+                raise osv.except_osv(_('Error !'), _('You can not do this modification on a confirmed entry ! Please note that you can just change some non important fields ! \n%s') % err_msg)
            if line.reconcile_id:
-                raise osv.except_osv(_('Error !'), _('You can not do this modification on a reconciled entry ! Please note that you can just change some non important fields !'))
+                raise osv.except_osv(_('Error !'), _('You can not do this modification on a reconciled entry ! Please note that you can just change some non important fields ! \n%s') % err_msg)
            t = (line.journal_id.id, line.period_id.id)
            if t not in done:
                self._update_journal_check(cr, uid, line.journal_id.id, line.period_id.id, context)
--- a/addons/account/account_view.xml
+++ b/addons/account/account_view.xml
@ -454,7 +454,7 @@
                            </group>
                            <group colspan="2" col="2" groups="base.group_extended">
                                <separator string="Sequence" colspan="4"/>
-                                <field name="sequence_id" required="0"/>
+                                <field name="sequence_id"/>
                            </group>
                        </page>
                        <page string="Entry Controls" groups="base.group_extended">
--- a/addons/account/data/account_data2.xml
+++ b/addons/account/data/account_data2.xml
@ -21,7 +21,10 @@
            <field eval="-1" name="days2"/>
            <field eval="account_payment_term" name="payment_id"/>
        </record>
-
+        <record forcecreate="True" id="decimal_payment" model="decimal.precision">
+            <field name="name">Payment Term</field>
+            <field name="digits">6</field>
+        </record>
        <!--
        Account Journal View
        -->
--- a/addons/account/i18n/ar.po
+++ b/addons/account/i18n/ar.po
@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-03-18 04:47+0000\n"
-"X-Generator: Launchpad (build 12559)\n"
+"X-Launchpad-Export-Date: 2011-04-29 05:04+0000\n"
+"X-Generator: Launchpad (build 12758)\n"

 #. module: account
 #: model:process.transition,name:account.process_transition_supplierreconcilepaid0
--- a/addons/account/i18n/bg.po
+++ b/addons/account/i18n/bg.po
@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-03-18 04:48+0000\n"
-"X-Generator: Launchpad (build 12559)\n"
+"X-Launchpad-Export-Date: 2011-04-29 05:05+0000\n"
+"X-Generator: Launchpad (build 12758)\n"

 #. module: account
 #: model:process.transition,name:account.process_transition_supplierreconcilepaid0
@ -1804,7 +1804,7 @@ msgstr "Записи по ред"
 #. module: account
 #: report:account.tax.code.entries:0
 msgid "A/c Code"
-msgstr ""
+msgstr "Код на сметка"

 #. module: account
 #: field:account.invoice,move_id:0
@ -3970,7 +3970,7 @@ msgstr ""
 #. module: account
 #: field:account.journal,view_id:0
 msgid "Display Mode"
-msgstr ""
+msgstr "Режим на екрана"

 #. module: account
 #: model:process.node,note:account.process_node_importinvoice0
@ -4036,7 +4036,7 @@ msgstr "Приключващ баланс"
 #: code:addons/account/report/common_report_header.py:92
 #, python-format
 msgid "Not implemented"
-msgstr ""
+msgstr "Не е реализирано"

 #. module: account
 #: model:ir.model,name:account.model_account_journal_select
@ -4051,7 +4051,7 @@ msgstr "Отпечатване на фактура"
 #. module: account
 #: view:account.tax.template:0
 msgid "Credit Notes"
-msgstr "Бележки по кредит"
+msgstr "кредитни известия"

 #. module: account
 #: code:addons/account/account.py:2067
@ -5485,7 +5485,7 @@ msgstr ""
 #: code:addons/account/wizard/account_report_common.py:126
 #, python-format
 msgid "not implemented"
-msgstr ""
+msgstr "не е реализирано"

 #. module: account
 #: help:account.journal,company_id:0
@ -6238,7 +6238,7 @@ msgstr ""
 #: view:account.move:0
 #: field:account.move,to_check:0
 msgid "To Review"
-msgstr ""
+msgstr "За преглед"

 #. module: account
 #: view:account.bank.statement:0
@ -6869,7 +6869,7 @@ msgstr "  ден от месеца= -1"
 #. module: account
 #: constraint:res.partner:0
 msgid "Error ! You can not create recursive associated members."
-msgstr ""
+msgstr "Грешка ! Не може да създадете рекурсивно свързани членове"

 #. module: account
 #: help:account.journal,type:0
@ -8482,7 +8482,7 @@ msgstr ""
 #: report:account.third_party_ledger:0
 #: report:account.third_party_ledger_other:0
 msgid "Filters By"
-msgstr ""
+msgstr "Филтри по"

 #. module: account
 #: model:process.node,note:account.process_node_manually0
@ -9001,7 +9001,7 @@ msgstr ""
 #: selection:account.account.template,type:0
 #: selection:account.entries.report,type:0
 msgid "Regular"
-msgstr ""
+msgstr "Редовен"

 #. module: account
 #: view:account.account:0
@ -9126,7 +9126,7 @@ msgstr "Няма зададена приходна сметка за проду
 #: report:account.third_party_ledger:0
 #: report:account.third_party_ledger_other:0
 msgid "JNRL"
-msgstr ""
+msgstr "Журнал"

 #. module: account
 #: view:account.payment.term.line:0
@ -9159,7 +9159,7 @@ msgstr "Общо"
 #: code:addons/account/wizard/account_move_journal.py:97
 #, python-format
 msgid "Journal: All"
-msgstr ""
+msgstr "Журнал: Всички"

 #. module: account
 #: field:account.account,company_id:0
@ -9475,7 +9475,7 @@ msgstr ""
 #. module: account
 #: model:ir.ui.menu,name:account.menu_finance_periodical_processing_billing
 msgid "Billing"
-msgstr ""
+msgstr "За плащане"

 #. module: account
 #: view:account.account:0
--- a/addons/account/i18n/br.po
+++ b/addons/account/i18n/br.po
@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-03-18 04:47+0000\n"
-"X-Generator: Launchpad (build 12559)\n"
+"X-Launchpad-Export-Date: 2011-04-29 05:04+0000\n"
+"X-Generator: Launchpad (build 12758)\n"

 #. module: account
 #: model:process.transition,name:account.process_transition_supplierreconcilepaid0
--- a/addons/account/i18n/bs.po
+++ b/addons/account/i18n/bs.po
@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-03-18 04:47+0000\n"
-"X-Generator: Launchpad (build 12559)\n"
+"X-Launchpad-Export-Date: 2011-04-29 05:04+0000\n"
+"X-Generator: Launchpad (build 12758)\n"

 #. module: account
 #: model:process.transition,name:account.process_transition_supplierreconcilepaid0
--- a/addons/account/i18n/ca.po
+++ b/addons/account/i18n/ca.po
@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-03-27 04:53+0000\n"
-"X-Generator: Launchpad (build 12559)\n"
+"X-Launchpad-Export-Date: 2011-04-29 05:05+0000\n"
+"X-Generator: Launchpad (build 12758)\n"

 #. module: account
 #: model:process.transition,name:account.process_transition_supplierreconcilepaid0
--- a/addons/account/i18n/cs.po
+++ b/addons/account/i18n/cs.po
@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-03-18 04:48+0000\n"
-"X-Generator: Launchpad (build 12559)\n"
+"X-Launchpad-Export-Date: 2011-04-29 05:05+0000\n"
+"X-Generator: Launchpad (build 12758)\n"

 #. module: account
 #: model:process.transition,name:account.process_transition_supplierreconcilepaid0
@ -181,7 +181,7 @@ msgstr ""
 #: code:addons/account/invoice.py:1421
 #, python-format
 msgid "Warning!"
-msgstr ""
+msgstr "Varování!"

 #. module: account
 #: field:account.fiscal.position.account,account_src_id:0
--- a/addons/account/i18n/da.po
+++ b/addons/account/i18n/da.po
@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-03-18 04:48+0000\n"
-"X-Generator: Launchpad (build 12559)\n"
+"X-Launchpad-Export-Date: 2011-04-29 05:05+0000\n"
+"X-Generator: Launchpad (build 12758)\n"

 #. module: account
 #: model:process.transition,name:account.process_transition_supplierreconcilepaid0
--- 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: 2011-01-11 11:14+0000\n"
-"PO-Revision-Date: 2011-04-03 09:24+0000\n"
+"PO-Revision-Date: 2011-04-21 05:36+0000\n"
 "Last-Translator: Ferdinand @ Camptocamp <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: 2011-04-04 04:47+0000\n"
-"X-Generator: Launchpad (build 12559)\n"
+"X-Launchpad-Export-Date: 2011-04-29 05:06+0000\n"
+"X-Generator: Launchpad (build 12758)\n"

 #. module: account
 #: model:process.transition,name:account.process_transition_supplierreconcilepaid0
@ -911,7 +911,7 @@ msgstr "Erzeuge 3 Monats Periode"
 #. module: account
 #: report:account.overdue:0
 msgid "Due"
-msgstr "fällig am"
+msgstr "Fällig"

 #. module: account
 #: view:account.invoice.report:0
@ -2664,7 +2664,7 @@ msgstr ""
 #: model:ir.actions.server,name:account.ir_actions_server_action_wizard_multi_chart
 #: model:ir.ui.menu,name:account.menu_act_ir_actions_bleble
 msgid "New Company Financial Setting"
-msgstr "Basiskonfiguration Unternehmen"
+msgstr "Neue Firma Financial Rahmen"

 #. module: account
 #: model:ir.actions.act_window,name:account.action_report_account_sales_tree_all
@ -4014,7 +4014,7 @@ msgstr "Fällige Analytische Konten"
 #: selection:account.invoice,state:0
 #: report:account.overdue:0
 msgid "Paid"
-msgstr "bezahlt am"
+msgstr "bezahlt"

 #. module: account
 #: field:account.invoice,tax_line:0
@ -4189,7 +4189,7 @@ msgstr "Storniere Abschreibung"
 #: field:account.model.line,date_maturity:0
 #: report:account.overdue:0
 msgid "Maturity date"
-msgstr "Fälligkeitstermin"
+msgstr "Datum Fällig"

 #. module: account
 #: view:report.account.receivable:0
@ -7355,7 +7355,7 @@ msgstr "Manueller Kontenausgleich"
 #. module: account
 #: report:account.overdue:0
 msgid "Total amount due:"
-msgstr "Gesamtbetrag (fällig):"
+msgstr "Gesamtbetrag fällig:"

 #. module: account
 #: field:account.analytic.chart,to_date:0
@ -8741,7 +8741,7 @@ msgstr ""
 #. module: account
 #: report:account.overdue:0
 msgid "Best regards."
-msgstr "Viele Grüsse."
+msgstr "Beste Grüsse."

 #. module: account
 #: view:account.invoice:0
--- a/addons/account/i18n/el.po
+++ b/addons/account/i18n/el.po
@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-03-18 04:49+0000\n"
-"X-Generator: Launchpad (build 12559)\n"
+"X-Launchpad-Export-Date: 2011-04-29 05:06+0000\n"
+"X-Generator: Launchpad (build 12758)\n"

 #. module: account
 #: model:process.transition,name:account.process_transition_supplierreconcilepaid0
@ -10799,6 +10799,10 @@ msgstr ""
 #~ msgid "Number of entries are generated"
 #~ msgstr "ο αριθμός των εγγραφών δημιουργήθηκε"

+#, python-format
+#~ msgid "Can not pay draft/proforma/cancel invoice."
+#~ msgstr "Αδύνατη η πληρωμή πρόχειρου/προφόρμας/τιμολογίου"
+
 #~ msgid "Entries Encoding by Move"
 #~ msgstr "Κωδικοποίηση Εγγραφών ανά Κίνηση"

--- a/addons/account/i18n/en_US.po
+++ b/addons/account/i18n/en_US.po
@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-03-18 04:56+0000\n"
-"X-Generator: Launchpad (build 12559)\n"
+"X-Launchpad-Export-Date: 2011-04-29 05:13+0000\n"
+"X-Generator: Launchpad (build 12758)\n"

 #. module: account
 #: model:process.transition,name:account.process_transition_supplierreconcilepaid0
--- a/addons/account/i18n/es.po
+++ b/addons/account/i18n/es.po
@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-03-28 04:36+0000\n"
-"X-Generator: Launchpad (build 12559)\n"
+"X-Launchpad-Export-Date: 2011-04-29 05:11+0000\n"
+"X-Generator: Launchpad (build 12758)\n"

 #. module: account
 #: model:process.transition,name:account.process_transition_supplierreconcilepaid0
--- a/addons/account/i18n/es_AR.po
+++ b/addons/account/i18n/es_AR.po
@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-03-18 04:56+0000\n"
-"X-Generator: Launchpad (build 12559)\n"
+"X-Launchpad-Export-Date: 2011-04-29 05:13+0000\n"
+"X-Generator: Launchpad (build 12758)\n"

 #. module: account
 #: model:process.transition,name:account.process_transition_supplierreconcilepaid0
--- a/addons/account/i18n/es_CL.po
+++ b/addons/account/i18n/es_CL.po
--- a/addons/account/i18n/es_EC.po
+++ b/addons/account/i18n/es_EC.po
@ -16,8 +16,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-03-18 04:57+0000\n"
-"X-Generator: Launchpad (build 12559)\n"
+"X-Launchpad-Export-Date: 2011-04-29 05:14+0000\n"
+"X-Generator: Launchpad (build 12758)\n"

 #. module: account
 #: model:process.transition,name:account.process_transition_supplierreconcilepaid0
--- a/addons/account/i18n/es_PY.po
+++ b/addons/account/i18n/es_PY.po
@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-03-18 04:57+0000\n"
-"X-Generator: Launchpad (build 12559)\n"
+"X-Launchpad-Export-Date: 2011-04-29 05:14+0000\n"
+"X-Generator: Launchpad (build 12758)\n"

 #. module: account
 #: model:process.transition,name:account.process_transition_supplierreconcilepaid0
--- a/addons/account/i18n/et.po
+++ b/addons/account/i18n/et.po
@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-03-18 04:49+0000\n"
-"X-Generator: Launchpad (build 12559)\n"
+"X-Launchpad-Export-Date: 2011-04-29 05:05+0000\n"
+"X-Generator: Launchpad (build 12758)\n"

 #. module: account
 #: model:process.transition,name:account.process_transition_supplierreconcilepaid0
--- a/addons/account/i18n/eu.po
+++ b/addons/account/i18n/eu.po
@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-03-18 04:47+0000\n"
-"X-Generator: Launchpad (build 12559)\n"
+"X-Launchpad-Export-Date: 2011-04-29 05:04+0000\n"
+"X-Generator: Launchpad (build 12758)\n"

 #. module: account
 #: model:process.transition,name:account.process_transition_supplierreconcilepaid0
--- a/addons/account/i18n/fa.po
+++ b/addons/account/i18n/fa.po
@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-03-18 04:52+0000\n"
-"X-Generator: Launchpad (build 12559)\n"
+"X-Launchpad-Export-Date: 2011-04-29 05:09+0000\n"
+"X-Generator: Launchpad (build 12758)\n"

 #. module: account
 #: model:process.transition,name:account.process_transition_supplierreconcilepaid0
--- a/addons/account/i18n/fa_AF.po
+++ b/addons/account/i18n/fa_AF.po
@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-03-18 04:57+0000\n"
-"X-Generator: Launchpad (build 12559)\n"
+"X-Launchpad-Export-Date: 2011-04-29 05:14+0000\n"
+"X-Generator: Launchpad (build 12758)\n"

 #. module: account
 #: model:process.transition,name:account.process_transition_supplierreconcilepaid0
--- a/addons/account/i18n/fi.po
+++ b/addons/account/i18n/fi.po
@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-03-18 04:49+0000\n"
-"X-Generator: Launchpad (build 12559)\n"
+"X-Launchpad-Export-Date: 2011-04-29 05:06+0000\n"
+"X-Generator: Launchpad (build 12758)\n"

 #. module: account
 #: model:process.transition,name:account.process_transition_supplierreconcilepaid0
--- a/addons/account/i18n/fr.po
+++ b/addons/account/i18n/fr.po
--- a/addons/account/i18n/fr_BE.po
+++ b/addons/account/i18n/fr_BE.po
@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-03-18 04:56+0000\n"
-"X-Generator: Launchpad (build 12559)\n"
+"X-Launchpad-Export-Date: 2011-04-29 05:13+0000\n"
+"X-Generator: Launchpad (build 12758)\n"

 #. module: account
 #: model:process.transition,name:account.process_transition_supplierreconcilepaid0
--- a/addons/account/i18n/gl.po
+++ b/addons/account/i18n/gl.po
@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2011-01-11 11:14+0000\n"
-"PO-Revision-Date: 2011-02-02 10:14+0000\n"
-"Last-Translator: Alberto Luengo Cabanillas (Pexego) <alberto@pexego.es>\n"
+"PO-Revision-Date: 2011-04-27 15:37+0000\n"
+"Last-Translator: Xosé <Unknown>\n"
 "Language-Team: Galician <gl@li.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-03-18 04:49+0000\n"
-"X-Generator: Launchpad (build 12559)\n"
+"X-Launchpad-Export-Date: 2011-04-29 05:06+0000\n"
+"X-Generator: Launchpad (build 12758)\n"

 #. module: account
 #: model:process.transition,name:account.process_transition_supplierreconcilepaid0
@ -2140,7 +2140,7 @@ msgstr ""
 #: field:analytic.entries.report,name:0
 #: field:report.invoice.created,name:0
 msgid "Description"
-msgstr "Descripción"
+msgstr "Descrición"

 #. module: account
 #: code:addons/account/account.py:2844
--- a/addons/account/i18n/gu.po
+++ b/addons/account/i18n/gu.po
@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-03-18 04:50+0000\n"
-"X-Generator: Launchpad (build 12559)\n"
+"X-Launchpad-Export-Date: 2011-04-29 05:06+0000\n"
+"X-Generator: Launchpad (build 12758)\n"

 #. module: account
 #: model:process.transition,name:account.process_transition_supplierreconcilepaid0
--- a/addons/account/i18n/he.po
+++ b/addons/account/i18n/he.po
@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-03-18 04:50+0000\n"
-"X-Generator: Launchpad (build 12559)\n"
+"X-Launchpad-Export-Date: 2011-04-29 05:07+0000\n"
+"X-Generator: Launchpad (build 12758)\n"

 #. module: account
 #: model:process.transition,name:account.process_transition_supplierreconcilepaid0
--- a/addons/account/i18n/hi.po
+++ b/addons/account/i18n/hi.po
@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-03-18 04:50+0000\n"
-"X-Generator: Launchpad (build 12559)\n"
+"X-Launchpad-Export-Date: 2011-04-29 05:07+0000\n"
+"X-Generator: Launchpad (build 12758)\n"

 #. module: account
 #: model:process.transition,name:account.process_transition_supplierreconcilepaid0
--- a/addons/account/i18n/hr.po
+++ b/addons/account/i18n/hr.po
@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-03-18 04:53+0000\n"
-"X-Generator: Launchpad (build 12559)\n"
+"X-Launchpad-Export-Date: 2011-04-29 05:10+0000\n"
+"X-Generator: Launchpad (build 12758)\n"

 #. module: account
 #: model:process.transition,name:account.process_transition_supplierreconcilepaid0
--- a/addons/account/i18n/hu.po
+++ b/addons/account/i18n/hu.po
@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-03-19 05:19+0000\n"
-"X-Generator: Launchpad (build 12559)\n"
+"X-Launchpad-Export-Date: 2011-04-29 05:07+0000\n"
+"X-Generator: Launchpad (build 12758)\n"

 #. module: account
 #: model:process.transition,name:account.process_transition_supplierreconcilepaid0
--- a/addons/account/i18n/id.po
+++ b/addons/account/i18n/id.po
@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-03-18 04:50+0000\n"
-"X-Generator: Launchpad (build 12559)\n"
+"X-Launchpad-Export-Date: 2011-04-29 05:07+0000\n"
+"X-Generator: Launchpad (build 12758)\n"

 #. module: account
 #: model:process.transition,name:account.process_transition_supplierreconcilepaid0
--- a/addons/account/i18n/it.po
+++ b/addons/account/i18n/it.po
@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-04-06 04:39+0000\n"
-"X-Generator: Launchpad (build 12559)\n"
+"X-Launchpad-Export-Date: 2011-04-29 05:07+0000\n"
+"X-Generator: Launchpad (build 12758)\n"

 #. module: account
 #: model:process.transition,name:account.process_transition_supplierreconcilepaid0
@ -5170,6 +5170,8 @@ msgid ""
 "According value related accounts will be display on respective reports "
 "(Balance Sheet Profit & Loss Account)"
 msgstr ""
+"I valori di raccordo dei conti saranno mostrati nei rispettivi rapporti "
+"(Conto Economico)"

 #. module: account
 #: field:account.report.general.ledger,sortby:0
@ -10639,6 +10641,10 @@ msgstr ""
 #~ msgid "Confirm statement from draft"
 #~ msgstr "Conferma il rendiconto da bozza"

+#, python-format
+#~ msgid "No Data Available"
+#~ msgstr "Nessun dato disponibile"
+
 #~ msgid "Keep empty if the fiscal year belongs to several companies."
 #~ msgstr "Lasciare vuoto se l'anno fiscale appartiene a più aziende"

@ -11098,3 +11104,12 @@ msgstr ""
 #~ msgstr ""
 #~ "Questo conto verra' usato per le fatture al posto del conto di ricavo per la "
 #~ "categoria prodotto"
+
+#~ msgid "Header"
+#~ msgstr "Intestazione"
+
+#~ msgid "<drawRightString x=\"19.8cm\" y=\"28cm\">"
+#~ msgstr "<drawRightString x=\"19.8cm\" y=\"28cm\">"
+
+#~ msgid "</drawRightString>"
+#~ msgstr "</drawRightString>"
--- a/addons/account/i18n/kab.po
+++ b/addons/account/i18n/kab.po
@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-03-18 04:51+0000\n"
-"X-Generator: Launchpad (build 12559)\n"
+"X-Launchpad-Export-Date: 2011-04-29 05:07+0000\n"
+"X-Generator: Launchpad (build 12758)\n"

 #. module: account
 #: model:process.transition,name:account.process_transition_supplierreconcilepaid0
--- a/addons/account/i18n/ko.po
+++ b/addons/account/i18n/ko.po
@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-03-18 04:51+0000\n"
-"X-Generator: Launchpad (build 12559)\n"
+"X-Launchpad-Export-Date: 2011-04-29 05:08+0000\n"
+"X-Generator: Launchpad (build 12758)\n"

 #. module: account
 #: model:process.transition,name:account.process_transition_supplierreconcilepaid0
--- a/addons/account/i18n/lo.po
+++ b/addons/account/i18n/lo.po
@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-03-18 04:51+0000\n"
-"X-Generator: Launchpad (build 12559)\n"
+"X-Launchpad-Export-Date: 2011-04-29 05:08+0000\n"
+"X-Generator: Launchpad (build 12758)\n"

 #. module: account
 #: model:process.transition,name:account.process_transition_supplierreconcilepaid0
--- a/addons/account/i18n/lt.po
+++ b/addons/account/i18n/lt.po
@ -8,13 +8,14 @@ msgstr ""
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2011-01-11 11:14+0000\n"
 "PO-Revision-Date: 2010-12-11 22:27+0000\n"
-"Last-Translator: Giedrius Slavinskas <giedrius.slavinskas@gmail.com>\n"
+"Last-Translator: Giedrius Slavinskas - inovera.lt "
+"<giedrius.slavinskas@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: 2011-03-18 04:51+0000\n"
-"X-Generator: Launchpad (build 12559)\n"
+"X-Launchpad-Export-Date: 2011-04-29 05:08+0000\n"
+"X-Generator: Launchpad (build 12758)\n"

 #. module: account
 #: model:process.transition,name:account.process_transition_supplierreconcilepaid0
@ -289,7 +290,7 @@ msgstr ""
 #: model:ir.actions.act_window,name:account.action_view_account_use_model
 #: model:ir.ui.menu,name:account.menu_action_manual_recurring
 msgid "Manual Recurring"
-msgstr ""
+msgstr "Pasirinktinas pasikartojančių įrašų kūrimas"

 #. module: account
 #: view:account.fiscalyear.close.state:0
@ -1422,7 +1423,7 @@ msgstr "Uždaryta"
 #. module: account
 #: model:ir.ui.menu,name:account.menu_finance_recurrent_entries
 msgid "Recurring Entries"
-msgstr ""
+msgstr "Pasikartojantys įrašai"

 #. module: account
 #: model:ir.model,name:account.model_account_fiscal_position_template
@ -3579,7 +3580,7 @@ msgstr "Nustatyti kaip juodraštį"
 #. module: account
 #: model:ir.actions.act_window,name:account.action_subscription_form
 msgid "Recurring Lines"
-msgstr ""
+msgstr "Pasikartojančios eilutės"

 #. module: account
 #: field:account.partner.balance,display_partner:0
@ -4054,7 +4055,7 @@ msgstr ""
 #: model:ir.actions.act_window,name:account.action_model_form
 #: model:ir.ui.menu,name:account.menu_action_model_form
 msgid "Recurring Models"
-msgstr ""
+msgstr "Pasikartojantys modeliai"

 #. module: account
 #: selection:account.automatic.reconcile,power:0
@ -5995,7 +5996,7 @@ msgstr "Įrašai: "
 #. module: account
 #: view:account.use.model:0
 msgid "Create manual recurring entries in a chosen journal."
-msgstr ""
+msgstr "Sukurti pasikartojančius įrašus pasirinktame žurnale."

 #. module: account
 #: code:addons/account/account.py:1393
@ -9090,7 +9091,7 @@ msgstr "Įmonė"
 #. module: account
 #: model:ir.ui.menu,name:account.menu_action_subscription_form
 msgid "Define Recurring Entries"
-msgstr ""
+msgstr "Apibrėžti pasikartojančius įrašus"

 #. module: account
 #: field:account.entries.report,date_maturity:0
@ -9263,7 +9264,7 @@ msgstr ""
 #. module: account
 #: view:account.subscription:0
 msgid "Recurring"
-msgstr ""
+msgstr "Pasikartojantis"

 #. module: account
 #: code:addons/account/account_move_line.py:805
--- a/addons/account/i18n/lv.po
+++ b/addons/account/i18n/lv.po
@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-04-02 04:55+0000\n"
-"X-Generator: Launchpad (build 12559)\n"
+"X-Launchpad-Export-Date: 2011-04-29 05:08+0000\n"
+"X-Generator: Launchpad (build 12758)\n"

 #. module: account
 #: model:process.transition,name:account.process_transition_supplierreconcilepaid0
--- a/addons/account/i18n/mk.po
+++ b/addons/account/i18n/mk.po
--- a/addons/account/i18n/mn.po
+++ b/addons/account/i18n/mn.po
@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-03-18 04:51+0000\n"
-"X-Generator: Launchpad (build 12559)\n"
+"X-Launchpad-Export-Date: 2011-04-29 05:08+0000\n"
+"X-Generator: Launchpad (build 12758)\n"

 #. module: account
 #: model:process.transition,name:account.process_transition_supplierreconcilepaid0
--- a/addons/account/i18n/nb.po
+++ b/addons/account/i18n/nb.po
--- a/addons/account/i18n/nl.po
+++ b/addons/account/i18n/nl.po
@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-03-18 04:48+0000\n"
-"X-Generator: Launchpad (build 12559)\n"
+"X-Launchpad-Export-Date: 2011-04-29 05:05+0000\n"
+"X-Generator: Launchpad (build 12758)\n"

 #. module: account
 #: code:addons/account/account.py:1167
--- a/addons/account/i18n/nl_BE.po
+++ b/addons/account/i18n/nl_BE.po
@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-03-18 04:56+0000\n"
-"X-Generator: Launchpad (build 12559)\n"
+"X-Launchpad-Export-Date: 2011-04-29 05:13+0000\n"
+"X-Generator: Launchpad (build 12758)\n"

 #. module: account
 #: model:process.transition,name:account.process_transition_supplierreconcilepaid0
--- a/addons/account/i18n/oc.po
+++ b/addons/account/i18n/oc.po
@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-03-18 04:52+0000\n"
-"X-Generator: Launchpad (build 12559)\n"
+"X-Launchpad-Export-Date: 2011-04-29 05:09+0000\n"
+"X-Generator: Launchpad (build 12758)\n"

 #. module: account
 #: model:process.transition,name:account.process_transition_supplierreconcilepaid0
--- a/addons/account/i18n/pl.po
+++ b/addons/account/i18n/pl.po
@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-03-18 04:52+0000\n"
-"X-Generator: Launchpad (build 12559)\n"
+"X-Launchpad-Export-Date: 2011-04-29 05:09+0000\n"
+"X-Generator: Launchpad (build 12758)\n"

 #. module: account
 #: model:process.transition,name:account.process_transition_supplierreconcilepaid0
--- a/addons/account/i18n/pt.po
+++ b/addons/account/i18n/pt.po
--- a/addons/account/i18n/pt_BR.po
+++ b/addons/account/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: 2011-01-11 11:14+0000\n"
-"PO-Revision-Date: 2011-03-08 21:39+0000\n"
+"PO-Revision-Date: 2011-05-04 03:16+0000\n"
 "Last-Translator: Emerson <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: 2011-03-18 04:56+0000\n"
-"X-Generator: Launchpad (build 12559)\n"
+"X-Launchpad-Export-Date: 2011-05-05 04:40+0000\n"
+"X-Generator: Launchpad (build 12959)\n"

 #. module: account
 #: model:process.transition,name:account.process_transition_supplierreconcilepaid0
@ -675,7 +675,7 @@ msgstr "Valor do Código do Imposto"
 #: code:addons/account/installer.py:434
 #, python-format
 msgid "SAJ"
-msgstr "SAJ"
+msgstr "DV"

 #. module: account
 #: help:account.bank.statement,balance_end_real:0
@ -948,7 +948,7 @@ msgstr "Diário Centralizador"
 #. module: account
 #: selection:account.journal,type:0
 msgid "Sale Refund"
-msgstr "Reembolso de Vendas"
+msgstr "Devolução de Venda"

 #. module: account
 #: model:process.node,note:account.process_node_accountingstatemententries0
@ -1549,7 +1549,7 @@ msgstr "Conta pagável"
 #: field:account.tax,account_paid_id:0
 #: field:account.tax.template,account_paid_id:0
 msgid "Refund Tax Account"
-msgstr "Conta reembolso da taxa"
+msgstr "Conta de Reembolso de Imposto"

 #. module: account
 #: view:account.bank.statement:0
@ -1639,8 +1639,8 @@ msgid ""
 "Cancel Invoice: Creates the refund invoice, validate and reconcile it to "
 "cancel the current invoice."
 msgstr ""
-"Cancelar Fatura: Cria uma Fatura de Reembolso, Valide e Reconcilie a mesma "
-"para cancelar a Fatura Corrente."
+"Cancelar Fatura: Crie a fatura de devolução, valide e a reconcilie para "
+"cancelar a fatura atual."

 #. module: account
 #: model:ir.ui.menu,name:account.periodical_processing_invoicing
@ -1843,7 +1843,7 @@ msgstr "Registros por Linha"
 #. module: account
 #: report:account.tax.code.entries:0
 msgid "A/c Code"
-msgstr ""
+msgstr "Código A/C"

 #. module: account
 #: field:account.invoice,move_id:0
@ -2148,7 +2148,7 @@ msgstr "Descrição"
 #: code:addons/account/installer.py:498
 #, python-format
 msgid "ECNJ"
-msgstr ""
+msgstr "DRC"

 #. module: account
 #: view:account.subscription:0
@ -2397,7 +2397,7 @@ msgstr "Modelo de entrada de contas"
 #: code:addons/account/installer.py:454
 #, python-format
 msgid "EXJ"
-msgstr "EXJ"
+msgstr "DC"

 #. module: account
 #: field:product.template,supplier_taxes_id:0
@ -2567,7 +2567,7 @@ msgstr "Pago/Reconciliado"
 #: field:account.tax,ref_base_code_id:0
 #: field:account.tax.template,ref_base_code_id:0
 msgid "Refund Base Code"
-msgstr "Código base p/reembolso"
+msgstr "Código Base para Devolução"

 #. module: account
 #: model:ir.actions.act_window,name:account.action_bank_statement_periodic_tree
@ -2707,6 +2707,8 @@ msgid ""
 "The statement balance is incorrect !\n"
 "The expected balance (%.2f) is different than the computed one. (%.2f)"
 msgstr ""
+"O saldo final do extrato está incorreto!\n"
+"O saldo experado (%.2f) é diferente do saldo calculado (%.2f)"

 #. module: account
 #: model:process.transition,note:account.process_transition_paymentreconcile0
@ -2964,14 +2966,14 @@ msgstr "Visualizar"
 #: code:addons/account/account.py:2951
 #, python-format
 msgid "BNK%s"
-msgstr ""
+msgstr "BCO%s"

 #. module: account
 #: code:addons/account/account.py:2906
 #: code:addons/account/installer.py:296
 #, python-format
 msgid "BNK"
-msgstr "BNK"
+msgstr "BCO"

 #. module: account
 #: field:account.move.line,analytic_lines:0
@ -4150,7 +4152,7 @@ msgstr "Extratos Bancários são lançados no sistema."
 #: code:addons/account/wizard/account_reconcile.py:133
 #, python-format
 msgid "Reconcile Writeoff"
-msgstr ""
+msgstr "Reconcílie a amortização"

 #. module: account
 #: field:account.model.line,date_maturity:0
@ -4394,7 +4396,7 @@ msgstr "Data da operação"
 #: field:account.tax,ref_tax_code_id:0
 #: field:account.tax.template,ref_tax_code_id:0
 msgid "Refund Tax Code"
-msgstr "Código da taxa de reembolso"
+msgstr "Código do Imposto para Reembolso"

 #. module: account
 #: view:validate.account.move:0
@ -4618,7 +4620,8 @@ msgstr ""
 #. module: account
 #: help:account.journal,refund_journal:0
 msgid "Fill this if the journal is to be used for refunds of invoices."
-msgstr "Preencha se o diário for usado para reembolso de faturas."
+msgstr ""
+"Preencha este campo se o diário deve ser usado para reembolsos de faturas."

 #. module: account
 #: view:account.fiscalyear.close:0
@ -4956,7 +4959,7 @@ msgstr "Permite cancelar lançamentos"
 #. module: account
 #: field:account.tax.code,sign:0
 msgid "Coefficent for parent"
-msgstr ""
+msgstr "Coeficiente para conta principal"

 #. module: account
 #: report:account.partner.balance:0
@ -5074,7 +5077,7 @@ msgstr "Contabilidade Analítica"
 #: selection:account.invoice.report,type:0
 #: selection:report.invoice.created,type:0
 msgid "Customer Refund"
-msgstr "Reembolso do cliente"
+msgstr "Reembolso a Cliente"

 #. module: account
 #: view:account.account:0
@ -5641,7 +5644,7 @@ msgstr "  365 dias  "
 #: model:ir.actions.act_window,name:account.action_invoice_tree3
 #: model:ir.ui.menu,name:account.menu_action_invoice_tree3
 msgid "Customer Refunds"
-msgstr "Reembolso a clientes"
+msgstr "Reembolsos para Cliente"

 #. module: account
 #: view:account.payment.term.line:0
@ -5756,7 +5759,7 @@ msgstr ""
 #: code:addons/account/invoice.py:997
 #, python-format
 msgid "Invoice  '%s' is validated."
-msgstr ""
+msgstr "A fatura '%s' está validada."

 #. module: account
 #: view:account.chart.template:0
@ -5980,7 +5983,7 @@ msgstr "Energia"
 #. module: account
 #: field:account.invoice.refund,filter_refund:0
 msgid "Refund Type"
-msgstr "Tipo de Reembolso"
+msgstr "Tipo de Devolução"

 #. module: account
 #: report:account.invoice:0
@ -6120,7 +6123,7 @@ msgstr "Entre com a Data Inicial !"
 #: selection:account.invoice.report,type:0
 #: selection:report.invoice.created,type:0
 msgid "Supplier Refund"
-msgstr "Reembolso a fornecedor"
+msgstr "Devolução para Fornecedor"

 #. module: account
 #: model:ir.ui.menu,name:account.menu_dashboard_acc
@ -6784,6 +6787,8 @@ msgid ""
 "This date will be used as the invoice date for Refund Invoice and Period "
 "will be chosen accordingly!"
 msgstr ""
+"Esta data será usada como a data da Fatura de Devolução e o período será "
+"escolhido apropriadamente!"

 #. module: account
 #: field:account.aged.trial.balance,period_length:0
@ -7010,9 +7015,9 @@ msgid ""
 "Bank Account Number, Company bank account if Invoice is customer or supplier "
 "refund, otherwise Partner bank account number."
 msgstr ""
-"Número da Conta Bancária. Conta bancária da Empresa se a fatura é um "
-"reembolso de cliente ou fornecedor, senão é o número da conta bancária do "
-"Parceiro."
+"Número da Conta Bancária. Será a conta bancária da Empresa se for uma fatura "
+"de devolução de cliente ou para fornecedor, senão será o número da conta "
+"bancária do Parceiro."

 #. module: account
 #: help:account.tax,domain:0
@ -7114,6 +7119,9 @@ msgid ""
 "will be added, Loss : Amount will be deducted.), Which is calculated from "
 "Profit & Loss Report"
 msgstr ""
+"Essa conta é usada para a transferência de Lucro/Perdas (se for lucro: O "
+"valor será adicionado, Perda: O valor será deduzido), que é calculado a "
+"partir de Relatório de Lucos e Perdas"

 #. module: account
 #: view:account.invoice.line:0
@ -7762,7 +7770,7 @@ msgstr "Escolha o Ano Fiscal"
 #: code:addons/account/installer.py:495
 #, python-format
 msgid "Purchase Refund Journal"
-msgstr "Diário de Reembolso de Compra"
+msgstr "Diário de Devolução de Compra"

 #. module: account
 #: help:account.tax.template,amount:0
@ -7869,10 +7877,10 @@ msgid ""
 "can easily generate refunds and reconcile them directly from the invoice "
 "form."
 msgstr ""
-"Com o Reembolso de Clientes você pode gerenciar as notas de crédito para "
+"Com os Reembolsos para Cliente você pode gerenciar as notas de crédito para "
 "seus clientes. Um reembolso é um documento que credita completamente ou "
 "parcialmente uma fatura. Você pode facilmente gerar reembolsos e reconciliá-"
-"los diretamente da tela de faturamento."
+"los diretamente a partir da tela de faturamento."

 #. module: account
 #: model:ir.actions.act_window,help:account.action_account_vat_declaration
@ -8019,7 +8027,7 @@ msgstr ""
 #: field:account.invoice.refund,journal_id:0
 #: field:account.journal,refund_journal:0
 msgid "Refund Journal"
-msgstr "Diário de reembolso"
+msgstr "Diário de Devolução"

 #. module: account
 #: report:account.account.balance:0
@ -8037,6 +8045,10 @@ msgid ""
 "sales orders or deliveries. You should only confirm them before sending them "
 "to your customers."
 msgstr ""
+"Com as Faturas de Clientes você pode criar e gerenciar notas de vendas "
+"emitidas para seus clientes. O OpenERP pode também gerar faturas provisórias "
+"automaticamente a partir de pedidos de venda ou entregas. Você deve apenas "
+"confirma-las antes de enviar para os seus clientes."

 #. module: account
 #: view:account.entries.report:0
@ -8072,7 +8084,7 @@ msgstr "Diário de compras"
 #. module: account
 #: view:account.invoice.refund:0
 msgid "Refund Invoice: Creates the refund invoice, ready for editing."
-msgstr "Fatura de Reembolso: Cria a fatura de reembolso pronta para edição."
+msgstr "Fatura de Devolução: Cria a fatura de devolução pronta para edição."

 #. module: account
 #: field:account.invoice.line,price_subtotal:0
@ -8082,7 +8094,7 @@ msgstr "Subtotal"
 #. module: account
 #: view:account.vat.declaration:0
 msgid "Print Tax Statement"
-msgstr ""
+msgstr "Imprimir Declaração de Imposto"

 #. module: account
 #: view:account.model.line:0
@ -8431,6 +8443,9 @@ msgid ""
 "the amount of this case into its parent. For example, set 1/-1 if you want "
 "to add/substract it."
 msgstr ""
+"Você pode especificar o coeficiente que será usado para consolidação do "
+"valor desta taxa no seu item pai. Por exemplo, defina 1/-1 se quiser "
+"adicionar/subtrair o valor."

 #. module: account
 #: view:account.invoice:0
@ -8468,7 +8483,7 @@ msgstr "Período de"
 #: code:addons/account/installer.py:476
 #, python-format
 msgid "Sales Refund Journal"
-msgstr "Diário de Reembolso de Vendas"
+msgstr "Diário de Devolução de Vendas"

 #. module: account
 #: code:addons/account/account.py:927
@ -8542,7 +8557,7 @@ msgstr "Configure sua Aplicação Contábil"
 #: code:addons/account/installer.py:479
 #, python-format
 msgid "SCNJ"
-msgstr ""
+msgstr "DRV"

 #. module: account
 #: model:process.transition,note:account.process_transition_analyticinvoice0
@ -8671,10 +8686,10 @@ msgid ""
 "partially. You can easily generate refunds and reconcile them directly from "
 "the invoice form."
 msgstr ""
-"Com os Reembolsos de Fornecedor, você pode gerenciar as notas de créditos "
-"que recebe dos seus fornecedores. Um reembolso é um documento que credita "
-"uma fatura completamente ou parcialmente. Você pode facilmente gerar "
-"reembolsos e reconciliá-los diretamente a partir da tela de faturas."
+"Com os Reembolsos de Fornecedor você pode gerenciar as notas de crédito que "
+"recebe dos seus fornecedores. Um reembolso é um documento que credita "
+"completamente ou parcialmente uma fatura. Você pode facilmente gerar "
+"reembolsos e reconciliá-los diretamente a partir da tela de faturamento."

 #. module: account
 #: view:account.account.template:0
@ -8827,6 +8842,12 @@ msgid ""
 "closed or left open depending on your company's activities over a specific "
 "period."
 msgstr ""
+"Aqui você pode definir um período financeiro, ou seja, um intervalo de tempo "
+"no ano fiscal da sua empresa. Um período contábil é normalmente um mês ou um "
+"quadrimestre. Ele geralmente corresponde ao período de declaração de "
+"impostos. Crie e administre os períodos a partir daqui e decida se um "
+"período deve ser fechado ou deixado aberto dependendo das atividades da sua "
+"empresa sobre um período específico."

 #. module: account
 #: report:account.move.voucher:0
@ -9187,7 +9208,7 @@ msgid ""
 "created. If you leave that field empty, it will use the same journal as the "
 "current invoice."
 msgstr ""
-"Aqui você pode selecionar o diário para usar na fatura de reembolso a ser "
+"Aqui você pode selecionar o diário para usar na fatura de devolução a ser "
 "criada. Se você deixar em branco, será usado o mesmo diário da fatura atual."

 #. module: account
@ -9299,7 +9320,7 @@ msgid ""
 "Refund invoice base on this type. You can not Modify and Cancel if the "
 "invoice is already reconciled"
 msgstr ""
-"Faturas de Reembolso se baseiam neste tipo. Você não pode Modificar e "
+"A faturas de devolução é baseada neste tipo. Você não pode Modificar e "
 "Cancelar se a fatura já estiver reconciliada"

 #. module: account
@ -9507,7 +9528,7 @@ msgstr "JNRL"
 #. module: account
 #: view:account.payment.term.line:0
 msgid "  value amount: 0.02"
-msgstr ""
+msgstr "  valor total: 0.02"

 #. module: account
 #: view:account.fiscalyear:0
@ -9601,7 +9622,7 @@ msgstr "Criar períodos mensais"
 #. module: account
 #: field:account.tax.code.template,sign:0
 msgid "Sign For Parent"
-msgstr ""
+msgstr "Sinal Para o Pai"

 #. module: account
 #: model:ir.model,name:account.model_account_balance_report
@ -9618,6 +9639,8 @@ msgstr "Demonstrativos provisórios"
 msgid ""
 "Manual or automatic creation of payment entries according to the statements"
 msgstr ""
+"Criação manual ou automática dos lançamentos de pagamento de acordo com a "
+"declaração"

 #. module: account
 #: view:account.invoice:0
@ -9967,7 +9990,7 @@ msgstr "Pesquisar Fatura"
 #: view:account.invoice.report:0
 #: model:ir.actions.act_window,name:account.action_account_invoice_refund
 msgid "Refund"
-msgstr "Reembolso"
+msgstr "Devolução"

 #. module: account
 #: field:wizard.multi.charts.accounts,bank_accounts_id:0
--- a/addons/account/i18n/ro.po
+++ b/addons/account/i18n/ro.po
@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-03-28 04:35+0000\n"
-"X-Generator: Launchpad (build 12559)\n"
+"X-Launchpad-Export-Date: 2011-04-29 05:09+0000\n"
+"X-Generator: Launchpad (build 12758)\n"

 #. module: account
 #: model:process.transition,name:account.process_transition_supplierreconcilepaid0
--- a/addons/account/i18n/ru.po
+++ b/addons/account/i18n/ru.po
@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2011-01-11 11:14+0000\n"
-"PO-Revision-Date: 2011-03-20 16:41+0000\n"
+"PO-Revision-Date: 2011-04-15 19:34+0000\n"
 "Last-Translator: Chertykov Denis <chertykov@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: 2011-03-21 04:46+0000\n"
-"X-Generator: Launchpad (build 12559)\n"
+"X-Launchpad-Export-Date: 2011-04-29 05:09+0000\n"
+"X-Generator: Launchpad (build 12758)\n"

 #. module: account
 #: model:process.transition,name:account.process_transition_supplierreconcilepaid0
@ -30,7 +30,7 @@ msgstr "Прочие настройки"
 #: code:addons/account/wizard/account_open_closed_fiscalyear.py:40
 #, python-format
 msgid "No End of year journal defined for the fiscal year"
-msgstr ""
+msgstr "Не определен журнал конца года для финансового года"

 #. module: account
 #: code:addons/account/account.py:506
@ -176,8 +176,8 @@ msgid ""
 "If the active field is set to False, it will allow you to hide the payment "
 "term without removing it."
 msgstr ""
-"Если в активном поле установлено значение Ложь, вы сможете скрыть срок "
-"оплаты, не удаляя его."
+"Если поле 'Активно' имеет значение Ложь, вы сможете скрыть срок оплаты, не "
+"удаляя его."

 #. module: account
 #: code:addons/account/invoice.py:1421
@ -336,6 +336,8 @@ msgid ""
 "Installs localized accounting charts to match as closely as possible the "
 "accounting needs of your company based on your country."
 msgstr ""
+"Устанавливает локализованный план счетов, чтобы соответствовать как можно "
+"ближе потребностям учета вашей компании на основе учета в вашей стране."

 #. module: account
 #: code:addons/account/wizard/account_move_journal.py:63
@ -1665,6 +1667,8 @@ msgid ""
 "If the active field is set to False, it will allow you to hide the journal "
 "period without removing it."
 msgstr ""
+"Если поле 'Активно' имеет значение Ложь, вы сможете скрыть период журнала, "
+"не удаляя его."

 #. module: account
 #: view:res.partner:0
@ -2890,7 +2894,7 @@ msgstr "Вид"
 #: code:addons/account/account.py:2951
 #, python-format
 msgid "BNK%s"
-msgstr ""
+msgstr "БНК%s"

 #. module: account
 #: code:addons/account/account.py:2906
@ -3217,6 +3221,8 @@ msgid ""
 "Selected Invoice(s) cannot be cancelled as they are already in 'Cancelled' "
 "or 'Done' state!"
 msgstr ""
+"Выбранные счета не могут быть отменены, поскольку они уже находятся в "
+"состоянии \"Отменено\" или \"Сделано\" !"

 #. module: account
 #: code:addons/account/account.py:522
@ -3599,7 +3605,7 @@ msgstr "Журнал аналитических проводок"
 #: view:product.template:0
 #: view:res.partner:0
 msgid "Accounting"
-msgstr "Бухгалтерский"
+msgstr "Бухгалтерия"

 #. module: account
 #: help:account.central.journal,amount_currency:0
@ -3747,11 +3753,13 @@ msgid ""
 "If the active field is set to False, it will allow you to hide the account "
 "without removing it."
 msgstr ""
+"Если поле 'Активно' имеет значение Ложь, вы сможете скрыть счет, не удаляя "
+"его."

 #. module: account
 #: view:account.tax.template:0
 msgid "Search Tax Templates"
-msgstr ""
+msgstr "Искать шаблоны налогов"

 #. module: account
 #: model:ir.ui.menu,name:account.periodical_processing_journal_entries_validation
@ -3975,6 +3983,8 @@ msgid ""
 "When new move line is created the state will be 'Draft'.\n"
 "* When all the payments are done it will be in 'Valid' state."
 msgstr ""
+"Когда новое перемещение создается, его состояние 'Черновик'.\n"
+"* Когда все платежи произведены состояние будет 'Проведено'."

 #. module: account
 #: field:account.journal,view_id:0
@ -4547,7 +4557,7 @@ msgstr ""
 #: code:addons/account/account.py:940
 #, python-format
 msgid "Start period should be smaller then End period"
-msgstr ""
+msgstr "Начало периода должно быть меньше, чем конец периода"

 #. module: account
 #: selection:account.automatic.reconcile,power:0
@ -5090,7 +5100,7 @@ msgstr "Количество"
 #. module: account
 #: view:account.move.line:0
 msgid "Number (Move)"
-msgstr ""
+msgstr "Номер (перемещение)"

 #. module: account
 #: view:account.invoice.refund:0
@ -5164,7 +5174,7 @@ msgstr "Фиксированная величина"
 #. module: account
 #: view:account.subscription:0
 msgid "Valid Up to"
-msgstr ""
+msgstr "Действительно до"

 #. module: account
 #: view:board.board:0
@ -5191,7 +5201,7 @@ msgstr ""
 #: model:ir.actions.act_window,name:account.action_account_fiscalyear_close
 #: model:ir.ui.menu,name:account.menu_wizard_fy_close
 msgid "Generate Opening Entries"
-msgstr ""
+msgstr "Генерировать открывающие проводки"

 #. module: account
 #: code:addons/account/account_move_line.py:738
@ -5261,7 +5271,7 @@ msgstr "Поставщик"
 #: selection:report.account.sales,month:0
 #: selection:report.account_type.sales,month:0
 msgid "March"
-msgstr ""
+msgstr "Март"

 #. module: account
 #: view:account.account.template:0
@ -5370,7 +5380,7 @@ msgstr "# строк"
 #: code:addons/account/wizard/account_change_currency.py:60
 #, python-format
 msgid "New currency is not confirured properly !"
-msgstr ""
+msgstr "Новая валюта неправильно настроена !"

 #. module: account
 #: field:account.aged.trial.balance,filter:0
@ -5624,7 +5634,7 @@ msgstr "Настройка отчетов"
 #. module: account
 #: constraint:account.move.line:0
 msgid "Company must be same for its related account and period."
-msgstr ""
+msgstr "Для счета и периода должна быть одна компания."

 #. module: account
 #: field:account.tax,type:0
@ -5927,7 +5937,7 @@ msgstr ""
 #: code:addons/account/wizard/account_report_aged_partner_balance.py:57
 #, python-format
 msgid "Enter a Start date !"
-msgstr ""
+msgstr "Введите дату начала !"

 #. module: account
 #: report:account.invoice:0
@ -6141,6 +6151,8 @@ msgid ""
 "This account will be used instead of the default one as the receivable "
 "account for the current partner"
 msgstr ""
+"Этот счет будет использоваться, вместо счета по умолчанию, для дебиторской "
+"задолженности по текущему контрагенту."

 #. module: account
 #: field:account.tax,python_applicable:0
@ -6271,6 +6283,8 @@ msgid ""
 "This report is an analysis done by a partner. It is a PDF report containing "
 "one line per partner representing the cumulative credit balance"
 msgstr ""
+"Это отчет - анализ по контрагентам. Это PDF отчет состоящий из одной строки "
+"на одного контрагента с совокупным кредитовым балансом."

 #. module: account
 #: code:addons/account/wizard/account_validate_account_move.py:61
@ -6315,13 +6329,13 @@ msgstr ""
 #. module: account
 #: view:account.journal.select:0
 msgid "Journal Select"
-msgstr ""
+msgstr "Выбор журнала"

 #. module: account
 #: code:addons/account/wizard/account_change_currency.py:65
 #, python-format
 msgid "Currnt currency is not confirured properly !"
-msgstr ""
+msgstr "Текущая валюта неправильно настроена !"

 #. module: account
 #: model:ir.model,name:account.model_account_move_reconcile
@ -6362,6 +6376,8 @@ msgid ""
 "Check this box if you are unsure of that journal entry and if you want to "
 "note it as 'to be reviewed' by an accounting expert."
 msgstr ""
+"Отметьте этот квадрат, если вы не уверены в этой записи журнала и хотите "
+"отметить её \"для проверки\" опытному бухгалтеру."

 #. module: account
 #: help:account.installer.modules,account_voucher:0
@ -6463,12 +6479,12 @@ msgstr "Столбец журнала"
 #: selection:account.subscription,state:0
 #: selection:report.invoice.created,state:0
 msgid "Done"
-msgstr "Выполнено"
+msgstr "Сделано"

 #. module: account
 #: model:process.transition,note:account.process_transition_invoicemanually0
 msgid "A statement with manual entries becomes a draft statement."
-msgstr ""
+msgstr "Документ с проводками вручную становится черновиком."

 #. module: account
 #: view:account.aged.trial.balance:0
@ -6782,7 +6798,7 @@ msgstr "Отчетность"
 #. module: account
 #: sql_constraint:account.journal:0
 msgid "The code of the journal must be unique per company !"
-msgstr ""
+msgstr "Код журнала должен быть уникальным для компании !"

 #. module: account
 #: field:account.bank.statement,ending_details_ids:0
@ -6822,7 +6838,7 @@ msgstr "Домен"
 #. module: account
 #: model:ir.model,name:account.model_account_use_model
 msgid "Use model"
-msgstr ""
+msgstr "Использовать модель"

 #. module: account
 #: model:ir.actions.act_window,help:account.action_account_moves_purchase
@ -7369,6 +7385,8 @@ msgid ""
 "When monthly periods are created. The state is 'Draft'. At the end of "
 "monthly period it is in 'Done' state."
 msgstr ""
+"При создании месячных периодов, состояние 'Черновик'. В конце месячного "
+"периода состояние 'Сделано'."

 #. module: account
 #: report:account.analytic.account.inverted.balance:0
@ -7417,7 +7435,7 @@ msgstr "Банковские и кассовые счета"
 #: view:account.invoice.report:0
 #: field:account.invoice.report,residual:0
 msgid "Total Residual"
-msgstr ""
+msgstr "Общий остаток"

 #. module: account
 #: model:process.node,note:account.process_node_invoiceinvoice0
@ -7436,7 +7454,7 @@ msgstr ""
 #. module: account
 #: view:account.installer.modules:0
 msgid "Add extra Accounting functionalities to the ones already installed."
-msgstr ""
+msgstr "Добавить дополнительную функциональность учета к уже установленной."

 #. module: account
 #: report:account.analytic.account.cost_ledger:0
@ -7798,6 +7816,8 @@ msgstr "Поставщики"
 msgid ""
 "You cannot create more than one move per period on centralized journal"
 msgstr ""
+"Вы не можете создать больше одного действия за период по централизованному "
+"журналу."

 #. module: account
 #: view:account.journal:0
@ -8488,7 +8508,7 @@ msgstr ""
 #: model:process.node,note:account.process_node_manually0
 #: model:process.transition,name:account.process_transition_invoicemanually0
 msgid "Manual entry"
-msgstr ""
+msgstr "Проводка вручную"

 #. module: account
 #: report:account.general.ledger:0
@ -8697,7 +8717,7 @@ msgstr "Не сверенные"
 #: code:addons/account/invoice.py:804
 #, python-format
 msgid "Bad total !"
-msgstr ""
+msgstr "Плохой итог !"

 #. module: account
 #: field:account.journal,sequence_id:0
@ -9200,7 +9220,7 @@ msgstr "Определить повторяющиеся проводки"
 #. module: account
 #: field:account.entries.report,date_maturity:0
 msgid "Date Maturity"
-msgstr ""
+msgstr "Дата погашения"

 #. module: account
 #: help:account.bank.statement,total_entry_encoding:0
@ -9228,7 +9248,7 @@ msgstr ""
 #. module: account
 #: model:ir.model,name:account.model_account_balance_report
 msgid "Trial Balance Report"
-msgstr ""
+msgstr "Балансовый отчет"

 #. module: account
 #: model:ir.actions.act_window,name:account.action_bank_statement_draft_tree
@ -9678,6 +9698,8 @@ msgid ""
 "If the active field is set to False, it will allow you to hide the analytic "
 "journal without removing it."
 msgstr ""
+"Если поле 'Активно' имеет значение Ложь, вы сможете скрыть журнал аналитики, "
+"не удаляя его."

 #. module: account
 #: field:account.analytic.line,ref:0
--- a/addons/account/i18n/si.po
+++ b/addons/account/i18n/si.po
@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-03-18 04:53+0000\n"
-"X-Generator: Launchpad (build 12559)\n"
+"X-Launchpad-Export-Date: 2011-04-29 05:10+0000\n"
+"X-Generator: Launchpad (build 12758)\n"

 #. module: account
 #: model:process.transition,name:account.process_transition_supplierreconcilepaid0
--- a/addons/account/i18n/sk.po
+++ b/addons/account/i18n/sk.po
@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-03-18 04:53+0000\n"
-"X-Generator: Launchpad (build 12559)\n"
+"X-Launchpad-Export-Date: 2011-04-29 05:10+0000\n"
+"X-Generator: Launchpad (build 12758)\n"

 #. module: account
 #: model:process.transition,name:account.process_transition_supplierreconcilepaid0
--- a/addons/account/i18n/sl.po
+++ b/addons/account/i18n/sl.po
@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-03-18 04:54+0000\n"
-"X-Generator: Launchpad (build 12559)\n"
+"X-Launchpad-Export-Date: 2011-04-29 05:10+0000\n"
+"X-Generator: Launchpad (build 12758)\n"

 #. module: account
 #: model:process.transition,name:account.process_transition_supplierreconcilepaid0
--- a/addons/account/i18n/sq.po
+++ b/addons/account/i18n/sq.po
@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-03-18 04:47+0000\n"
-"X-Generator: Launchpad (build 12559)\n"
+"X-Launchpad-Export-Date: 2011-04-29 05:04+0000\n"
+"X-Generator: Launchpad (build 12758)\n"

 #. module: account
 #: model:process.transition,name:account.process_transition_supplierreconcilepaid0
--- a/addons/account/i18n/sr.po
+++ b/addons/account/i18n/sr.po
@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-03-18 04:53+0000\n"
-"X-Generator: Launchpad (build 12559)\n"
+"X-Launchpad-Export-Date: 2011-04-29 05:10+0000\n"
+"X-Generator: Launchpad (build 12758)\n"

 #. module: account
 #: model:process.transition,name:account.process_transition_supplierreconcilepaid0
--- a/addons/account/i18n/sr@latin.po
+++ b/addons/account/i18n/sr@latin.po
@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-03-18 04:58+0000\n"
-"X-Generator: Launchpad (build 12559)\n"
+"X-Launchpad-Export-Date: 2011-04-29 05:14+0000\n"
+"X-Generator: Launchpad (build 12758)\n"

 #. module: account
 #: model:process.transition,name:account.process_transition_supplierreconcilepaid0
--- a/addons/account/i18n/sv.po
+++ b/addons/account/i18n/sv.po
@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-03-18 04:54+0000\n"
-"X-Generator: Launchpad (build 12559)\n"
+"X-Launchpad-Export-Date: 2011-04-29 05:11+0000\n"
+"X-Generator: Launchpad (build 12758)\n"

 #. module: account
 #: model:process.transition,name:account.process_transition_supplierreconcilepaid0
@ -30,7 +30,7 @@ msgstr "Övrig konfiguration"
 #: code:addons/account/wizard/account_open_closed_fiscalyear.py:40
 #, python-format
 msgid "No End of year journal defined for the fiscal year"
-msgstr "Inget slutdatum definierat för bokföringsåret"
+msgstr "Slutdatum saknas för bokföringsåret"

 #. module: account
 #: code:addons/account/account.py:506
@ -44,12 +44,12 @@ msgstr ""
 #. module: account
 #: view:account.move.reconcile:0
 msgid "Journal Entry Reconcile"
-msgstr "Gournal transaktion avstämning"
+msgstr "Avstämning av journalpost"

 #. module: account
 #: field:account.installer.modules,account_voucher:0
 msgid "Voucher Management"
-msgstr "Kuponghantering"
+msgstr "Verifikatregistrering"

 #. module: account
 #: view:account.account:0
@ -69,7 +69,7 @@ msgstr "Kvarvarande"
 #: code:addons/account/invoice.py:785
 #, python-format
 msgid "Please define sequence on invoice journal"
-msgstr "Vänligen definera en sekvens på fakturajournalen"
+msgstr "Vänligen definiera en nummerserie för fakturajournalen"

 #. module: account
 #: constraint:account.period:0
@ -471,11 +471,11 @@ msgid ""
 "amount of each area of the tax declaration for your country. It’s presented "
 "in a hierarchical structure, which can be modified to fit your needs."
 msgstr ""
-"Diagram på Skatter är en trädvy som återspeglar strukturen i Skatter (eller "
-"skatt koder) och visar den aktuella skattesituationen. Skattediagrammet "
-"representerar den mängd varje område i deklarationen för ditt land. Det "
-"presenteras i en hierarkisk struktur, som kan modifieras för att passa dina "
-"behov."
+"Momstabell är en trädvy som återspeglar strukturen i momssatser (eller "
+"momskoder) och visar den aktuella skattesituationen. Momstabellen "
+"representerar de avsnitt som skall redovisas på skattedeklarationen för ditt "
+"land. Den presenteras i en hierarkisk struktur, som kan modifieras för att "
+"passa dina behov."

 #. module: account
 #: view:account.analytic.line:0
@ -736,7 +736,7 @@ msgstr "Procent"
 #. module: account
 #: model:ir.ui.menu,name:account.menu_finance_charts
 msgid "Charts"
-msgstr "Grafer"
+msgstr "Kontoplaner"

 #. module: account
 #: code:addons/account/project/wizard/project_account_analytic_line.py:47
@ -869,7 +869,7 @@ msgstr ""
 #: model:ir.actions.act_window,name:account.action_tax_code_tree
 #: model:ir.ui.menu,name:account.menu_action_tax_code_tree
 msgid "Chart of Taxes"
-msgstr "Chart of Taxes"
+msgstr "Momssatser"

 #. module: account
 #: view:account.fiscalyear:0
@ -1640,9 +1640,9 @@ msgid ""
 "Have a complete tree view of all journal items per account code by clicking "
 "on an account."
 msgstr ""
-"Visa ditt företagskontoplan per bokföringsår och selektera på period.  Du "
-"får en komplett trädvy över alla verifikationer per konto genom att klicka "
-"på ett konto."
+"Visar företagets kontoplan per bokföringsår och selekterat på period. Du får "
+"en komplett trädvy över alla verifikationer per konto genom att klicka på "
+"ett konto."

 #. module: account
 #: constraint:account.fiscalyear:0
@ -1706,7 +1706,7 @@ msgstr "Ref. :"
 #. module: account
 #: view:account.analytic.chart:0
 msgid "Analytic Account Charts"
-msgstr "Analytic Account Charts"
+msgstr "Objektkontoplan"

 #. module: account
 #: view:account.analytic.line:0
@ -2005,7 +2005,7 @@ msgstr "Innevarande bokf.år"
 #. module: account
 #: view:account.tax.chart:0
 msgid "Account tax charts"
-msgstr ""
+msgstr "Momskonton"

 #. module: account
 #: constraint:account.period:0
@ -3161,7 +3161,7 @@ msgstr ""
 #. module: account
 #: view:account.chart:0
 msgid "Account charts"
-msgstr "Account charts"
+msgstr "Kontoplan"

 #. module: account
 #: report:account.vat.declaration:0
@ -3271,7 +3271,7 @@ msgstr "VAT :"
 #: model:ir.actions.act_window,name:account.action_account_tree
 #: model:ir.ui.menu,name:account.menu_action_account_tree2
 msgid "Chart of Accounts"
-msgstr "Kontotabell"
+msgstr "Kontoplan"

 #. module: account
 #: view:account.tax.chart:0
@ -3356,7 +3356,7 @@ msgstr "The journal must have default credit and debit account"
 #. module: account
 #: view:account.chart.template:0
 msgid "Chart of Accounts Template"
-msgstr "Kontotabell template"
+msgstr "Förlaga för kontoplan"

 #. module: account
 #: code:addons/account/account.py:2095
@ -3979,7 +3979,7 @@ msgstr "  dag i månaden: 0"
 #. module: account
 #: model:ir.model,name:account.model_account_chart
 msgid "Account chart"
-msgstr "Konto plan"
+msgstr "Kontoplan"

 #. module: account
 #: report:account.account.balance.landscape:0
@ -4629,7 +4629,7 @@ msgstr "År"
 #. module: account
 #: field:account.bank.statement,starting_details_ids:0
 msgid "Opening Cashbox"
-msgstr ""
+msgstr "Öppna kassalåda"

 #. module: account
 #: view:account.payment.term.line:0
--- a/addons/account/i18n/ta.po
+++ b/addons/account/i18n/ta.po
@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-03-18 04:54+0000\n"
-"X-Generator: Launchpad (build 12559)\n"
+"X-Launchpad-Export-Date: 2011-04-29 05:11+0000\n"
+"X-Generator: Launchpad (build 12758)\n"

 #. module: account
 #: model:process.transition,name:account.process_transition_supplierreconcilepaid0
--- a/addons/account/i18n/te.po
+++ b/addons/account/i18n/te.po
@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-03-18 04:54+0000\n"
-"X-Generator: Launchpad (build 12559)\n"
+"X-Launchpad-Export-Date: 2011-04-29 05:11+0000\n"
+"X-Generator: Launchpad (build 12758)\n"

 #. module: account
 #: model:process.transition,name:account.process_transition_supplierreconcilepaid0
--- a/addons/account/i18n/th.po
+++ b/addons/account/i18n/th.po
@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-03-18 04:54+0000\n"
-"X-Generator: Launchpad (build 12559)\n"
+"X-Launchpad-Export-Date: 2011-04-29 05:11+0000\n"
+"X-Generator: Launchpad (build 12758)\n"

 #. module: account
 #: model:process.transition,name:account.process_transition_supplierreconcilepaid0
--- a/addons/account/i18n/tlh.po
+++ b/addons/account/i18n/tlh.po
@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-03-18 04:54+0000\n"
-"X-Generator: Launchpad (build 12559)\n"
+"X-Launchpad-Export-Date: 2011-04-29 05:11+0000\n"
+"X-Generator: Launchpad (build 12758)\n"

 #. module: account
 #: model:process.transition,name:account.process_transition_supplierreconcilepaid0
--- a/addons/account/i18n/tr.po
+++ b/addons/account/i18n/tr.po
--- a/addons/account/i18n/ug.po
+++ b/addons/account/i18n/ug.po
@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-03-18 04:55+0000\n"
-"X-Generator: Launchpad (build 12559)\n"
+"X-Launchpad-Export-Date: 2011-04-29 05:12+0000\n"
+"X-Generator: Launchpad (build 12758)\n"

 #. module: account
 #: model:process.transition,name:account.process_transition_supplierreconcilepaid0
--- a/addons/account/i18n/uk.po
+++ b/addons/account/i18n/uk.po
@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-03-18 04:55+0000\n"
-"X-Generator: Launchpad (build 12559)\n"
+"X-Launchpad-Export-Date: 2011-04-29 05:12+0000\n"
+"X-Generator: Launchpad (build 12758)\n"

 #. module: account
 #: model:process.transition,name:account.process_transition_supplierreconcilepaid0
--- a/addons/account/i18n/ur.po
+++ b/addons/account/i18n/ur.po
@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-03-18 04:55+0000\n"
-"X-Generator: Launchpad (build 12559)\n"
+"X-Launchpad-Export-Date: 2011-04-29 05:12+0000\n"
+"X-Generator: Launchpad (build 12758)\n"

 #. module: account
 #: model:process.transition,name:account.process_transition_supplierreconcilepaid0
--- a/addons/account/i18n/vi.po
+++ b/addons/account/i18n/vi.po
@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2011-01-11 11:14+0000\n"
-"PO-Revision-Date: 2011-01-19 21:51+0000\n"
+"PO-Revision-Date: 2011-05-04 19:28+0000\n"
 "Last-Translator: Phong Nguyen-Thanh <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: 2011-03-18 04:55+0000\n"
-"X-Generator: Launchpad (build 12559)\n"
+"X-Launchpad-Export-Date: 2011-05-05 04:39+0000\n"
+"X-Generator: Launchpad (build 12959)\n"

 #. module: account
 #: model:process.transition,name:account.process_transition_supplierreconcilepaid0
@ -2923,7 +2923,7 @@ msgstr "View"
 #: code:addons/account/account.py:2951
 #, python-format
 msgid "BNK%s"
-msgstr ""
+msgstr "BNK%s"

 #. module: account
 #: code:addons/account/account.py:2906
@ -3904,7 +3904,7 @@ msgstr "Tháng"
 #. module: account
 #: field:account.invoice.report,uom_name:0
 msgid "Reference UoM"
-msgstr ""
+msgstr "ĐVĐ Tham chiếu"

 #. module: account
 #: field:account.account,note:0
@ -5673,7 +5673,7 @@ msgstr ""
 #: code:addons/account/invoice.py:997
 #, python-format
 msgid "Invoice  '%s' is validated."
-msgstr ""
+msgstr "Hóa đơn  '%s' đã được kiểm tra."

 #. module: account
 #: view:account.chart.template:0
@ -9759,7 +9759,7 @@ msgstr "Các báo cáo thống kê"
 #: field:account.installer.modules,progress:0
 #: field:wizard.multi.charts.accounts,progress:0
 msgid "Configuration Progress"
-msgstr "Configuration Progress"
+msgstr "Tiến trình cấu hình"

 #. module: account
 #: view:account.fiscal.position.template:0
@ -9770,7 +9770,7 @@ msgstr "Accounts Mapping"
 #: code:addons/account/invoice.py:346
 #, python-format
 msgid "Invoice '%s' is waiting for validation."
-msgstr "Invoice '%s' is waiting for validation."
+msgstr "Hóa đơn '%s' đang chờ kiểm tra."

 #. module: account
 #: selection:account.entries.report,month:0
--- a/addons/account/i18n/zh_CN.po
+++ b/addons/account/i18n/zh_CN.po
@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-03-18 04:57+0000\n"
-"X-Generator: Launchpad (build 12559)\n"
+"X-Launchpad-Export-Date: 2011-04-29 05:14+0000\n"
+"X-Generator: Launchpad (build 12758)\n"

 #. module: account
 #: model:process.transition,name:account.process_transition_supplierreconcilepaid0
--- a/addons/account/i18n/zh_HK.po
+++ b/addons/account/i18n/zh_HK.po
@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-03-18 04:56+0000\n"
-"X-Generator: Launchpad (build 12559)\n"
+"X-Launchpad-Export-Date: 2011-04-29 05:12+0000\n"
+"X-Generator: Launchpad (build 12758)\n"

 #. module: account
 #: model:process.transition,name:account.process_transition_supplierreconcilepaid0
--- a/addons/account/i18n/zh_TW.po
+++ b/addons/account/i18n/zh_TW.po
@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-03-18 04:57+0000\n"
-"X-Generator: Launchpad (build 12559)\n"
+"X-Launchpad-Export-Date: 2011-04-29 05:13+0000\n"
+"X-Generator: Launchpad (build 12758)\n"

 #. module: account
 #: model:process.transition,name:account.process_transition_supplierreconcilepaid0
--- a/addons/account/installer.py
+++ b/addons/account/installer.py
@ -90,8 +90,6 @@ class account_installer(osv.osv_memory):

    def fields_view_get(self, cr, uid, view_id=None, view_type='form', context=None, toolbar=False, submenu=False):
        res = super(account_installer, self).fields_view_get(cr, uid, view_id=view_id, view_type=view_type, context=context, toolbar=toolbar,submenu=False)
-        configured_cmp = []
-        unconfigured_cmp = []
        cmp_select = []
        company_ids = self.pool.get('res.company').search(cr, uid, [], context=context)
        #display in the widget selection of companies, only the companies that haven't been configured yet (but don't care about the demo chart of accounts)
@ -99,12 +97,12 @@ class account_installer(osv.osv_memory):
        configured_cmp = [r[0] for r in cr.fetchall()]
        unconfigured_cmp = list(set(company_ids)-set(configured_cmp))
        for field in res['fields']:
-           if field == 'company_id':
-               res['fields'][field]['domain'] = unconfigured_cmp
-               res['fields'][field]['selection'] = [('', '')]
-               if unconfigured_cmp:
-                   cmp_select = [(line.id, line.name) for line in self.pool.get('res.company').browse(cr, uid, unconfigured_cmp)]
-                   res['fields'][field]['selection'] = cmp_select
+            if field == 'company_id':
+                res['fields'][field]['domain'] = unconfigured_cmp
+                res['fields'][field]['selection'] = [('', '')]
+                if unconfigured_cmp:
+                    cmp_select = [(line.id, line.name) for line in self.pool.get('res.company').browse(cr, uid, unconfigured_cmp)]
+                    res['fields'][field]['selection'] = cmp_select
        return res

    def on_change_tax(self, cr, uid, id, tax):
@ -120,17 +118,13 @@ class account_installer(osv.osv_memory):
    def execute(self, cr, uid, ids, context=None):
        if context is None:
            context = {}
-        super(account_installer, self).execute(cr, uid, ids, context=context)
        fy_obj = self.pool.get('account.fiscalyear')
        mod_obj = self.pool.get('ir.model.data')
        obj_acc_temp = self.pool.get('account.account.template')
        obj_tax_code_temp = self.pool.get('account.tax.code.template')
        obj_tax_temp = self.pool.get('account.tax.template')
-        obj_product = self.pool.get('product.product')
-        ir_values = self.pool.get('ir.values')
        obj_acc_chart_temp = self.pool.get('account.chart.template')
        record = self.browse(cr, uid, ids, context=context)[0]
-        company_id = record.company_id
        for res in self.read(cr, uid, ids, context=context):
            if record.charts == 'configurable':
                fp = tools.file_open(opj('account', 'configurable_account_chart.xml'))
@ -231,6 +225,7 @@ class account_installer(osv.osv_memory):
                        fy_obj.create_period(cr, uid, [fiscal_id])
                    elif res['period'] == '3months':
                        fy_obj.create_period3(cr, uid, [fiscal_id])
+        super(account_installer, self).execute(cr, uid, ids, context=context)

    def modules_to_install(self, cr, uid, ids, context=None):
        modules = super(account_installer, self).modules_to_install(
--- a/addons/account/invoice.py
+++ b/addons/account/invoice.py
@ -312,13 +312,20 @@ class account_invoice(osv.osv):
                journal_select = journal_obj._name_search(cr, uid, '', [('type', '=', type)], context=context, limit=None, name_get_uid=1)
                res['fields'][field]['selection'] = journal_select

+        doc = etree.XML(res['arch'])
+        if view_type == 'search':
+            if context.get('type', 'in_invoice') in ('out_invoice', 'out_refund'):
+                for node in doc.xpath("//group[@name='extended filter']"):
+                    doc.remove(node)
+            res['arch'] = etree.tostring(doc)
+
        if view_type == 'tree':
-            doc = etree.XML(res['arch'])
-            nodes = doc.xpath("//field[@name='partner_id']")
            partner_string = _('Customer')
            if context.get('type', 'out_invoice') in ('in_invoice', 'in_refund'):
                partner_string = _('Supplier')
-            for node in nodes:
+                for node in doc.xpath("//field[@name='reference']"):
+                    node.set('invisible', '0')
+            for node in doc.xpath("//field[@name='partner_id']"):
                node.set('string', partner_string)
            res['arch'] = etree.tostring(doc)
        return res
@ -542,7 +549,8 @@ class account_invoice(osv.osv):
            journal_ids = obj_journal.search(cr, uid, [('company_id','=',company_id), ('type', '=', journal_type)])
            if journal_ids:
                val['journal_id'] = journal_ids[0]
-            res_journal_default = self.pool.get('ir.values').get(cr, uid, 'default', 'type=%s' % (type), ['account.invoice'])
+            ir_values_obj = self.pool.get('ir.values')
+            res_journal_default = ir_values_obj.get(cr, uid, 'default', 'type=%s' % (type), ['account.invoice'])
            for r in res_journal_default:
                if r[1] == 'journal_id' and r[2] in journal_ids:
                    val['journal_id'] = r[2]
@ -1258,7 +1266,7 @@ class account_invoice_line(osv.osv):
                    t = t - (p * l[2].get('quantity'))
                    taxes = l[2].get('invoice_line_tax_id')
                    if len(taxes[0]) >= 3 and taxes[0][2]:
-                        taxes = tax_obj.browse(cr, uid, taxes[0][2])
+                        taxes = tax_obj.browse(cr, uid, list(taxes[0][2]))
                        for tax in tax_obj.compute_all(cr, uid, taxes, p,l[2].get('quantity'), context.get('address_invoice_id', False), l[2].get('product_id', False), context.get('partner_id', False))['taxes']:
                            t = t - tax['amount']
            return t
@ -1609,17 +1617,17 @@ class res_partner(osv.osv):
    _columns = {
        'invoice_ids': fields.one2many('account.invoice.line', 'partner_id', 'Invoices', readonly=True),
    }
-    
+
    def copy(self, cr, uid, id, default=None, context=None):
        if default is None:
            default = {}
-            
+
        if context is None:
-            context = {}   
-             
+            context = {}
+
        default.update({'invoice_ids' : []})
        return super(res_partner, self).copy(cr, uid, id, default, context)
-      
+
 res_partner()

 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
--- a/addons/account/project/project_view.xml
+++ b/addons/account/project/project_view.xml
@ -17,6 +17,7 @@
                    <field name="user_id" invisible="1"/>
                    <field name="parent_id" invisible="1"/>
                    <field name="partner_id" invisible="1"/>
+                    <field name="state" invisible="1"/>
                </tree>
            </field>
        </record>
@ -44,6 +45,7 @@
                        <filter string="Associated Partner" icon="terp-partner" domain="[]" context="{'group_by':'partner_id'}"/>
                        <separator orientation="vertical"/>
                        <filter string="Parent" icon="terp-folder-orange" domain="[]" context="{'group_by':'parent_id'}"/>
+                        <filter string="State" icon="terp-folder-green" domain="[]" context="{'group_by':'state'}"/>
                    </group>
                </search>
            </field>
@ -88,11 +90,12 @@
                    </group>
                    <notebook colspan="4">
                        <page string="Account Data">
-                            <field name="partner_id" select="1"/>
-                            <field name="currency_id" select="1"/>
+                            <field name="partner_id"/>
+                            <field name="contact_id"/>
+                            <field name="currency_id"/>
                            <newline/>
                            <field name="date_start"/>
-                            <field name="date" select="2"/>
+                            <field name="date"/>
                            <newline/>
                            <field name="quantity_max"/>
                            <field name="user_id"/>
--- a/addons/account/project/wizard/account_analytic_balance_report.py
+++ b/addons/account/project/wizard/account_analytic_balance_report.py
@ -38,7 +38,6 @@ class account_analytic_balance(osv.osv_memory):
    }

    def check_report(self, cr, uid, ids, context=None):
-        datas = {}
        if context is None:
            context = {}
        data = self.read(cr, uid, ids)[0]
--- a/addons/account/project/wizard/account_analytic_cost_ledger_for_journal_report.py
+++ b/addons/account/project/wizard/account_analytic_cost_ledger_for_journal_report.py
@ -38,7 +38,6 @@ class account_analytic_cost_ledger_journal_report(osv.osv_memory):
    }

    def check_report(self, cr, uid, ids, context=None):
-        datas = {}
        if context is None:
            context = {}
        data = self.read(cr, uid, ids)[0]
--- a/addons/account/project/wizard/account_analytic_cost_ledger_report.py
+++ b/addons/account/project/wizard/account_analytic_cost_ledger_report.py
@ -37,7 +37,6 @@ class account_analytic_cost_ledger(osv.osv_memory):
    }

    def check_report(self, cr, uid, ids, context=None):
-        datas = {}
        if context is None:
            context = {}
        data = self.read(cr, uid, ids)[0]
--- a/addons/account/project/wizard/account_analytic_inverted_balance_report.py
+++ b/addons/account/project/wizard/account_analytic_inverted_balance_report.py
@ -37,7 +37,6 @@ class account_analytic_inverted_balance(osv.osv_memory):
    }

    def check_report(self, cr, uid, ids, context=None):
-        datas = {}
        if context is None:
            context = {}
        data = self.read(cr, uid, ids)[0]
--- a/addons/account/project/wizard/account_analytic_journal_report.py
+++ b/addons/account/project/wizard/account_analytic_journal_report.py
@ -22,8 +22,8 @@ import time

 from osv import osv, fields

-class account_analytic_Journal_report(osv.osv_memory):
-    _name = 'account.analytic.Journal.report'
+class account_analytic_journal_report(osv.osv_memory):
+    _name = 'account.analytic.journal.report'
    _description = 'Account Analytic Journal'

    _columns = {
@ -37,7 +37,6 @@ class account_analytic_Journal_report(osv.osv_memory):
    }

    def check_report(self, cr, uid, ids, context=None):
-        datas = {}
        if context is None:
            context = {}
        data = self.read(cr, uid, ids)[0]
@ -52,5 +51,5 @@ class account_analytic_Journal_report(osv.osv_memory):
            'datas': datas,
            }

-account_analytic_Journal_report()
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+account_analytic_journal_report()
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
--- a/addons/account/project/wizard/account_analytic_journal_report_view.xml
+++ b/addons/account/project/wizard/account_analytic_journal_report_view.xml
@ -4,7 +4,7 @@

 		<record id="account_analytic_journal_view" model="ir.ui.view">
 			<field name="name">Account Analytic Journal</field>
-			<field name="model">account.analytic.Journal.report</field>
+			<field name="model">account.analytic.journal.report</field>
 			<field name="type">form</field>
 			<field name="arch" type="xml">
 				<form string="Select Period">
@ -24,7 +24,7 @@
 		<record id="action_account_analytic_journal" model="ir.actions.act_window">
 			<field name="name">Analytic Journal</field>
 			<field name="type">ir.actions.act_window</field>
-			<field name="res_model">account.analytic.Journal.report</field>
+			<field name="res_model">account.analytic.journal.report</field>
 			<field name="view_type">form</field>
 			<field name="view_mode">form</field>
 			<field name="view_id" ref="account_analytic_journal_view"/>
@ -42,4 +42,4 @@
 		</record>

    </data>
-</openerp>
+</openerp>
--- a/addons/account/project/wizard/project_account_analytic_line.py
+++ b/addons/account/project/wizard/project_account_analytic_line.py
@ -22,36 +22,36 @@ from osv import fields, osv
 from tools.translate import _

 class project_account_analytic_line(osv.osv_memory):
-     _name = "project.account.analytic.line"
-     _description = "Analytic Entries by line"
-     _columns = {
-         'from_date': fields.date('From'),
+    _name = "project.account.analytic.line"
+    _description = "Analytic Entries by line"
+    _columns = {
+        'from_date': fields.date('From'),
         'to_date': fields.date('To'),
-     }
+    }

-     def action_open_window(self, cr, uid, ids, context=None):
-          mod_obj =self.pool.get('ir.model.data')
-          domain = []
-          data = self.read(cr, uid, ids, [])[0]
-          from_date = data['from_date']
-          to_date = data['to_date']
-          if from_date and to_date:
-                domain = [('date','>=',from_date), ('date','<=',to_date)]
-          elif from_date:
-                domain = [('date','>=',from_date)]
-          elif to_date:
-                domain = [('date','<=',to_date)]
-          result = mod_obj.get_object_reference(cr, uid, 'account', 'view_account_analytic_line_filter')
-          id = result and result[1] or False
-          return {
-                'name': _('Analytic Entries by line'),
-                'view_type': 'form',
-                "view_mode": 'tree,form',
-                'res_model': 'account.analytic.line',
-                'type': 'ir.actions.act_window',
-                'domain': domain,
-                'search_view_id': id['res_id'],
-                }
+    def action_open_window(self, cr, uid, ids, context=None):
+        mod_obj =self.pool.get('ir.model.data')
+        domain = []
+        data = self.read(cr, uid, ids, [])[0]
+        from_date = data['from_date']
+        to_date = data['to_date']
+        if from_date and to_date:
+            domain = [('date','>=',from_date), ('date','<=',to_date)]
+        elif from_date:
+            domain = [('date','>=',from_date)]
+        elif to_date:
+            domain = [('date','<=',to_date)]
+        result = mod_obj.get_object_reference(cr, uid, 'account', 'view_account_analytic_line_filter')
+        id = result and result[1] or False
+        return {
+              'name': _('Analytic Entries by line'),
+              'view_type': 'form',
+              "view_mode": 'tree,form',
+              'res_model': 'account.analytic.line',
+              'type': 'ir.actions.act_window',
+              'domain': domain,
+              'search_view_id': id['res_id'],
+              }

 project_account_analytic_line()

--- a/addons/account/report/init.py
+++ b/addons/account/report/init.py
@ -41,6 +41,7 @@ import account_entries_report
 import account_analytic_entries_report
 import account_balance_sheet
 import account_profit_loss
+import account_treasury_report

 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

--- a/addons/account/report/account_balance_landscape.py
+++ b/addons/account/report/account_balance_landscape.py
@ -98,7 +98,6 @@ class account_balance_landscape(report_sxw.rml_parse):
            ref_bal='nothing'


-        total_for_perc=[]
        self.done_total=1
        self.total_for_perc=self.linesForTotal(form, ids={}, doneAccount={}, level=1)
        self.done_total=0
@ -116,9 +115,7 @@ class account_balance_landscape(report_sxw.rml_parse):


    def linesForTotal(self, form, ids={}, doneAccount={}, level=1):
-        if self.done_total==1:
-            self.done_total==1
-        else:
+        if not self.done_total==1:
            return [self.result_total]
        accounts=[]
        if not ids:
@ -127,7 +124,6 @@ class account_balance_landscape(report_sxw.rml_parse):
            return []

        ctx = self.context.copy()
-        result_total_parent=[]

        for id in form['fiscalyear']:
            tmp=[]
@ -142,7 +138,7 @@ class account_balance_landscape(report_sxw.rml_parse):
                accounts.append(tmp)

        merged_accounts=zip(*accounts)
-         # used to check for the frst record so all sum_credit and sum_debit r set to 0.00
+        # used to check for the frst record so all sum_credit and sum_debit r set to 0.00
        if level==1:
            doneAccount={}
        for entry in merged_accounts:
@ -345,7 +341,6 @@ class account_balance_landscape(report_sxw.rml_parse):

    def get_lines(self, year_dict, form):
        final_result = []
-        line_l =[]
        res = {}
        line_l = self.lines(form)
        self.cal_total(year_dict)
@ -357,21 +352,21 @@ class account_balance_landscape(report_sxw.rml_parse):
                res['level'] = l['level']
                for k,v in l.items():
                    if k.startswith('debit'+str(year_dict['last_str'])):
-                     res['debit'] = v
+                        res['debit'] = v
                    if k.startswith('credit'+str(year_dict['last_str'])):
-                     res['credit'] = v
+                        res['credit'] = v
                    if k.startswith('balance'+str(year_dict['last_str'])) and not k.startswith('balance_perc'+str(year_dict['last_str'])):
-                     res['balance'] =v
+                        res['balance'] =v
                    if k.startswith('balance_perc'+str(year_dict['last_str'])) and not k.startswith('balance'+str(year_dict['last_str'])):
-                     res['balance_perc'] = v
+                        res['balance_perc'] = v
                    if form['compare_pattern'] == 'bal_perc':
                        if k.startswith('bal_perc'+str(year_dict['last_str'])):
-                         res['pattern'] = v
+                            res['pattern'] = v
                    elif form['compare_pattern'] == 'bal_cash':
                        if k.startswith('bal_cash'+str(year_dict['last_str'])):
-                         res['pattern'] = v
+                            res['pattern'] = v
                    else:
-                         res['pattern'] = ''
+                        res['pattern'] = ''
                final_result.append(res)
        return final_result

--- a/addons/account/report/account_balance_sheet.py
+++ b/addons/account/report/account_balance_sheet.py
@ -214,4 +214,4 @@ report_sxw.report_sxw('report.account.balancesheet', 'account.account',
    'addons/account/report/account_balance_sheet.rml',parser=report_balancesheet_horizontal,
    header='internal')

-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
--- a/addons/account/report/account_balance_sheet.rml
+++ b/addons/account/report/account_balance_sheet.rml
@ -214,7 +214,7 @@
          <para style="terp_default_9"><font color="white">[[  '. '*(a['level']-1) ]]</font><font>[[ a['level']&lt;4 and ( setTag('para','para',{'style':'terp_default_Bold_9'})) or removeParentNode('font')  ]][[ a['name'] ]]</font></para>
        </td>
        <td>
-          <para style="terp_default_Right_9"><font>[[ a['level']&lt;4 and ( setTag('para','para',{'style':'terp_default_Right_9_Bold'})) or removeParentNode('font')  ]]</font><font>[[ formatLang(abs(a['balance'])) ]] [[ company.currency_id.symbol ]]</font></para>
+          <para style="terp_default_Right_9"><font>[[ a['level']&lt;4 and ( setTag('para','para',{'style':'terp_default_Right_9_Bold'})) or removeParentNode('font')  ]]</font><font>[[ formatLang(a['balance']) ]] [[ company.currency_id.symbol ]]</font></para>
        </td>
      </tr>
    </blockTable>
@ -224,7 +224,7 @@
          <para style="terp_default_Bold_9">Balance:</para>
        </td>
        <td>
-          <para style="terp_default_Right_9_Bold"><u>[[ formatLang(abs(sum_cr())) ]] [[ company.currency_id.symbol ]]</u></para>
+          <para style="terp_default_Right_9_Bold"><u>[[ formatLang(sum_cr()) ]] [[ company.currency_id.symbol ]]</u></para>
        </td>
      </tr>
    </blockTable>
@ -259,7 +259,7 @@
          <para style="terp_default_9"><font color="white">[[  '. '*(a['level']-1) ]]</font><font>[[ a['level']&lt;4 and ( setTag('para','para',{'style':'terp_default_Bold_9'})) or removeParentNode('font')  ]][[ a['name'] ]]</font><font>[[ a['name']=='Net Profit' and setTag('para','para',{'style':'terp_default_Bold_9'}) or removeParentNode('font') ]]</font></para>
        </td>
        <td>
-          <para style="terp_default_Right_9"><font>[[ a['level']&lt;4 and ( setTag('para','para',{'style':'terp_default_Right_9_Bold'})) or removeParentNode('font')  ]]</font><font>[[ formatLang(abs(a['balance'])) ]] [[ company.currency_id.symbol ]]</font><font>[[ a['name']=='Net Profit' and setTag('para','para',{'style':'terp_default_Right_9_Bold'}) or removeParentNode('font') ]]</font></para>
+          <para style="terp_default_Right_9"><font>[[ a['level']&lt;4 and ( setTag('para','para',{'style':'terp_default_Right_9_Bold'})) or removeParentNode('font')  ]]</font><font>[[ formatLang(a['balance']) ]] [[ company.currency_id.symbol ]]</font><font>[[ a['name']=='Net Profit' and setTag('para','para',{'style':'terp_default_Right_9_Bold'}) or removeParentNode('font') ]]</font></para>
        </td>
      </tr>
    </blockTable>
@ -269,7 +269,7 @@
          <para style="terp_default_Bold_9">Balance:</para>
        </td>
        <td>
-          <para style="terp_default_Right_9_Bold"><u>[[ formatLang(abs(sum_dr())) ]] [[ company.currency_id.symbol ]]</u></para>
+          <para style="terp_default_Right_9_Bold"><u>[[ formatLang(sum_dr()) ]] [[ company.currency_id.symbol ]]</u></para>
        </td>
      </tr>
    </blockTable>
--- a/addons/account/report/account_balance_sheet_horizontal.rml
+++ b/addons/account/report/account_balance_sheet_horizontal.rml
@ -202,7 +202,7 @@
          <para style="terp_default_9"><font color="white">[[  '. '*(a['level1']-1) ]]</font><font>[[ a['level1']&lt;4 and ( setTag('para','para',{'style':'terp_default_Bold_9'})) or removeParentNode('font')  ]][[ a['name1'] ]]</font></para>
        </td>
        <td>
-          <para style="terp_default_Right_9"><font>[[ a['level1']&lt;4 and ( setTag('para','para',{'style':'terp_default_Right_9_Bold'})) or removeParentNode('font')  ]]</font><font>[[ formatLang(abs(a['balance1'])) ]] [[ company.currency_id.symbol ]]</font></para>
+          <para style="terp_default_Right_9"><font>[[ a['level1']&lt;4 and ( setTag('para','para',{'style':'terp_default_Right_9_Bold'})) or removeParentNode('font')  ]]</font><font>[[ formatLang(a['balance1']) ]] [[ company.currency_id.symbol ]]</font></para>
        </td>
        <td>
          <para style="terp_default_9"><font face="Times-Roman">[[ repeatIn(get_lines(), 'a') ]]</font> <font>[[ a['level']&lt;4 and ( setTag('para','para',{'style':'terp_default_Bold_9'})) or removeParentNode('font')  ]]</font><font>[[ a['code'] ]]</font><font>[[ a['name']=='Net Profit' and setTag('para','para',{'style':'terp_default_Bold_9'}) or removeParentNode('font') ]]</font></para>
@ -213,7 +213,7 @@
        <td>
          <para style="terp_default_Right_9"><font>[[ a['level1']&lt;4 and ( setTag('para','para',{'style':'terp_default_Right_9_Bold'})) or removeParentNode('font')  ]]</font>
 <font>[[ a['name']=='Net Profit' and setTag('para','para',{'style':'terp_default_Right_9_Bold'}) or removeParentNode('font') ]]</font>
-<font> [[(a['code'] and a['name']) and formatLang(abs(a['balance'])) or removeParentNode('font')]] [[ company.currency_id.symbol ]]</font></para>
+<font> [[(a['code'] and a['name']) and formatLang(a['balance']) or removeParentNode('font')]] [[ company.currency_id.symbol ]]</font></para>
        </td>
     </tr>
     </blockTable>
@ -223,13 +223,13 @@
          <para style="terp_default_Bold_9">Balance:</para>
        </td>
        <td>
-          <para style="terp_default_Right_9_Bold"><u>[[ formatLang(abs(sum_cr())) ]] [[ company.currency_id.symbol ]]</u></para>
+          <para style="terp_default_Right_9_Bold"><u>[[ formatLang(sum_cr()) ]] [[ company.currency_id.symbol ]]</u></para>
        </td>
        <td>
          <para style="terp_default_Bold_9">Balance:</para>
        </td>
        <td>
-          <para style="terp_default_Right_9_Bold"><u>[[ formatLang(abs(sum_dr())) ]] [[ company.currency_id.symbol ]]</u></para>
+          <para style="terp_default_Right_9_Bold"><u>[[ formatLang(sum_dr()) ]] [[ company.currency_id.symbol ]]</u></para>
        </td>
      </tr>
    </blockTable>
--- a/addons/account/report/account_general_ledger.py
+++ b/addons/account/report/account_general_ledger.py
@ -40,9 +40,10 @@ class general_ledger(report_sxw.rml_parse, common_report_header):
        self.sortby = data['form'].get('sortby', 'sort_date')
        self.query = obj_move._query_get(self.cr, self.uid, obj='l', context=data['form'].get('used_context',{}))
        ctx2 = data['form'].get('used_context',{}).copy()
-        ctx2.update({'initial_bal': True})
+        self.init_balance = data['form'].get('initial_balance', True)
+        if self.init_balance:
+            ctx2.update({'initial_bal': True})
        self.init_query = obj_move._query_get(self.cr, self.uid, obj='l', context=ctx2)
-        self.init_balance = data['form']['initial_balance']
        self.display_account = data['form']['display_account']
        self.target_move = data['form'].get('target_move', 'all')
        ctx = self.context.copy()
--- a/addons/account/report/account_invoice_report.py
+++ b/addons/account/report/account_invoice_report.py
@ -47,7 +47,6 @@ class account_invoice_report(osv.osv):
        'company_id': fields.many2one('res.company', 'Company', readonly=True),
        'user_id': fields.many2one('res.users', 'Salesman', readonly=True),
        'price_total': fields.float('Total Without Tax', readonly=True),
-        'price_total_tax': fields.float('Total With Tax', readonly=True),
        'price_average': fields.float('Average Price', readonly=True, group_operator="avg"),
        'currency_rate': fields.float('Currency Rate', readonly=True),
        'nbr':fields.integer('# of Lines', readonly=True),
@ -69,6 +68,7 @@ class account_invoice_report(osv.osv):
        'address_contact_id': fields.many2one('res.partner.address', 'Contact Address Name', readonly=True),
        'address_invoice_id': fields.many2one('res.partner.address', 'Invoice Address Name', readonly=True),
        'account_id': fields.many2one('account.account', 'Account',readonly=True),
+        'account_line_id': fields.many2one('account.account', 'Account Line',readonly=True),
        'partner_bank_id': fields.many2one('res.partner.bank', 'Bank Account',readonly=True),
        'residual': fields.float('Total Residual', readonly=True),
        'delay_to_pay': fields.float('Avg. Delay To Pay', readonly=True, group_operator="avg"),
@ -89,7 +89,7 @@ class account_invoice_report(osv.osv):
                    ai.payment_term as payment_term,
                    ai.period_id as period_id,
                    (case when u.uom_type not in ('reference') then
-                        (select name from product_uom where uom_type='reference' and category_id=u.category_id)
+                        (select name from product_uom where uom_type='reference' and active and category_id=u.category_id LIMIT 1)
                    else
                        u.name
                    end) as uom_name,
@ -106,44 +106,30 @@ class account_invoice_report(osv.osv):
                    ai.address_contact_id as address_contact_id,
                    ai.address_invoice_id as address_invoice_id,
                    ai.account_id as account_id,
+                    ail.account_id as account_line_id,
                    ai.partner_bank_id as partner_bank_id,
                    sum(case when ai.type in ('out_refund','in_invoice') then
-                         ail.quantity / u.factor * -1
+                         -ail.quantity / u.factor
                        else
                         ail.quantity / u.factor
                        end) as product_qty,
+
                    sum(case when ai.type in ('out_refund','in_invoice') then
-                         ail.quantity*ail.price_unit * -1
+                         -ail.price_subtotal
                        else
-                         ail.quantity*ail.price_unit
+                          ail.price_subtotal
                        end) / cr.rate as price_total,
-                    sum(case when ai.type in ('out_refund','in_invoice') then
-                         ai.amount_total * -1
-                        else
-                         ai.amount_total
-                         end) / (CASE WHEN 
-                              (select count(l.id) from account_invoice_line as l
-                               left join account_invoice as a ON (a.id=l.invoice_id)
-                               where a.id=ai.id) <> 0 
-                            THEN 
-                              (select count(l.id) from account_invoice_line as l
-                               left join account_invoice as a ON (a.id=l.invoice_id)
-                               where a.id=ai.id) 
-                            ELSE 1 
-                            END) / cr.rate as price_total_tax,
+
                    (case when ai.type in ('out_refund','in_invoice') then
-                      sum(ail.quantity*ail.price_unit*-1)
+                      sum(-ail.price_subtotal)
                    else
-                      sum(ail.quantity*ail.price_unit)
-                    end) / (CASE WHEN
-                         (case when ai.type in ('out_refund','in_invoice') 
-                          then sum(ail.quantity/u.factor*-1)
-                          else sum(ail.quantity/u.factor) end) <> 0 
-                       THEN 
-                         (case when ai.type in ('out_refund','in_invoice') 
-                          then sum(ail.quantity/u.factor*-1)
-                          else sum(ail.quantity/u.factor) end) 
-                       ELSE 1 
+                      sum(ail.price_subtotal)
+                    end) / (CASE WHEN sum(ail.quantity/u.factor) <> 0
+                       THEN
+                         (case when ai.type in ('out_refund','in_invoice')
+                          then sum(-ail.quantity/u.factor)
+                          else sum(ail.quantity/u.factor) end)
+                       ELSE 1
                       END)
                     / cr.rate as price_average,

@ -159,22 +145,23 @@ class account_invoice_report(osv.osv):
                        left join account_invoice_line as l ON (a.id=l.invoice_id)
                        where a.id=ai.id)) as due_delay,
                    (case when ai.type in ('out_refund','in_invoice') then
-                      ai.residual * -1
+                      -ai.residual
                    else
                      ai.residual
-                    end)/ (CASE WHEN 
+                    end)/ (CASE WHEN
                        (select count(l.id) from account_invoice_line as l
                         left join account_invoice as a ON (a.id=l.invoice_id)
-                         where a.id=ai.id) <> 0 
+                         where a.id=ai.id) <> 0
                       THEN
                        (select count(l.id) from account_invoice_line as l
                         left join account_invoice as a ON (a.id=l.invoice_id)
-                         where a.id=ai.id) 
-                       ELSE 1 
+                         where a.id=ai.id)
+                       ELSE 1
                       END) / cr.rate as residual
                from account_invoice_line as ail
                left join account_invoice as ai ON (ai.id=ail.invoice_id)
-                left join product_template pt on (pt.id=ail.product_id)
+                left join product_product pr on (pr.id=ail.product_id)
+                left join product_template pt on (pt.id=pr.product_tmpl_id)
                left join product_uom u on (u.id=ail.uos_id),
                res_currency_rate cr
                where cr.id in (select id from res_currency_rate cr2  where (cr2.currency_id = ai.currency_id)
@ -202,6 +189,7 @@ class account_invoice_report(osv.osv):
                    ai.address_contact_id,
                    ai.address_invoice_id,
                    ai.account_id,
+                    ail.account_id,
                    ai.partner_bank_id,
                    ai.residual,
                    ai.amount_total,
--- a/addons/account/report/account_invoice_report_view.xml
+++ b/addons/account/report/account_invoice_report_view.xml
@ -27,12 +27,11 @@
                <field name="partner_bank_id" invisible="1"/>
                <field name="date_due" invisible="1"/>
                <field name="account_id" invisible="1"/>
+                <field name="account_line_id" invisible="1"/>
                <field name="nbr" sum="# of Lines"/>
                <field name="product_qty" sum="Qty"/>
                <!-- <field name="reconciled"  sum="# Reconciled"/> -->
-                <field name="price_average" sum="Average Price"/>
                <field name="price_total" sum="Total Without Tax"/>
-                <field name="price_total_tax" sum="Total With Tax"/>
                <field name="residual"  sum="Total Residual" invisible="context.get('residual_invisible',False)"/>
                <field name="due_delay"  sum="Avg. Due Delay" invisible="context.get('residual_invisible',False)"/>
                <field name="delay_to_pay"  sum="Avg. Delay To Pay" invisible="context.get('residual_invisible',False)"/>
@ -103,6 +102,7 @@
                    <separator orientation="vertical"/>
                    <field name="journal_id" widget="selection"/>
                    <field name="account_id"/>
+                    <field name="account_line_id"/>
                    <separator orientation="vertical"/>
                    <field name="date_due"/>
                    <separator orientation="vertical" groups="base.group_multi_company"/>
@ -120,6 +120,7 @@
                    <filter string="Type" icon="terp-stock_symbol-selection" context="{'group_by':'type'}"/>
                    <separator orientation="vertical"/>
                    <filter string="Journal" icon="terp-folder-orange" context="{'group_by':'journal_id'}"/>
+                    <filter string="Account" icon="terp-folder-orange" context="{'group_by':'account_line_id'}"/>
                    <separator orientation="vertical"/>
                    <filter string="Due Date" icon="terp-go-today" context="{'group_by':'date_due'}"/>
                    <filter string="Period" icon="terp-go-month" context="{'group_by':'period_id'}"/>
--- a/addons/account/report/account_partner_balance.py
+++ b/addons/account/report/account_partner_balance.py
@ -242,7 +242,6 @@ class partner_balance(report_sxw.rml_parse, common_report_header):

        if not self.ids:
            return 0.0
-        temp_res = 0.0
        self.cr.execute(
                "SELECT sum(debit) " \
                "FROM account_move_line AS l " \
@ -261,7 +260,6 @@ class partner_balance(report_sxw.rml_parse, common_report_header):

        if not self.ids:
            return 0.0
-        temp_res = 0.0
        self.cr.execute(
                "SELECT sum(credit) " \
                "FROM account_move_line AS l " \
@ -281,7 +279,6 @@ class partner_balance(report_sxw.rml_parse, common_report_header):

        if not self.ids:
            return 0.0
-        temp_res = 0.0
        self.cr.execute(
                "SELECT sum(debit-credit) " \
                "FROM account_move_line AS l " \
@ -295,7 +292,6 @@ class partner_balance(report_sxw.rml_parse, common_report_header):
        return temp_res

    def _get_partners(self):
-        cr, uid = self.cr, self.uid

        if self.result_selection == 'customer':
            return _('Receivable Accounts')
--- a/addons/account/report/account_partner_ledger.py
+++ b/addons/account/report/account_partner_ledger.py
@ -23,6 +23,7 @@ import time
 import re
 from report import report_sxw
 from common_report_header import common_report_header
+from tools.translate import _

 class third_party_ledger(report_sxw.rml_parse, common_report_header):

@ -53,15 +54,23 @@ class third_party_ledger(report_sxw.rml_parse, common_report_header):
            'get_target_move': self._get_target_move,
        })

+    def _get_filter(self, data):
+        if data['form']['filter'] == 'unreconciled':
+            return _('Unreconciled Entries')
+        return super(third_party_ledger, self)._get_filter(data)
+
    def set_context(self, objects, data, ids, report_type=None):
        obj_move = self.pool.get('account.move.line')
        obj_partner = self.pool.get('res.partner')
        self.query = obj_move._query_get(self.cr, self.uid, obj='l', context=data['form'].get('used_context', {}))
        ctx2 = data['form'].get('used_context',{}).copy()
-        ctx2.update({'initial_bal': True})
-        self.init_query = obj_move._query_get(self.cr, self.uid, obj='l', context=ctx2)
-        self.reconcil = data['form'].get('reconcil', True)
        self.initial_balance = data['form'].get('initial_balance', True)
+        if self.initial_balance:
+            ctx2.update({'initial_bal': True})
+        self.init_query = obj_move._query_get(self.cr, self.uid, obj='l', context=ctx2)
+        self.reconcil = True
+        if data['form']['filter'] == 'unreconciled':
+            self.reconcil = False
        self.result_selection = data['form'].get('result_selection', 'customer')
        self.amount_currency = data['form'].get('amount_currency', False)
        self.target_move = data['form'].get('target_move', 'all')
@ -118,7 +127,7 @@ class third_party_ledger(report_sxw.rml_parse, common_report_header):
        else:
            amount = str(amount)
        if (amount == '0'):
-             return ' '
+            return ' '
        orig = amount
        new = re.sub("^(-?\d+)(\d{3})", "\g<1>'\g<2>", amount)
        if orig == new:
@ -169,7 +178,6 @@ class third_party_ledger(report_sxw.rml_parse, common_report_header):
            RECONCILE_TAG = " "
        else:
            RECONCILE_TAG = "AND l.reconcile_id IS NULL"
-
        self.cr.execute(
            "SELECT COALESCE(SUM(l.debit),0.0), COALESCE(SUM(l.credit),0.0), COALESCE(sum(debit-credit), 0.0) " \
            "FROM account_move_line AS l,  " \
@ -402,14 +410,14 @@ class third_party_ledger(report_sxw.rml_parse, common_report_header):
            return currency_total

    def _display_initial_balance(self, data):
-         if self.initial_balance:
-             return True
-         return False
+        if self.initial_balance:
+            return True
+        return False

    def _display_currency(self, data):
-         if self.amount_currency:
-             return True
-         return False
+        if self.amount_currency:
+            return True
+        return False

 report_sxw.report_sxw('report.account.third_party_ledger', 'res.partner',
        'addons/account/report/account_partner_ledger.rml',parser=third_party_ledger,
--- a/addons/account/report/account_partner_ledger.rml
+++ b/addons/account/report/account_partner_ledger.rml
@ -355,7 +355,7 @@
          <para style="terp_tblheader_General_Centre">Journal</para>
        </td>
        <td>
-          <para style="terp_tblheader_General_Centre">Filters By [[ get_filter(data)!='No Filter' and get_filter(data) ]]</para>
+          <para style="terp_tblheader_General_Centre">Filters By [[ data['form']['filter'] not in ('filter_no','unreconciled') and get_filter(data) ]]</para>
        </td>
        <td>
          <para style="terp_tblheader_General_Centre">Partner's</para>
@ -377,7 +377,7 @@
          <para style="terp_default_Centre_8">[[', '.join([ lt or '' for lt in get_journal(data) ]) ]]</para>
        </td>
        <td>
-          <para style="terp_default_Centre_8">[[ get_filter(data)=='No Filter' and get_filter(data) or removeParentNode('para') ]]</para>
+          <para style="terp_default_Centre_8">[[ data['form']['filter'] in ('filter_no','unreconciled') and get_filter(data) or removeParentNode('para') ]]</para>
          <blockTable colWidths="58.0,58.0" style="Table7">[[ get_filter(data)=='Date' or removeParentNode('blockTable') ]]
            <tr>
              <td>
--- a/addons/account/report/account_partner_ledger_other.rml
+++ b/addons/account/report/account_partner_ledger_other.rml
@ -356,7 +356,7 @@
          <para style="terp_tblheader_General_Centre">Journal</para>
        </td>
        <td>
-          <para style="terp_tblheader_General_Centre">Filters By [[ get_filter(data)!='No Filter' and get_filter(data) ]]</para>
+          <para style="terp_tblheader_General_Centre">Filters By [[ data['form']['filter'] not in ('filter_no','unreconciled') and get_filter(data) ]]</para>
        </td>
        <td>
          <para style="terp_tblheader_General_Centre">Partner's</para>
@ -378,7 +378,7 @@
          <para style="terp_default_Centre_8">[[', '.join([ lt or '' for lt in get_journal(data) ]) ]]</para>
        </td>
        <td>
-          <para style="terp_default_Centre_8">[[ get_filter(data)=='No Filter' and get_filter(data) or removeParentNode('para') ]]</para>
+          <para style="terp_default_Centre_8">[[ data['form']['filter'] in ('filter_no','unreconciled') and get_filter(data) or removeParentNode('para') ]]</para>
          <blockTable colWidths="58.0,58.0" style="Table7">[[ get_filter(data)=='Date' or removeParentNode('blockTable') ]]
            <tr>
              <td>
--- a/addons/account/report/account_profit_loss.py
+++ b/addons/account/report/account_profit_loss.py
@ -110,9 +110,9 @@ class report_pl_account_horizontal(report_sxw.rml_parse, common_report_header):
                if (account.user_type.report_type) and (account.user_type.report_type == typ):
                    currency = account.currency_id and account.currency_id or account.company_id.currency_id
                    if typ == 'expense' and account.type <> 'view' and (account.debit <> account.credit):
-                        self.result_sum_dr += abs(account.debit - account.credit)
+                        self.result_sum_dr += account.debit - account.credit
                    if typ == 'income' and account.type <> 'view' and (account.debit <> account.credit):
-                        self.result_sum_cr += abs(account.debit - account.credit)
+                        self.result_sum_cr += account.credit - account.debit
                    if data['form']['display_account'] == 'bal_movement':
                        if not currency_pool.is_zero(self.cr, self.uid, currency, account.credit) or not currency_pool.is_zero(self.cr, self.uid, currency, account.debit) or not currency_pool.is_zero(self.cr, self.uid, currency, account.balance):
                            accounts_temp.append(account)
--- a/addons/account/report/account_profit_loss.rml
+++ b/addons/account/report/account_profit_loss.rml
@ -218,7 +218,7 @@
          </para>
        </td>
         <td>
-          <para style="terp_default_Right_9"><font>[[ a.level&lt;4 and ( setTag('para','para',{'style':'terp_default_Right_9_Bold'}))  or removeParentNode('font') ]]</font><font>[[ formatLang(abs(a.balance)) ]] [[ company.currency_id.symbol ]]</font></para>
+          <para style="terp_default_Right_9"><font>[[ a.level&lt;4 and ( setTag('para','para',{'style':'terp_default_Right_9_Bold'}))  or removeParentNode('font') ]]</font><font>[[ formatLang(a.balance) ]] [[ company.currency_id.symbol ]]</font></para>
        </td>
      </tr>
    </blockTable>
@ -231,7 +231,7 @@
          <para style="terp_default_Bold_9">[[ final_result()['type'] == 'Net Profit' and final_result()['type'] or removeParentNode('blockTable') ]]</para>
        </td>
        <td>
-          <para style="terp_default_Right_9_Bold">[[ final_result()['balance'] and final_result()['type'] == 'Net Profit' and  formatLang(abs(final_result()['balance'])) ]] [[ final_result()['balance'] and final_result()['type'] == 'Net Profit' and company.currency_id.symbol ]]</para>
+          <para style="terp_default_Right_9_Bold">[[ final_result()['balance'] and final_result()['type'] == 'Net Profit' and  formatLang(final_result()['balance']) ]] [[ final_result()['balance'] and final_result()['type'] == 'Net Profit' and company.currency_id.symbol ]]</para>
        </td>
      </tr>
    </blockTable>
@ -241,7 +241,7 @@
          <para style="terp_default_Bold_9">Total:</para>
        </td>
        <td>
-          <para style="terp_default_Right_9_Bold"><u>[[ formatLang(abs(sum_dr())) ]] [[ company.currency_id.symbol ]]</u></para>
+          <para style="terp_default_Right_9_Bold"><u>[[ formatLang(sum_dr()) ]] [[ company.currency_id.symbol ]]</u></para>
        </td>
      </tr>
    </blockTable>
@ -273,7 +273,7 @@
          </para>
        </td>
        <td>
-          <para style="terp_default_Right_9"><font>[[ a.level&lt;4 and ( setTag('para','para',{'style':'terp_default_Right_9_Bold'}))  or removeParentNode('font') ]]</font><font>[[ formatLang(abs(a.balance)) ]] [[ company.currency_id.symbol ]]</font></para>
+          <para style="terp_default_Right_9"><font>[[ a.level&lt;4 and ( setTag('para','para',{'style':'terp_default_Right_9_Bold'}))  or removeParentNode('font') ]]</font><font>[[ formatLang(a.balance) ]] [[ company.currency_id.symbol ]]</font></para>
        </td>
      </tr>
    </blockTable>
@ -286,7 +286,7 @@
          <para style="terp_default_Bold_9">[[ final_result()['type'] == 'Net Loss' and final_result()['type'] or removeParentNode('blockTable') ]]</para>
        </td>
        <td>
-          <para style="terp_default_Right_9_Bold">[[ final_result()['balance'] and final_result()['type'] == 'Net Loss' and  formatLang(abs(final_result()['balance'])) ]] [[ final_result()['balance'] and final_result()['type'] == 'Net Loss' and company.currency_id.symbol ]]</para>
+          <para style="terp_default_Right_9_Bold">[[ final_result()['balance'] and final_result()['type'] == 'Net Loss' and  formatLang(final_result()['balance']) ]] [[ final_result()['balance'] and final_result()['type'] == 'Net Loss' and company.currency_id.symbol ]]</para>
        </td>
      </tr>
    </blockTable>
@ -296,7 +296,7 @@
          <para style="terp_default_Bold_9">Total:</para>
        </td>
        <td>
-          <para style="terp_default_Right_9_Bold"><u>[[ formatLang(abs(sum_cr())) ]] [[ company.currency_id.symbol ]]</u></para>
+          <para style="terp_default_Right_9_Bold"><u>[[ formatLang(sum_cr()) ]] [[ company.currency_id.symbol ]]</u></para>
        </td>
      </tr>
    </blockTable>
--- a/addons/account/report/account_report.py
+++ b/addons/account/report/account_report.py
@ -101,14 +101,14 @@ class report_aged_receivable(osv.osv):
    def _calc_bal(self, cr, uid, ids, name, args, context=None):
        res = {}
        for period in self.read(cr, uid, ids, ['name'], context=context):
-           date1,date2 = period['name'].split(' to ')
-           cr.execute("SELECT SUM(credit-debit) FROM account_move_line AS line, account_account as ac  \
+            date1,date2 = period['name'].split(' to ')
+            cr.execute("SELECT SUM(credit-debit) FROM account_move_line AS line, account_account as ac  \
                        WHERE (line.account_id=ac.id) AND ac.type='receivable' \
                            AND (COALESCE(line.date,date) BETWEEN %s AND  %s) \
                            AND (reconcile_id IS NULL) AND ac.active",(str(date2),str(date1),))
-           amount = cr.fetchone()
-           amount = amount[0] or 0.00
-           res[period['id']] = amount
+            amount = cr.fetchone()
+            amount = amount[0] or 0.00
+            res[period['id']] = amount

        return res

--- a/addons/account/report/account_tax_code.py
+++ b/addons/account/report/account_tax_code.py
@ -1,4 +1,3 @@
-#!/usr/bin/env python
 # -*- coding: utf-8 -*-
 ##############################################################################
 #
--- a/Show More
+++ b/Show More