[MERGE] merged with trunk development branch

bzr revid: hmo@tinyerp.com-20111020094534-cs0c5jst6s692gej
2011-10-20 15:15:34 +05:30 · 2011-10-20 15:15:34 +05:30 · 8d83ae361b
parent 7225115a0f 2a30d5e185
commit 8d83ae361b
5273 changed files with 67025 additions and 20626 deletions
--- a/addons/account/account.py
+++ b/addons/account/account.py
@ -966,10 +966,17 @@ class account_period(osv.osv):
        return False

    def find(self, cr, uid, dt=None, context=None):
+        if context is None: context = {}
        if not dt:
            dt = time.strftime('%Y-%m-%d')
 #CHECKME: shouldn't we check the state of the period?
-        ids = self.search(cr, uid, [('date_start','<=',dt),('date_stop','>=',dt)])
+        args = [('date_start', '<=' ,dt), ('date_stop', '>=', dt)]
+        if context.get('company_id', False):
+            args.append(('company_id', '=', context['company_id']))
+        else:
+            company_id = self.pool.get('res.users').browse(cr, uid, uid, context=context).company_id.id
+            args.append(('company_id', '=', company_id))
+        ids = self.search(cr, uid, args, context=context)
        if not ids:
            raise osv.except_osv(_('Error !'), _('No period defined for this date: %s !\nPlease create one.')%dt)
        return ids
@ -1213,22 +1220,10 @@ class account_move(osv.osv):
                    return False
        return True

-    def _check_period_journal(self, cursor, user, ids, context=None):
-        for move in self.browse(cursor, user, ids, context=context):
-            for line in move.line_id:
-                if line.period_id.id != move.period_id.id:
-                    return False
-                if line.journal_id.id != move.journal_id.id:
-                    return False
-        return True
-
    _constraints = [
        (_check_centralisation,
            'You can not create more than one move per period on centralized journal',
            ['journal_id']),
-        (_check_period_journal,
-            'You can not create journal items on different periods/journals in the same journal entry',
-            ['line_id']),
    ]

    def post(self, cr, uid, ids, context=None):
@ -1511,8 +1506,6 @@ class account_move(osv.osv):
                # Update the move lines (set them as valid)

                obj_move_line.write(cr, uid, line_draft_ids, {
-                    'journal_id': move.journal_id.id,
-                    'period_id': move.period_id.id,
                    'state': 'valid'
                }, context, check=False)

@ -1553,8 +1546,6 @@ class account_move(osv.osv):
                # We can't validate it (it's unbalanced)
                # Setting the lines as draft
                obj_move_line.write(cr, uid, line_ids, {
-                    'journal_id': move.journal_id.id,
-                    'period_id': move.period_id.id,
                    'state': 'draft'
                }, context, check=False)
        # Create analytic lines for the valid moves
@ -1579,11 +1570,15 @@ class account_move_reconcile(osv.osv):
    _defaults = {
        'name': lambda self,cr,uid,ctx={}: self.pool.get('ir.sequence').get(cr, uid, 'account.reconcile') or '/',
    }
+
    def reconcile_partial_check(self, cr, uid, ids, type='auto', context=None):
        total = 0.0
        for rec in self.browse(cr, uid, ids, context=context):
            for line in rec.line_partial_ids:
