diff options
Diffstat (limited to 'addons/base_synchro/wizard')
| -rw-r--r-- | addons/base_synchro/wizard/base_synchro.py | 4 | ||||
| -rw-r--r-- | addons/base_synchro/wizard/base_synchro_view.xml | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/addons/base_synchro/wizard/base_synchro.py b/addons/base_synchro/wizard/base_synchro.py index 1a593684b59..bc16b558ce5 100644 --- a/addons/base_synchro/wizard/base_synchro.py +++ b/addons/base_synchro/wizard/base_synchro.py @@ -170,7 +170,7 @@ class base_synchro(osv.osv_memory): # # 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] @@ -189,7 +189,7 @@ class base_synchro(osv.osv_memory): 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) + self.meta[pool_src][object] = pool_src.get(object).fields_get(cr, uid) fields = self.meta[pool_src][object] for f in fields: diff --git a/addons/base_synchro/wizard/base_synchro_view.xml b/addons/base_synchro/wizard/base_synchro_view.xml index 231fc7b055f..ccebb6145c2 100644 --- a/addons/base_synchro/wizard/base_synchro_view.xml +++ b/addons/base_synchro/wizard/base_synchro_view.xml @@ -7,6 +7,7 @@ <field name="name">Base Synchronization</field> <field name="model">base.synchro</field> <field name="type">form</field> + <field name="priority">1</field> <field name="arch" type="xml"> <form string="Transfer Data To Server"> <field name="server_url" colspan="4"/> @@ -29,19 +30,18 @@ <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> <field name="type">form</field> <field name="arch" type="xml"> - <form string="Synchronization Complited!"> + <form string="Synchronization Completed!"> <label string="The synchronisation has been started.You will receive a request when it's done." colspan="4"/> <separator string="" colspan="4"/> <button special="cancel" string="OK" icon="gtk-ok"/> </form> </field> - </record> + </record> <menuitem id="next_id_62" name="Synchronization" parent="base.menu_administration"/> |