From 4661fb71d202390f0bf55c1f92073d3fce24878f Mon Sep 17 00:00:00 2001 From: "Turkesh Patel (Open ERP)" Date: Fri, 18 May 2012 12:03:48 +0530 Subject: [PATCH 01/62] [FIX] account: set ondelete='cascade' on payment_id for allow to delete payment term. bzr revid: tpa@tinyerp.com-20120518063348-1lm9oyy0kw5pkwdy --- addons/account/account.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/account/account.py b/addons/account/account.py index 26af7a5f9bd..8d0fb8eb818 100644 --- a/addons/account/account.py +++ b/addons/account/account.py @@ -106,7 +106,7 @@ class account_payment_term_line(osv.osv): 'days': fields.integer('Number of Days', required=True, help="Number of days to add before computation of the day of month." \ "If Date=15/01, Number of Days=22, Day of Month=-1, then the due date is 28/02."), 'days2': fields.integer('Day of the Month', required=True, help="Day of the month, set -1 for the last day of the current month. If it's positive, it gives the day of the next month. Set 0 for net days (otherwise it's based on the beginning of the month)."), - 'payment_id': fields.many2one('account.payment.term', 'Payment Term', required=True, select=True), + 'payment_id': fields.many2one('account.payment.term', 'Payment Term', required=True, select=True, ondelete='cascade'), } _defaults = { 'value': 'balance', From da13d90912fb12bd8f82a12300325f6f57dfee17 Mon Sep 17 00:00:00 2001 From: "Turkesh Patel (Open ERP)" Date: Mon, 11 Jun 2012 14:38:49 +0530 Subject: [PATCH 02/62] [FIX] stock:'product level forecast' report does not support accented char. bzr revid: tpa@tinyerp.com-20120611090849-cmir9qms3blrjjw4 --- addons/stock/report/stock_graph.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/addons/stock/report/stock_graph.py b/addons/stock/report/stock_graph.py index 5ee58bb9d2c..b5d08f93d3f 100644 --- a/addons/stock/report/stock_graph.py +++ b/addons/stock/report/stock_graph.py @@ -22,6 +22,7 @@ from pychart import * import pychart.legend import time from report.misc import choice_colors +import base64 # # Draw a graph for stocks @@ -41,7 +42,7 @@ class stock_graph(object): product_name=product_name.replace('/', '//') if product_id not in self._datas: self._datas[product_id] = {} - self._names[product_id] = product_name + self._names[product_id] = product_name.decode('utf-8') for (dt,stock) in datas: if not dt in self._datas[product_id]: self._datas[product_id][dt]=0 From 61a3238d978ab40e661974dc2b75fbda700f7c70 Mon Sep 17 00:00:00 2001 From: "Mayur Maheshwari (OpenERP)" Date: Mon, 11 Jun 2012 16:20:38 +0530 Subject: [PATCH 03/62] [FIX]stock: fix the issue of counting of Deliveries in kanban view and improve a action string lp bug: https://launchpad.net/bugs/1011541 fixed bzr revid: mma@tinyerp.com-20120611105038-wrospxpjr2wbna6h --- addons/stock/product.py | 2 +- addons/stock/product_view.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/addons/stock/product.py b/addons/stock/product.py index 62fdbb24ca2..9f9faa1cc24 100644 --- a/addons/stock/product.py +++ b/addons/stock/product.py @@ -44,7 +44,7 @@ class product_product(osv.osv): ], ['product_id'], ['product_id']) for move in moves: product_id = move['product_id'][0] - res[product_id]['reception_count'] = move['product_id_count'] + res[product_id]['delivery_count'] = move['product_id_count'] return res def get_product_accounts(self, cr, uid, product_id, context=None): diff --git a/addons/stock/product_view.xml b/addons/stock/product_view.xml index 49e0e9c1880..e1840ac7497 100644 --- a/addons/stock/product_view.xml +++ b/addons/stock/product_view.xml @@ -140,7 +140,7 @@ - Receive Products + Deliver Products stock.move ir.actions.act_window form From 344ddfbdd5fcf2ff6f22a76f5aa405e8ebeee185 Mon Sep 17 00:00:00 2001 From: "Mayur Maheshwari (OpenERP)" Date: Tue, 19 Jun 2012 11:54:26 +0530 Subject: [PATCH 04/62] [FIX]base:fix the issue of KeyError when changes in line of Journal Entry lp bug: https://launchpad.net/bugs/955910 fixed bzr revid: mma@tinyerp.com-20120619062426-x5ykv2thycvpvs4l --- addons/account/account.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/account/account.py b/addons/account/account.py index f0c16d8586c..a441a262003 100644 --- a/addons/account/account.py +++ b/addons/account/account.py @@ -1363,7 +1363,7 @@ class account_move(osv.osv): balance = 0.0 for line in line_ids: if line[2]: - balance += (line[2]['debit'] or 0.00)- (line[2]['credit'] or 0.00) + balance += (line[2].get('debit',0.00)- (line[2].get('credit',0.00))) return {'value': {'balance': balance}} def write(self, cr, uid, ids, vals, context=None): From 41c90e8755b5b12f8e6f4e3870eb3a7f8e2b7b5b Mon Sep 17 00:00:00 2001 From: "Ajay Chauhan (OpenERP)" Date: Thu, 5 Jul 2012 18:34:55 +0530 Subject: [PATCH 05/62] [FIX] account: add else condition in onchange_chart_id lp bug: https://launchpad.net/bugs/1021152 fixed bzr revid: cha@tinyerp.com-20120705130455-iy00wseff3lroj25 --- addons/account/wizard/account_report_common.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/addons/account/wizard/account_report_common.py b/addons/account/wizard/account_report_common.py index fa3c195cfb7..f84c4e909a2 100644 --- a/addons/account/wizard/account_report_common.py +++ b/addons/account/wizard/account_report_common.py @@ -32,6 +32,8 @@ class account_common_report(osv.osv_memory): def onchange_chart_id(self, cr, uid, ids, chart_account_id=False, context=None): if chart_account_id: company_id = self.pool.get('account.account').browse(cr, uid, chart_account_id, context=context).company_id.id + else: + return {'value': {'company_id': False}} return {'value': {'company_id': company_id}} _columns = { From 4e435d335db70863ec732860f4b5009ed13d5279 Mon Sep 17 00:00:00 2001 From: "Mayur Maheshwari (OpenERP)" Date: Fri, 17 Aug 2012 16:17:02 +0530 Subject: [PATCH 06/62] [FIX]hr_timesheet_sheet :fix the issue open timesheet by account from timesheet form view and pass a appropriate ids in name_get lp bug: https://launchpad.net/bugs/1038023 fixed bzr revid: mma@tinyerp.com-20120817104702-qpzqc8w1s9pccr83 --- addons/hr_timesheet_sheet/hr_timesheet_sheet.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/addons/hr_timesheet_sheet/hr_timesheet_sheet.py b/addons/hr_timesheet_sheet/hr_timesheet_sheet.py index ca28b5bdb28..b2ef41f3a46 100644 --- a/addons/hr_timesheet_sheet/hr_timesheet_sheet.py +++ b/addons/hr_timesheet_sheet/hr_timesheet_sheet.py @@ -442,8 +442,10 @@ class hr_timesheet_sheet(osv.osv): return True def name_get(self, cr, uid, ids, context=None): - if not len(ids): + if not ids: return [] + if isinstance(ids, (int)): + ids = [ids] return [(r['id'], r['date_from'] + ' - ' + r['date_to']) \ for r in self.read(cr, uid, ids, ['date_from', 'date_to'], context=context, load='_classic_write')] From 20981ac1a30cf05f82f2467b65664931b5ebf579 Mon Sep 17 00:00:00 2001 From: "Ajay Chauhan (OpenERP)" Date: Mon, 20 Aug 2012 16:29:42 +0530 Subject: [PATCH 07/62] [IMP] account: make little change in onchange method. bzr revid: cha@tinyerp.com-20120820105942-zkyrqrebn3s3j9nc --- addons/account/wizard/account_report_common.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/addons/account/wizard/account_report_common.py b/addons/account/wizard/account_report_common.py index f84c4e909a2..604806f6e31 100644 --- a/addons/account/wizard/account_report_common.py +++ b/addons/account/wizard/account_report_common.py @@ -30,11 +30,11 @@ class account_common_report(osv.osv_memory): _description = "Account Common Report" def onchange_chart_id(self, cr, uid, ids, chart_account_id=False, context=None): + res = {} if chart_account_id: company_id = self.pool.get('account.account').browse(cr, uid, chart_account_id, context=context).company_id.id - else: - return {'value': {'company_id': False}} - return {'value': {'company_id': company_id}} + res['value'] = {'company_id': company_id} + return res _columns = { 'chart_account_id': fields.many2one('account.account', 'Chart of Account', help='Select Charts of Accounts', required=True, domain = [('parent_id','=',False)]), From 1937247840f50a4333c5618c538a27253573b06f Mon Sep 17 00:00:00 2001 From: "Mayur Maheshwari (OpenERP)" Date: Tue, 21 Aug 2012 11:21:50 +0530 Subject: [PATCH 08/62] [IMP]hr_timesheet_sheet :improve name_get method bzr revid: mma@tinyerp.com-20120821055150-60n2k2fva99mqi9m --- addons/hr_timesheet_sheet/hr_timesheet_sheet.py | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/addons/hr_timesheet_sheet/hr_timesheet_sheet.py b/addons/hr_timesheet_sheet/hr_timesheet_sheet.py index b2ef41f3a46..f2a5df1ba0c 100644 --- a/addons/hr_timesheet_sheet/hr_timesheet_sheet.py +++ b/addons/hr_timesheet_sheet/hr_timesheet_sheet.py @@ -442,9 +442,7 @@ class hr_timesheet_sheet(osv.osv): return True def name_get(self, cr, uid, ids, context=None): - if not ids: - return [] - if isinstance(ids, (int)): + if ids and isinstance(ids, int): ids = [ids] return [(r['id'], r['date_from'] + ' - ' + r['date_to']) \ for r in self.read(cr, uid, ids, ['date_from', 'date_to'], From 6c337bcd64b53f234872d9f7026f342755de9c60 Mon Sep 17 00:00:00 2001 From: "Mayur Maheshwari (OpenERP)" Date: Tue, 21 Aug 2012 14:37:50 +0530 Subject: [PATCH 09/62] [IMP]hr_timesheet_sheet :improved as per ids bzr revid: mma@tinyerp.com-20120821090750-zkr0loqnmslqslcr --- addons/hr_timesheet_sheet/hr_timesheet_sheet.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/addons/hr_timesheet_sheet/hr_timesheet_sheet.py b/addons/hr_timesheet_sheet/hr_timesheet_sheet.py index f2a5df1ba0c..7a7e05a80e0 100644 --- a/addons/hr_timesheet_sheet/hr_timesheet_sheet.py +++ b/addons/hr_timesheet_sheet/hr_timesheet_sheet.py @@ -442,7 +442,9 @@ class hr_timesheet_sheet(osv.osv): return True def name_get(self, cr, uid, ids, context=None): - if ids and isinstance(ids, int): + if not ids: + return [] + if isinstance(ids, int): ids = [ids] return [(r['id'], r['date_from'] + ' - ' + r['date_to']) \ for r in self.read(cr, uid, ids, ['date_from', 'date_to'], From 8bf884d2b698dae61f00814768259d6e6fe6a3c7 Mon Sep 17 00:00:00 2001 From: "Nimesh (Open ERP)" Date: Wed, 22 Aug 2012 11:20:23 +0530 Subject: [PATCH 10/62] [FIX] set the menu for base.menu_definitions bzr revid: nco@tinyerp.com-20120822055023-4y39imx6dhwyjqsi --- addons/crm_claim/crm_claim_menu.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/crm_claim/crm_claim_menu.xml b/addons/crm_claim/crm_claim_menu.xml index 46f8760387a..bb881d62a58 100644 --- a/addons/crm_claim/crm_claim_menu.xml +++ b/addons/crm_claim/crm_claim_menu.xml @@ -50,9 +50,9 @@ parent="base.menu_aftersale" action="crm_case_categ_claim0" sequence="1"/> + - From 4d0937e9a642b31183dfbc0cd963b95411d536cb Mon Sep 17 00:00:00 2001 From: "Jignesh Rathod (Open ERP)" Date: Wed, 22 Aug 2012 12:39:28 +0530 Subject: [PATCH 11/62] [FIX] Fixes the problem of Iteration is not allowed on browse_record lp bug: https://launchpad.net/bugs/1039899 fixed bzr revid: jir@tinyerp.com-20120822070928-hfqz8s9du89ib03d --- addons/event/event.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/addons/event/event.py b/addons/event/event.py index 7f0c77661e4..004b370f48e 100644 --- a/addons/event/event.py +++ b/addons/event/event.py @@ -52,10 +52,13 @@ class event_event(osv.osv): _inherit = ['ir.needaction_mixin','mail.thread'] def name_get(self, cr, uid, ids, context=None): + event_obj = self.browse(cr, uid, ids, context=context) if not ids: return [] + if not isinstance(event_obj,list): + event_obj = [event_obj] res = [] - for record in self.browse(cr, uid, ids, context=context): + for record in event_obj: date = record.date_begin.split(" ")[0] date_end = record.date_end.split(" ")[0] if date != date_end: From e7a5fcd896c84d5b93f9ac463335690d75780e2f Mon Sep 17 00:00:00 2001 From: "Turkesh Patel (Open ERP)" Date: Thu, 23 Aug 2012 15:11:11 +0530 Subject: [PATCH 12/62] [FIX] Improved code to encode accented char. bzr revid: tpa@tinyerp.com-20120823094111-vph3jpaxb29hoqqm --- addons/stock/report/stock_graph.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/addons/stock/report/stock_graph.py b/addons/stock/report/stock_graph.py index b5d08f93d3f..d92de2805b5 100644 --- a/addons/stock/report/stock_graph.py +++ b/addons/stock/report/stock_graph.py @@ -22,7 +22,7 @@ from pychart import * import pychart.legend import time from report.misc import choice_colors -import base64 +import tools # # Draw a graph for stocks @@ -42,7 +42,7 @@ class stock_graph(object): product_name=product_name.replace('/', '//') if product_id not in self._datas: self._datas[product_id] = {} - self._names[product_id] = product_name.decode('utf-8') + self._names[product_id] = tools.ustr(product_name) for (dt,stock) in datas: if not dt in self._datas[product_id]: self._datas[product_id][dt]=0 From 3ef83d99e197cbdb12e993b2fbac88b557e4591c Mon Sep 17 00:00:00 2001 From: Minh Tran Date: Tue, 28 Aug 2012 20:04:40 +0200 Subject: [PATCH 13/62] Tweaks to kanban view bzr revid: mit@openerp.com-20120828180440-axp9g1n3y7dayofq --- addons/web_kanban/static/src/css/kanban.css | 7 ++----- addons/web_kanban/static/src/css/kanban.sass | 6 ++---- 2 files changed, 4 insertions(+), 9 deletions(-) diff --git a/addons/web_kanban/static/src/css/kanban.css b/addons/web_kanban/static/src/css/kanban.css index 345becc7cdd..53cad801b49 100644 --- a/addons/web_kanban/static/src/css/kanban.css +++ b/addons/web_kanban/static/src/css/kanban.css @@ -249,7 +249,7 @@ width: 100%; } .openerp .oe_kanban_view.oe_kanban_ungrouped .oe_kanban_column { - background: white; + background: #eeeeee; } .openerp .oe_kanban_view.oe_kanban_ungrouped .oe_kanban_column .oe_kanban_record { float: left; @@ -340,15 +340,12 @@ background: white; border: 1px solid #d8d8d8; border-bottom-color: #b9b9b9; - padding: 6px; + padding: 8px; display: block; -moz-border-radius: 4px; -webkit-border-radius: 4px; border-radius: 4px; } -.openerp .oe_kanban_view .oe_kanban_card:last-child { - margin-bottom: 0; -} .openerp .oe_kanban_view .oe_kanban_card:hover { border: 1px solid #7c7bad; -moz-box-shadow: 0 0 4px #7c7bad; diff --git a/addons/web_kanban/static/src/css/kanban.sass b/addons/web_kanban/static/src/css/kanban.sass index b85d3ebea03..83b17dcfa4d 100644 --- a/addons/web_kanban/static/src/css/kanban.sass +++ b/addons/web_kanban/static/src/css/kanban.sass @@ -234,7 +234,7 @@ &.oe_kanban_grouped .oe_kanban_show_more .oe_button width: 100% &.oe_kanban_ungrouped .oe_kanban_column - background: white + background: #eee .oe_kanban_record float: left padding: 2px @@ -307,11 +307,9 @@ background: white border: 1px solid #d8d8d8 border-bottom-color: #b9b9b9 - padding: 6px + padding: 8px display: block @include radius(4px) - &:last-child - margin-bottom: 0 &:hover border: 1px solid #7C7BAD @include box-shadow(0 0 4px #7C7BAD) From 16773839a48cf3dd9997a1343f789b39e0f37d2f Mon Sep 17 00:00:00 2001 From: Minh Tran Date: Thu, 30 Aug 2012 15:05:24 +0200 Subject: [PATCH 14/62] Styling of group header in listview group by bzr revid: mit@openerp.com-20120830130524-3szsbr80dltbenzm --- addons/web/static/src/css/base.css | 14 +++++++++++--- addons/web/static/src/css/base.sass | 3 +++ addons/web/static/src/js/view_list.js | 2 +- 3 files changed, 15 insertions(+), 4 deletions(-) diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css index 06a37a54727..c3552811fd4 100644 --- a/addons/web/static/src/css/base.css +++ b/addons/web/static/src/css/base.css @@ -1,4 +1,4 @@ -@charset "utf-8"; +@charset "UTF-8"; @font-face { font-family: "mnmliconsRegular"; src: url("/web/static/src/font/mnmliconsv21-webfont.eot") format("eot"); @@ -69,7 +69,6 @@ display: none !important; } } - .openerp.openerp_webclient_container { height: 100%; position: relative; @@ -85,7 +84,7 @@ text-shadow: 0 1px 1px rgba(255, 255, 255, 0.5); /* http://www.quirksmode.org/dom/inputfile.html * http://stackoverflow.com/questions/2855589/replace-input-type-file-by-an-image - */ */ + */ } .openerp :-moz-placeholder { color: #afafb6 !important; @@ -2523,6 +2522,15 @@ margin: 0 !important; padding: 0; } +.openerp .oe_list .oe_list_content .oe_group_header { + background-color: #fcfcfc; + background-image: -webkit-gradient(linear, left top, left bottom, from(#fcfcfc), to(#dedede)); + background-image: -webkit-linear-gradient(top, #fcfcfc, #dedede); + background-image: -moz-linear-gradient(top, #fcfcfc, #dedede); + background-image: -ms-linear-gradient(top, #fcfcfc, #dedede); + background-image: -o-linear-gradient(top, #fcfcfc, #dedede); + background-image: linear-gradient(to bottom, #fcfcfc, #dedede); +} .openerp .oe_list_content { width: 100%; } diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass index c238ef6ee07..0ac0d99def8 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -1970,6 +1970,8 @@ $sheet-max-width: 860px position: absolute margin: 0 !important // dammit padding: 0 + .oe_list_content .oe_group_header + @include vertical-gradient(#fcfcfc, #dedede) .oe_list_content width: 100% @@ -2028,6 +2030,7 @@ $sheet-max-width: 860px > tr:nth-child(odd) background-color: #f0f0fa @include vertical-gradient(#f0f0fa, #eeeef6) + > tfoot border-top: 2px solid #cacaca border-bottom: 1px solid #cacaca diff --git a/addons/web/static/src/js/view_list.js b/addons/web/static/src/js/view_list.js index a2dccf2ec73..42a808c5e15 100644 --- a/addons/web/static/src/js/view_list.js +++ b/addons/web/static/src/js/view_list.js @@ -1259,7 +1259,7 @@ instance.web.ListView.Groups = instance.web.Class.extend( /** @lends instance.we self.bind_child_events(child); child.datagroup = group; - var $row = child.$row = $(''); + var $row = child.$row = $(''); if (group.openable && group.length) { $row.click(function (e) { if (!$row.data('open')) { From 6bc116cf6d8d3ff250b24f9d59ccd35df8c92bd2 Mon Sep 17 00:00:00 2001 From: Minh Tran Date: Fri, 31 Aug 2012 15:23:04 +0200 Subject: [PATCH 15/62] fixed avatar hover and shadow in kanban view bzr revid: mit@openerp.com-20120831132304-qzmuvltopy1mdiwa --- addons/web_kanban/static/src/css/kanban.css | 9 ++++++--- addons/web_kanban/static/src/css/kanban.sass | 4 +++- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/addons/web_kanban/static/src/css/kanban.css b/addons/web_kanban/static/src/css/kanban.css index 53cad801b49..b2abba2b0ec 100644 --- a/addons/web_kanban/static/src/css/kanban.css +++ b/addons/web_kanban/static/src/css/kanban.css @@ -170,9 +170,9 @@ -moz-border-radius: 3px; -webkit-border-radius: 3px; border-radius: 3px; - -moz-box-shadow: 0 1px 4px rgba(0, 0, 0, 0.4); - -webkit-box-shadow: 0 1px 4px rgba(0, 0, 0, 0.4); - -box-shadow: 0 1px 4px rgba(0, 0, 0, 0.4); + -moz-box-shadow: 0 1px 3px rgba(0, 0, 0, 0.3); + -webkit-box-shadow: 0 1px 3px rgba(0, 0, 0, 0.3); + -box-shadow: 0 1px 3px rgba(0, 0, 0, 0.3); } .openerp .oe_kanban_view .oe_kanban_details { display: inline-block; @@ -265,6 +265,9 @@ .openerp .oe_kanban_view .oe_kanban_action_a { text-decoration: none; } +.openerp .oe_kanban_view .oe_kanban_action_a:hover { + text-decoration: none; +} .openerp .oe_kanban_view .oe_kanban_table { width: 100%; border: none; diff --git a/addons/web_kanban/static/src/css/kanban.sass b/addons/web_kanban/static/src/css/kanban.sass index 83b17dcfa4d..67039ac475b 100644 --- a/addons/web_kanban/static/src/css/kanban.sass +++ b/addons/web_kanban/static/src/css/kanban.sass @@ -178,7 +178,7 @@ text-align: center overflow: hidden @include radius(3px) - @include box-shadow(0 1px 4px rgba(0, 0, 0, 0.4)) + @include box-shadow(0 1px 3px rgba(0, 0, 0, 0.3)) .oe_kanban_details display: inline-block vertical-align: top @@ -246,6 +246,8 @@ margin: 0 .oe_kanban_action_a text-decoration: none + &:hover + text-decoration: none .oe_kanban_table width: 100% border: none From 723d2ee1daaf2d709926f0ea1bce6c5ba334285d Mon Sep 17 00:00:00 2001 From: Minh Tran Date: Fri, 31 Aug 2012 18:31:53 +0200 Subject: [PATCH 16/62] uniformization of avatar box-shadow bzr revid: mit@openerp.com-20120831163153-8515c0vfr6sw09n1 --- addons/web/static/src/css/base.css | 12 ++++++------ addons/web/static/src/css/base.sass | 4 ++-- addons/web_kanban/static/src/css/kanban.css | 6 +++--- addons/web_kanban/static/src/css/kanban.sass | 2 +- 4 files changed, 12 insertions(+), 12 deletions(-) diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css index c3552811fd4..dcb3fd958f4 100644 --- a/addons/web/static/src/css/base.css +++ b/addons/web/static/src/css/base.css @@ -498,9 +498,9 @@ -moz-border-radius: 3px; -webkit-border-radius: 3px; border-radius: 3px; - -moz-box-shadow: 0 1px 3px rgba(0, 0, 0, 0.3); - -webkit-box-shadow: 0 1px 3px rgba(0, 0, 0, 0.3); - box-shadow: 0 1px 3px rgba(0, 0, 0, 0.3); + -moz-box-shadow: 0 1px 4px rgba(0, 0, 0, 0.4); + -webkit-box-shadow: 0 1px 4px rgba(0, 0, 0, 0.4); + box-shadow: 0 1px 4px rgba(0, 0, 0, 0.4); border: none; } .openerp .oe_avatar + div { @@ -866,9 +866,9 @@ font-family: "Lucida Grande", Helvetica, Verdana, Arial; border: 1px solid #999999; background: whitesmoke; - -moz-box-shadow: inset 0 1px 4px rgba(0, 0, 0, 0.3); - -webkit-box-shadow: inset 0 1px 4px rgba(0, 0, 0, 0.3); - box-shadow: inset 0 1px 4px rgba(0, 0, 0, 0.3); + -moz-box-shadow: inset 0 1px 4px rgba(0, 0, 0, 0.4); + -webkit-box-shadow: inset 0 1px 4px rgba(0, 0, 0, 0.4); + box-shadow: inset 0 1px 4px rgba(0, 0, 0, 0.4); -moz-border-radius: 3px; -webkit-border-radius: 3px; border-radius: 3px; diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass index 0ac0d99def8..43b8ace724b 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -420,7 +420,7 @@ $sheet-max-width: 860px max-height: 90px max-width: 90px @include radius(3px) - @include box-shadow(0 1px 3px rgba(0, 0, 0, 0.3)) + @include box-shadow(0 1px 4px rgba(0, 0, 0, 0.4)) border: none .oe_avatar + div margin-left: 5px @@ -687,7 +687,7 @@ $sheet-max-width: 860px font-family: "Lucida Grande", Helvetica, Verdana, Arial border: 1px solid #999999 background: whitesmoke - @include box-shadow(inset 0 1px 4px rgba(0, 0, 0, 0.3)) + @include box-shadow(inset 0 1px 4px rgba(0, 0, 0, 0.4)) @include radius(3px) input margin-bottom: 9px diff --git a/addons/web_kanban/static/src/css/kanban.css b/addons/web_kanban/static/src/css/kanban.css index b2abba2b0ec..299aba737e6 100644 --- a/addons/web_kanban/static/src/css/kanban.css +++ b/addons/web_kanban/static/src/css/kanban.css @@ -170,9 +170,9 @@ -moz-border-radius: 3px; -webkit-border-radius: 3px; border-radius: 3px; - -moz-box-shadow: 0 1px 3px rgba(0, 0, 0, 0.3); - -webkit-box-shadow: 0 1px 3px rgba(0, 0, 0, 0.3); - -box-shadow: 0 1px 3px rgba(0, 0, 0, 0.3); + -moz-box-shadow: 0 1px 4px rgba(0, 0, 0, 0.4); + -webkit-box-shadow: 0 1px 4px rgba(0, 0, 0, 0.4); + -box-shadow: 0 1px 4px rgba(0, 0, 0, 0.4); } .openerp .oe_kanban_view .oe_kanban_details { display: inline-block; diff --git a/addons/web_kanban/static/src/css/kanban.sass b/addons/web_kanban/static/src/css/kanban.sass index 67039ac475b..30bfe9b364f 100644 --- a/addons/web_kanban/static/src/css/kanban.sass +++ b/addons/web_kanban/static/src/css/kanban.sass @@ -178,7 +178,7 @@ text-align: center overflow: hidden @include radius(3px) - @include box-shadow(0 1px 3px rgba(0, 0, 0, 0.3)) + @include box-shadow(0 1px 4px rgba(0, 0, 0, 0.4)) .oe_kanban_details display: inline-block vertical-align: top From c895c53341c21a06d6a00bfb7045b1353d708d3d Mon Sep 17 00:00:00 2001 From: "Ajay Chauhan (OpenERP)" Date: Mon, 3 Sep 2012 15:01:27 +0530 Subject: [PATCH 17/62] [IMP] crm, project, hr_recruitment: made stages accute on view according to state bzr revid: cha@tinyerp.com-20120903093127-vao5eoi61is1pqfx --- addons/crm/crm_lead.py | 2 +- addons/hr_recruitment/hr_recruitment.py | 2 +- addons/hr_recruitment/hr_recruitment_view.xml | 2 +- addons/project/project.py | 2 +- addons/project/project_view.xml | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/addons/crm/crm_lead.py b/addons/crm/crm_lead.py index 25a47ecbadc..8f857c28556 100644 --- a/addons/crm/crm_lead.py +++ b/addons/crm/crm_lead.py @@ -213,7 +213,7 @@ class crm_lead(base_stage, osv.osv): 'priority': fields.selection(crm.AVAILABLE_PRIORITIES, 'Priority', select=True), 'date_closed': fields.datetime('Closed', readonly=True), 'stage_id': fields.many2one('crm.case.stage', 'Stage', - domain="['&', '|', ('section_ids', '=', section_id), ('case_default', '=', True), '|', ('type', '=', type), ('type', '=', 'both')]"), + domain="['&', '|', ('section_ids', '=', section_id), ('case_default', '=', True), '&', ('fold', '=', False), '|', ('type', '=', type), ('type', '=', 'both')]"), 'user_id': fields.many2one('res.users', 'Salesperson'), 'referred': fields.char('Referred By', size=64), 'date_open': fields.datetime('Opened', readonly=True), diff --git a/addons/hr_recruitment/hr_recruitment.py b/addons/hr_recruitment/hr_recruitment.py index 6b4839b7b2b..2a3fab58730 100644 --- a/addons/hr_recruitment/hr_recruitment.py +++ b/addons/hr_recruitment/hr_recruitment.py @@ -185,7 +185,7 @@ class hr_applicant(base_stage, osv.Model): 'create_date': fields.datetime('Creation Date', readonly=True, select=True), 'write_date': fields.datetime('Update Date', readonly=True), 'stage_id': fields.many2one ('hr.recruitment.stage', 'Stage', - domain="['|', ('department_id', '=', department_id), ('department_id', '=', False)]"), + domain="['&', ('fold', '=', False), '|', ('department_id', '=', department_id), ('department_id', '=', False)]"), 'state': fields.related('stage_id', 'state', type="selection", store=True, selection=AVAILABLE_STATES, string="State", readonly=True, help='The state is set to \'Draft\', when a case is created.\ diff --git a/addons/hr_recruitment/hr_recruitment_view.xml b/addons/hr_recruitment/hr_recruitment_view.xml index d1866f124af..8fd2db3425a 100644 --- a/addons/hr_recruitment/hr_recruitment_view.xml +++ b/addons/hr_recruitment/hr_recruitment_view.xml @@ -107,7 +107,7 @@