~openerp-commiter/openobject-server/trunk-company-currency-currency-field-pna

« back to all changes in this revision

Viewing changes to openerp/addons/base/res/res_company.py

  • Committer: pso (OpenERP)
  • Date: 2012-07-24 09:57:25 UTC
  • mfrom: (4246.3.18 trunk)
  • Revision ID: pso@tinyerp.com-20120724095725-3haoypbo7s6c8e2b
[MERGE] Merged with main branch

Show diffs side-by-side

added added

removed removed

Lines of Context:
108
108
        'parent_id': fields.many2one('res.company', 'Parent Company', select=True),
109
109
        'child_ids': fields.one2many('res.company', 'parent_id', 'Child Companies'),
110
110
        'partner_id': fields.many2one('res.partner', 'Partner', required=True),
111
 
        'rml_header1': fields.char('Report Header / Company Slogan', size=200, help="Appears by default on the top right corner of your printed documents."),
 
111
        'rml_header1': fields.char('Company Slogan', size=200, help="Appears by default on the top right corner of your printed documents (report header)."),
112
112
        'rml_footer1': fields.char('General Information Footer', size=200),
113
113
        'rml_footer2': fields.char('Bank Accounts Footer', size=250, help="Write here your bank accounts for customer payments."),
114
114
        'rml_header': fields.text('RML Header', required=True),
115
115
        'rml_header2': fields.text('RML Internal Header', required=True),
116
 
        'rml_header3': fields.text('RML Internal Header', required=True),
 
116
        'rml_header3': fields.text('RML Internal Header for Landscape Reports', required=True),
117
117
        'logo': fields.related('partner_id', 'photo', string="Logo", type="binary"),
118
118
        'currency_id': fields.many2one('res.currency', 'Currency', required=True),
119
119
        'currency_ids': fields.one2many('res.currency', 'company_id', 'Currency'),