From 3b8573f7ce273948826cffbffd7f2cfa91665e3c Mon Sep 17 00:00:00 2001 From: Vo Minh Thu Date: Wed, 27 Jun 2012 11:25:35 +0200 Subject: [PATCH 1/3] [FIX] analytic_contract_expense_project: removed empty certificate entry from descriptor file (which cause the unique constraint to be impossible to add). bzr revid: vmt@openerp.com-20120627092535-va6fuhc3o65te8u9 --- addons/analytic_contract_expense_project/__openerp__.py | 1 - 1 file changed, 1 deletion(-) diff --git a/addons/analytic_contract_expense_project/__openerp__.py b/addons/analytic_contract_expense_project/__openerp__.py index 514f0bfbbf5..41e0bbd084a 100644 --- a/addons/analytic_contract_expense_project/__openerp__.py +++ b/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: From ed7b1d1b568e871a4e5591df3e5f301900909788 Mon Sep 17 00:00:00 2001 From: Fabien Meghazi Date: Wed, 27 Jun 2012 11:41:06 +0200 Subject: [PATCH 2/3] [ADD] Added oe_link css class bzr revid: fme@openerp.com-20120627094106-sg0nk89obcjtlzpl --- addons/web/static/src/css/base.css | 32 +++++++++++++++++++++++++++++ addons/web/static/src/css/base.sass | 19 +++++++++++++++++ 2 files changed, 51 insertions(+) diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css index 72d89921cfd..20d7e46dd11 100644 --- a/addons/web/static/src/css/base.css +++ b/addons/web/static/src/css/base.css @@ -309,6 +309,38 @@ box-shadow: 0 1px 3px rgba(0, 0, 0, 0.3); border: none; } +.openerp .oe_button.oe_link { + border: none; + padding: 0; + margin: 0; + background: none; + -moz-border-radius: none; + -webkit-border-radius: none; + border-radius: none; + -moz-box-shadow: none; + -webkit-box-shadow: none; + box-shadow: none; +} +.openerp .oe_button.oe_link img { + display: none; +} +.openerp .oe_button.oe_link span { + border: none; + padding: 0; + margin: 0; + background: none; + -moz-border-radius: none; + -webkit-border-radius: none; + border-radius: none; + -moz-box-shadow: none; + -webkit-box-shadow: none; + box-shadow: none; + color: #8a89ba; + font-weight: bold; +} +.openerp .oe_button.oe_link span:hover { + text-decoration: underline; +} .openerp.oe_tooltip { font-size: 12px; } diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass index cae493ea2e5..f42b527a500 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -27,6 +27,14 @@ $colour4: #8a89ba font-weight: normal font-style: normal +@mixin reset() + border: none + padding: 0 + margin: 0 + background: none + @include radius(none) + @include box-shadow(none) + @mixin vertical-gradient($startColor: #555, $endColor: #333) background-color: $startColor background-image: -webkit-gradient(linear, left top, left bottom, from($startColor), to($endColor)) /* Saf4+, Chrome */ @@ -261,6 +269,17 @@ $colour4: #8a89ba @include radius(3px) @include box-shadow(0 1px 3px rgba(0, 0, 0, 0.3)) border: none + .oe_button.oe_link + @include reset() + img + display: none + span + @include reset() + color: #8A89BA + font-weight: bold + &:hover + text-decoration: underline + //.oe_edit_only  // }}} // Tooltips {{{ From b22523e08242edb8df5d1d39f6a76121833956d4 Mon Sep 17 00:00:00 2001 From: Fabien Meghazi Date: Wed, 27 Jun 2012 11:41:42 +0200 Subject: [PATCH 3/3] [IMP] opportunity2phonecall wizard, use oe_link on cancel button bzr revid: fme@openerp.com-20120627094142-nut1pqe4vzevvu4z --- addons/crm/wizard/crm_opportunity_to_phonecall_view.xml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/addons/crm/wizard/crm_opportunity_to_phonecall_view.xml b/addons/crm/wizard/crm_opportunity_to_phonecall_view.xml index ad1a763fa46..de4219fb42d 100644 --- a/addons/crm/wizard/crm_opportunity_to_phonecall_view.xml +++ b/addons/crm/wizard/crm_opportunity_to_phonecall_view.xml @@ -13,7 +13,8 @@