[MERGE] OPW 577037: account_voucher: 'import entries' wizard should allow selecting...

bzr revid: xal@openerp.com-20121130161732-d37t8h7u4gqak4tx

diff --cc addons/account_voucher/wizard/account_statement_from_invoice_view.xml
index 3213bae,a123600..c8582a1
--- 1/addons/account_voucher/wizard/account_statement_from_invoice_view.xml
--- 2/addons/account_voucher/wizard/account_statement_from_invoice_view.xml
+++ b/addons/account_voucher/wizard/account_statement_from_invoice_view.xml
@@@ -38,7 -38,7 +38,7 @@@
                  <form string="Import Entries">
                      <group colspan="4" expand="1">
                          <separator string="Payable and Receivables" colspan="4"/>
-                         <field height="300" width="700" name="line_ids" colspan="4" nolabel="1" domain="[('account_id.type','in',['receivable','payable']),('reconcile_id','=',False), ('journal_id.type','in',['sale','purchase']), ('state', '=', 'valid')]"/>
 -                        <field height="300" width="700" name="line_ids" colspan="4" nolabel="1" domain="[('account_id.type','in',['receivable','payable']),('reconcile_id','=',False),('state', '=', 'valid')]"/>
++                        <field height="300" width="700" name="line_ids" colspan="4" nolabel="1" domain="[('account_id.type','in',['receivable','payable']),('reconcile_id','=',False), ('journal_id.type','not in',['bank','cash']), ('state', '=', 'valid')]"/>
                      </group>
                      <group colspan="4" col="6">
                          <label string ="" colspan="2"/>