Merge lp:~openerp-dev/openobject-addons/6.1-opw-572802-skh into lp:openobject-addons/6.1

[Somesh Khare]

Hello Sir,

[Fix]: On the stock move filter "Product" when you search the product the limit into the name_search() goes "None".
 Current Result : No move for the search product
 Expected Result: Should show all move for the Product

Kindly review the branch and please share your view on it,

Thanks

[Somesh Khare (somesh.khare)]

review: Needs Resubmitting

[lp:~openerp-dev/openobject-addons/6.1-opw-572802-skh]

6718. By Olivier Dony (Odoo) on 2012-03-31

[FIX] Trunk backport: properly record UTC login date, courtesy of Ian Beardslee

6719. By Launchpad Translations on behalf of openerp on 2012-03-31

Launchpad automatic translations update.

6720. By Launchpad Translations on behalf of openerp on 2012-04-01

Launchpad automatic translations update.

[Somesh Khare (somesh.khare)]

review: Needs Resubmitting

[lp:~openerp-dev/openobject-addons/6.1-opw-572802-skh]

6721. By Somesh Khare on 2012-04-02

[Fix] Product : removed the print statement (Case Ref: 572802)

[Olivier Dony (Odoo) (odo-openerp)]

Looks good to me now. See also related bug 971627 and the patch similar that was applied there.

review: Approve

[Naresh(OpenERP) (nch-openerp)]

review: Approve

[Naresh(OpenERP) (nch-openerp)]

Hello,

This bug was qualified as Confirmed on Trunk (means still existing and reproducible). A Merge Proposal for trunk was created to fix it. Here is the link to follow the MP on Launchpad https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-opw-572802-port-mma/+merge/132657 and be informed once it's been merged in trunk: ... If this Merge Proposal could not be merged in v6.1 at the release of v7.0, it will be closed.

Thanks,
Naresh Soni

Unmerged revisions

6721. By Somesh Khare on 2012-04-02

[Fix] Product : removed the print statement (Case Ref: 572802)

=== modified file 'product/product.py'
--- product/product.py	2012-02-14 14:34:20 +0000
+++ product/product.py	2012-04-02 05:06:20 +0000
@@ -611,9 +611,9 @@
                 # Performing a quick memory merge of ids in Python will give much better performance
                 ids = set()
                 ids.update(self.search(cr, user, args + [('default_code',operator,name)], limit=limit, context=context))
-                if len(ids) < limit:
+                if not limit or len(ids) < limit:
                     # we may underrun the limit because of dupes in the results, that's fine
-                    ids.update(self.search(cr, user, args + [('name',operator,name)], limit=(limit-len(ids)), context=context))
+                    ids.update(self.search(cr, user, args + [('name',operator,name)], limit=(limit-len(ids) if limit else limit) , context=context))
                 ids = list(ids)
             if not ids:
                 ptrn = re.compile('(\[(.*?)\])')