qdp (OpenERP) has proposed merging
lp:~openerp-dev/openobject-addons/trunk-configuration-rework-upload-company-logo-mma
into lp:~openerp-dev/openobject-addons/trunk-configuration-rework.
Requested reviews:
OpenERP R&D Team (openerp-dev)
For more details, see:
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-configuration-rework-upload-company-logo-mma/+merge/64649
upload your logo config wizard
--
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-configuration-rework-upload-company-logo-mma/+merge/64649
Your team OpenERP R&D Team is requested to review the proposed merge of
lp:~openerp-dev/openobject-addons/trunk-configuration-rework-upload-company-logo-mma
into lp:~openerp-dev/openobject-addons/trunk-configuration-rework.
=== modified file 'base_setup/wizard/res_company_logo.py'
--- base_setup/wizard/res_company_logo.py 2011-05-09 12:55:22 +0000
+++ base_setup/wizard/res_company_logo.py 2011-06-15 09:35:53 +0000
@@ -27,6 +27,7 @@
class res_company_logo(osv.osv_memory):
_name = 'res.company.logo'
+ _inherit = 'res.config'
_columns = {
'logo' : fields.binary('Logo'),
}
=== modified file 'base_setup/wizard/res_company_logo_view.xml'
--- base_setup/wizard/res_company_logo_view.xml 2011-05-06 08:40:25 +0000
+++ base_setup/wizard/res_company_logo_view.xml 2011-06-15 09:35:53 +0000
@@ -6,17 +6,32 @@
<field name="name">res.company.logo.form</field>
<field name="model">res.company.logo</field>
<field name="type">form</field>
+ <field name="inherit_id" ref="base.res_config_view_base"/>
<field name="arch" type="xml">
- <form string="Upload Your Company Logo">
- <separator string="Upload your company logo in JPG or PNG with a format similar to 450*150 pixels" colspan="4"/>
- <field colspan="4" height="150" name="logo" widget="image" nolabel="1"/>
- <separator colspan="4"/>
- <group colspan="4" col="6">
- <label string="" colspan="2"/>
- <button icon="gtk-cancel" special="cancel" string="Cancel"/>
- <button icon="gtk-ok" string="Upload" name="execute" type="object"/>
- </group>
+ <data>
+ <form position="attributes">
+ <attribute name="string">Upload Your Company Logo</attribute>
</form>
+ <xpath expr='//separator[@string="title"]' position='attributes'>
+ <attribute name='string'> </attribute>
+ </xpath>
+ <xpath expr="//label[@string='description']"
+ position="attributes">
+ <attribute name="string">Upload your company logo in JPG or PNG with a format similar to 450*150 pixels </attribute>
+ </xpath>
+ <xpath expr='//separator[@string="vsep"]' position='attributes'>
+ <attribute name='string'> </attribute>
+ <attribute name='rowspan'>12</attribute>
+ </xpath>
+ <xpath expr="//button[@string='Next']" position="replace">
+ <button icon="gtk-ok" string="Upload" name="execute" type="object"/>
+ </xpath>
+ <group string="res_config_contents" position="replace">
+ <group colspan="4">
+ <field colspan="4" height="150" name="logo" widget="image" nolabel="1"/>
+ </group>
+ </group>
+ </data>
</field>
</record>
_______________________________________________
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
