Merge lp:~openerp-dev/openobject-server/6.0-bug-726592-ysa into lp:openobject-server/6.0

[Yogesh (SerpentCS)]

[lp:~openerp-dev/openobject-server/6.0-bug-726592-ysa]

3444. By Jay Vora (Serpent Consulting Services) on 2011-06-17

[MERGE] Merged Panos' branch for the fix of install_lang passing wrong format of model, it should be list rather than a string

3445. By Launchpad Translations on behalf of openerp on 2011-06-18

Launchpad automatic translations update.

3446. By Launchpad Translations on behalf of openerp on 2011-06-21

Launchpad automatic translations update.

3447. By Launchpad Translations on behalf of openerp on 2011-06-22

Launchpad automatic translations update.

3448. By Jay Vora (Serpent Consulting Services) on 2011-06-23

[MERGE] Merged Rifakat's branch for the fix of report headers not appearing for multicomapny environment

3449. By Jay Vora (Serpent Consulting Services) on 2011-06-23

[MERGE] Merged Panos' branch for the fix of the problem found by pyflakes

3450. By Launchpad Translations on behalf of openerp on 2011-06-24

Launchpad automatic translations update.

3451. By Jay Vora (Serpent Consulting Services) on 2011-06-24

[MERGE] fixes launchpad bug 780584: Field definition translate=Yes is not stored in ir.model.fields

3452. By Launchpad Translations on behalf of openerp on 2011-06-25

Launchpad automatic translations update.

3453. By Jay Vora (Serpent Consulting Services) on 2011-06-27

[FIX] Report : Removed the unnecessary Return of setLang()

3454. By Launchpad Translations on behalf of openerp on 2011-06-28

Launchpad automatic translations update.

3455. By Launchpad Translations on behalf of openerp on 2011-06-30

Launchpad automatic translations update.

3456. By Priyesh (OpenERP) on 2011-07-01

[MERGE] Merged IRA's branch for the fix of correction in address_get method and addition of active field in address (case:6198)

3457. By Jay Vora (Serpent Consulting Services) on 2011-07-01

[MERGE] Merged Anup's branch for the fix of record rule for allowing access to users of relevant groups only

3458. By Launchpad Translations on behalf of openerp on 2011-07-02

Launchpad automatic translations update.

3459. By Launchpad Translations on behalf of openerp on 2011-07-03

Launchpad automatic translations update.

3460. By Jay Vora (Serpent Consulting Services) on 2011-07-04

[MERGE] Merged ILA's branch for the fix of correction in get_id() of ir_sequence to allow multi-company feature

3461. By Launchpad Translations on behalf of openerp on 2011-07-05

Launchpad automatic translations update.

3462. By Launchpad Translations on behalf of openerp on 2011-07-12

Launchpad automatic translations update.

3463. By Antony Lesuisse (OpenERP) on 2011-07-13

[FIX] res_currency typo

3464. By Launchpad Translations on behalf of openerp on 2011-07-18

Launchpad automatic translations update.

3465. By Jay Vora (Serpent Consulting Services) on 2011-07-18

[MERGE] Merged Rifakat's branch for the fix which stops the record rule for users/comapny getting updated on each update of base module

3466. By Launchpad Translations on behalf of openerp on 2011-07-23

Launchpad automatic translations update.

3467. By Launchpad Translations on behalf of openerp on 2011-07-30

Launchpad automatic translations update.

3468. By Launchpad Translations on behalf of openerp on 2011-07-31

Launchpad automatic translations update.

3469. By Launchpad Translations on behalf of openerp on 2011-08-03

Launchpad automatic translations update.

3470. By Priyesh (OpenERP) on 2011-08-04

[MERGE] Merged ADO's branch to fetch the correct values in Partner Labels report(case:16548)

3471. By Launchpad Translations on behalf of openerp on 2011-08-10

Launchpad automatic translations update.

3472. By Launchpad Translations on behalf of openerp on 2011-08-11

Launchpad automatic translations update.

3473. By Launchpad Translations on behalf of openerp on 2011-08-15

Launchpad automatic translations update.

3474. By Launchpad Translations on behalf of openerp on 2011-08-16

Launchpad automatic translations update.

3475. By Stephane Wirtel (OpenERP) on 2011-08-18

[RELEASE] OpenERP 6.0.3

3476. By Launchpad Translations on behalf of openerp on 2011-08-20

Launchpad automatic translations update.

3477. By Launchpad Translations on behalf of openerp on 2011-08-21

Launchpad automatic translations update.

3478. By Launchpad Translations on behalf of openerp on 2011-08-24

Launchpad automatic translations update.

3479. By Launchpad Translations on behalf of openerp on 2011-08-25

Launchpad automatic translations update.

3480. By Launchpad Translations on behalf of openerp on 2011-08-29

Launchpad automatic translations update.

3481. By Jay Vora (Serpent Consulting Services) on 2011-08-30

[MERGE] Merged Rifakat's branch to fix the problem of search with 'active' field when its in _inherit_fields

3482. By Launchpad Translations on behalf of openerp on 2011-09-03

Launchpad automatic translations update.

3483. By Launchpad Translations on behalf of openerp on 2011-09-05

Launchpad automatic translations update.

3484. By Launchpad Translations on behalf of openerp on 2011-09-06

Launchpad automatic translations update.

3485. By Launchpad Translations on behalf of openerp on 2011-09-07

Launchpad automatic translations update.

3486. By Husen Daudi <hda@hda-laptop> on 2011-09-07

