odoo
/
odoo
2
0
Fork 0
Code Pull Requests Releases Activity

[FIX] account: invoices - missing field in tree view 

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

bzr revid: ara@tinyerp.com-20110429050118-34p90naeqjj4d9cf
This commit is contained in:
ARA (OpenERP) 2011-04-29 10:31:18 +05:30
parent eb389dcdff
commit 2a0be4932f
2 changed files with 23 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
addons/account/account_invoice_view.xml
View File

@ -123,7 +123,7 @@
<field name="date_invoice"/> <field name="date_invoice"/>
<field name="number"/> <field name="number"/>
<field name="partner_id" groups="base.group_user"/> <field name="partner_id" groups="base.group_user"/>
<field name="reference" groups="base.group_user"/> <field name="reference"/>
<field name="name"/> <field name="name"/>
<field name="journal_id" invisible="1"/> <field name="journal_id" invisible="1"/>
<field name="period_id" invisible="1" groups="account.group_account_user"/> <field name="period_id" invisible="1" groups="account.group_account_user"/>
@ -378,6 +378,10 @@
<field name="period_id" select='1' string="Period"/> <field name="period_id" select='1' string="Period"/>
</group> </group>
<newline/> <newline/>
<group expand="0" string="Extended Filters..." name = "extended filter" >
<field name="reference" select="1" string="Invoice Reference"/>
</group>
<newline/>
<group expand="0" string="Group By..."> <group expand="0" string="Group By...">
<filter string="Partner" icon="terp-partner" domain="[]" context="{'group_by':'partner_id'}"/> <filter string="Partner" icon="terp-partner" domain="[]" context="{'group_by':'partner_id'}"/>
<filter string="Responsible" icon="terp-personal" domain="[]" context="{'group_by':'user_id'}"/> <filter string="Responsible" icon="terp-personal" domain="[]" context="{'group_by':'user_id'}"/>

30
addons/account/invoice.py
View File

@ -312,15 +312,21 @@ class account_invoice(osv.osv):
journal_select = journal_obj._name_search(cr, uid, '', [('type', '=', type)], context=context, limit=None, name_get_uid=1) journal_select = journal_obj._name_search(cr, uid, '', [('type', '=', type)], context=context, limit=None, name_get_uid=1)
res['fields'][field]['selection'] = journal_select res['fields'][field]['selection'] = journal_select
doc = etree.XML(res['arch'])
if view_type == 'search':
if context.get('type', 'in_invoice') in ('out_invoice', 'out_refund'):
for node in doc.xpath("//group[@name='extended filter']"):
doc.remove(node)
if view_type == 'tree': if view_type == 'tree':
doc = etree.XML(res['arch']) partner_string = _('Supplier')
nodes = doc.xpath("//field[@name='partner_id']") if context.get('type', 'in_invoice') in ('out_invoice', 'out_refund'):
partner_string = _('Customer') partner_string = _('Customer')
if context.get('type', 'out_invoice') in ('in_invoice', 'in_refund'): for node in doc.xpath("//field[@name='reference']"):
partner_string = _('Supplier') doc.remove(node)
for node in nodes: for node in doc.xpath("//field[@name='partner_id']"):
node.set('string', partner_string) node.set('string', partner_string)
res['arch'] = etree.tostring(doc) res['arch'] = etree.tostring(doc)
return res return res
def get_log_context(self, cr, uid, context=None): def get_log_context(self, cr, uid, context=None):
@ -1609,17 +1615,17 @@ class res_partner(osv.osv):
_columns = { _columns = {
'invoice_ids': fields.one2many('account.invoice.line', 'partner_id', 'Invoices', readonly=True), 'invoice_ids': fields.one2many('account.invoice.line', 'partner_id', 'Invoices', readonly=True),
} }
def copy(self, cr, uid, id, default=None, context=None): def copy(self, cr, uid, id, default=None, context=None):
if default is None: if default is None:
default = {} default = {}
if context is None: if context is None:
context = {} context = {}
default.update({'invoice_ids' : []}) default.update({'invoice_ids' : []})
return super(res_partner, self).copy(cr, uid, id, default, context) return super(res_partner, self).copy(cr, uid, id, default, context)
res_partner() res_partner()
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: