[MERGE] merged trunk-dev-addons1 branch to fix buildbot failure

bzr revid: hmo@tinyerp.com-20100929071934-ogixp77y7m10xpye

addons/point_of_sale/account_bank_statement.py

@@ -20,12 +20,8 @@
 #
 ##############################################################################
 
-import time
 from osv import osv
 from osv import fields
-from mx import DateTime
-from decimal import Decimal
-from tools.translate import _
 
 class account_journal(osv.osv):
 
@@ -46,8 +42,8 @@ class account_cash_statement(osv.osv):
     
     _inherit = 'account.bank.statement'
 
-    def _equal_balance(self, cr, uid, ids, statement, context={}):
-
+    def _equal_balance(self, cr, uid, cash_id, context={}):
+        statement = self.browse(cr, uid, cash_id, context=context)
         if not statement.journal_id.check_dtls:
             return True
         

addons/point_of_sale/pos_demo.xml

@@ -61,14 +61,5 @@
             <field name="notice">Discount Applied</field>
         </record>
 		
-		<record id="account_bank_statement_st0" model="account.bank.statement">
-			<field name="name">St. 05/19</field>
-            <field name="balance_end_real">0.0</field>
-            <field name="date">2010-05-19</field>
-            <field name="journal_id" ref="account.bank_journal"/>
-            <field name="period_id" ref="account.period_5"/>
-            <field name="state">draft</field>
-        </record>
-		
     </data>
 </openerp>

addons/point_of_sale/test/pos_report.yml

@@ -67,6 +67,16 @@
     (data, format) = netsvc.LocalService('report.pos.details').create(cr, uid, [], {'model':'ir.ui.menu', 'form':{'date_start': time.strftime('%Y-%m-%d'), 'date_end': time.strftime('%Y-%m-%d') }}, {})
     if tools.config['test_report_directory']:
         file(os.path.join(tools.config['test_report_directory'], 'point_of_sale- pos details report'+format), 'wb+').write(data)
+-
+  I create a record for Bank Statement.
+-
+  !record {model: account.bank.statement, id: account_bank_statement_st0}:
+    name: St.05/19
+    balance_end_real: 0.0
+    date: '2010-05-19'
+    journal_id: account.bank_journal
+    period_id: account.period_5
+    state: 'draft'
 -
   In order to test the PDF reports defined on a Point Of Sale, we will print a Account Statement Report
 -