Merge lp:~openerp-dev/openobject-server/6.0-opw-19972-rha into lp:openobject-server/6.0

[Rifakat Husen (OpenERP)]

Hello,

Corrected behavior of search method of osv memory object which was giving wrong result with limit and offset.

Currently it was searching for records till the limit instead of giving number of record of that limit and offset did not take into account also.

Regards,
Rifakat

[lp:~openerp-dev/openobject-server/6.0-opw-19972-rha]

3543. By Launchpad Translations on behalf of openerp on 2011-11-18

Launchpad automatic translations update.

3544. By Launchpad Translations on behalf of openerp on 2011-11-22

Launchpad automatic translations update.

3545. By Launchpad Translations on behalf of openerp on 2011-11-25

Launchpad automatic translations update.

3546. By Launchpad Translations on behalf of openerp on 2011-11-30

Launchpad automatic translations update.

3547. By Olivier Laurent (Open ERP) on 2011-12-02

[MERGE] opw 50559

3548. By Launchpad Translations on behalf of openerp on 2011-12-09

Launchpad automatic translations update.

3549. By Olivier Laurent (Open ERP) on 2011-12-09

[MERGE] opw 50997

3550. By Launchpad Translations on behalf of openerp on 2011-12-14

Launchpad automatic translations update.

3551. By Launchpad Translations on behalf of openerp on 2011-12-15

Launchpad automatic translations update.

3552. By Olivier Laurent (Open ERP) on 2011-12-15

[MERGE] opw 51206

3553. By Olivier Laurent (Open ERP) on 2011-12-15

[FIX] revert r3552 (opw 51206)

3554. By Olivier Laurent (Open ERP) on 2011-12-15

[FIX] opw 51206 (code improved)

3555. By Olivier Laurent (Open ERP) on 2011-12-15

[FIX] fixed r3554

3556. By Olivier Laurent (Open ERP) on 2011-12-16

[MERGE] opw 50912

3557. By Launchpad Translations on behalf of openerp on 2011-12-17

Launchpad automatic translations update.

3558. By Launchpad Translations on behalf of openerp on 2011-12-19

Launchpad automatic translations update.

3559. By Launchpad Translations on behalf of openerp on 2011-12-30

Launchpad automatic translations update.

3560. By Launchpad Translations on behalf of openerp on 2012-01-07

Launchpad automatic translations update.

3561. By Launchpad Translations on behalf of openerp on 2012-01-08

Launchpad automatic translations update.

3562. By Launchpad Translations on behalf of openerp on 2012-01-09

Launchpad automatic translations update.

3563. By Launchpad Translations on behalf of openerp on 2012-01-10

Launchpad automatic translations update.

3564. By Launchpad Translations on behalf of openerp on 2012-01-11

Launchpad automatic translations update.

3565. By Olivier Laurent (Open ERP) on 2012-01-12

[MERGE] backport of revision 3900: groupby boolean field with 3 distinct values (True, False, NULL)

3566. By Launchpad Translations on behalf of openerp on 2012-01-13

Launchpad automatic translations update.

3567. By Olivier Laurent (Open ERP) on 2012-01-13

[MERGE] opw 51127

3568. By Olivier Laurent (Open ERP) on 2012-01-13

[MERGE] opw 54583

3569. By Launchpad Translations on behalf of openerp on 2012-01-14

Launchpad automatic translations update.

3570. By Launchpad Translations on behalf of openerp on 2012-01-18

Launchpad automatic translations update.

3571. By Launchpad Translations on behalf of openerp on 2012-01-21

Launchpad automatic translations update.

[Naresh(OpenERP) (nch-openerp)]

review: Approve

[lp:~openerp-dev/openobject-server/6.0-opw-19972-rha]

3572. By Olivier Laurent (Open ERP) on 2012-01-27

[MERGE] opw 51026

3573. By Olivier Laurent (Open ERP) on 2012-01-27

[MERGE] opw 51093

3574. By Olivier Laurent (Open ERP) on 2012-01-27

[MERGE] opw 50831

3575. By Olivier Laurent (Open ERP) on 2012-01-27

[MERGE] opw 5801

3576. By Olivier Laurent (Open ERP) on 2012-01-27

reverted patch for 'opw 51026'

