[tryton-debian-vcs] tryton-modules-account-product branch debian updated. debian/3.0.0-3-4-g1704600
Mathias Behrle
tryton-debian-vcs at alioth.debian.org
Tue Apr 22 13:05:35 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-product.git;a=commitdiff;h=debian/3.0.0-3-4-g1704600
commit 17046000264379d6f08cb07ff1034146eb95bdc7
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Tue Apr 22 14:59:37 2014 +0200
Bumping minimal required Python version to 2.7.
diff --git a/debian/control b/debian/control
index 4f2eec4..9297f21 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-product.git
Vcs-Git: git://anonscm.debian.org/tryton/tryton-modules-account-product.git
-X-Python-Version: >= 2.6
+X-Python-Version: >= 2.7
Package: tryton-modules-account-product
Architecture: all
commit ced37f2a0d9a805ac9d4eb4de1227df9511a110c
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Tue Apr 22 14:45:36 2014 +0200
Updating copyright.
diff --git a/debian/copyright b/debian/copyright
index 9776a5f..1585a99 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,9 +1,9 @@
Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
Files: *
-Copyright: 2008-2013 Cédric Krier
+Copyright: 2008-2014 Cédric Krier
2008-2013 Bertrand Chenal
- 2008-2013 B2CK SPRL
+ 2008-2014 B2CK SPRL
2004-2008 Tiny SPRL
License: GPL-3+
commit c09229c2fc34d0c87ec24a8480996f9620612170
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Tue Apr 22 14:20:48 2014 +0200
Merging upstream version 3.2.0.
diff --git a/CHANGELOG b/CHANGELOG
index 452cce6..04fb866 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+Version 3.2.0 - 2014-04-21
+* Bug fixes (see mercurial logs for details)
+
Version 3.0.0 - 2013-10-21
* Bug fixes (see mercurial logs for details)
diff --git a/COPYRIGHT b/COPYRIGHT
index 5d422e0..77715d8 100644
--- a/COPYRIGHT
+++ b/COPYRIGHT
@@ -1,6 +1,6 @@
-Copyright (C) 2008-2013 Cédric Krier.
+Copyright (C) 2008-2014 Cédric Krier.
Copyright (C) 2008-2013 Bertrand Chenal.
-Copyright (C) 2008-2013 B2CK SPRL.
+Copyright (C) 2008-2014 B2CK SPRL.
Copyright (C) 2004-2008 Tiny SPRL.
This program is free software: you can redistribute it and/or modify
diff --git a/INSTALL b/INSTALL
index b8a472d..0adf226 100644
--- a/INSTALL
+++ b/INSTALL
@@ -4,7 +4,7 @@ Installing trytond_account_product
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_company (http://www.tryton.org/)
* trytond_account (http://www.tryton.org/)
diff --git a/MANIFEST.in b/MANIFEST.in
index 18ce53c..4cf1634 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -1,11 +1,9 @@
include INSTALL
include README
-include TODO
include COPYRIGHT
include CHANGELOG
include LICENSE
include tryton.cfg
include *.xml
include view/*.xml
-include *.odt
include locale/*.po
diff --git a/PKG-INFO b/PKG-INFO
index 44ac868..9c4d5cc 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,12 +1,12 @@
Metadata-Version: 1.1
Name: trytond_account_product
-Version: 3.0.0
+Version: 3.2.0
Summary: Tryton module to add accounting on product
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_product
=======================
@@ -43,6 +43,7 @@ Description: trytond_account_product
http://www.tryton.org/
+Keywords: tryton account product
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/locale/de_DE.po b/locale/de_DE.po
index ecc992a..ec62bbd 100644
--- a/locale/de_DE.po
+++ b/locale/de_DE.po
@@ -12,7 +12,7 @@ msgstr "Es ist kein Aufwands-/Ertragskonto definiert für Artikel %s (%d)!"
msgctxt "field:product.category,account_expense:"
msgid "Account Expense"
-msgstr "Konto Aufwand"
+msgstr "Aufwandskonto"
msgctxt "field:product.category,account_expense_used:"
msgid "Account Expense Used"
@@ -24,7 +24,7 @@ msgstr "Konten der übergeordneten Kategorie anwenden"
msgctxt "field:product.category,account_revenue:"
msgid "Account Revenue"
-msgstr "Konto Ertrag"
+msgstr "Ertragskonto"
msgctxt "field:product.category,account_revenue_used:"
msgid "Account Revenue Used"
@@ -120,7 +120,7 @@ msgstr "Konten der Kategorie anwenden"
msgctxt "field:product.template,account_expense:"
msgid "Account Expense"
-msgstr "Konto Aufwand"
+msgstr "Aufwandskonto"
msgctxt "field:product.template,account_expense_used:"
msgid "Account Expense Used"
@@ -128,7 +128,7 @@ msgstr "Verwendetes Aufwandskonto"
msgctxt "field:product.template,account_revenue:"
msgid "Account Revenue"
-msgstr "Konto Ertrag"
+msgstr "Ertragskonto"
msgctxt "field:product.template,account_revenue_used:"
msgid "Account Revenue Used"
diff --git a/locale/es_CO.po b/locale/es_CO.po
index 4fedf7d..02ce8fb 100644
--- a/locale/es_CO.po
+++ b/locale/es_CO.po
@@ -20,7 +20,7 @@ msgstr "Cuenta de Gastos Usada"
msgctxt "field:product.category,account_parent:"
msgid "Use Parent's accounts"
-msgstr "Usar cuenta del Padre"
+msgstr "Usar Cuenta Padre"
msgctxt "field:product.category,account_revenue:"
msgid "Account Revenue"
@@ -116,7 +116,7 @@ msgstr "Modificado por Usuario"
msgctxt "field:product.template,account_category:"
msgid "Use Category's accounts"
-msgstr "Use las cuentas de Categoría"
+msgstr "Use Cuentas de la Categoría"
msgctxt "field:product.template,account_expense:"
msgid "Account Expense"
@@ -152,7 +152,7 @@ msgstr "Impuestos del Proveedor Aplicados"
msgctxt "field:product.template,taxes_category:"
msgid "Use Category's Taxes"
-msgstr "Usar Categorías de Impuesto"
+msgstr "Usar Impuestos de la Categoría"
msgctxt "field:product.template-customer-account.tax,create_date:"
msgid "Create Date"
diff --git a/product.py b/product.py
index 1e0b636..3814117 100644
--- a/product.py
+++ b/product.py
@@ -19,7 +19,7 @@ class Category:
'Account Expense', domain=[
('kind', '=', 'expense'),
('company', '=', Eval('context', {}).get('company', -1)),
- ], on_change=['account_expense'],
+ ],
states={
'invisible': (~Eval('context', {}).get('company')
| Eval('account_parent')),
@@ -29,7 +29,7 @@ class Category:
'Account Revenue', domain=[
('kind', '=', 'revenue'),
('company', '=', Eval('context', {}).get('company', -1)),
- ], on_change=['account_revenue'],
+ ],
states={
'invisible': (~Eval('context', {}).get('company')
| Eval('account_parent')),
@@ -95,6 +95,7 @@ class Category:
else:
return [x.id for x in getattr(self, name[:-5])]
+ @fields.depends('account_expense')
def on_change_account_expense(self):
supplier_taxes = []
result = {
@@ -104,6 +105,7 @@ class Category:
supplier_taxes.extend(tax.id for tax in self.account_expense.taxes)
return result
+ @fields.depends('account_revenue')
def on_change_account_revenue(self):
customer_taxes = []
result = {
@@ -166,7 +168,7 @@ class Template:
'Account Expense', domain=[
('kind', '=', 'expense'),
('company', '=', Eval('context', {}).get('company', -1)),
- ], on_change=['account_category', 'account_expense'],
+ ],
states={
'invisible': (~Eval('context', {}).get('company')
| Eval('account_category')),
@@ -177,7 +179,7 @@ class Template:
'Account Revenue', domain=[
('kind', '=', 'revenue'),
('company', '=', Eval('context', {}).get('company', -1)),
- ], on_change=['account_category', 'account_revenue'],
+ ],
states={
'invisible': (~Eval('context', {}).get('company')
| Eval('account_category')),
@@ -245,6 +247,7 @@ class Template:
else:
return [x.id for x in getattr(self, name[:-5])]
+ @fields.depends('account_category', 'account_expense')
def on_change_account_expense(self):
result = {}
if not self.account_category:
@@ -257,6 +260,7 @@ class Template:
tax.id for tax in self.account_expense.taxes)
return result
+ @fields.depends('account_category', 'account_revenue')
def on_change_account_revenue(self):
result = {}
if not self.account_category:
diff --git a/setup.py b/setup.py
index c28e9f1..e4740f2 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_product'
+
+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_product',
- version=info.get('version', '0.0.1'),
+setup(name=name,
+ version=version,
description='Tryton module to add accounting on product',
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 product',
package_dir={'trytond.modules.account_product': '.'},
packages=[
'trytond.modules.account_product',
@@ -66,7 +84,6 @@ setup(name='trytond_account_product',
'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_product.py b/tests/test_account_product.py
index 27b4cba..3c6f70a 100644
--- a/tests/test_account_product.py
+++ b/tests/test_account_product.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 AccountProductTestCase(unittest.TestCase):
- '''
- Test AccountProduct module.
- '''
+ 'Test AccountProduct module'
def setUp(self):
trytond.tests.test_tryton.install_module('account_product')
def test0005views(self):
- '''
- Test views.
- '''
+ 'Test views'
test_view('account_product')
def test0006depends(self):
- '''
- Test depends.
- '''
+ 'Test depends'
test_depends()
@@ -40,6 +25,3 @@ def suite():
suite.addTests(unittest.TestLoader().loadTestsFromTestCase(
AccountProductTestCase))
return suite
-
-if __name__ == '__main__':
- unittest.TextTestRunner(verbosity=2).run(suite())
diff --git a/tryton.cfg b/tryton.cfg
index 4539ae6..65da117 100644
--- a/tryton.cfg
+++ b/tryton.cfg
@@ -1,5 +1,5 @@
[tryton]
-version=3.0.0
+version=3.2.0
depends:
account
company
diff --git a/trytond_account_product.egg-info/PKG-INFO b/trytond_account_product.egg-info/PKG-INFO
index 5f0c8a3..dddcd51 100644
--- a/trytond_account_product.egg-info/PKG-INFO
+++ b/trytond_account_product.egg-info/PKG-INFO
@@ -1,12 +1,12 @@
Metadata-Version: 1.1
Name: trytond-account-product
-Version: 3.0.0
+Version: 3.2.0
Summary: Tryton module to add accounting on product
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_product
=======================
@@ -43,6 +43,7 @@ Description: trytond_account_product
http://www.tryton.org/
+Keywords: tryton account product
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_product.egg-info/requires.txt b/trytond_account_product.egg-info/requires.txt
index 1b5fd4d..c31c823 100644
--- a/trytond_account_product.egg-info/requires.txt
+++ b/trytond_account_product.egg-info/requires.txt
@@ -1,4 +1,4 @@
-trytond_account >= 3.0, < 3.1
-trytond_company >= 3.0, < 3.1
-trytond_product >= 3.0, < 3.1
-trytond >= 3.0, < 3.1
\ No newline at end of file
+trytond_account >= 3.2, < 3.3
+trytond_company >= 3.2, < 3.3
+trytond_product >= 3.2, < 3.3
+trytond >= 3.2, < 3.3
\ No newline at end of file
--
tryton-modules-account-product
More information about the tryton-debian-vcs
mailing list