pengyuthon/odoo_source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[IMP] base: add company_id in ir.attachment and improve search view

Browse Source 
bzr revid: hmo@tinyerp.com-20101014103707-rz7114umi29g4w9s
This commit is contained in:
Harry (OpenERP)
2010-10-14 16:07:07 +05:30
parent bee7aabb04
commit 4a72d3a745
2 changed files with 29 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
bin/addons/base/ir/ir.xml
+26 -10
View File
@@ -854,8 +854,11 @@
<field name="type">form</field>
<field name="arch" type="xml">
<form string="Attachments">
<field name="name" />
<field name="type"/>
<group colspan="4" col="6">
<field name="name" />
<field name="type"/>
<field name="company_id" groups="base.group_multi_company" widget="selection"/>
</group>
<notebook colspan="4">
<page string="Attachment">
<group col="4" colspan="4">
@@ -896,6 +899,8 @@
<tree string="Attachments">
<field name="name"/>
<field name="datas_fname"/>
<field name="type" invisible="1"/>
<field name="company_id" groups="base.group_multi_company"/>
<field name="create_uid"/>
<field name="create_date"/>
</tree>
@@ -908,20 +913,31 @@
<field name="arch" type="xml">
<search string="Attachments">
<group colspan="4" col="10">
<filter icon="terp-stage"
string="URL"
domain="[('type','=','url')]"/>
<filter icon="terp-stock_align_left_24"
string="Binary"
domain="[('type','=','binary')]"/>
<separator orientation="vertical"/>
<filter icon="terp-stage"
string="URL"
domain="[('type','=','url')]"/>
<filter icon="terp-stock_align_left_24"
string="Binary"
domain="[('type','=','binary')]"/>
<separator orientation="vertical"/>
<filter icon="terp-go-month" string="Month"
domain="[('create_date','&lt;=', time.strftime('%%Y-%%m-%%d')),('create_date','&gt;=',time.strftime('%%Y-%%m-01'))]"/>
<separator orientation="vertical"/>
<field name="name"/>
<field name="type"/>
<field name="datas_fname"/>
<field name="create_uid">
<filter icon="terp-personal"
domain="[('create_uid','=',uid)]"
help="Filter on my documents" />
</field>
</group>
<newline/>
<group expand="0" string="Group By...">
<filter string="Creator" icon="terp-personal" domain="[]" context="{'group_by':'create_uid'}"/>
<filter string="Owner" icon="terp-personal" domain="[]" context="{'group_by':'create_uid'}"/>
<filter string="Type" icon="terp-stock_symbol-selection" domain="[]" context="{'group_by':'type'}" groups="base.group_extended"/>
<filter string="Company" icon="terp-personal" domain="[]" context="{'group_by':'company_id'}" groups="base.group_multi_company"/>
<separator orientation="vertical"/>
<filter string="Month" help="Creation Month" icon="terp-go-month" domain="[]" context="{'group_by':'create_date'}"/>
</group>
</search>
bin/addons/base/ir/ir_attachment.py
+3 -1
View File
@@ -117,11 +117,13 @@ class ir_attachment(osv.osv):
'Type', help="Binary File or external URL", required=True),
'create_date': fields.datetime('Date Created', readonly=True),
'create_uid': fields.many2one('res.users', 'Creator', readonly=True),
'create_uid': fields.many2one('res.users', 'Owner', readonly=True),
'company_id': fields.many2one('res.company', 'Company'),
}
_defaults = {
'type': 'binary',
'company_id': lambda s,cr,uid,c: s.pool.get('res.company')._company_default_get(cr, uid, 'ir.attachment', context=c),
}
def _auto_init(self, cr, context=None):