From c9f3b0f46a833adb32e11ccdddd03c2fc9afcbfc Mon Sep 17 00:00:00 2001 From: florian da Costa Date: Mon, 27 Feb 2012 16:06:20 -0300 Subject: [PATCH 001/149] [FIX] fixed sale order line properties not copied in procurement bug lp bug: https://launchpad.net/bugs/926107 fixed bzr revid: florian.dacosta@akretion.com.br-20120227190620-ltdpop07hggjc9lb --- addons/sale/sale.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/addons/sale/sale.py b/addons/sale/sale.py index 82bfda7b580..5dca3d432f0 100644 --- a/addons/sale/sale.py +++ b/addons/sale/sale.py @@ -720,7 +720,8 @@ class sale_order(osv.osv): 'procure_method': line.type, 'move_id': move_id, 'company_id': order.company_id.id, - 'note': line.notes + 'note': line.notes, + 'property_ids': [(6, 0, [x.id for x in line.property_ids])] } def _prepare_order_line_move(self, cr, uid, order, line, picking_id, date_planned, context=None): From 5ba6b775acbedf74eac34fa1bc52a809585e96ff Mon Sep 17 00:00:00 2001 From: "Bhumi Thakkar (Open ERP)" Date: Tue, 8 May 2012 19:02:10 +0530 Subject: [PATCH 002/149] [IMP] Image displayed in kanban. bzr revid: bth@tinyerp.com-20120508133210-hs3ku34n957fkxvk --- addons/web_kanban/static/src/js/kanban.js | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/addons/web_kanban/static/src/js/kanban.js b/addons/web_kanban/static/src/js/kanban.js index 928a06d8ba2..f402573b4fc 100644 --- a/addons/web_kanban/static/src/js/kanban.js +++ b/addons/web_kanban/static/src/js/kanban.js @@ -581,10 +581,14 @@ instance.web_kanban.KanbanRecord = instance.web.OldWidget.extend({ }, kanban_image: function(model, field, id) { id = id || ''; - var url = instance.connection.prefix + '/web/binary/image?session_id=' + this.session.session_id + '&model=' + model + '&field=' + field + '&id=' + id; - if (this.record.__last_update && this.record.__last_update.raw_value) { - var time = instance.web.str_to_datetime(this.record.__last_update.raw_value).getTime(); - url += '&t=' + time; + if (typeof(id)=="string" && this.record[field].value && this.record[field].value.substr(0, 10).indexOf(' ') == -1) { + url = 'data:image/png;base64,' + this.record[field].value; + }else{ + var url = instance.connection.prefix + '/web/binary/image?session_id=' + this.session.session_id + '&model=' + model + '&field=' + field + '&id=' + id; + if (this.record.__last_update && this.record.__last_update.raw_value) { + var time = instance.web.str_to_datetime(this.record.__last_update.raw_value).getTime(); + url += '&t=' + time; + } } return url; }, From 4afcce3a4722cddef89a1548cfd406960f8e9c23 Mon Sep 17 00:00:00 2001 From: Alexis de Lattre <> Date: Mon, 21 May 2012 11:57:36 +0530 Subject: [PATCH 003/149] [FIX] the problem of Empty list of journals when trying to create invoice from picking lp bug: https://launchpad.net/bugs/1001806 fixed bzr revid: rmu@tinyerp.com-20120521062736-qkd3d20k0pxzn2l8 --- addons/stock/wizard/stock_invoice_onshipping.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/stock/wizard/stock_invoice_onshipping.py b/addons/stock/wizard/stock_invoice_onshipping.py index 46c55311045..ca294f8ec79 100644 --- a/addons/stock/wizard/stock_invoice_onshipping.py +++ b/addons/stock/wizard/stock_invoice_onshipping.py @@ -36,7 +36,7 @@ class stock_invoice_onshipping(osv.osv_memory): context = {} model = context.get('active_model') - if not model or model != 'stock.picking': + if not model or 'stock.picking' not in model: return [] model_pool = self.pool.get(model) From 70b78feb630a35f34312229fbd3e7ea805fc9bed Mon Sep 17 00:00:00 2001 From: "Jiten (OpenERP)" Date: Fri, 22 Jun 2012 11:44:47 +0530 Subject: [PATCH 004/149] [IMP] Improved kanban_image for o2m list(e.g. contacts of company). bzr revid: jra@tinyerp.com-20120622061447-kszcg6tq9q5qjctr --- addons/web_kanban/static/src/js/kanban.js | 3 +++ 1 file changed, 3 insertions(+) diff --git a/addons/web_kanban/static/src/js/kanban.js b/addons/web_kanban/static/src/js/kanban.js index 6811953465d..483f84aa3c5 100644 --- a/addons/web_kanban/static/src/js/kanban.js +++ b/addons/web_kanban/static/src/js/kanban.js @@ -718,6 +718,9 @@ instance.web_kanban.KanbanRecord = instance.web.OldWidget.extend({ // Set the cache duration in seconds. url += '&cache=' + parseInt(cache, 10); } + if (typeof(id)=="string" && this.record[field].value && this.record[field].value.substr(0, 10).indexOf(' ') == -1) { + url = 'data:image/png;base64,' + this.record[field].value; + } return url; }, kanban_text_ellipsis: function(s, size) { From 07e5b120e608f43973c7250b831800ca637d2e5b Mon Sep 17 00:00:00 2001 From: "Bharat Devnani (OpenERP)" Date: Fri, 22 Jun 2012 17:16:01 +0530 Subject: [PATCH 005/149] [IMP] improved the view of project related modules bzr revid: bde@tinyerp.com-20120622114601-58ivi12560qpw51l --- addons/project/project_view.xml | 2 +- addons/project_issue/project_issue_view.xml | 5 ++++- .../project_issue_sheet_view.xml | 14 +++++++++----- .../project_long_term/project_long_term_view.xml | 4 ++-- 4 files changed, 16 insertions(+), 9 deletions(-) diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml index f883f007bd6..f6c72655a41 100644 --- a/addons/project/project_view.xml +++ b/addons/project/project_view.xml @@ -361,10 +361,10 @@ + - diff --git a/addons/project_issue/project_issue_view.xml b/addons/project_issue/project_issue_view.xml index 2b93cfec105..5b48fc8d987 100644 --- a/addons/project_issue/project_issue_view.xml +++ b/addons/project_issue/project_issue_view.xml @@ -90,7 +90,6 @@ - @@ -111,6 +110,10 @@ + + + + diff --git a/addons/project_issue_sheet/project_issue_sheet_view.xml b/addons/project_issue_sheet/project_issue_sheet_view.xml index 2a98f186922..d883fadf2d9 100644 --- a/addons/project_issue_sheet/project_issue_sheet_view.xml +++ b/addons/project_issue_sheet/project_issue_sheet_view.xml @@ -10,11 +10,15 @@ on_change_project(project_id) - - - + + + + + + + diff --git a/addons/project_long_term/project_long_term_view.xml b/addons/project_long_term/project_long_term_view.xml index 18babab66a4..8750c98728f 100644 --- a/addons/project_long_term/project_long_term_view.xml +++ b/addons/project_long_term/project_long_term_view.xml @@ -212,7 +212,7 @@ - +

