[MERGE] lp:909124. Conflict between account_bank_statement_extension and point_of_sale

bzr revid: qdp-launchpad@openerp.com-20120223104219-whw2z497ghxydks0

addons/account/account_bank_statement.py

@@ -472,6 +472,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',

addons/account_bank_statement_extensions/account_bank_statement.py

@@ -112,7 +112,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),
@@ -134,4 +133,4 @@ class account_bank_statement_line(osv.osv):
 
 account_bank_statement_line()
 
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

addons/point_of_sale/point_of_sale.py

@@ -622,7 +622,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()

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"/>