[IMP] Renamed paper_format to rml_paperformat and moved report's related configuration into a tab in the company form
bzr revid: openerp-sle@openerp-sle.home-20140212115350-2p9ky7ei2t9q99xs
This commit is contained in:
openerp-sle
parent
24b0b132d4
commit
5e535ee4f3
|
|
@ -147,7 +147,7 @@ class res_company(osv.osv):
|
|||
'website': fields.related('partner_id', 'website', string="Website", type="char", size=64),
|
||||
'vat': fields.related('partner_id', 'vat', string="Tax ID", type="char", size=32),
|
||||
'company_registry': fields.char('Company Registry', size=64),
|
||||
'paper_format': fields.selection([('a4', 'A4'), ('us_letter', 'US Letter')], "Paper Format", required=True),
|
||||
'rml_paper_format': fields.selection([('a4', 'A4'), ('us_letter', 'US Letter')], "Paper Format", required=True),
|
||||
}
|
||||
_sql_constraints = [
|
||||
('name_uniq', 'unique (name)', 'The company name must be unique !')
|
||||
|
|
@ -388,8 +388,8 @@ class res_company(osv.osv):
|
|||
_header_a4 = _header_main % ('21.7cm', '27.7cm', '27.7cm', '27.7cm', '27.8cm', '27.3cm', '25.3cm', '25.0cm', '25.0cm', '24.6cm', '24.6cm', '24.5cm', '24.5cm')
|
||||
_header_letter = _header_main % ('20cm', '26.0cm', '26.0cm', '26.0cm', '26.1cm', '25.6cm', '23.6cm', '23.3cm', '23.3cm', '22.9cm', '22.9cm', '22.8cm', '22.8cm')
|
||||
|
||||
def onchange_paper_format(self, cr, uid, ids, paper_format, context=None):
|
||||
if paper_format == 'us_letter':
|
||||
def onchange_rml_paper_format(self, cr, uid, ids, rml_paper_format, context=None):
|
||||
if rml_paper_format == 'us_letter':
|
||||
return {'value': {'rml_header': self._header_letter}}
|
||||
return {'value': {'rml_header': self._header_a4}}
|
||||
|
||||
|
|
@ -398,7 +398,7 @@ class res_company(osv.osv):
|
|||
|
||||
_defaults = {
|
||||
'currency_id': _get_euro,
|
||||
'paper_format': 'a4',
|
||||
'rml_paper_format': 'a4',
|
||||
'rml_header':_get_header,
|
||||
'rml_header2': _header2,
|
||||
'rml_header3': _header3,
|
||||
|
|
|
|||
|
|
@ -23,9 +23,6 @@
|
|||
<div>
|
||||
<field name="logo" widget="image" class="oe_avatar oe_left"/>
|
||||
</div>
|
||||
<div class="oe_right oe_button_box" name="button_box">
|
||||
<button name="%(preview_report)d" string="Preview Header/Footer" type="action"/>
|
||||
</div>
|
||||
<div class="oe_title">
|
||||
<label for="name" class="oe_edit_only"/>
|
||||
<h1>
|
||||
|
|
@ -75,12 +72,23 @@
|
|||
<field name="bank_ids" nolabel="1" context="{'default_company_id': active_id, 'footer_hide': False}"
|
||||
on_change="onchange_footer(custom_footer, phone, fax, email, website, vat, company_registry, bank_ids)"/>
|
||||
</group>
|
||||
<group string="Report Footer Configuration">
|
||||
<field name="paper_format" on_change="onchange_paper_format(paper_format)"/>
|
||||
</page>
|
||||
<page string="Configuration">
|
||||
<group>
|
||||
<group name="account_grp" string="Accounting">
|
||||
<field name="currency_id"/>
|
||||
</group>
|
||||
</group>
|
||||
</page>
|
||||
<page string="Reports Configuration">
|
||||
<group string="Footer Configuration">
|
||||
<field name="custom_footer" on_change="onchange_footer(custom_footer, phone, fax, email, website, vat, company_registry, bank_ids)"/>
|
||||
<field name="rml_footer" attrs="{'invisible': [('custom_footer','=',False)]}"/>
|
||||
<field name="rml_footer_readonly" attrs="{'invisible': [('custom_footer','=',True)]}"/>
|
||||
</group>
|
||||
<group string="RML Configuration">
|
||||
<field name="rml_paper_format" on_change="onchange_rml_paper_format(rml_paper_format)"/>
|
||||
</group>
|
||||
<group>
|
||||
<label for="font" />
|
||||
<div>
|
||||
|
|
@ -90,21 +98,15 @@
|
|||
</div>
|
||||
</div>
|
||||
</group>
|
||||
</page>
|
||||
<page string="Header/Footer" groups="base.group_no_one">
|
||||
<label for="rml_header"/>
|
||||
<field name="rml_header"/>
|
||||
<label for="rml_header2"/>
|
||||
<field name="rml_header2"/>
|
||||
<label for="rml_header3"/>
|
||||
<field name="rml_header3"/>
|
||||
</page>
|
||||
<page string="Configuration">
|
||||
<group>
|
||||
<group name="account_grp" string="Accounting">
|
||||
<field name="currency_id"/>
|
||||
</group>
|
||||
</group>
|
||||
<div class="oe_right oe_button_box" name="button_box" groups="base.group_no_one" >
|
||||
<button name="%(preview_report)d" string="Preview Header/Footer" type="action"/>
|
||||
</div>
|
||||
<label for="rml_header" groups="base.group_no_one" />
|
||||
<field name="rml_header" groups="base.group_no_one" />
|
||||
<label for="rml_header2" groups="base.group_no_one" />
|
||||
<field name="rml_header2" groups="base.group_no_one" />
|
||||
<label for="rml_header3" groups="base.group_no_one" />
|
||||
<field name="rml_header3" groups="base.group_no_one" />
|
||||
</page>
|
||||
</notebook>
|
||||
</sheet>
|
||||
|
|
|
|||
|
|
@ -982,7 +982,7 @@ class _rml_template(object):
|
|||
}
|
||||
pageSize = A4
|
||||
if self.localcontext.get('company'):
|
||||
pageSize = pagesize_map.get(self.localcontext.get('company').paper_format, A4)
|
||||
pageSize = pagesize_map.get(self.localcontext.get('company').rml_paper_format, A4)
|
||||
if node.get('pageSize'):
|
||||
ps = map(lambda x:x.strip(), node.get('pageSize').replace(')', '').replace('(', '').split(','))
|
||||
pageSize = ( utils.unit_get(ps[0]),utils.unit_get(ps[1]) )
|
||||
|
|
|
|||
Loading…
Reference in New Issue