Rajesh Prajapati (OpenERP) has proposed merging
lp:~openerp-dev/openobject-server/trunk-res_rml_footer-rpr into
lp:openobject-server.
Requested reviews:
OpenERP Core Team (openerp)
For more details, see:
https://code.launchpad.net/~openerp-dev/openobject-server/trunk-res_rml_footer-rpr/+merge/120087
Hello
Replaced two fields rml_footer1 and rml_footer2(char) into
rml_footer(text).
Thanks
Rajesh
--
https://code.launchpad.net/~openerp-dev/openobject-server/trunk-res_rml_footer-rpr/+merge/120087
Your team OpenERP R&D Team is subscribed to branch
lp:~openerp-dev/openobject-server/trunk-res_rml_footer-rpr.
=== modified file 'openerp/addons/base/base_data.xml'
--- openerp/addons/base/base_data.xml 2012-08-14 15:21:28 +0000
+++ openerp/addons/base/base_data.xml 2012-08-17 09:28:20 +0000
@@ -1089,8 +1089,7 @@
<field name="name">Your Company</field>
<field name="partner_id" ref="main_partner"/>
<field name="rml_header1">Your Company Slogan</field>
- <field name="rml_footer1">Web: http://www.yourcompany.com - Tel: +33 1 49 51 23 94</field>
- <field name="rml_footer2">Bank Accounts... to be configured in menu Settings > Accounting/Invoicing.</field>
+ <field name="rml_footer">Web: http://www.yourcompany.com - Tel: +33 1 49 51 23 94 - Bank Accounts... to be configured in menu Settings > Accounting/Invoicing.</field>
<field name="currency_id" ref="base.EUR"/>
</record>
=== modified file 'openerp/addons/base/res/res_company.py'
--- openerp/addons/base/res/res_company.py 2012-08-10 08:19:09 +0000
+++ openerp/addons/base/res/res_company.py 2012-08-17 09:28:20 +0000
@@ -109,8 +109,7 @@
'child_ids': fields.one2many('res.company', 'parent_id', 'Child Companies'),
'partner_id': fields.many2one('res.partner', 'Partner', required=True),
'rml_header1': fields.char('Company Slogan', size=200, help="Appears by default on the top right corner of your printed documents (report header)."),
- 'rml_footer1': fields.char('General Information Footer', size=200),
- 'rml_footer2': fields.char('Bank Accounts Footer', size=250, help="Write here your bank accounts for customer payments."),
+ 'rml_footer': fields.text('General Information Footer'),
'rml_header': fields.text('RML Header', required=True),
'rml_header2': fields.text('RML Internal Header', required=True),
'rml_header3': fields.text('RML Internal Header for Landscape Reports', required=True),
@@ -144,7 +143,7 @@
if website: val.append(_('Website: ')+website)
if vat: val.append(_('VAT: ')+vat)
if reg: val.append(_('Reg: ')+reg)
- return {'value': {'rml_footer1':' | '.join(val)}}
+ return {'value': {'rml_footer':' | '.join(val)}}
def _search(self, cr, uid, args, offset=0, limit=None, order=None,
@@ -294,8 +293,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">[[ company.rml_footer ]]</drawCentredString>
<drawCentredString x="10.5cm" y="0.8cm">Contact : [[ user.name ]] - Page: <pageNumber/></drawCentredString>
</pageGraphics>
</pageTemplate>
=== modified file 'openerp/addons/base/res/res_company_view.xml'
--- openerp/addons/base/res/res_company_view.xml 2012-08-13 14:24:43 +0000
+++ openerp/addons/base/res/res_company_view.xml 2012-08-17 09:28:20 +0000
@@ -67,9 +67,9 @@
</group>
<group string="Bank Accounts">
<field name="bank_ids" colspan="4" nolabel="1"/>
- <label for="rml_footer2"/>
+ <label for="rml_footer"/>
<div name="bank_acc">
- <field name="rml_footer2"/>
+ <field name="rml_footer"/>
<!--<button name="%(bank_account_update)d" string="Set Bank Accounts" type="action" icon="gtk-go-forward" class="oe_inline"/>-->
</div>
</group>
@@ -77,7 +77,6 @@
<page string="Header/Footer" groups="base.group_no_one">
<group>
<field name="paper_format" on_change="onchange_paper_format(paper_format)"/>
- <field name="rml_footer1"/>
</group>
<label for="rml_header"/>
<field name="rml_header"/>
_______________________________________________
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
