[tryton-debian-vcs] tryton-modules-bank branch upstream updated. upstream/3.4.1-1-gdf3aa20
Mathias Behrle
tryton-debian-vcs at alioth.debian.org
Thu Apr 23 16:02:52 UTC 2015
The following commit has been merged in the upstream branch:
https://alioth.debian.org/plugins/scmgit/cgi-bin/gitweb.cgi/?p=tryton/tryton-modules-bank.git;a=commitdiff;h=upstream/3.4.1-1-gdf3aa20
commit df3aa20b07430e0fae097f93fd3c353763013435
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Thu Apr 23 16:59:53 2015 +0200
Adding upstream version 3.6.0.
Signed-off-by: Mathias Behrle <mathiasb at m9s.biz>
diff --git a/CHANGELOG b/CHANGELOG
index d06a7aa..51e2a4b 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,6 +1,6 @@
-Version 3.4.1 - 2015-03-01
+Version 3.6.0 - 2015-04-20
* Bug fixes (see mercurial logs for details)
-
+* Add support for PyPy
Version 3.4.0 - 2014-10-20
* Bug fixes (see mercurial logs for details)
* Search also on compact number
diff --git a/PKG-INFO b/PKG-INFO
index 4d0d6f5..7fa0d17 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,12 +1,12 @@
Metadata-Version: 1.1
Name: trytond_bank
-Version: 3.4.1
+Version: 3.6.0
Summary: Tryton module with banks
Home-page: http://www.tryton.org/
Author: Tryton
Author-email: issue_tracker at tryton.org
License: GPL-3
-Download-URL: http://downloads.tryton.org/3.4/
+Download-URL: http://downloads.tryton.org/3.6/
Description: trytond_bank
============
@@ -65,4 +65,6 @@ Classifier: Natural Language :: Slovenian
Classifier: Natural Language :: Spanish
Classifier: Operating System :: OS Independent
Classifier: Programming Language :: Python :: 2.7
+Classifier: Programming Language :: Python :: Implementation :: CPython
+Classifier: Programming Language :: Python :: Implementation :: PyPy
Classifier: Topic :: Office/Business
diff --git a/__init__.py b/__init__.py
index f1d0621..01ea38b 100644
--- a/__init__.py
+++ b/__init__.py
@@ -1,5 +1,5 @@
-#This file is part of Tryton. The COPYRIGHT file at the top level of
-#this repository contains the full copyright notices and license terms.
+# This file is part of Tryton. The COPYRIGHT file at the top level of
+# this repository contains the full copyright notices and license terms.
from trytond.pool import Pool
from .bank import *
diff --git a/bank.py b/bank.py
index 783a807..65d3f0a 100644
--- a/bank.py
+++ b/bank.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.
+# This file is part of Tryton. The COPYRIGHT file at the top level of
+# this repository contains the full copyright notices and license terms.
from stdnum import iban
-from sql import operators, Literal
+from sql import operators, Literal, Null
from trytond.model import ModelView, ModelSQL, fields
@@ -30,6 +30,11 @@ class BankAccount(ModelSQL, ModelView):
currency = fields.Many2One('currency.currency', 'Currency')
numbers = fields.One2Many('bank.account.number', 'account', 'Numbers',
required=True)
+ active = fields.Boolean('Active', select=True)
+
+ @staticmethod
+ def default_active():
+ return True
def get_rec_name(self, name):
return self.numbers[0].number
@@ -65,7 +70,7 @@ class BankAccountNumber(ModelSQL, ModelView):
@staticmethod
def order_sequence(tables):
table, _ = tables[None]
- return [table.sequence == None, table.sequence]
+ return [table.sequence == Null, table.sequence]
@classmethod
def domain_number(cls, domain, tables):
diff --git a/locale/ca_ES.po b/locale/ca_ES.po
index 287f308..2debe75 100644
--- a/locale/ca_ES.po
+++ b/locale/ca_ES.po
@@ -24,7 +24,7 @@ msgstr "ID"
msgctxt "field:bank,party:"
msgid "Party"
-msgstr "Tercers"
+msgstr "Tercer"
msgctxt "field:bank,rec_name:"
msgid "Name"
@@ -38,6 +38,10 @@ msgctxt "field:bank,write_uid:"
msgid "Write User"
msgstr "Usuari modificació"
+msgctxt "field:bank.account,active:"
+msgid "Active"
+msgstr "Actiu"
+
msgctxt "field:bank.account,bank:"
msgid "Bank"
msgstr "Banc"
diff --git a/locale/de_DE.po b/locale/de_DE.po
index dca9eec..863ef14 100644
--- a/locale/de_DE.po
+++ b/locale/de_DE.po
@@ -38,6 +38,10 @@ msgctxt "field:bank,write_uid:"
msgid "Write User"
msgstr "Letzte Änderung durch"
+msgctxt "field:bank.account,active:"
+msgid "Active"
+msgstr "Aktiv"
+
msgctxt "field:bank.account,bank:"
msgid "Bank"
msgstr "Bank"
@@ -52,7 +56,7 @@ msgstr "Erstellt durch"
msgctxt "field:bank.account,currency:"
msgid "Currency"
-msgstr "Währungen"
+msgstr "Währung"
msgctxt "field:bank.account,id:"
msgid "ID"
diff --git a/locale/es_AR.po b/locale/es_AR.po
index 130c2c6..c2786fb 100644
--- a/locale/es_AR.po
+++ b/locale/es_AR.po
@@ -38,6 +38,10 @@ msgctxt "field:bank,write_uid:"
msgid "Write User"
msgstr "Usuario modificación"
+msgctxt "field:bank.account,active:"
+msgid "Active"
+msgstr "Activa"
+
msgctxt "field:bank.account,bank:"
msgid "Bank"
msgstr "Banco"
diff --git a/locale/es_CO.po b/locale/es_CO.po
index c404c7e..b2d6523 100644
--- a/locale/es_CO.po
+++ b/locale/es_CO.po
@@ -32,12 +32,16 @@ msgstr "Nombre"
msgctxt "field:bank,write_date:"
msgid "Write Date"
-msgstr "Modificado por Usuario"
+msgstr "Fecha de Modificación"
msgctxt "field:bank,write_uid:"
msgid "Write User"
msgstr "Modificado por Usuario"
+msgctxt "field:bank.account,active:"
+msgid "Active"
+msgstr "Activo"
+
msgctxt "field:bank.account,bank:"
msgid "Bank"
msgstr "Banco"
diff --git a/locale/es_EC.po b/locale/es_EC.po
index 7e91787..5572f76 100644
--- a/locale/es_EC.po
+++ b/locale/es_EC.po
@@ -12,11 +12,11 @@ msgstr "BIC / SWIFT"
msgctxt "field:bank,create_date:"
msgid "Create Date"
-msgstr "Fecha de Creación"
+msgstr "Fecha de creación"
msgctxt "field:bank,create_uid:"
msgid "Create User"
-msgstr "Creado por Usuario"
+msgstr "Creado por usuario"
msgctxt "field:bank,id:"
msgid "ID"
@@ -32,11 +32,15 @@ msgstr "Nombre"
msgctxt "field:bank,write_date:"
msgid "Write Date"
-msgstr "Fecha de Modificación"
+msgstr "Fecha de modificación"
msgctxt "field:bank,write_uid:"
msgid "Write User"
-msgstr "Modificado por Usuario"
+msgstr "Modificado por usuario"
+
+msgctxt "field:bank.account,active:"
+msgid "Active"
+msgstr "Activo"
msgctxt "field:bank.account,bank:"
msgid "Bank"
@@ -44,11 +48,11 @@ msgstr "Banco"
msgctxt "field:bank.account,create_date:"
msgid "Create Date"
-msgstr "Fecha de Creación"
+msgstr "Fecha de creación"
msgctxt "field:bank.account,create_uid:"
msgid "Create User"
-msgstr "Creado por Usuario"
+msgstr "Creado por usuario"
msgctxt "field:bank.account,currency:"
msgid "Currency"
@@ -72,11 +76,11 @@ msgstr "Nombre"
msgctxt "field:bank.account,write_date:"
msgid "Write Date"
-msgstr "Fecha de Modificación"
+msgstr "Fecha de modificación"
msgctxt "field:bank.account,write_uid:"
msgid "Write User"
-msgstr "Modificado por Usuario"
+msgstr "Modificado por usuario"
msgctxt "field:bank.account-party.party,account:"
msgid "Account"
@@ -84,11 +88,11 @@ msgstr "Cuenta"
msgctxt "field:bank.account-party.party,create_date:"
msgid "Create Date"
-msgstr "Fecha de Creación"
+msgstr "Fecha de creación"
msgctxt "field:bank.account-party.party,create_uid:"
msgid "Create User"
-msgstr "Creado por Usuario"
+msgstr "Creado por usuario"
msgctxt "field:bank.account-party.party,id:"
msgid "ID"
@@ -104,11 +108,11 @@ msgstr "Nombre"
msgctxt "field:bank.account-party.party,write_date:"
msgid "Write Date"
-msgstr "Fecha de Modificación"
+msgstr "Fecha de modificación"
msgctxt "field:bank.account-party.party,write_uid:"
msgid "Write User"
-msgstr "Modificado por Usuario"
+msgstr "Modificado por usuario"
msgctxt "field:bank.account.number,account:"
msgid "Account"
@@ -116,11 +120,11 @@ msgstr "Cuenta"
msgctxt "field:bank.account.number,create_date:"
msgid "Create Date"
-msgstr "Fecha de Creación"
+msgstr "Fecha de creación"
msgctxt "field:bank.account.number,create_uid:"
msgid "Create User"
-msgstr "Creado por Usuario"
+msgstr "Creado por usuario"
msgctxt "field:bank.account.number,id:"
msgid "ID"
@@ -132,7 +136,7 @@ msgstr "Número"
msgctxt "field:bank.account.number,number_compact:"
msgid "Number Compact"
-msgstr "Número Compacto"
+msgstr "Número compacto"
msgctxt "field:bank.account.number,rec_name:"
msgid "Name"
@@ -148,15 +152,15 @@ msgstr "Tipo"
msgctxt "field:bank.account.number,write_date:"
msgid "Write Date"
-msgstr "Fecha de Modificación"
+msgstr "Fecha de modificación"
msgctxt "field:bank.account.number,write_uid:"
msgid "Write User"
-msgstr "Modificado por Usuario"
+msgstr "Modificado por usuario"
msgctxt "field:party.party,bank_accounts:"
msgid "Bank Accounts"
-msgstr "Cuentas Bancarias"
+msgstr "Cuentas bancarias"
msgctxt "help:bank,bic:"
msgid "Bank/Business Identifier Code"
@@ -168,15 +172,15 @@ msgstr "Banco"
msgctxt "model:bank.account,name:"
msgid "Bank Account"
-msgstr "Cuenta Bancaria"
+msgstr "Cuenta bancaria"
msgctxt "model:bank.account-party.party,name:"
msgid "Bank Account - Party"
-msgstr "Cuenta Bancaria - Tercero"
+msgstr "Cuenta bancaria - Tercero"
msgctxt "model:bank.account.number,name:"
msgid "Bank Account Number"
-msgstr "Número de Cuenta Bancaria"
+msgstr "Número de cuenta bancaria"
msgctxt "model:ir.action,name:act_bank_account_form"
msgid "Accounts"
@@ -212,19 +216,19 @@ msgstr "Otro"
msgctxt "view:bank.account.number:"
msgid "Bank Account Number"
-msgstr "Número de Cuenta Bancaria"
+msgstr "Número de cuenta bancaria"
msgctxt "view:bank.account.number:"
msgid "Bank Account Numbers"
-msgstr "Números de Cuenta Bancaria"
+msgstr "Números de cuenta bancaria"
msgctxt "view:bank.account:"
msgid "Bank Account"
-msgstr "Cuenta Bancaria"
+msgstr "Cuenta bancaria"
msgctxt "view:bank.account:"
msgid "Bank Accounts"
-msgstr "Cuentas Bancarias"
+msgstr "Cuentas bancarias"
msgctxt "view:bank:"
msgid "Bank"
diff --git a/locale/es_ES.po b/locale/es_ES.po
index eb08ed5..23b3788 100644
--- a/locale/es_ES.po
+++ b/locale/es_ES.po
@@ -38,6 +38,10 @@ msgctxt "field:bank,write_uid:"
msgid "Write User"
msgstr "Usuario modificación"
+msgctxt "field:bank.account,active:"
+msgid "Active"
+msgstr "Activo"
+
msgctxt "field:bank.account,bank:"
msgid "Bank"
msgstr "Banco"
diff --git a/locale/fr_FR.po b/locale/fr_FR.po
index 986868b..46ee9d7 100644
--- a/locale/fr_FR.po
+++ b/locale/fr_FR.po
@@ -38,6 +38,10 @@ msgctxt "field:bank,write_uid:"
msgid "Write User"
msgstr "Mis à jour par"
+msgctxt "field:bank.account,active:"
+msgid "Active"
+msgstr "Actif"
+
msgctxt "field:bank.account,bank:"
msgid "Bank"
msgstr "Banque"
diff --git a/locale/sl_SI.po b/locale/sl_SI.po
index 459889c..6c7b83f 100644
--- a/locale/sl_SI.po
+++ b/locale/sl_SI.po
@@ -38,6 +38,10 @@ msgctxt "field:bank,write_uid:"
msgid "Write User"
msgstr "Zapisal"
+msgctxt "field:bank.account,active:"
+msgid "Active"
+msgstr "Aktivno"
+
msgctxt "field:bank.account,bank:"
msgid "Bank"
msgstr "Banka"
@@ -144,7 +148,7 @@ msgstr "Zap.št."
msgctxt "field:bank.account.number,type:"
msgid "Type"
-msgstr "Vrsta"
+msgstr "Tip"
msgctxt "field:bank.account.number,write_date:"
msgid "Write Date"
diff --git a/party.py b/party.py
index 131d2cf..f7c0a68 100644
--- a/party.py
+++ b/party.py
@@ -1,5 +1,5 @@
-#This file is part of Tryton. The COPYRIGHT file at the top level of
-#this repository contains the full copyright notices and license terms.
+# This file is part of Tryton. The COPYRIGHT file at the top level of
+# this repository contains the full copyright notices and license terms.
from trytond.pool import PoolMeta
from trytond.model import fields
@@ -15,10 +15,12 @@ class Party:
@classmethod
def search_rec_name(cls, name, clause):
- result = super(Party, cls).search_rec_name(name, clause)
- parties = cls.search([('bank_accounts',) + tuple(clause[1:])],
- order=[])
- if parties:
- parties += cls.search(result, order=[])
- return [('id', 'in', [p.id for p in parties])]
- return result
+ domain = super(Party, cls).search_rec_name(name, clause)
+ if clause[1].startswith('!') or clause[1].startswith('not '):
+ bool_op = 'AND'
+ else:
+ bool_op = 'OR'
+ return [bool_op,
+ domain,
+ ('bank_accounts',) + tuple(clause[1:]),
+ ]
diff --git a/setup.py b/setup.py
index a912803..1dd3573 100644
--- a/setup.py
+++ b/setup.py
@@ -1,6 +1,6 @@
#!/usr/bin/env python
-#This file is part of Tryton. The COPYRIGHT file at the top level of
-#this repository contains the full copyright notices and license terms.
+# This file is part of Tryton. The COPYRIGHT file at the top level of
+# this repository contains the full copyright notices and license terms.
from setuptools import setup
import re
@@ -41,7 +41,7 @@ if minor_version % 2:
'hg+http://hg.tryton.org/modules/%s#egg=%s-%s' % (
name[8:], name, version))
-requires = ['python-stdnum']
+requires = ['python-stdnum', 'python-sql >= 0.4']
for dep in info.get('depends', []):
if not re.match(r'(ir|res|webdav)(\W|$)', dep):
requires.append(get_require_version('trytond_%s' % dep))
@@ -86,6 +86,8 @@ setup(name=name,
'Natural Language :: Spanish',
'Operating System :: OS Independent',
'Programming Language :: Python :: 2.7',
+ 'Programming Language :: Python :: Implementation :: CPython',
+ 'Programming Language :: Python :: Implementation :: PyPy',
'Topic :: Office/Business',
],
license='GPL-3',
diff --git a/tests/__init__.py b/tests/__init__.py
index eb4e35e..efca78c 100644
--- a/tests/__init__.py
+++ b/tests/__init__.py
@@ -1,5 +1,5 @@
-#This file is part of Tryton. The COPYRIGHT file at the top level of
-#this repository contains the full copyright notices and license terms.
+# This file is part of Tryton. The COPYRIGHT file at the top level of
+# this repository contains the full copyright notices and license terms.
from .test_bank import suite
diff --git a/tests/test_bank.py b/tests/test_bank.py
index ed6f85e..1e996c5 100644
--- a/tests/test_bank.py
+++ b/tests/test_bank.py
@@ -1,30 +1,23 @@
-#This file is part of Tryton. The COPYRIGHT file at the top level of
-#this repository contains the full copyright notices and license terms.
+# This file is part of Tryton. The COPYRIGHT file at the top level of
+# this repository contains the full copyright notices and license terms.
import unittest
import trytond.tests.test_tryton
-from trytond.tests.test_tryton import test_view, test_depends, \
- POOL, DB_NAME, USER, CONTEXT
+from trytond.tests.test_tryton import ModuleTestCase
+from trytond.tests.test_tryton import POOL, DB_NAME, USER, CONTEXT
from trytond.transaction import Transaction
-class BankTestCase(unittest.TestCase):
+class BankTestCase(ModuleTestCase):
'Test Bank module'
+ module = 'bank'
def setUp(self):
- trytond.tests.test_tryton.install_module('bank')
+ super(BankTestCase, self).setUp()
self.bank = POOL.get('bank')
self.party = POOL.get('party.party')
self.account = POOL.get('bank.account')
self.number = POOL.get('bank.account.number')
- def test0005views(self):
- 'Test views'
- test_view('bank')
-
- def test0006depends(self):
- 'Test depends'
- test_depends()
-
def test0010iban_format(self):
'Test IBAN format'
with Transaction().start(DB_NAME, USER, context=CONTEXT):
diff --git a/tryton.cfg b/tryton.cfg
index 5681135..1225b46 100644
--- a/tryton.cfg
+++ b/tryton.cfg
@@ -1,5 +1,5 @@
[tryton]
-version=3.4.1
+version=3.6.0
depends:
ir
party
diff --git a/trytond_bank.egg-info/PKG-INFO b/trytond_bank.egg-info/PKG-INFO
index 79d9a30..fffcb8e 100644
--- a/trytond_bank.egg-info/PKG-INFO
+++ b/trytond_bank.egg-info/PKG-INFO
@@ -1,12 +1,12 @@
Metadata-Version: 1.1
Name: trytond-bank
-Version: 3.4.1
+Version: 3.6.0
Summary: Tryton module with banks
Home-page: http://www.tryton.org/
Author: Tryton
Author-email: issue_tracker at tryton.org
License: GPL-3
-Download-URL: http://downloads.tryton.org/3.4/
+Download-URL: http://downloads.tryton.org/3.6/
Description: trytond_bank
============
@@ -65,4 +65,6 @@ Classifier: Natural Language :: Slovenian
Classifier: Natural Language :: Spanish
Classifier: Operating System :: OS Independent
Classifier: Programming Language :: Python :: 2.7
+Classifier: Programming Language :: Python :: Implementation :: CPython
+Classifier: Programming Language :: Python :: Implementation :: PyPy
Classifier: Topic :: Office/Business
diff --git a/trytond_bank.egg-info/requires.txt b/trytond_bank.egg-info/requires.txt
index 887f9c4..2b03efa 100644
--- a/trytond_bank.egg-info/requires.txt
+++ b/trytond_bank.egg-info/requires.txt
@@ -1,4 +1,5 @@
python-stdnum
-trytond_party >= 3.4, < 3.5
-trytond_currency >= 3.4, < 3.5
-trytond >= 3.4, < 3.5
\ No newline at end of file
+python-sql >= 0.4
+trytond_party >= 3.6, < 3.7
+trytond_currency >= 3.6, < 3.7
+trytond >= 3.6, < 3.7
\ No newline at end of file
diff --git a/view/bank_account_form.xml b/view/bank_account_form.xml
index cc4b561..155eed7 100644
--- a/view/bank_account_form.xml
+++ b/view/bank_account_form.xml
@@ -1,12 +1,14 @@
<?xml version="1.0"?>
<!-- This file is part of Tryton. The COPYRIGHT file at the top level of
this repository contains the full copyright notices and license terms. -->
-<form string="Bank Account">
+<form string="Bank Account" col="6">
<label name="bank"/>
<field name="bank"/>
<label name="currency"/>
<field name="currency"/>
- <field name="owners" colspan="4"/>
- <field name="numbers" colspan="4" pre_validate="1"
+ <label name="active"/>
+ <field name="active"/>
+ <field name="owners" colspan="6"/>
+ <field name="numbers" colspan="6" pre_validate="1"
view_ids="bank.bank_account_number_view_list_sequence"/>
</form>
diff --git a/view/bank_account_list.xml b/view/bank_account_list.xml
index 02d9236..d74e18a 100644
--- a/view/bank_account_list.xml
+++ b/view/bank_account_list.xml
@@ -5,4 +5,5 @@ this repository contains the full copyright notices and license terms. -->
<field name="rec_name"/>
<field name="bank"/>
<field name="currency"/>
+ <field name="active" tree_invisible="1"/>
</tree>
--
tryton-modules-bank
More information about the tryton-debian-vcs
mailing list