From 79ebe1060d7a6303dbd5ff6e401aec5337161883 Mon Sep 17 00:00:00 2001 From: Martin Trigaux Date: Thu, 23 Oct 2014 17:14:19 +0200 Subject: [PATCH 01/16] [FIX] product: pricelist, uom and price_surcharge The price_surcharge attribute must be computed based on the reference unit of measure (divided by the factor). This is to make sure than 12 units and 1 dozen have the same price after pricelist computation (opw 599727). Added test checking the correctness of pricelist computation based on unit of measures. --- addons/product/pricelist.py | 7 ++- addons/product/tests/__init__.py | 3 +- addons/product/tests/test_pricelist.py | 70 ++++++++++++++++++++++++++ 3 files changed, 78 insertions(+), 2 deletions(-) create mode 100644 addons/product/tests/test_pricelist.py diff --git a/addons/product/pricelist.py b/addons/product/pricelist.py index d4ed2567afc..0dd6b45acda 100644 --- a/addons/product/pricelist.py +++ b/addons/product/pricelist.py @@ -297,7 +297,12 @@ class product_pricelist(osv.osv): price = price * (1.0+(res['price_discount'] or 0.0)) if res['price_round']: price = tools.float_round(price, precision_rounding=res['price_round']) - price += (res['price_surcharge'] or 0.0) + if context.get('uom'): + # compute price_surcharge based on reference uom + factor = product_uom_obj.browse(cr, uid, context.get('uom'), context=context).factor + else: + factor = 1.0 + price += (res['price_surcharge'] or 0.0) / factor if res['price_min_margin']: price = max(price, price_limit+res['price_min_margin']) if res['price_max_margin']: diff --git a/addons/product/tests/__init__.py b/addons/product/tests/__init__.py index 850189ac0f4..4a1ce43351b 100644 --- a/addons/product/tests/__init__.py +++ b/addons/product/tests/__init__.py @@ -1,5 +1,6 @@ -from . import test_uom +from . import test_uom, test_pricelist fast_suite = [ test_uom, + test_pricelist ] diff --git a/addons/product/tests/test_pricelist.py b/addons/product/tests/test_pricelist.py new file mode 100644 index 00000000000..dd9130e1be5 --- /dev/null +++ b/addons/product/tests/test_pricelist.py @@ -0,0 +1,70 @@ +from openerp.tests.common import TransactionCase + +class TestPricelist(TransactionCase): + """Tests for unit of measure conversion""" + + def setUp(self): + super(TestPricelist, self).setUp() + cr, uid, context = self.cr, self.uid, {} + self.ir_model_data = self.registry('ir.model.data') + self.product_product = self.registry('product.product') + self.product_pricelist = self.registry('product.pricelist') + self.uom = self.registry('product.uom') + + self.usb_adapter_id = self.ir_model_data.get_object_reference(cr, uid, 'product', 'product_product_48')[1] + self.datacard_id = self.ir_model_data.get_object_reference(cr, uid, 'product', 'product_template_46')[1] + self.unit_id = self.ir_model_data.get_object_reference(cr, uid, 'product', 'product_uom_unit')[1] + self.dozen_id = self.ir_model_data.get_object_reference(cr, uid, 'product', 'product_uom_dozen')[1] + + self.public_pricelist_id = self.ir_model_data.get_object_reference(cr, uid, 'product', 'list0')[1] + self.sale_pricelist_id = self.product_pricelist.create(cr, uid, { + 'name': 'Sale pricelist', + 'type': 'sale', + 'version_id': [(0, 0, { + 'name': 'v1.0', + 'items_id': [(0, 0, { + 'name': 'Discount 10%', + 'base': 1, # based on public price + 'price_discount': -0.1, + 'product_id': self.usb_adapter_id + }), (0, 0, { + 'name': 'Discount -0.5', + 'base': 1, # based on public price + 'price_surcharge': -0.5, + 'product_id': self.datacard_id + })] + })] + }, context=context) + + def test_10_discount(self): + # Make sure the price using a pricelist is the same than without after + # applying the computation manually + cr, uid, context = self.cr, self.uid, {} + + public_context = dict(context, pricelist=self.public_pricelist_id) + pricelist_context = dict(context, pricelist=self.sale_pricelist_id) + + usb_adapter_without_pricelist = self.product_product.browse(cr, uid, self.usb_adapter_id, context=public_context) + usb_adapter_with_pricelist = self.product_product.browse(cr, uid, self.usb_adapter_id, context=pricelist_context) + self.assertEqual(usb_adapter_with_pricelist.price, usb_adapter_without_pricelist.price*0.9) + + datacard_without_pricelist = self.product_product.browse(cr, uid, self.datacard_id, context=public_context) + datacard_with_pricelist = self.product_product.browse(cr, uid, self.datacard_id, context=pricelist_context) + self.assertEqual(datacard_with_pricelist.price, datacard_without_pricelist.price-0.5) + + # Make sure that changing the unit of measure does not break the unit + # price (after converting) + unit_context = dict(context, + pricelist=self.sale_pricelist_id, + uom=self.unit_id) + dozen_context = dict(context, + pricelist=self.sale_pricelist_id, + uom=self.dozen_id) + + usb_adapter_unit = self.product_product.browse(cr, uid, self.usb_adapter_id, context=unit_context) + usb_adapter_dozen = self.product_product.browse(cr, uid, self.usb_adapter_id, context=dozen_context) + self.assertAlmostEqual(usb_adapter_unit.price*12, usb_adapter_dozen.price) + + datacard_unit = self.product_product.browse(cr, uid, self.datacard_id, context=unit_context) + datacard_dozen = self.product_product.browse(cr, uid, self.datacard_id, context=dozen_context) + self.assertAlmostEqual(datacard_unit.price*12, datacard_dozen.price) From 42bf0a567003168029508e0b501d6aef7876e41f Mon Sep 17 00:00:00 2001 From: Martin Trigaux Date: Fri, 24 Oct 2014 16:07:55 +0200 Subject: [PATCH 02/16] [FIX] product_visible_discount: discount with different unit of measures The computation of the price without pricelist should take care of the unit of measure. e.g. if computing discount for objects in dozen (on a product with price in unit), returned unit price should be (price*12) where 12 is the factor to go from dozen to unit. Otherwise the compared prices (with and without pricelist) would not use the same unit of measure and the comparaison would be inconsistent. (opw 599727) --- addons/product_visible_discount/product_visible_discount.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/addons/product_visible_discount/product_visible_discount.py b/addons/product_visible_discount/product_visible_discount.py index 595deba1983..f173e844b27 100644 --- a/addons/product_visible_discount/product_visible_discount.py +++ b/addons/product_visible_discount/product_visible_discount.py @@ -44,6 +44,7 @@ class sale_order_line(osv.osv): fiscal_position=False, flag=False, context=None): def get_real_price(res_dict, product_id, qty, uom, pricelist): + """Retrieve the price before applying the pricelist""" item_obj = self.pool.get('product.pricelist.item') price_type_obj = self.pool.get('product.price.type') product_obj = self.pool.get('product.product') @@ -60,9 +61,8 @@ class sale_order_line(osv.osv): factor = 1.0 if uom and uom != product.uom_id.id: - product_uom_obj = self.pool.get('product.uom') - uom_data = product_uom_obj.browse(cr, uid, product.uom_id.id) - factor = uom_data.factor + # the unit price is in a different uom + factor = self.pool['product.uom']._compute_qty(cr, uid, uom, 1.0, product.uom_id.id) return product_read[field_name] * factor From 8abd003ef0f1a59b57fbdd85f54b8aadad68bed2 Mon Sep 17 00:00:00 2001 From: Martin Trigaux Date: Mon, 27 Oct 2014 11:41:23 +0100 Subject: [PATCH 03/16] [FIX] product: reference in test --- addons/product/tests/test_pricelist.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/product/tests/test_pricelist.py b/addons/product/tests/test_pricelist.py index dd9130e1be5..4e61cb11b75 100644 --- a/addons/product/tests/test_pricelist.py +++ b/addons/product/tests/test_pricelist.py @@ -12,7 +12,7 @@ class TestPricelist(TransactionCase): self.uom = self.registry('product.uom') self.usb_adapter_id = self.ir_model_data.get_object_reference(cr, uid, 'product', 'product_product_48')[1] - self.datacard_id = self.ir_model_data.get_object_reference(cr, uid, 'product', 'product_template_46')[1] + self.datacard_id = self.ir_model_data.get_object_reference(cr, uid, 'product', 'product_product_46')[1] self.unit_id = self.ir_model_data.get_object_reference(cr, uid, 'product', 'product_uom_unit')[1] self.dozen_id = self.ir_model_data.get_object_reference(cr, uid, 'product', 'product_uom_dozen')[1] From d68d1d0434e870b7fed39665be2d8c33afe07eb6 Mon Sep 17 00:00:00 2001 From: Frederic van der Essen Date: Mon, 27 Oct 2014 12:28:47 +0100 Subject: [PATCH 04/16] [FIX] web: cors rpc calls were missing the session cookie, resulting in new sessions being created for every call --- addons/web/static/src/js/openerpframework.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/addons/web/static/src/js/openerpframework.js b/addons/web/static/src/js/openerpframework.js index 5dcc2197944..34fe523753c 100644 --- a/addons/web/static/src/js/openerpframework.js +++ b/addons/web/static/src/js/openerpframework.js @@ -1018,11 +1018,11 @@ openerp.Session = openerp.Class.extend(openerp.PropertiesMixin, { }, check_session_id: function() { var self = this; - if (this.avoid_recursion || self.use_cors) + if (this.avoid_recursion) return $.when(); if (this.session_id) return $.when(); // we already have the session id - if (this.override_session || ! this.origin_server) { + if (!this.use_cors && (this.override_session || ! this.origin_server)) { // If we don't use the origin server we consider we should always create a new session. // Even if some browsers could support cookies when using jsonp that behavior is // not consistent and the browser creators are tending to removing that feature. From 0790682296e43989e4e232189009c3ba380e32ba Mon Sep 17 00:00:00 2001 From: Denis Ledoux Date: Sat, 25 Oct 2014 14:26:52 +0200 Subject: [PATCH 05/16] [FIX] mail: read more show original message Instead of html cleaned html, to allow display blockquotes opw-614729 --- addons/mail/mail_message.py | 1 + addons/mail/static/src/js/mail.js | 12 +++++++++++- addons/mail/static/src/xml/mail.xml | 5 ++++- 3 files changed, 16 insertions(+), 2 deletions(-) diff --git a/addons/mail/mail_message.py b/addons/mail/mail_message.py index 8ac047fb77e..be88fa9de60 100644 --- a/addons/mail/mail_message.py +++ b/addons/mail/mail_message.py @@ -373,6 +373,7 @@ class mail_message(osv.Model): 'type': message.type, 'subtype': message.subtype_id.name if message.subtype_id else False, 'body': body_html, + 'body_original': message.body if message.type == 'email' else None, 'model': message.model, 'res_id': message.res_id, 'record_name': message.record_name, diff --git a/addons/mail/static/src/js/mail.js b/addons/mail/static/src/js/mail.js index 1f65058d4af..094a4f72de5 100644 --- a/addons/mail/static/src/js/mail.js +++ b/addons/mail/static/src/js/mail.js @@ -225,6 +225,7 @@ openerp.mail = function (session) { this.name = datasets.name || false, this.record_name = datasets.record_name || false, this.body = datasets.body || '', + this.body_original = datasets.body_original || '', this.vote_nb = datasets.vote_nb || 0, this.has_voted = datasets.has_voted || false, this.is_favorite = datasets.is_favorite || false, @@ -976,6 +977,7 @@ openerp.mail = function (session) { }, expender: function () { + var self = this; this.$('.oe_msg_body:first').expander({ slicePoint: this.options.truncate_limit, expandText: _t('read more'), @@ -983,7 +985,15 @@ openerp.mail = function (session) { detailClass: 'oe_msg_tail', moreClass: 'oe_mail_expand', lessClass: 'oe_mail_reduce', - }); + afterExpand: function(){ + self.$('.oe_msg_body').hide(); + self.$('.oe_msg_original').show(); + }, + onCollapse: function(){ + self.$('.oe_msg_body').show(); + self.$('.oe_msg_original').hide(); + }, + }); }, /** diff --git a/addons/mail/static/src/xml/mail.xml b/addons/mail/static/src/xml/mail.xml index 1e52105c739..e57b9d7d7a2 100644 --- a/addons/mail/static/src/xml/mail.xml +++ b/addons/mail/static/src/xml/mail.xml @@ -257,7 +257,10 @@
- + +
+
From 96bcaadd46e7685de3f5267506f051f47e601624 Mon Sep 17 00:00:00 2001 From: Denis Ledoux Date: Mon, 27 Oct 2014 13:23:16 +0100 Subject: [PATCH 06/16] [FIX] account: limit search for fields_view_get to one result + use ir.model.data get_object_reference method for better performance (cached result) opw-616616 --- addons/account/account_invoice.py | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/addons/account/account_invoice.py b/addons/account/account_invoice.py index 9390e2cf3fd..f324a07d684 100644 --- a/addons/account/account_invoice.py +++ b/addons/account/account_invoice.py @@ -355,13 +355,22 @@ class account_invoice(osv.osv): if context.get('active_model', '') in ['res.partner'] and context.get('active_ids', False) and context['active_ids']: partner = self.pool.get(context['active_model']).read(cr, uid, context['active_ids'], ['supplier','customer'])[0] if not view_type: - view_id = self.pool.get('ir.ui.view').search(cr, uid, [('name', '=', 'account.invoice.tree')]) + try: + view_id = self.pool['ir.model.data'].get_object_reference(cr, uid, 'account', 'invoice_tree')[1] + except ValueError: + view_id = self.pool.get('ir.ui.view').search(cr, uid, [('name', '=', 'account.invoice.tree')], limit=1) view_type = 'tree' if view_type == 'form': if partner['supplier'] and not partner['customer']: - view_id = self.pool.get('ir.ui.view').search(cr,uid,[('name', '=', 'account.invoice.supplier.form')]) + try: + view_id = self.pool['ir.model.data'].get_object_reference(cr, uid, 'account', 'invoice_supplier_form')[1] + except ValueError: + view_id = self.pool.get('ir.ui.view').search(cr,uid,[('name', '=', 'account.invoice.supplier.form')], limit=1) elif partner['customer'] and not partner['supplier']: - view_id = self.pool.get('ir.ui.view').search(cr,uid,[('name', '=', 'account.invoice.form')]) + try: + view_id = self.pool['ir.model.data'].get_object_reference(cr, uid, 'account', 'invoice_form')[1] + except ValueError: + view_id = self.pool.get('ir.ui.view').search(cr,uid,[('name', '=', 'account.invoice.form')], limit=1) if view_id and isinstance(view_id, (list, tuple)): view_id = view_id[0] res = super(account_invoice,self).fields_view_get(cr, uid, view_id=view_id, view_type=view_type, context=context, toolbar=toolbar, submenu=submenu) From fcc59f12fcf2b5dad846d693fe19bec4f782797c Mon Sep 17 00:00:00 2001 From: Martin Trigaux Date: Mon, 27 Oct 2014 13:45:53 +0100 Subject: [PATCH 07/16] [FIX] product_visible_discount: use on_change result for product value At the end of the onchange call product_id_change, the uom may have changed (e.g. if product in different category). To compute the quantity, we need to use the new uom and not the first one (that may be Unit, default value) --- addons/product_visible_discount/product_visible_discount.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/product_visible_discount/product_visible_discount.py b/addons/product_visible_discount/product_visible_discount.py index f173e844b27..138c141c749 100644 --- a/addons/product_visible_discount/product_visible_discount.py +++ b/addons/product_visible_discount/product_visible_discount.py @@ -79,7 +79,7 @@ class sale_order_line(osv.osv): price=result['price_unit'] else: return res - + uom = result.get('product_uom', uom) product = product_obj.browse(cr, uid, product, context) list_price = pricelist_obj.price_get(cr, uid, [pricelist], product.id, qty or 1.0, partner_id, {'uom': uom,'date': date_order }) From d28cab5257cf96f4b9a913f8890682d03e29f9ef Mon Sep 17 00:00:00 2001 From: Ravi Gohil Date: Thu, 9 Oct 2014 16:51:29 +0530 Subject: [PATCH 08/16] [FIX] stock: forbid adding new lines when processing picking Source and destination locations are required and not displayed in the form view. Adding new items when recieving a picking can not be easily guessed as we can put different locations for each line, using default locations may not be the expected result. Instead should modify the original picking or create new one. Fixes #2074, opw 612768 --- 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 ef474bb9921..07c9671cdf8 100644 --- a/addons/stock/wizard/stock_partial_picking_view.xml +++ b/addons/stock/wizard/stock_partial_picking_view.xml @@ -18,7 +18,7 @@ - + From 79787084ffe66001203e7a593d121f5c0e287779 Mon Sep 17 00:00:00 2001 From: Martin Trigaux Date: Mon, 27 Oct 2014 18:02:59 +0100 Subject: [PATCH 09/16] [FIX] sale_margin: cost price uom When computing the cost price to display, take the uom into account. The cost of 1 Unit or 1 dozen should not be the same. opw 599727 --- addons/sale_margin/sale_margin.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/addons/sale_margin/sale_margin.py b/addons/sale_margin/sale_margin.py index 72d252a7c11..7c58028658e 100644 --- a/addons/sale_margin/sale_margin.py +++ b/addons/sale_margin/sale_margin.py @@ -36,7 +36,11 @@ class sale_order_line(osv.osv): frm_cur = self.pool.get('res.users').browse(cr, uid, uid).company_id.currency_id.id to_cur = self.pool.get('product.pricelist').browse(cr, uid, [pricelist])[0].currency_id.id if product: - purchase_price = self.pool.get('product.product').browse(cr, uid, product).standard_price + product = self.pool['product.product'].browse(cr, uid, product, context=context) + purchase_price = product.standard_price + to_uom = res.get('product_uom', uom) + if to_uom != product.uom_id.id: + purchase_price = self.pool['product.uom']._compute_price(cr, uid, product.uom_id.id, purchase_price, to_uom) ctx = context.copy() ctx['date'] = date_order price = self.pool.get('res.currency').compute(cr, uid, frm_cur, to_cur, purchase_price, round=False, context=ctx) From a00de91001c10aa14cdb84523b676c3d12bf45a2 Mon Sep 17 00:00:00 2001 From: Antonio Esposito Date: Mon, 27 Oct 2014 13:00:18 +0100 Subject: [PATCH 10/16] [FIX] hr_timesheet_invoice: warning in report generation When generating the report 'Timesheet Profit', got a warning "The domain term '('user_id', '=', [...])' should use the 'in' or 'not in' operator." This warning is due to the use of the '=' operator to compare the field 'user_id' while the reports sends a list of ids. Fallback to still accept a single id in case of customised reports. --- addons/hr_timesheet_invoice/report/account_analytic_profit.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/addons/hr_timesheet_invoice/report/account_analytic_profit.py b/addons/hr_timesheet_invoice/report/account_analytic_profit.py index 57fd06b0c34..dfdce39a9d9 100644 --- a/addons/hr_timesheet_invoice/report/account_analytic_profit.py +++ b/addons/hr_timesheet_invoice/report/account_analytic_profit.py @@ -37,13 +37,15 @@ class account_analytic_profit(report_sxw.rml_parse): return user_obj.browse(self.cr, self.uid, ids) def _journal_ids(self, form, user_id): + if isinstance(user_id, (int, long)): + user_id = [user_id] line_obj=pooler.get_pool(self.cr.dbname).get('account.analytic.line') journal_obj=pooler.get_pool(self.cr.dbname).get('account.analytic.journal') line_ids=line_obj.search(self.cr, self.uid, [ ('date', '>=', form['date_from']), ('date', '<=', form['date_to']), ('journal_id', 'in', form['journal_ids'][0][2]), - ('user_id', '=', user_id), + ('user_id', 'in', user_id), ]) ids=list(set([b.journal_id.id for b in line_obj.browse(self.cr, self.uid, line_ids)])) return journal_obj.browse(self.cr, self.uid, ids) From 00ec786e487ee79e6edaa29aa8bb3d4ccd028779 Mon Sep 17 00:00:00 2001 From: Denis Ledoux Date: Tue, 28 Oct 2014 13:18:22 +0100 Subject: [PATCH 11/16] [FIX] account: partner balance general totals General totals were not computed at all, due to the condition "if not self.ids" which was always true as self.ids wasn't set. Besides, a parameter allows to display only partner with balance greater than 0, which was completely ignored by the totals computation methods: The totals always included all partners, even those having balance equals to 0 --- .../account/report/account_partner_balance.py | 75 ++++--------------- 1 file changed, 14 insertions(+), 61 deletions(-) diff --git a/addons/account/report/account_partner_balance.py b/addons/account/report/account_partner_balance.py index 53edbbe9685..91d2ff999f2 100644 --- a/addons/account/report/account_partner_balance.py +++ b/addons/account/report/account_partner_balance.py @@ -32,10 +32,6 @@ class partner_balance(report_sxw.rml_parse, common_report_header): self.account_ids = [] self.localcontext.update( { 'time': time, - 'lines': self.lines, - 'sum_debit': self._sum_debit, - 'sum_credit': self._sum_credit, - 'sum_litige': self._sum_litige, 'get_fiscalyear': self._get_fiscalyear, 'get_journal': self._get_journal, 'get_filter': self._get_filter, @@ -69,7 +65,20 @@ class partner_balance(report_sxw.rml_parse, common_report_header): "WHERE a.type IN %s " \ "AND a.active", (self.ACCOUNT_TYPE,)) self.account_ids = [a for (a,) in self.cr.fetchall()] - return super(partner_balance, self).set_context(objects, data, ids, report_type=report_type) + res = super(partner_balance, self).set_context(objects, data, ids, report_type=report_type) + lines = self.lines() + sum_debit = sum_credit = sum_litige = 0 + for line in filter(lambda x: x['type'] == 3, lines): + sum_debit += line['debit'] or 0 + sum_credit += line['credit'] or 0 + sum_litige += line['enlitige'] or 0 + self.localcontext.update({ + 'lines': lambda: lines, + 'sum_debit': lambda: sum_debit, + 'sum_credit': lambda: sum_credit, + 'sum_litige': lambda: sum_litige, + }) + return res def lines(self): move_state = ['draft','posted'] @@ -235,62 +244,6 @@ class partner_balance(report_sxw.rml_parse, common_report_header): i = i + 1 return completearray - def _sum_debit(self): - move_state = ['draft','posted'] - if self.target_move == 'posted': - move_state = ['posted'] - - if not self.ids: - return 0.0 - self.cr.execute( - "SELECT sum(debit) " \ - "FROM account_move_line AS l " \ - "JOIN account_move am ON (am.id = l.move_id)" \ - "WHERE l.account_id IN %s" \ - "AND am.state IN %s" \ - "AND " + self.query + "", - (tuple(self.account_ids), tuple(move_state))) - temp_res = float(self.cr.fetchone()[0] or 0.0) - return temp_res - - def _sum_credit(self): - move_state = ['draft','posted'] - if self.target_move == 'posted': - move_state = ['posted'] - - if not self.ids: - return 0.0 - self.cr.execute( - "SELECT sum(credit) " \ - "FROM account_move_line AS l " \ - "JOIN account_move am ON (am.id = l.move_id)" \ - "WHERE l.account_id IN %s" \ - "AND am.state IN %s" \ - "AND " + self.query + "", - (tuple(self.account_ids), tuple(move_state))) - temp_res = float(self.cr.fetchone()[0] or 0.0) - return temp_res - - def _sum_litige(self): - #gives the total of move lines with blocked boolean set to TRUE for the report selection - move_state = ['draft','posted'] - if self.target_move == 'posted': - move_state = ['posted'] - - if not self.ids: - return 0.0 - self.cr.execute( - "SELECT sum(debit-credit) " \ - "FROM account_move_line AS l " \ - "JOIN account_move am ON (am.id = l.move_id)" \ - "WHERE l.account_id IN %s" \ - "AND am.state IN %s" \ - "AND " + self.query + " " \ - "AND l.blocked=TRUE ", - (tuple(self.account_ids), tuple(move_state), )) - temp_res = float(self.cr.fetchone()[0] or 0.0) - return temp_res - def _get_partners(self): if self.result_selection == 'customer': From 0021fa977d0ded23ecc91c0d07703207840620b9 Mon Sep 17 00:00:00 2001 From: Denis Ledoux Date: Tue, 28 Oct 2014 13:43:25 +0100 Subject: [PATCH 12/16] Revert "[FIX] mail: read more show original message" This reverts commit 0790682296e43989e4e232189009c3ba380e32ba. This fix is not yet ready. See PR #3295 --- addons/mail/mail_message.py | 1 - addons/mail/static/src/js/mail.js | 12 +----------- addons/mail/static/src/xml/mail.xml | 5 +---- 3 files changed, 2 insertions(+), 16 deletions(-) diff --git a/addons/mail/mail_message.py b/addons/mail/mail_message.py index be88fa9de60..8ac047fb77e 100644 --- a/addons/mail/mail_message.py +++ b/addons/mail/mail_message.py @@ -373,7 +373,6 @@ class mail_message(osv.Model): 'type': message.type, 'subtype': message.subtype_id.name if message.subtype_id else False, 'body': body_html, - 'body_original': message.body if message.type == 'email' else None, 'model': message.model, 'res_id': message.res_id, 'record_name': message.record_name, diff --git a/addons/mail/static/src/js/mail.js b/addons/mail/static/src/js/mail.js index 094a4f72de5..1f65058d4af 100644 --- a/addons/mail/static/src/js/mail.js +++ b/addons/mail/static/src/js/mail.js @@ -225,7 +225,6 @@ openerp.mail = function (session) { this.name = datasets.name || false, this.record_name = datasets.record_name || false, this.body = datasets.body || '', - this.body_original = datasets.body_original || '', this.vote_nb = datasets.vote_nb || 0, this.has_voted = datasets.has_voted || false, this.is_favorite = datasets.is_favorite || false, @@ -977,7 +976,6 @@ openerp.mail = function (session) { }, expender: function () { - var self = this; this.$('.oe_msg_body:first').expander({ slicePoint: this.options.truncate_limit, expandText: _t('read more'), @@ -985,15 +983,7 @@ openerp.mail = function (session) { detailClass: 'oe_msg_tail', moreClass: 'oe_mail_expand', lessClass: 'oe_mail_reduce', - afterExpand: function(){ - self.$('.oe_msg_body').hide(); - self.$('.oe_msg_original').show(); - }, - onCollapse: function(){ - self.$('.oe_msg_body').show(); - self.$('.oe_msg_original').hide(); - }, - }); + }); }, /** diff --git a/addons/mail/static/src/xml/mail.xml b/addons/mail/static/src/xml/mail.xml index e57b9d7d7a2..1e52105c739 100644 --- a/addons/mail/static/src/xml/mail.xml +++ b/addons/mail/static/src/xml/mail.xml @@ -257,10 +257,7 @@
- -
-
From b1df5aab6e529e9667bb97c96c9196e1a4e5e0ce Mon Sep 17 00:00:00 2001 From: Julien Legros Date: Tue, 28 Oct 2014 15:12:53 +0100 Subject: [PATCH 13/16] [FIX] sale: trigger all_lines signal when all lines are invoiced --- addons/sale/wizard/sale_line_invoice.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/sale/wizard/sale_line_invoice.py b/addons/sale/wizard/sale_line_invoice.py index 5f979ead31e..fd3e78c05a0 100644 --- a/addons/sale/wizard/sale_line_invoice.py +++ b/addons/sale/wizard/sale_line_invoice.py @@ -100,7 +100,7 @@ class sale_order_line_make_invoice(osv.osv_memory): flag = False break if flag: - wf_service.trg_validate(uid, 'sale.order', order.id, 'manual_invoice', cr) + wf_service.trg_validate(uid, 'sale.order', order.id, 'all_lines', cr) if not invoices: raise osv.except_osv(_('Warning!'), _('Invoice cannot be created for this Sales Order Line due to one of the following reasons:\n1.The state of this sales order line is either "draft" or "cancel"!\n2.The Sales Order Line is Invoiced!')) From f4870f84182eb7a062f11e37e31827009d237cbb Mon Sep 17 00:00:00 2001 From: Denis Ledoux Date: Tue, 28 Oct 2014 17:57:08 +0100 Subject: [PATCH 14/16] [FIX] sale: when invoicing on lines, set order in progress when all lines invoiced This fix is related to rev. b1df5aab6e529e9667bb97c96c9196e1a4e5e0ce --- addons/sale/wizard/sale_line_invoice.py | 1 + 1 file changed, 1 insertion(+) diff --git a/addons/sale/wizard/sale_line_invoice.py b/addons/sale/wizard/sale_line_invoice.py index fd3e78c05a0..998c66a8a03 100644 --- a/addons/sale/wizard/sale_line_invoice.py +++ b/addons/sale/wizard/sale_line_invoice.py @@ -100,6 +100,7 @@ class sale_order_line_make_invoice(osv.osv_memory): flag = False break if flag: + line.order_id.write({'state': 'progress'}) wf_service.trg_validate(uid, 'sale.order', order.id, 'all_lines', cr) if not invoices: From 43db7267c5051c9ad4877c27ce1220d446d7552d Mon Sep 17 00:00:00 2001 From: Mohammad Alhashash Date: Tue, 21 Oct 2014 21:12:58 +0200 Subject: [PATCH 15/16] [FIX] stock: UoS quantity in stock.picking Implements the UoS TODO items on stock.picking.do_partial() to fix #1432. Add a new method _compute_uos_qty() on product.product to computes product's invoicing quantity in UoS from quantity in UoM. The created invoice will use the product_uos of the stock.move, meaning keeping the quantity specified on the partial picking and the unit of measure of the original stock.move (e.g. recieving 1 dozen from a 12 unit picking should either get uos=dozen, uos_qty=1 or uos=unit, uos_qty=12, not a mix of both) Fixes #1432, opw 611479 --- addons/product/product.py | 28 ++++++++++++++++++++++++++++ addons/stock/stock.py | 9 +++++---- 2 files changed, 33 insertions(+), 4 deletions(-) diff --git a/addons/product/product.py b/addons/product/product.py index ff0a6a770d7..ac0de1d2fec 100644 --- a/addons/product/product.py +++ b/addons/product/product.py @@ -770,6 +770,34 @@ class product_product(osv.osv): args.append((('categ_id', 'child_of', context['search_default_categ_id']))) return super(product_product, self).search(cr, uid, args, offset=offset, limit=limit, order=order, context=context, count=count) + def _compute_uos_qty(self, cr, uid, ids, uom, qty, uos, context=None): + ''' + Computes product's invoicing quantity in UoS from quantity in UoM. + Takes into account the + :param uom: Source unit + :param qty: Source quantity + :param uos: Target UoS unit. + ''' + if not uom or not qty or not uos: + return qty + uom_obj = self.pool['product.uom'] + product_id = ids[0] if isinstance(ids, (list, tuple)) else ids + product = self.browse(cr, uid, product_id, context=context) + if isinstance(uos, (int, long)): + uos = uom_obj.browse(cr, uid, uos, context=context) + if isinstance(uom, (int, long)): + uom = uom_obj.browse(cr, uid, uom, context=context) + if product.uos_id: # Product has UoS defined + # We cannot convert directly between units even if the units are of the same category + # as we need to apply the conversion coefficient which is valid only between quantities + # in product's default UoM/UoS + qty_default_uom = uom_obj._compute_qty_obj(cr, uid, uom, qty, product.uom_id) # qty in product's default UoM + qty_default_uos = qty_default_uom * product.uos_coeff + return uom_obj._compute_qty_obj(cr, uid, product.uos_id, qty_default_uos, uos) + else: + return uom_obj._compute_qty_obj(cr, uid, uom, qty, uos) + + product_product() class product_packaging(osv.osv): diff --git a/addons/stock/stock.py b/addons/stock/stock.py index f117bdbc27d..644dae4ddf9 100644 --- a/addons/stock/stock.py +++ b/addons/stock/stock.py @@ -1241,7 +1241,7 @@ class stock_picking(osv.osv): for pick in self.browse(cr, uid, ids, context=context): new_picking = None complete, too_many, too_few = [], [], [] - move_product_qty, prodlot_ids, product_avail, partial_qty, product_uoms = {}, {}, {}, {}, {} + move_product_qty, prodlot_ids, product_avail, partial_qty, uos_qty, product_uoms = {}, {}, {}, {}, {}, {} for move in pick.move_lines: if move.state in ('done', 'cancel'): continue @@ -1255,6 +1255,7 @@ class stock_picking(osv.osv): prodlot_ids[move.id] = prodlot_id product_uoms[move.id] = product_uom partial_qty[move.id] = uom_obj._compute_qty(cr, uid, product_uoms[move.id], product_qty, move.product_uom.id) + uos_qty[move.id] = move.product_id._compute_uos_qty(product_uom, product_qty, move.product_uos) if product_qty else 0.0 if move.product_qty == partial_qty[move.id]: complete.append(move) elif move.product_qty > partial_qty[move.id]: @@ -1318,7 +1319,7 @@ class stock_picking(osv.osv): if product_qty != 0: defaults = { 'product_qty' : product_qty, - 'product_uos_qty': product_qty, #TODO: put correct uos_qty + 'product_uos_qty': uos_qty[move.id], 'picking_id' : new_picking, 'state': 'assigned', 'move_dest_id': False, @@ -1332,7 +1333,7 @@ class stock_picking(osv.osv): move_obj.write(cr, uid, [move.id], { 'product_qty': move.product_qty - partial_qty[move.id], - 'product_uos_qty': move.product_qty - partial_qty[move.id], #TODO: put correct uos_qty + 'product_uos_qty': move.product_uos_qty - uos_qty[move.id], 'prodlot_id': False, 'tracking_id': False, }) @@ -1348,7 +1349,7 @@ class stock_picking(osv.osv): product_qty = move_product_qty[move.id] defaults = { 'product_qty' : product_qty, - 'product_uos_qty': product_qty, #TODO: put correct uos_qty + 'product_uos_qty': uos_qty[move.id], 'product_uom': product_uoms[move.id] } prodlot_id = prodlot_ids.get(move.id) From 787147d52b85464588c046b2afaa0bab0796009b Mon Sep 17 00:00:00 2001 From: Jeremy Kersten Date: Wed, 29 Oct 2014 17:43:44 +0100 Subject: [PATCH 16/16] [FIX] web_calendar: cast the id into int. When you open a form view in a popup via the attr 'event_open_popup', in some cases the id is a string and so the popup is empty... FIX #545 PR #551 --- addons/web_calendar/static/src/js/web_calendar.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/web_calendar/static/src/js/web_calendar.js b/addons/web_calendar/static/src/js/web_calendar.js index d32cbe453ad..5f90f49acad 100644 --- a/addons/web_calendar/static/src/js/web_calendar.js +++ b/addons/web_calendar/static/src/js/web_calendar.js @@ -855,7 +855,7 @@ openerp.web_calendar = function(instance) { } else { var pop = new instance.web.form.FormOpenPopup(this); - pop.show_element(this.dataset.model, id, this.dataset.get_context(), { + pop.show_element(this.dataset.model, parseInt(id), this.dataset.get_context(), { title: _.str.sprintf(_t("View: %s"),title), view_id: +this.open_popup_action, res_id: id,