[MERGE]

bzr revid: hmo@tinyerp.com-20101026055347-yxz72wusdbhty34e

diff --cc addons/account/account_cash_statement.py
index 454290c,13c6464..0776732
--- 1/addons/account/account_cash_statement.py
--- 2/addons/account/account_cash_statement.py
+++ b/addons/account/account_cash_statement.py
@@@ -241,10 -240,8 +240,10 @@@ class account_cash_statement(osv.osv)
       }
  
      def create(self, cr, uid, vals, context=None):
 +        if 'journal_id' not in vals:
 +            raise osv.except_osv('Error', _('You cannot create a bank or cash register without a journal!'))
          sql = [
-                 ('journal_id', '=', vals['journal_id']),
+                 ('journal_id', '=', vals.get('journal_id', False)),
                  ('state', '=', 'open')
          ]
          open_jrnl = self.search(cr, uid, sql)

diff --cc addons/sale/sale.py
Simple merge