[tryton-debian-vcs] tryton-modules-analytic-account branch debian updated. debian/2.8.0-3-5-g1e1546d
git repository hosting
tryton-debian-vcs at m9s.biz
Mon Nov 25 19:33:02 UTC 2013
The following commit has been merged in the debian branch:
http://debian.tryton.org/gitweb/?p=packages/tryton-modules-analytic-account.git;a=commitdiff;h=debian/2.8.0-3-5-g1e1546d
commit 1e1546d81acf0e6a71982c8d8e40a9fb589fef36
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Mon Nov 25 20:30:05 2013 +0100
Releasing debian version 3.0.0-1.
diff --git a/debian/changelog b/debian/changelog
index f279723..5479d52 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+tryton-modules-analytic-account (3.0.0-1) unstable; urgency=low
+
+ * Merging upstream version 3.0.0.
+ * Updating to standards version 3.9.5, no changes needed.
+ * Changing to buildsystem pybuild.
+ * Adding python-sql to Depends.
+
+ -- Mathias Behrle <mathiasb at m9s.biz> Mon, 25 Nov 2013 17:53:29 +0100
+
tryton-modules-analytic-account (2.8.0-3) unstable; urgency=low
* Adapting the rules file to work also with git-buildpackage.
commit 2961d846cf9c155771a6b76e0e07014f2e8e9056
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Mon Nov 25 17:40:40 2013 +0100
Adding python-sql to Depends.
diff --git a/debian/control b/debian/control
index a45f269..7888382 100644
--- a/debian/control
+++ b/debian/control
@@ -17,7 +17,8 @@ Depends: ${misc:Depends}, ${python:Depends}, tryton-server (>= ${version:major})
tryton-modules-account (>= ${version:major}),
tryton-modules-company (>= ${version:major}),
tryton-modules-currency (>= ${version:major}),
- tryton-modules-party (>= ${version:major}), python-pkg-resources
+ tryton-modules-party (>= ${version:major}),
+ python-sql, python-pkg-resources
Description: Tryton Application Platform (Financial and Accounting Module)
Tryton is a high-level general purpose application platform written in Python
and using PostgreSQL as database engine. It is the core base of a complete
commit 624119abe291f2e2319b6b42d5d46d29cb307fc5
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Sun Nov 24 19:51:51 2013 +0100
Changing to buildsystem pybuild.
diff --git a/debian/control b/debian/control
index dc962b0..a45f269 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,8 @@ Section: python
Priority: optional
Maintainer: Debian Tryton Maintainers <maintainers at debian.tryton.org>
Uploaders: Mathias Behrle <mathiasb at m9s.biz>
-Build-Depends: debhelper (>= 9), python (>= 2.6.6-3~), python-setuptools
+Build-Depends:
+ debhelper (>= 9), python (>= 2.6.6-3~), python-setuptools, dh-python
Standards-Version: 3.9.5
Homepage: http://www.tryton.org/
Vcs-Browser: http://debian.tryton.org/gitweb/?p=packages/tryton-modules-analytic-account.git
diff --git a/debian/rules b/debian/rules
index 30074ad..5b8c326 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,24 +1,17 @@
#!/usr/bin/make -f
-MAJOR := $(shell python setup.py --version | awk -F "." '{print $$1 "." $$2}')
-PACKAGE_NAME := $(shell python setup.py --name)
-
-%:
- dh ${@} --with python2
+# needed for pbuilder
+export LC_ALL=C.UTF-8
-override_dh_auto_clean:
- dh_auto_clean
+MAJOR := $(shell python setup.py --version | awk -F "." '{print $$1 "." $$2}')
+PACKAGE_NAME := tryton-modules-$(shell python setup.py --name | sed s/^trytond_// | sed s/_/-/g)
+export PYBUILD_DESTDIR_python2=debian/${PACKAGE_NAME}
-override_dh_auto_build:
- mv $(PACKAGE_NAME).egg-info $(PACKAGE_NAME).hen-info
- mv PKG-INFO PKG-INFO.hen
- dh_auto_build
+# Don't run tests for Tryton modules, they try to download dependencies from pypi
+export PYBUILD_DISABLE_python2.7=test
-override_dh_auto_install:
- dh_auto_install
- rm -rf *.egg-info
- mv $(PACKAGE_NAME).hen-info $(PACKAGE_NAME).egg-info
- mv PKG-INFO.hen PKG-INFO
+%:
+ dh ${@} --with python2 --buildsystem=pybuild
override_dh_gencontrol:
dh_gencontrol -- -Vversion:major="$(MAJOR)"
commit 396599632b1eed8ec708d11e9bb3fe48b5e8bf80
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Sun Nov 24 19:14:20 2013 +0100
Updating to standards version 3.9.5, no changes needed.
diff --git a/debian/control b/debian/control
index 3c14954..dc962b0 100644
--- a/debian/control
+++ b/debian/control
@@ -4,7 +4,7 @@ Priority: optional
Maintainer: Debian Tryton Maintainers <maintainers at debian.tryton.org>
Uploaders: Mathias Behrle <mathiasb at m9s.biz>
Build-Depends: debhelper (>= 9), python (>= 2.6.6-3~), python-setuptools
-Standards-Version: 3.9.4
+Standards-Version: 3.9.5
Homepage: http://www.tryton.org/
Vcs-Browser: http://debian.tryton.org/gitweb/?p=packages/tryton-modules-analytic-account.git
Vcs-Git: git://debian.tryton.org/packages/tryton-modules-analytic-account.git
commit a2d6b88622bdbcd86c4201cb6c409f1e8383effb
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Sun Nov 24 17:26:30 2013 +0100
Merging upstream version 3.0.0.
diff --git a/CHANGELOG b/CHANGELOG
index 307388e..8921297 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+Version 3.0.0 - 2013-10-21
+* Bug fixes (see mercurial logs for details)
+
Version 2.8.0 - 2013-04-22
* Bug fixes (see mercurial logs for details)
diff --git a/INSTALL b/INSTALL
index 80b3192..cbfa29a 100644
--- a/INSTALL
+++ b/INSTALL
@@ -5,6 +5,7 @@ Prerequisites
-------------
* Python 2.6 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/)
* trytond_party (http://www.tryton.org/)
diff --git a/PKG-INFO b/PKG-INFO
index 950839e..b804a2b 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,12 +1,12 @@
Metadata-Version: 1.1
Name: trytond_analytic_account
-Version: 2.8.0
+Version: 3.0.0
Summary: Tryton module for analytic accounting
Home-page: http://www.tryton.org/
Author: Tryton
Author-email: UNKNOWN
License: GPL-3
-Download-URL: http://downloads.tryton.org/2.8/
+Download-URL: http://downloads.tryton.org/3.0/
Description: trytond_analytic_account
========================
@@ -59,6 +59,7 @@ Classifier: Natural Language :: English
Classifier: Natural Language :: French
Classifier: Natural Language :: German
Classifier: Natural Language :: Russian
+Classifier: Natural Language :: Slovenian
Classifier: Natural Language :: Spanish
Classifier: Operating System :: OS Independent
Classifier: Programming Language :: Python :: 2.6
diff --git a/account.py b/account.py
index a1e0afb..05c388f 100644
--- a/account.py
+++ b/account.py
@@ -2,6 +2,10 @@
#this repository contains the full copyright notices and license terms.
from decimal import Decimal
import copy
+from sql import Column
+from sql.aggregate import Sum
+from sql.conditionals import Coalesce
+
from trytond.model import ModelView, ModelSQL, fields
from trytond.wizard import Wizard, StateView, StateAction, Button
from trytond.pyson import Eval, PYSONEncoder
@@ -115,9 +119,18 @@ class Account(ModelSQL, ModelView):
@classmethod
def get_balance(cls, accounts, name):
res = {}
- Line = Pool().get('analytic_account.line')
- Currency = Pool().get('currency.currency')
+ pool = Pool()
+ Line = pool.get('analytic_account.line')
+ MoveLine = pool.get('account.move.line')
+ Account = pool.get('account.account')
+ Company = pool.get('company.company')
+ Currency = pool.get('currency.currency')
cursor = Transaction().cursor
+ table = cls.__table__()
+ line = Line.__table__()
+ move_line = MoveLine.__table__()
+ a_account = Account.__table__()
+ company = Company.__table__()
ids = [a.id for a in accounts]
childs = cls.search([('parent', 'child_of', ids)])
@@ -128,25 +141,22 @@ class Account(ModelSQL, ModelView):
for account in all_accounts:
id2account[account.id] = account
- line_query = Line.query_get()
- cursor.execute('SELECT a.id, '
- 'SUM((COALESCE(l.debit, 0) - COALESCE(l.credit, 0))), '
- 'c.currency '
- 'FROM analytic_account_account a '
- 'LEFT JOIN analytic_account_line l '
- 'ON (a.id = l.account) '
- 'LEFT JOIN account_move_line ml '
- 'ON (ml.id = l.move_line) '
- 'LEFT JOIN account_account aa '
- 'ON (aa.id = ml.account) '
- 'LEFT JOIN company_company c '
- 'ON (c.id = aa.company) '
- 'WHERE a.type != \'view\' '
- 'AND a.id IN (' +
- ','.join(('%s',) * len(all_ids)) + ') '
- 'AND ' + line_query + ' '
- 'AND a.active '
- 'GROUP BY a.id, c.currency', all_ids)
+ line_query = Line.query_get(line)
+ cursor.execute(*table.join(line, 'LEFT',
+ condition=table.id == line.account
+ ).join(move_line, 'LEFT',
+ condition=move_line.id == line.move_line
+ ).join(a_account, 'LEFT',
+ condition=a_account.id == move_line.account
+ ).join(company, 'LEFT',
+ condition=company.id == a_account.company
+ ).select(table.id,
+ Sum(Coalesce(line.debit, 0) - Coalesce(line.credit, 0)),
+ company.currency,
+ where=(table.type != 'view')
+ & table.id.in_(all_ids)
+ & table.active & line_query,
+ group_by=(table.id, company.currency)))
account_sum = {}
id2currency = {}
for account_id, sum, currency_id in cursor.fetchall():
@@ -185,8 +195,16 @@ class Account(ModelSQL, ModelView):
res = {}
pool = Pool()
Line = pool.get('analytic_account.line')
+ MoveLine = pool.get('account.move.line')
+ Account = pool.get('account.account')
+ Company = pool.get('company.company')
Currency = pool.get('currency.currency')
cursor = Transaction().cursor
+ table = cls.__table__()
+ line = Line.__table__()
+ move_line = MoveLine.__table__()
+ a_account = Account.__table__()
+ company = Company.__table__()
if name not in ('credit', 'debit'):
raise Exception('Bad argument')
@@ -197,25 +215,22 @@ class Account(ModelSQL, ModelView):
res[account.id] = Decimal('0.0')
id2account[account.id] = account
- line_query = Line.query_get()
- cursor.execute('SELECT a.id, '
- 'SUM(COALESCE(l.' + name + ', 0)), '
- 'c.currency '
- 'FROM analytic_account_account a '
- 'LEFT JOIN analytic_account_line l '
- 'ON (a.id = l.account) '
- 'LEFT JOIN account_move_line ml '
- 'ON (ml.id = l.move_line) '
- 'LEFT JOIN account_account aa '
- 'ON (aa.id = ml.account) '
- 'LEFT JOIN company_company c '
- 'ON (c.id = aa.company) '
- 'WHERE a.type != \'view\' '
- 'AND a.id IN (' +
- ','.join(('%s',) * len(ids)) + ') '
- 'AND ' + line_query + ' '
- 'AND a.active '
- 'GROUP BY a.id, c.currency', ids)
+ line_query = Line.query_get(line)
+ cursor.execute(*table.join(line, 'LEFT',
+ condition=table.id == line.account
+ ).join(move_line, 'LEFT',
+ condition=move_line.id == line.move_line
+ ).join(a_account, 'LEFT',
+ condition=a_account.id == move_line.account
+ ).join(company, 'LEFT',
+ condition=company.id == a_account.company
+ ).select(table.id,
+ Sum(Coalesce(Column(line, name), 0)),
+ company.currency,
+ where=(table.type != 'view')
+ & table.id.in_(ids)
+ & table.active & line_query,
+ group_by=(table.id, company.currency)))
id2currency = {}
for account_id, sum, currency_id in cursor.fetchall():
@@ -240,11 +255,11 @@ class Account(ModelSQL, ModelView):
@classmethod
def search_rec_name(cls, name, clause):
- accounts = cls.search([('code',) + clause[1:]], limit=1)
+ accounts = cls.search([('code',) + tuple(clause[1:])], limit=1)
if accounts:
- return [('code',) + clause[1:]]
+ return [('code',) + tuple(clause[1:])]
else:
- return [(cls._rec_name,) + clause[1:]]
+ return [(cls._rec_name,) + tuple(clause[1:])]
@classmethod
def convert_view(cls, tree):
@@ -272,10 +287,15 @@ class Account(ModelSQL, ModelView):
parent.remove(element_accounts)
@classmethod
- def analytic_accounts_fields_get(cls, field, fields_names=None):
+ def analytic_accounts_fields_get(cls, field, fields_names=None,
+ states=None, required_states=None):
res = {}
if fields_names is None:
fields_names = []
+ if states is None:
+ states = {}
+
+ encoder = PYSONEncoder()
root_accounts = cls.search([
('parent', '=', None),
@@ -284,7 +304,13 @@ class Account(ModelSQL, ModelView):
name = 'analytic_account_' + str(account.id)
if name in fields_names or not fields_names:
res[name] = field.copy()
- res[name]['required'] = account.mandatory
+ field_states = states.copy()
+ if account.mandatory:
+ if required_states:
+ field_states['required'] = required_states
+ else:
+ field_states['required'] = True
+ res[name]['states'] = encoder.encode(field_states)
res[name]['string'] = account.name
res[name]['relation'] = cls.__name__
res[name]['domain'] = PYSONEncoder().encode([
diff --git a/account.xml b/account.xml
index 04c21bf..ac0bc07 100644
--- a/account.xml
+++ b/account.xml
@@ -26,7 +26,7 @@ this repository contains the full copyright notices and license terms. -->
<record model="ir.action.act_window" id="act_account_tree">
<field name="name">Analytic Accounts</field>
<field name="res_model">analytic_account.account</field>
- <field name="domain">[('parent', '=', False)]</field>
+ <field name="domain">[('parent', '=', None), ('type', '=', 'root')]</field>
</record>
<record model="ir.action.act_window.view" id="act_account_tree_view1">
<field name="sequence" eval="10"/>
@@ -69,7 +69,7 @@ this repository contains the full copyright notices and license terms. -->
<record model="ir.action.act_window" id="act_account_tree2">
<field name="name">Analytic Accounts</field>
<field name="res_model">analytic_account.account</field>
- <field name="domain">[('parent', '=', False)]</field>
+ <field name="domain">[('parent', '=', None)]</field>
</record>
<record model="ir.action.act_window.view" id="act_account_tree2_view1">
<field name="sequence" eval="10"/>
diff --git a/line.py b/line.py
index 123500c..16b05d7 100644
--- a/line.py
+++ b/line.py
@@ -1,10 +1,9 @@
#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 time
from decimal import Decimal
from trytond.model import ModelView, ModelSQL, fields
from trytond.wizard import Wizard, StateAction
-from trytond.backend import TableHandler
+from trytond import backend
from trytond.pyson import Eval, PYSONEncoder
from trytond.transaction import Transaction
from trytond.pool import Pool
@@ -44,7 +43,8 @@ class Line(ModelSQL, ModelView):
'Wrong credit/debit values.'),
]
cls._error_messages.update({
- 'line_on_view_account': ('You can not create a move line using '
+ 'line_on_view_account': (
+ 'You can not create a move line using '
'view account "%s".'),
'line_on_inactive_account': ('You can not create a move line '
'using inactive account "%s".'),
@@ -53,6 +53,7 @@ class Line(ModelSQL, ModelView):
@classmethod
def __register__(cls, module_name):
+ TableHandler = backend.get('TableHandler')
super(Line, cls).__register__(module_name)
cursor = Transaction().cursor
table = TableHandler(cursor, cls, module_name)
@@ -87,23 +88,17 @@ class Line(ModelSQL, ModelView):
return 2
@staticmethod
- def query_get(obj='l'):
+ def query_get(table):
'''
Return SQL clause for analytic line depending of the context.
- obj is the SQL alias of the analytic_account_line in the query.
+ table is the SQL instance of the analytic_account_line table.
'''
- res = obj + '.active'
+ clause = table.active
if Transaction().context.get('start_date'):
- # Check start_date
- time.strptime(str(Transaction().context['start_date']), '%Y-%m-%d')
- res += (' AND ' + obj + '.date >= date(\''
- + str(Transaction().context['start_date']) + '\')')
+ clause &= table.date >= Transaction().context['start_date']
if Transaction().context.get('end_date'):
- # Check end_date
- time.strptime(str(Transaction().context['end_date']), '%Y-%m-%d')
- res += (' AND ' + obj + '.date <= date(\''
- + str(Transaction().context['end_date']) + '\')')
- return res
+ clause &= table.date <= Transaction().context['end_date']
+ return clause
@classmethod
def validate(cls, lines):
diff --git a/locale/de_DE.po b/locale/de_DE.po
index bc486a9..482bf2f 100644
--- a/locale/de_DE.po
+++ b/locale/de_DE.po
@@ -46,10 +46,6 @@ msgctxt "field:account.statement,lines:"
msgid "Transactions"
msgstr "Transaktionen"
-msgctxt "field:account.statement,move_lines:"
-msgid "Move Lines"
-msgstr "Buchungsposten"
-
msgctxt "field:account.statement,rec_name:"
msgid "Name"
msgstr "Name"
diff --git a/locale/es_AR.po b/locale/es_AR.po
index e7d60de..45caffb 100644
--- a/locale/es_AR.po
+++ b/locale/es_AR.po
@@ -61,11 +61,11 @@ msgstr "Haber"
msgctxt "field:analytic_account.account,currency:"
msgid "Currency"
-msgstr "Divisa"
+msgstr "Moneda"
msgctxt "field:analytic_account.account,currency_digits:"
msgid "Currency Digits"
-msgstr "Dígitos de divisa"
+msgstr "Dígitos de moneda"
msgctxt "field:analytic_account.account,debit:"
msgid "Debit"
@@ -212,11 +212,11 @@ msgstr "Haber"
msgctxt "field:analytic_account.line,currency:"
msgid "Currency"
-msgstr "Divisa"
+msgstr "Moneda"
msgctxt "field:analytic_account.line,currency_digits:"
msgid "Currency Digits"
-msgstr "Dígitos de divisa"
+msgstr "Dígitos de moneda"
msgctxt "field:analytic_account.line,date:"
msgid "Date"
diff --git a/locale/es_ES.po b/locale/es_ES.po
index 1cf0188..b5d187a 100644
--- a/locale/es_ES.po
+++ b/locale/es_ES.po
@@ -7,7 +7,7 @@ msgid ""
"Can not have many accounts with the same root or a missing mandatory root "
"account on \"%s\"."
msgstr ""
-"No se puede tener muchos cuentas con la misma raíz o sin una cuenta raíz "
+"No se puede tener muchas cuentas con la misma raíz o falta una cuenta raíz "
"obligatoria en \"%s\"."
msgctxt "error:analytic_account.line:"
@@ -20,7 +20,7 @@ msgstr "No puede crear una línea de movimiento usando una cuenta inactiva \"%s\
msgctxt "error:analytic_account.line:"
msgid "You can not create a move line using view account \"%s\"."
-msgstr "No puede crear un apunte utilizando la cuenta de vista \"%s\"."
+msgstr "No puede crear un apunte utilizando la cuenta tipo vista \"%s\"."
msgctxt "field:account.move.line,analytic_lines:"
msgid "Analytic Lines"
diff --git a/locale/fr_FR.po b/locale/fr_FR.po
index 8ee875d..c0d7f42 100644
--- a/locale/fr_FR.po
+++ b/locale/fr_FR.po
@@ -347,14 +347,6 @@ msgid "Credit - Debit"
msgstr "Crédit - Débit"
msgctxt "selection:analytic_account.account,display_balance:"
-msgid "Credit - Debit"
-msgstr "Crédit - Débit"
-
-msgctxt "selection:analytic_account.account,display_balance:"
-msgid "Debit - Credit"
-msgstr "Débit - Crédit"
-
-msgctxt "selection:analytic_account.account,display_balance:"
msgid "Debit - Credit"
msgstr "Débit - Crédit"
@@ -363,14 +355,6 @@ msgid "Closed"
msgstr "Fermé"
msgctxt "selection:analytic_account.account,state:"
-msgid "Closed"
-msgstr "Fermé"
-
-msgctxt "selection:analytic_account.account,state:"
-msgid "Draft"
-msgstr "Brouillon"
-
-msgctxt "selection:analytic_account.account,state:"
msgid "Draft"
msgstr "Brouillon"
@@ -378,14 +362,6 @@ msgctxt "selection:analytic_account.account,state:"
msgid "Opened"
msgstr "Ouvert"
-msgctxt "selection:analytic_account.account,state:"
-msgid "Opened"
-msgstr "Ouvert"
-
-msgctxt "selection:analytic_account.account,type:"
-msgid "Normal"
-msgstr "Normal"
-
msgctxt "selection:analytic_account.account,type:"
msgid "Normal"
msgstr "Normal"
@@ -395,14 +371,6 @@ msgid "Root"
msgstr "Racine"
msgctxt "selection:analytic_account.account,type:"
-msgid "Root"
-msgstr "Racine"
-
-msgctxt "selection:analytic_account.account,type:"
-msgid "View"
-msgstr "Vue"
-
-msgctxt "selection:analytic_account.account,type:"
msgid "View"
msgstr "Vue"
@@ -410,10 +378,6 @@ msgctxt "view:account.move.line:"
msgid "Analytic"
msgstr "Analytique"
-msgctxt "view:account.move.line:"
-msgid "Analytic"
-msgstr "Analytique"
-
msgctxt "view:account.move:"
msgid "Analytic"
msgstr "Analytique"
@@ -423,22 +387,10 @@ msgid "Analytic Account"
msgstr "Compte analytique"
msgctxt "view:analytic_account.account:"
-msgid "Analytic Account"
-msgstr "Compte analytique"
-
-msgctxt "view:analytic_account.account:"
msgid "Analytic Accounts"
msgstr "Comptes analytiques"
msgctxt "view:analytic_account.account:"
-msgid "Analytic Accounts"
-msgstr "Comptes analytiques"
-
-msgctxt "view:analytic_account.account:"
-msgid "General Information"
-msgstr "Information générale"
-
-msgctxt "view:analytic_account.account:"
msgid "General Information"
msgstr "Information générale"
@@ -446,14 +398,6 @@ msgctxt "view:analytic_account.account:"
msgid "Notes"
msgstr "Notes"
-msgctxt "view:analytic_account.account:"
-msgid "Notes"
-msgstr "Notes"
-
-msgctxt "view:analytic_account.line:"
-msgid "Analytic Line"
-msgstr "Ligne analytique"
-
msgctxt "view:analytic_account.line:"
msgid "Analytic Line"
msgstr "Ligne analytique"
@@ -463,14 +407,6 @@ msgid "Analytic Lines"
msgstr "Lignes analytiques"
msgctxt "view:analytic_account.line:"
-msgid "Analytic Lines"
-msgstr "Lignes analytiques"
-
-msgctxt "view:analytic_account.line:"
-msgid "General Information"
-msgstr "Information générale"
-
-msgctxt "view:analytic_account.line:"
msgid "General Information"
msgstr "Information générale"
diff --git a/locale/es_ES.po b/locale/sl_SI.po
similarity index 75%
copy from locale/es_ES.po
copy to locale/sl_SI.po
index 1cf0188..6fe9c6f 100644
--- a/locale/es_ES.po
+++ b/locale/sl_SI.po
@@ -7,72 +7,72 @@ msgid ""
"Can not have many accounts with the same root or a missing mandatory root "
"account on \"%s\"."
msgstr ""
-"No se puede tener muchos cuentas con la misma raíz o sin una cuenta raíz "
-"obligatoria en \"%s\"."
+"Pri \"%s\" ni možno imeti več kontov z istim korenskim kontom ali z "
+"manjkajočim obveznim korenskim kontom."
msgctxt "error:analytic_account.line:"
msgid "Wrong credit/debit values."
-msgstr "Valores de haber/debe erróneos."
+msgstr "Napačne vrednosti za debet/kredit."
msgctxt "error:analytic_account.line:"
msgid "You can not create a move line using inactive account \"%s\"."
-msgstr "No puede crear una línea de movimiento usando una cuenta inactiva \"%s\"."
+msgstr "Knjiženje postavke ni možno izvesti z neaktivnim kontom \"%s\"."
msgctxt "error:analytic_account.line:"
msgid "You can not create a move line using view account \"%s\"."
-msgstr "No puede crear un apunte utilizando la cuenta de vista \"%s\"."
+msgstr "Knjiženje postavke ni možno izvesti z vpoglednim kontom \"%s\"."
msgctxt "field:account.move.line,analytic_lines:"
msgid "Analytic Lines"
-msgstr "Líneas analíticas"
+msgstr "Analitične postavke"
msgctxt "field:analytic_account.account,active:"
msgid "Active"
-msgstr "Activa"
+msgstr "Aktivno"
msgctxt "field:analytic_account.account,balance:"
msgid "Balance"
-msgstr "Saldo"
+msgstr "Bilanca"
msgctxt "field:analytic_account.account,childs:"
msgid "Children"
-msgstr "Hijos"
+msgstr "Podkonti"
msgctxt "field:analytic_account.account,code:"
msgid "Code"
-msgstr "Código"
+msgstr "Šifra"
msgctxt "field:analytic_account.account,company:"
msgid "Company"
-msgstr "Empresa"
+msgstr "Podjetje"
msgctxt "field:analytic_account.account,create_date:"
msgid "Create Date"
-msgstr "Fecha creación"
+msgstr "Ustvarjeno"
msgctxt "field:analytic_account.account,create_uid:"
msgid "Create User"
-msgstr "Usuario creación"
+msgstr "Ustvaril"
msgctxt "field:analytic_account.account,credit:"
msgid "Credit"
-msgstr "Haber"
+msgstr "Kredit"
msgctxt "field:analytic_account.account,currency:"
msgid "Currency"
-msgstr "Moneda"
+msgstr "Valuta"
msgctxt "field:analytic_account.account,currency_digits:"
msgid "Currency Digits"
-msgstr "Decimales de la moneda"
+msgstr "Decimalke"
msgctxt "field:analytic_account.account,debit:"
msgid "Debit"
-msgstr "Debe"
+msgstr "Debet"
msgctxt "field:analytic_account.account,display_balance:"
msgid "Display Balance"
-msgstr "Mostrar saldo"
+msgstr "Prikaz bilance"
msgctxt "field:analytic_account.account,id:"
msgid "ID"
@@ -80,60 +80,60 @@ msgstr "ID"
msgctxt "field:analytic_account.account,mandatory:"
msgid "Mandatory"
-msgstr "Obligatorio"
+msgstr "Obvezno"
msgctxt "field:analytic_account.account,name:"
msgid "Name"
-msgstr "Nombre"
+msgstr "Naziv"
msgctxt "field:analytic_account.account,note:"
msgid "Note"
-msgstr "Nota"
+msgstr "Opomba"
msgctxt "field:analytic_account.account,parent:"
msgid "Parent"
-msgstr "Padre"
+msgstr "Matični konto"
msgctxt "field:analytic_account.account,rec_name:"
msgid "Name"
-msgstr "Nombre"
+msgstr "Ime"
msgctxt "field:analytic_account.account,root:"
msgid "Root"
-msgstr "Raíz"
+msgstr "Koren"
msgctxt "field:analytic_account.account,state:"
msgid "State"
-msgstr "Estado"
+msgstr "Stanje"
msgctxt "field:analytic_account.account,type:"
msgid "Type"
-msgstr "Tipo"
+msgstr "Tip"
msgctxt "field:analytic_account.account,write_date:"
msgid "Write Date"
-msgstr "Fecha modificación"
+msgstr "Zapisano"
msgctxt "field:analytic_account.account,write_uid:"
msgid "Write User"
-msgstr "Usuario modificación"
+msgstr "Zapisal"
msgctxt ""
"field:analytic_account.account-analytic_account.account.selection,account:"
msgid "Account"
-msgstr "Cuenta"
+msgstr "Konto"
msgctxt ""
"field:analytic_account.account-"
"analytic_account.account.selection,create_date:"
msgid "Create Date"
-msgstr "Fecha creación"
+msgstr "Ustvarjeno"
msgctxt ""
"field:analytic_account.account-"
"analytic_account.account.selection,create_uid:"
msgid "Create User"
-msgstr "Usuario creación"
+msgstr "Ustvaril"
msgctxt ""
"field:analytic_account.account-analytic_account.account.selection,id:"
@@ -143,35 +143,35 @@ msgstr "ID"
msgctxt ""
"field:analytic_account.account-analytic_account.account.selection,rec_name:"
msgid "Name"
-msgstr "Nombre"
+msgstr "Ime"
msgctxt ""
"field:analytic_account.account-analytic_account.account.selection,selection:"
msgid "Selection"
-msgstr "Selección"
+msgstr "Izbor"
msgctxt ""
"field:analytic_account.account-"
"analytic_account.account.selection,write_date:"
msgid "Write Date"
-msgstr "Fecha modificación"
+msgstr "Zapisano"
msgctxt ""
"field:analytic_account.account-analytic_account.account.selection,write_uid:"
msgid "Write User"
-msgstr "Usuario modificación"
+msgstr "Zapisal"
msgctxt "field:analytic_account.account.selection,accounts:"
msgid "Accounts"
-msgstr "Cuentas"
+msgstr "Konti"
msgctxt "field:analytic_account.account.selection,create_date:"
msgid "Create Date"
-msgstr "Fecha creación"
+msgstr "Ustvarjeno"
msgctxt "field:analytic_account.account.selection,create_uid:"
msgid "Create User"
-msgstr "Usuario creación"
+msgstr "Ustvaril"
msgctxt "field:analytic_account.account.selection,id:"
msgid "ID"
@@ -179,51 +179,51 @@ msgstr "ID"
msgctxt "field:analytic_account.account.selection,rec_name:"
msgid "Name"
-msgstr "Nombre"
+msgstr "Ime"
msgctxt "field:analytic_account.account.selection,write_date:"
msgid "Write Date"
-msgstr "Fecha modificación"
+msgstr "Zapisano"
msgctxt "field:analytic_account.account.selection,write_uid:"
msgid "Write User"
-msgstr "Usuario modificación"
+msgstr "Zapisal"
msgctxt "field:analytic_account.line,account:"
msgid "Account"
-msgstr "Cuenta"
+msgstr "Konto"
msgctxt "field:analytic_account.line,active:"
msgid "Active"
-msgstr "Activa"
+msgstr "Aktivno"
msgctxt "field:analytic_account.line,create_date:"
msgid "Create Date"
-msgstr "Fecha creación"
+msgstr "Ustvarjeno"
msgctxt "field:analytic_account.line,create_uid:"
msgid "Create User"
-msgstr "Usuario creación"
+msgstr "Ustvaril"
msgctxt "field:analytic_account.line,credit:"
msgid "Credit"
-msgstr "Haber"
+msgstr "Kredit"
msgctxt "field:analytic_account.line,currency:"
msgid "Currency"
-msgstr "Moneda"
+msgstr "Valuta"
msgctxt "field:analytic_account.line,currency_digits:"
msgid "Currency Digits"
-msgstr "Decimales de la moneda"
+msgstr "Decimalke"
msgctxt "field:analytic_account.line,date:"
msgid "Date"
-msgstr "Fecha"
+msgstr "Datum"
msgctxt "field:analytic_account.line,debit:"
msgid "Debit"
-msgstr "Debe"
+msgstr "Debet"
msgctxt "field:analytic_account.line,id:"
msgid "ID"
@@ -231,39 +231,39 @@ msgstr "ID"
msgctxt "field:analytic_account.line,journal:"
msgid "Journal"
-msgstr "Diario"
+msgstr "Dnevnik"
msgctxt "field:analytic_account.line,move_line:"
msgid "Account Move Line"
-msgstr "Apunte contable"
+msgstr "Postavka knjižbe"
msgctxt "field:analytic_account.line,name:"
msgid "Name"
-msgstr "Nombre"
+msgstr "Naziv"
msgctxt "field:analytic_account.line,party:"
msgid "Party"
-msgstr "Tercero"
+msgstr "Stranka"
msgctxt "field:analytic_account.line,rec_name:"
msgid "Name"
-msgstr "Nombre"
+msgstr "Ime"
msgctxt "field:analytic_account.line,reference:"
msgid "Reference"
-msgstr "Referencia"
+msgstr "Sklic"
msgctxt "field:analytic_account.line,write_date:"
msgid "Write Date"
-msgstr "Fecha modificación"
+msgstr "Zapisano"
msgctxt "field:analytic_account.line,write_uid:"
msgid "Write User"
-msgstr "Usuario modificación"
+msgstr "Zapisal"
msgctxt "field:analytic_account.open_chart.start,end_date:"
msgid "End Date"
-msgstr "Fecha final"
+msgstr "Končni datum"
msgctxt "field:analytic_account.open_chart.start,id:"
msgid "ID"
@@ -271,149 +271,145 @@ msgstr "ID"
msgctxt "field:analytic_account.open_chart.start,start_date:"
msgid "Start Date"
-msgstr "Fecha inicial"
+msgstr "Začetni datum"
msgctxt "model:analytic_account.account,name:"
msgid "Analytic Account"
-msgstr "Cuenta analítica"
+msgstr "Analitični konto"
msgctxt ""
"model:analytic_account.account-analytic_account.account.selection,name:"
msgid "Analytic Account - Analytic Account Selection"
-msgstr "Cuenta analítica - Selección de cuenta analítica"
+msgstr "Analitični konto - Izbor analitičnega konta"
msgctxt "model:analytic_account.account.selection,name:"
msgid "Analytic Account Selection"
-msgstr "Selección de cuenta analítica"
+msgstr "Izbor analitičnega konta"
msgctxt "model:analytic_account.line,name:"
msgid "Analytic Line"
-msgstr "Línea analítica"
+msgstr "Analitična postavka"
msgctxt "model:analytic_account.open_chart.start,name:"
msgid "Open Chart of Accounts"
-msgstr "Abrir plan contable"
+msgstr "Odpri kontni načrt"
msgctxt "model:ir.action,name:act_account_list"
msgid "Analytic Accounts"
-msgstr "Cuentas analíticas"
+msgstr "Analitični konti"
msgctxt "model:ir.action,name:act_account_tree"
msgid "Analytic Accounts"
-msgstr "Cuentas analíticas"
+msgstr "Analitični konti"
msgctxt "model:ir.action,name:act_account_tree2"
msgid "Analytic Accounts"
-msgstr "Cuentas analíticas"
+msgstr "Analitični konti"
msgctxt "model:ir.action,name:act_line_form"
msgid "Analytic Lines"
-msgstr "Líneas analíticas"
+msgstr "Analitične postavke"
msgctxt "model:ir.action,name:act_open_account"
msgid "Open Account"
-msgstr "Abrir cuenta"
+msgstr "Odpri konto"
msgctxt "model:ir.action,name:act_open_chart"
msgid "Open Chart of Analytic Accounts"
-msgstr "Abrir plan analítico"
+msgstr "Odpri analitični kontni načrt"
msgctxt "model:ir.ui.menu,name:menu_account_list"
msgid "Analytic Accounts"
-msgstr "Cuentas analíticas"
+msgstr "Analitični konti"
msgctxt "model:ir.ui.menu,name:menu_account_tree"
msgid "Analytic Accounts"
-msgstr "Cuentas analíticas"
+msgstr "Analitični konti"
msgctxt "model:ir.ui.menu,name:menu_analytic_account_configuration"
msgid "Analytic Account"
-msgstr "Contabilidad analítica"
+msgstr "Analitični konto"
msgctxt "model:ir.ui.menu,name:menu_open_chart"
msgid "Open Chart of Analytic Accounts"
-msgstr "Abrir plan analítico"
+msgstr "Odpri analitični kontni načrt"
msgctxt "model:res.group,name:group_analytic_admin"
msgid "Analytic Administration"
-msgstr "Administración analítica"
+msgstr "Analitika - vodenje"
msgctxt "selection:analytic_account.account,display_balance:"
msgid "Credit - Debit"
-msgstr "Haber - Debe"
+msgstr "Kredit - Debet"
msgctxt "selection:analytic_account.account,display_balance:"
msgid "Debit - Credit"
-msgstr "Debe - Haber"
+msgstr "Debet - Kredit"
msgctxt "selection:analytic_account.account,state:"
msgid "Closed"
-msgstr "Cerrada"
+msgstr "Zaprto"
msgctxt "selection:analytic_account.account,state:"
msgid "Draft"
-msgstr "Borrador"
+msgstr "Osnutek"
msgctxt "selection:analytic_account.account,state:"
msgid "Opened"
-msgstr "Abierta"
+msgstr "Odprto"
msgctxt "selection:analytic_account.account,type:"
msgid "Normal"
-msgstr "Normal"
+msgstr "Normalno"
msgctxt "selection:analytic_account.account,type:"
msgid "Root"
-msgstr "Raíz"
+msgstr "Koren"
msgctxt "selection:analytic_account.account,type:"
msgid "View"
-msgstr "Vista"
+msgstr "Vpogled"
msgctxt "view:account.move.line:"
msgid "Analytic"
-msgstr "Analítica"
-
-msgctxt "view:account.move:"
-msgid "Analytic"
-msgstr "Analítica"
+msgstr "Analitično"
msgctxt "view:analytic_account.account:"
msgid "Analytic Account"
-msgstr "Cuenta analítica"
+msgstr "Analitični konto"
msgctxt "view:analytic_account.account:"
msgid "Analytic Accounts"
-msgstr "Cuentas analíticas"
+msgstr "Analitični konti"
msgctxt "view:analytic_account.account:"
msgid "General Information"
-msgstr "Información general"
+msgstr "Splošno"
msgctxt "view:analytic_account.account:"
msgid "Notes"
-msgstr "Notas"
+msgstr "Opombe"
msgctxt "view:analytic_account.line:"
msgid "Analytic Line"
-msgstr "Línea analítica"
+msgstr "Analitična postavka"
msgctxt "view:analytic_account.line:"
msgid "Analytic Lines"
-msgstr "Líneas analíticas"
+msgstr "Analitične postavke"
msgctxt "view:analytic_account.line:"
msgid "General Information"
-msgstr "Información general"
+msgstr "Splošno"
msgctxt "view:analytic_account.open_chart.start:"
msgid "Open Chart of Analytic Accounts"
-msgstr "Abrir plan analítico"
+msgstr "Odpri analitični kontni načrt"
msgctxt "wizard_button:analytic_account.open_chart,start,end:"
msgid "Cancel"
-msgstr "Cancelar"
+msgstr "Prekliči"
msgctxt "wizard_button:analytic_account.open_chart,start,open_:"
msgid "Open"
-msgstr "Abrir"
+msgstr "Odpri"
diff --git a/setup.py b/setup.py
index b3149cb..9c485f1 100644
--- a/setup.py
+++ b/setup.py
@@ -21,7 +21,7 @@ major_version, minor_version, _ = info.get('version', '0.0.1').split('.', 2)
major_version = int(major_version)
minor_version = int(minor_version)
-requires = []
+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' %
@@ -63,6 +63,7 @@ setup(name='trytond_analytic_account',
'Natural Language :: French',
'Natural Language :: German',
'Natural Language :: Russian',
+ 'Natural Language :: Slovenian',
'Natural Language :: Spanish',
'Operating System :: OS Independent',
'Programming Language :: Python :: 2.6',
diff --git a/tests/__init__.py b/tests/__init__.py
index 43e5109..9ed41c1 100644
--- a/tests/__init__.py
+++ b/tests/__init__.py
@@ -2,3 +2,5 @@
#this repository contains the full copyright notices and license terms.
from .test_analytic_account import suite
+
+__all__ = ['suite']
diff --git a/tryton.cfg b/tryton.cfg
index f985701..8c89ebe 100644
--- a/tryton.cfg
+++ b/tryton.cfg
@@ -1,5 +1,5 @@
[tryton]
-version=2.8.0
+version=3.0.0
depends:
account
company
diff --git a/trytond_analytic_account.egg-info/PKG-INFO b/trytond_analytic_account.egg-info/PKG-INFO
index f9d7c8b..08871ff 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: 2.8.0
+Version: 3.0.0
Summary: Tryton module for analytic accounting
Home-page: http://www.tryton.org/
Author: Tryton
Author-email: UNKNOWN
License: GPL-3
-Download-URL: http://downloads.tryton.org/2.8/
+Download-URL: http://downloads.tryton.org/3.0/
Description: trytond_analytic_account
========================
@@ -59,6 +59,7 @@ Classifier: Natural Language :: English
Classifier: Natural Language :: French
Classifier: Natural Language :: German
Classifier: Natural Language :: Russian
+Classifier: Natural Language :: Slovenian
Classifier: Natural Language :: Spanish
Classifier: Operating System :: OS Independent
Classifier: Programming Language :: Python :: 2.6
diff --git a/trytond_analytic_account.egg-info/SOURCES.txt b/trytond_analytic_account.egg-info/SOURCES.txt
index 27bd141..a754472 100644
--- a/trytond_analytic_account.egg-info/SOURCES.txt
+++ b/trytond_analytic_account.egg-info/SOURCES.txt
@@ -24,6 +24,7 @@ locale/es_ES.po
locale/fr_FR.po
locale/nl_NL.po
locale/ru_RU.po
+locale/sl_SI.po
trytond_analytic_account.egg-info/PKG-INFO
trytond_analytic_account.egg-info/SOURCES.txt
trytond_analytic_account.egg-info/dependency_links.txt
diff --git a/trytond_analytic_account.egg-info/requires.txt b/trytond_analytic_account.egg-info/requires.txt
index 339f1aa..5246ce6 100644
--- a/trytond_analytic_account.egg-info/requires.txt
+++ b/trytond_analytic_account.egg-info/requires.txt
@@ -1,5 +1,6 @@
-trytond_account >= 2.8, < 2.9
-trytond_company >= 2.8, < 2.9
-trytond_currency >= 2.8, < 2.9
-trytond_party >= 2.8, < 2.9
-trytond >= 2.8, < 2.9
\ No newline at end of file
+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
diff --git a/view/account_form.xml b/view/account_form.xml
index b6c569c..07b0d5b 100644
--- a/view/account_form.xml
+++ b/view/account_form.xml
@@ -24,6 +24,7 @@ this repository contains the full copyright notices and license terms. -->
<field name="currency"/>
<label name="mandatory"/>
<field name="mandatory"/>
+ <field name="childs" colspan="4" view_ids="analytic_account.account_view_list"/>
</page>
<page string="Notes" id="notes">
<field name="note"/>
--
tryton-modules-analytic-account
More information about the tryton-debian-vcs
mailing list