[IMP] res_company : new boolean field added and place changed in first page of notebook
bzr revid: rpr@tinyerp.com-20120817131527-e4spfz6q9tlu3uab
This commit is contained in:
@@ -105,6 +105,7 @@ class res_company(osv.osv):
|
||||
|
||||
_columns = {
|
||||
'name': fields.related('partner_id', 'name', string='Company Name', size=128, required=True, store=True, type='char'),
|
||||
'customize_footer': fields.boolean('Customize Footer', help="Determines if it is true the onchanges on rml_footer text field do not trigger and become editable."),
|
||||
'parent_id': fields.many2one('res.company', 'Parent Company', select=True),
|
||||
'child_ids': fields.one2many('res.company', 'parent_id', 'Child Companies'),
|
||||
'partner_id': fields.many2one('res.partner', 'Partner', required=True),
|
||||
@@ -138,6 +139,9 @@ class res_company(osv.osv):
|
||||
]
|
||||
def on_change_header(self, cr, uid, ids, phone, email, fax, website, vat, reg=False, context=None):
|
||||
val = []
|
||||
res_id=self.browse(cr, uid, ids, context=context)[0]
|
||||
if res_id.customize_footer:
|
||||
return {}
|
||||
if phone: val.append(_('Phone: ')+phone)
|
||||
if fax: val.append(_('Fax: ')+fax)
|
||||
if website: val.append(_('Website: ')+website)
|
||||
|
||||
@@ -68,6 +68,8 @@
|
||||
</group>
|
||||
<group string="Bank Accounts">
|
||||
<field name="bank_ids" colspan="4" nolabel="1"/>
|
||||
<field name="customize_footer"/>
|
||||
<field name="paper_format" on_change="onchange_paper_format(paper_format)"/>
|
||||
<label for="rml_footer"/>
|
||||
<div name="bank_acc">
|
||||
<field name="rml_footer"/>
|
||||
@@ -76,9 +78,6 @@
|
||||
</group>
|
||||
</page>
|
||||
<page string="Header/Footer" groups="base.group_no_one">
|
||||
<group>
|
||||
<field name="paper_format" on_change="onchange_paper_format(paper_format)"/>
|
||||
</group>
|
||||
<label for="rml_header"/>
|
||||
<field name="rml_header"/>
|
||||
<label for="rml_header2"/>
|
||||
|
||||
Reference in New Issue
Block a user