From f55f24853347de57658050b272c54465c5df6c03 Mon Sep 17 00:00:00 2001 From: "Somesh Khare(OpenERP)" <> Date: Mon, 19 Nov 2012 12:43:18 +0000 Subject: [PATCH 1/6] [FIX]stock: date format in the created log for deliveries and receptions are wrong bzr revid: mma@tinyerp.com-20121119124318-xkxdzm4htxj0eu7g --- addons/stock/stock.py | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/addons/stock/stock.py b/addons/stock/stock.py index 859cda8ce94..dc12bfbd847 100644 --- a/addons/stock/stock.py +++ b/addons/stock/stock.py @@ -1393,6 +1393,11 @@ class stock_picking(osv.osv): """ if context is None: context = {} + lang_obj = self.pool.get('res.lang') + user_lang = self.pool.get('res.users').browse(cr, uid, uid, context=context).context_lang + lang_ids = lang_obj.search(cr, uid, [('code','like',user_lang)]) + date_format = lang_obj.browse(cr, uid, lang_ids[0], context=context).date_format + for pick in self.browse(cr, uid, ids, context=context): msg='' if pick.auto_picking: @@ -1404,7 +1409,7 @@ class stock_picking(osv.osv): } message = type_list.get(pick.type, _('Document')) + " '" + (pick.name or '?') + "' " if pick.min_date: - msg= _(' for the ')+ datetime.strptime(pick.min_date, '%Y-%m-%d %H:%M:%S').strftime('%m/%d/%Y') + msg= _(' for the ')+ datetime.strptime(pick.min_date, '%Y-%m-%d %H:%M:%S').strftime(date_format) state_list = { 'confirmed': _('is scheduled %s.') % msg, 'assigned': _('is ready to process.'), From 8024dfbd4b990e5ed0900192f3dc54fed0cfe76a Mon Sep 17 00:00:00 2001 From: " Amit Dodiya(OpenERP)" <> Date: Mon, 19 Nov 2012 18:43:08 +0530 Subject: [PATCH 2/6] [FIX]stock: when we have production lot tracking for product the partial picking wizard refuses to validate the partial picking because he requires production lot for product although the line in wizard has a quantity of 0 bzr revid: mma@tinyerp.com-20121119131308-5x1c7zoyeg2l6kx4 --- addons/stock/wizard/stock_partial_picking_view.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/stock/wizard/stock_partial_picking_view.xml b/addons/stock/wizard/stock_partial_picking_view.xml index 98f599da48b..e87534795b5 100644 --- a/addons/stock/wizard/stock_partial_picking_view.xml +++ b/addons/stock/wizard/stock_partial_picking_view.xml @@ -23,7 +23,7 @@ - + From 02ebe3312b071fb3f4d60610cd406f4afe8a3f38 Mon Sep 17 00:00:00 2001 From: "Quentin (OpenERP)" Date: Thu, 13 Dec 2012 10:53:04 +0100 Subject: [PATCH 3/6] [MERGE] mrp_repair: fixing the bug of operation type onchange, as of revision 8290, in a correct way bzr revid: qdp-launchpad@openerp.com-20121213095304-1td16oqz66lnj08g --- addons/mrp_repair/mrp_repair.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/addons/mrp_repair/mrp_repair.py b/addons/mrp_repair/mrp_repair.py index 905a1b5642f..17e9d9666fc 100644 --- a/addons/mrp_repair/mrp_repair.py +++ b/addons/mrp_repair/mrp_repair.py @@ -748,11 +748,13 @@ class mrp_repair_line(osv.osv, ProductChangeMixin): 'location_id': stock_id, 'location_dest_id': location_id }} + obj_data = self.pool.get('ir.model.data') + dummy, scrapped_location_id = obj_data.get_object_reference(cr, uid, 'stock', 'stock_location_scrapped') return {'value': { 'to_invoice': False, 'location_id': location_id, - 'location_dest_id': False + 'location_dest_id': scrapped_location_id, }} mrp_repair_line() From 03f81db942a1e2e9891824638255d0d0c0f355af Mon Sep 17 00:00:00 2001 From: niv-openerp Date: Thu, 13 Dec 2012 11:27:56 +0100 Subject: [PATCH 4/6] [FIX] problem in charts when using line charts lp bug: https://launchpad.net/bugs/1089517 fixed bzr revid: nicolas.vanhoren@openerp.com-20121213102756-yzhq0igzcgttlpvz --- addons/web_graph/static/src/js/graph.js | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/addons/web_graph/static/src/js/graph.js b/addons/web_graph/static/src/js/graph.js index 3b73201b154..282822d6cba 100644 --- a/addons/web_graph/static/src/js/graph.js +++ b/addons/web_graph/static/src/js/graph.js @@ -136,9 +136,8 @@ instance.web_graph.GraphView = instance.web.View.extend({ make_graph: function (mode, container, data) { if (mode === 'area') { mode = 'line'; } - return Flotr.draw( - container, data.data, - this.get_format(this['options_' + mode](data))); + var format = this.get_format(this['options_' + mode](data)); + return Flotr.draw(container, data.data, format); }, options_bar: function (data) { @@ -210,7 +209,9 @@ instance.web_graph.GraphView = instance.web.View.extend({ return { lines : { show : true, - stacked : this.stacked + }, + points: { + show: true, }, grid : { verticalLines : this.orientation, From 96231a7ddbd228cbc8e27040c974771e84d57d49 Mon Sep 17 00:00:00 2001 From: niv-openerp Date: Thu, 13 Dec 2012 11:52:00 +0100 Subject: [PATCH 5/6] [FIX] problem when the user has a long name, the top bar will expand on two lines lp bug: https://launchpad.net/bugs/1083976 fixed bzr revid: nicolas.vanhoren@openerp.com-20121213105200-e806966yi03vxsjx --- addons/web/static/src/css/base.css | 8 ++++++++ addons/web/static/src/css/base.sass | 7 +++++++ 2 files changed, 15 insertions(+) diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css index ee0fe56e35b..c71e26adb48 100644 --- a/addons/web/static/src/css/base.css +++ b/addons/web/static/src/css/base.css @@ -1069,6 +1069,14 @@ -webkit-box-shadow: none; box-shadow: none; } +.openerp .oe_topbar .oe_topbar_name { + max-width: 150px; + overflow: hidden; + display: inline-block; + max-height: 100%; + text-overflow: ellipsis; + white-space: nowrap; +} .openerp .oe_menu { float: left; padding: 0; diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass index f6df43394c9..8efc85c2a04 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -870,6 +870,13 @@ $sheet-padding: 16px &:hover @include vertical-gradient(#292929, #191919) @include box-shadow(none) + .oe_topbar_name + max-width: 150px + overflow: hidden + display: inline-block + max-height: 100% + text-overflow: ellipsis + white-space: nowrap // oe menu is the list of the buttons on the left side of the bar. // So why aren't the buttons oe_topbar_items ? This sad state of affairs From 154dab3182cf9f4d8d3d5170a5e0000465932d30 Mon Sep 17 00:00:00 2001 From: "Quentin (OpenERP)" Date: Thu, 13 Dec 2012 12:26:07 +0100 Subject: [PATCH 6/6] [IMP] mrp_repair: better use a search on scrap location rather than rely on xml_ids that may refer to removed/deprecated data bzr revid: qdp-launchpad@openerp.com-20121213112607-0gzeu7dpq81dxx3w --- addons/mrp_repair/mrp_repair.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/addons/mrp_repair/mrp_repair.py b/addons/mrp_repair/mrp_repair.py index 17e9d9666fc..cd783509bd4 100644 --- a/addons/mrp_repair/mrp_repair.py +++ b/addons/mrp_repair/mrp_repair.py @@ -729,8 +729,9 @@ class mrp_repair_line(osv.osv, ProductChangeMixin): 'location_id': False, 'location_dest_id': False }} + location_obj = self.pool.get('stock.location') warehouse_obj = self.pool.get('stock.warehouse') - location_id = self.pool.get('stock.location').search(cr, uid, [('usage','=','production')], context=context) + location_id = location_obj.search(cr, uid, [('usage','=','production')], context=context) location_id = location_id and location_id[0] or False if type == 'add': @@ -748,13 +749,12 @@ class mrp_repair_line(osv.osv, ProductChangeMixin): 'location_id': stock_id, 'location_dest_id': location_id }} - obj_data = self.pool.get('ir.model.data') - dummy, scrapped_location_id = obj_data.get_object_reference(cr, uid, 'stock', 'stock_location_scrapped') + scrap_location_ids = location_obj.search(cr, uid, [('scrap_location', '=', True)], context=context) return {'value': { 'to_invoice': False, 'location_id': location_id, - 'location_dest_id': scrapped_location_id, + 'location_dest_id': scrap_location_ids and scrap_location_ids[0] or False, }} mrp_repair_line()