From 0ddc5b4d6f784f41d12d5626b827078806409c30 Mon Sep 17 00:00:00 2001
From: "uco (OpenERP)" <uco@tinyerp.com>
Date: Thu, 18 Nov 2010 17:35:53 +0530
Subject: [FIX] document: Directories arranged by company.

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

bzr revid: uco@tinyerp.com-20101118120553-z3f97scb8q54lgxo
---
 addons/document/document_view.xml | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

(limited to 'addons/document/document_view.xml')

diff --git a/addons/document/document_view.xml b/addons/document/document_view.xml
index 544ad1694be..c1c1f738c16 100644
--- a/addons/document/document_view.xml
+++ b/addons/document/document_view.xml
@@ -148,6 +148,7 @@
                 <field name="name"/>
                 <field name="type"/>
                 <field name="user_id"/>
+                <field name="company_id" groups="base.group_multi_company"/>
                 <field name="storage_id"/>
                 <field name="create_date"/>
                 <field name="write_date"/>
@@ -166,12 +167,16 @@
                     <separator orientation="vertical"/>
                     <field name="name" />
                     <field name="user_id" />
+                    <field name="company_id" groups="base.group_multi_company"/>
                     <field name="storage_id" />
                     <newline/>
                     <group expand="0" string="Group By..." groups="base.group_extended">
-                        <filter string="Type" icon="terp-stock_symbol-selection" domain="[]" context="{'group_by':'type'}"/>
                         <filter string="Owner" icon="terp-personal" domain="[]" context="{'group_by':'user_id'}"/>
-                        <filter string="Storage" domain="[]" context="{'group_by':'storage_id'}"/>
+                        <separator orientation="vertical"/>
+                        <filter string="Type" icon="terp-stock_symbol-selection" domain="[]" context="{'group_by':'type'}"/>
+                        <filter string="Storage" domain="[]" icon="terp-accessories-archiver" context="{'group_by':'storage_id'}"/>
+                        <separator orientation="vertical" groups="base.group_multi_company"/>
+                        <filter string="Company" domain="[]" icon="terp-go-home" context="{'group_by':'company_id'}" groups="base.group_multi_company"/>
                     </group>
                </search>
             </field>
-- 
cgit v1.2.3


From 9a3416b95f52a6ba38c0da16cdff2baae2baf6f1 Mon Sep 17 00:00:00 2001
From: "atp (Open ERP)" <atp@tinyerp.co.in>
Date: Mon, 22 Nov 2010 16:13:16 +0530
Subject: [FIX]: Fix some problem in caldav and Minor Improvement.

bzr revid: atp@tinyerp.co.in-20101122104316-2veko2vubv3w9oml
---
 addons/document/document_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'addons/document/document_view.xml')

diff --git a/addons/document/document_view.xml b/addons/document/document_view.xml
index 544ad1694be..1c8a97edd8f 100644
--- a/addons/document/document_view.xml
+++ b/addons/document/document_view.xml
@@ -106,7 +106,7 @@
                             <field name="extension"/>
                             <field name="include_name"/>
                             <separator string="PDF Report" colspan="4"/>
-                            <field name="report_id" domain="[('model_id','=',parent.ressource_type_id)]"/>
+                            <field name="report_id" domain="[ ('type','=','ressource'),('model_id','=',parent.ressource_type_id)]"/>
                         </form>
                         <tree string="Contents">
                             <field name="sequence" string="Seq."/>
-- 
cgit v1.2.3