From f693a7d9003283e9da6e911562a60ef41047923d Mon Sep 17 00:00:00 2001 From: "Ravish Murari (OpenERP)" Date: Wed, 25 Jul 2012 18:47:51 +0530 Subject: [PATCH 01/12] [FIX] When duplication of event on calender The invitations are there but not shown on the calendar lp bug: https://launchpad.net/bugs/1028825 fixed bzr revid: rmu@tinyerp.com-20120725131751-26slqnee04irjt7m --- addons/base_calendar/crm_meeting.py | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/addons/base_calendar/crm_meeting.py b/addons/base_calendar/crm_meeting.py index 239ab8d0f28..c34968a14a0 100644 --- a/addons/base_calendar/crm_meeting.py +++ b/addons/base_calendar/crm_meeting.py @@ -65,6 +65,11 @@ class crm_meeting(base_state, osv.Model): _defaults = { 'state': 'draft', } + + def copy(self, cr, uid, id, default=None, context=None): + default = default or {} + default.update({'attendee_ids' : []}) + return super(crm_meeting, self).copy(cr, uid, id, default, context) # ---------------------------------------- # OpenChatter From ce3ebe5cebf8b040dae066ac8077aacf4aed2b3d Mon Sep 17 00:00:00 2001 From: "Bhumi Thakkar (Open ERP)" Date: Tue, 11 Sep 2012 12:12:51 +0530 Subject: [PATCH 02/12] [IMP] For firefox browser css apply on blockUI. bzr revid: bth@tinyerp.com-20120911064251-vh6j1au1lzpj0k44 --- addons/web/static/lib/jquery.blockUI/jquery.blockUI.js | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/addons/web/static/lib/jquery.blockUI/jquery.blockUI.js b/addons/web/static/lib/jquery.blockUI/jquery.blockUI.js index 04db883c76e..6aba71ec58d 100644 --- a/addons/web/static/lib/jquery.blockUI/jquery.blockUI.js +++ b/addons/web/static/lib/jquery.blockUI/jquery.blockUI.js @@ -260,13 +260,14 @@ function install(el, opts) { lyr3.css(themedCSS); lyr3.addClass('ui-widget-content'); } - else + else lyr3.css(css); } - // style the overlay if (!opts.theme && (!opts.applyPlatformOpacityRules || !($.browser.mozilla && /Linux/.test(navigator.platform)))) - lyr2.css(opts.overlayCSS); + lyr2.css(opts.overlayCSS); + if ($.browser.mozilla && /Linux/.test(navigator.platform)) + lyr2.css(opts.overlayCSS); lyr2.css('position', full ? 'fixed' : 'absolute'); // make iframe layer transparent in IE From 75de060cd836578962788a61c4a2728aedd95d80 Mon Sep 17 00:00:00 2001 From: "Bhumi Thakkar (Open ERP)" Date: Tue, 11 Sep 2012 12:27:11 +0530 Subject: [PATCH 03/12] [IMP] Indentation. bzr revid: bth@tinyerp.com-20120911065711-hm4ka55a3g4g6e9j --- addons/web/static/lib/jquery.blockUI/jquery.blockUI.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/addons/web/static/lib/jquery.blockUI/jquery.blockUI.js b/addons/web/static/lib/jquery.blockUI/jquery.blockUI.js index 6aba71ec58d..58c11f46f9f 100644 --- a/addons/web/static/lib/jquery.blockUI/jquery.blockUI.js +++ b/addons/web/static/lib/jquery.blockUI/jquery.blockUI.js @@ -265,9 +265,9 @@ function install(el, opts) { } // style the overlay if (!opts.theme && (!opts.applyPlatformOpacityRules || !($.browser.mozilla && /Linux/.test(navigator.platform)))) - lyr2.css(opts.overlayCSS); + lyr2.css(opts.overlayCSS); if ($.browser.mozilla && /Linux/.test(navigator.platform)) - lyr2.css(opts.overlayCSS); + lyr2.css(opts.overlayCSS); lyr2.css('position', full ? 'fixed' : 'absolute'); // make iframe layer transparent in IE From 84ae2ce144cb39256e6d0cc0056ef29664a0548f Mon Sep 17 00:00:00 2001 From: "Bhumi Thakkar (Open ERP)" Date: Tue, 11 Sep 2012 15:15:08 +0530 Subject: [PATCH 04/12] [IMP] Pass parameter for clear_breadcrumbs with server action. bzr revid: bth@tinyerp.com-20120911094508-eby3d04wo4cevhzn --- addons/web/static/src/js/views.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/web/static/src/js/views.js b/addons/web/static/src/js/views.js index 90709276bdf..b2d80489e5f 100644 --- a/addons/web/static/src/js/views.js +++ b/addons/web/static/src/js/views.js @@ -327,7 +327,7 @@ instance.web.ActionManager = instance.web.Widget.extend({ } this.dialog_stop(); }, - ir_actions_server: function (action, on_closed) { + ir_actions_server: function (action, on_closed, clear_breadcrumbs) { var self = this; this.rpc('/web/action/run', { action_id: action.id, From 228a19d6c2c115367299ddd262e7bd8f34eeef79 Mon Sep 17 00:00:00 2001 From: "Bhumi Thakkar (Open ERP)" Date: Thu, 13 Sep 2012 16:04:47 +0530 Subject: [PATCH 05/12] [IMP] In help field define type='html'. bzr revid: bth@tinyerp.com-20120913103447-ag5p3yhzi59tp3uo --- addons/procurement/procurement_view.xml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/addons/procurement/procurement_view.xml b/addons/procurement/procurement_view.xml index 432ff13aaa5..ba0d4506709 100644 --- a/addons/procurement/procurement_view.xml +++ b/addons/procurement/procurement_view.xml @@ -166,7 +166,9 @@ tree,form {'search_default_perm_exceptions':1} - Procurement Orders represent the need for a certain quantity of products, at a given time, in a given location. Sales Orders are one typical source of Procurement Orders (but these are distinct documents). Depending on the procurement parameters and the product configuration, the procurement engine will attempt to satisfy the need by reserving products from stock, ordering products from a supplier, or passing a manufacturing order, etc. A Procurement Exception occurs when the system cannot find a way to fulfill a procurement. Some exceptions will resolve themselves automatically, but others require manual intervention (those are identified by a specific error message). + + Procurement Orders represent the need for a certain quantity of products, at a given time, in a given location. Sales Orders are one typical source of Procurement Orders (but these are distinct documents). Depending on the procurement parameters and the product configuration, the procurement engine will attempt to satisfy the need by reserving products from stock, ordering products from a supplier, or passing a manufacturing order, etc. A Procurement Exception occurs when the system cannot find a way to fulfill a procurement. Some exceptions will resolve themselves automatically, but others require manual intervention (those are identified by a specific error message). + From ed7a980a8556e7ea0ab5840d130f9accc83bf7ff Mon Sep 17 00:00:00 2001 From: "Jiten (OpenERP)" Date: Fri, 14 Sep 2012 14:58:32 +0530 Subject: [PATCH 06/12] [IMP] minor change to add