@@ -325,7 +325,7 @@ form - + From 3ed27adc6d269e7a911d54f97f91def721a9be48 Mon Sep 17 00:00:00 2001 From: "Bharat Devnani (OpenERP)" Date: Fri, 22 Jun 2012 18:55:36 +0530 Subject: [PATCH 006/149] [IMP] improved views of project module under configuration wizard bzr revid: bde@tinyerp.com-20120622132536-3ig2s3zwm0n1x06n --- addons/hr_holidays/hr_holidays_view.xml | 4 ++-- addons/resource/resource_view.xml | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/addons/hr_holidays/hr_holidays_view.xml b/addons/hr_holidays/hr_holidays_view.xml index edfff777c3e..31d30fc1d94 100644 --- a/addons/hr_holidays/hr_holidays_view.xml +++ b/addons/hr_holidays/hr_holidays_view.xml @@ -449,8 +449,8 @@ form - - + + diff --git a/addons/resource/resource_view.xml b/addons/resource/resource_view.xml index 4da1a465c42..f3c7deaa994 100644 --- a/addons/resource/resource_view.xml +++ b/addons/resource/resource_view.xml @@ -117,7 +117,7 @@ resource.calendar.attendance tree - + @@ -229,12 +229,12 @@ - - - + + + From 83d2af86765314ee40dac91a7dbc0e1f0f4a3414 Mon Sep 17 00:00:00 2001 From: "Bharat Devnani (OpenERP)" Date: Mon, 25 Jun 2012 13:00:40 +0530 Subject: [PATCH 007/149] [IMP] improved view for date fields bzr revid: bde@tinyerp.com-20120625073040-mtdcgxi9tkjqg0a1 --- addons/resource/resource_view.xml | 28 ++++++++++++++++++---------- 1 file changed, 18 insertions(+), 10 deletions(-) diff --git a/addons/resource/resource_view.xml b/addons/resource/resource_view.xml index f3c7deaa994..003bbd8810c 100644 --- a/addons/resource/resource_view.xml +++ b/addons/resource/resource_view.xml @@ -120,8 +120,8 @@ - - + + @@ -132,11 +132,16 @@ form
- - - - - + + + + + @@ -232,9 +237,12 @@ - - - + + From 145656b555cc61e5d2d9154d3c127c73522c6f3e Mon Sep 17 00:00:00 2001 From: "Foram Katharotiya (OpenERP)" Date: Tue, 26 Jun 2012 15:56:18 +0530 Subject: [PATCH 008/149] [IMP] change form view of registration in event module bzr revid: fka@tinyerp.com-20120626102618-py2cnj472tzofwbw --- addons/event/event_view.xml | 86 +++++++++++++++++++------------------ 1 file changed, 45 insertions(+), 41 deletions(-) diff --git a/addons/event/event_view.xml b/addons/event/event_view.xml index ed539e7bf39..c577c43a2e2 100644 --- a/addons/event/event_view.xml +++ b/addons/event/event_view.xml @@ -362,50 +362,54 @@ From 1a2c33faa2fcd3112c76b287c19cd3be0538e728 Mon Sep 17 00:00:00 2001 From: Fabien Meghazi Date: Thu, 5 Jul 2012 10:04:50 +0200 Subject: [PATCH 048/149] [WIP] breadcrumb bzr revid: fme@openerp.com-20120705080450-j1o7p0vebjtd4ch3 --- addons/web/static/src/js/view_form.js | 2 ++ addons/web/static/src/js/views.js | 45 +++++++++++++++++---------- 2 files changed, 31 insertions(+), 16 deletions(-) diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js index d40a1760e81..607f3283179 100644 --- a/addons/web/static/src/js/view_form.js +++ b/addons/web/static/src/js/view_form.js @@ -287,10 +287,12 @@ instance.web.FormView = instance.web.View.extend(instance.web.form.FieldManagerM on_record_loaded: function(record) { var self = this, set_values = []; if (!record) { + this.set({ 'title' : undefined }); this.do_warn("Form", "The record could not be found in the database.", true); return $.Deferred().reject(); } this.datarecord = record; + this.set({ 'title' : record.id ? record.name : "New record" }); if (this.qweb) { this.kill_current_form(); diff --git a/addons/web/static/src/js/views.js b/addons/web/static/src/js/views.js index 368dd5e840c..f4ec3d4458d 100644 --- a/addons/web/static/src/js/views.js +++ b/addons/web/static/src/js/views.js @@ -156,25 +156,44 @@ instance.web.ActionManager = instance.web.Widget.extend({ } else { this.dialog_stop(); //this.content_stop(); - this.breadcrumb.hide_all(); + this.breadcrumb.hide_items(); if(action.menu_id) { return this.getParent().do_action(action, function () { instance.webclient.menu.open_menu(action.menu_id); }); } this.inner_action = action; - this.inner_viewmanager = new instance.web.ViewManagerAction(this, action); + var inner_viewmanager = this.inner_viewmanager = new instance.web.ViewManagerAction(this, action); this.inner_viewmanager.appendTo(this.$element); this.inner_viewmanager.$element.addClass("oe_view_manager_" + action.target); + this.breadcrumb.push({ - widget: this.inner_viewmanager, + widget: inner_viewmanager, + show: function() { + inner_viewmanager.$element.show(); + inner_viewmanager.on_mode_switch(action.view_mode.split(',')[0]); + }, action: action, title: action.name }); - // show - // hide - // destroy - // title // all view get_title ?? + inner_viewmanager.on_mode_switch.add_first(function(mode) { + if (mode === 'form' && !inner_viewmanager.views[mode].controller) { + self.breadcrumb.push({ + widget: inner_viewmanager, + show: function() { + inner_viewmanager.$element.show(); + inner_viewmanager.on_mode_switch('form'); + }, + action: action, + get_title: function() { + var form = inner_viewmanager.views['form'].controller; + if (form) { + return form.get('title'); + } + } + }); + } + }); } }, ir_actions_act_window_close: function (action, on_closed) { @@ -195,7 +214,7 @@ instance.web.ActionManager = instance.web.Widget.extend({ ir_actions_client: function (action) { //this.content_stop(); this.dialog_stop(); - this.breadcrumb.hide_all(); + this.breadcrumb.hide_items(); var ClientWidget = instance.web.client_actions.get_object(action.tag); (this.client_widget = new ClientWidget(this, action.params)).appendTo(this.$element); this.breadcrumb.push({ @@ -260,7 +279,7 @@ instance.web.BreadCrumb = instance.web.CallbackEnabled.extend({ } if (!item.get_title) { item.get_title = function() { - return item.action.name; + return item.title || item.action.name; }; } this.items.push(item); @@ -270,7 +289,7 @@ instance.web.BreadCrumb = instance.web.CallbackEnabled.extend({ this.remove_item(this.items.length - 1); this.select_item(this.items.length - 1); }, - hide_all: function() { + hide_items: function() { _.each(this.items, function(i) { i.hide(); }); @@ -1164,12 +1183,6 @@ instance.web.View = instance.web.Widget.extend({ } this.translate_dialog.open(field); }, - /** - * Get the title of the view - */ - get_title: function() { - return ""; - }, /** * Fetches and executes the action identified by ``action_data``. * From c5d9158a292c6439d4192cbd2601b15ae9ee51b5 Mon Sep 17 00:00:00 2001 From: "Kuldeep Joshi (OpenERP)" Date: Thu, 5 Jul 2012 14:38:30 +0530 Subject: [PATCH 049/149] [IMP]event: remove conflict bzr revid: kjo@tinyerp.com-20120705090830-trou4tqk01ylqqqh --- addons/event/event_view.xml | 51 ++++--------------------------------- 1 file changed, 5 insertions(+), 46 deletions(-) diff --git a/addons/event/event_view.xml b/addons/event/event_view.xml index 34b3b6b71ad..1019706f8db 100644 --- a/addons/event/event_view.xml +++ b/addons/event/event_view.xml @@ -462,9 +462,8 @@ -<<<<<<< TREE -
@@ -403,11 +400,9 @@ states="cancel,done"/> -->