Merge lp:~openerp-dev/openobject-addons/6.0-opw-579336-rgo into lp:openobject-addons/6.0

[Ravi Gohil (OpenERP)]

Hello,

When we run `Synchronize objects` wizard from menu `Administration/Synchronization`, wrong wizard is popped up.

Steps to reproduce:
1) Install base_synchro,
2) Goto `Administration/Configuration/Synchronization` and feed the server parameters which defines with whom we want to do synchronization,
3) Goto `Administration/Synchronization/History/Synchronized objects` and select the server and select the object to be synchronized(I tested with `res.partner` object without any domain to sync all partners),
4) Run the `Synchronize objects` wizard,

You will have `Synchronize Completed!` wizard, where a wizard should be popped up which asks for from which server one wants to synchronize.

I have provided right view from .xml file and also removed redundent definition of menuitem with id="next_id_62" from it.

I need to remove context from .py file as I faced a traceback saying 'TypeError: __call__() got an unexpected keyword argument 'context'' when I processed the `Synchronize objects` wizard after applying changes of .xml files from this fix.

Kindly review the fix.

Thanks.

[Niels Huylebroeck (red15)]

I'm personally a little concerned about the removal of the context, this doesn't seem normal and would need further analysis to make sure we aren't ignoring another (big) issue under the surface.

[lp:~openerp-dev/openobject-addons/6.0-opw-579336-rgo]

5347. By Launchpad Translations on behalf of openerp on 2012-09-27

Launchpad automatic translations update.

5348. By Launchpad Translations on behalf of openerp on 2012-09-28

Launchpad automatic translations update.

5349. By Launchpad Translations on behalf of openerp on 2012-10-02

Launchpad automatic translations update.

5350. By Launchpad Translations on behalf of openerp on 2012-10-03

Launchpad automatic translations update.

5351. By Launchpad Translations on behalf of openerp on 2012-10-09

Launchpad automatic translations update.

5352. By Launchpad Translations on behalf of openerp on 2012-10-10

Launchpad automatic translations update.

5353. By Launchpad Translations on behalf of openerp on 2012-10-11

Launchpad automatic translations update.

5354. By Xavier ALT on 2012-10-11

[MERGE] OPW 578622: project: duplicating project must reset analytic account code

  backport of addons v6.1 revision id: <email address hidden>

5355. By Ravi Gohil (OpenERP) on 2012-10-15

[FIX] base_synchro: Fixed traceback saying cannot adapt type browse_record and int type is unsubscriptable when sync direction is 'both' for meeting object : (Maintenance Case : 579336)

Unmerged revisions

5355. By Ravi Gohil (OpenERP) on 2012-10-15

[FIX] base_synchro: Fixed traceback saying cannot adapt type browse_record and int type is unsubscriptable when sync direction is 'both' for meeting object : (Maintenance Case : 579336)

=== modified file 'base_synchro/wizard/base_synchro.py'
--- base_synchro/wizard/base_synchro.py	2011-01-14 00:11:01 +0000
+++ base_synchro/wizard/base_synchro.py	2012-10-15 09:03:22 +0000
@@ -102,6 +102,13 @@
             if object.model_id.model=='crm.case.history':
                 fields = ['email','description','log_id']
             value = pool_src.get(object.model_id.model).read(cr, uid, [id], fields)[0]
+            if 'create_date' in value:
+                del value['create_date']
+            if 'create_uid' in value:
+                del value['create_uid']
+            for key ,val in value.iteritems():
+                if type(val)==tuple:
+                    value.update({key:val[0]})
             value = self.data_transform(cr, uid, pool_src, pool_dest, object.model_id.model, value, action)
             id2 = self.get_id(cr, uid, object.id, id, action, context)
             #
@@ -165,7 +172,7 @@
             #
             # If not synchronized, try to find it with name_get/name_search
             #
-            names = pool_src.get(object).name_get(cr, uid, [id], context)[0][1]
+            names = pool_src.get(object).name_get(cr, uid, [id])[0][1]
             res = pool_dest.get(object).name_search(cr, uid, names, [], 'like')
             if res:
                 result = res[0][0]
@@ -184,7 +191,7 @@
     def data_transform(self, cr, uid, pool_src, pool_dest, object, data, action='u', context=None):
         self.meta.setdefault(pool_src, {})
         if not object in self.meta[pool_src]:
-            self.meta[pool_src][object] = pool_src.get(object).fields_get(cr, uid, context=context)
+            self.meta[pool_src][object] = pool_src.get(object).fields_get(cr, uid)
         fields = self.meta[pool_src][object]
 
         for f in fields:
@@ -196,7 +203,11 @@
                 del data[f]
             elif ftype == 'many2one':
                 if data[f]:
-                    df = self.relation_transform(cr, uid, pool_src, pool_dest, fields[f]['relation'], data[f][0], action, context=context)
+                    if isinstance(data[f], int):
+                        id = data[f]
+                    elif isinstance(data[f], list):
+                        id = data[f][0]
+                    df = self.relation_transform(cr, uid, pool_src, pool_dest, fields[f]['relation'], id, action, context=context)
                     data[f] = df
                     if not data[f]:
                         del data[f]
@@ -225,7 +236,7 @@
                 dt = time.strftime('%Y-%m-%d %H:%M:%S')
             self.pool.get('base.synchro.obj').write(cr, uid, [object.id], {'synchronize_date': dt})
         end_date = time.strftime('%Y-%m-%d, %Hh %Mm %Ss')
-        if 'user_id' in syn_obj.user_id:
+        if syn_obj.user_id:
             request = pooler.get_pool(cr.dbname).get('res.request')
             if not self.report:
                 self.report.append('No exception.')
@@ -244,7 +255,7 @@
             request.create(cr, uid, {
                 'name' : "Synchronization report",
                 'act_from' : uid,
-                'act_to' : syn_obj.user_id,
+                'act_to' : syn_obj.user_id.id,
                 'body': summary,
             })
             return True

=== modified file 'base_synchro/wizard/base_synchro_view.xml'
--- base_synchro/wizard/base_synchro_view.xml	2011-01-14 00:11:01 +0000
+++ base_synchro/wizard/base_synchro_view.xml	2012-10-15 09:03:22 +0000
@@ -25,10 +25,10 @@
             <field name="res_model">base.synchro</field>
             <field name="view_type">form</field>
             <field name="view_mode">form</field>
+            <field name="view_id" ref="view_base_synchro"/>
             <field name="target">new</field>
         </record>
 
-        <menuitem id="next_id_62" name="Synchronization" parent="base.menu_administration"/>
         <record id="view_base_synchro_finish" model="ir.ui.view">
             <field name="name">Base Synchronization</field>
             <field name="model">base.synchro</field>