-                total += (line.debit or 0.0) - (line.credit or 0.0)
+                if line.account_id.currency_id:
+                    total += line.amount_currency
+                else:
+                    total += (line.debit or 0.0) - (line.credit or 0.0)
        if not total:
            self.pool.get('account.move.line').write(cr, uid,
                map(lambda x: x.id, rec.line_partial_ids),
@ -2172,12 +2167,13 @@ class account_model(osv.osv):
            raise osv.except_osv(_('No period found !'), _('Unable to find a valid period !'))
        period_id = period_id[0]

+        move_date = context.get('date', time.strftime('%Y-%m-%d'))
+        move_date = datetime.strptime(move_date,"%Y-%m-%d")
        for model in self.browse(cr, uid, ids, context=context):
            try:
-                entry['name'] = model.name%{'year':time.strftime('%Y'), 'month':time.strftime('%m'), 'date':time.strftime('%Y-%m')}
+                entry['name'] = model.name%{'year': move_date.strftime('%Y'), 'month': move_date.strftime('%m'), 'date': move_date.strftime('%Y-%m')}
            except:
                raise osv.except_osv(_('Wrong model !'), _('You have a wrong expression "%(...)s" in your model !'))
-                
            move_id = account_move_obj.create(cr, uid, {
                'ref': entry['name'],
                'period_id': period_id,
@ -2198,7 +2194,7 @@ class account_model(osv.osv):
                    'analytic_account_id': analytic_account_id
                }

-                date_maturity = time.strftime('%Y-%m-%d')
+                date_maturity = context.get('date',time.strftime('%Y-%m-%d'))
                if line.date_maturity == 'partner':
                    if not line.partner_id:
                        raise osv.except_osv(_('Error !'), _("Maturity date of entry line generated by model line '%s' of model '%s' is based on partner payment term!" \
@ -2634,7 +2630,8 @@ class account_fiscal_position_template(osv.osv):
        'name': fields.char('Fiscal Position Template', size=64, required=True),
        'chart_template_id': fields.many2one('account.chart.template', 'Chart Template', required=True),
        'account_ids': fields.one2many('account.fiscal.position.account.template', 'position_id', 'Account Mapping'),
-        'tax_ids': fields.one2many('account.fiscal.position.tax.template', 'position_id', 'Tax Mapping')
+        'tax_ids': fields.one2many('account.fiscal.position.tax.template', 'position_id', 'Tax Mapping'),
+        'note': fields.text('Notes', translate=True),
    }

 account_fiscal_position_template()
@ -2718,7 +2715,7 @@ class account_financial_report(osv.osv):
        return res

    _columns = {
-        'name': fields.char('Report Name', size=128, required=True),
+        'name': fields.char('Report Name', size=128, required=True, translate=True),
        'parent_id': fields.many2one('account.financial.report', 'Parent'),
        'children_ids':  fields.one2many('account.financial.report', 'parent_id', 'Account Report'),
        'sequence': fields.integer('Sequence'),
--- a/addons/account/account_bank_statement.py
+++ b/addons/account/account_bank_statement.py
@ -137,7 +137,7 @@ class account_bank_statement(osv.osv):
            states={'confirm':[('readonly',True)]}),
        'balance_end_real': fields.float('Ending Balance', digits_compute=dp.get_precision('Account'),
            states={'confirm': [('readonly', True)]}),
-        'balance_end': fields.function(_end_balance, 
+        'balance_end': fields.function(_end_balance,
            store = {
                'account.bank.statement': (lambda self, cr, uid, ids, c={}: ids, ['line_ids','move_line_ids'], 10),
                'account.bank.statement.line': (_get_statement, ['amount'], 10),
@ -219,6 +219,7 @@ class account_bank_statement(osv.osv):
            'period_id': st.period_id.id,
            'date': st_line.date,
            'name': st_line_number,
+            'ref': st_line.ref,
        }, context=context)
        account_bank_statement_line_obj.write(cr, uid, [st_line.id], {
            'move_ids': [(4, move_id, False)]
--- a/addons/account/account_invoice.py
+++ b/addons/account/account_invoice.py
@ -209,7 +209,7 @@ class account_invoice(osv.osv):
            \n* The \'Open\' state is used when user create invoice,a invoice number is generated.Its in open state till user does not pay invoice. \
            \n* The \'Paid\' state is set automatically when invoice is paid.\
            \n* The \'Cancelled\' state is used when user cancel invoice.'),
-        'date_invoice': fields.date('Invoice Date', states={'paid':[('readonly',True)], 'open':[('readonly',True)], 'close':[('readonly',True)]}, select=True, help="Keep empty to use the current date"),
+        'date_invoice': fields.date('Invoice Date', readonly=True, states={'draft':[('readonly',False)]}, select=True, help="Keep empty to use the current date"),
        'date_due': fields.date('Due Date', states={'paid':[('readonly',True)], 'open':[('readonly',True)], 'close':[('readonly',True)]}, select=True,
            help="If you use payment terms, the due date will be computed automatically at the generation "\
                "of accounting entries. If you keep the payment term and the due date empty, it means direct payment. The payment term may compute several due dates, for example 50% now, 50% in one month."),
@ -880,7 +880,7 @@ class account_invoice(osv.osv):
                        'account_id': acc_id,
                        'date_maturity': t[0],
                        'amount_currency': diff_currency_p \
-                                and  amount_currency or False,
+                                and amount_currency or False,
                        'currency_id': diff_currency_p \
                                and inv.currency_id.id or False,
                        'ref': ref,
--- a/addons/account/account_invoice_view.xml
+++ b/addons/account/account_invoice_view.xml
@ -208,10 +208,10 @@
                                <field name="state" widget="statusbar" statusbar_visible="draft,open,paid" statusbar_colors='{"proforma":"blue","proforma2":"blue"}'/>
                                <field name="residual"/>
                                <group col="6" colspan="4">
-                                    <button name="invoice_cancel" states="draft,proforma2,sale,open" string="Cancel" icon="gtk-cancel"/>
+                                    <button name="invoice_cancel" states="draft,proforma2,sale,open" string="Cancel" icon="gtk-cancel" groups="base.group_no_one"/>
                                    <button name="action_cancel_draft" states="cancel" string="Set to Draft" type="object" icon="terp-stock_effects-object-colorize"/>
                                    <button name="%(action_account_invoice_refund)d" type='action' string='Refund' states='open,paid' icon="gtk-execute"/>
-                                    <button name="%(action_account_state_open)d" type='action' string='Re-Open' states='paid' icon="gtk-convert" groups="base.group_no_one"/>
+                                    <button name='%(action_account_state_open)d' type='action' string='Re-Open' groups="account.group_account_invoice" attrs="{'invisible':['|', ('state','&lt;&gt;','paid'), ('reconciled', '=', True)]}" icon="gtk-convert" help="This button only appears when the state of the invoice is 'paid' (showing that it has been fully reconciled) and auto-computed boolean 'reconciled' is False (depicting that it's not the case anymore). In other words, the invoice has been dereconciled and it does not fit anymore the 'paid' state. You should press this button to re-open it and let it continue its normal process after having resolved the eventual exceptions it may have created."/>
                                    <button name="invoice_open" states="draft,proforma2" string="Approve" icon="terp-camera_test"/>
                                </group>
                            </group>
@ -234,6 +234,7 @@
                            <field name="payment_ids" colspan="4" nolabel="1" >
                                <tree string="Payments">
                                    <field name="date" string="Payment Date"/>
+                                    <field name="move_id"/>
                                    <field name="ref"/>
                                    <field name="name" groups="base.group_extended"/>
                                    <field name="journal_id"/>
@ -302,11 +303,11 @@
                                <field name="state" widget="statusbar" statusbar_visible="draft,open,paid" statusbar_colors='{"proforma":"blue","proforma2":"blue"}'/>
                                <field name="residual"/>
                                <group col="8" colspan="4" groups="base.group_user">
-                                    <button name="invoice_cancel" states="draft,proforma2,sale,open" string="Cancel" icon="gtk-cancel"/>
+                                    <button name="invoice_cancel" states="draft,proforma2,sale,open" string="Cancel" icon="gtk-cancel" groups="base.group_no_one"/>
                                    <button name="action_cancel_draft" states="cancel" string="Reset to Draft" type="object" icon="terp-stock_effects-object-colorize"/>

+                                    <button name='%(action_account_state_open)d' type='action' string='Re-Open' groups="account.group_account_invoice" attrs="{'invisible':['|', ('state','&lt;&gt;','paid'), ('reconciled', '=', True)]}" icon="gtk-convert" help="This button only appears when the state of the invoice is 'paid' (showing that it has been fully reconciled) and auto-computed boolean 'reconciled' is False (depicting that it's not the case anymore). In other words, the invoice has been dereconciled and it does not fit anymore the 'paid' state. You should press this button to re-open it and let it continue its normal process after having resolved the eventual exceptions it may have created."/>
                                    <button name="%(action_account_invoice_refund)d" type='action' string='Refund' states='open,paid' icon="gtk-execute"/>
-                                    <button name='%(action_account_state_open)d' type='action' string='Re-Open' states='paid' icon="gtk-convert" groups="base.group_no_one"/>
                                    <button name="invoice_proforma2" states="draft" string="PRO-FORMA" icon="terp-gtk-media-pause" groups="account.group_account_user"/>
                                    <button name="invoice_open" states="draft,proforma2" string="Validate" icon="gtk-go-forward"/>
                                    <button name="%(account_invoices)d" string="Print Invoice" type="action" icon="gtk-print" states="open,paid,proforma,sale,proforma2"/>
@ -332,6 +333,7 @@
                            <field name="payment_ids" colspan="4" nolabel="1">
                                <tree string="Payments">
                                    <field name="date"/>
+                                    <field name="move_id"/>
                                    <field name="ref"/>
                                    <field name="name"/>
                                    <field name="journal_id" groups="base.group_user"/>
--- a/addons/account/account_move_line.py
+++ b/addons/account/account_move_line.py
@ -494,8 +494,14 @@ class account_move_line(osv.osv):
        'amount_residual_currency': fields.function(_amount_residual, string='Residual Amount', multi="residual", help="The residual amount on a receivable or payable of a journal entry expressed in its currency (maybe different of the company currency)."),
        'amount_residual': fields.function(_amount_residual, string='Residual Amount', multi="residual", help="The residual amount on a receivable or payable of a journal entry expressed in the company currency."),
        'currency_id': fields.many2one('res.currency', 'Currency', help="The optional other currency if it is a multi-currency entry."),
-        'period_id': fields.many2one('account.period', 'Period', required=True, select=2),
-        'journal_id': fields.many2one('account.journal', 'Journal', required=True, select=1),
+        'journal_id': fields.related('move_id', 'journal_id', string='Journal', type='many2one', relation='account.journal', required=True, select=True, readonly=True,
+                                store = {
+                                    'account.move': (_get_move_lines, ['journal_id'], 20)
+                                }),
+        'period_id': fields.related('move_id', 'period_id', string='Period', type='many2one', relation='account.period', required=True, select=True, readonly=True,
+                                store = {
+                                    'account.move': (_get_move_lines, ['period_id'], 20)
+                                }),
        'blocked': fields.boolean('Litigation', help="You can check this box to mark this journal item as a litigation with the associated partner"),
        'partner_id': fields.many2one('res.partner', 'Partner', select=1, ondelete='restrict'),
        'date_maturity': fields.date('Due date', select=True ,help="This field is used for payable and receivable journal entries. You can put the limit date for the payment of this line."),
@ -597,11 +603,19 @@ class account_move_line(osv.osv):
                    return False
        return True

+    def _check_currency(self, cr, uid, ids, context=None):
+        for l in self.browse(cr, uid, ids, context=context):
+            if l.account_id.currency_id:
+                if not l.currency_id or not l.currency_id.id == l.account_id.currency_id.id:
+                    return False
+        return True
+
    _constraints = [
        (_check_no_view, 'You can not create move line on view account.', ['account_id']),
        (_check_no_closed, 'You can not create move line on closed account.', ['account_id']),
-        (_check_company_id, 'Company must be same for its related account and period.',['company_id'] ),
-        (_check_date, 'The date of your Journal Entry is not in the defined period!',['date'] ),
+        (_check_company_id, 'Company must be same for its related account and period.', ['company_id']),
+        (_check_date, 'The date of your Journal Entry is not in the defined period!', ['date']),
+        (_check_currency, 'The selected account of your Journal Entry must receive a value in its secondary currency', ['currency_id']),
    ]

    #TODO: ONCHANGE_ACCOUNT_ID: set account_tax_id
@ -735,7 +749,10 @@ class account_move_line(osv.osv):
            company_list.append(line.company_id.id)

        for line in self.browse(cr, uid, ids, context=context):
-            company_currency_id = line.company_id.currency_id
+            if line.account_id.currency_id:
+                currency_id = line.account_id.currency_id
+            else:
+                currency_id = line.company_id.currency_id
            if line.reconcile_id:
                raise osv.except_osv(_('Warning'), _('Already Reconciled!'))
            if line.reconcile_partial_id:
@ -743,12 +760,18 @@ class account_move_line(osv.osv):
                    if not line2.reconcile_id:
                        if line2.id not in merges:
                            merges.append(line2.id)
-                        total += (line2.debit or 0.0) - (line2.credit or 0.0)
+                        if line2.account_id.currency_id:
+                            total += line2.amount_currency
+                        else:
+                            total += (line2.debit or 0.0) - (line2.credit or 0.0)
                merges_rec.append(line.reconcile_partial_id.id)
            else:
                unmerge.append(line.id)
-                total += (line.debit or 0.0) - (line.credit or 0.0)
-        if self.pool.get('res.currency').is_zero(cr, uid, company_currency_id, total):
+                if line.account_id.currency_id:
+                    total += line.amount_currency
+                else:
+                    total += (line.debit or 0.0) - (line.credit or 0.0)
+        if self.pool.get('res.currency').is_zero(cr, uid, currency_id, total):
            res = self.reconcile(cr, uid, merges+unmerge, context=context, writeoff_acc_id=writeoff_acc_id, writeoff_period_id=writeoff_period_id, writeoff_journal_id=writeoff_journal_id)
            return res
        r_id = move_rec_obj.create(cr, uid, {
@ -1259,7 +1282,7 @@ class account_move_line(osv.osv):
                        break
            # Automatically convert in the account's secondary currency if there is one and
            # the provided values were not already multi-currency
-            if account.currency_id and not vals.get('ammount_currency') and account.currency_id.id != account.company_id.currency_id.id:
+            if account.currency_id and (vals.get('amount_currency', False) is False) and account.currency_id.id != account.company_id.currency_id.id:
                vals['currency_id'] = account.currency_id.id
                ctx = {}
                if 'date' in vals:
--- a/addons/account/account_report.xml
+++ b/addons/account/account_report.xml
@ -23,8 +23,6 @@
        <report id="account_transfers" model="account.transfer" name="account.transfer" string="Transfers" xml="account/report/transfer.xml" xsl="account/report/transfer.xsl"/>
        <report auto="False" id="account_intracom" menu="False" model="account.move.line" name="account.intracom" string="IntraCom"/>

-        <report id="account_move_line_list" model="account.tax.code" name="account.tax.code.entries" rml="account/report/account_tax_code.rml" string="All Entries"/>
-
        <report
            auto="False"
            id="account_vat_declaration"
--- a/addons/account/account_view.xml
+++ b/addons/account/account_view.xml
@ -455,9 +455,9 @@
 <!--                                <field name="invoice_sequence_id"/>-->
                                <field name="group_invoice_lines"/>
                            </group>
-                            <group colspan="2" col="2" groups="base.group_extended">
+                            <group colspan="2" col="2"> <!-- can't set the field as hidden for certain groups as it's required in the object and not in the view, and GTK doesn't handle that correctly -->
                                <separator string="Sequence" colspan="4"/>
-                                <field name="sequence_id"/>
+                                <field name="sequence_id" required="0"/>
                            </group>
                        </page>
                        <page string="Entry Controls" groups="base.group_extended">
--- 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-10-02 04:51+0000\n"
-"X-Generator: Launchpad (build 14071)\n"
+"X-Launchpad-Export-Date: 2011-10-19 05:04+0000\n"
+"X-Generator: Launchpad (build 14157)\n"

 #. module: account
 #: model:process.transition,name:account.process_transition_supplierreconcilepaid0
@ -9828,3 +9828,9 @@ msgstr ""

 #~ msgid "Subscription Periods"
 #~ msgstr "فترات الاشتراك"
+
+#~ msgid "Charts of Account"
+#~ msgstr "شجرة الحسابات"
+
+#~ msgid "Move line select"
+#~ msgstr "تحريك السطر المختار"
--- 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-09-17 04:55+0000\n"
-"X-Generator: Launchpad (build 13955)\n"
+"X-Launchpad-Export-Date: 2011-10-19 05:05+0000\n"
+"X-Generator: Launchpad (build 14157)\n"

 #. module: account
 #: model:process.transition,name:account.process_transition_supplierreconcilepaid0
--- 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-09-17 04:55+0000\n"
-"X-Generator: Launchpad (build 13955)\n"
+"X-Launchpad-Export-Date: 2011-10-19 05:05+0000\n"
+"X-Generator: Launchpad (build 14157)\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-09-17 04:55+0000\n"
-"X-Generator: Launchpad (build 13955)\n"
+"X-Launchpad-Export-Date: 2011-10-19 05:05+0000\n"
+"X-Generator: Launchpad (build 14157)\n"

 #. module: account
 #: model:process.transition,name:account.process_transition_supplierreconcilepaid0
--- a/addons/account/i18n/ca.po
+++ b/addons/account/i18n/ca.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-09-17 04:55+0000\n"
-"X-Generator: Launchpad (build 13955)\n"
+"X-Launchpad-Export-Date: 2011-10-19 05:05+0000\n"
+"X-Generator: Launchpad (build 14157)\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-09-17 04:55+0000\n"
-"X-Generator: Launchpad (build 13955)\n"
+"X-Launchpad-Export-Date: 2011-10-19 05:05+0000\n"
+"X-Generator: Launchpad (build 14157)\n"
 "X-Poedit-Language: Czech\n"

 #. module: account
--- a/addons/account/i18n/da.po
+++ b/addons/account/i18n/da.po
@ -14,13 +14,13 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-09-17 04:55+0000\n"
-"X-Generator: Launchpad (build 13955)\n"
+"X-Launchpad-Export-Date: 2011-10-19 05:05+0000\n"
+"X-Generator: Launchpad (build 14157)\n"

 #. module: account
 #: model:process.transition,name:account.process_transition_supplierreconcilepaid0
 msgid "System payment"
-msgstr ""
+msgstr "Systembetaling"

 #. module: account
 #: view:account.journal:0
@ -40,16 +40,17 @@ msgid ""
 "You cannot remove/deactivate an account which is set as a property to any "
 "Partner."
 msgstr ""
+"Du kan ikke fjerne/deaktivere en konto som er sat til ejerskab af en Partner."

 #. module: account
 #: view:account.move.reconcile:0
 msgid "Journal Entry Reconcile"
-msgstr ""
+msgstr "Afstem kasseklade"

 #. module: account
 #: field:account.installer.modules,account_voucher:0
 msgid "Voucher Management"
-msgstr ""
+msgstr "Bilagshåndtering"

 #. module: account
 #: view:account.account:0
@ -69,7 +70,7 @@ msgstr "Resterende"
 #: code:addons/account/invoice.py:785
 #, python-format
 msgid "Please define sequence on invoice journal"
-msgstr ""
+msgstr "Definer venligst sekvensen på faktura journalen"

 #. module: account
 #: constraint:account.period:0
@ -102,6 +103,8 @@ msgid ""
 "The Profit and Loss report gives you an overview of your company profit and "
 "loss in a single document"
 msgstr ""
+"Profit og Tab rapporten giver dig et overblik af din virksomheds profit og "
+"tab i et enkelt dokument."

 #. module: account
 #: model:process.transition,name:account.process_transition_invoiceimport0
@ -178,7 +181,7 @@ msgstr ""
 #: code:addons/account/invoice.py:1421
 #, python-format
 msgid "Warning!"
-msgstr ""
+msgstr "Advarsel!"

 #. module: account
 #: field:account.fiscal.position.account,account_src_id:0
@ -360,7 +363,7 @@ msgstr ""
 #: selection:report.account.sales,month:0
 #: selection:report.account_type.sales,month:0
 msgid "June"
-msgstr ""
+msgstr "Juni"

 #. module: account
 #: model:ir.actions.act_window,help:account.action_account_moves_bank
--- a/addons/account/i18n/de.po
+++ b/addons/account/i18n/de.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-09-17 04:56+0000\n"
-"X-Generator: Launchpad (build 13955)\n"
+"X-Launchpad-Export-Date: 2011-10-19 05:06+0000\n"
+"X-Generator: Launchpad (build 14157)\n"

 #. module: account
 #: model:process.transition,name:account.process_transition_supplierreconcilepaid0
@ -10447,13 +10447,13 @@ msgstr ""
 #: report:account.balancesheet:0
 #: report:account.balancesheet.horizontal:0
 msgid "Assets"
-msgstr ""
+msgstr "Anlagen"

 #. module: account
 #: report:account.balancesheet:0
 #: report:account.balancesheet.horizontal:0
 msgid "Liabilities"
-msgstr ""
+msgstr "Verbindlichkeiten"

 #~ msgid "Unpaid Supplier Invoices"
 #~ msgstr "Offene Eingangsrechnungen"
@ -11770,3 +11770,6 @@ msgstr ""
 #~ msgstr ""
 #~ "Kein Zeitraum für dieses Datum definiert!\n"
 #~ "Bitte erzeugen Sie ein neues Geschäftsjahr."
+
+#~ msgid "Balance:"
+#~ msgstr "Saldo:"
--- 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-09-17 04:56+0000\n"
-"X-Generator: Launchpad (build 13955)\n"
+"X-Launchpad-Export-Date: 2011-10-19 05:06+0000\n"
+"X-Generator: Launchpad (build 14157)\n"

 #. module: account
 #: model:process.transition,name:account.process_transition_supplierreconcilepaid0
--- a/addons/account/i18n/en_GB.po
+++ b/addons/account/i18n/en_GB.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-09-17 05:02+0000\n"
-"X-Generator: Launchpad (build 13955)\n"
+"X-Launchpad-Export-Date: 2011-10-19 05:11+0000\n"
+"X-Generator: Launchpad (build 14157)\n"

 #. module: account
 #: model:process.transition,name:account.process_transition_supplierreconcilepaid0
--- 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-09-17 05:02+0000\n"
-"X-Generator: Launchpad (build 13955)\n"
+"X-Launchpad-Export-Date: 2011-10-19 05:11+0000\n"
+"X-Generator: Launchpad (build 14157)\n"

 #. module: account
 #: model:process.transition,name:account.process_transition_supplierreconcilepaid0
--- a/addons/account/i18n/es.po
+++ b/addons/account/i18n/es.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-09-17 05:00+0000\n"
-"X-Generator: Launchpad (build 13955)\n"
+"X-Launchpad-Export-Date: 2011-10-19 05:09+0000\n"
+"X-Generator: Launchpad (build 14157)\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-09-17 05:02+0000\n"
-"X-Generator: Launchpad (build 13955)\n"
+"X-Launchpad-Export-Date: 2011-10-19 05:11+0000\n"
+"X-Generator: Launchpad (build 14157)\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
@ -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-09-17 05:02+0000\n"
-"X-Generator: Launchpad (build 13955)\n"
+"X-Launchpad-Export-Date: 2011-10-19 05:11+0000\n"
+"X-Generator: Launchpad (build 14157)\n"

 #. module: account
 #: model:process.transition,name:account.process_transition_supplierreconcilepaid0
--- 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-09-17 05:03+0000\n"
-"X-Generator: Launchpad (build 13955)\n"
+"X-Launchpad-Export-Date: 2011-10-19 05:12+0000\n"
+"X-Generator: Launchpad (build 14157)\n"

 #. module: account
 #: model:process.transition,name:account.process_transition_supplierreconcilepaid0
--- a/addons/account/i18n/es_MX.po
+++ b/addons/account/i18n/es_MX.po
--- 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-09-17 05:03+0000\n"
-"X-Generator: Launchpad (build 13955)\n"
+"X-Launchpad-Export-Date: 2011-10-19 05:12+0000\n"
+"X-Generator: Launchpad (build 14157)\n"

 #. module: account
 #: model:process.transition,name:account.process_transition_supplierreconcilepaid0
--- a/addons/account/i18n/et.po
+++ b/addons/account/i18n/et.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-09-30 07:02+0000\n"
+"PO-Revision-Date: 2011-10-10 19:34+0000\n"
 "Last-Translator: Raiko Pajur <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-10-01 05:08+0000\n"
-"X-Generator: Launchpad (build 14071)\n"
+"X-Launchpad-Export-Date: 2011-10-19 05:06+0000\n"
+"X-Generator: Launchpad (build 14157)\n"

 #. module: account
 #: model:process.transition,name:account.process_transition_supplierreconcilepaid0
@ -80,7 +80,7 @@ msgstr "Viga! Perioodi(de) kestvus(ed) on vale(d). "
 #. module: account
 #: field:account.analytic.line,currency_id:0
 msgid "Account currency"
-msgstr ""
+msgstr "Konto valuuta"

 #. module: account
 #: view:account.tax:0
--- 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-09-17 04:55+0000\n"
-"X-Generator: Launchpad (build 13955)\n"
+"X-Launchpad-Export-Date: 2011-10-19 05:05+0000\n"
+"X-Generator: Launchpad (build 14157)\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-09-17 04:58+0000\n"
-"X-Generator: Launchpad (build 13955)\n"
+"X-Launchpad-Export-Date: 2011-10-19 05:08+0000\n"
+"X-Generator: Launchpad (build 14157)\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-09-17 05:03+0000\n"
-"X-Generator: Launchpad (build 13955)\n"
+"X-Launchpad-Export-Date: 2011-10-19 05:12+0000\n"
+"X-Generator: Launchpad (build 14157)\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-09-17 04:56+0000\n"
-"X-Generator: Launchpad (build 13955)\n"
+"X-Launchpad-Export-Date: 2011-10-19 05:06+0000\n"
+"X-Generator: Launchpad (build 14157)\n"

 #. module: account
 #: model:process.transition,name:account.process_transition_supplierreconcilepaid0
--- a/addons/account/i18n/fr.po
+++ b/addons/account/i18n/fr.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-09-17 04:56+0000\n"
-"X-Generator: Launchpad (build 13955)\n"
+"X-Launchpad-Export-Date: 2011-10-19 05:06+0000\n"
+"X-Generator: Launchpad (build 14157)\n"

 #. module: account
 #: code:addons/account/account.py:1291
@ -2199,7 +2199,7 @@ msgid ""
 "can be installed and will be selected by default."
 msgstr ""
 "Le plan de comptes par défaut correspond au pays sélectionné. Si aucun plan "
-"de comptes certifiés n'existe pour le pays spécifié, un plan de compte "
+"de comptes certifié n'existe pour le pays spécifié, un plan de compte "
 "générique pourra être installé et sera sélectionné par défaut."

 #. module: account
@ -6062,7 +6062,7 @@ msgstr "Créditeurs"
 #. module: account
 #: view:account.invoice:0
 msgid "Other Info"
-msgstr "Autre information"
+msgstr "Autres informations"

 #. module: account
 #: field:account.journal,default_credit_account_id:0
--- 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-09-17 05:02+0000\n"
-"X-Generator: Launchpad (build 13955)\n"
+"X-Launchpad-Export-Date: 2011-10-19 05:11+0000\n"
+"X-Generator: Launchpad (build 14157)\n"

 #. module: account
 #: model:process.transition,name:account.process_transition_supplierreconcilepaid0
--- a/addons/account/i18n/gl.po
+++ b/addons/account/i18n/gl.po
--- 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-09-17 04:57+0000\n"
-"X-Generator: Launchpad (build 13955)\n"
+"X-Launchpad-Export-Date: 2011-10-19 05:06+0000\n"
+"X-Generator: Launchpad (build 14157)\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-09-17 04:57+0000\n"
-"X-Generator: Launchpad (build 13955)\n"
+"X-Launchpad-Export-Date: 2011-10-19 05:06+0000\n"
+"X-Generator: Launchpad (build 14157)\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-09-17 04:57+0000\n"
-"X-Generator: Launchpad (build 13955)\n"
+"X-Launchpad-Export-Date: 2011-10-19 05:07+0000\n"
+"X-Generator: Launchpad (build 14157)\n"

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

 #. module: account
 #: model:process.transition,name:account.process_transition_supplierreconcilepaid0
 msgid "System payment"
-msgstr ""
+msgstr "Poredak plaćanja"

 #. module: account
 #: view:account.journal:0
@ -38,7 +38,8 @@ msgstr "Nije definiran dnevnik završetka ove fiskalne godine"
 msgid ""
 "You cannot remove/deactivate an account which is set as a property to any "
 "Partner."
-msgstr "Konto se koristi kao obilježje partnera."
+msgstr ""
+"Ne možete obrisati/deaktivirati konto koji se koristi kao obilježje partnera."

 #. module: account
 #: view:account.move.reconcile:0
@ -1836,7 +1837,7 @@ msgstr "Ispis dnevnika"
 #. module: account
 #: model:ir.model,name:account.model_product_category
 msgid "Product Category"
-msgstr "Kategorija proizvoda"
+msgstr "Grupa proizvoda"

 #. module: account
 #: selection:account.account.type,report_type:0
--- a/addons/account/i18n/hu.po
+++ b/addons/account/i18n/hu.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-09-17 04:57+0000\n"
-"X-Generator: Launchpad (build 13955)\n"
+"X-Launchpad-Export-Date: 2011-10-19 05:07+0000\n"
+"X-Generator: Launchpad (build 14157)\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-09-17 04:57+0000\n"
-"X-Generator: Launchpad (build 13955)\n"
+"X-Launchpad-Export-Date: 2011-10-19 05:07+0000\n"
+"X-Generator: Launchpad (build 14157)\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-09-17 04:57+0000\n"
-"X-Generator: Launchpad (build 13955)\n"
+"X-Launchpad-Export-Date: 2011-10-19 05:07+0000\n"
+"X-Generator: Launchpad (build 14157)\n"

 #. module: account
 #: model:process.transition,name:account.process_transition_supplierreconcilepaid0
@ -293,7 +293,7 @@ msgstr "Reports belgi"
 #, python-format
 msgid "You can not add/modify entries in a closed journal."
 msgstr ""
-"Non si può aggiungere/modificare registrazioni in un sezionale chiuso"
+"Non si possono aggiungere/modificare registrazioni in un sezionale chiuso"

 #. module: account
 #: view:account.bank.statement:0
@ -396,9 +396,9 @@ msgid ""
 "OpenERP. Journal items are created by OpenERP if you use Bank Statements, "
 "Cash Registers, or Customer/Supplier payments."
 msgstr ""
-"Questa vista viene usata dai contabili per inserire massivamente "
-"registrazioni in OpenERP. Le registrazioni sui sezionali vengono create da "
-"OpenERP se si usano movimenti bancari, registratori di cassa o pagamenti "
+"Questa vista viene usata dai contabili per l'inserimento massivo di "
+"registrazioni in OpenERP. I movimenti contabili vengono creati da OpenERP se "
+"si usano estratti conto bancari, registratori di cassa o pagamenti "
 "clienti/fornitori."

 #. module: account
@ -443,8 +443,8 @@ msgid ""
 "This field contains the informatin related to the numbering of the journal "
 "entries of this journal."
 msgstr ""
-"Questo campo contiene informazioni relative alla numerazione delle scritture "
-"in questo sezionale."
+"Questo campo contiene informazioni relative alla numerazione delle "
+"registrazioni in questo sezionale."

 #. module: account
 #: field:account.journal,default_debit_account_id:0
@ -485,9 +485,9 @@ msgid ""
 "it comes to 'Printed' state. When all transactions are done, it comes in "
 "'Done' state."
 msgstr ""
-"Quando viene creato un periodo sezionale il suo stato è 'Bozza', se stampato "
-"il suo stato  è: 'Stampato'. Quando sono registrate tutte le transazioni il "
-"suo stato è: 'Completato'"
+"Quando viene creato un periodo contabile il suo stato è 'Bozza', se viene "
+"stampato il suo stato  è: 'Stampato'. Quando tutte le transazioni sono "
+"registrate il suo stato è: 'Completato'."

 #. module: account
 #: model:ir.actions.act_window,help:account.action_account_tax_chart
@ -1323,7 +1323,7 @@ msgstr "Opzioni Report"
 #. module: account
 #: model:ir.model,name:account.model_account_entries_report
 msgid "Journal Items Analysis"
-msgstr "Analisi Voci Sezionale"
+msgstr "Analisi Movimenti Contabili"

 #. module: account
 #: model:ir.actions.act_window,name:account.action_partner_all
@ -1436,10 +1436,10 @@ msgid ""
 "entry per accounting document: invoice, refund, supplier payment, bank "
 "statements, etc."
 msgstr ""
-"Un Movimento Sezionale consiste in diversi componenti, ognuno di essi è una "
-"transazione a credito o a debito. OpenERP crea automaticate un movimento per "
-"ciascun documento contabile: fatture, note di credito, pagamento fornitori, "
-"estratti conto, ecc."
+"Una registrazione contabile è costituita da diversi movimenti contabili, "
+"ognuno dei quali è in dare o in avere. OpenERP crea automaticamente una "
+"registrazione contabile per ciascun documento contabile: fatture, note di "
+"credito, pagamento fornitori, estratti conto, ecc."

 #. module: account
 #: view:account.entries.report:0
@ -1547,7 +1547,7 @@ msgstr "Vai al partner successivo"
 #. module: account
 #: view:account.bank.statement:0
 msgid "Search Bank Statements"
-msgstr "Ricerca Movimenti Bancari"
+msgstr "Ricerca Estratti Conto Bancari"

 #. module: account
 #: sql_constraint:account.model.line:0
@ -1698,9 +1698,9 @@ msgid ""
 "Have a complete tree view of all journal items per account code by clicking "
 "on an account."
 msgstr ""
-"Mostra il piano dei conti della azienda per anno fiscale, scegliendo il "
-"periodo. Cliccare su un conto per avere una vista ad albero di tutte le voci "
-"Sezionale organizzate per codice di conto."
+"Mostra il piano dei conti della tua azienda per anno fiscale, scegliendo il "
+"periodo. Cliccare su un conto per avere una vista ad albero di tutti i "
+"movimenti contabili organizzati per codice di conto."

 #. module: account
 #: constraint:account.fiscalyear:0
@ -1724,8 +1724,8 @@ msgid ""
 "If the active field is set to False, it will allow you to hide the journal "
 "period without removing it."
 msgstr ""
-"Il campo, impostato come \"falso\", permette di nascondere il periodo "
-"fiscale del Sezionale senza eliminarlo."
+"Se impostato come \"falso\", permette di nascondere il periodo fiscale del "
+"Sezionale senza eliminarlo."

 #. module: account
 #: view:res.partner:0
@ -2106,7 +2106,7 @@ msgstr " Sezionale"
 msgid ""
 "There is no default default debit account defined \n"
 "on journal \"%s\""
-msgstr "Il Sezionale \"%s\" non ha un conto di debito di default predefinito"
+msgstr "Il Sezionale \"%s\" non ha un conto di debito predefinito"

 #. module: account
 #: help:account.account,type:0
@ -2598,7 +2598,7 @@ msgstr "Conto imponibile note di credito"
 #: model:ir.actions.act_window,name:account.action_bank_statement_tree
 #: model:ir.ui.menu,name:account.menu_bank_statement_tree
 msgid "Bank Statements"
-msgstr "Movimenti Bancari"
+msgstr "Estratti Conto Bancari"

 #. module: account
 #: selection:account.tax.template,applicable_type:0
@ -4049,8 +4049,8 @@ msgstr ""
 "Pubblicate', ma è possibile impostare l'opzione per saltare lo stato sul "
 "relativo sezionale. In tal caso, esse si comporteranno come normali "
 "registrazioni contabili create automaticamente dal sistema nella conferma "
-"documenti (fatture, estratti conto...) e saranno create con lo stato di "
-"'Pubblicate'."
+"documenti (fatture, estratti conto bancari...) e saranno create con lo stato "
+"di 'Pubblicate'."

 #. module: account
 #: code:addons/account/account_analytic_line.py:91
@ -8549,7 +8549,7 @@ msgstr ""
 #: field:account.period,date_stop:0
 #: model:ir.ui.menu,name:account.menu_account_end_year_treatments
 msgid "End of Period"
-msgstr "Concludi il periodo"
+msgstr "Fine del periodo"

 #. module: account
 #: field:account.installer.modules,account_followup:0
@ -8872,7 +8872,7 @@ msgstr ""
 #. module: account
 #: model:ir.actions.act_window,name:account.act_account_journal_2_account_bank_statement
 msgid "Bank statements"
-msgstr "Movimenti bancari"
+msgstr "Estratti Conto Bancari"

 #. module: account
 #: help:account.addtmpl.wizard,cparent_id:0
@ -9142,7 +9142,7 @@ msgstr ""
 #. module: account
 #: field:account.period,special:0
 msgid "Opening/Closing Period"
-msgstr "Aprire/chiudere un periodo"
+msgstr "Periodo di apertura/chiusura"

 #. module: account
 #: field:account.account,currency_id:0
--- 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-09-17 04:57+0000\n"
-"X-Generator: Launchpad (build 13955)\n"
+"X-Launchpad-Export-Date: 2011-10-19 05:07+0000\n"
+"X-Generator: Launchpad (build 14157)\n"

 #. module: account
 #: model:process.transition,name:account.process_transition_supplierreconcilepaid0
--- a/addons/account/i18n/kk.po
+++ b/addons/account/i18n/kk.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-09-17 04:57+0000\n"
-"X-Generator: Launchpad (build 13955)\n"
+"X-Launchpad-Export-Date: 2011-10-19 05:07+0000\n"
+"X-Generator: Launchpad (build 14157)\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-09-17 04:57+0000\n"
-"X-Generator: Launchpad (build 13955)\n"
+"X-Launchpad-Export-Date: 2011-10-19 05:07+0000\n"
+"X-Generator: Launchpad (build 14157)\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-09-17 04:58+0000\n"
-"X-Generator: Launchpad (build 13955)\n"
+"X-Launchpad-Export-Date: 2011-10-19 05:07+0000\n"
+"X-Generator: Launchpad (build 14157)\n"

 #. module: account
 #: model:process.transition,name:account.process_transition_supplierreconcilepaid0
--- a/addons/account/i18n/lt.po
+++ b/addons/account/i18n/lt.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-09-17 04:58+0000\n"
-"X-Generator: Launchpad (build 13955)\n"
+"X-Launchpad-Export-Date: 2011-10-19 05:08+0000\n"
+"X-Generator: Launchpad (build 14157)\n"

 #. module: account
 #: model:process.transition,name:account.process_transition_supplierreconcilepaid0
--- 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-09-17 04:58+0000\n"
-"X-Generator: Launchpad (build 13955)\n"
+"X-Launchpad-Export-Date: 2011-10-19 05:07+0000\n"
+"X-Generator: Launchpad (build 14157)\n"

 #. module: account
 #: model:process.transition,name:account.process_transition_supplierreconcilepaid0
@ -754,7 +754,7 @@ msgstr "Procenti"
 #. module: account
 #: model:ir.ui.menu,name:account.menu_finance_charts
 msgid "Charts"
-msgstr "Diagrammas"
+msgstr "Kontu Plāni"

 #. module: account
 #: code:addons/account/project/wizard/project_account_analytic_line.py:47
--- a/addons/account/i18n/mk.po
+++ b/addons/account/i18n/mk.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-09-17 04:58+0000\n"
-"X-Generator: Launchpad (build 13955)\n"
+"X-Launchpad-Export-Date: 2011-10-19 05:08+0000\n"
+"X-Generator: Launchpad (build 14157)\n"

 #. module: account
 #: model:process.transition,name:account.process_transition_supplierreconcilepaid0
--- 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-09-17 04:58+0000\n"
-"X-Generator: Launchpad (build 13955)\n"
+"X-Launchpad-Export-Date: 2011-10-19 05:08+0000\n"
+"X-Generator: Launchpad (build 14157)\n"

 #. module: account
 #: model:process.transition,name:account.process_transition_supplierreconcilepaid0
--- a/addons/account/i18n/nb.po
+++ b/addons/account/i18n/nb.po
@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2011-01-11 11:14+0000\n"
-"PO-Revision-Date: 2011-03-30 13:55+0000\n"
+"PO-Revision-Date: 2011-10-13 07:32+0000\n"
 "Last-Translator: Rolv Råen (adEgo) <Unknown>\n"
 "Language-Team: Norwegian Bokmal <nb@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-09-17 04:58+0000\n"
-"X-Generator: Launchpad (build 13955)\n"
+"X-Launchpad-Export-Date: 2011-10-19 05:08+0000\n"
+"X-Generator: Launchpad (build 14157)\n"

 #. module: account
 #: model:process.transition,name:account.process_transition_supplierreconcilepaid0
@ -4933,7 +4933,7 @@ msgstr "Analytisk bokføring"
 #: selection:account.invoice.report,type:0
 #: selection:report.invoice.created,type:0
 msgid "Customer Refund"
-msgstr "Kunderefusjon"
+msgstr "Kreditnota"

 #. module: account
 #: view:account.account:0
@ -5489,7 +5489,7 @@ msgstr "  365 dager  "
 #: model:ir.actions.act_window,name:account.action_invoice_tree3
 #: model:ir.ui.menu,name:account.menu_action_invoice_tree3
 msgid "Customer Refunds"
-msgstr "Kunderefusjon"
+msgstr "Kreditnota"

 #. module: account
 #: view:account.payment.term.line:0
@ -5945,7 +5945,7 @@ msgstr "Legg inn en startdato !"
 #: selection:account.invoice.report,type:0
 #: selection:report.invoice.created,type:0
 msgid "Supplier Refund"
-msgstr "Leverandørrefusjon"
+msgstr "Kreditnota"

 #. module: account
 #: model:ir.ui.menu,name:account.menu_dashboard_acc
@ -6815,7 +6815,7 @@ msgstr "Kommentar"
 #: field:account.tax,domain:0
 #: field:account.tax.template,domain:0
 msgid "Domain"
-msgstr "Område"
+msgstr "Domene"

 #. module: account
 #: model:ir.model,name:account.model_account_use_model
@ -9616,7 +9616,7 @@ msgstr "Søk faktura"
 #: view:account.invoice.report:0
 #: model:ir.actions.act_window,name:account.action_account_invoice_refund
 msgid "Refund"
-msgstr "Refusjon"
+msgstr "Kreditnota"

 #. module: account
 #: field:wizard.multi.charts.accounts,bank_accounts_id:0
--- 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-09-17 04:56+0000\n"
-"X-Generator: Launchpad (build 13955)\n"
+"X-Launchpad-Export-Date: 2011-10-19 05:05+0000\n"
+"X-Generator: Launchpad (build 14157)\n"

 #. module: account
 #: code:addons/account/account.py:1167
@ -7513,7 +7513,7 @@ msgstr "Deferral Method"
 #: code:addons/account/invoice.py:359
 #, python-format
 msgid "Invoice '%s' is paid."
-msgstr ""
+msgstr "Factuur '%s' is betaald."

 #. module: account
 #: model:process.node,note:account.process_node_electronicfile0
--- 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-09-17 05:02+0000\n"
-"X-Generator: Launchpad (build 13955)\n"
+"X-Launchpad-Export-Date: 2011-10-19 05:12+0000\n"
+"X-Generator: Launchpad (build 14157)\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-09-17 04:58+0000\n"
-"X-Generator: Launchpad (build 13955)\n"
+"X-Launchpad-Export-Date: 2011-10-19 05:08+0000\n"
+"X-Generator: Launchpad (build 14157)\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-09-17 04:59+0000\n"
-"X-Generator: Launchpad (build 13955)\n"
+"X-Launchpad-Export-Date: 2011-10-19 05:08+0000\n"
+"X-Generator: Launchpad (build 14157)\n"

 #. module: account
 #: model:process.transition,name:account.process_transition_supplierreconcilepaid0
--- a/addons/account/i18n/pt.po
+++ b/addons/account/i18n/pt.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-09-17 04:59+0000\n"
-"X-Generator: Launchpad (build 13955)\n"
+"X-Launchpad-Export-Date: 2011-10-19 05:08+0000\n"
+"X-Generator: Launchpad (build 14157)\n"

 #. module: account
 #: model:process.transition,name:account.process_transition_supplierreconcilepaid0
--- a/addons/account/i18n/pt_BR.po
+++ b/addons/account/i18n/pt_BR.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-09-17 05:02+0000\n"
-"X-Generator: Launchpad (build 13955)\n"
+"X-Launchpad-Export-Date: 2011-10-19 05:11+0000\n"
+"X-Generator: Launchpad (build 14157)\n"

 #. module: account
 #: model:process.transition,name:account.process_transition_supplierreconcilepaid0
--- 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-09-17 04:59+0000\n"
-"X-Generator: Launchpad (build 13955)\n"
+"X-Launchpad-Export-Date: 2011-10-19 05:09+0000\n"
+"X-Generator: Launchpad (build 14157)\n"

 #. module: account
 #: model:process.transition,name:account.process_transition_supplierreconcilepaid0
--- a/addons/account/i18n/ru.po
+++ b/addons/account/i18n/ru.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-09-17 04:59+0000\n"
-"X-Generator: Launchpad (build 13955)\n"
+"X-Launchpad-Export-Date: 2011-10-19 05:09+0000\n"
+"X-Generator: Launchpad (build 14157)\n"

 #. module: account
 #: model:process.transition,name:account.process_transition_supplierreconcilepaid0
--- 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-09-17 04:59+0000\n"
-"X-Generator: Launchpad (build 13955)\n"
+"X-Launchpad-Export-Date: 2011-10-19 05:09+0000\n"
+"X-Generator: Launchpad (build 14157)\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-09-17 05:00+0000\n"
-"X-Generator: Launchpad (build 13955)\n"
+"X-Launchpad-Export-Date: 2011-10-19 05:09+0000\n"
+"X-Generator: Launchpad (build 14157)\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-09-17 05:00+0000\n"
-"X-Generator: Launchpad (build 13955)\n"
+"X-Launchpad-Export-Date: 2011-10-19 05:09+0000\n"
+"X-Generator: Launchpad (build 14157)\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-09-17 04:54+0000\n"
-"X-Generator: Launchpad (build 13955)\n"
+"X-Launchpad-Export-Date: 2011-10-19 05:04+0000\n"
+"X-Generator: Launchpad (build 14157)\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-09-17 04:59+0000\n"
-"X-Generator: Launchpad (build 13955)\n"
+"X-Launchpad-Export-Date: 2011-10-19 05:09+0000\n"
+"X-Generator: Launchpad (build 14157)\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-09-17 05:03+0000\n"
-"X-Generator: Launchpad (build 13955)\n"
+"X-Launchpad-Export-Date: 2011-10-19 05:12+0000\n"
+"X-Generator: Launchpad (build 14157)\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-09-17 05:00+0000\n"
-"X-Generator: Launchpad (build 13955)\n"
+"X-Launchpad-Export-Date: 2011-10-19 05:10+0000\n"
+"X-Generator: Launchpad (build 14157)\n"

 #. module: account
 #: model:process.transition,name:account.process_transition_supplierreconcilepaid0
@ -136,7 +136,7 @@ msgstr "Bokföringstransaktioner-"
 #: code:addons/account/account.py:1291
 #, python-format
 msgid "You can not delete posted movement: \"%s\"!"
-msgstr "You can not delete posted movement: \"%s\"!"
+msgstr "Du kan inte radera sparade affärshändelser: \"%s\"!"

 #. module: account
 #: report:account.invoice:0
@ -799,7 +799,7 @@ msgstr "Beräkna förfallodatum"
 #. module: account
 #: report:account.analytic.account.quantity_cost_ledger:0
 msgid "J.C./Move name"
-msgstr "J.C./Move name"
+msgstr ""

 #. module: account
 #: selection:account.entries.report,month:0
@ -933,7 +933,7 @@ msgstr "Kontoutdrag"
 #. module: account
 #: field:account.analytic.line,move_id:0
 msgid "Move Line"
-msgstr "Move Line"
+msgstr "Affärshändelse"

 #. module: account
 #: help:account.move.line,tax_amount:0
@ -1135,7 +1135,7 @@ msgstr "Utgående valutakurs"
 #. module: account
 #: help:account.move.line,move_id:0
 msgid "The move of this entry line."
-msgstr "The move of this entry line."
+msgstr ""

 #. module: account
 #: field:account.move.line.reconcile,trans_nbr:0
@ -1752,7 +1752,7 @@ msgstr "Momsdeklaration: Kreditfakturor"
 #: code:addons/account/account.py:499
 #, python-format
 msgid "You cannot deactivate an account that contains account moves."
-msgstr "You cannot deactivate an account that contains account moves."
+msgstr "Du kan inte avaktivera ett konto där det finns affärshändelser."

 #. module: account
 #: field:account.move.line.reconcile,credit:0
@ -2380,7 +2380,7 @@ msgstr "Kontoutdrag"
 #. module: account
 #: report:account.analytic.account.journal:0
 msgid "Move Name"
-msgstr "Move Name"
+msgstr "Affärshändelse"

 #. module: account
 #: help:res.partner,property_account_position:0
@ -2950,6 +2950,7 @@ msgstr "Tax Declaration"
 #: help:account.bank.accounts.wizard,currency_id:0
 msgid "Forces all moves for this account to have this secondary currency."
 msgstr ""
+"Tvingar alla affärshändelser för detta konto att anta denna sekundära valuta."

 #. module: account
 #: model:ir.actions.act_window,help:account.action_validate_account_move_line
@ -3209,7 +3210,7 @@ msgstr "Dina bank och kontantkonton"
 #. module: account
 #: view:account.move:0
 msgid "Search Move"
-msgstr ""
+msgstr "Sök affärshändelse"

 #. module: account
 #: field:account.tax.code,name:0
@ -3511,6 +3512,8 @@ msgstr "Account Payable"
 msgid ""
 "You cannot create entries on different periods/journals in the same move"
 msgstr ""
+"Du kan inte skapa rader med skiftande perioder/journaler i samma "
+"affärshändelse"

 #. module: account
 #: model:process.node,name:account.process_node_supplierpaymentorder0
@ -4003,6 +4006,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 ""
+"Nya affärshändelserader skapas i statusen 'Förslag'.\n"
+"* När alla betalningar är gjorda så övergår statusen till 'Valid'."

 #. module: account
 #: field:account.journal,view_id:0
@ -4528,7 +4533,7 @@ msgstr "Stäng"
 #. module: account
 #: field:account.bank.statement.line,move_ids:0
 msgid "Moves"
-msgstr "Moves"
+msgstr "Affärshändelse"

 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_vat_declaration
@ -4619,7 +4624,7 @@ msgstr "Analytic Balance -"
 #: report:pl.account:0
 #: report:pl.account.horizontal:0
 msgid "Target Moves"
-msgstr "Target Moves"
+msgstr "Vald affärshändelse"

 #. module: account
 #: field:account.subscription,period_type:0
@ -5099,8 +5104,7 @@ msgid ""
 "Specified Journal does not have any account move entries in draft state for "
 "this period"
 msgstr ""
-"Specified Journal does not have any account move entries in draft state for "
-"this period"
+"Urvalet av journaler i perioden saknar icke bekräftade affärshändelserader"

 #. module: account
 #: model:ir.actions.act_window,name:account.action_view_move_line
@ -5125,7 +5129,7 @@ msgstr "Antal"
 #. module: account
 #: view:account.move.line:0
 msgid "Number (Move)"
-msgstr ""
+msgstr "Nummer (Affärshändelse)"

 #. module: account
 #: view:account.invoice.refund:0
@ -5218,7 +5222,7 @@ msgstr "Journalpost"
 #. module: account
 #: model:ir.model,name:account.model_account_move_journal
 msgid "Move journal"
-msgstr "Flytta journal"
+msgstr "Journal med affärshändelser"

 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_fiscalyear_close
@ -6138,7 +6142,7 @@ msgstr ""
 #: code:addons/account/account.py:1393
 #, python-format
 msgid "Couldn't create move between different companies"
-msgstr "Couldn't create move between different companies"
+msgstr "Kunde inte skapa affärshändelse som berör flera företag"

 #. module: account
 #: model:ir.actions.act_window,help:account.action_account_type_form
@ -6334,6 +6338,7 @@ msgstr ""
 msgid ""
 "Selected Entry Lines does not have any account move enties in draft state"
 msgstr ""
+"Valda verifikatrader saknar motsvarande icke verifierade affärshändelserader."

 #. module: account
 #: selection:account.aged.trial.balance,target_move:0
@ -7287,13 +7292,13 @@ msgstr "Warning !"
 #. module: account
 #: field:account.entries.report,move_line_state:0
 msgid "State of Move Line"
-msgstr ""
+msgstr "Status för rad i affärshändelse"

 #. module: account
 #: model:ir.model,name:account.model_account_move_line_reconcile
 #: model:ir.model,name:account.model_account_move_line_reconcile_writeoff
 msgid "Account move line reconcile"
-msgstr ""
+msgstr "Avstäm affärshändelserader"

 #. module: account
 #: view:account.subscription.generate:0
@ -7372,7 +7377,7 @@ msgstr "Status"
 msgid ""
 "Select Fiscal Year which you want to remove entries for its End of year "
 "entries journal"
-msgstr ""
+msgstr "Välj bokföringsår för vilket du önskar justera årsavslutjournalen"

 #. module: account
 #: field:account.tax.template,type_tax_use:0
@ -7714,7 +7719,7 @@ msgstr ""
 #. module: account
 #: model:ir.model,name:account.model_account_move_bank_reconcile
 msgid "Move bank reconcile"
-msgstr ""
+msgstr "Avstäm bankärenden"

 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_type_form
@ -7726,7 +7731,7 @@ msgstr "Kontotyper"
 #: code:addons/account/invoice.py:897
 #, python-format
 msgid "Cannot create invoice move on centralised journal"
-msgstr "Cannot create invoice move on centralised journal"
+msgstr "Kan inte skapa affärshändelse för fakturan i huvudboken"

 #. module: account
 #: field:account.account.type,report_type:0
@ -7862,7 +7867,7 @@ msgstr "Leverantörer"
 #: constraint:account.move:0
 msgid ""
 "You cannot create more than one move per period on centralized journal"
-msgstr ""
+msgstr "Du kan inte skapa mer än en affärshändelse per period i huvudboken"

 #. module: account
 #: view:account.journal:0
@ -7999,7 +8004,7 @@ msgstr ""
 #: code:addons/account/account_move_line.py:1056
 #, python-format
 msgid "The account move (%s) for centralisation has been confirmed!"
-msgstr "The account move (%s) for centralisation has been confirmed!"
+msgstr "Affärshändelsen (%s) för huvudboken har bekräftats!"

 #. module: account
 #: help:account.move.line,amount_currency:0
@ -8586,13 +8591,14 @@ msgstr "Manuell registrering"
 #: field:account.move.line,move_id:0
 #: field:analytic.entries.report,move_id:0
 msgid "Move"
-msgstr "Flytta"
+msgstr "Affärshändelse"

 #. module: account
 #: code:addons/account/account_move_line.py:1128
 #, python-format
 msgid "You can not change the tax, you should remove and recreate lines !"
-msgstr "You can not change the tax, you should remove and recreate lines !"
+msgstr ""
+"Du kan inte ändra momsen i efterhand, korrigera genom att återskapa raderna!"

 #. module: account
 #: report:account.central.journal:0
@ -8888,7 +8894,7 @@ msgstr "Valuta"
 #. module: account
 #: model:ir.model,name:account.model_validate_account_move
 msgid "Validate Account Move"
-msgstr ""
+msgstr "Verifiera affärshändelseraderna"

 #. module: account
 #: field:account.account,credit:0
@ -9096,7 +9102,7 @@ msgstr "Account period"
 #. module: account
 #: view:account.subscription:0
 msgid "Remove Lines"
-msgstr "Remove Lines"
+msgstr "Tag bort rader"

 #. module: account
 #: view:account.report.general.ledger:0
@ -9401,7 +9407,7 @@ msgstr ""
 #: view:account.automatic.reconcile:0
 #: view:account.move.line.reconcile.writeoff:0
 msgid "Write-Off Move"
-msgstr "Write-Off Move"
+msgstr "Avskrivning"

 #. module: account
 #: model:process.node,note:account.process_node_paidinvoice0
@ -9528,7 +9534,7 @@ msgstr ""
 #: report:pl.account:0
 #: report:pl.account.horizontal:0
 msgid "With movements"
-msgstr "With movements"
+msgstr "Med affärshändelser"

 #. module: account
 #: view:account.analytic.account:0
@ -9725,7 +9731,7 @@ msgstr ""
 #. module: account
 #: model:ir.model,name:account.model_validate_account_move_lines
 msgid "Validate Account Move Lines"
-msgstr ""
+msgstr "Verifiera kontots affärshändelserader"

 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_analytic_cost_ledger_journal
@ -9877,7 +9883,7 @@ msgstr "You must enter a period length that cannot be 0 or below !"
 #: code:addons/account/account.py:501
 #, python-format
 msgid "You cannot remove an account which has account entries!. "
-msgstr "You cannot remove an account which has account entries!. "
+msgstr "Du kan inte radera ett konto med affärshändelser! "

 #. module: account
 #: model:ir.actions.act_window,help:account.action_account_form
--- a/addons/account/i18n/ta.po
+++ b/addons/account/i18n/ta.po
@ -9,13 +9,13 @@ msgstr ""
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2011-01-11 11:14+0000\n"
 "PO-Revision-Date: 2010-09-01 06:55+0000\n"
-"Last-Translator: ஆமாச்சு <ubuntu@amachu.net>\n"
+"Last-Translator: ஆமாச்சு <ramadasan@amachu.net>\n"
 "Language-Team: Tamil <ta@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-09-17 05:00+0000\n"
-"X-Generator: Launchpad (build 13955)\n"
+"X-Launchpad-Export-Date: 2011-10-19 05:10+0000\n"
+"X-Generator: Launchpad (build 14157)\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-09-17 05:00+0000\n"
-"X-Generator: Launchpad (build 13955)\n"
+"X-Launchpad-Export-Date: 2011-10-19 05:10+0000\n"
+"X-Generator: Launchpad (build 14157)\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-09-17 05:00+0000\n"
-"X-Generator: Launchpad (build 13955)\n"
+"X-Launchpad-Export-Date: 2011-10-19 05:10+0000\n"
+"X-Generator: Launchpad (build 14157)\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-09-17 05:01+0000\n"
-"X-Generator: Launchpad (build 13955)\n"
+"X-Launchpad-Export-Date: 2011-10-19 05:10+0000\n"
+"X-Generator: Launchpad (build 14157)\n"

 #. module: account
 #: model:process.transition,name:account.process_transition_supplierreconcilepaid0
--- a/addons/account/i18n/tr.po
+++ b/addons/account/i18n/tr.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-09-17 05:01+0000\n"
-"X-Generator: Launchpad (build 13955)\n"
+"X-Launchpad-Export-Date: 2011-10-19 05:10+0000\n"
+"X-Generator: Launchpad (build 14157)\n"

 #. module: account
 #: model:process.transition,name:account.process_transition_supplierreconcilepaid0
--- 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-09-17 05:01+0000\n"
-"X-Generator: Launchpad (build 13955)\n"
+"X-Launchpad-Export-Date: 2011-10-19 05:10+0000\n"
+"X-Generator: Launchpad (build 14157)\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-09-17 05:01+0000\n"
-"X-Generator: Launchpad (build 13955)\n"
+"X-Launchpad-Export-Date: 2011-10-19 05:10+0000\n"
+"X-Generator: Launchpad (build 14157)\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-09-17 05:01+0000\n"
-"X-Generator: Launchpad (build 13955)\n"
+"X-Launchpad-Export-Date: 2011-10-19 05:11+0000\n"
+"X-Generator: Launchpad (build 14157)\n"

 #. module: account
 #: model:process.transition,name:account.process_transition_supplierreconcilepaid0
--- a/addons/account/i18n/vi.po
+++ b/addons/account/i18n/vi.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-09-17 05:01+0000\n"
-"X-Generator: Launchpad (build 13955)\n"
+"X-Launchpad-Export-Date: 2011-10-19 05:11+0000\n"
+"X-Generator: Launchpad (build 14157)\n"

 #. module: account
 #: model:process.transition,name:account.process_transition_supplierreconcilepaid0
--- 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-09-17 05:03+0000\n"
-"X-Generator: Launchpad (build 13955)\n"
+"X-Launchpad-Export-Date: 2011-10-19 05:12+0000\n"
+"X-Generator: Launchpad (build 14157)\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-09-17 05:02+0000\n"
-"X-Generator: Launchpad (build 13955)\n"
+"X-Launchpad-Export-Date: 2011-10-19 05:11+0000\n"
+"X-Generator: Launchpad (build 14157)\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
@ -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: 2010-12-11 23:34+0000\n"
-"Last-Translator: BlueT - Matthew Lien - 練喆明 <bluet@ubuntu-tw.org>\n"
+"PO-Revision-Date: 2011-09-27 10:01+0000\n"
+"Last-Translator: Walter Cheuk <wwycheuk@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-09-17 05:02+0000\n"
-"X-Generator: Launchpad (build 13955)\n"
+"X-Launchpad-Export-Date: 2011-10-19 05:12+0000\n"
+"X-Generator: Launchpad (build 14157)\n"

 #. module: account
 #: model:process.transition,name:account.process_transition_supplierreconcilepaid0
@ -48,7 +48,7 @@ msgstr ""
 #. module: account
 #: field:account.installer.modules,account_voucher:0
 msgid "Voucher Management"
-msgstr ""
+msgstr "換票券管理"

 #. module: account
 #: view:account.account:0
@ -3550,7 +3550,7 @@ msgstr ""
 #: view:product.template:0
 #: view:res.partner:0
 msgid "Accounting"
-msgstr "账号"
+msgstr "會計"

 #. module: account
 #: help:account.central.journal,amount_currency:0
@ -6779,7 +6779,7 @@ msgstr ""
 #: field:account.invoice.tax,invoice_id:0
 #: model:ir.model,name:account.model_account_invoice_line
 msgid "Invoice Line"
-msgstr "发票行"
+msgstr "發票明細"

 #. module: account
 #: field:account.balance.report,display_account:0
@ -6788,7 +6788,7 @@ msgstr "发票行"
 #: field:account.pl.report,display_account:0
 #: field:account.report.general.ledger,display_account:0
 msgid "Display accounts"
-msgstr ""
+msgstr "顯示帳號"

 #. module: account
 #: field:account.account.type,sign:0
@ -9305,7 +9305,7 @@ msgstr ""
 #. module: account
 #: field:account.invoice,invoice_line:0
 msgid "Invoice Lines"
-msgstr "发票行"
+msgstr "發票明細"

 #. module: account
 #: constraint:account.account.template:0
--- a/addons/account/installer.py
+++ b/addons/account/installer.py
@ -149,7 +149,7 @@ class account_installer(osv.osv_memory):
                    }
                    new_paid_tax_code_temp = obj_tax_code_temp.create(cr, uid, vals_paid_tax_code_temp, context=context)
                    sales_tax_temp = obj_tax_temp.create(cr, uid, {
-                                            'name': _('TAX %s%%') % (s_tax*100),
+                                            'name': _('Sale TAX %s%%') % (s_tax*100),
                                            'amount': s_tax,
                                            'base_code_id': new_tax_code_temp,
                                            'tax_code_id': new_paid_tax_code_temp,
@ -178,8 +178,7 @@ class account_installer(osv.osv_memory):
                    }
                    new_paid_tax_code_temp = obj_tax_code_temp.create(cr, uid, vals_paid_tax_code_temp, context=context)
                    purchase_tax_temp = obj_tax_temp.create(cr, uid, {
-                                             'name': _('TAX %s%%') % (p_tax*100),
-                                             'description': _('TAX %s%%') % (p_tax*100),
+                                             'name': _('Purchase TAX %s%%') % (p_tax*100),
                                             'amount': p_tax,
                                             'base_code_id': new_tax_code_temp,
                                             'tax_code_id': new_paid_tax_code_temp,
--- a/addons/account/project/project_view.xml
+++ b/addons/account/project/project_view.xml
@ -45,7 +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'}"/>
+                        <filter string="State" icon="terp-folder-green" domain="[]" context="{'group_by':'state'}" groups="base.group_no_one"/>
                    </group>
                </search>
            </field>
@ -65,6 +65,7 @@
                    <field name="debit"/>
                    <field name="credit"/>
                    <field name="balance"/>
+                    <field name="state" invisible="1"/>
                    <field name="currency_id" groups="base.group_extended"/>
                    <field name="date" invisible="1"/>
                    <field name="user_id" invisible="1"/>
--- a/addons/account/report/init.py
+++ b/addons/account/report/init.py
@ -33,7 +33,6 @@ import account_print_overdue
 import account_aged_partner_balance
 #import tax_report
 import account_tax_report
-import account_tax_code
 import account_balance_landscape
 import account_invoice_report
 import account_report
--- a/addons/account/report/account_balance.rml
+++ b/addons/account/report/account_balance.rml
@ -220,7 +220,7 @@
          <para style="terp_tblheader_General_Centre">Display Account</para>
        </td>
        <td>
-          <para style="terp_tblheader_General_Centre">Filter By <font>[[ get_filter(data)!='No Filter' and get_filter(data) ]]</font> </para>
+          <para style="terp_tblheader_General_Centre">Filter By <font>[[ data['form']['filter']!='filter_no' and get_filter(data) ]]</font> </para>
        </td>
        <td>
          <para style="terp_tblheader_General_Centre">Target Moves</para>
@ -234,8 +234,8 @@
          <para style="terp_default_Centre_8">[[ get_fiscalyear(data) or '' ]]</para>
        </td>
          <td><para style="terp_default_Centre_8">[[ (data['form']['display_account']=='all' and 'All') or  (data['form']['display_account']=='movement' and 'With movements') or 'With balance is not equal to 0']]</para></td>
-        <td>  <para style="terp_default_Centre_8">[[ get_filter(data)=='No Filter' and get_filter(data) or removeParentNode('para') ]] </para>
-          <blockTable colWidths="60.0,60.0" style="Table5">[[ get_filter(data)=='Date' or removeParentNode('blockTable') ]]
+        <td>  <para style="terp_default_Centre_8">[[ data['form']['filter']=='filter_no' and get_filter(data) or removeParentNode('para') ]] </para>
+          <blockTable colWidths="60.0,60.0" style="Table5">[[ data['form']['filter']=='filter_date' or removeParentNode('blockTable') ]]
            <tr>
              <td>
                <para style="terp_tblheader_General_Centre">Start Date</para>
@ -253,7 +253,7 @@
              </td>
            </tr>
          </blockTable>
-          <blockTable colWidths="60.0,60.0" style="Table5">[[ get_filter(data)=='Periods' or removeParentNode('blockTable') ]]
+          <blockTable colWidths="60.0,60.0" style="Table5">[[ data['form']['filter']=='filter_period' or removeParentNode('blockTable') ]]
            <tr>
              <td>
                <para style="terp_tblheader_General_Centre">Start Period</para>
--- a/addons/account/report/account_balance_sheet.rml
+++ b/addons/account/report/account_balance_sheet.rml
@ -174,15 +174,15 @@
      <tr>
        <td><para style="terp_tblheader_General_Centre">Chart of Accounts</para></td>
        <td><para style="terp_tblheader_General_Centre">Fiscal Year</para></td>
-        <td><para style="terp_tblheader_General_Centre">Filter By [[ get_filter(data)!='No Filter' and get_filter(data) ]]</para></td>
+        <td><para style="terp_tblheader_General_Centre">Filter By [[ data['form']['filter']!='filter_no' and get_filter(data) ]]</para></td>
    <td><para style="terp_tblheader_General_Centre">Display Account</para></td>
        <td><para style="terp_tblheader_General_Centre">Target Moves</para></td>
      </tr>
  <tr>
     <td><para style="terp_default_Centre_8">[[ get_account(data) or removeParentNode('para') ]]</para></td>
       <td><para style="terp_default_Centre_8">[[ get_fiscalyear(data)  or '' ]]</para></td>
-        <td><para style="terp_default_Centre_8">[[ get_filter(data)=='No Filter' and get_filter(data) or removeParentNode('para') ]] </para>
-          <blockTable colWidths="60.0,60.0" style="Table3">[[ get_filter(data)=='Date' or removeParentNode('blockTable') ]]
+        <td><para style="terp_default_Centre_8">[[ data['form']['filter']=='filter_no' and get_filter(data) or removeParentNode('para') ]] </para>
+          <blockTable colWidths="60.0,60.0" style="Table3">[[ data['form']['filter']=='filter_date' or removeParentNode('blockTable') ]]
        <tr>
                 <td><para style="terp_tblheader_Details_Centre">Start Date</para></td>
              <td><para style="terp_tblheader_Details_Centre">End Date</para></td>
@ -192,7 +192,7 @@
              <td><para style="terp_default_Centre_8">[[ formatLang(get_end_date(data),date=True) ]]</para></td>
            </tr>
          </blockTable>
-          <blockTable colWidths="65.0,60.0" style="Table3">[[ get_filter(data)=='Periods' or removeParentNode('blockTable') ]]
+          <blockTable colWidths="65.0,60.0" style="Table3">[[ data['form']['filter']=='filter_period' or removeParentNode('blockTable') ]]
        <tr>
              <td><para style="terp_tblheader_Details_Centre">Start Period</para></td>
              <td><para style="terp_tblheader_Details_Centre">End Period</para></td>
--- a/addons/account/report/account_balance_sheet_horizontal.rml
+++ b/addons/account/report/account_balance_sheet_horizontal.rml
@ -134,15 +134,15 @@
      <tr>
        <td><para style="terp_tblheader_General_Centre">Chart of Accounts</para></td>
        <td><para style="terp_tblheader_General_Centre">Fiscal Year</para></td>
-        <td><para style="terp_tblheader_General_Centre">Filter By  [[ get_filter(data)!='No Filter' and get_filter(data) ]]</para></td>
+        <td><para style="terp_tblheader_General_Centre">Filter By  [[ data['form']['filter']!='filter_no' and get_filter(data) ]]</para></td>
    <td><para style="terp_tblheader_General_Centre">Display Account</para></td>
        <td><para style="terp_tblheader_General_Centre">Target Moves</para></td>
      </tr>
  <tr>
     <td><para style="terp_default_Centre_8">[[ get_account(data) or removeParentNode('para') ]]</para></td>
       <td><para style="terp_default_Centre_8">[[ get_fiscalyear(data)  or '' ]]</para></td>
-        <td><para style="terp_default_Centre_8">[[ get_filter(data)=='No Filter' and get_filter(data) or removeParentNode('para') ]] </para>
-          <blockTable colWidths="70.0,70.0" style="Table3">[[ get_filter(data)=='Date' or removeParentNode('blockTable') ]]
+        <td><para style="terp_default_Centre_8">[[ data['form']['filter']=='filter_no' and get_filter(data) or removeParentNode('para') ]] </para>
+          <blockTable colWidths="70.0,70.0" style="Table3">[[ data['form']['filter']=='filter_date' or removeParentNode('blockTable') ]]
        <tr>
                 <td><para style="terp_tblheader_Details_Centre">Start Date</para></td>
              <td><para style="terp_tblheader_Details_Centre">End Date</para></td>
@ -152,7 +152,7 @@
              <td><para style="terp_default_Centre_8">[[ formatLang(get_end_date(data),date=True) ]]</para></td>
            </tr>
          </blockTable>
-          <blockTable colWidths="70.0,70.0" style="Table3">[[ get_filter(data)=='Periods' or removeParentNode('blockTable') ]]
+          <blockTable colWidths="70.0,70.0" style="Table3">[[ data['form']['filter']=='filter_period' or removeParentNode('blockTable') ]]
        <tr>
              <td><para style="terp_tblheader_Details_Centre">Start Period</para></td>
              <td><para style="terp_tblheader_Details_Centre">End Period</para></td>
--- a/addons/account/report/account_central_journal.rml
+++ b/addons/account/report/account_central_journal.rml
@ -238,15 +238,15 @@
 		<td><para style="terp_tblheader_General_Centre">Chart of Accounts</para></td>
 	        <td><para style="terp_tblheader_General_Centre">Fiscal Year</para></td>
 			<td><para style="terp_tblheader_General_Centre">Journal</para></td>
-	        <td><para style="terp_tblheader_General_Centre">Filter By  [[get_filter(data)!='No Filter' and get_filter(data) ]]</para></td>
+	        <td><para style="terp_tblheader_General_Centre">Filter By  [[ data['form']['filter']!='filter_no' and get_filter(data) ]]</para></td>
 	        <td><para style="terp_tblheader_General_Centre">Target Moves</para></td>
      </tr>
 	<tr>
 		<td><para style="terp_default_Centre_8">[[ get_account(data) or removeParentNode('para') ]]</para></td>
        <td><para style="terp_default_Centre_8">[[ get_fiscalyear(data)  or '' ]]</para></td>
 		<td><para style="terp_default_Centre_8">[[o.journal_id.name  ]]</para></td>
-        <td><para style="terp_default_Centre_8">[[ get_filter(data)=='No Filter' and get_filter(data) or removeParentNode('para') ]] </para>
-        	<blockTable colWidths="60.0,60.0" style="Table3">[[ get_filter(data)=='Date' or removeParentNode('blockTable') ]]
+        <td><para style="terp_default_Centre_8">[[ data['form']['filter']=='filter_no' and get_filter(data) or removeParentNode('para') ]] </para>
+        	<blockTable colWidths="60.0,60.0" style="Table3">[[ data['form']['filter']=='filter_date' or removeParentNode('blockTable') ]]
 				<tr>
 	               <td><para style="terp_tblheader_Details_Centre">Start Date</para></td>
 	        		<td><para style="terp_tblheader_Details_Centre">End Date</para></td>
@ -256,7 +256,7 @@
 	        		<td><para style="terp_default_Centre_8">[[ formatLang(get_end_date(data),date=True) ]]</para></td>
 	        	</tr>
        	</blockTable>
-        	<blockTable colWidths="65.0,65.0" style="Table3">[[ get_filter(data)=='Periods' or removeParentNode('blockTable') ]]
+        	<blockTable colWidths="65.0,65.0" style="Table3">[[ data['form']['filter']=='filter_period' or removeParentNode('blockTable') ]]
 				<tr>
 			        <td><para style="terp_tblheader_Details_Centre">Start Period</para></td>
 			        <td><para style="terp_tblheader_Details_Centre">End Period</para></td>
--- a/addons/account/report/account_general_journal.rml
+++ b/addons/account/report/account_general_journal.rml
@ -224,15 +224,15 @@
      	<para style="terp_tblheader_General_Centre"> [[ data['model']=='ir.ui.menu' and 'Chart of Accounts' or removeParentNode('para') ]]</para></td>
        <td><para style="terp_tblheader_General_Centre">Fiscal Year</para></td>
    	<td><para style="terp_tblheader_General_Centre">Journals</para></td>
-        <td><para style="terp_tblheader_General_Centre">Filter By [[ get_filter(data)!='No Filter' and  get_filter(data) ]]</para></td>
+        <td><para style="terp_tblheader_General_Centre">Filter By [[ data['form']['filter']!='filter_no' and  get_filter(data) ]]</para></td>
        <td><para style="terp_tblheader_General_Centre">Target Moves</para></td>
      </tr>
 	<tr>
 	   <td><para style="terp_default_Centre_8">[[ get_account(data) or removeParentNode('para') ]]</para></td>
       <td><para style="terp_default_Centre_8">[[ get_fiscalyear(data)  or '' ]]</para></td>
 		<td> <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>
-        	<blockTable colWidths="60.0,60.0" style="Table3">[[ get_filter(data)=='Date' or removeParentNode('blockTable') ]]
+        <td><para style="terp_default_Centre_8">[[ data['form']['filter']=='filter_no' and get_filter(data) or removeParentNode('para') ]] </para>
+        	<blockTable colWidths="60.0,60.0" style="Table3">[[ data['form']['filter']=='filter_date' or removeParentNode('blockTable') ]]
 				<tr>
 	               <td><para style="terp_tblheader_Details_Centre">Start Date</para></td>
 	        		<td><para style="terp_tblheader_Details_Centre">End Date</para></td>
@ -242,7 +242,7 @@
 	        		<td><para style="terp_default_Centre_8">[[ formatLang(get_end_date(data),date=True) ]]</para></td>
 	        	</tr>
        	</blockTable>
-        	<blockTable colWidths="60.0,60.0" style="Table3">[[ get_filter(data)=='Periods' or removeParentNode('blockTable') ]]
+        	<blockTable colWidths="60.0,60.0" style="Table3">[[ data['form']['filter']=='filter_period' or removeParentNode('blockTable') ]]
 				<tr>
 			        <td><para style="terp_tblheader_Details_Centre">Start Period</para></td>
 			        <td><para style="terp_tblheader_Details_Centre">End Period</para></td>
--- a/addons/account/report/account_general_ledger.rml
+++ b/addons/account/report/account_general_ledger.rml
@ -353,7 +353,7 @@
          <para style="terp_tblheader_General_Centre">Journals</para>
        </td>
        <td>
-          <para style="terp_tblheader_General_Centre">Filter By [[ get_filter(data)!='No Filter' and get_filter(data) ]]</para>
+          <para style="terp_tblheader_General_Centre">Filter By [[ data['form']['filter']!='filter_no' and get_filter(data) ]]</para>
        </td>
        <td>
          <para style="terp_tblheader_General_Centre">Target Moves</para>
@ -372,8 +372,8 @@
          <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>
-          <blockTable colWidths="58.0,58.0" style="Table2">[[ get_filter(data)=='Date' or removeParentNode('blockTable') ]]
+          <para style="terp_default_Centre_8">[[ data['form']['filter']=='filter_no' and get_filter(data) or removeParentNode('para') ]]</para>
+          <blockTable colWidths="58.0,58.0" style="Table2">[[ data['form']['filter']=='filter_date' or removeParentNode('blockTable') ]]
            <tr>
              <td>
                <para style="terp_tblheader_General_Centre">Start Date</para>
@ -383,7 +383,7 @@
              </td>
            </tr>
          </blockTable>
-          <blockTable colWidths="58.0,58.0" style="Table3">[[ get_filter(data)=='Date' or removeParentNode('blockTable') ]]
+          <blockTable colWidths="58.0,58.0" style="Table3">[[ data['form']['filter']=='filter_date' or removeParentNode('blockTable') ]]
            <tr>
              <td>
                <para style="terp_default_Centre_8">[[ formatLang(get_start_date(data),date=True) ]]</para>
@ -393,7 +393,7 @@
              </td>
            </tr>
          </blockTable>
-          <blockTable colWidths="58.0,58.0" style="Table4">[[ get_filter(data)=='Periods' or removeParentNode('blockTable') ]]
+          <blockTable colWidths="58.0,58.0" style="Table4">[[ data['form']['filter']=='filter_period' or removeParentNode('blockTable') ]]
            <tr>
              <td>
                <para style="terp_tblheader_General_Centre">Start Period</para>
@ -403,7 +403,7 @@
              </td>
            </tr>
          </blockTable>
-          <blockTable colWidths="58.0,58.0" style="Table5">[[ get_filter(data)=='Periods' or removeParentNode('blockTable') ]]
+          <blockTable colWidths="58.0,58.0" style="Table5">[[ data['form']['filter']=='filter_period' or removeParentNode('blockTable') ]]
            <tr>
              <td>
                <para style="terp_default_Centre_8">[[ get_start_period(data) or removeParentNode('para') ]]</para>
--- a/addons/account/report/account_general_ledger_landscape.rml
+++ b/addons/account/report/account_general_ledger_landscape.rml
@ -373,7 +373,7 @@
          <para style="terp_tblheader_General_Centre">Display Account</para>
        </td>
        <td>
-          <para style="terp_tblheader_General_Centre">Filter By [[ get_filter(data)!='No Filter' and get_filter(data) ]]</para>
+          <para style="terp_tblheader_General_Centre">Filter By [[ data['form']['filter']!='filter_no' and get_filter(data) ]]</para>
        </td>
        <td>
          <para style="terp_tblheader_General_Centre">Entries Sorted By</para>
@ -398,8 +398,8 @@
          <para style="terp_default_Centre_7">[[ (data['form']['display_account']=='all' and 'All') or (data['form']['display_account']=='movement' and 'With movements') or 'With balance is not equal to 0']]</para>
        </td>
        <td>
-          <para style="terp_default_Centre_7">[[ get_filter(data)=='No Filter' and get_filter(data) or removeParentNode('para') ]]</para>
-          <blockTable colWidths="58.0,58.0" style="Table3">[[ get_filter(data)=='Date' or removeParentNode('blockTable') ]]
+          <para style="terp_default_Centre_7">[[ data['form']['filter']=='filter_no' and get_filter(data) or removeParentNode('para') ]]</para>
+          <blockTable colWidths="58.0,58.0" style="Table3">[[ data['form']['filter']=='filter_date' or removeParentNode('blockTable') ]]
            <tr>
              <td>
                <para style="terp_tblheader_General_Centre">Start Date</para>
@ -409,7 +409,7 @@
              </td>
            </tr>
          </blockTable>
-          <blockTable colWidths="58.0,58.0" style="Table4">[[ get_filter(data)=='Date' or removeParentNode('blockTable') ]]
+          <blockTable colWidths="58.0,58.0" style="Table4">[[ data['form']['filter']=='filter_date' or removeParentNode('blockTable') ]]
            <tr>
              <td>
                <para style="terp_default_Centre_7">[[ formatLang(get_start_date(data),date=True) ]]</para>
@ -419,7 +419,7 @@
              </td>
            </tr>
          </blockTable>
-          <blockTable colWidths="58.0,58.0" style="Table5">[[ get_filter(data)=='Periods' or removeParentNode('blockTable') ]]
+          <blockTable colWidths="58.0,58.0" style="Table5">[[ data['form']['filter']=='filter_period' or removeParentNode('blockTable') ]]
            <tr>
              <td>
                <para style="terp_tblheader_General_Centre">Start Period</para>
@ -429,7 +429,7 @@
              </td>
            </tr>
          </blockTable>
-          <blockTable colWidths="58.0,58.0" style="Table6">[[ get_filter(data)=='Periods' or removeParentNode('blockTable') ]]
+          <blockTable colWidths="58.0,58.0" style="Table6">[[ data['form']['filter']=='filter_period' or removeParentNode('blockTable') ]]
            <tr>
              <td>
                <para style="terp_default_Centre_7">[[ get_start_period(data) or removeParentNode('para') ]]</para>
--- a/addons/account/report/account_journal.rml
+++ b/addons/account/report/account_journal.rml
@ -197,8 +197,8 @@
       <td><para style="terp_default_Centre_8">[[ get_account(data) or ''  ]]</para></td>
       <td><para style="terp_default_Centre_8">[[ get_fiscalyear(data) or '' ]]</para></td>
        <td><para style="terp_default_Centre_8">[[o.journal_id.name  ]]</para></td>
-        <td><para style="terp_default_Centre_8">[[ get_filter(data)=='No Filter' and get_filter(data) or removeParentNode('para') ]] </para>
-            <blockTable colWidths="60.0,60.0" style="Table3">[[ get_filter(data)=='Date' or removeParentNode('blockTable') ]]
+        <td><para style="terp_default_Centre_8">[[ data['form']['filter']=='filter_no' and get_filter(data) or removeParentNode('para') ]] </para>
+            <blockTable colWidths="60.0,60.0" style="Table3">[[ data['form']['filter']=='filter_date' or removeParentNode('blockTable') ]]
                <tr>
                   <td><para style="terp_tblheader_Details_Centre">Start Date</para></td>
                    <td><para style="terp_tblheader_Details_Centre">End Date</para></td>
@ -208,7 +208,7 @@
                    <td><para style="terp_default_Centre_8">[[ formatLang(get_end_date(data),date=True) ]]</para></td>
                </tr>
            </blockTable>
-            <blockTable colWidths="60.0,60.0" style="Table3">[[ get_filter(data)=='Periods' or removeParentNode('blockTable') ]]
+            <blockTable colWidths="60.0,60.0" style="Table3">[[ data['form']['filter']=='filter_period' or removeParentNode('blockTable') ]]
                <tr>
                    <td><para style="terp_tblheader_Details_Centre">Start Period</para></td>
                    <td><para style="terp_tblheader_Details_Centre">End Period</para></td>
--- a/addons/account/report/account_partner_balance.rml
+++ b/addons/account/report/account_partner_balance.rml
@ -187,7 +187,7 @@
      	 <td><para style="terp_tblheader_General_Centre">Chart of Accounts</para></td>
        <td><para style="terp_tblheader_General_Centre">Fiscal Year</para></td>
       	<td><para style="terp_tblheader_General_Centre">Journals</para></td>
-		<td><para style="terp_tblheader_General_Centre">Filter By [[ get_filter(data)!='No Filter' and get_filter(data) ]]</para></td>
+		<td><para style="terp_tblheader_General_Centre">Filter By [[ data['form']['filter']!='filter_no' and get_filter(data) ]]</para></td>
 		<td><para style="terp_tblheader_General_Centre">Partner's</para></td>
        <td><para style="terp_tblheader_General_Centre">Target Moves</para></td>
      </tr>
@ -196,8 +196,8 @@
       <td><para style="terp_default_Centre_8">[[ get_fiscalyear(data)  or '' ]]</para></td>
 		<td> <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>
-        	<blockTable colWidths="60.0,60.0" style="Table3">[[ get_filter(data)=='Date' or removeParentNode('blockTable') ]]
+        <td><para style="terp_default_Centre_8">[[ data['form']['filter']=='filter_no' and get_filter(data) or removeParentNode('para') ]] </para>
+        	<blockTable colWidths="60.0,60.0" style="Table3">[[ data['form']['filter']=='filter_date' or removeParentNode('blockTable') ]]
 				<tr>
 	               <td><para style="terp_tblheader_General_Centre">Start Date</para></td>
 	        		<td><para style="terp_tblheader_General_Centre">End Date</para></td>
@ -207,7 +207,7 @@
 	        		<td><para style="terp_default_Centre_8">[[ formatLang(get_end_date(data),date=True) ]]</para></td>
 	        	</tr>
        	</blockTable>
-        	<blockTable colWidths="60.0,60.0" style="Table3">[[ get_filter(data)=='Periods' or removeParentNode('blockTable') ]]
+        	<blockTable colWidths="60.0,60.0" style="Table3">[[ data['form']['filter']=='filter_period' or removeParentNode('blockTable') ]]
 				<tr>
 			        <td><para style="terp_tblheader_General_Centre">Start Period</para></td>
 			        <td><para style="terp_tblheader_General_Centre">End Period</para></td>
--- a/addons/account/report/account_partner_ledger.rml
+++ b/addons/account/report/account_partner_ledger.rml
@ -378,7 +378,7 @@
        </td>
        <td>
          <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') ]]
+          <blockTable colWidths="58.0,58.0" style="Table7">[[ data['form']['filter']=='filter_date' or removeParentNode('blockTable') ]]
            <tr>
              <td>
                <para style="terp_tblheader_General_Centre">Start Date</para>
@ -388,7 +388,7 @@
              </td>
            </tr>
          </blockTable>
-          <blockTable colWidths="58.0,58.0" style="Table9">[[ get_filter(data)=='Date' or removeParentNode('blockTable') ]]
+          <blockTable colWidths="58.0,58.0" style="Table9">[[ data['form']['filter']=='filter_date' or removeParentNode('blockTable') ]]
            <tr>
              <td>
                <para style="terp_default_Centre_8">[[ formatLang(get_start_date(data),date=True) ]]</para>
@ -398,7 +398,7 @@
              </td>
            </tr>
          </blockTable>
-          <blockTable colWidths="58.0,58.0" style="Table10">[[ get_filter(data)=='Periods' or removeParentNode('blockTable') ]]
+          <blockTable colWidths="58.0,58.0" style="Table10">[[ data['form']['filter']=='filter_period' or removeParentNode('blockTable') ]]
            <tr>
              <td>
                <para style="terp_tblheader_General_Centre">Start Period</para>
@ -408,7 +408,7 @@
              </td>
            </tr>
          </blockTable>
-          <blockTable colWidths="58.0,58.0" style="Table11">[[ get_filter(data)=='Periods' or removeParentNode('blockTable') ]]
+          <blockTable colWidths="58.0,58.0" style="Table11">[[ data['form']['filter']=='filter_period' or removeParentNode('blockTable') ]]
            <tr>
              <td>
                <para style="terp_default_Centre_8">[[ get_start_period(data) or removeParentNode('para') ]]</para>
--- a/addons/account/report/account_partner_ledger_other.rml
+++ b/addons/account/report/account_partner_ledger_other.rml
@ -379,7 +379,7 @@
        </td>
        <td>
          <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') ]]
+          <blockTable colWidths="58.0,58.0" style="Table7">[[ data['form']['filter']=='filter_date' or removeParentNode('blockTable') ]]
            <tr>
              <td>
                <para style="terp_tblheader_General_Centre">Start Date</para>
@ -389,7 +389,7 @@
              </td>
            </tr>
          </blockTable>
-          <blockTable colWidths="58.0,58.0" style="Table9">[[ get_filter(data)=='Date' or removeParentNode('blockTable') ]]
+          <blockTable colWidths="58.0,58.0" style="Table9">[[ data['form']['filter']=='filter_date' or removeParentNode('blockTable') ]]
            <tr>
              <td>
                <para style="terp_default_Centre_8">[[ formatLang(get_start_date(data),date=True) ]]</para>
@ -399,7 +399,7 @@
              </td>
            </tr>
          </blockTable>
-          <blockTable colWidths="58.0,58.0" style="Table10">[[ get_filter(data)=='Periods' or removeParentNode('blockTable') ]]
+          <blockTable colWidths="58.0,58.0" style="Table10">[[ data['form']['filter']=='filter_period' or removeParentNode('blockTable') ]]
            <tr>
              <td>
                <para style="terp_tblheader_General_Centre">Start Period</para>
@ -409,7 +409,7 @@
              </td>
            </tr>
          </blockTable>
-          <blockTable colWidths="58.0,58.0" style="Table11">[[ get_filter(data)=='Periods' or removeParentNode('blockTable') ]]
+          <blockTable colWidths="58.0,58.0" style="Table11">[[ data['form']['filter']=='filter_period' or removeParentNode('blockTable') ]]
            <tr>
              <td>
                <para style="terp_default_Centre_8">[[ get_start_period(data) or removeParentNode('para') ]]</para>
--- a/addons/account/report/account_profit_horizontal.rml
+++ b/addons/account/report/account_profit_horizontal.rml
@ -151,15 +151,15 @@
      <tr>
      	<td><para style="terp_tblheader_General_Centre">Chart of Accounts</para></td>
        <td><para style="terp_tblheader_General_Centre">Fiscal Year</para></td>
-        <td><para style="terp_tblheader_General_Centre">Filter By [[ get_filter(data)!='No Filter' and get_filter(data) ]]</para></td>
+        <td><para style="terp_tblheader_General_Centre">Filter By [[ data['form']['filter']!='filter_no' and get_filter(data) ]]</para></td>
 		<td><para style="terp_tblheader_General_Centre">Display Account</para></td>
        <td><para style="terp_tblheader_General_Centre">Target Moves</para></td>
      </tr>
 	<tr>
 	   <td><para style="terp_default_Centre_8">[[ get_account(data) or removeParentNode('para') ]]</para></td>
       <td><para style="terp_default_Centre_8">[[ get_fiscalyear(data)  or '' ]]</para></td>
-        <td><para style="terp_default_Centre_8">[[ get_filter(data)=='No Filter' and get_filter(data) or removeParentNode('para') ]] </para>
-        	<blockTable colWidths="70.0,70.0" style="Table3">[[ get_filter(data)=='Date' or removeParentNode('blockTable') ]]
+        <td><para style="terp_default_Centre_8">[[ data['form']['filter']=='filter_no' and get_filter(data) or removeParentNode('para') ]] </para>
+        	<blockTable colWidths="70.0,70.0" style="Table3">[[ data['form']['filter']=='filter_date' or removeParentNode('blockTable') ]]
 				<tr>
 	               <td><para style="terp_tblheader_General_Centre">Start Date</para></td>
 	        		<td><para style="terp_tblheader_General_Centre">End Date</para></td>
@ -169,7 +169,7 @@
 	        		<td><para style="terp_default_Centre_8">[[ formatLang(get_end_date(data),date=True) ]]</para></td>
 	        	</tr>
        	</blockTable>
-        	<blockTable colWidths="70.0,70.0" style="Table3">[[ get_filter(data)=='Periods' or removeParentNode('blockTable') ]]
+        	<blockTable colWidths="70.0,70.0" style="Table3">[[ data['form']['filter']=='filter_period' or removeParentNode('blockTable') ]]
 				<tr>
 			        <td><para style="terp_tblheader_General_Centre">Start Period</para></td>
 			        <td><para style="terp_tblheader_General_Centre">End Period</para></td>
--- a/addons/account/report/account_profit_loss.rml
+++ b/addons/account/report/account_profit_loss.rml
@ -174,15 +174,15 @@
      <tr>
      	<td><para style="terp_tblheader_General_Centre">Chart of Accounts</para></td>
        <td><para style="terp_tblheader_General_Centre">Fiscal Year</para></td>
-        <td><para style="terp_tblheader_General_Centre">Filter By [[ get_filter(data)!='No Filter' and get_filter(data) ]]</para></td>
+        <td><para style="terp_tblheader_General_Centre">Filter By [[ data['form']['filter']!='filter_no' and get_filter(data) ]]</para></td>
        <td><para style="terp_tblheader_General_Centre">Display Account</para></td>
        <td><para style="terp_tblheader_General_Centre">Target Moves</para></td>
      </tr>
 	<tr>
 	   <td><para style="terp_default_Centre_8">[[ get_account(data) or removeParentNode('para') ]]</para></td>
       <td><para style="terp_default_Centre_8">[[ get_fiscalyear(data)  or '' ]]</para></td>
-        <td><para style="terp_default_Centre_8">[[ get_filter(data)=='No Filter' and get_filter(data) or removeParentNode('para') ]] </para>
-        	<blockTable colWidths="60.0,60.0" style="Table3">[[ get_filter(data)=='Date' or removeParentNode('blockTable') ]]
+        <td><para style="terp_default_Centre_8">[[ data['form']['filter']=='filter_no' and get_filter(data) or removeParentNode('para') ]] </para>
+        	<blockTable colWidths="60.0,60.0" style="Table3">[[ data['form']['filter']=='filter_date' or removeParentNode('blockTable') ]]
 				<tr>
 	               <td><para style="terp_tblheader_General_Centre">Start Date</para></td>
 	        		<td><para style="terp_tblheader_General_Centre">End Date</para></td>
@ -192,7 +192,7 @@
 	        		<td><para style="terp_default_Centre_8">[[ formatLang(get_end_date(data),date=True) ]]</para></td>
 	        	</tr>
        	</blockTable>
-        	<blockTable colWidths="65.0,60.0" style="Table3">[[ get_filter(data)=='Periods' or removeParentNode('blockTable') ]]
+        	<blockTable colWidths="65.0,60.0" style="Table3">[[ data['form']['filter']=='filter_period' or removeParentNode('blockTable') ]]
 				<tr>
 			        <td><para style="terp_tblheader_General_Centre">Start Period</para></td>
 			        <td><para style="terp_tblheader_General_Centre">End Period</para></td>
--- a/addons/account/report/account_tax_code.py
+++ b/addons/account/report/account_tax_code.py
@ -1,63 +0,0 @@
-# -*- coding: utf-8 -*-
-##############################################################################
-#
-#    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU Affero General Public License as
-#    published by the Free Software Foundation, either version 3 of the
-#    License, or (at your option) any later version.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU Affero General Public License for more details.
-#
-#    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-##############################################################################
-
-import time
-from report import report_sxw
-
-def _get_country(record):
-    if record.partner_id \
-            and record.partner_id.address \
-            and record.partner_id.address[0].country_id:
-        return record.partner_id.address[0].country_id.code
-    else:
-        return ''
-
-def _record_to_report_line(record):
-    return {'date': record.date,
-            'ref': record.ref,
-            'acode': record.account_id.code,
-            'name': record.name,
-            'debit': record.debit,
-            'credit': record.credit,
-            'pname': record.partner_id and record.partner_id.name or '',
-            'country': _get_country(record)
-            }
-
-class account_tax_code_report(report_sxw.rml_parse):
-    def __init__(self, cr, uid, name, context):
-        super(account_tax_code_report, self).__init__(cr, uid, name, context=context)
-        self.localcontext.update({
-            'time': time,
-            'get_line':self.get_line,
-        })
-
-    def get_line(self, obj):
-        line_ids = self.pool.get('account.move.line').search(self.cr, self.uid, [('tax_code_id','=',obj.id)])
-        if not line_ids: return []
-
-        return map(_record_to_report_line,
-                   self.pool.get('account.move.line')\
-                       .browse(self.cr, self.uid, line_ids))
-
-report_sxw.report_sxw('report.account.tax.code.entries', 'account.tax.code',
-    'addons/account/report/account_tax_code.rml', parser=account_tax_code_report, header="internal")
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
--- a/addons/account/report/account_tax_code.rml
+++ b/addons/account/report/account_tax_code.rml
@ -1,144 +0,0 @@
-<?xml version="1.0"?>
-<document filename="Accounting Entries.pdf">
-  <template pageSize="(595.0,842.0)" title="Accounting Entries" author="OpenERP S.A.(sales@openerp.com)" allowSplitting="20">
-    <pageTemplate id="first">
-      <frame id="first" x1="28.0" y1="42.0" width="539" height="758"/>
-    </pageTemplate>
-  </template>
-  <stylesheet>
-    <blockTableStyle id="Standard_Outline">
-      <blockAlignment value="LEFT"/>
-      <blockValign value="TOP"/>
-    </blockTableStyle>
-    <blockTableStyle id="Table2">
-      <blockAlignment value="LEFT"/>
-      <blockValign value="TOP"/>
-    </blockTableStyle>
-    <blockTableStyle id="Table_Line_Title">
-      <blockAlignment value="LEFT"/>
-      <blockValign value="TOP"/>
-      <lineStyle kind="LINEBELOW" colorName="#000000" start="0,-1" stop="0,-1"/>
-      <lineStyle kind="LINEBELOW" colorName="#000000" start="1,-1" stop="1,-1"/>
-      <lineStyle kind="LINEBELOW" colorName="#000000" start="2,-1" stop="2,-1"/>
-      <lineStyle kind="LINEBELOW" colorName="#000000" start="3,-1" stop="3,-1"/>
-      <lineStyle kind="LINEBELOW" colorName="#000000" start="4,-1" stop="4,-1"/>
-      <lineStyle kind="LINEBELOW" colorName="#000000" start="5,-1" stop="5,-1"/>
-      <lineStyle kind="LINEBELOW" colorName="#000000" start="6,-1" stop="6,-1"/>
-    </blockTableStyle>
-    <blockTableStyle id="Table_Line_Content_Detail">
-      <blockAlignment value="LEFT"/>
-      <blockValign value="TOP"/>
-      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="0,-1" stop="0,-1"/>
-      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="1,-1" stop="1,-1"/>
-      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="2,-1" stop="2,-1"/>
-      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="3,-1" stop="3,-1"/>
-      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="4,-1" stop="4,-1"/>
-      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="5,-1" stop="5,-1"/>
-      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="6,-1" stop="6,-1"/>
-    </blockTableStyle>
-    <initialize>
-      <paraStyle name="all" alignment="justify"/>
-    </initialize>
-    <paraStyle name="P1" fontName="Helvetica-Bold" fontSize="11.0" leading="14" alignment="LEFT" spaceBefore="12.0" spaceAfter="6.0"/>
-    <paraStyle name="Standard" fontName="Helvetica"/>
-    <paraStyle name="Text body" fontName="Helvetica" spaceBefore="0.0" spaceAfter="6.0"/>
-    <paraStyle name="List" fontName="Helvetica" spaceBefore="0.0" spaceAfter="6.0"/>
-    <paraStyle name="Table Contents" fontName="Helvetica" spaceBefore="0.0" spaceAfter="6.0"/>
-    <paraStyle name="Table Heading" fontName="Helvetica" alignment="CENTER" spaceBefore="0.0" spaceAfter="6.0"/>
-    <paraStyle name="Caption" fontName="Helvetica" fontSize="10.0" leading="13" spaceBefore="6.0" spaceAfter="6.0"/>
-    <paraStyle name="Index" fontName="Helvetica"/>
-    <paraStyle name="Heading" fontName="Helvetica" fontSize="15.0" leading="19" spaceBefore="12.0" spaceAfter="6.0"/>
-    <paraStyle name="Footer" fontName="Helvetica"/>
-    <paraStyle name="Horizontal Line" fontName="Helvetica" fontSize="6.0" leading="8" spaceBefore="0.0" spaceAfter="14.0"/>
-    <paraStyle name="terp_header" fontName="Helvetica-Bold" fontSize="12.0" leading="15" alignment="LEFT" spaceBefore="12.0" spaceAfter="6.0"/>
-    <paraStyle name="Heading 9" fontName="Helvetica-Bold" fontSize="75%" leading="NaN" spaceBefore="12.0" spaceAfter="6.0"/>
-    <paraStyle name="terp_tblheader_General" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="6.0" spaceAfter="6.0"/>
-    <paraStyle name="terp_tblheader_Details" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="6.0" spaceAfter="6.0"/>
-    <paraStyle name="terp_default_8" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="terp_default_Bold_8" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="terp_tblheader_General_Centre" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="CENTER" spaceBefore="6.0" spaceAfter="6.0"/>
-    <paraStyle name="terp_tblheader_General_Right" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="6.0" spaceAfter="6.0"/>
-    <paraStyle name="terp_tblheader_Details_Centre" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="CENTER" spaceBefore="6.0" spaceAfter="6.0"/>
-    <paraStyle name="terp_tblheader_Details_Right" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="6.0" spaceAfter="6.0"/>
-    <paraStyle name="terp_default_Right_8" fontName="Helvetica" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="terp_default_Centre_8" fontName="Helvetica" fontSize="8.0" leading="10" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="terp_header_Right" fontName="Helvetica-Bold" fontSize="15.0" leading="19" alignment="LEFT" spaceBefore="12.0" spaceAfter="6.0"/>
-    <paraStyle name="terp_header_Centre" fontName="Helvetica-Bold" fontSize="15.0" leading="19" alignment="CENTER" spaceBefore="12.0" spaceAfter="6.0"/>
-    <paraStyle name="terp_default_address" fontName="Helvetica" fontSize="10.0" leading="13" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="terp_default_9" fontName="Helvetica" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="terp_default_Bold_9" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="terp_default_Centre_9" fontName="Helvetica" fontSize="9.0" leading="11" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="terp_default_Right_9" fontName="Helvetica" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="terp_default_2" fontName="Helvetica" fontSize="2.0" leading="3" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <images/>
-  </stylesheet>
-  <story>
-    <para style="terp_default_8">[[ repeatIn(objects, 'o') ]]</para>
-    <blockTable colWidths="539.0" repeatRows="1" style="Table2">
-      <tr>
-        <td>
-          <para style="terp_header_Centre">Accounting Entries-[[ company.currency_id.name ]]</para>
-        </td>
-      </tr>
-    </blockTable>
-    <para style="Standard">
-      <font color="white"> </font>
-    </para>
-    <blockTable colWidths="52.0,68.0,55.0,110.0,130.0,64.0,60.0" repeatRows="1" style="Table_Line_Title">
-      <tr>
-        <td>
-          <para style="terp_tblheader_Details">Date</para>
-        </td>
-        <td>
-          <para style="terp_tblheader_Details">Voucher No</para>
-        </td>
-        <td>
-          <para style="terp_tblheader_Details">A/c Code</para>
-        </td>
-        <td>
-          <para style="terp_tblheader_Details">Third Party (Country)</para>
-        </td>
-        <td>
-          <para style="terp_tblheader_Details">Entry Label</para>
-        </td>
-        <td>
-          <para style="terp_tblheader_Details_Right">Debit</para>
-        </td>
-        <td>
-          <para style="terp_tblheader_Details_Right">Credit</para>
-        </td>
-      </tr>
-    </blockTable>
-    <section>
-      <para style="terp_default_8">[[ repeatIn(get_line(o),'line') ]]</para>
-      <blockTable colWidths="52.0,68.0,54.0,110.0,131.0,63.0,60.0" style="Table_Line_Content_Detail">
-        <tr>
-          <td>
-            <para style="terp_default_9">[[ not line and removeParentNode('blockTable') ]] [[ formatLang(line['date'],date=True) ]]</para>
-          </td>
-          <td>
-            <para style="terp_default_9">[[ line['ref'] ]]</para>
-          </td>
-          <td>
-            <para style="terp_default_9">[[ line['acode'] ]]</para>
-          </td>
-          <td>
-            <para style="terp_default_9">[[ line['pname'] ]] ([[ line['country'] ]] )</para>
-          </td>
-          <td>
-            <para style="terp_default_9">[[ line['name'] ]]</para>
-          </td>
-          <td>
-            <para style="terp_default_Right_9">[[ formatLang(line['debit'], currency_obj=company.currency_id) ]]</para>
-          </td>
-          <td>
-            <para style="terp_default_Right_9">[[ formatLang(line['credit'], currency_obj=company.currency_id) ]]</para>
-          </td>
-        </tr>
-      </blockTable>
-      <para style="terp_default_2">
-        <font color="white"> </font>
-      </para>
-    </section>
-  </story>
-</document>
--- a/addons/account/test/account_change_currency.yml
+++ b/addons/account/test/account_change_currency.yml
@ -33,11 +33,11 @@
 -
  !python {model: account.change.currency}: |
    self.view_init(cr, uid, [ref("account_change_currency_0")], {"lang": 'en_US',
-      "active_model": "account.invoice", "tz": False, "record_id": 4, "active_ids":
+      "active_model": "account.invoice", "tz": False, "active_ids":
      [ref("account_invoice_currency")], "type": "out_invoice", "active_id": ref("account_invoice_currency"),
    })
    self.change_currency(cr, uid, [ref("account_change_currency_0")], {"lang": 'en_US',
-      "active_model": "account.invoice", "tz": False, "record_id": 4, "active_ids":
+      "active_model": "account.invoice", "tz": False, "active_ids":
      [ref("account_invoice_currency")], "type": "out_invoice", "active_id": ref("account_invoice_currency"),
    })
 -
@ -71,7 +71,7 @@
 -
  !python {model: account.change.currency}: |
    self.change_currency(cr, uid, [ref("account_change_currency_0")], {"lang": 'en_US',
-      "active_model": "account.invoice", "tz": False, "record_id": 4, "active_ids":
+      "active_model": "account.invoice", "tz": False, "active_ids":
      [ref("account_invoice_currency")], "type": "out_invoice", "active_id": ref("account_invoice_currency"),
      })
 -
--- a/addons/account/wizard/account_automatic_reconcile_view.xml
+++ b/addons/account/wizard/account_automatic_reconcile_view.xml
@ -42,7 +42,7 @@
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
             <field name="view_id" ref="account_automatic_reconcile_view"/>
-             <field name="context">{'record_id':active_id}</field>
+             <field name="context">{}</field>
             <field name="target">new</field>
       </record>

--- a/addons/account/wizard/account_change_currency_view.xml
+++ b/addons/account/wizard/account_change_currency_view.xml
@ -25,7 +25,7 @@
            <field name="view_type">form</field>
            <field name="view_mode">form</field>
            <field name="view_id" ref="view_account_change_currency"/>
-            <field name="context">{'record_id' : active_id}</field>
+            <field name="context">{}</field>
            <field name="target">new</field>
        </record>
    </data>
--- a/addons/account/wizard/account_chart.py
+++ b/addons/account/wizard/account_chart.py
@ -38,9 +38,12 @@ class account_chart(osv.osv_memory):
                                        ], 'Target Moves', required=True),
    }

+    def _get_fiscalyear(self, cr, uid, context=None):
+        """Return default Fiscalyear value"""
+        return self.pool.get('account.fiscalyear').find(cr, uid, context=context)
+
    def onchange_fiscalyear(self, cr, uid, ids, fiscalyear_id=False, context=None):
        res = {}
-        res['value'] = {}
        if fiscalyear_id:
            start_period = end_period = False
            cr.execute('''
@ -50,7 +53,7 @@ class account_chart(osv.osv_memory):
                               WHERE f.id = %s
                               ORDER BY p.date_start ASC
                               LIMIT 1) AS period_start
-                UNION
+                UNION ALL
                SELECT * FROM (SELECT p.id
                               FROM account_period p
                               LEFT JOIN account_fiscalyear f ON (p.fiscalyear_id = f.id)
@ -63,6 +66,8 @@ class account_chart(osv.osv_memory):
                start_period = periods[0]
                end_period = periods[1]
            res['value'] = {'period_from': start_period, 'period_to': end_period}
+        else:
+            res['value'] = {'period_from': False, 'period_to': False}
        return res

    def account_chart_open_window(self, cr, uid, ids, context=None):
@ -96,7 +101,8 @@ class account_chart(osv.osv_memory):
        return result

    _defaults = {
-        'target_move': 'posted'
+        'target_move': 'posted',
+        'fiscalyear': _get_fiscalyear,
    }

 account_chart()
--- a/addons/account/wizard/account_reconcile_partner_process_view.xml
+++ b/addons/account/wizard/account_reconcile_partner_process_view.xml
@ -28,7 +28,7 @@
            <field name="view_type">form</field>
            <field name="view_mode">tree,form</field>
            <field name="view_id" ref="account_partner_reconcile_view"/>
-            <field name="context">{'record_id':active_id}</field>
+            <field name="context">{}</field>
            <field name="target">new</field>
       </record>
            <record model="ir.values" id="action_partner_reconcile_actino">
--- a/addons/account/wizard/account_report_aged_partner_balance_view.xml
+++ b/addons/account/wizard/account_report_aged_partner_balance_view.xml
@ -37,7 +37,7 @@
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
             <field name="view_id" ref="account_aged_balance_view"/>
-             <field name="context">{'record_id':active_id}</field>
+             <field name="context">{}</field>
             <field name="target">new</field>
       </record>

--- a/addons/account/wizard/account_report_common.py
+++ b/addons/account/wizard/account_report_common.py
@ -71,7 +71,7 @@ class account_common_report(osv.osv_memory):
                               AND p.special = false
                               ORDER BY p.date_start ASC, p.special ASC
                               LIMIT 1) AS period_start
-                UNION
+                UNION ALL
                SELECT * FROM (SELECT p.id
                               FROM account_period p
                               LEFT JOIN account_fiscalyear f ON (p.fiscalyear_id = f.id)
--- a/Show More
+++ b/Show More