Merge lp:~nch-openerp/openobject-client/6.1-opw-577958-nch into lp:openobject-client/6.1

[Naresh(OpenERP)]

Hello,

Steps to reproduce:

1: Edit any SO line
2: change some field values eg:qty
3: press save & close
4: click new to add a new SO line
5: click save & close and finally save the SO

Current: edited SO line changes are reverted.
Expected: should not revert :)

Same can be reproduced by modifying this steps :
3:click save & new
4:ignore

Thanks,
Naresh

[lp:~nch-openerp/openobject-client/6.1-opw-577958-nch]

2089. By Naresh(OpenERP) on 2012-09-10

[IMP]:Improve the previous commit

=== modified file 'bin/widget/view/form_gtk/one2many_list.py'
--- bin/widget/view/form_gtk/one2many_list.py	2011-12-12 07:10:21 +0000
+++ bin/widget/view/form_gtk/one2many_list.py	2012-09-10 10:01:19 +0000
@@ -301,11 +301,36 @@
         if self._readonly:
             value = not self._readonly
         self.eb_del.set_sensitive(value)
-
+        
+    ## This method is specially developed to store old values of 
+    ## the modified records.
+    def _get_old_values(self, model_value={}):
+        group_model ={}
+        for key, val in model_value.iteritems():
+            if isinstance(val, ModelRecordGroup):
+                group_model[key] = val.models[:]
+                del model_value[key]
+        return model_value,group_model
+    
+    ## This method is specially developed to restored old values 
+    def _restore_values(self, edited_model, model_value, group_model, modified):
+        if modified:
+            edited_model.set(model_value, modified=True)
+            for f_name, models in group_model.items():
+                edited_model.value[f_name].clear()
+                for model in models:
+                # add model in ModelRecordGroup
+                    edited_model.value[f_name].model_add(model)
+        return True
+                    
     def _sig_new(self, *args):
         _, event = args
         ctx = dict(self._view.model.expr_eval(self.screen.default_get), **self.context)
         ctx.update(self._view.model.expr_eval('dict(%s)' % self.attrs.get('context', '{}')))
+        if self.screen.current_model:
+            child_modified = self.screen.current_model.modified
+            edited_model = self.screen.current_model
+        
         if event.type in (gtk.gdk.BUTTON_PRESS, gtk.gdk.KEY_PRESS):
             if (self.screen.current_view.view_type=='form') or self.screen.editable_get():
                 self.screen.new(context=ctx)
@@ -319,50 +344,38 @@
                 while ok:
                     ok, value, res = dia.run()
                     if ok or res == gtk.RESPONSE_APPLY:
+                        old_rec_modified = edited_model.is_modified()
+                        model_value, group_model = self._get_old_values(edited_model.value.copy()) 
                         self.screen.models.model_add(value)
                         value.signal('record-changed', value.parent)
+                        self._restore_values(edited_model, model_value, group_model, old_rec_modified)
                         self.screen.display()
                         dia.new()
                         self.set_disable(True)
                 self.pager.reset_pager()
                 dia.destroy()
-
+    
     def _sig_edit(self, *args):
         ctx = dict(self._view.model.expr_eval(self.screen.default_get), **self.context)
         ctx.update(self._view.model.expr_eval('dict(%s)' % self.attrs.get('context', '{}')))
         if self.screen.current_model:
             ok = True
-            parent_modified = self.screen.current_model.parent.modified
-            child_modifield = self.screen.current_model.modified
+            child_modified = self.screen.current_model.modified
             edited_model = self.screen.current_model
-            model_value = self.screen.current_model.value.copy()
-            
-            group_model ={}
-            for key, val in model_value.items():
-                if isinstance(val, ModelRecordGroup):
-                    group_model[key] = val.models[:]
-                    del model_value[key]
-                    
+            model_value, group_model = self._get_old_values(edited_model.value.copy())
             dia = dialog(self.attrs['relation'], parent=self._view.model,  model=self.screen.current_model, attrs=self.attrs, window=self._window, readonly=self._readonly, context=ctx)
             while ok:
                 ok, value, res = dia.run()
-                if not any([ok, value, res]) and dia.screen.is_modified(): 
-                    if child_modifield:
-                        edited_model.set(model_value, modified=True)
-                        for f_name, models in group_model.items():
-                            edited_model.value[f_name].clear()
-                            for model in models:
-                                # add model in ModelRecordGroup
-                                edited_model.value[f_name].model_add(model)
-                    else:
-                        edited_model.cancel()
-                        edited_model.modified = False
-                        self.screen.current_model.parent.modified = parent_modified
+                if not any([ok, value, res]) and dia.screen.is_modified():  
+                    self._restore_values(edited_model, model_value, group_model, child_modified)
                 if res == gtk.RESPONSE_OK:
                     dia.new()
                 if value and value != edited_model:
+                    old_rec_modified = edited_model.is_modified()
+                    model_value, group_model = self._get_old_values(edited_model.value.copy()) 
                     self.screen.models.model_add(value)
                     value.signal('record-changed', value.parent)
+                    self._restore_values(edited_model, model_value, group_model, old_rec_modified)
                     self.screen.display()
             self.pager.reset_pager()
             dia.destroy()