merge ach branch issue 16889

3487. By Launchpad Translations on behalf of openerp on 2011-09-15

Launchpad automatic translations update.

3488. By Raphael Collet (OpenERP) on 2011-09-15

[MERGE] backport of revision 3391.4.1 from trunk, To fix Printscreen report Title translation

3489. By Raphael Collet (OpenERP) on 2011-09-16

[MERGE] translation import: source is not relevant in case of translation of record data (model)

3490. By Raphael Collet (OpenERP) on 2011-09-16

[MERGE] overwrite translation terms when updating modules from command line

3491. By Raphael Collet (OpenERP) on 2011-09-16

[MERGE] correct store computation of global field of ir.rule

3492. By Launchpad Translations on behalf of openerp on 2011-09-17

Launchpad automatic translations update.

3493. By Launchpad Translations on behalf of openerp on 2011-09-21

Launchpad automatic translations update.

3494. By Raphael Collet (OpenERP) on 2011-09-21

[MERGE] improve method exists() to handle list of ids

3495. By Launchpad Translations on behalf of openerp on 2011-09-23

Launchpad automatic translations update.

3496. By Launchpad Translations on behalf of openerp on 2011-09-24

Launchpad automatic translations update.

3497. By Launchpad Translations on behalf of openerp on 2011-09-25

Launchpad automatic translations update.

3498. By Launchpad Translations on behalf of openerp on 2011-09-26

Launchpad automatic translations update.

3499. By Launchpad Translations on behalf of openerp on 2011-09-27

Launchpad automatic translations update.

3500. By Launchpad Translations on behalf of openerp on 2011-09-28

Launchpad automatic translations update.

3501. By Launchpad Translations on behalf of openerp on 2011-09-29

Launchpad automatic translations update.

3502. By Launchpad Translations on behalf of openerp on 2011-09-30

Launchpad automatic translations update.

3503. By Jay Vora (Serpent Consulting Services) on 2011-09-30

[FIX] call to fields_get should always go with context attached

3504. By Jay Vora (Serpent Consulting Services) on 2011-09-30

[MERGE] Merged Rifakat's branch for the fix of domain and context over Accounting/Customers/Customers menu

3505. By Raphael Collet (OpenERP) on 2011-09-30

[MERGE] opw 17657

3506. By Launchpad Translations on behalf of openerp on 2011-10-01

Launchpad automatic translations update.

3507. By Launchpad Translations on behalf of openerp on 2011-10-02

Launchpad automatic translations update.

3508. By Launchpad Translations on behalf of openerp on 2011-10-03

Launchpad automatic translations update.

3509. By Raphael Collet (OpenERP) on 2011-10-03

[MERGE] owp 17683

3510. By Raphael Collet (OpenERP) on 2011-10-03

[MERGE] opw 17601

3511. By Launchpad Translations on behalf of openerp on 2011-10-04

Launchpad automatic translations update.

3512. By Launchpad Translations on behalf of openerp on 2011-10-05

Launchpad automatic translations update.

3513. By Launchpad Translations on behalf of openerp on 2011-10-06

Launchpad automatic translations update.

3514. By Launchpad Translations on behalf of openerp on 2011-10-07

Launchpad automatic translations update.

3515. By Launchpad Translations on behalf of openerp on 2011-10-08

Launchpad automatic translations update.

3516. By Launchpad Translations on behalf of openerp on 2011-10-09

Launchpad automatic translations update.

3517. By Launchpad Translations on behalf of openerp on 2011-10-10

Launchpad automatic translations update.

3518. By Launchpad Translations on behalf of openerp on 2011-10-11

Launchpad automatic translations update.

3519. By Launchpad Translations on behalf of openerp on 2011-10-12

Launchpad automatic translations update.

[Raphael Collet (OpenERP) (rco-openerp)]

You should not access '_id' (fragile). The branch lp:~openerp-dev/openobject-server/trunk-bug-726592-ysa uses a better solution (isinstance(..., browse_record)).

Can you please modify the code, to align it on that branch?

Thanks,
Raphael

review: Needs Fixing

[lp:~openerp-dev/openobject-server/6.0-bug-726592-ysa]

3520. By Rifakat Husen (OpenERP) on 2011-10-12

[FIX] fields.property: performed check with browse_record

[Rifakat Husen (OpenERP) (rha-openerp)]

review: Needs Resubmitting

[Raphael Collet (OpenERP) (rco-openerp)]

Excellent!

Thanks,
Raphael

review: Approve

=== modified file 'bin/osv/fields.py'
--- bin/osv/fields.py	2011-05-25 14:59:09 +0000
+++ bin/osv/fields.py	2011-10-12 09:12:23 +0000
@@ -38,6 +38,7 @@
 import xmlrpclib
 from psycopg2 import Binary
 
+import osv
 import netsvc
 import tools
 from tools.translate import _
@@ -1030,8 +1031,14 @@
             cr.execute('DELETE FROM ir_property WHERE id IN %s', (tuple(nids),))
 
         default_val = self._get_default(obj, cr, uid, prop_name, context)
+        property_create = False
+        if isinstance(default_val, osv.orm.browse_record):
+            if default_val.id != id_val:
+                property_create = True
+        elif default_val != id_val:
+            property_create = True
 
-        if id_val is not default_val:
+        if property_create:
             def_id = self._field_get(cr, uid, obj._name, prop_name)
             company = obj.pool.get('res.company')
             cid = company._company_default_get(cr, uid, obj._name, def_id,