[tryton-debian-vcs] tryton-client branch debian-jessie-2.8 updated. debian/2.8.4-1-4-ga4bec01
Mathias Behrle
tryton-debian-vcs at alioth.debian.org
Wed Dec 11 18:08:46 UTC 2013
The following commit has been merged in the debian-jessie-2.8 branch:
https://alioth.debian.org/plugins/scmgit/cgi-bin/gitweb.cgi/?p=tryton/tryton-client.git;a=commitdiff;h=debian/2.8.4-1-4-ga4bec01
commit a4bec01cf4dfe9f12165f87228a9440137eb473d
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Wed Dec 11 19:08:12 2013 +0100
Releasing debian version 2.8.5-1.
diff --git a/debian/changelog b/debian/changelog
index df98e7f..12301c7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+tryton-client (2.8.5-1) unstable; urgency=low
+
+ * Adding doc packages to Suggests.
+ * Fixing the branch version in the watch file.
+ * Merging upstream version 2.8.5.
+
+ -- Mathias Behrle <mathiasb at m9s.biz> Wed, 11 Dec 2013 18:40:46 +0100
+
tryton-client (2.8.4-1) unstable; urgency=high
* Merging upstream version 2.8.4.
commit c3e6bfdacb90f59aa720beab908333edcf71ece0
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Wed Dec 11 18:26:57 2013 +0100
Merging upstream version 2.8.5.
diff --git a/CHANGELOG b/CHANGELOG
index fe92637..0115ea0 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+Version 2.8.5 - 2013-12-04
+* Bug fixes (see mercurial logs for details)
+
Version 2.8.4 - 2013-11-03
* Bug fixes (see mercurial logs for details)
* Sanitize report file extension
diff --git a/PKG-INFO b/PKG-INFO
index 9eecea8..908ae8d 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
Metadata-Version: 1.1
Name: tryton
-Version: 2.8.4
+Version: 2.8.5
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 9eecea8..908ae8d 100644
--- a/tryton.egg-info/PKG-INFO
+++ b/tryton.egg-info/PKG-INFO
@@ -1,6 +1,6 @@
Metadata-Version: 1.1
Name: tryton
-Version: 2.8.4
+Version: 2.8.5
Summary: Tryton client
Home-page: http://www.tryton.org/
Author: Tryton
diff --git a/tryton/common/button.py b/tryton/common/button.py
index f4e07aa..67a5190 100644
--- a/tryton/common/button.py
+++ b/tryton/common/button.py
@@ -17,6 +17,11 @@ class Button(gtk.Button):
self._set_icon(attrs.get('icon'))
def _set_icon(self, stock):
+ image = self.get_image()
+ if not image and not stock:
+ return
+ elif image and image.get_stock()[0] == stock:
+ return
if not stock:
self.set_image(gtk.Image())
return
diff --git a/tryton/common/common.py b/tryton/common/common.py
index 11a63c0..f99bcae 100644
--- a/tryton/common/common.py
+++ b/tryton/common/common.py
@@ -10,6 +10,7 @@ import os
import subprocess
import re
import logging
+from functools import partial
from tryton.config import CONFIG
from tryton.config import TRYTON_ICON, PIXMAPS_DIR
import time
@@ -971,9 +972,10 @@ def send_bugtracker(title, msg):
protocol = 'http'
if ssl or hasattr(socket, 'ssl'):
protocol = 'https'
+ quote = partial(urllib.quote, safe="!$&'()*+,;=:")
server = xmlrpclib.Server(
('%s://%s:%s@' + CONFIG['roundup.xmlrpc'])
- % (protocol, user, password), allow_none=True)
+ % (protocol, quote(user), quote(password)), allow_none=True)
if hashlib:
msg_md5 = hashlib.md5(msg + '\n' + title).hexdigest()
else:
diff --git a/tryton/gui/window/view_form/model/field.py b/tryton/gui/window/view_form/model/field.py
index 5ec85c0..3fa1ae9 100644
--- a/tryton/gui/window/view_form/model/field.py
+++ b/tryton/gui/window/view_form/model/field.py
@@ -76,7 +76,7 @@ class CharField(object):
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(record)
+ if (not self.get_eval(record)
and not bool(int(state_attrs.get('readonly') or 0))):
return False
return True
diff --git a/tryton/gui/window/view_form/model/record.py b/tryton/gui/window/view_form/model/record.py
index 4cc5d91..bb65b7e 100644
--- a/tryton/gui/window/view_form/model/record.py
+++ b/tryton/gui/window/view_form/model/record.py
@@ -496,7 +496,7 @@ class Record(SignalEvent):
scope = values
for i in arg.split('.'):
if i not in scope:
- scope = False
+ scope = None
break
scope = scope[i]
res[arg] = scope
diff --git a/tryton/version.py b/tryton/version.py
index cd374f5..5f7c145 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 = "2.8.4"
+VERSION = "2.8.5"
LICENSE = "GPL-3"
WEBSITE = "http://www.tryton.org/"
--
tryton-client
More information about the tryton-debian-vcs
mailing list