[tryton-debian-vcs] tryton-modules-analytic-purchase branch upstream updated. upstream/2.8.0-1-g539fbf5
git repository hosting
tryton-debian-vcs at m9s.biz
Mon Nov 25 19:33:13 UTC 2013
The following commit has been merged in the upstream branch:
http://debian.tryton.org/gitweb/?p=packages/tryton-modules-analytic-purchase.git;a=commitdiff;h=upstream/2.8.0-1-g539fbf5
commit 539fbf5bdc2f340b857a2c38958c0e3ba567e4c5
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Sun Nov 24 17:26:31 2013 +0100
Adding upstream version 3.0.0.
diff --git a/CHANGELOG b/CHANGELOG
index 034335d..09d92d7 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/PKG-INFO b/PKG-INFO
index d1e4b5a..ff8239b 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,12 +1,12 @@
Metadata-Version: 1.1
Name: trytond_analytic_purchase
-Version: 2.8.0
+Version: 3.0.0
Summary: Tryton module to add analytic accounting on purchase
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_purchase
=========================
@@ -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/locale/es_AR.po b/locale/es_AR.po
index 56c127c..f3b5cb0 100644
--- a/locale/es_AR.po
+++ b/locale/es_AR.po
@@ -32,11 +32,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"
@@ -168,11 +168,11 @@ msgstr "Empresa"
msgctxt "field:purchase.purchase,currency:"
msgid "Currency"
-msgstr "Divisa"
+msgstr "Moneda"
msgctxt "field:purchase.purchase,currency_digits:"
msgid "Currency Digits"
-msgstr "Dígitos de divisa"
+msgstr "Dígitos de moneda"
msgctxt "field:purchase.purchase,description:"
msgid "Description"
@@ -324,7 +324,7 @@ msgstr "Basado en la orden"
msgctxt "selection:purchase.purchase,invoice_method:"
msgid "Based On Shipment"
-msgstr "Basado en el envío"
+msgstr "Basado en el Remito"
msgctxt "selection:purchase.purchase,invoice_method:"
msgid "Manual"
diff --git a/locale/es_CO.po b/locale/es_CO.po
index c8dbbf1..fdb041b 100644
--- a/locale/es_CO.po
+++ b/locale/es_CO.po
@@ -4,7 +4,7 @@ msgstr "Content-Type: text/plain; charset=utf-8\n"
msgctxt "error:purchase.purchase:"
msgid "Analytic account is required on line \"%s\"."
-msgstr ""
+msgstr "Cuenta analítica es requerida en la línea \"%s\"."
msgctxt "field:analytic_account.account,active:"
msgid "Active"
diff --git a/locale/es_ES.po b/locale/es_ES.po
index ca66722..d9ee44e 100644
--- a/locale/es_ES.po
+++ b/locale/es_ES.po
@@ -12,7 +12,7 @@ msgstr "Activa"
msgctxt "field:analytic_account.account,balance:"
msgid "Balance"
-msgstr "Balance"
+msgstr "Saldo"
msgctxt "field:analytic_account.account,childs:"
msgid "Children"
@@ -44,7 +44,7 @@ msgstr "Debe"
msgctxt "field:analytic_account.account,display_balance:"
msgid "Display Balance"
-msgstr "Mostrar balance"
+msgstr "Mostrar saldo"
msgctxt "field:analytic_account.account,mandatory:"
msgid "Mandatory"
@@ -100,7 +100,7 @@ msgstr "Movimientos realizados"
msgctxt "field:purchase.line,move_exception:"
msgid "Moves Exception"
-msgstr "Exepción de movimientos"
+msgstr "Movimientos en excepción"
msgctxt "field:purchase.line,moves:"
msgid "Moves"
@@ -208,7 +208,7 @@ msgstr "Líneas"
msgctxt "field:purchase.purchase,moves:"
msgid "Moves"
-msgstr "Movimientos"
+msgstr "Asientos"
msgctxt "field:purchase.purchase,party:"
msgid "Party"
@@ -280,7 +280,7 @@ msgstr "Debe - Haber"
msgctxt "selection:analytic_account.account,state:"
msgid "Closed"
-msgstr "Cerrado"
+msgstr "Cerrada"
msgctxt "selection:analytic_account.account,state:"
msgid "Draft"
@@ -324,7 +324,7 @@ msgstr "Basado en el pedido"
msgctxt "selection:purchase.purchase,invoice_method:"
msgid "Based On Shipment"
-msgstr "Basado en el envío"
+msgstr "Basado en el albarán"
msgctxt "selection:purchase.purchase,invoice_method:"
msgid "Manual"
diff --git a/locale/sl_SI.po b/locale/sl_SI.po
new file mode 100644
index 0000000..f63eff5
--- /dev/null
+++ b/locale/sl_SI.po
@@ -0,0 +1,11 @@
+#
+msgid ""
+msgstr "Content-Type: text/plain; charset=utf-8\n"
+
+msgctxt "error:purchase.purchase:"
+msgid "Analytic account is required on line \"%s\"."
+msgstr "Na postavki \"%s\" je obvezen analitični konto."
+
+msgctxt "field:purchase.line,analytic_accounts:"
+msgid "Analytic Accounts"
+msgstr "Analitični konti"
diff --git a/purchase.py b/purchase.py
index 66b145c..511d6aa 100644
--- a/purchase.py
+++ b/purchase.py
@@ -68,7 +68,9 @@ class PurchaseLine:
['analytic_accounts'])['analytic_accounts']
res.update(AnalyticAccount.analytic_accounts_fields_get(
- analytic_accounts_field, fields_names))
+ analytic_accounts_field, fields_names,
+ states=cls.analytic_accounts.states,
+ required_states=Eval('type') == 'line'))
return res
@classmethod
diff --git a/setup.py b/setup.py
index df77f9d..f6ba358 100644
--- a/setup.py
+++ b/setup.py
@@ -63,6 +63,7 @@ setup(name='trytond_analytic_purchase',
'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 5d12558..9d053e8 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_purchase import suite
+
+__all__ = ['suite']
diff --git a/tryton.cfg b/tryton.cfg
index 385ea89..1f00218 100644
--- a/tryton.cfg
+++ b/tryton.cfg
@@ -1,5 +1,5 @@
[tryton]
-version=2.8.0
+version=3.0.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 4f13bac..8b735ec 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: 2.8.0
+Version: 3.0.0
Summary: Tryton module to add analytic accounting on purchase
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_purchase
=========================
@@ -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_purchase.egg-info/SOURCES.txt b/trytond_analytic_purchase.egg-info/SOURCES.txt
index 8948d02..3c7a573 100644
--- a/trytond_analytic_purchase.egg-info/SOURCES.txt
+++ b/trytond_analytic_purchase.egg-info/SOURCES.txt
@@ -21,6 +21,7 @@ locale/es_ES.po
locale/fr_FR.po
locale/nl_NL.po
locale/ru_RU.po
+locale/sl_SI.po
trytond_analytic_purchase.egg-info/PKG-INFO
trytond_analytic_purchase.egg-info/SOURCES.txt
trytond_analytic_purchase.egg-info/dependency_links.txt
diff --git a/trytond_analytic_purchase.egg-info/requires.txt b/trytond_analytic_purchase.egg-info/requires.txt
index a2da151..29aa8c6 100644
--- a/trytond_analytic_purchase.egg-info/requires.txt
+++ b/trytond_analytic_purchase.egg-info/requires.txt
@@ -1,4 +1,4 @@
-trytond_analytic_account >= 2.8, < 2.9
-trytond_analytic_invoice >= 2.8, < 2.9
-trytond_purchase >= 2.8, < 2.9
-trytond >= 2.8, < 2.9
\ No newline at end of file
+trytond_analytic_account >= 3.0, < 3.1
+trytond_analytic_invoice >= 3.0, < 3.1
+trytond_purchase >= 3.0, < 3.1
+trytond >= 3.0, < 3.1
\ No newline at end of file
--
tryton-modules-analytic-purchase
More information about the tryton-debian-vcs
mailing list