Turkesh Patel (openERP) has proposed merging
lp:~openerp-dev/openobject-server/trunk-bug-1009936-tpa into
lp:openobject-server.
Requested reviews:
OpenERP Core Team (openerp)
Related bugs:
Bug #1009936 in OpenERP Server: "Select photo on partner form then set
company true photo will also changed"
https://bugs.launchpad.net/openobject-server/+bug/1009936
For more details, see:
https://code.launchpad.net/~openerp-dev/openobject-server/trunk-bug-1009936-tpa/+merge/109137
[FIX] set proper condition for photo of the partner.
--
https://code.launchpad.net/~openerp-dev/openobject-server/trunk-bug-1009936-tpa/+merge/109137
Your team OpenERP R&D Team is subscribed to branch
lp:~openerp-dev/openobject-server/trunk-bug-1009936-tpa.
=== modified file 'openerp/addons/base/res/res_partner.py'
--- openerp/addons/base/res/res_partner.py 2012-08-17 14:27:48 +0000
+++ openerp/addons/base/res/res_partner.py 2012-08-24 05:12:25 +0000
@@ -255,9 +255,14 @@
default.update({'name': _('%s (copy)')%(name)})
return super(res_partner, self).copy(cr, uid, id, default, context)
- def onchange_type(self, cr, uid, ids, is_company, context=None):
+ def onchange_type(self, cr, uid, ids, is_company, image, context=None):
# get value as for an onchange on the image
- value = tools.image_get_resized_images(self._get_default_image(cr, uid, is_company, context), return_big=True)
+ value = {}
+ cmp_image = tools.image_resize_image_medium(open(openerp.modules.get_module_resource('base', 'static/src/img', 'company_image.png'), 'rb').read().encode('base64'))
+ partner_image = tools.image_resize_image_medium(open(openerp.modules.get_module_resource('base', 'static/src/img', 'partner_image.png'), 'rb').read().encode('base64'))
+ partner_image_big = tools.image_resize_image_big(open(openerp.modules.get_module_resource('base', 'static/src/img', 'partner_image.png'), 'rb').read().encode('base64'))
+ if image == cmp_image or image == partner_image or image == partner_image_big:
+ value = tools.image_get_resized_images(self._get_default_image(cr, uid, is_company, context), return_big=True)
value['title'] = False
if is_company:
value['parent_id'] = False
=== modified file 'openerp/addons/base/res/res_partner_view.xml'
--- openerp/addons/base/res/res_partner_view.xml 2012-08-22 09:20:41 +0000
+++ openerp/addons/base/res/res_partner_view.xml 2012-08-24 05:12:25 +0000
@@ -96,10 +96,11 @@
<form string="Partners" version="7.0">
<sheet>
<field name="image" widget='image' class="oe_left" options='{"preview_image": "image_medium", "size": [90, 90]}'/>
+ <field name="image_medium" invisible='1'/>
<div class="oe_title">
<div class="oe_edit_only">
<label for="name"/> (
- <field name="is_company" on_change="onchange_type(is_company)" class="oe_inline"/> <label for="is_company" string="Is a Company?"/>)
+ <field name="is_company" on_change="onchange_type(is_company,image_medium)" class="oe_inline"/> <label for="is_company" string="Is a Company?"/>)
</div>
<h1>
<field name="name" default_focus="1" placeholder="Name" />
_______________________________________________
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
