[tryton-debian-vcs] tryton-client branch upstream-1.6 created. 19a19c29804cdc9b2fb5c309acac9db675e65c3c
Mathias Behrle
tryton-debian-vcs at alioth.debian.org
Wed Nov 27 16:51:06 UTC 2013
The following commit has been merged in the upstream-1.6 branch:
https://alioth.debian.org/plugins/scmgit/cgi-bin/gitweb.cgi/?p=tryton/tryton-client.git;a=commitdiff;h=19a19c29804cdc9b2fb5c309acac9db675e65c3c
commit 19a19c29804cdc9b2fb5c309acac9db675e65c3c
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Sat Nov 20 21:00:46 2010 +0100
Adding upstream version 1.6.2.
diff --git a/CHANGELOG b/CHANGELOG
index f0ccabb..6a9c5ef 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+Version 1.6.2 - 2010-11-02
+* Bug fixes (see mercurial logs for details)
+
Version 1.6.1 - 2010-07-25
* Bug fixes (see mercurial logs for details)
diff --git a/PKG-INFO b/PKG-INFO
index a53c016..19f31da 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
Metadata-Version: 1.0
Name: tryton
-Version: 1.6.1
+Version: 1.6.2
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 a53c016..19f31da 100644
--- a/tryton.egg-info/PKG-INFO
+++ b/tryton.egg-info/PKG-INFO
@@ -1,6 +1,6 @@
Metadata-Version: 1.0
Name: tryton
-Version: 1.6.1
+Version: 1.6.2
Summary: Tryton client
Home-page: http://www.tryton.org/
Author: B2CK
diff --git a/tryton/gui/window/view_form/model/record.py b/tryton/gui/window/view_form/model/record.py
index 436e928..d101f6d 100644
--- a/tryton/gui/window/view_form/model/record.py
+++ b/tryton/gui/window/view_form/model/record.py
@@ -19,7 +19,7 @@ class EvalEnvironment(dict):
def __getitem__(self, item):
if item == '_parent_' + self.parent.parent_name and self.parent.parent:
- return EvalEnvironment(self.parent.parent)
+ return EvalEnvironment(self.parent.parent, self.check_load)
return self.parent.get_eval(check_load=self.check_load)[item]
def __getattr__(self, item):
@@ -260,8 +260,9 @@ class Record(SignalEvent):
self.signal('record-changed')
return change
- def validate(self):
- self._check_load()
+ def validate(self, check_load=True):
+ if check_load:
+ self._check_load()
res = True
for field in self.group.fields.itervalues():
if not field.validate(self):
@@ -342,7 +343,7 @@ class Record(SignalEvent):
if self.id < 0:
return
self['*']
- self.validate()
+ self.validate(check_load=False)
def expr_eval(self, expr, check_load=False):
if not isinstance(expr, basestring):
diff --git a/tryton/gui/window/view_form/screen/screen.py b/tryton/gui/window/view_form/screen/screen.py
index 88f03e6..1feea02 100644
--- a/tryton/gui/window/view_form/screen/screen.py
+++ b/tryton/gui/window/view_form/screen/screen.py
@@ -506,7 +506,7 @@ class Screen(SignalEvent):
context.update(rpc.CONTEXT)
context.update(self.context)
context['_timestamp'] = self.current_record.get_timestamp()
- reload_ids = self.group.on_write_ids(record_id)
+ reload_ids = self.group.on_write_ids([record_id])
if reload_ids and record_id in reload_ids:
reload_ids.remove(record_id)
args = ('model', self.model_name, 'delete', [record_id],
diff --git a/tryton/gui/window/view_form/view/list_gtk/parser.py b/tryton/gui/window/view_form/view/list_gtk/parser.py
index c5363c8..c8cafea 100644
--- a/tryton/gui/window/view_form/view/list_gtk/parser.py
+++ b/tryton/gui/window/view_form/view/list_gtk/parser.py
@@ -386,6 +386,7 @@ class Datetime(Date):
super(Datetime, self).__init__(field_name, model_name, treeview,
window, attrs=attrs)
self.display_format = date_format() + ' ' + HM_FORMAT
+ self.renderer.format = self.display_format
def get_textual_value(self, record):
value = record[self.field_name].get_client(record)
diff --git a/tryton/gui/window/view_tree/view_tree.py b/tryton/gui/window/view_tree/view_tree.py
index 0a80666..ea94781 100644
--- a/tryton/gui/window/view_tree/view_tree.py
+++ b/tryton/gui/window/view_tree/view_tree.py
@@ -293,35 +293,6 @@ class ViewTreeModel(gtk.GenericTreeModel, gtk.TreeSortable):
return None
return node[:-1]
- def cus_refresh(self):
- tree = self.tree
- tree[0][2] = None
-
- def _cus_row_find(self, ids_res):
- tree = self.tree
- try:
- ids = ids_res[:]
- while len(ids)>0:
- if ids[-1] in self.roots:
- ids.pop()
- break
- ids.pop()
- path = []
- while ids != []:
- path.append(0)
- val = ids.pop()
- i = iter(tree)
- while True:
- node = i.next()
- if node[0] == val:
- break
- path[-1] += 1
- if (node[2] is None) and (ids != []):
- return None
- tree = node[2]
- return (tuple(path), node)
- except:
- return None
class ViewTree(object):
"View tree"
diff --git a/tryton/rpc.py b/tryton/rpc.py
index 3899fcd..bb627d2 100644
--- a/tryton/rpc.py
+++ b/tryton/rpc.py
@@ -9,7 +9,7 @@ from tryton.fingerprints import Fingerprints
from tryton.config import get_config_dir
_SOCK = None
-_USER = 0
+_USER = None
_USERNAME = ''
_SESSION = ''
_DATABASE = ''
@@ -141,11 +141,11 @@ def login(username, password, host, port, database):
_SOCK.reconnect()
except (socket.error, RuntimeError):
pass
- _USER = 0
+ _USER = None
_SESSION = ''
return -1
if not res:
- _USER = 0
+ _USER = None
_SESSION = ''
return -2
_USER = res[0]
@@ -174,7 +174,7 @@ def logout():
pass
_SOCK.disconnect()
_SOCK = None
- _USER = 0
+ _USER = None
_USERNAME = ''
_SESSION = ''
_DATABASE = ''
diff --git a/tryton/version.py b/tryton/version.py
index c5d8547..e7943ec 100644
--- a/tryton/version.py
+++ b/tryton/version.py
@@ -1,7 +1,7 @@
#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 = "1.6.1"
+VERSION = "1.6.2"
LICENSE = "GPL-3"
WEBSITE = "http://www.tryton.org/"
--
tryton-client
More information about the tryton-debian-vcs
mailing list