From 873aaacc5085b109ee0172c41aa18986cfec2088 Mon Sep 17 00:00:00 2001
From: "Divyesh Makwana (Open ERP)" <mdi@tinyerp.com>
Date: Mon, 2 Jan 2012 14:38:33 +0530
Subject: [PATCH] [FIX] account, account_bank_statement_extensions,
 point_of_sale : account_bank_statement_extension conflicts with point_of_sale

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

bzr revid: mdi@tinyerp.com-20120102090833-ytztgr3vsq2jkm4v
---
 addons/account/account_bank_statement.py                       | 1 +
 .../account_bank_statement.py                                  | 3 +--
 addons/point_of_sale/point_of_sale.py                          | 1 -
 addons/point_of_sale/point_of_sale_demo.xml                    | 2 +-
 4 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/addons/account/account_bank_statement.py b/addons/account/account_bank_statement.py
index bd31b01a41d..dcb99c0ceb8 100644
--- a/addons/account/account_bank_statement.py
+++ b/addons/account/account_bank_statement.py
@@ -468,6 +468,7 @@ class account_bank_statement_line(osv.osv):
             required=True),
         'statement_id': fields.many2one('account.bank.statement', 'Statement',
             select=True, required=True, ondelete='cascade'),
+        'journal_id': fields.related('statement_id', 'journal_id', type='many2one', relation='account.journal', string='Journal', store=True, readonly=True),
         'analytic_account_id': fields.many2one('account.analytic.account', 'Analytic Account'),
         'move_ids': fields.many2many('account.move',
             'account_bank_statement_line_move_rel', 'statement_line_id','move_id',
diff --git a/addons/account_bank_statement_extensions/account_bank_statement.py b/addons/account_bank_statement_extensions/account_bank_statement.py
index 3fef72f4aff..ba78c3f5e97 100644
--- a/addons/account_bank_statement_extensions/account_bank_statement.py
+++ b/addons/account_bank_statement_extensions/account_bank_statement.py
@@ -111,7 +111,6 @@ class account_bank_statement_line(osv.osv):
             help="Code to identify transactions belonging to the same globalisation level within a batch payment"),
         'globalisation_amount': fields.related('globalisation_id', 'amount', type='float',
             relation='account.bank.statement.line.global', string='Glob. Amount', readonly=True),
-        'journal_id': fields.related('statement_id', 'journal_id', type='many2one', relation='account.journal', string='Journal', store=True, readonly=True),
         'state': fields.selection([('draft', 'Draft'), ('confirm', 'Confirmed')],
             'State', required=True, readonly=True),    
         'counterparty_name': fields.char('Counterparty Name', size=35),
@@ -133,4 +132,4 @@ class account_bank_statement_line(osv.osv):
 
 account_bank_statement_line()
 
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/point_of_sale/point_of_sale.py b/addons/point_of_sale/point_of_sale.py
index 2848889ec70..a52686c648d 100644
--- a/addons/point_of_sale/point_of_sale.py
+++ b/addons/point_of_sale/point_of_sale.py
@@ -596,7 +596,6 @@ account_bank_statement()
 class account_bank_statement_line(osv.osv):
     _inherit = 'account.bank.statement.line'
     _columns= {
-        'journal_id': fields.related('statement_id','journal_id','name', store=True, string='Journal', type='char', size=64),
         'pos_statement_id': fields.many2one('pos.order', ondelete='cascade'),
     }
 account_bank_statement_line()
diff --git a/addons/point_of_sale/point_of_sale_demo.xml b/addons/point_of_sale/point_of_sale_demo.xml
index 418066ec148..0030f6cf8ae 100644
--- a/addons/point_of_sale/point_of_sale_demo.xml
+++ b/addons/point_of_sale/point_of_sale_demo.xml
@@ -108,7 +108,7 @@
             <field model="pos.order" name="pos_statement_id" search="[('name', '=', u'POS/019')]"/>
             <field name="company_id" ref="base.main_company"/>
             <field name="account_id" ref="account.a_recv"/>
-            <field name="journal_id">Cash Journal - (test)</field>
+            <field name="journal_id" ref="account.cash_journal"/>
             <field eval="[(6,0,[])]" name="move_ids"/>
             <field name="date" eval="time.strftime('%Y-%m-%d')"/>
             <field eval="450.0" name="amount"/>