[tryton-debian-vcs] tryton-client branch debian updated. debian/3.0.1-2-2-g4777c6f
Mathias Behrle
tryton-debian-vcs at alioth.debian.org
Wed Dec 11 13:45:46 UTC 2013
The following commit has been merged in the debian branch:
https://alioth.debian.org/plugins/scmgit/cgi-bin/gitweb.cgi/?p=tryton/tryton-client.git;a=commitdiff;h=debian/3.0.1-2-2-g4777c6f
commit 4777c6fd27ac9e63f41bef499f840cff6bf5def1
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Wed Dec 11 14:45:37 2013 +0100
Releasing debian version 3.0.2-1.
diff --git a/debian/changelog b/debian/changelog
index 0af22eb..655d691 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+tryton-client (3.0.2-1) unstable; urgency=low
+
+ * Merging upstream version 3.0.2.
+
+ -- Mathias Behrle <mathiasb at m9s.biz> Wed, 11 Dec 2013 12:56:48 +0100
+
tryton-client (3.0.1-2) unstable; urgency=low
* Pointing VCS fields to new location on alioth.debian.org.
commit cc8e7492b4900b1e6d978523f8ebc57df5048247
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Wed Dec 11 12:51:47 2013 +0100
Merging upstream version 3.0.2.
diff --git a/CHANGELOG b/CHANGELOG
index d7104eb..85ce572 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+Version 3.0.2 - 2013-12-04
+* Bug fixes (see mercurial logs for details)
+
Version 3.0.1 - 2013-11-03
* Bug fixes (see mercurial logs for details)
* Sanitize report file extension
diff --git a/PKG-INFO b/PKG-INFO
index 8f298a7..1ffc501 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
Metadata-Version: 1.1
Name: tryton
-Version: 3.0.1
+Version: 3.0.2
Summary: Tryton client
Home-page: http://www.tryton.org/
Author: Tryton
diff --git a/doc/installation.rst b/doc/installation.rst
index 7003d51..14ecd9c 100644
--- a/doc/installation.rst
+++ b/doc/installation.rst
@@ -12,6 +12,7 @@ Prerequisites
* Optional: simplejson (http://undefined.org/python/#simplejson)
* Optional: pytz (http://pytz.sourceforge.net/)
* Optional: cdecimal (http://www.bytereef.org/mpdecimal/index.html)
+ * Optional: GooCalendar (http://code.google.com/p/goocalendar/)
Installation
------------
diff --git a/tryton.egg-info/PKG-INFO b/tryton.egg-info/PKG-INFO
index 8f298a7..1ffc501 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.1
+Version: 3.0.2
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/popup_menu.py b/tryton/common/popup_menu.py
index ac69109..4b4e743 100644
--- a/tryton/common/popup_menu.py
+++ b/tryton/common/popup_menu.py
@@ -52,7 +52,7 @@ def populate(menu, model, record, title=''):
Action._exec_action(action, data, {})
def attachment(menuitem):
- Attachment(model, load(record).id, None)
+ Attachment(record, None)
if title:
if len(menu):
diff --git a/tryton/config.py b/tryton/config.py
index ac9763d..a20aba8 100644
--- a/tryton/config.py
+++ b/tryton/config.py
@@ -155,7 +155,9 @@ class ConfigManager(object):
elif value.lower() == 'false':
value = False
if section == 'client' and name == 'limit':
- value = float(value)
+ # First convert to float to be backward compatible with old
+ # configuration
+ value = int(float(value))
self.config[section + '.' + name] = value
return True
diff --git a/tryton/gui/window/limit.py b/tryton/gui/window/limit.py
index b0501e8..af4797a 100644
--- a/tryton/gui/window/limit.py
+++ b/tryton/gui/window/limit.py
@@ -27,11 +27,11 @@ class Limit(object):
self.win.vbox.pack_start(gtk.HSeparator())
hbox = gtk.HBox(spacing=3)
hbox.pack_start(gtk.Label(_('Limit:')), expand=True, fill=True)
- self.spin_limit = gtk.SpinButton(climb_rate=1, digits=0)
+ adjustment = gtk.Adjustment(value=CONFIG['client.limit'],
+ lower=1, upper=sys.maxint, step_incr=10, page_incr=100)
+ self.spin_limit = gtk.SpinButton(adjustment, climb_rate=1, digits=0)
self.spin_limit.set_numeric(False)
- self.spin_limit.set_adjustment(gtk.Adjustment(
- value=CONFIG['client.limit'], lower=1, upper=sys.maxint,
- step_incr=10, page_incr=100))
+ self.spin_limit.set_activates_default(True)
hbox.pack_start(self.spin_limit, expand=True, fill=True)
self.win.vbox.pack_start(hbox, expand=True, fill=True)
@@ -41,7 +41,7 @@ class Limit(object):
'Run the window'
res = self.win.run()
if res == gtk.RESPONSE_OK:
- CONFIG['client.limit'] = self.spin_limit.get_value()
+ CONFIG['client.limit'] = self.spin_limit.get_value_as_int()
CONFIG.save()
self.parent.present()
self.win.destroy()
diff --git a/tryton/gui/window/view_form/model/field.py b/tryton/gui/window/view_form/model/field.py
index 12966ca..c4a7a2e 100644
--- a/tryton/gui/window/view_form/model/field.py
+++ b/tryton/gui/window/view_form/model/field.py
@@ -77,7 +77,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 83bcdd4..35a08b1 100644
--- a/tryton/gui/window/view_form/model/record.py
+++ b/tryton/gui/window/view_form/model/record.py
@@ -73,7 +73,7 @@ class Record(SignalEvent):
record_context = self.context_get()
if loading == 'eager':
- limit = int(CONFIG['client.limit'])
+ limit = CONFIG['client.limit']
if not self.parent:
# If not a children no need to load too much
limit = int(limit / len(fnames))
@@ -514,7 +514,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/gui/window/view_form/screen/screen.py b/tryton/gui/window/view_form/screen/screen.py
index 3e5a745..37923e3 100644
--- a/tryton/gui/window/view_form/screen/screen.py
+++ b/tryton/gui/window/view_form/screen/screen.py
@@ -53,7 +53,7 @@ class Screen(SignalEvent):
if domain is None:
domain = []
- self.limit = limit or int(CONFIG['client.limit'])
+ self.limit = limit or CONFIG['client.limit']
self.offset = 0
super(Screen, self).__init__()
@@ -140,7 +140,7 @@ class Screen(SignalEvent):
):
if name not in fields:
fields[name] = {
- 'string': string,
+ 'string': string.decode('utf-8'),
'name': name,
'type': type_,
}
diff --git a/tryton/version.py b/tryton/version.py
index eb74475..b21c548 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.1"
+VERSION = "3.0.2"
LICENSE = "GPL-3"
WEBSITE = "http://www.tryton.org/"
--
tryton-client
More information about the tryton-debian-vcs
mailing list