[MERGE] Merged from openobject-addons.

bzr revid: jra@tinyerp.com-20120627130544-08hf1fvkdskvyihb

addons/analytic_contract_expense_project/__openerp__.py

@@ -41,7 +41,6 @@ This module is for modifying project view to show some data related to the hr_ex
              ],
     'installable': True,
     'auto_install': True,
-    'certificate': '',
 }
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

addons/crm/wizard/crm_opportunity_to_phonecall_view.xml

@@ -13,7 +13,8 @@
                     <header>
                         <button name="action_schedule" type="object" string="Log call" icon="gtk-ok" attrs="{'invisible' : [('action', '!=', 'log')]}" />
                         <button name="action_schedule" type="object" string="Schedule Call" icon="gtk-ok" attrs="{'invisible' : [('action', '!=', 'schedule')]}" />
-                        <button name="action_cancel" string="_Cancel" icon="gtk-cancel" special="cancel" />
+                        or
+                        <button name="action_cancel" string="_Cancel" class="oe_link" special="cancel" />
                     </header>
                     <group>
                         <group>