3577. By Launchpad Translations on behalf of openerp on 2012-01-28

Launchpad automatic translations update.

3578. By Launchpad Translations on behalf of openerp on 2012-02-04

Launchpad automatic translations update.

3579. By Launchpad Translations on behalf of openerp on 2012-02-08

Launchpad automatic translations update.

3580. By Launchpad Translations on behalf of openerp on 2012-02-09

Launchpad automatic translations update.

3581. By Olivier Laurent (Open ERP) on 2012-02-09

[FIX] ir_values: revert r3568: caused a crash when creating a new purchase.order

3582. By Christophe Simonis (OpenERP) on 2012-02-09

[IMP] backport of rev <email address hidden> of trunk: tools.translate: be more lenient and accept standart gettext source annotations

Original commit information:
------------------------------------------------------------
revno: 4002
revision-id: <email address hidden>
parent: <email address hidden>
committer: Olivier Dony <email address hidden>
branch nick: trunk
timestamp: Thu 2012-02-02 15:32:10 +0100
message:
  [IMP] tools.translate: be more lenient and accept standart gettext source annotations

   The GetText spec says that PO auto-comments indicating
    the source location have this form:
     #: /path/to/file:lineno
    However OpenERP's POT export system defaults to a modified
    version of this format with an extra 'type' field:
     #: type:/path/to/file:lineno
    The babel extractors we use for openerp-web's translations
    have the GetText format hardcoded, so it's a good idea
    to be more lenient and allow the standards annotations too.
    We can use a default 'code' type for such cases.

    For openerp-web translations the type does not matter,
    as the translations will be directly loaded by the
    web engine from the PO files and served in Javascript
   to the browser, with no typing needed.

    This patch simply avoids failing to parse updated PO files
    that will contain standard GetText annotations for the
    openerp-web related terms.

3583. By tfr (Openerp) on 2012-02-10

[MERGE] fix opw issue 56037 : res.log context need to allow more the 250 char

3584. By Olivier Laurent (Open ERP) on 2012-02-14

[FIX] resubmit patch for opw 51206 (cfr r3552, r3553, r3576). Also check addons revision 5056

3585. By Launchpad Translations on behalf of openerp on 2012-02-17

Launchpad automatic translations update.

3586. By Launchpad Translations on behalf of openerp on 2012-02-18

Launchpad automatic translations update.

3587. By Launchpad Translations on behalf of openerp on 2012-02-21

Launchpad automatic translations update.

3588. By Launchpad Translations on behalf of openerp on 2012-02-22

Launchpad automatic translations update.

3589. By Xavier ALT on 2012-02-24

[MERGE] OPW 18390

[Xavier ALT (dex-phx)]

Hello,

First "if" is equivalent to the "elif" in default case (offset = 0), so a unique "if" is sufficient, like:

if limit and (counter > int(limit)+int(offset))

Cheers,
Xavier

review: Needs Fixing

[lp:~openerp-dev/openobject-server/6.0-opw-19972-rha]

3590. By Rifakat Husen (OpenERP) on 2012-02-24

[FIX] osv: small imp for if condition

[Xavier ALT (dex-phx)]

review: Approve

=== modified file 'bin/osv/orm.py'
--- bin/osv/orm.py	2012-02-24 10:04:28 +0000
+++ bin/osv/orm.py	2012-02-24 13:17:18 +0000
@@ -2060,14 +2060,13 @@
             return self.datas.keys()
 
         res = []
-        counter = 0
+        counter = 1
         #Find the value of dict
         f = False
         if result:
             for id, data in self.datas.items():
-                counter = counter + 1
                 data['id'] = id
-                if limit and (counter > int(limit)):
+                if limit and (counter > int(limit) + int(offset)):
                     break
                 f = True
                 for arg in result:
@@ -2077,11 +2076,11 @@
                         val = eval('data[arg[0]]'+arg[1] +' arg[2]', locals())
                     elif arg[1] in ['ilike']:
                         val = (str(data[arg[0]]).find(str(arg[2]))!=-1)
-
                     f = f and val
-
                 if f:
-                    res.append(id)
+                    if counter > offset:
+                        res.append(id)
+                    counter += 1
         if count:
             return len(res)
         return res or []