[tryton-debian-vcs] tryton-modules-analytic-purchase branch upstream updated. upstream/4.2.0-1-gc1a239f
Mathias Behrle
tryton-debian-vcs at alioth.debian.org
Wed Jun 7 13:32:44 UTC 2017
The following commit has been merged in the upstream branch:
https://alioth.debian.org/plugins/scmgit/cgi-bin/gitweb.cgi/?p=tryton/tryton-modules-analytic-purchase.git;a=commitdiff;h=upstream/4.2.0-1-gc1a239f
commit c1a239f9350f9aec345ae8576b4a310bd6c7ddf4
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Wed Jun 7 15:26:01 2017 +0200
Adding upstream version 4.4.0.
Signed-off-by: Mathias Behrle <mathiasb at m9s.biz>
diff --git a/CHANGELOG b/CHANGELOG
index 04386d7..96ecf9d 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)
diff --git a/COPYRIGHT b/COPYRIGHT
index fcc5eeb..5af5413 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-2013 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 47ac2cd..3082e0b 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,12 +1,12 @@
Metadata-Version: 1.1
Name: trytond_analytic_purchase
-Version: 4.2.0
+Version: 4.4.0
Summary: Tryton module to add analytic accounting on purchase
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_purchase
=========================
@@ -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/locale/es_419.po b/locale/es_419.po
index aae7e65..76fa821 100644
--- a/locale/es_419.po
+++ b/locale/es_419.po
@@ -8,7 +8,7 @@ msgstr ""
msgctxt "error:purchase.purchase:"
msgid "Analytic account is required for \"%(roots)s\" on line \"%(line)s\"."
-msgstr "Se requiere la cuenta analítica de \"%(roots)s\" en la línea \"%(line)s\"."
+msgstr ""
msgctxt "field:purchase.line,analytic_accounts:"
msgid "Analytic Accounts"
diff --git a/purchase.py b/purchase.py
index eab12c2..ef62c51 100644
--- a/purchase.py
+++ b/purchase.py
@@ -56,6 +56,11 @@ class PurchaseLine(AnalyticMixin):
Eval('context', {}).get('company', -1),
Eval('_parent_purchase', {}).get('company', -1))),
]
+ cls.analytic_accounts.states = {
+ 'invisible': Eval('type') != 'line',
+ 'readonly': Eval('purchase_state') != 'draft',
+ }
+ cls.analytic_accounts.depends.extend(['type', 'purchase_state'])
def get_invoice_line(self):
pool = Pool()
diff --git a/setup.py b/setup.py
index e1b12c5..c3266a9 100644
--- a/setup.py
+++ b/setup.py
@@ -84,7 +84,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/tryton.cfg b/tryton.cfg
index f5a436d..27ac8d7 100644
--- a/tryton.cfg
+++ b/tryton.cfg
@@ -1,5 +1,5 @@
[tryton]
-version=4.2.0
+version=4.4.0
depends:
analytic_account
analytic_invoice
diff --git a/trytond_analytic_purchase.egg-info/PKG-INFO b/trytond_analytic_purchase.egg-info/PKG-INFO
index 0a28344..0124a26 100644
--- a/trytond_analytic_purchase.egg-info/PKG-INFO
+++ b/trytond_analytic_purchase.egg-info/PKG-INFO
@@ -1,12 +1,12 @@
Metadata-Version: 1.1
Name: trytond-analytic-purchase
-Version: 4.2.0
+Version: 4.4.0
Summary: Tryton module to add analytic accounting on purchase
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_purchase
=========================
@@ -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_purchase.egg-info/requires.txt b/trytond_analytic_purchase.egg-info/requires.txt
index 61f26fb..45e3100 100644
--- a/trytond_analytic_purchase.egg-info/requires.txt
+++ b/trytond_analytic_purchase.egg-info/requires.txt
@@ -1,4 +1,4 @@
-trytond_analytic_account >= 4.2, < 4.3
-trytond_analytic_invoice >= 4.2, < 4.3
-trytond_purchase >= 4.2, < 4.3
-trytond >= 4.2, < 4.3
+trytond_analytic_account >= 4.4, < 4.5
+trytond_analytic_invoice >= 4.4, < 4.5
+trytond_purchase >= 4.4, < 4.5
+trytond >= 4.4, < 4.5
--
tryton-modules-analytic-purchase
More information about the tryton-debian-vcs
mailing list