From efc8b61ea33d46aef0d8709f13c4c59114738be9 Mon Sep 17 00:00:00 2001
From: bde <bde@tiny2-desktop>
Date: Thu, 30 Jun 2011 19:12:50 +0530
Subject: [PATCH 1/2] [REM] removed _default_balance_start method in
 account_bank_statement.py file

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

bzr revid: bde@tiny2-desktop-20110630134250-1qu7vdtvtnrb3266
---
 addons/account/account_bank_statement.py | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/addons/account/account_bank_statement.py b/addons/account/account_bank_statement.py
index 54776e5c7e6..b4dd4b15aa1 100644
--- a/addons/account/account_bank_statement.py
+++ b/addons/account/account_bank_statement.py
@@ -58,13 +58,6 @@ class account_bank_statement(osv.osv):
                 journal_id = ids[0]
         return journal_id
 
-    def _default_balance_start(self, cr, uid, context=None):
-        cr.execute('select id from account_bank_statement where journal_id=%s order by date desc limit 1', (1,))
-        res = cr.fetchone()
-        if res:
-            return self.browse(cr, uid, res[0], context=context).balance_end
-        return 0.0
-
     def _end_balance(self, cursor, user, ids, name, attr, context=None):
         res_currency_obj = self.pool.get('res.currency')
         res_users_obj = self.pool.get('res.users')
@@ -158,7 +151,6 @@ class account_bank_statement(osv.osv):
         'name': "/",
         'date': lambda *a: time.strftime('%Y-%m-%d'),
         'state': 'draft',
-        'balance_start': _default_balance_start,
         'journal_id': _default_journal_id,
         'period_id': _get_period,
         'company_id': lambda self,cr,uid,c: self.pool.get('res.company')._company_default_get(cr, uid, 'account.bank.statement',context=c),

From 20ac4b4ee091113ebdb38040f5a470f4a1f10ac1 Mon Sep 17 00:00:00 2001
From: "Bharat (OpenERP)" <bde@tinyerp.com>
Date: Thu, 15 Sep 2011 18:06:32 +0530
Subject: [PATCH 2/2] [MERGE] merged with main addons

bzr revid: bde@tinyerp.com-20110915123632-fg6bzgxbx6t2eec5
---
 addons/sale_layout/report/report_sale_layout.rml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/addons/sale_layout/report/report_sale_layout.rml b/addons/sale_layout/report/report_sale_layout.rml
index 941df09aeb5..80196a7e68e 100644
--- a/addons/sale_layout/report/report_sale_layout.rml
+++ b/addons/sale_layout/report/report_sale_layout.rml
@@ -276,6 +276,7 @@
         <tr>
           <td>
             <para style="terp_default_8">
+              <!--font face="Helvetica" size="9.0">[[ a['layout_type']=='text' and removeParentNode('blockTable')]]</font-->
               <font face="Helvetica" size="9.0">[[ a['layout_type']=='text' and removeParentNode('blockTable')]]</font>
             </para>
           </td>
@@ -398,4 +399,4 @@
     </para>
   </pto>
   </story>
-</document>
\ No newline at end of file
+</document>