[IMP] company configuration, report header and footer

bzr revid: fp@fp-laptop-20110815152825-n2njyvgmqoyuqwwi

openerp/addons/base/base_update.xml

@@ -224,17 +224,20 @@
                             <field name="city"/>
                             <field name="country_id"/>
                             <field name="state_id"/>
-                            <field name="phone"/>
-                            <field name="email"/>
+                            <field name="phone" on_change="on_change_header(phone, email, fax, website, vat)"/>
+                            <field name="email" on_change="on_change_header(phone, email, fax, website, vat)"/>
+                            <field name="fax" on_change="on_change_header(phone, email, fax, website, vat)"/>
+                            <field name="website" on_change="on_change_header(phone, email, fax, website, vat)"/>
+                            <field name="vat" on_change="on_change_header(phone, email, fax, website, vat)"/>
                             <separator string="Header/Footer of Reports" colspan="4"/>
-			    <group colspan="4" col="3">
-				<field name="rml_header1" colspan="3"/>
-				<newline/>
-				<field name="rml_footer1" colspan="3"/>
-				<newline/>
-				<field name="rml_footer2" colspan="2"/>
-                                <button name="%(bank_account_update)d" string="Bank Accounts" type="action" icon="gtk-go-forward"/>
-				<newline/>
+                            <group colspan="4" col="3">
+                                <field name="rml_header1" colspan="3"/>
+                                <newline/>
+                                <field name="rml_footer1" colspan="3"/>
+                                <newline/>
+                                <field name="rml_footer2" colspan="2"/>
+                                <button name="%(bank_account_update)d" string="Set Bank Accounts" type="action" icon="gtk-go-forward"/>
+                                <newline/>
                                 <label string="" colspan="2"/>
                                 <button name="%(preview_report)d" string="Preview Header" type="action" icon="gtk-print"/>
                             </group>

openerp/addons/base/res/res_company.py

@@ -114,13 +114,14 @@ class res_company(osv.osv):
                 address_obj.create(cr, uid, {name: value or False, 'partner_id': company.partner_id.id}, context=context)
         return True
 
+
     _columns = {
         'name': fields.char('Company Name', size=64, required=True),
         '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),
-        'rml_header1': fields.char('Report Header', size=200),
-        'rml_footer1': fields.char('Report Footer 1', size=200),
+        'rml_header1': fields.char('Report Header / Company Slogan', size=200),
+        'rml_footer1': fields.char('General Information Footer', size=200),
         'rml_footer2': fields.function(_get_bank_data, type="char", string='Bank Accounts Footer', size=250, help="This field is computed automatically based on bank accounts defined, having the display on footer checkbox set."),
         'rml_header': fields.text('RML Header', required=True),
         'rml_header2': fields.text('RML Internal Header', required=True),
@@ -139,7 +140,19 @@ class res_company(osv.osv):
         'country_id': fields.function(_get_address_data, fnct_inv=_set_address_data, type='many2one', relation='res.country', string="Country", multi='address'), 
         'email': fields.function(_get_address_data, fnct_inv=_set_address_data, size=64, type='char', string="Email", multi='address'), 
         'phone': fields.function(_get_address_data, fnct_inv=_set_address_data, size=64, type='char', string="Phone", multi='address'), 
+        'fax': fields.function(_get_address_data, fnct_inv=_set_address_data, size=64, type='char', string="Fax", multi='address'), 
+        '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), 
     }
+    def on_change_header(self, cr, uid, ids, phone, email, fax, website, vat, context={}):
+        val = []
+        if phone: val.append(_('Phone: ')+phone)
+        if email: val.append(_('Email: ')+email)
+        if fax: val.append(_('Fax: ')+fax)
+        if website: val.append(_('Website: ')+website)
+        if vat: val.append(_('VAT: ')+vat)
+        return {'value': {'rml_footer1':' | '.join(val)}}
+
 
     def _search(self, cr, uid, args, offset=0, limit=None, order=None,
             context=None, count=False, access_rights_uid=None):
@@ -235,7 +248,7 @@ class res_company(osv.osv):
 
     def _get_logo(self, cr, uid, ids):
         return open(os.path.join(
-            tools.config['root_path'], '..', 'pixmaps', 'openerp-header.png'),
+            tools.config['root_path'], '..', 'pixmaps', 'your_logo.png'),
                     'rb') .read().encode('base64')
 
     _header = """
@@ -306,7 +319,7 @@ class res_company(osv.osv):
         'rml_header':_get_header,
         'rml_header2': _header2,
         'rml_header3': _header3,
-        #'logo':_get_logo
+        'logo':_get_logo
     }
 
     _constraints = [