on text context. bzr revid: jra@tinyerp.com-20120914092832-sbu30zjrkx5y2j18 --- addons/procurement/procurement_view.xml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/addons/procurement/procurement_view.xml b/addons/procurement/procurement_view.xml index ba0d4506709..bf73b383216 100644 --- a/addons/procurement/procurement_view.xml +++ b/addons/procurement/procurement_view.xml @@ -167,7 +167,9 @@ {'search_default_perm_exceptions':1} +

Procurement Orders represent the need for a certain quantity of products, at a given time, in a given location. Sales Orders are one typical source of Procurement Orders (but these are distinct documents). Depending on the procurement parameters and the product configuration, the procurement engine will attempt to satisfy the need by reserving products from stock, ordering products from a supplier, or passing a manufacturing order, etc. A Procurement Exception occurs when the system cannot find a way to fulfill a procurement. Some exceptions will resolve themselves automatically, but others require manual intervention (those are identified by a specific error message). +

From 8ad2786b5c025aed1170c92dd41a5870c0328aa8 Mon Sep 17 00:00:00 2001 From: "Jiten (OpenERP)" Date: Fri, 14 Sep 2012 18:40:58 +0530 Subject: [PATCH 07/12] [FIX] Fix the issue of dashboard giving traceback for knowledge. bzr revid: jra@tinyerp.com-20120914131058-celb1tgo93en0dpl --- addons/document/report/document_report_view.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/document/report/document_report_view.xml b/addons/document/report/document_report_view.xml index 2a8b9f34ddf..2740967d53a 100644 --- a/addons/document/report/document_report_view.xml +++ b/addons/document/report/document_report_view.xml @@ -114,7 +114,7 @@ report.document.user - + From 29ff1bf82aba1274641bf35d5f3cf53bb751ffa4 Mon Sep 17 00:00:00 2001 From: "Bhumi Thakkar (Open ERP)" Date: Mon, 17 Sep 2012 16:33:46 +0530 Subject: [PATCH 08/12] [IMP] Improve code for return value of selection field. bzr revid: bth@tinyerp.com-20120917110346-0daw7ho3y31zbpu3 --- addons/web_graph/controllers/graph.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/addons/web_graph/controllers/graph.py b/addons/web_graph/controllers/graph.py index f6c1343c042..1da5e3bc91f 100644 --- a/addons/web_graph/controllers/graph.py +++ b/addons/web_graph/controllers/graph.py @@ -53,6 +53,9 @@ class GraphView(View): if fields[field]['type']=='many2one': data = data and data[1] if tick: + if fields[field]['type']=='selection': + d = dict(fields[field]['selection']) + data = d[data] return ticks.setdefault(data, len(ticks)) return data or 0 From bfaaf55f9f52c57cca39ade6423f8eeb8fccc896 Mon Sep 17 00:00:00 2001 From: Fabien Pinckaers Date: Mon, 17 Sep 2012 18:33:01 +0200 Subject: [PATCH 09/12] [IMP] events form view cleaned bzr revid: fp@tinyerp.com-20120917163301-8b1hf7cklxmx4pcn --- addons/event/event.py | 10 ++++++++-- addons/event/event_view.xml | 40 +++++++++++++++++++------------------ 2 files changed, 29 insertions(+), 21 deletions(-) diff --git a/addons/event/event.py b/addons/event/event.py index 747981f854b..44def4f0c76 100644 --- a/addons/event/event.py +++ b/addons/event/event.py @@ -207,6 +207,8 @@ class event_event(osv.osv): 'main_speaker_id': fields.many2one('res.partner','Main Speaker', readonly=False, states={'done': [('readonly', True)]}, help="Speaker who will be giving speech at the event."), 'address_id': fields.many2one('res.partner','Location Address', readonly=False, states={'done': [('readonly', True)]}), 'street': fields.related('address_id','street',type='char',string='Street'), + 'street2': fields.related('address_id','street2',type='char',string='Street2'), + 'state_id': fields.related('address_id','state_id',type='many2one', relation="res.country.state", string='State'), 'zip': fields.related('address_id','zip',type='char',string='zip'), 'city': fields.related('address_id','city',type='char',string='city'), 'speaker_confirmed': fields.boolean('Speaker Confirmed', readonly=False, states={'done': [('readonly', True)]}), @@ -265,16 +267,20 @@ class event_event(osv.osv): def on_change_address_id(self, cr, uid, ids, address_id, context=None): values = { 'street' : False, + 'street2' : False, 'city' : False, 'zip' : False, + 'country_id' : False, + 'state_id' : False, } if isinstance(address_id, (long, int)): address = self.pool.get('res.partner').browse(cr, uid, address_id, context=context) - values.update({ 'street' : address.street, - + 'street2' : address.street2, 'city' : address.city, + 'country_id' : address.country_id and address.country_id.id, + 'state_id' : address.state_id and address.state_id.id, 'zip' : address.zip, }) diff --git a/addons/event/event_view.xml b/addons/event/event_view.xml index 2e50822cd7b..fd396053d5d 100644 --- a/addons/event/event_view.xml +++ b/addons/event/event_view.xml @@ -111,52 +111,54 @@
-
-

From to -

-