From 44df166411a22e66072de9323bcd7e5e4929eb9f Mon Sep 17 00:00:00 2001
From: "qdp-launchpad@tinyerp.com" <>
Date: Tue, 11 Jan 2011 10:52:35 +0100
Subject: [PATCH 1/2] [FIX] account: fixed query_get of trial balance

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

bzr revid: qdp-launchpad@tinyerp.com-20110111095235-17730agda2pmq8sv
---
 addons/account/report/account_balance.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/addons/account/report/account_balance.py b/addons/account/report/account_balance.py
index 00fa1f58ff6..d077042e698 100644
--- a/addons/account/report/account_balance.py
+++ b/addons/account/report/account_balance.py
@@ -111,7 +111,8 @@ class account_balance(report_sxw.rml_parse, common_report_header):
 
         ctx['fiscalyear'] = form['fiscalyear_id']
         if form['filter'] == 'filter_period':
-            ctx['periods'] = form['periods']
+            ctx['period_from'] = form['period_from']
+            ctx['period_to'] = form['period_to']
         elif form['filter'] == 'filter_date':
             ctx['date_from'] = form['date_from']
             ctx['date_to'] =  form['date_to']

From c9bd14644e0277941901a28039eaa3403bd3b8da Mon Sep 17 00:00:00 2001
From: "qdp-launchpad@tinyerp.com" <>
Date: Tue, 11 Jan 2011 10:55:13 +0100
Subject: [PATCH 2/2] [REF] account: removed deprecated, bugged and unused
 bank.statement form view and action

bzr revid: qdp-launchpad@tinyerp.com-20110111095513-hl5sa8mp7z30pwyk
---
 addons/account/account_view.xml | 66 +--------------------------------
 1 file changed, 1 insertion(+), 65 deletions(-)

diff --git a/addons/account/account_view.xml b/addons/account/account_view.xml
index 71830154d74..0ef24bcd38d 100644
--- a/addons/account/account_view.xml
+++ b/addons/account/account_view.xml
@@ -602,7 +602,7 @@
         </record>
 
         <record id="view_bank_statement_periodic_form" model="ir.ui.view">
-            <field name="name">account.bank.statement.form</field>
+            <field name="name">account.bank.statement.reconcile.form</field>
             <field name="model">account.bank.statement</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
@@ -1519,70 +1519,6 @@
             <field name="act_window_id" ref="action_move_line_search"/>
         </record>
 
-        <record id="view_bank_statement_reconcile_form" model="ir.ui.view">
-            <field name="name">account.bank.statement.form</field>
-            <field name="model">account.bank.statement</field>
-            <field eval="30" name="priority"/>
-            <field name="type">form</field>
-            <field name="arch" type="xml">
-                <form string="Statement">
-                    <group col="6" colspan="4">
-                        <field name="name" select="1"/>
-                        <field name="date" select="1"/>
-                        <field name="journal_id" on_change="onchange_journal_id(journal_id)" select="1"/>
-                        <field name="currency"/>
-                        <field name="balance_start"/>
-                        <field name="balance_end_real"/>
-                    </group>
-                    <notebook colspan="4">
-                        <page string="Select entries">
-                            <field colspan="4" domain="[('statement_id', '=', False), ('journal_id', '=', journal_id)]" name="move_line_ids" nolabel="1" widget="many2many"/>
-                        </page>
-                        <page string="Entry encoding">
-                            <separator colspan="4" string="Entry Lines"/>
-                            <field name="period_id"/>
-                            <field colspan="4" name="line_ids" nolabel="1">
-                                <tree editable="bottom" string="Statement lines">
-                                    <field name="date"/>
-                                    <field name="name"/>
-                                    <field name="type" on_change="onchange_type(partner_id, type)"/>
-                                    <field name="partner_id" on_change="onchange_type(partner_id, type)"/>
-                                    <field domain="[('journal_id', '=', parent.journal_id)]" name="account_id"/>
-                                    <field name="amount"/>
-                                    <field context="{'partner_id': partner_id, 'amount': amount, 'account_id': account_id, 'date':date}" name="reconcile_id"/>
-                                </tree>
-                                <form string="Statement lines">
-                                    <field name="date"/>
-                                    <field name="name"/>
-                                    <field name="type" on_change="onchange_type(partner_id, type)"/>
-                                    <field name="partner_id" on_change="onchange_type(partner_id, type)"/>
-                                    <field domain="[('journal_id', '=', parent.journal_id)]" name="account_id"/>
-                                    <field name="analytic_account_id" groups="analytic.group_analytic_accounting" />
-                                    <field name="amount"/>
-                                    <field context="{'partner_id': partner_id, 'amount': amount, 'account_id': account_id, 'date':date}" name="reconcile_id"/>
-                                </form>
-                            </field>
-                        </page>
-                    </notebook>
-                    <group col="7" colspan="4">
-                        <field name="state"/>
-                        <field name="balance_end"/>
-                        <button name="button_cancel" states="confirm" string="Cancel" type="object" icon="gtk-cancel"/>
-                        <button name="button_dummy" states="draft" string="Compute" icon="terp-stock_format-scientific"/>
-                        <button name="button_confirm" states="draft" string="Confirm" type="object" icon="terp-camera_test"/>
-                    </group>
-                </form>
-            </field>
-        </record>
-        <record id="action_bank_statement_reconciliation_form" model="ir.actions.act_window">
-            <field name="name">Statements reconciliation</field>
-            <field name="res_model">account.bank.statement</field>
-            <field name="view_type">form</field>
-            <field name="view_mode">form,tree</field>
-            <field name="search_view_id" ref="view_bank_statement_search"/>
-            <field name="view_id" ref="view_bank_statement_reconcile_form"/>
-        </record>
-
         <act_window
             context="{'search_default_next_partner':1,'view_mode':True}"
             id="action_account_manual_reconcile" name="Journal Items"