openerp-dev-web team mailing list archive

["uco \(OpenERP\)" <uco@xxxxxxxxxxx>]

uco (OpenERP) has proposed merging lp:~openerp-dev/openobject-addons/uco-dev-addons1 into lp:~openerp-dev/openobject-addons/trunk-dev-addons1.

Requested reviews:
  OpenERP R&D Team (openerp-dev)
Related bugs:
  #644325 In Lead shows HTML from email rather than plain text
  https://bugs.launchpad.net/bugs/644325
  #655034 Project : Progressbar of project should be updated based on task changes.
  https://bugs.launchpad.net/bugs/655034
  #657688 [trunk] fetchmail services need help text
  https://bugs.launchpad.net/bugs/657688
  #670904 CRM : Create opportunity wizard crashes
  https://bugs.launchpad.net/bugs/670904
  #670914 [6.0] Error when a task is delegated if task's name have an accent
  https://bugs.launchpad.net/bugs/670914
  #676857 [6.0RC1] documents - separation per company 
  https://bugs.launchpad.net/bugs/676857


[FIX] document: Directories arranged by company.
https://bugs.launchpad.net/openobject-addons/+bug/676857
------------------------------
-- 
https://code.launchpad.net/~openerp-dev/openobject-addons/uco-dev-addons1/+merge/41272
Your team OpenERP R&D Team is requested to review the proposed merge of lp:~openerp-dev/openobject-addons/uco-dev-addons1 into lp:~openerp-dev/openobject-addons/trunk-dev-addons1.

=== modified file 'document/document_view.xml'
--- document/document_view.xml	2010-10-28 05:01:35 +0000
+++ document/document_view.xml	2010-11-19 09:19:02 +0000
@@ -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>