[tryton-debian-vcs] tryton-modules-account-dunning-letter branch debian updated. debian/3.0.2-1-2-ga8b1f8f
Mathias Behrle
tryton-debian-vcs at alioth.debian.org
Tue Apr 22 13:05:04 UTC 2014
The following commit has been merged in the debian branch:
https://alioth.debian.org/plugins/scmgit/cgi-bin/gitweb.cgi/?p=tryton/tryton-modules-account-dunning-letter.git;a=commitdiff;h=debian/3.0.2-1-2-ga8b1f8f
commit a8b1f8f07df30c0c913c55180b0fb01b41d24e46
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Tue Apr 22 14:59:33 2014 +0200
Bumping minimal required Python version to 2.7.
diff --git a/debian/control b/debian/control
index c8102f7..b038c0b 100644
--- a/debian/control
+++ b/debian/control
@@ -9,7 +9,7 @@ Standards-Version: 3.9.5
Homepage: http://www.tryton.org/
Vcs-Browser: http://anonscm.debian.org/gitweb/?p=tryton/tryton-modules-account-dunning-letter.git
Vcs-Git: git://anonscm.debian.org/tryton/tryton-modules-account-dunning-letter.git
-X-Python-Version: >= 2.6
+X-Python-Version: >= 2.7
Package: tryton-modules-account-dunning-letter
Architecture: all
commit 3d4cf570833677b5528fae22e20cf1ef315d0687
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Tue Apr 22 14:20:33 2014 +0200
Merging upstream version 3.2.0.
diff --git a/CHANGELOG b/CHANGELOG
index a33d539..a77894f 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,7 +1,4 @@
-Version 3.0.2 - 2014-03-22
-* Bug fixes (see mercurial logs for details)
-
-Version 3.0.1 - 2013-12-04
+Version 3.2.0 - 2014-04-21
* Bug fixes (see mercurial logs for details)
Version 3.0.0 - 2013-10-21
diff --git a/INSTALL b/INSTALL
index e189fb7..fb37480 100644
--- a/INSTALL
+++ b/INSTALL
@@ -4,7 +4,7 @@ Installing trytond_account_dunning_letter
Prerequisites
-------------
- * Python 2.6 or later (http://www.python.org/)
+ * Python 2.7 or later (http://www.python.org/)
* trytond (http://www.tryton.org/)
* trytond_account (http://www.tryton.org/)
* trytond_party (http://www.tryton.org/)
diff --git a/PKG-INFO b/PKG-INFO
index f097a54..a8083b5 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,12 +1,12 @@
Metadata-Version: 1.1
Name: trytond_account_dunning_letter
-Version: 3.0.2
+Version: 3.2.0
Summary: Tryton module for account dunning letter
Home-page: http://www.tryton.org/
Author: Tryton
-Author-email: UNKNOWN
+Author-email: issue_tracker at tryton.org
License: GPL-3
-Download-URL: http://downloads.tryton.org/3.0/
+Download-URL: http://downloads.tryton.org/3.2/
Description: trytond_account_dunning_letter
==============================
@@ -43,6 +43,7 @@ Description: trytond_account_dunning_letter
http://www.tryton.org/
+Keywords: tryton account dunning letter
Platform: UNKNOWN
Classifier: Development Status :: 5 - Production/Stable
Classifier: Environment :: Plugins
@@ -62,7 +63,6 @@ Classifier: Natural Language :: Russian
Classifier: Natural Language :: Slovenian
Classifier: Natural Language :: Spanish
Classifier: Operating System :: OS Independent
-Classifier: Programming Language :: Python :: 2.6
Classifier: Programming Language :: Python :: 2.7
Classifier: Topic :: Office/Business
Classifier: Topic :: Office/Business :: Financial :: Accounting
diff --git a/dunning.py b/dunning.py
index 1b163cf..97181b8 100644
--- a/dunning.py
+++ b/dunning.py
@@ -67,7 +67,7 @@ class Letter(CompanyReport):
current_payments = list(payments.get(party, []))
payment_amount = sum((l.credit - l.debit
for l in current_payments))
- if dunning_amount < payment_amount:
+ if dunning_amount <= payment_amount:
continue
letters[party] = PartyLetter(dunnings=current_dunnings,
payments=current_payments)
diff --git a/locale/ca_ES.po b/locale/ca_ES.po
index 56e3ad8..e55d62e 100644
--- a/locale/ca_ES.po
+++ b/locale/ca_ES.po
@@ -4,7 +4,7 @@ msgstr "Content-Type: text/plain; charset=utf-8\n"
msgctxt "field:account.dunning.level,print_on_letter:"
msgid "Print on Letter"
-msgstr "Imprimir a una carta"
+msgstr "Imprimeix en una carta"
msgctxt "model:ir.action,name:report_letter"
msgid "Dunning Letter"
@@ -60,4 +60,4 @@ msgstr "Cancel·la"
msgctxt "wizard_button:account.dunning.process,start,process:"
msgid "process"
-msgstr "processa"
+msgstr "Processa"
diff --git a/locale/de_DE.po b/locale/de_DE.po
index e10c28d..f8dd7fa 100644
--- a/locale/de_DE.po
+++ b/locale/de_DE.po
@@ -4,7 +4,7 @@ msgstr "Content-Type: text/plain; charset=utf-8\n"
msgctxt "field:account.dunning.level,print_on_letter:"
msgid "Print on Letter"
-msgstr "Auf Mahnung drucken"
+msgstr "Auf Mahnschreiben drucken"
msgctxt "model:ir.action,name:report_letter"
msgid "Dunning Letter"
@@ -16,7 +16,7 @@ msgstr "Betrag"
msgctxt "odt:account.dunning.letter:"
msgid "Date"
-msgstr "Zeitpunkt"
+msgstr "Datum"
msgctxt "odt:account.dunning.letter:"
msgid "Date:"
@@ -24,7 +24,7 @@ msgstr "Datum:"
msgctxt "odt:account.dunning.letter:"
msgid "Description"
-msgstr "Bezeichnung"
+msgstr "Beschreibung"
msgctxt "odt:account.dunning.letter:"
msgid "Due Date"
@@ -48,7 +48,7 @@ msgstr "Beleg"
msgctxt "odt:account.dunning.letter:"
msgid "Reminder Notice"
-msgstr "Erinnerungsnachricht"
+msgstr "Erinnerung"
msgctxt "odt:account.dunning.letter:"
msgid "VAT Number:"
diff --git a/locale/es_CO.po b/locale/es_CO.po
index cb33f95..096fdfa 100644
--- a/locale/es_CO.po
+++ b/locale/es_CO.po
@@ -28,7 +28,7 @@ msgstr "Descripción"
msgctxt "odt:account.dunning.letter:"
msgid "Due Date"
-msgstr "Fecha Debida"
+msgstr "Fecha Esperada"
msgctxt "odt:account.dunning.letter:"
msgid "E-Mail:"
@@ -52,4 +52,4 @@ msgstr "Aviso Recordatorio"
msgctxt "odt:account.dunning.letter:"
msgid "VAT Number:"
-msgstr "Número NIT:"
+msgstr "Número Identificación:"
diff --git a/locale/es_ES.po b/locale/es_ES.po
index 493c018..dce5ba5 100644
--- a/locale/es_ES.po
+++ b/locale/es_ES.po
@@ -32,7 +32,7 @@ msgstr "Fecha de vencimiento"
msgctxt "odt:account.dunning.letter:"
msgid "E-Mail:"
-msgstr "Correo electrónico"
+msgstr "Correo electrónico:"
msgctxt "odt:account.dunning.letter:"
msgid "Pending Payments Received"
diff --git a/setup.py b/setup.py
index 4481e06..86c6dac 100644
--- a/setup.py
+++ b/setup.py
@@ -11,33 +11,51 @@ import ConfigParser
def read(fname):
return open(os.path.join(os.path.dirname(__file__), fname)).read()
+
+def get_require_version(name):
+ if minor_version % 2:
+ require = '%s >= %s.%s.dev0, < %s.%s'
+ else:
+ require = '%s >= %s.%s, < %s.%s'
+ require %= (name, major_version, minor_version,
+ major_version, minor_version + 1)
+ return require
+
config = ConfigParser.ConfigParser()
config.readfp(open('tryton.cfg'))
info = dict(config.items('tryton'))
for key in ('depends', 'extras_depend', 'xml'):
if key in info:
info[key] = info[key].strip().splitlines()
-major_version, minor_version, _ = info.get('version', '0.0.1').split('.', 2)
+version = info.get('version', '0.0.1')
+major_version, minor_version, _ = version.split('.', 2)
major_version = int(major_version)
minor_version = int(minor_version)
+name = 'trytond_account_dunning_letter'
+
+download_url = 'http://downloads.tryton.org/%s.%s/' % (
+ major_version, minor_version)
+if minor_version % 2:
+ version = '%s.%s.dev0' % (major_version, minor_version)
+ download_url = (
+ 'hg+http://hg.tryton.org/modules/%s#egg=%s-%s' % (
+ name[8:], name, version))
requires = []
for dep in info.get('depends', []):
if not re.match(r'(ir|res|webdav)(\W|$)', dep):
- requires.append('trytond_%s >= %s.%s, < %s.%s' %
- (dep, major_version, minor_version, major_version,
- minor_version + 1))
-requires.append('trytond >= %s.%s, < %s.%s' %
- (major_version, minor_version, major_version, minor_version + 1))
+ requires.append(get_require_version('trytond_%s' % dep))
+requires.append(get_require_version('trytond'))
-setup(name='trytond_account_dunning_letter',
- version=info.get('version', '0.0.1'),
+setup(name=name,
+ version=version,
description='Tryton module for account dunning letter',
long_description=read('README'),
author='Tryton',
+ author_email='issue_tracker at tryton.org',
url='http://www.tryton.org/',
- download_url=("http://downloads.tryton.org/" +
- info.get('version', '0.0.1').rsplit('.', 1)[0] + '/'),
+ download_url=download_url,
+ keywords='tryton account dunning letter',
package_dir={'trytond.modules.account_dunning_letter': '.'},
packages=[
'trytond.modules.account_dunning_letter',
@@ -66,7 +84,6 @@ setup(name='trytond_account_dunning_letter',
'Natural Language :: Slovenian',
'Natural Language :: Spanish',
'Operating System :: OS Independent',
- 'Programming Language :: Python :: 2.6',
'Programming Language :: Python :: 2.7',
'Topic :: Office/Business',
'Topic :: Office/Business :: Financial :: Accounting',
diff --git a/tests/test_account_dunning_letter.py b/tests/test_account_dunning_letter.py
index c6f37c5..edf0093 100644
--- a/tests/test_account_dunning_letter.py
+++ b/tests/test_account_dunning_letter.py
@@ -1,37 +1,22 @@
-#!/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.
-
-import sys
-import os
-DIR = os.path.abspath(os.path.normpath(os.path.join(__file__,
- '..', '..', '..', '..', '..', 'trytond')))
-if os.path.isdir(DIR):
- sys.path.insert(0, os.path.dirname(DIR))
-
import unittest
import trytond.tests.test_tryton
from trytond.tests.test_tryton import test_view, test_depends
class AccountDunningLetterTestCase(unittest.TestCase):
- '''
- Test AccountDunningLetter module.
- '''
+ 'Test AccountDunningLetter module'
def setUp(self):
trytond.tests.test_tryton.install_module('account_dunning_letter')
def test0005views(self):
- '''
- Test views.
- '''
+ 'Test views'
test_view('account_dunning_letter')
def test0006depends(self):
- '''
- Test depends.
- '''
+ 'Test depends'
test_depends()
@@ -40,6 +25,3 @@ def suite():
suite.addTests(unittest.TestLoader().loadTestsFromTestCase(
AccountDunningLetterTestCase))
return suite
-
-if __name__ == '__main__':
- unittest.TextTestRunner(verbosity=2).run(suite())
diff --git a/tryton.cfg b/tryton.cfg
index 683bb4c..ea1cdab 100644
--- a/tryton.cfg
+++ b/tryton.cfg
@@ -1,5 +1,5 @@
[tryton]
-version=3.0.2
+version=3.2.0
depends:
account
account_dunning
diff --git a/trytond_account_dunning_letter.egg-info/PKG-INFO b/trytond_account_dunning_letter.egg-info/PKG-INFO
index 8f0eb9b..ab421ac 100644
--- a/trytond_account_dunning_letter.egg-info/PKG-INFO
+++ b/trytond_account_dunning_letter.egg-info/PKG-INFO
@@ -1,12 +1,12 @@
Metadata-Version: 1.1
Name: trytond-account-dunning-letter
-Version: 3.0.2
+Version: 3.2.0
Summary: Tryton module for account dunning letter
Home-page: http://www.tryton.org/
Author: Tryton
-Author-email: UNKNOWN
+Author-email: issue_tracker at tryton.org
License: GPL-3
-Download-URL: http://downloads.tryton.org/3.0/
+Download-URL: http://downloads.tryton.org/3.2/
Description: trytond_account_dunning_letter
==============================
@@ -43,6 +43,7 @@ Description: trytond_account_dunning_letter
http://www.tryton.org/
+Keywords: tryton account dunning letter
Platform: UNKNOWN
Classifier: Development Status :: 5 - Production/Stable
Classifier: Environment :: Plugins
@@ -62,7 +63,6 @@ Classifier: Natural Language :: Russian
Classifier: Natural Language :: Slovenian
Classifier: Natural Language :: Spanish
Classifier: Operating System :: OS Independent
-Classifier: Programming Language :: Python :: 2.6
Classifier: Programming Language :: Python :: 2.7
Classifier: Topic :: Office/Business
Classifier: Topic :: Office/Business :: Financial :: Accounting
diff --git a/trytond_account_dunning_letter.egg-info/requires.txt b/trytond_account_dunning_letter.egg-info/requires.txt
index d24dfbc..4688d7e 100644
--- a/trytond_account_dunning_letter.egg-info/requires.txt
+++ b/trytond_account_dunning_letter.egg-info/requires.txt
@@ -1,5 +1,5 @@
-trytond_account >= 3.0, < 3.1
-trytond_account_dunning >= 3.0, < 3.1
-trytond_company >= 3.0, < 3.1
-trytond_party >= 3.0, < 3.1
-trytond >= 3.0, < 3.1
\ No newline at end of file
+trytond_account >= 3.2, < 3.3
+trytond_account_dunning >= 3.2, < 3.3
+trytond_company >= 3.2, < 3.3
+trytond_party >= 3.2, < 3.3
+trytond >= 3.2, < 3.3
\ No newline at end of file
--
tryton-modules-account-dunning-letter
More information about the tryton-debian-vcs
mailing list