[tryton-debian-vcs] tryton-modules-analytic-invoice branch debian updated. debian/4.2.0-1-2-g07784eb
Mathias Behrle
tryton-debian-vcs at alioth.debian.org
Wed Jun 7 13:32:40 UTC 2017
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-invoice.git;a=commitdiff;h=debian/4.2.0-1-2-g07784eb
commit 07784ebca8f91663d2982152bca23022cacc068b
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Wed Jun 7 15:26:01 2017 +0200
Merging upstream version 4.4.0.
diff --git a/CHANGELOG b/CHANGELOG
index b2dc8a3..e78bf8d 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+Version 4.4.0 - 2017-05-01
+* Bug fixes (see mercurial logs for details)
+
Version 4.2.0 - 2016-11-28
* Bug fixes (see mercurial logs for details)
* Add support for depreciable assets
diff --git a/COPYRIGHT b/COPYRIGHT
index 808b71b..1474fa9 100644
--- a/COPYRIGHT
+++ b/COPYRIGHT
@@ -1,6 +1,6 @@
-Copyright (C) 2008-2016 Cédric Krier.
+Copyright (C) 2008-2017 Cédric Krier.
Copyright (C) 2008-2012 Bertrand Chenal.
-Copyright (C) 2008-2016 B2CK SPRL.
+Copyright (C) 2008-2017 B2CK SPRL.
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
diff --git a/PKG-INFO b/PKG-INFO
index fe0065d..fb77934 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,12 +1,12 @@
Metadata-Version: 1.1
Name: trytond_analytic_invoice
-Version: 4.2.0
+Version: 4.4.0
Summary: Tryton module to add analytic accounting on invoice
Home-page: http://www.tryton.org/
Author: Tryton
Author-email: issue_tracker at tryton.org
License: GPL-3
-Download-URL: http://downloads.tryton.org/4.2/
+Download-URL: http://downloads.tryton.org/4.4/
Description: trytond_analytic_invoice
========================
@@ -51,7 +51,7 @@ Classifier: Framework :: Tryton
Classifier: Intended Audience :: Developers
Classifier: Intended Audience :: Financial and Insurance Industry
Classifier: Intended Audience :: Legal Industry
-Classifier: License :: OSI Approved :: GNU General Public License (GPL)
+Classifier: License :: OSI Approved :: GNU General Public License v3 or later (GPLv3+)
Classifier: Natural Language :: Bulgarian
Classifier: Natural Language :: Catalan
Classifier: Natural Language :: Chinese (Simplified)
diff --git a/invoice.py b/invoice.py
index f75d953..5476143 100644
--- a/invoice.py
+++ b/invoice.py
@@ -22,6 +22,11 @@ class InvoiceLine(AnalyticMixin):
Eval('company', -1))),
]
cls.analytic_accounts.depends.append('company')
+ cls.analytic_accounts.states = {
+ 'invisible': Eval('type') != 'line',
+ 'readonly': Eval('invoice_state') != 'draft',
+ }
+ cls.analytic_accounts.depends.extend(['type', 'invoice_state'])
def _credit(self):
pool = Pool()
diff --git a/locale/lo.po b/locale/lo.po
index 7fa03fe..13608f4 100644
--- a/locale/lo.po
+++ b/locale/lo.po
@@ -2,21 +2,18 @@
msgid ""
msgstr "Content-Type: text/plain; charset=utf-8\n"
-#, fuzzy
msgctxt "error:account.asset:"
msgid "Some mandatory root account are missing on \"%(name)s\""
-msgstr "ບາງບັນຊີຫຼັກບັງຄັບບໍ່ມີໃນ \"%(name)s\""
+msgstr "ບາງບັນຊີຮຽກເກັບຫຼັກບໍ່ມີໃນ \"%(name)s\""
msgctxt "error:account.invoice.line:"
msgid "Some mandatory root account are missing on \"%(name)s\""
msgstr "ບາງບັນຊີຫຼັກບັງຄັບບໍ່ມີໃນ \"%(name)s\""
-#, fuzzy
msgctxt "field:account.asset,analytic_accounts:"
msgid "Analytic Accounts"
msgstr "ບັນຊີວິເຄາະ"
-#, fuzzy
msgctxt "field:account.asset,analytic_accounts_size:"
msgid "Analytic Accounts Size"
msgstr "ຂະໜາດບັນຊີວິເຄາະ"
diff --git a/locale/pt_BR.po b/locale/pt_BR.po
index ceb1431..6b8daa6 100644
--- a/locale/pt_BR.po
+++ b/locale/pt_BR.po
@@ -2,21 +2,18 @@
msgid ""
msgstr "Content-Type: text/plain; charset=utf-8\n"
-#, fuzzy
msgctxt "error:account.asset:"
msgid "Some mandatory root account are missing on \"%(name)s\""
-msgstr "Alguma conta de raíz obrigatória está faltando em \"%(name)s\""
+msgstr "Está faltando alguma conta de raiz obrigatória em \"%(name)s\""
msgctxt "error:account.invoice.line:"
msgid "Some mandatory root account are missing on \"%(name)s\""
msgstr "Alguma conta de raíz obrigatória está faltando em \"%(name)s\""
-#, fuzzy
msgctxt "field:account.asset,analytic_accounts:"
msgid "Analytic Accounts"
msgstr "Contas Analíticas"
-#, fuzzy
msgctxt "field:account.asset,analytic_accounts_size:"
msgid "Analytic Accounts Size"
msgstr "Tamanho da Conta Analítica"
diff --git a/locale/sl.po b/locale/sl.po
index bd1b85b..4bf4ce6 100644
--- a/locale/sl.po
+++ b/locale/sl.po
@@ -10,12 +10,10 @@ msgctxt "error:account.invoice.line:"
msgid "Some mandatory root account are missing on \"%(name)s\""
msgstr "Pri \"%(name)s\" manjkajo nekateri korenski konti."
-#, fuzzy
msgctxt "field:account.asset,analytic_accounts:"
msgid "Analytic Accounts"
msgstr "Analitični konti"
-#, fuzzy
msgctxt "field:account.asset,analytic_accounts_size:"
msgid "Analytic Accounts Size"
msgstr "Število analitičnih kontov"
diff --git a/setup.py b/setup.py
index 9a5b531..8a85cab 100644
--- a/setup.py
+++ b/setup.py
@@ -86,7 +86,7 @@ setup(name=name,
'Intended Audience :: Developers',
'Intended Audience :: Financial and Insurance Industry',
'Intended Audience :: Legal Industry',
- 'License :: OSI Approved :: GNU General Public License (GPL)',
+ 'License :: OSI Approved :: GNU General Public License v3 or later (GPLv3+)',
'Natural Language :: Bulgarian',
'Natural Language :: Catalan',
'Natural Language :: Chinese (Simplified)',
diff --git a/tests/scenario_analytic_invoice_asset.rst b/tests/scenario_analytic_invoice_asset.rst
index 4d1af54..0ace839 100644
--- a/tests/scenario_analytic_invoice_asset.rst
+++ b/tests/scenario_analytic_invoice_asset.rst
@@ -77,7 +77,7 @@ Create an asset::
>>> asset_template.account_revenue = revenue
>>> asset_template.account_asset = asset_account
>>> asset_template.account_depreciation = depreciation_account
- >>> asset_template.depreciation_duration = Decimal(10)
+ >>> asset_template.depreciation_duration = 10
>>> asset_template.save()
>>> asset_product.template = asset_template
>>> asset_product.save()
diff --git a/tryton.cfg b/tryton.cfg
index 9b5a8ef..1aa4139 100644
--- a/tryton.cfg
+++ b/tryton.cfg
@@ -1,5 +1,5 @@
[tryton]
-version=4.2.0
+version=4.4.0
depends:
account_invoice
analytic_account
diff --git a/trytond_analytic_invoice.egg-info/PKG-INFO b/trytond_analytic_invoice.egg-info/PKG-INFO
index 394bbd9..8c76e29 100644
--- a/trytond_analytic_invoice.egg-info/PKG-INFO
+++ b/trytond_analytic_invoice.egg-info/PKG-INFO
@@ -1,12 +1,12 @@
Metadata-Version: 1.1
Name: trytond-analytic-invoice
-Version: 4.2.0
+Version: 4.4.0
Summary: Tryton module to add analytic accounting on invoice
Home-page: http://www.tryton.org/
Author: Tryton
Author-email: issue_tracker at tryton.org
License: GPL-3
-Download-URL: http://downloads.tryton.org/4.2/
+Download-URL: http://downloads.tryton.org/4.4/
Description: trytond_analytic_invoice
========================
@@ -51,7 +51,7 @@ Classifier: Framework :: Tryton
Classifier: Intended Audience :: Developers
Classifier: Intended Audience :: Financial and Insurance Industry
Classifier: Intended Audience :: Legal Industry
-Classifier: License :: OSI Approved :: GNU General Public License (GPL)
+Classifier: License :: OSI Approved :: GNU General Public License v3 or later (GPLv3+)
Classifier: Natural Language :: Bulgarian
Classifier: Natural Language :: Catalan
Classifier: Natural Language :: Chinese (Simplified)
diff --git a/trytond_analytic_invoice.egg-info/requires.txt b/trytond_analytic_invoice.egg-info/requires.txt
index 40e9282..d856d41 100644
--- a/trytond_analytic_invoice.egg-info/requires.txt
+++ b/trytond_analytic_invoice.egg-info/requires.txt
@@ -1,3 +1,3 @@
-trytond_account_invoice >= 4.2, < 4.3
-trytond_analytic_account >= 4.2, < 4.3
-trytond >= 4.2, < 4.3
+trytond_account_invoice >= 4.4, < 4.5
+trytond_analytic_account >= 4.4, < 4.5
+trytond >= 4.4, < 4.5
--
tryton-modules-analytic-invoice
More information about the tryton-debian-vcs
mailing list