[tryton-debian-vcs] tryton-client branch upstream-2.6 updated. upstream/2.6.6-1-ge901f48
git repository hosting
tryton-debian-vcs at m9s.biz
Mon Nov 4 13:12:12 UTC 2013
The following commit has been merged in the upstream-2.6 branch:
http://debian.tryton.org/gitweb/?p=packages/tryton-client.git;a=commitdiff;h=upstream/2.6.6-1-ge901f48
commit e901f48f972b50112082162c5e38369e2d2f4f0e
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Mon Nov 4 13:56:29 2013 +0100
Adding upstream version 2.6.7.
diff --git a/CHANGELOG b/CHANGELOG
index 3127310..9a540a2 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,7 @@
+Version 2.6.7 - 2013-11-03
+* Bug fixes (see mercurial logs for details)
+* Sanitize report file extension
+
Version 2.6.6 - 2013-10-10
* Bug fixes (see mercurial logs for details)
diff --git a/PKG-INFO b/PKG-INFO
index 554d0f5..8e6332c 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
Metadata-Version: 1.1
Name: tryton
-Version: 2.6.6
+Version: 2.6.7
Summary: Tryton client
Home-page: http://www.tryton.org/
Author: B2CK
diff --git a/tryton.egg-info/PKG-INFO b/tryton.egg-info/PKG-INFO
index 554d0f5..8e6332c 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.6.6
+Version: 2.6.7
Summary: Tryton client
Home-page: http://www.tryton.org/
Author: B2CK
diff --git a/tryton/action/main.py b/tryton/action/main.py
index ec681af..e466458 100644
--- a/tryton/action/main.py
+++ b/tryton/action/main.py
@@ -42,7 +42,8 @@ class Action(object):
dtemp = tempfile.mkdtemp(prefix='tryton_')
fp_name = os.path.join(dtemp,
name.replace(os.sep, '_').replace(os.altsep or os.sep, '_') \
- + os.extsep + type)
+ + os.extsep
+ + type.replace(os.sep, '_').replace(os.altsep or os.sep, '_'))
with open(fp_name, 'wb') as file_d:
file_d.write(data)
if email_print:
diff --git a/tryton/gui/window/view_form/model/field.py b/tryton/gui/window/view_form/model/field.py
index 85af6a7..ad2d77e 100644
--- a/tryton/gui/window/view_form/model/field.py
+++ b/tryton/gui/window/view_form/model/field.py
@@ -818,7 +818,7 @@ class ReferenceField(CharField):
def get(self, record, check_load=True, readonly=True, modified=False):
if (record.value.get(self.name)
and record.value[self.name][0]
- and record.value[self.name][1] >= 0):
+ and record.value[self.name][1] >= -1):
return ','.join(map(str, record.value[self.name]))
return None
@@ -830,6 +830,11 @@ class ReferenceField(CharField):
if isinstance(ref_id, (tuple, list)):
ref_id, rec_name = ref_id
else:
+ if ref_id:
+ try:
+ ref_id = int(ref_id)
+ except ValueError:
+ pass
if '%s,%s' % (ref_model, ref_id) == self.get(record):
rec_name = record.value.get(self.name + '.rec_name', '')
else:
diff --git a/tryton/gui/window/view_form/view/form.py b/tryton/gui/window/view_form/view/form.py
index 7373db2..a4b5024 100644
--- a/tryton/gui/window/view_form/view/form.py
+++ b/tryton/gui/window/view_form/view/form.py
@@ -184,8 +184,8 @@ class ViewForm(ParserView):
self.screen.display()
return
else:
- widget.set_sensitive(False)
+ widget.handler_block_by_func(self.button_clicked)
try:
self.screen.button(widget.attrs)
finally:
- widget.set_sensitive(True)
+ widget.handler_unblock_by_func(self.button_clicked)
diff --git a/tryton/gui/window/view_form/view/form_gtk/one2many.py b/tryton/gui/window/view_form/view/form_gtk/one2many.py
index 3842639..85dcf65 100644
--- a/tryton/gui/window/view_form/view/form_gtk/one2many.py
+++ b/tryton/gui/window/view_form/view/form_gtk/one2many.py
@@ -370,8 +370,7 @@ class One2Many(WidgetInterface):
self.view.set_value()
domain = self.field.domain_get(self.record)
context = self.field.context_get(self.record)
- domain = domain[:]
- domain.extend(self.record.expr_eval(self.attrs.get('add_remove')))
+ domain = [domain, self.record.expr_eval(self.attrs.get('add_remove'))]
removed_ids = self.field.get_removed_ids(self.record)
self.focus_out = False
diff --git a/tryton/gui/window/view_form/view/form_gtk/reference.py b/tryton/gui/window/view_form/view/form_gtk/reference.py
index b546c75..3dd57be 100644
--- a/tryton/gui/window/view_form/view/form_gtk/reference.py
+++ b/tryton/gui/window/view_form/view/form_gtk/reference.py
@@ -114,7 +114,12 @@ class Reference(Many2One):
return
self.wid_text.set_text('')
self.wid_text.set_position(0)
- self.field.set_client(self.record, (self.get_model(), (-1, '')))
+ model = self.get_model()
+ if model:
+ value = (model, (-1, ''))
+ else:
+ value = ('', '')
+ self.field.set_client(self.record, value)
def set_value(self, record, field):
if not self.get_model():
diff --git a/tryton/gui/window/view_form/view/list.py b/tryton/gui/window/view_form/view/list.py
index 9a738b7..70b10d3 100644
--- a/tryton/gui/window/view_form/view/list.py
+++ b/tryton/gui/window/view_form/view/list.py
@@ -120,7 +120,8 @@ class AdaptModelGroup(gtk.GenericTreeModel):
# Don't remove record from previous group
# as the new parent will change the parent
# This prevents concurrency conflict
- record.group.record_removed.remove(record)
+ if record in record.group.record_removed:
+ record.group.record_removed.remove(record)
group.add(record)
record.modified_fields.setdefault(record.parent_name or 'id')
group.move(record, 0)
diff --git a/tryton/gui/window/win_export.py b/tryton/gui/window/win_export.py
index 1fc34e1..d67c155 100644
--- a/tryton/gui/window/win_export.py
+++ b/tryton/gui/window/win_export.py
@@ -359,7 +359,7 @@ class WinExport(NoModal):
self.on_row_expanded(self.view1, iter,
self.model1.get_path(iter))
iter = self.model1.iter_children(iter)
- prefix = parent + '/'
+ prefix += parent + '/'
break
else:
iter = self.model1.iter_next(iter)
diff --git a/tryton/version.py b/tryton/version.py
index 674220d..4af2595 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.6.6"
+VERSION = "2.6.7"
LICENSE = "GPL-3"
WEBSITE = "http://www.tryton.org/"
--
tryton-client
More information about the tryton-debian-vcs
mailing list