From c9f3b0f46a833adb32e11ccdddd03c2fc9afcbfc Mon Sep 17 00:00:00 2001 From: florian da Costa Date: Mon, 27 Feb 2012 16:06:20 -0300 Subject: [PATCH 01/97] [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 02/97] [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 03/97] [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 04/97] [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 145656b555cc61e5d2d9154d3c127c73522c6f3e Mon Sep 17 00:00:00 2001 From: "Foram Katharotiya (OpenERP)" Date: Tue, 26 Jun 2012 15:56:18 +0530 Subject: [PATCH 05/97] [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 c5d9158a292c6439d4192cbd2601b15ae9ee51b5 Mon Sep 17 00:00:00 2001 From: "Kuldeep Joshi (OpenERP)" Date: Thu, 5 Jul 2012 14:38:30 +0530 Subject: [PATCH 33/97] [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 -