Merge lp:~openerp-dev/openobject-server/trunk-bug-1095475-hip into lp:openobject-server

[Hiral Patel (OpenERP)]

Hello,

Go to settings > Companies > Companies
The "Click to set your company logo" appears before the Edit button is clicked.

Thanks.

=== modified file 'openerp/addons/base/res/res_company_view.xml'
--- openerp/addons/base/res/res_company_view.xml	2012-12-18 17:47:54 +0000
+++ openerp/addons/base/res/res_company_view.xml	2013-01-15 09:38:40 +0000
@@ -33,7 +33,7 @@
                         </h1>
                     </div>
                     <div attrs="{'invisible' : [('logo','!=',False)]}" class="oe_view_nocontent oe_clear">
-                        <p class="oe_view_nocontent_create">
+                        <p class="oe_view_nocontent_create oe_edit_only">
                             Click to set your company logo.
                         </p>
                     </div>