[tryton-debian-vcs] tryton-modules-account-statement branch upstream-2.2 created. fd69ae960b331e3f31a563c7f9e0c60645c5669c

Mathias Behrle tryton-debian-vcs at alioth.debian.org
Wed Nov 27 16:56:59 UTC 2013


The following commit has been merged in the upstream-2.2 branch:
https://alioth.debian.org/plugins/scmgit/cgi-bin/gitweb.cgi/?p=tryton/tryton-modules-account-statement.git;a=commitdiff;h=fd69ae960b331e3f31a563c7f9e0c60645c5669c
commit fd69ae960b331e3f31a563c7f9e0c60645c5669c
Author: Mathias Behrle <mathiasb at m9s.biz>
Date:   Sun Feb 24 19:46:11 2013 +0100

    Adding upstream version 2.2.2.

diff --git a/CHANGELOG b/CHANGELOG
index 2622ed5..59fceb9 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+Version 2.2.2 - 2012-11-05
+* Bug fixes (see mercurial logs for details)
+
 Version 2.2.1 - 2012-09-02
 * Bug fixes (see mercurial logs for details)
 
diff --git a/PKG-INFO b/PKG-INFO
index 3964690..9dac682 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
-Metadata-Version: 1.0
+Metadata-Version: 1.1
 Name: trytond_account_statement
-Version: 2.2.1
+Version: 2.2.2
 Summary: Financial and Accounting Module with:
     - Statement
     - Statement journal
diff --git a/__tryton__.py b/__tryton__.py
index a8baed5..0cac7cf 100644
--- a/__tryton__.py
+++ b/__tryton__.py
@@ -8,7 +8,7 @@
     'name_es_ES': 'Estado de cuentas',
     'name_fr_FR': 'Relevé comptable',
     'name_nl_NL': 'Bankafschriften',
-    'version': '2.2.1',
+    'version': '2.2.2',
     'author': 'B2CK',
     'email': 'info at b2ck.com',
     'website': 'http://www.tryton.org/',
diff --git a/statement.py b/statement.py
index d901fb4..f0c496b 100644
--- a/statement.py
+++ b/statement.py
@@ -169,12 +169,12 @@ class Statement(ModelWorkflow, ModelSQL, ModelView):
 
     def search_rec_name(self, name, clause):
         ids = self.search(['OR',
-            ('start_balance',) + clause[1:],
-            ('end_balance',) + clause[1:],
+            ('start_balance',) + tuple(clause[1:]),
+            ('end_balance',) + tuple(clause[1:]),
             ])
         if ids:
             return [('id', 'in', ids)]
-        return [('journal',) + clause[1:]]
+        return [('journal',) + tuple(clause[1:])]
 
     def get_move_lines(self, ids, name):
         '''
diff --git a/trytond_account_statement.egg-info/PKG-INFO b/trytond_account_statement.egg-info/PKG-INFO
index aef77f1..04d1c86 100644
--- a/trytond_account_statement.egg-info/PKG-INFO
+++ b/trytond_account_statement.egg-info/PKG-INFO
@@ -1,6 +1,6 @@
-Metadata-Version: 1.0
+Metadata-Version: 1.1
 Name: trytond-account-statement
-Version: 2.2.1
+Version: 2.2.2
 Summary: Financial and Accounting Module with:
     - Statement
     - Statement journal
commit e788b0ff1a9dd937de35ece36f7bd15af86ff4ec
Author: Mathias Behrle <mathiasb at m9s.biz>
Date:   Wed Sep 12 15:53:52 2012 +0200

    Adding upstream version 2.2.1.

diff --git a/CHANGELOG b/CHANGELOG
index af7659b..2622ed5 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+Version 2.2.1 - 2012-09-02
+* Bug fixes (see mercurial logs for details)
+
 Version 2.2.0 - 2011-10-24
 * Bug fixes (see mercurial logs for details)
 
diff --git a/COPYRIGHT b/COPYRIGHT
index a9feb41..83c0f58 100644
--- a/COPYRIGHT
+++ b/COPYRIGHT
@@ -1,6 +1,6 @@
-Copyright (C) 2008-2011 Cédric Krier.
+Copyright (C) 2008-2012 Cédric Krier.
 Copyright (C) 2008-2011 Bertrand Chenal.
-Copyright (C) 2008-2011 B2CK SPRL.
+Copyright (C) 2008-2012 B2CK SPRL.
 Copyright (C) 2004-2008 Tiny SPRL.
 
 This program is free software: you can redistribute it and/or modify
diff --git a/PKG-INFO b/PKG-INFO
index 12c55a3..3964690 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
 Metadata-Version: 1.0
 Name: trytond_account_statement
-Version: 2.2.0
+Version: 2.2.1
 Summary: Financial and Accounting Module with:
     - Statement
     - Statement journal
diff --git a/__tryton__.py b/__tryton__.py
index 96aebf8..a8baed5 100644
--- a/__tryton__.py
+++ b/__tryton__.py
@@ -8,7 +8,7 @@
     'name_es_ES': 'Estado de cuentas',
     'name_fr_FR': 'Relevé comptable',
     'name_nl_NL': 'Bankafschriften',
-    'version': '2.2.0',
+    'version': '2.2.1',
     'author': 'B2CK',
     'email': 'info at b2ck.com',
     'website': 'http://www.tryton.org/',
diff --git a/statement.py b/statement.py
index b4d4fd8..d901fb4 100644
--- a/statement.py
+++ b/statement.py
@@ -244,7 +244,9 @@ class Statement(ModelWorkflow, ModelSQL, ModelView):
                         else:
                             res['lines']['update'].append({
                                 'id': line['id'],
-                                'amount': amount_to_pay,
+                                'amount': (amount_to_pay
+                                        if line['amount'] >= 0
+                                        else -amount_to_pay),
                                 })
                             res['lines'].setdefault('add', [])
                             vals = line.copy()
diff --git a/trytond_account_statement.egg-info/PKG-INFO b/trytond_account_statement.egg-info/PKG-INFO
index 81c0e62..aef77f1 100644
--- a/trytond_account_statement.egg-info/PKG-INFO
+++ b/trytond_account_statement.egg-info/PKG-INFO
@@ -1,6 +1,6 @@
 Metadata-Version: 1.0
 Name: trytond-account-statement
-Version: 2.2.0
+Version: 2.2.1
 Summary: Financial and Accounting Module with:
     - Statement
     - Statement journal
-- 
tryton-modules-account-statement



More information about the tryton-debian-vcs mailing list