From 39afa56669b137149939d7da7415a7078cf33450 Mon Sep 17 00:00:00 2001 From: "rha@tinyerp.com" <> Date: Fri, 28 Jan 2011 16:48:48 +0530 Subject: [PATCH 01/18] [Fix]: stock: Anglo-saxon Accounting does not use input stock account when purchase order invoicing control set to From picking lp bug: https://launchpad.net/bugs/708874 fixed bzr revid: rha@tinyerp.com-20110128111848-y3pqbmiu3l9sl0kh --- 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 c7eab1eef4d..37b3d09810f 100644 --- a/addons/stock/wizard/stock_invoice_onshipping.py +++ b/addons/stock/wizard/stock_invoice_onshipping.py @@ -127,7 +127,7 @@ class stock_invoice_onshipping(osv.osv_memory): res = picking_pool.action_invoice_create(cr, uid, active_ids, journal_id = onshipdata_obj[0]['journal_id'], group = onshipdata_obj[0]['group'], - type = None, + type = context.get('inv_type'), context=context) return res From 145c74b2709696f9964b4ecdda53768947368e09 Mon Sep 17 00:00:00 2001 From: Olivier Dony Date: Tue, 1 Feb 2011 14:07:21 +0100 Subject: [PATCH 02/18] [REVERT] fields: revert previous fix, until tests and addons are checked for compatibility bzr revid: odo@openerp.com-20110201130721-q368qznven3vbmty --- bin/osv/fields.py | 14 -------------- 1 file changed, 14 deletions(-) diff --git a/bin/osv/fields.py b/bin/osv/fields.py index b7874cda8e6..72df0e925ad 100644 --- a/bin/osv/fields.py +++ b/bin/osv/fields.py @@ -339,20 +339,6 @@ class many2one(_column): result = {} for id in ids: result[id] = obj.datas[id].get(name, False) - - # build a dictionary of the form {'id_of_distant_resource': name_of_distant_resource} - # we use uid=1 because the visibility of a many2one field value (just id and name) - # must be the access right of the parent form and not the linked object itself. - obj = obj.pool.get(self._obj) - records = dict(obj.name_get(cr, 1, - list(set([x for x in result.values() if x and isinstance(x, (int,long))])), - context=context)) - for id in ids: - if result[id] in records: - result[id] = (result[id], records[result[id]]) - else: - result[id] = False - return result def get(self, cr, obj, ids, name, user=None, context=None, values=None): From f76e0fc097531b414fd1d7dd5cf13c6ef29ebfa3 Mon Sep 17 00:00:00 2001 From: "rha@tinyerp.com" <> Date: Tue, 1 Feb 2011 18:57:50 +0530 Subject: [PATCH 03/18] [Fix]: product: Pricelist with base price set to 0 lp bug: https://launchpad.net/bugs/710521 fixed bzr revid: rha@tinyerp.com-20110201132750-lvp43mmvs0kxqwif --- addons/product/pricelist.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/product/pricelist.py b/addons/product/pricelist.py index 6899b673c70..9413ceebbe2 100644 --- a/addons/product/pricelist.py +++ b/addons/product/pricelist.py @@ -264,7 +264,7 @@ class product_pricelist(osv.osv): product_obj.price_get(cr, uid, [product_id], price_type.field)[product_id], round=False, context=context) - if price: + if price or price == 0.0: price_limit = price price = price * (1.0+(res['price_discount'] or 0.0)) From daa1b729734666fefb0b615150184ff0bd698b97 Mon Sep 17 00:00:00 2001 From: Thibault Francois Date: Tue, 1 Feb 2011 17:06:22 +0100 Subject: [PATCH 04/18] [FIX] widget selection replace by m2o because the domain is dynamic bzr revid: tfr@openerp.com-20110201160622-gc75h8fwp0c4vz7o --- addons/project_issue/project_issue_view.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/project_issue/project_issue_view.xml b/addons/project_issue/project_issue_view.xml index 0c63698b209..23a361b0ff9 100644 --- a/addons/project_issue/project_issue_view.xml +++ b/addons/project_issue/project_issue_view.xml @@ -58,7 +58,7 @@ - +