[tryton-debian-vcs] tryton-proteus branch debian-jessie-3.0 updated. debian/3.0.0-3-6-g6a13684

[Mathias Behrle]

The following commit has been merged in the debian-jessie-3.0 branch:
https://alioth.debian.org/plugins/scmgit/cgi-bin/gitweb.cgi/?p=tryton/tryton-proteus.git;a=commitdiff;h=debian/3.0.0-3-6-g6a13684

commit 6a136845c0b8a828a26c47a49ac1ffbd2923fc1e
Author: Mathias Behrle <mathiasb at m9s.biz>
Date:   Wed Jul 2 14:29:20 2014 +0200

    Releasing debian version 3.0.1-1.

diff --git a/debian/changelog b/debian/changelog
index 5588776..684aa99 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,14 @@
+tryton-proteus (3.0.1-1) unstable; urgency=medium
+
+  * Removing  LC_ALL=C.UTF-8 as build environment.
+  * Setting the branch in the watch file to the fixed version 3.0.
+  * Updating signing key while using now plain .asc files instead of .pgp
+    binaries.
+  * Merging upstream version 3.0.1.
+  * Updating copyright file.
+
+ -- Mathias Behrle <mathiasb at m9s.biz>  Wed, 02 Jul 2014 14:29:19 +0200
+
 tryton-proteus (3.0.0-3) unstable; urgency=medium
 
   * Updating year in debian copyright.
commit b81055b3d7c74b4fb637fc6955bf124d92da34ee
Author: Mathias Behrle <mathiasb at m9s.biz>
Date:   Wed Jul 2 14:29:16 2014 +0200

    Updating copyright file.

diff --git a/debian/copyright b/debian/copyright
index c288422..4b11c65 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,8 +1,8 @@
 Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 
 Files: *
-Copyright: 2010-2013 Cédric Krier
-           2010-2013 B2CK SPRL
+Copyright: 2010-2014 Cédric Krier
+           2010-2014 B2CK SPRL
 License: LGPL-3+
 
 Files: debian/*
commit 40cab2def142fad62d8aab2fe0363fa4c201cc33
Author: Mathias Behrle <mathiasb at m9s.biz>
Date:   Wed Jul 2 14:29:16 2014 +0200

    Merging upstream version 3.0.1.

diff --git a/CHANGELOG b/CHANGELOG
index 6579877..fee254b 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+Version 3.0.1 - 2014-07-02
+* Bug fixes (see mercurial logs for details)
+
 Version 3.0.0 - 2013-10-21
 * Bug fixes (see mercurial logs for details)
 
diff --git a/COPYRIGHT b/COPYRIGHT
index 7e8c156..c655746 100644
--- a/COPYRIGHT
+++ b/COPYRIGHT
@@ -1,5 +1,5 @@
-Copyright (C) 2010-2013 Cédric Krier.
-Copyright (C) 2010-2013 B2CK SPRL.
+Copyright (C) 2010-2014 Cédric Krier.
+Copyright (C) 2010-2014 B2CK SPRL.
 
 This program is free software: you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
diff --git a/PKG-INFO b/PKG-INFO
index 9a334cb..ec0d718 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
 Metadata-Version: 1.1
 Name: proteus
-Version: 3.0.0
+Version: 3.0.1
 Summary: Library to access Tryton server as a client
 Home-page: http://www.tryton.org/
 Author: Tryton
diff --git a/proteus.egg-info/PKG-INFO b/proteus.egg-info/PKG-INFO
index 9a334cb..ec0d718 100644
--- a/proteus.egg-info/PKG-INFO
+++ b/proteus.egg-info/PKG-INFO
@@ -1,6 +1,6 @@
 Metadata-Version: 1.1
 Name: proteus
-Version: 3.0.0
+Version: 3.0.1
 Summary: Library to access Tryton server as a client
 Home-page: http://www.tryton.org/
 Author: Tryton
diff --git a/proteus/__init__.py b/proteus/__init__.py
index 9843977..0998fa4 100644
--- a/proteus/__init__.py
+++ b/proteus/__init__.py
@@ -3,7 +3,7 @@
 '''
 A library to access Tryton's models like a client.
 '''
-__version__ = "3.0.0"
+__version__ = "3.0.1"
 __all__ = ['Model', 'Wizard']
 import sys
 try:
@@ -31,7 +31,7 @@ class _EvalEnvironment(dict):
         self.parent = parent
 
     def __getitem__(self, item):
-        if item == '_parent_' + self.parent._parent_field_name \
+        if item == '_parent_' + self.parent._parent_name \
                 and self.parent.parent:
             return _EvalEnvironment(self.parent.parent)
         return self.parent._get_eval()[item]
@@ -274,15 +274,19 @@ class One2ManyValueDescriptor(ValueDescriptor):
     def __get__(self, instance, owner):
         value = [('add', [])]
         value_list = getattr(instance, self.name)
+        parent_name = self.definition.get('relation_field', '')
         to_create = []
         for record in value_list:
-            if record.id > 0:
-                if record._changed:
-                    value.append(('write', [record.id], record._get_values(
-                        fields=record._changed)))
+            if record.id >= 0:
+                values = record._get_values(fields=record._changed)
+                values.pop(parent_name, None)
+                if record._changed and values:
+                    value.append(('write', [record.id], values))
                 value[0][1].append(record.id)
             else:
-                to_create.append(record._get_values())
+                values = record._get_values()
+                values.pop(parent_name, None)
+                to_create.append(values)
         if to_create:
             value.append(('create', to_create))
         if value_list.record_removed:
@@ -505,8 +509,8 @@ class ModelList(list):
     def pop(self, index=-1):
         self.record_removed.add(self[index])
         self[index]._parent = None
-        self[index]._parent_field_name = None
-        self[index]._parent_name = None
+        self[index]._parent_field_name = ''
+        self[index]._parent_name = ''
         res = super(ModelList, self).pop(index)
         self._changed()
         return res
@@ -515,8 +519,8 @@ class ModelList(list):
     def remove(self, record):
         self.record_deleted.add(record)
         record._parent = None
-        record._parent_field_name = None
-        record._parent_name = None
+        record._parent_field_name = ''
+        record._parent_name = ''
         res = super(ModelList, self).remove(record)
         self._changed()
         return res
-- 
tryton-proteus