From 826ed07e3da711303e02b49bd489df55b8d90444 Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Tue, 20 Jan 2009 17:10:32 +0100
Subject: [PATCH] bugfix

bzr revid: fp@tinyerp.com-20090120161032-bmdu8lm249g680xg
---
 addons/account/account_report.xml | 2 +-
 addons/account/account_view.xml   | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/addons/account/account_report.xml b/addons/account/account_report.xml
index 98929af59a8..3fe2e12a138 100644
--- a/addons/account/account_report.xml
+++ b/addons/account/account_report.xml
@@ -16,7 +16,7 @@
             name="account.invoice"
             rml="account/report/invoice.rml"
             string="Invoices"
-            attachment="(object.state in ('open','paid')) and (time.strftime('%Y-%m-%d')+'-'+object.number)"
+            attachment="(object.state in ('open','paid')) and ('INV'+(object.number or '').replace('/',''))"
             attachment_use="1"/>
         <report id="account_transfers" model="account.transfer" name="account.transfer" string="Transfers" xml="account/report/transfer.xml" xsl="account/report/transfer.xsl"/>
         <report auto="False" id="account_intracom" menu="False" model="account.move.line" name="account.intracom" string="IntraCom"/>
diff --git a/addons/account/account_view.xml b/addons/account/account_view.xml
index ae2603ce9d9..9b17dd05783 100644
--- a/addons/account/account_view.xml
+++ b/addons/account/account_view.xml
@@ -599,9 +599,9 @@
                             <field groups="base.group_extended" name="include_base_amount"/>
                             <field groups="base.group_extended" name="domain"/>
                             <newline/>
-                            <field name="account_collected_id"/>
+                            <field name="account_collected_id" domain="[('type','&lt;&gt;','view'),('type','&lt;&gt;','consolidation')]"/>
                             <label colspan="2" nolabel="1" string="Keep empty to use the income account"/>
-                            <field name="account_paid_id"/>
+                            <field name="account_paid_id" domain="[('type','&lt;&gt;','view'),('type','&lt;&gt;','consolidation')]"/>
                             <label colspan="2" nolabel="1" string="Keep empty to use the expense account"/>
                             <field groups="base.group_extended" name="child_depend"/>
                             <field groups="base.group_extended" name="sequence"/>