Mayur Maheshwari(OpenERP) has proposed merging
lp:~openerp-dev/openobject-server/trunk-configrework2-improve-company-view-mma
into lp:~openerp-dev/openobject-server/trunk-configrework3.
Requested reviews:
Rucha (Open ERP) (rpa-openerp)
For more details, see:
https://code.launchpad.net/~openerp-dev/openobject-server/trunk-configrework2-improve-company-view-mma/+merge/70862
Hello,
set a default logo, company view & report Improvement is done
Thanks
--
https://code.launchpad.net/~openerp-dev/openobject-server/trunk-configrework2-improve-company-view-mma/+merge/70862
Your team OpenERP R&D Team is subscribed to branch
lp:~openerp-dev/openobject-server/trunk-configrework3.
=== modified file 'openerp/addons/base/base_data.xml'
--- openerp/addons/base/base_data.xml 2011-08-04 06:59:21 +0000
+++ openerp/addons/base/base_data.xml 2011-08-09 12:08:27 +0000
@@ -1041,8 +1041,11 @@
<field name="name">OpenERP S.A.</field>
<field name="partner_id" ref="main_partner"/>
<field name="rml_header1">Free Business Solutions</field>
- <field name="rml_footer1">Web: http://www.openerp.com - Tel: (+32).81.81.37.00 - Bank: CPH 126-2013269-07</field>
- <field name="rml_footer2">IBAN: BE74 1262 0132 6907 - SWIFT: CPHBBE75 - VAT: BE0477.472.701</field>
+ <field name="website">http://www.openerp.com</field>
+ <field name="bank">CPH 126-2013269-07</field>
+ <field name="account_number1">IBAN: BE74 1262 0132 6907</field>
+ <field name="account_number2">SWIFT: CPHBBE75</field>
+ <field name="vat">BE0477.472.701</field>
<field name="currency_id" ref="base.EUR"/>
</record>
=== modified file 'openerp/addons/base/base_update.xml'
--- openerp/addons/base/base_update.xml 2011-08-09 10:57:24 +0000
+++ openerp/addons/base/base_update.xml 2011-08-09 12:08:27 +0000
@@ -198,7 +198,7 @@
<group colspan="4" col="6">
<group colspan="4" col="4">
<field name="name"/>
- <field name="partner_id" readonly="1" required="0"/>
+ <field name="partner_id" readonly="1" required="0" invisible="1"/>
<field name="parent_id" groups="base.group_multi_company"/>
</group>
<group colspan="2" col="2">
@@ -208,21 +208,31 @@
<notebook colspan="4">
<page string="General Information">
<separator string="Address Information" colspan="4"/>
- <field name="street"/>
- <field name="street2"/>
- <field name="zip"/>
- <field name="city"/>
- <field name="country_id"/>
- <field name="state_id"/>
- <field name="phone"/>
- <field name="email"/>
- <separator string="Header/Footer of Reports" colspan="4"/>
- <field name="rml_header1" colspan="4"/>
- <field name="rml_footer1" colspan="4"/>
- <field name="rml_footer2" colspan="4"/>
- <group colspan="4" col="8">
- <label string="" colspan="7"/>
- <button name="%(preview_report)d" string="Preview Report" type="action" icon="gtk-print"/>
+ <group col="2" colspan="2" >
+ <field name="street"/>
+ <field name="zip"/>
+ <field name="country_id"/>
+ <field name="phone"/>
+ </group>
+ <group col="2" colspan="2" >
+ <field name="street2"/>
+ <field name="city"/>
+ <field name="state_id"/>
+ <field name="email"/>
+ </group>
+ <group col="2" colspan="2" >
+ <separator string="Header of Reports" colspan="2"/>
+ <field name="rml_header1" />
+ <label string="" />
+ <button name="%(preview_report)d" string="Report Preview" type="action" icon="gtk-print"/>
+ </group>
+ <group col="2" colspan="2" >
+ <separator string="Footer of Reports" colspan="2"/>
+ <field name="website" widget="url"/>
+ <field name="bank" />
+ <field name="account_number1" />
+ <field name="account_number2" />
+ <field name="vat" />
</group>
</page>
<page string="Header/Footer" groups="base.group_extended">
@@ -235,9 +245,12 @@
<field colspan="2" name="rml_header3" nolabel="1"/>
</page>
<page string="Configuration">
- <separator string="Accounting" colspan="4"/>
+ <group colspan="2" col="2" name="accounting">
+ <separator string="Accounting" colspan="2"/>
<field name="currency_id" colspan="2"/>
- <newline/>
+ </group>
+ <group colspan="2" col="2" name="mrp">
+ </group>
</page>
</notebook>
</form>
=== modified file 'openerp/addons/base/report/corporate_defaults.xml'
--- openerp/addons/base/report/corporate_defaults.xml 2009-01-29 22:22:23 +0000
+++ openerp/addons/base/report/corporate_defaults.xml 2011-08-09 12:08:27 +0000
@@ -2,8 +2,12 @@
<corporate-header>
<corporation type="zoom" name="company_id">
<rml_header1 type="field" name="rml_header1"/>
- <rml_footer1 type="field" name="rml_footer1"/>
- <rml_footer2 type="field" name="rml_footer2"/>
+ <website type="field" name="website"/>
+ <phone type="field" name="phone"/>
+ <vat type="field" name="vat"/>
+ <bank type="field" name="bank"/>
+ <acount1 type="field" name="account_number1"/>
+ <acount2 type="field" name="account_number2"/>
<title type="field" name="partner_id.title"/>
<name type="field" name="partner_id.name"/>
<address type="zoom" name="partner_id.address">
=== modified file 'openerp/addons/base/report/corporate_sxw_header.xml'
--- openerp/addons/base/report/corporate_sxw_header.xml 2009-01-29 22:22:23 +0000
+++ openerp/addons/base/report/corporate_sxw_header.xml 2011-08-09 12:08:27 +0000
@@ -233,8 +233,8 @@
<table:table-column table:style-name="Table1.A"/>
<table:table-row>
<table:table-cell table:style-name="Table1.A1" table:value-type="string">
- <text:p text:style-name="P7">[[ company.rml_footer1 ]]</text:p>
- <text:p text:style-name="P7">[[ company.rml_footer2 ]]</text:p>
+ <text:p text:style-name="P7">Web: [[ company.website ]] - Tel: [[ company.phone ]] - VAT: [[ company.vat ]]</text:p>
+ <text:p text:style-name="P7">Bank: [[ company.bank ]] - Account Number: [[ company.account_number1 ]] , [[ company.account_number2 ]]</text:p>
<text:p text:style-name="P7">Contact : [[ user.name ]]</text:p>
</table:table-cell>
</table:table-row>
=== added file 'openerp/addons/base/res/config_pixmaps/logo.png'
Binary files openerp/addons/base/res/config_pixmaps/logo.png 1970-01-01 00:00:00 +0000 and openerp/addons/base/res/config_pixmaps/logo.png 2011-08-09 12:08:27 +0000 differ
=== modified file 'openerp/addons/base/res/res_company.py'
--- openerp/addons/base/res/res_company.py 2011-07-06 15:40:01 +0000
+++ openerp/addons/base/res/res_company.py 2011-08-09 12:08:27 +0000
@@ -23,6 +23,7 @@
from osv import fields
import os
import tools
+import base64
from tools.translate import _
from tools.safe_eval import safe_eval as eval
@@ -108,8 +109,11 @@
'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_footer2': fields.char('Report Footer 2', size=200),
+ 'website': fields.char('Website', size=200),
+ 'bank': fields.char('Bank', size=200),
+ 'account_number1': fields.char('Account Number', size=200),
+ 'account_number2': fields.char('Account Number', size=200),
+ 'vat': fields.char('VAT', size=200),
'rml_header': fields.text('RML Header', required=True),
'rml_header2': fields.text('RML Internal Header', required=True),
'rml_header3': fields.text('RML Internal Header', required=True),
@@ -221,9 +225,8 @@
return False
def _get_logo(self, cr, uid, ids):
- return open(os.path.join(
- tools.config['root_path'], '..', 'pixmaps', 'openerp-header.png'),
- 'rb') .read().encode('base64')
+ current_dir = os.path.dirname(os.path.abspath(__file__))
+ return base64.encodestring(open(os.path.join(current_dir, 'config_pixmaps', 'logo.png'), 'rb').read())
_header = """
<header>
@@ -282,8 +285,8 @@
<lines>1.2cm 2.15cm 19.9cm 2.15cm</lines>
- <drawCentredString x="10.5cm" y="1.7cm">[[ company.rml_footer1 ]]</drawCentredString>
- <drawCentredString x="10.5cm" y="1.25cm">[[ company.rml_footer2 ]]</drawCentredString>
+ <drawCentredString x="10.5cm" y="1.7cm">Web: [[ company.website ]] - Tel: [[ company.phone ]] - VAT: [[ company.vat ]]</drawCentredString>
+ <drawCentredString x="10.5cm" y="1.3cm">Bank: [[ company.bank ]] - Account Number: [[ company.account_number1 ]] , [[ company.account_number2 ]]</drawCentredString>
<drawCentredString x="10.5cm" y="0.8cm">Contact : [[ user.name ]] - Page: <pageNumber/></drawCentredString>
</pageGraphics>
</pageTemplate>
@@ -293,7 +296,7 @@
'rml_header':_get_header,
'rml_header2': _header2,
'rml_header3': _header3,
- #'logo':_get_logo
+ 'logo':_get_logo
}
_constraints = [
_______________________________________________
Mailing list: https://launchpad.net/~openerp-dev-gtk
Post to : [email protected]
Unsubscribe : https://launchpad.net/~openerp-dev-gtk
More help : https://help.launchpad.net/ListHelp
