[tryton-debian-vcs] tryton-client branch upstream-3.0 updated. upstream/3.0.14-1-gddd6752
Mathias Behrle
tryton-debian-vcs at alioth.debian.org
Wed Feb 10 19:53:00 UTC 2016
The following commit has been merged in the upstream-3.0 branch:
https://alioth.debian.org/plugins/scmgit/cgi-bin/gitweb.cgi/?p=tryton/tryton-client.git;a=commitdiff;h=upstream/3.0.14-1-gddd6752
commit ddd6752d7164475f3d3e9219251c2bb8e21f7e68
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Wed Feb 10 18:58:52 2016 +0100
Adding upstream version 3.0.15.
Signed-off-by: Mathias Behrle <mathiasb at m9s.biz>
diff --git a/CHANGELOG b/CHANGELOG
index eee99b6..cfbec66 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+Version 3.0.15 - 2016-02-06
+* Bug fixes (see mercurial logs for details)
+
Version 3.0.14 - 2016-01-11
* Bug fixes (see mercurial logs for details)
diff --git a/PKG-INFO b/PKG-INFO
index 8015be3..5c15e54 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
Metadata-Version: 1.1
Name: tryton
-Version: 3.0.14
+Version: 3.0.15
Summary: Tryton client
Home-page: http://www.tryton.org/
Author: Tryton
diff --git a/tryton.egg-info/PKG-INFO b/tryton.egg-info/PKG-INFO
index 8015be3..5c15e54 100644
--- a/tryton.egg-info/PKG-INFO
+++ b/tryton.egg-info/PKG-INFO
@@ -1,6 +1,6 @@
Metadata-Version: 1.1
Name: tryton
-Version: 3.0.14
+Version: 3.0.15
Summary: Tryton client
Home-page: http://www.tryton.org/
Author: Tryton
diff --git a/tryton/gui/window/view_form/model/field.py b/tryton/gui/window/view_form/model/field.py
index 24f803e..49cc552 100644
--- a/tryton/gui/window/view_form/model/field.py
+++ b/tryton/gui/window/view_form/model/field.py
@@ -74,10 +74,13 @@ class CharField(object):
context.update(record.expr_eval(self.attrs.get('context', {})))
return context
+ def _is_empty(self, record):
+ return not self.get_eval(record)
+
def check_required(self, record):
state_attrs = self.get_state_attrs(record)
if bool(int(state_attrs.get('required') or 0)):
- if (not self.get_eval(record)
+ if (self._is_empty(record)
and not bool(int(state_attrs.get('readonly') or 0))):
return False
return True
@@ -250,6 +253,9 @@ class TimeField(CharField):
_default = None
+ def _is_empty(self, record):
+ return self.get(record) is None
+
def set_client(self, record, value, force_change=False):
if isinstance(value, basestring):
try:
@@ -276,13 +282,8 @@ class FloatField(CharField):
_default = None
default_digits = (16, 2)
- def check_required(self, record):
- state_attrs = self.get_state_attrs(record)
- if bool(int(state_attrs.get('required') or 0)):
- if (self.get(record) is None
- and not bool(int(state_attrs.get('readonly') or 0))):
- return False
- return True
+ def _is_empty(self, record):
+ return self.get(record) is None
def get(self, record):
return record.value.get(self.name, self._default)
@@ -613,7 +614,6 @@ class O2MField(CharField):
new_record.set_default(vals)
group.add(new_record)
else:
- new_record.id *= -1 # Don't consider record as unsaved
new_record.set(vals)
group.append(new_record)
diff --git a/tryton/version.py b/tryton/version.py
index 972a700..7a7a11f 100644
--- a/tryton/version.py
+++ b/tryton/version.py
@@ -1,6 +1,6 @@
#This file is part of Tryton. The COPYRIGHT file at the top level of
#this repository contains the full copyright notices and license terms.
PACKAGE = "tryton"
-VERSION = "3.0.14"
+VERSION = "3.0.15"
LICENSE = "GPL-3"
WEBSITE = "http://www.tryton.org/"
--
tryton-client
More information about the tryton-debian-vcs
mailing list