[tryton-debian-vcs] tryton-modules-analytic-account branch debian updated. debian/3.0.0-3-4-g8e64ca8
Mathias Behrle
tryton-debian-vcs at alioth.debian.org
Tue Apr 22 13:06:01 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-analytic-account.git;a=commitdiff;h=debian/3.0.0-3-4-g8e64ca8
commit 8e64ca82a24f5a1be03ebb4cf9a0de82d3f6bcca
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Tue Apr 22 14:59:40 2014 +0200
Bumping minimal required Python version to 2.7.
diff --git a/debian/control b/debian/control
index 130b39b..d1c8660 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-analytic-account.git
Vcs-Git: git://anonscm.debian.org/tryton/tryton-modules-analytic-account.git
-X-Python-Version: >= 2.6
+X-Python-Version: >= 2.7
Package: tryton-modules-analytic-account
Architecture: all
commit af90984376d170d513f0296e5bd5894f2e123972
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Tue Apr 22 14:45:42 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 ff0bb420616aff31d5c8aaefd16959c2546ab375
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Tue Apr 22 14:20:54 2014 +0200
Merging upstream version 3.2.0.
diff --git a/CHANGELOG b/CHANGELOG
index 8921297..9aabff0 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 cbfa29a..5381995 100644
--- a/INSTALL
+++ b/INSTALL
@@ -4,7 +4,7 @@ Installing trytond_analytic_account
Prerequisites
-------------
- * Python 2.6 or later (http://www.python.org/)
+ * Python 2.7 or later (http://www.python.org/)
* python-sql (http://code.google.com/p/python-sql/)
* trytond (http://www.tryton.org/)
* trytond_company (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 b804a2b..acbe699 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,12 +1,12 @@
Metadata-Version: 1.1
Name: trytond_analytic_account
-Version: 3.0.0
+Version: 3.2.0
Summary: Tryton module for analytic accounting
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_analytic_account
========================
@@ -43,6 +43,7 @@ Description: trytond_analytic_account
http://www.tryton.org/
+Keywords: tryton analytic account
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/account.py b/account.py
index 05c388f..d984948 100644
--- a/account.py
+++ b/account.py
@@ -24,8 +24,8 @@ class Account(ModelSQL, ModelView):
active = fields.Boolean('Active', select=True)
company = fields.Many2One('company.company', 'Company')
currency = fields.Many2One('currency.currency', 'Currency', required=True)
- currency_digits = fields.Function(fields.Integer('Currency Digits',
- on_change_with=['currency']), 'on_change_with_currency_digits')
+ currency_digits = fields.Function(fields.Integer('Currency Digits'),
+ 'on_change_with_currency_digits')
type = fields.Selection([
('root', 'Root'),
('view', 'View'),
@@ -111,6 +111,7 @@ class Account(ModelSQL, ModelView):
super(Account, cls).validate(accounts)
cls.check_recursion(accounts)
+ @fields.depends('currency')
def on_change_with_currency_digits(self, name=None):
if self.currency:
return self.currency.digits
diff --git a/line.py b/line.py
index 16b05d7..9a0d984 100644
--- a/line.py
+++ b/line.py
@@ -19,10 +19,10 @@ class Line(ModelSQL, ModelView):
required=True, depends=['currency_digits'])
credit = fields.Numeric('Credit', digits=(16, Eval('currency_digits', 2)),
required=True, depends=['currency_digits'])
- currency = fields.Function(fields.Many2One('currency.currency', 'Currency',
- on_change_with=['move_line']), 'on_change_with_currency')
- currency_digits = fields.Function(fields.Integer('Currency Digits',
- on_change_with=['move_line']), 'on_change_with_currency_digits')
+ currency = fields.Function(fields.Many2One('currency.currency',
+ 'Currency'), 'on_change_with_currency')
+ currency_digits = fields.Function(fields.Integer('Currency Digits'),
+ 'on_change_with_currency_digits')
account = fields.Many2One('analytic_account.account', 'Account',
required=True, select=True, domain=[('type', '!=', 'view')])
move_line = fields.Many2One('account.move.line', 'Account Move Line',
@@ -78,10 +78,12 @@ class Line(ModelSQL, ModelView):
def default_credit():
return Decimal(0)
+ @fields.depends('move_line')
def on_change_with_currency(self, name=None):
if self.move_line:
return self.move_line.account.company.currency.id
+ @fields.depends('move_line')
def on_change_with_currency_digits(self, name=None):
if self.move_line:
return self.move_line.account.company.currency.digits
diff --git a/line.xml b/line.xml
index 17add8c..0cdffbb 100644
--- a/line.xml
+++ b/line.xml
@@ -61,5 +61,11 @@ this repository contains the full copyright notices and license terms. -->
<field name="name">move_line_form</field>
</record>
+ <record model="ir.ui.view" id="move_line_view_form_move">
+ <field name="model">account.move.line</field>
+ <field name="inherit" ref="account.move_line_view_form_move"/>
+ <field name="name">move_line_form</field>
+ </record>
+
</data>
</tryton>
diff --git a/locale/ca_ES.po b/locale/ca_ES.po
index ab57969..130735f 100644
--- a/locale/ca_ES.po
+++ b/locale/ca_ES.po
@@ -336,7 +336,7 @@ msgstr "Obre pla analític"
msgctxt "model:res.group,name:group_analytic_admin"
msgid "Analytic Administration"
-msgstr "Administració analítica"
+msgstr "Administració d'analítica"
msgctxt "selection:analytic_account.account,display_balance:"
msgid "Credit - Debit"
diff --git a/locale/de_DE.po b/locale/de_DE.po
index 482bf2f..4d80f02 100644
--- a/locale/de_DE.po
+++ b/locale/de_DE.po
@@ -28,7 +28,7 @@ msgstr "Kostenstelle Zeilen"
msgctxt "field:account.statement,currency_digits:"
msgid "Currency Digits"
-msgstr "Stellen Währung"
+msgstr "Nachkommastellen Währung"
msgctxt "field:account.statement,date:"
msgid "Date"
@@ -152,7 +152,7 @@ msgstr "Währung"
msgctxt "field:analytic_account.account,currency_digits:"
msgid "Currency Digits"
-msgstr "Währung (signifikante Stellen)"
+msgstr "Nachkommastellen Währung"
msgctxt "field:analytic_account.account,debit:"
msgid "Debit"
@@ -303,7 +303,7 @@ msgstr "Währung"
msgctxt "field:analytic_account.line,currency_digits:"
msgid "Currency Digits"
-msgstr "Währung (signifikante Stellen)"
+msgstr "Nachkommastellen Währung"
msgctxt "field:analytic_account.line,date:"
msgid "Date"
@@ -363,15 +363,15 @@ msgstr "Anfangsdatum"
msgctxt "model:account.statement,name:"
msgid "Account Statement"
-msgstr "Zahlungsverkehr"
+msgstr "Bankauszug"
msgctxt "model:account.statement.journal,name:"
msgid "Statement Journal"
-msgstr "Journal Zahlungsverkehr"
+msgstr "Bankauszugsjournal"
msgctxt "model:account.statement.line,name:"
msgid "Account Statement Line"
-msgstr "Zahlungsverkehr Position"
+msgstr "Bankauszugsposition"
msgctxt "model:analytic_account.account,name:"
msgid "Analytic Account"
@@ -496,11 +496,11 @@ msgstr "Kostenstelle"
msgctxt "view:account.statement.journal:"
msgid "Statement Journal"
-msgstr "Journal Zahlungsverkehr"
+msgstr "Bankauszugsjournal"
msgctxt "view:account.statement.journal:"
msgid "Statement Journals"
-msgstr "Journale Zahlungsverkehr"
+msgstr "Bankauszugsjournale"
msgctxt "view:account.statement.line:"
msgid "Bank Statement Line"
@@ -552,7 +552,7 @@ msgstr "Zahlungsposten"
msgctxt "view:account.statement:"
msgid "Statements"
-msgstr "Zahlungsverkehr"
+msgstr "Bankauszüge"
msgctxt "view:account.statement:"
msgid "Validate"
diff --git a/locale/es_CO.po b/locale/es_CO.po
index 45b50f8..0fe9dd4 100644
--- a/locale/es_CO.po
+++ b/locale/es_CO.po
@@ -20,7 +20,8 @@ msgstr "No puede crear una línea de asiento usando la cuenta inactiva \"%s\"."
msgctxt "error:analytic_account.line:"
msgid "You can not create a move line using view account \"%s\"."
-msgstr "No puede crear una línea de asiento usando la cuenta de vista \"%s\"."
+msgstr ""
+"No puede crear una línea de asiento usando una cuenta de tipo vista \"%s\"."
msgctxt "field:account.move.line,analytic_lines:"
msgid "Analytic Lines"
@@ -231,7 +232,7 @@ msgstr "ID"
msgctxt "field:analytic_account.line,journal:"
msgid "Journal"
-msgstr "Libro Diario"
+msgstr "Libro Contable"
msgctxt "field:analytic_account.line,move_line:"
msgid "Account Move Line"
diff --git a/locale/es_ES.po b/locale/es_ES.po
index b5d187a..35e1e70 100644
--- a/locale/es_ES.po
+++ b/locale/es_ES.po
@@ -336,7 +336,7 @@ msgstr "Abrir plan analítico"
msgctxt "model:res.group,name:group_analytic_admin"
msgid "Analytic Administration"
-msgstr "Administración analítica"
+msgstr "Administración de analítica"
msgctxt "selection:analytic_account.account,display_balance:"
msgid "Credit - Debit"
diff --git a/locale/fr_FR.po b/locale/fr_FR.po
index c0d7f42..d797e1b 100644
--- a/locale/fr_FR.po
+++ b/locale/fr_FR.po
@@ -340,7 +340,7 @@ msgstr "Ouvrir le plan comptable analytique"
msgctxt "model:res.group,name:group_analytic_admin"
msgid "Analytic Administration"
-msgstr "Administration analytique"
+msgstr "Administration de l'analytique"
msgctxt "selection:analytic_account.account,display_balance:"
msgid "Credit - Debit"
diff --git a/locale/sl_SI.po b/locale/sl_SI.po
index 6fe9c6f..0118735 100644
--- a/locale/sl_SI.po
+++ b/locale/sl_SI.po
@@ -44,7 +44,7 @@ msgstr "Šifra"
msgctxt "field:analytic_account.account,company:"
msgid "Company"
-msgstr "Podjetje"
+msgstr "Družba"
msgctxt "field:analytic_account.account,create_date:"
msgid "Create Date"
@@ -243,7 +243,7 @@ msgstr "Naziv"
msgctxt "field:analytic_account.line,party:"
msgid "Party"
-msgstr "Stranka"
+msgstr "Partner"
msgctxt "field:analytic_account.line,rec_name:"
msgid "Name"
@@ -352,7 +352,7 @@ msgstr "Zaprto"
msgctxt "selection:analytic_account.account,state:"
msgid "Draft"
-msgstr "Osnutek"
+msgstr "V pripravi"
msgctxt "selection:analytic_account.account,state:"
msgid "Opened"
diff --git a/setup.py b/setup.py
index 9c485f1..de94b06 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_analytic_account'
+
+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 = ['python-sql']
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_analytic_account',
- version=info.get('version', '0.0.1'),
+setup(name=name,
+ version=version,
description='Tryton module for analytic accounting',
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 analytic account',
package_dir={'trytond.modules.analytic_account': '.'},
packages=[
'trytond.modules.analytic_account',
@@ -66,7 +84,6 @@ setup(name='trytond_analytic_account',
'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_analytic_account.py b/tests/test_analytic_account.py
index 1b367d2..d5a69ac 100644
--- a/tests/test_analytic_account.py
+++ b/tests/test_analytic_account.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 AnalyticAccountTestCase(unittest.TestCase):
- '''
- Test AnalyticAccount module.
- '''
+ 'Test AnalyticAccount module'
def setUp(self):
trytond.tests.test_tryton.install_module('analytic_account')
def test0005views(self):
- '''
- Test views.
- '''
+ 'Test views'
test_view('analytic_account')
def test0006depends(self):
- '''
- Test depends.
- '''
+ 'Test depends'
test_depends()
@@ -40,6 +25,3 @@ def suite():
suite.addTests(unittest.TestLoader().loadTestsFromTestCase(
AnalyticAccountTestCase))
return suite
-
-if __name__ == '__main__':
- unittest.TextTestRunner(verbosity=2).run(suite())
diff --git a/tryton.cfg b/tryton.cfg
index 8c89ebe..f96fb75 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_analytic_account.egg-info/PKG-INFO b/trytond_analytic_account.egg-info/PKG-INFO
index 08871ff..eb192f4 100644
--- a/trytond_analytic_account.egg-info/PKG-INFO
+++ b/trytond_analytic_account.egg-info/PKG-INFO
@@ -1,12 +1,12 @@
Metadata-Version: 1.1
Name: trytond-analytic-account
-Version: 3.0.0
+Version: 3.2.0
Summary: Tryton module for analytic accounting
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_analytic_account
========================
@@ -43,6 +43,7 @@ Description: trytond_analytic_account
http://www.tryton.org/
+Keywords: tryton analytic account
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_analytic_account.egg-info/requires.txt b/trytond_analytic_account.egg-info/requires.txt
index 5246ce6..b4e861f 100644
--- a/trytond_analytic_account.egg-info/requires.txt
+++ b/trytond_analytic_account.egg-info/requires.txt
@@ -1,6 +1,6 @@
python-sql
-trytond_account >= 3.0, < 3.1
-trytond_company >= 3.0, < 3.1
-trytond_currency >= 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_company >= 3.2, < 3.3
+trytond_currency >= 3.2, < 3.3
+trytond_party >= 3.2, < 3.3
+trytond >= 3.2, < 3.3
\ No newline at end of file
--
tryton-modules-analytic-account
More information about the tryton-debian-vcs
mailing list