Merge lp:~openerp-commiter/openobject-client/5.0-opw-52718-nch into lp:openobject-client/5.0

[Naresh(OpenERP)]

Hello,

There is a an error with one2many object in any form of OpenERP v5 It happens on all forms,
Here are the steps to reproduce:
1. Open any saved data (ie. Sale Order)
2. Change some data in one2many object (ie. quantites on lines) and
don't save, just press OK (quantity will change in one2many list)
3. Add a new line
4. Save the whole data (form)
5. The data you change in step 2. will return to original data

Regards,

Unmerged revisions

1100. By Naresh(OpenERP) on 2011-12-22

[FIX]:reload of previous values in O2M

=== modified file 'bin/widget/view/form_gtk/one2many_list.py'
--- bin/widget/view/form_gtk/one2many_list.py	2010-04-15 07:57:53 +0000
+++ bin/widget/view/form_gtk/one2many_list.py	2011-12-22 07:06:27 +0000
@@ -288,15 +288,26 @@
                 self._readonly = False
                 self.screen.current_view.widget.set_sensitive(True)
             else:
+                modified = {}
                 ok = 1
                 dia = dialog(self.attrs['relation'], parent=self._view.model, attrs=self.attrs, model_ctx=self.screen.models._context, default_get_ctx=ctx, window=self._window, readonly=self._readonly)
                 while ok:
                     ok, value = dia.run()
                     if ok:
+                        for m in self.screen.models.models:
+                            if m.is_modified():
+                                modified.setdefault(m, {})
+                                modified[m] = m.get()
                         self.screen.models.model_add(value)
                         value.signal('record-changed', value.parent)
                         self.screen.display()
                         dia.new()
+                if modified:
+                    for model, val in modified.iteritems():
+                        for k, v in val.iteritems():
+                            if isinstance(v,list) and len(v) and isinstance(v[0],tuple):
+                                val[k] = v[0][2]
+                        model.set(val, True)
                 dia.destroy()
 
     def _sig_edit(self, *args):