Tejas Tank (OpenERP) has proposed merging
lp:~openerp-dev/openobject-server/trunk-usability-improve_res_company-tta into
lp:~openerp-dev/openobject-server/trunk-usability.
Requested reviews:
Raphael Collet (OpenERP) (rco-openerp)
Amit (Open ERP) (apa-tiny)
For more details, see:
https://code.launchpad.net/~openerp-dev/openobject-server/trunk-usability-improve_res_company-tta/+merge/70421
Hello,
regarding res.company,
renamed 'footer_website' to 'website',
rename 'tax_number' to 'vat', already in partner form so it removed from the
form view.
phone which already their and it was with functional field but I have make it
field.related.
Redundant lines are removed.
Thanks,
Tejas
--
https://code.launchpad.net/~openerp-dev/openobject-server/trunk-usability-improve_res_company-tta/+merge/70421
Your team OpenERP R&D Team is subscribed to branch
lp:~openerp-dev/openobject-server/trunk-usability.
=== modified file 'openerp/addons/base/base_data.xml'
--- openerp/addons/base/base_data.xml 2011-07-19 10:34:25 +0000
+++ openerp/addons/base/base_data.xml 2011-08-04 10:49:24 +0000
@@ -1006,6 +1006,8 @@
<!-- Address and Company ID will be set later -->
<field name="address" eval="[]"/>
<field name="company_id" eval="None"/>
+ <field name="vat">BE0477472701</field>
+ <field name="website">www.openerp.com</field>
</record>
<record id="main_address" model="res.partner.address">
<field name="partner_id" ref="main_partner"/>
@@ -1040,8 +1042,9 @@
<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">www.openerp.com</field>
+ <field name="phone">(+32).81.81.37.0</field>
+ <field name="vat">BE0477472701</field>
<field name="currency_id" ref="base.EUR"/>
</record>
=== modified file 'openerp/addons/base/base_update.xml'
--- openerp/addons/base/base_update.xml 2011-07-06 12:55:41 +0000
+++ openerp/addons/base/base_update.xml 2011-08-04 10:49:24 +0000
@@ -217,10 +217,9 @@
<field name="state_id"/>
<field name="phone"/>
<field name="email"/>
+ <field name="website" widget="url"/>
<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"/>
+ <field name="rml_header1" colspan="4"/>
<group colspan="4" col="8">
<label string="" colspan="7"/>
<button name="%(preview_report)d" string="Preview Report" type="action" icon="gtk-print"/>
=== 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-04 10:49:24 +0000
@@ -2,8 +2,9 @@
<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"/>
+ <footer_website type="field" name="website"/>
+ <footer_phone type="field" name="phone"/>
+ <tax_number type="field" name="vat"/>
<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-04 10:49:24 +0000
@@ -233,8 +233,7 @@
<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">Contact : [[ user.name ]]</text:p>
</table:table-cell>
</table:table-row>
=== 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-04 10:49:24 +0000
@@ -108,8 +108,8 @@
'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.related('partner_id', 'website', type='char',string='Website'),
+ 'vat': fields.related('partner_id', 'vat', type='char',string='VAT No.'),
'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),
@@ -125,7 +125,7 @@
'state_id': fields.function(_get_address_data, fnct_inv=_set_address_data, type='many2one', domain="[('country_id', '=', country_id)]", relation='res.country.state', string="State", multi='address'),
'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'),
+ 'phone': fields.related('partner_id', 'phone', type='char',string='phone'),
}
def _search(self, cr, uid, args, offset=0, limit=None, order=None,
@@ -282,8 +282,7 @@
<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="0.8cm">Contact : [[ user.name ]] - Page: <pageNumber/></drawCentredString>
</pageGraphics>
</pageTemplate>
_______________________________________________
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
