From de90ef25dc393dc19d4b32e97f2e64b1cfeb8db4 Mon Sep 17 00:00:00 2001 From: "Kuldeep Joshi (OpenERP)" Date: Fri, 22 Jun 2012 17:33:53 +0530 Subject: [PATCH 001/150] [IMP]Manufacturing orders view change bzr revid: kjo@tinyerp.com-20120622120353-poglhhjdz17vbegi --- addons/mrp/mrp.py | 8 ++-- addons/mrp/mrp_view.xml | 40 +++++++++++-------- addons/mrp_operations/mrp_operations_view.xml | 4 +- addons/sale_mrp/sale_mrp.py | 4 +- addons/sale_mrp/sale_mrp_view.xml | 6 ++- 5 files changed, 35 insertions(+), 27 deletions(-) diff --git a/addons/mrp/mrp.py b/addons/mrp/mrp.py index 3214cad5a5c..e22bc286e0a 100644 --- a/addons/mrp/mrp.py +++ b/addons/mrp/mrp.py @@ -472,9 +472,9 @@ class mrp_production(osv.osv): 'bom_id': fields.many2one('mrp.bom', 'Bill of Material', domain=[('bom_id','=',False)], readonly=True, states={'draft':[('readonly',False)]}), 'routing_id': fields.many2one('mrp.routing', string='Routing', on_delete='set null', readonly=True, states={'draft':[('readonly',False)]}, help="The list of operations (list of work centers) to produce the finished product. The routing is mainly used to compute work center costs during operations and to plan future loads on work centers based on production plannification."), - 'picking_id': fields.many2one('stock.picking', 'Picking list', readonly=True, ondelete="restrict", + 'picking_id': fields.many2one('stock.picking', 'Picking List', readonly=True, ondelete="restrict", help="This is the Internal Picking List that brings the finished product to the production plan"), - 'move_prod_id': fields.many2one('stock.move', 'Move product', readonly=True), + 'move_prod_id': fields.many2one('stock.move', 'Product Move', readonly=True), 'move_lines': fields.many2many('stock.move', 'mrp_production_move_ids', 'production_id', 'move_id', 'Products to Consume', domain=[('state','not in', ('done', 'cancel'))], states={'done':[('readonly',True)]}), 'move_lines2': fields.many2many('stock.move', 'mrp_production_move_ids', 'production_id', 'move_id', 'Consumed Products', domain=[('state','in', ('done', 'cancel'))]), 'move_created_ids': fields.one2many('stock.move', 'production_id', 'Products to Produce', domain=[('state','not in', ('done', 'cancel'))], states={'done':[('readonly',True)]}), @@ -1112,9 +1112,9 @@ class mrp_production_product_line(osv.osv): _columns = { 'name': fields.char('Name', size=64, required=True), 'product_id': fields.many2one('product.product', 'Product', required=True), - 'product_qty': fields.float('Product Qty', digits_compute=dp.get_precision('Product Unit of Measure'), required=True), + 'product_qty': fields.float('Product Quantity', digits_compute=dp.get_precision('Product Unit of Measure'), required=True), 'product_uom': fields.many2one('product.uom', 'Product Unit of Measure', required=True), - 'product_uos_qty': fields.float('Product UOS Qty'), + 'product_uos_qty': fields.float('Product UOS Quantity'), 'product_uos': fields.many2one('product.uom', 'Product UOS'), 'production_id': fields.many2one('mrp.production', 'Production Order', select=True), } diff --git a/addons/mrp/mrp_view.xml b/addons/mrp/mrp_view.xml index 8559a679beb..456cd5cbed8 100644 --- a/addons/mrp/mrp_view.xml +++ b/addons/mrp/mrp_view.xml @@ -642,17 +642,19 @@ + + + - - - + + - + @@ -671,10 +673,11 @@ states="draft,waiting,confirmed,assigned"/> + - + @@ -686,14 +689,13 @@ states="done,cancel"/> - - - + + - + + /
Date: Tue, 17 Jul 2012 17:55:39 +0200 Subject: [PATCH 100/150] [FIX] web_dashboard: allow columns without actions bzr revid: chs@openerp.com-20120717155539-dludvgbvhzfpsx83 --- addons/web_dashboard/static/src/js/dashboard.js | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/addons/web_dashboard/static/src/js/dashboard.js b/addons/web_dashboard/static/src/js/dashboard.js index 0754bfd7e2b..a19151af33c 100644 --- a/addons/web_dashboard/static/src/js/dashboard.js +++ b/addons/web_dashboard/static/src/js/dashboard.js @@ -37,11 +37,12 @@ instance.web.form.DashBoard = instance.web.form.FormWidget.extend({ delete(action.attrs.width); delete(action.attrs.height); delete(action.attrs.colspan); - self.rpc('/web/action/load', { - action_id: parseInt(action.attrs.name, 10) - }, function(result) { - self.on_load_action(result, column_index + '_' + action_index, action.attrs); - }); + var action_id = _.str.toNumber(action.attrs.name); + if (!_.isNaN(action_id)) { + self.rpc('/web/action/load', {action_id: action_id}, function(result) { + self.on_load_action(result, column_index + '_' + action_index, action.attrs); + }); + } }); }); }, From c1d7f61d1fef37609179edee3d5e0374c9f25ca7 Mon Sep 17 00:00:00 2001 From: Christophe Simonis Date: Tue, 17 Jul 2012 17:56:11 +0200 Subject: [PATCH 101/150] [FIX] web_dashboard: generate a valid view bzr revid: chs@openerp.com-20120717155611-ns8w0u1u0niq1q30 --- addons/web_dashboard/static/src/xml/web_dashboard.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/web_dashboard/static/src/xml/web_dashboard.xml b/addons/web_dashboard/static/src/xml/web_dashboard.xml index 5ca2551255c..68dda7d7f67 100644 --- a/addons/web_dashboard/static/src/xml/web_dashboard.xml +++ b/addons/web_dashboard/static/src/xml/web_dashboard.xml @@ -48,7 +48,7 @@
-
+ From bed5bf4804480c0b38d9fccef855db2b292e8025 Mon Sep 17 00:00:00 2001 From: Minh Tran Date: Tue, 17 Jul 2012 19:30:02 +0200 Subject: [PATCH 102/150] improved task kanban view bzr revid: mit@openerp.com-20120717173002-0m3f3uicefpmcu2l --- addons/project/project_view.xml | 27 +++++++++++---------------- 1 file changed, 11 insertions(+), 16 deletions(-) diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml index 9e4f3c44a27..a70bc504299 100644 --- a/addons/project/project_view.xml +++ b/addons/project/project_view.xml @@ -517,22 +517,16 @@
- i + í
+
- -
- -
+
-
-
- - - - -
+ +
+ + + + 7 + 7 +
From 005f7a3180f03ee03075cb7e5bb46910a8994644 Mon Sep 17 00:00:00 2001 From: Minh Tran Date: Tue, 17 Jul 2012 19:30:27 +0200 Subject: [PATCH 103/150] improved task kanban view bzr revid: mit@openerp.com-20120717173027-tnpri7yd1jclnufs --- addons/web_kanban/static/src/css/kanban.css | 11 +++++++---- addons/web_kanban/static/src/css/kanban.sass | 5 +++-- 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/addons/web_kanban/static/src/css/kanban.css b/addons/web_kanban/static/src/css/kanban.css index 868fa9783fd..36dbab57559 100644 --- a/addons/web_kanban/static/src/css/kanban.css +++ b/addons/web_kanban/static/src/css/kanban.css @@ -402,16 +402,19 @@ top: 2px; } .openerp .oe_kanban_view .oe_kanban_status { + position: relative; + top: 4px; display: inline-block; height: 12px; width: 12px; - margin: 4px auto; -moz-border-radius: 6px; -webkit-border-radius: 6px; border-radius: 6px; - -moz-box-shadow: 0 1px 3px rgba(0, 0, 0, 0.6); - -webkit-box-shadow: 0 1px 3px rgba(0, 0, 0, 0.6); - -box-shadow: 0 1px 3px rgba(0, 0, 0, 0.6); + background-position: center center; + background-image: -webkit-radial-gradient(circle, #eeeeee 0%, #cccccc 40%, #bbbbbb 100%); + background-image: -moz-radial-gradient(#eeeeee 0%, #cccccc 40%, #bbbbbb 100%); + background-image: -ms-radial-gradient(#eeeeee 0%, #cccccc 40%, #bbbbbb 100%); + background-image: radial-gradient(#eeeeee 0%, #cccccc 40%, #bbbbbb 100%); } .openerp .oe_kanban_view .oe_kanban_status_green { background: green; diff --git a/addons/web_kanban/static/src/css/kanban.sass b/addons/web_kanban/static/src/css/kanban.sass index fb5bdc9dcbb..f4c13cc7bd2 100644 --- a/addons/web_kanban/static/src/css/kanban.sass +++ b/addons/web_kanban/static/src/css/kanban.sass @@ -338,12 +338,13 @@ top: 2px .oe_kanban_status + position: relative + top: 4px display: inline-block height: 12px width: 12px - margin: 4px auto @include radius(6px) - @include box-shadow(0 1px 3px rgba(0,0,0,0.6)) + @include radial-gradient((#eee 0%, #ccc 40%, #bbb 100%)) .oe_kanban_status_green background: green @include radial-gradient((#55dd55 0%, #44aa44 40%, #339933 100%)) From afd02c77dc20cfcbfe23c5d8edeeb1c6f11dbb75 Mon Sep 17 00:00:00 2001 From: "Atul Patel (OpenERP)" Date: Wed, 18 Jul 2012 12:24:44 +0530 Subject: [PATCH 104/150] [FIX]: Payment_rate_Currency_id field in account_voucher bzr revid: atp@tinyerp.com-20120718065444-d13waj4x9x0quin3 --- addons/account_voucher/account_voucher_view.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/addons/account_voucher/account_voucher_view.xml b/addons/account_voucher/account_voucher_view.xml index 09fe0d23842..552e2e5a1f0 100644 --- a/addons/account_voucher/account_voucher_view.xml +++ b/addons/account_voucher/account_voucher_view.xml @@ -52,6 +52,7 @@ + From c11281fddd42101951980250022d5329771cfa77 Mon Sep 17 00:00:00 2001 From: "Quentin (OpenERP)" Date: Wed, 18 Jul 2012 12:11:17 +0200 Subject: [PATCH 105/150] [FIX] l10n_be_invoice_bba: fixed the algorithm missing argument correctly bzr revid: qdp-launchpad@openerp.com-20120718101117-oekq03q72j90avp0 --- addons/l10n_be_invoice_bba/account_invoice_view.xml | 3 +-- addons/l10n_be_invoice_bba/invoice.py | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/addons/l10n_be_invoice_bba/account_invoice_view.xml b/addons/l10n_be_invoice_bba/account_invoice_view.xml index 2d3ebbd4cd2..924cc0fcd48 100644 --- a/addons/l10n_be_invoice_bba/account_invoice_view.xml +++ b/addons/l10n_be_invoice_bba/account_invoice_view.xml @@ -11,9 +11,8 @@ - + on_change="generate_bbacomm(type,reference_type, partner_id.out_inv_comm_algorithm, partner_id,reference)" colspan="1"/> diff --git a/addons/l10n_be_invoice_bba/invoice.py b/addons/l10n_be_invoice_bba/invoice.py index 0cf55e5be64..93f9f22b1fa 100644 --- a/addons/l10n_be_invoice_bba/invoice.py +++ b/addons/l10n_be_invoice_bba/invoice.py @@ -85,7 +85,7 @@ class account_invoice(osv.osv): } result['value'].update(res_update) return result -#algorithm is not defined as field in any account related modules.so pass it as false argument. + def generate_bbacomm(self, cr, uid, ids, type, reference_type, algorithm, partner_id, reference): partner_obj = self.pool.get('res.partner') reference = reference or '' From e4c1ca04a11db2da818cbec650b241f6febbc674 Mon Sep 17 00:00:00 2001 From: "Quentin (OpenERP)" Date: Wed, 18 Jul 2012 12:13:39 +0200 Subject: [PATCH 106/150] [FIX] account: date_stop is required on account.period, there is no need to check if it's filled\! bzr revid: qdp-launchpad@openerp.com-20120718101339-qe7sfe5ql370fn8j --- addons/account/account_view.xml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/addons/account/account_view.xml b/addons/account/account_view.xml index e1cf268115b..8ed796eebd7 100644 --- a/addons/account/account_view.xml +++ b/addons/account/account_view.xml @@ -107,10 +107,9 @@ - From 0f74f43fdf3372adc582f559a9dc787402371f12 Mon Sep 17 00:00:00 2001 From: "Quentin (OpenERP)" Date: Wed, 18 Jul 2012 12:15:07 +0200 Subject: [PATCH 107/150] [FIX] account: bad merge had duplicated some fields\! bzr revid: qdp-launchpad@openerp.com-20120718101507-lj66v0k3lm2tt5av --- addons/account/account_view.xml | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/addons/account/account_view.xml b/addons/account/account_view.xml index 8ed796eebd7..0172fa7429a 100644 --- a/addons/account/account_view.xml +++ b/addons/account/account_view.xml @@ -627,13 +627,8 @@
- - + @@ -1441,7 +1435,7 @@ - + From 87d0d213ea061e90f041993eea5bec138763f808 Mon Sep 17 00:00:00 2001 From: "Quentin (OpenERP)" Date: Wed, 18 Jul 2012 12:16:26 +0200 Subject: [PATCH 108/150] [FIX] account: bad parameters during string formatting\!\!\! bzr revid: qdp-launchpad@openerp.com-20120718101626-4h0z8qyq8mx1jg5h --- addons/account/wizard/account_move_journal.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/account/wizard/account_move_journal.py b/addons/account/wizard/account_move_journal.py index 5986bfc3bd3..66f634bd59f 100644 --- a/addons/account/wizard/account_move_journal.py +++ b/addons/account/wizard/account_move_journal.py @@ -115,7 +115,7 @@ class account_move_journal(osv.osv_memory): or From 803220f3b7c893824cecb09763155a99436a1524 Mon Sep 17 00:00:00 2001 From: "Quentin (OpenERP)" Date: Wed, 18 Jul 2012 12:21:09 +0200 Subject: [PATCH 115/150] [IMP] account: usability, review of form views bzr revid: qdp-launchpad@openerp.com-20120718102109-prtl3sb28xehgnlh --- addons/account/account_view.xml | 7 ++++--- addons/account/wizard/account_chart_view.xml | 5 ++--- addons/account/wizard/account_report_common_view.xml | 2 +- addons/account/wizard/account_use_model_view.xml | 4 ++-- addons/account_voucher/account_voucher_view.xml | 2 +- 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/addons/account/account_view.xml b/addons/account/account_view.xml index 0172fa7429a..ecdcdaf4924 100644 --- a/addons/account/account_view.xml +++ b/addons/account/account_view.xml @@ -2603,20 +2603,21 @@ action = pool.get('res.config').next(cr, uid, [], context)
@@ -30,7 +30,7 @@ - Select an Accounting Setup + Chart of Accounts account.chart form tree,form @@ -41,7 +41,6 @@ diff --git a/addons/account/wizard/account_report_common_view.xml b/addons/account/wizard/account_report_common_view.xml index aa09e7fd3a8..18953270e09 100644 --- a/addons/account/wizard/account_report_common_view.xml +++ b/addons/account/wizard/account_report_common_view.xml @@ -26,7 +26,7 @@ - + diff --git a/addons/account/wizard/account_use_model_view.xml b/addons/account/wizard/account_use_model_view.xml index b128292271c..6170ca4fe12 100644 --- a/addons/account/wizard/account_use_model_view.xml +++ b/addons/account/wizard/account_use_model_view.xml @@ -8,8 +8,8 @@ form
- - + +
+ + - Compabitiliby configuration wizard - ir.actions.configuration.wizard - form - -
-
-
- - - -
- + Compabitiliby configuration wizard + ir.actions.configuration.wizard + form + +
+ + + +
+
+
+ - Inheritable view for installer objects - res.config.installer - form - -
-
-
- - -
+ Inheritable view for installer objects + res.config.installer + form + +
+ +
+
+ +
- + From 8c403c671c20a0b45adb367b5510f8a6f91ad8a2 Mon Sep 17 00:00:00 2001 From: Raphael Collet Date: Wed, 18 Jul 2012 15:08:22 +0200 Subject: [PATCH 124/150] [FIX] in all wizards, move buttons to footer bzr revid: rco@openerp.com-20120718130822-wn71hhjukhqblijc --- addons/plugin_outlook/plugin_outlook.xml | 2 +- addons/plugin_thunderbird/plugin_thunderbird.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/addons/plugin_outlook/plugin_outlook.xml b/addons/plugin_outlook/plugin_outlook.xml index 0340a7c502f..811661bf127 100644 --- a/addons/plugin_outlook/plugin_outlook.xml +++ b/addons/plugin_outlook/plugin_outlook.xml @@ -14,7 +14,7 @@ - + diff --git a/addons/plugin_thunderbird/plugin_thunderbird.xml b/addons/plugin_thunderbird/plugin_thunderbird.xml index fef7772dfdf..69e83bf6df2 100644 --- a/addons/plugin_thunderbird/plugin_thunderbird.xml +++ b/addons/plugin_thunderbird/plugin_thunderbird.xml @@ -14,7 +14,7 @@ - + From 6001d4fcb4e8b7eebe83789f44219a76b489355f Mon Sep 17 00:00:00 2001 From: niv-openerp Date: Wed, 18 Jul 2012 15:27:35 +0200 Subject: [PATCH 125/150] [FIX] temporarily desactivate commits 2748 & 2747 because there are problems with werkzeug versions bzr revid: nicolas.vanhoren@openerp.com-20120718132735-t2lg790pl9g4ccgj --- addons/web/common/http.py | 71 +-------------------------------------- 1 file changed, 1 insertion(+), 70 deletions(-) diff --git a/addons/web/common/http.py b/addons/web/common/http.py index cd17f5711e0..cc76a554693 100644 --- a/addons/web/common/http.py +++ b/addons/web/common/http.py @@ -452,7 +452,7 @@ class Root(object): static_dirs = self._load_addons(openerp_addons_namespace) if options.serve_static: - self.dispatch = SuperSharedDataMiddleware( + self.dispatch = werkzeug.wsgi.SharedDataMiddleware( self.dispatch, static_dirs, cache=False) if options.session_storage: @@ -555,75 +555,6 @@ class Root(object): return m ps, _slash, meth = ps.rpartition('/') return None - -class SuperSharedDataMiddleware(werkzeug.wsgi.SharedDataMiddleware): - """Redefine SharedDataMiddleware to better handle the cache = False directive. - Also desactivate 304 Not Modified headers only when the referer has 'debug' in its - arguments. - """ - def __call__(self, environ, start_response): - import os - import mimetypes - import werkzeug.http - import urlparse - # sanitize the path for non unix systems - cleaned_path = environ.get('PATH_INFO', '').strip('/') - for sep in os.sep, os.altsep: - if sep and sep != '/': - cleaned_path = cleaned_path.replace(sep, '/') - path = '/'.join([''] + [x for x in cleaned_path.split('/') - if x and x != '..']) - file_loader = None - for search_path, loader in self.exports.iteritems(): - if search_path == path: - real_filename, file_loader = loader(None) - if file_loader is not None: - break - if not search_path.endswith('/'): - search_path += '/' - if path.startswith(search_path): - real_filename, file_loader = loader(path[len(search_path):]) - if file_loader is not None: - break - if file_loader is None or not self.is_allowed(real_filename): - return self.app(environ, start_response) - - guessed_type = mimetypes.guess_type(real_filename) - mime_type = guessed_type[0] or self.fallback_mimetype - f, mtime, file_size = file_loader() - - etag = self.generate_etag(mtime, file_size, real_filename) - modified = werkzeug.http.is_resource_modified(environ, etag, last_modified=mtime) - - headers = [('Date', werkzeug.http.http_date())] - if self.cache: - timeout = self.cache_timeout - headers += [ - ('Etag', '"%s"' % etag), - ('Cache-Control', 'max-age=%d, public' % timeout) - ] - if modified: - headers.append(('Expires', werkzeug.http.http_date(time() + timeout))) - else: - headers.append(('Cache-Control', 'no-cache')) - - referer = environ.get('HTTP_REFERER', '') - parsed = urlparse.urlparse(referer) - debug = not urlparse.parse_qs(parsed.query).has_key('debug') - # it's important to put it at the end - if not debug and not modified: - f.close() - start_response('304 Not Modified', headers) - return [] - - headers.extend(( - ('Content-Type', mime_type), - ('Content-Length', str(file_size)), - ('Last-Modified', werkzeug.http.http_date(mtime)) - )) - start_response('200 OK', headers) - return werkzeug.wsgi.wrap_file(environ, f) - class LibException(Exception): """ Base of all client lib exceptions """ From 26665b774376068a93b887a2818ae98a22f23ae7 Mon Sep 17 00:00:00 2001 From: Raphael Collet Date: Wed, 18 Jul 2012 15:50:10 +0200 Subject: [PATCH 126/150] [IMP] after a module installation, reload the client and open the menu Feeds bzr revid: rco@openerp.com-20120718135010-4933mmgw3n18epvy --- openerp/addons/base/module/module.py | 28 +++------------------------ openerp/addons/base/res/res_config.py | 12 ++++++++---- 2 files changed, 11 insertions(+), 29 deletions(-) diff --git a/openerp/addons/base/module/module.py b/openerp/addons/base/module/module.py index fde8fcf5b9a..1a0932ac7cf 100644 --- a/openerp/addons/base/module/module.py +++ b/openerp/addons/base/module/module.py @@ -363,8 +363,9 @@ class module(osv.osv): if config.get('type') not in ('ir.actions.reload', 'ir.actions.act_window_close'): return config - # reload the client - menu_ids = self.root_menus(cr,uid,ids,context) + # reload the client; open the first available root menu + menu_obj = self.pool.get('ir.ui.menu') + menu_ids = menu_obj.search(cr, uid, [('parent_id', '=', False)], context=context) return { 'type': 'ir.actions.client', 'tag': 'reload', @@ -649,29 +650,6 @@ class module(osv.osv): _logger.critical('module %s: invalid quality certificate: %s', mod.name, mod.certificate) raise osv.except_osv(_('Error'), _('Module %s: Invalid Quality Certificate') % (mod.name,)) - def root_menus(self, cr, uid, ids, context=None): - """ Return root menu ids the menus created by the modules whose ids are - provided. - - :param list[int] ids: modules to get menus from - """ - values = self.read(cr, uid, ids, ['name'], context=context) - module_names = [i['name'] for i in values] - - ids = self.pool.get('ir.model.data').search(cr, uid, [ ('model', '=', 'ir.ui.menu'), ('module', 'in', module_names) ], context=context) - values = self.pool.get('ir.model.data').read(cr, uid, ids, ['res_id'], context=context) - all_menu_ids = [i['res_id'] for i in values] - - root_menu_ids = [] - for menu in self.pool.get('ir.ui.menu').browse(cr, uid, all_menu_ids, context=context): - while menu.parent_id: - menu = menu.parent_id - if not menu.id in root_menu_ids: - root_menu_ids.append((menu.sequence,menu.id)) - root_menu_ids.sort() - root_menu_ids = [i[1] for i in root_menu_ids] - return root_menu_ids - class module_dependency(osv.osv): _name = "ir.module.module.dependency" _description = "Module dependency" diff --git a/openerp/addons/base/res/res_config.py b/openerp/addons/base/res/res_config.py index 9277184a822..3f4a052a36b 100644 --- a/openerp/addons/base/res/res_config.py +++ b/openerp/addons/base/res/res_config.py @@ -70,10 +70,14 @@ class res_config_configurable(osv.osv_memory): res = next.action_launch(context=context) res['nodestroy'] = False return res - #if there is no next action and if html is in the context: reload instead of closing - if context and 'html' in context: - return {'type' : 'ir.actions.reload'} - return {'type' : 'ir.actions.act_window_close'} + # reload the client; open the first available root menu + menu_obj = self.pool.get('ir.ui.menu') + menu_ids = menu_obj.search(cr, uid, [('parent_id', '=', False)], context=context) + return { + 'type': 'ir.actions.client', + 'tag': 'reload', + 'params': {'menu_id': menu_ids and menu_ids[0] or False}, + } def start(self, cr, uid, ids, context=None): return self.next(cr, uid, ids, context) From 531444a6f6b1d94e8ab4893a8f976e32e038bfff Mon Sep 17 00:00:00 2001 From: Raphael Collet Date: Wed, 18 Jul 2012 15:51:02 +0200 Subject: [PATCH 127/150] [IMP] account: do not open a non-existing view after setting taxes bzr revid: rco@openerp.com-20120718135102-34gvep3dbpqznozc --- addons/account/account.py | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/addons/account/account.py b/addons/account/account.py index b6fd7232a25..fab9de5407c 100644 --- a/addons/account/account.py +++ b/addons/account/account.py @@ -3351,15 +3351,7 @@ class wizard_multi_charts_accounts(osv.osv_memory): # Create Bank journals self._create_bank_journals_from_o2m(cr, uid, obj_wizard, company_id, acc_template_ref, context=context) - action = { - 'type': 'ir.actions.act_window', - 'view_type': 'form', - 'view_mode': 'form', - 'res_model': 'board.board', - 'view_id': self.pool.get('ir.model.data').get_object_reference(cr, uid, 'account', 'board_account_form')[1], - 'menu_id': self.pool.get('ir.model.data').get_object_reference(cr, uid, 'account', 'menu_finance')[1] - } - return action + return {} def _prepare_bank_journal(self, cr, uid, line, current_num, default_account_id, company_id, context=None): ''' From bfe3afcbd8ac214487c57731c850c199f8a6a3c5 Mon Sep 17 00:00:00 2001 From: Minh Tran Date: Wed, 18 Jul 2012 15:55:03 +0200 Subject: [PATCH 128/150] improved project kanban vignette bzr revid: mit@openerp.com-20120718135503-gi222ulbtmhyesq8 --- addons/web_kanban/static/src/css/kanban.css | 3 +++ addons/web_kanban/static/src/css/kanban.sass | 3 +++ 2 files changed, 6 insertions(+) diff --git a/addons/web_kanban/static/src/css/kanban.css b/addons/web_kanban/static/src/css/kanban.css index 36dbab57559..5a7c1b84067 100644 --- a/addons/web_kanban/static/src/css/kanban.css +++ b/addons/web_kanban/static/src/css/kanban.css @@ -401,6 +401,9 @@ position: relative; top: 2px; } +.openerp .oe_kanban_view .oe_kanban_project_times li { + float: left; +} .openerp .oe_kanban_view .oe_kanban_status { position: relative; top: 4px; diff --git a/addons/web_kanban/static/src/css/kanban.sass b/addons/web_kanban/static/src/css/kanban.sass index f4c13cc7bd2..cea95f2ce53 100644 --- a/addons/web_kanban/static/src/css/kanban.sass +++ b/addons/web_kanban/static/src/css/kanban.sass @@ -336,6 +336,9 @@ float: right position: relative top: 2px + + .oe_kanban_project_times li + float: left .oe_kanban_status position: relative From 607c1670314a00cb3cd5b28ba495f950104d776f Mon Sep 17 00:00:00 2001 From: Minh Tran Date: Wed, 18 Jul 2012 15:55:14 +0200 Subject: [PATCH 129/150] improved project kanban vignette bzr revid: mit@openerp.com-20120718135514-ojyvli4qyresvsmf --- addons/project/project_view.xml | 28 +++++++++++++++------------- 1 file changed, 15 insertions(+), 13 deletions(-) diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml index a70bc504299..dbc4007bf8c 100644 --- a/addons/project/project_view.xml +++ b/addons/project/project_view.xml @@ -521,6 +521,15 @@