[tryton-debian-vcs] tryton-modules-analytic-purchase branch upstream created. 539fbf5bdc2f340b857a2c38958c0e3ba567e4c5
Mathias Behrle
tryton-debian-vcs at alioth.debian.org
Wed Nov 27 16:58:36 UTC 2013
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=539fbf5bdc2f340b857a2c38958c0e3ba567e4c5
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
commit 4135f58bd1c546d1b797f543c333aa8f4e7f5f5b
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Thu May 2 00:35:19 2013 +0200
Adding upstream version 2.8.0.
diff --git a/CHANGELOG b/CHANGELOG
index 39c1db7..034335d 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,4 +1,4 @@
-Version 2.6.1 - 2012-12-23
+Version 2.8.0 - 2013-04-22
* Bug fixes (see mercurial logs for details)
Version 2.6.0 - 2012-10-22
diff --git a/COPYRIGHT b/COPYRIGHT
index 2057c72..9192c97 100644
--- a/COPYRIGHT
+++ b/COPYRIGHT
@@ -1,6 +1,6 @@
-Copyright (C) 2008-2012 Cédric Krier.
-Copyright (C) 2008-2012 Bertrand Chenal.
-Copyright (C) 2008-2012 B2CK SPRL.
+Copyright (C) 2008-2013 Cédric Krier.
+Copyright (C) 2008-2013 Bertrand Chenal.
+Copyright (C) 2008-2013 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/MANIFEST.in b/MANIFEST.in
index 44969c7..18ce53c 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -6,5 +6,6 @@ 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 9eb22a0..d1e4b5a 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,12 +1,12 @@
Metadata-Version: 1.1
Name: trytond_analytic_purchase
-Version: 2.6.1
+Version: 2.8.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.6/
+Download-URL: http://downloads.tryton.org/2.8/
Description: trytond_analytic_purchase
=========================
@@ -52,6 +52,7 @@ Classifier: Intended Audience :: Financial and Insurance Industry
Classifier: Intended Audience :: Legal Industry
Classifier: License :: OSI Approved :: GNU General Public License (GPL)
Classifier: Natural Language :: Bulgarian
+Classifier: Natural Language :: Catalan
Classifier: Natural Language :: Czech
Classifier: Natural Language :: Dutch
Classifier: Natural Language :: English
diff --git a/locale/bg_BG.po b/locale/bg_BG.po
index ee69623..b811beb 100644
--- a/locale/bg_BG.po
+++ b/locale/bg_BG.po
@@ -3,8 +3,8 @@ msgid ""
msgstr "Content-Type: text/plain; charset=utf-8\n"
msgctxt "error:purchase.purchase:"
-msgid "Analytic account is required on line \"%s\" (%d)!"
-msgstr "Аналитична сметка е необходима за ред \"%s\" (%d)!"
+msgid "Analytic account is required on line \"%s\"."
+msgstr ""
msgctxt "field:purchase.line,analytic_accounts:"
msgid "Analytic Accounts"
diff --git a/locale/ca_ES.po b/locale/ca_ES.po
index e5a6f01..c012aab 100644
--- a/locale/ca_ES.po
+++ b/locale/ca_ES.po
@@ -3,8 +3,8 @@ msgid ""
msgstr "Content-Type: text/plain; charset=utf-8\n"
msgctxt "error:purchase.purchase:"
-msgid "Analytic account is required on line \"%s\" (%d)!"
-msgstr "És necessari un compte analític en la línia «%s» (%d)."
+msgid "Analytic account is required on line \"%s\"."
+msgstr "El compte analític a la línia \"%s\" és obligatori."
msgctxt "field:purchase.line,analytic_accounts:"
msgid "Analytic Accounts"
diff --git a/locale/cs_CZ.po b/locale/cs_CZ.po
index 1649ed2..2f65fc6 100644
--- a/locale/cs_CZ.po
+++ b/locale/cs_CZ.po
@@ -3,7 +3,7 @@ msgid ""
msgstr "Content-Type: text/plain; charset=utf-8\n"
msgctxt "error:purchase.purchase:"
-msgid "Analytic account is required on line \"%s\" (%d)!"
+msgid "Analytic account is required on line \"%s\"."
msgstr ""
msgctxt "field:purchase.line,analytic_accounts:"
diff --git a/locale/de_DE.po b/locale/de_DE.po
index be4f49d..35a90c3 100644
--- a/locale/de_DE.po
+++ b/locale/de_DE.po
@@ -3,8 +3,8 @@ msgid ""
msgstr "Content-Type: text/plain; charset=utf-8\n"
msgctxt "error:purchase.purchase:"
-msgid "Analytic account is required on line \"%s\" (%d)!"
-msgstr "Kostenstelle ist erforderlich in Zeile \"%s\" (%d)!"
+msgid "Analytic account is required on line \"%s\"."
+msgstr "Kostenstelle ist erforderlich auf Zeile \"%s\"."
msgctxt "field:purchase.line,analytic_accounts:"
msgid "Analytic Accounts"
diff --git a/locale/es_AR.po b/locale/es_AR.po
index b37346e..56c127c 100644
--- a/locale/es_AR.po
+++ b/locale/es_AR.po
@@ -2,29 +2,9 @@
msgid ""
msgstr "Content-Type: text/plain; charset=utf-8\n"
-msgctxt "error:analytic_account.account:"
-msgid "You can not create recursive accounts!"
-msgstr "¡No puede crear cuentas recursivas!"
-
-msgctxt "error:purchase.line:"
-msgid "It misses an \"Account Expense\" on product \"%s\"!"
-msgstr "¡Falta la propiedad «Cuenta de gastos» en el producto «%s»!"
-
-msgctxt "error:purchase.line:"
-msgid "The supplier location is required!"
-msgstr "¡Se necesita la ubicación del proveedor!"
-
-msgctxt "error:purchase.purchase:"
-msgid "Analytic account is required on line \"%s\" (%d)!"
-msgstr "¡Se necesita una cuenta analítica en la línea «%s» (%d)!"
-
-msgctxt "error:purchase.purchase:"
-msgid "Invoice addresses must be defined for the quotation."
-msgstr "Se necesita la dirección de facturación para el presupuesto."
-
msgctxt "error:purchase.purchase:"
-msgid "It misses an \"Account Payable\" on the party \"%s\"!"
-msgstr "¡Falta una «Cuenta por pagar» en la entidad «%s»!"
+msgid "Analytic account is required on line \"%s\"."
+msgstr "Se requiere la cuenta analítica en la línea «%s»."
msgctxt "field:analytic_account.account,active:"
msgid "Active"
@@ -56,7 +36,7 @@ msgstr "Divisa"
msgctxt "field:analytic_account.account,currency_digits:"
msgid "Currency Digits"
-msgstr "Decimales de la divisa"
+msgstr "Dígitos de divisa"
msgctxt "field:analytic_account.account,debit:"
msgid "Debit"
@@ -100,7 +80,7 @@ msgstr "Tipo"
msgctxt "field:purchase.line,amount:"
msgid "Amount"
-msgstr "Cantidad"
+msgstr "Importe"
msgctxt "field:purchase.line,analytic_accounts:"
msgid "Analytic Accounts"
@@ -116,7 +96,7 @@ msgstr "Líneas de factura"
msgctxt "field:purchase.line,move_done:"
msgid "Moves Done"
-msgstr "Movimientos terminados"
+msgstr "Movimientos realizados"
msgctxt "field:purchase.line,move_exception:"
msgid "Moves Exception"
@@ -172,7 +152,7 @@ msgstr "Unidad"
msgctxt "field:purchase.line,unit_digits:"
msgid "Unit Digits"
-msgstr "Decimales de la unidad"
+msgstr "Dígitos de unidad"
msgctxt "field:purchase.line,unit_price:"
msgid "Unit Price"
@@ -192,7 +172,7 @@ msgstr "Divisa"
msgctxt "field:purchase.purchase,currency_digits:"
msgid "Currency Digits"
-msgstr "Decimales de la divisa"
+msgstr "Dígitos de divisa"
msgctxt "field:purchase.purchase,description:"
msgid "Description"
@@ -240,7 +220,7 @@ msgstr "Idioma de la entidad"
msgctxt "field:purchase.purchase,payment_term:"
msgid "Payment Term"
-msgstr "Plazo de pago"
+msgstr "Término de pago"
msgctxt "field:purchase.purchase,purchase_date:"
msgid "Purchase Date"
@@ -272,7 +252,7 @@ msgstr "Total"
msgctxt "field:purchase.purchase,untaxed_amount:"
msgid "Untaxed"
-msgstr "Sin Impuestos"
+msgstr "Base imponible"
msgctxt "field:purchase.purchase,warehouse:"
msgid "Warehouse"
@@ -376,7 +356,7 @@ msgstr "Confirmada"
msgctxt "selection:purchase.purchase,state:"
msgid "Done"
-msgstr "Terminada"
+msgstr "Realizada"
msgctxt "selection:purchase.purchase,state:"
msgid "Draft"
diff --git a/locale/es_CO.po b/locale/es_CO.po
index 1648397..c8dbbf1 100644
--- a/locale/es_CO.po
+++ b/locale/es_CO.po
@@ -2,29 +2,9 @@
msgid ""
msgstr "Content-Type: text/plain; charset=utf-8\n"
-msgctxt "error:analytic_account.account:"
-msgid "You can not create recursive accounts!"
-msgstr "¡No puede crear cuentas recursivas!"
-
-msgctxt "error:purchase.line:"
-msgid "It misses an \"Account Expense\" on product \"%s\"!"
-msgstr "Falta una propiedad por defecto \"Account Expense\"!"
-
-msgctxt "error:purchase.line:"
-msgid "The supplier location is required!"
-msgstr "Se requiere la locación del proveedor!"
-
-msgctxt "error:purchase.purchase:"
-msgid "Analytic account is required on line \"%s\" (%d)!"
-msgstr "Se requiere una cuenta analítica en la línea \"%s\" (%d)!"
-
-msgctxt "error:purchase.purchase:"
-msgid "Invoice addresses must be defined for the quotation."
-msgstr "Factura direccionada debe ser definida por el presupuesto."
-
msgctxt "error:purchase.purchase:"
-msgid "It misses an \"Account Payable\" on the party \"%s\"!"
-msgstr "Falta una \"Cuenta por Pagar\" en el tercero \"%s\"!"
+msgid "Analytic account is required on line \"%s\"."
+msgstr ""
msgctxt "field:analytic_account.account,active:"
msgid "Active"
diff --git a/locale/es_ES.po b/locale/es_ES.po
index f9faa44..ca66722 100644
--- a/locale/es_ES.po
+++ b/locale/es_ES.po
@@ -2,29 +2,9 @@
msgid ""
msgstr "Content-Type: text/plain; charset=utf-8\n"
-msgctxt "error:analytic_account.account:"
-msgid "You can not create recursive accounts!"
-msgstr "No puede crear cuentas recursivas."
-
-msgctxt "error:purchase.line:"
-msgid "It misses an \"Account Expense\" on product \"%s\"!"
-msgstr "Al producto \"%s\" le falta una \"Cuenta de gastos\"."
-
-msgctxt "error:purchase.line:"
-msgid "The supplier location is required!"
-msgstr "La ubicación de proveedor es requerida."
-
-msgctxt "error:purchase.purchase:"
-msgid "Analytic account is required on line \"%s\" (%d)!"
-msgstr "Es necesaria una cuenta analítica en la línea «%s» (%d)."
-
-msgctxt "error:purchase.purchase:"
-msgid "Invoice addresses must be defined for the quotation."
-msgstr "Se necesita la dirección de facturación para el presupuesto."
-
msgctxt "error:purchase.purchase:"
-msgid "It misses an \"Account Payable\" on the party \"%s\"!"
-msgstr "Al tercero \"%s\" le falta una \"Cuenta a pagar\"."
+msgid "Analytic account is required on line \"%s\"."
+msgstr "Se requiere la cuenta analítica en la línea \"%s\"."
msgctxt "field:analytic_account.account,active:"
msgid "Active"
@@ -52,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 "Decimales de la divisa"
+msgstr "Decimales de la moneda"
msgctxt "field:analytic_account.account,debit:"
msgid "Debit"
@@ -188,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 "Decimales de la divisa"
+msgstr "Decimales de la moneda"
msgctxt "field:purchase.purchase,description:"
msgid "Description"
diff --git a/locale/fr_FR.po b/locale/fr_FR.po
index 2f61090..4dad4cf 100644
--- a/locale/fr_FR.po
+++ b/locale/fr_FR.po
@@ -3,12 +3,8 @@ msgid ""
msgstr "Content-Type: text/plain; charset=utf-8\n"
msgctxt "error:purchase.purchase:"
-msgid "Analytic account is required on line \"%s\" (%d)!"
-msgstr "Compte analytique requis sur la ligne \"%s\" (%d)!"
-
-msgctxt "error:purchase.purchase:"
-msgid "Analytic account is required on line \"%s\" (%d)!"
-msgstr "Compte analytique requis sur la ligne \"%s\" (%d)!"
+msgid "Analytic account is required on line \"%s\"."
+msgstr "Le compte analytique est requis sur la ligne \"%s\""
msgctxt "field:purchase.line,analytic_accounts:"
msgid "Analytic Accounts"
diff --git a/locale/nl_NL.po b/locale/nl_NL.po
index 1649ed2..2f65fc6 100644
--- a/locale/nl_NL.po
+++ b/locale/nl_NL.po
@@ -3,7 +3,7 @@ msgid ""
msgstr "Content-Type: text/plain; charset=utf-8\n"
msgctxt "error:purchase.purchase:"
-msgid "Analytic account is required on line \"%s\" (%d)!"
+msgid "Analytic account is required on line \"%s\"."
msgstr ""
msgctxt "field:purchase.line,analytic_accounts:"
diff --git a/locale/ru_RU.po b/locale/ru_RU.po
index 1649ed2..105bb4d 100644
--- a/locale/ru_RU.po
+++ b/locale/ru_RU.po
@@ -3,9 +3,9 @@ msgid ""
msgstr "Content-Type: text/plain; charset=utf-8\n"
msgctxt "error:purchase.purchase:"
-msgid "Analytic account is required on line \"%s\" (%d)!"
-msgstr ""
+msgid "Analytic account is required on line \"%s\"."
+msgstr "Счет аналитики необходим для строки \"%s\"."
msgctxt "field:purchase.line,analytic_accounts:"
msgid "Analytic Accounts"
-msgstr ""
+msgstr "Счета аналитики"
diff --git a/purchase.py b/purchase.py
index 5d31c1d..66b145c 100644
--- a/purchase.py
+++ b/purchase.py
@@ -4,6 +4,7 @@ from trytond.model import fields
from trytond.pyson import Eval
from trytond.transaction import Transaction
from trytond.pool import Pool, PoolMeta
+from trytond.exceptions import UserError
__all__ = ['Purchase', 'PurchaseLine', 'Account']
__metaclass__ = PoolMeta
@@ -16,24 +17,29 @@ class Purchase:
def __setup__(cls):
super(Purchase, cls).__setup__()
cls._error_messages.update({
- 'analytic_account_required': 'Analytic account is required ' \
- 'on line "%s" (%d)!',
- })
+ 'analytic_account_required': ('Analytic account is required '
+ 'on line "%s".'),
+ })
def check_for_quotation(self):
AccountSelection = Pool().get('analytic_account.account.selection')
super(Purchase, self).check_for_quotation()
- if not AccountSelection.check_root(
+ try:
+ AccountSelection.check_root(
[x.analytic_accounts for x in self.lines
- if x.analytic_accounts]):
+ if x.analytic_accounts])
+ except UserError:
for line in self.lines:
if line.type != 'line':
continue
- if not AccountSelection.check_root([line.analytic_accounts]):
+ try:
+ AccountSelection.check_root([line.analytic_accounts])
+ except UserError:
self.raise_user_error('analytic_account_required',
- (line.rec_name, line.id))
+ (line.rec_name,))
+ raise
class PurchaseLine:
@@ -82,8 +88,7 @@ class PurchaseLine:
res = super(PurchaseLine, cls).read(ids, fields_names=fields_names2)
if not fields_names:
- fields_names = list(set(cls._fields.keys()
- + cls._inherit_fields.keys()))
+ fields_names = cls._fields.keys()
root_ids = []
for field in fields_names:
@@ -96,41 +101,43 @@ class PurchaseLine:
lines = cls.browse(ids)
for line in lines:
for root_id in root_ids:
- id2record[line.id]['analytic_account_' \
- + str(root_id)] = None
+ id2record[line.id]['analytic_account_'
+ + str(root_id)] = None
if line.type != 'line':
continue
if not line.analytic_accounts:
continue
for account in line.analytic_accounts.accounts:
if account.root.id in root_ids:
- id2record[line.id]['analytic_account_' \
- + str(account.root.id)] = account.id
+ id2record[line.id]['analytic_account_'
+ + str(account.root.id)] = account.id
for field in fields_names:
- if field.startswith('analytic_account_' + \
- str(account.root.id) + '.'):
+ if field.startswith('analytic_account_'
+ + str(account.root.id) + '.'):
ham, field2 = field.split('.', 1)
id2record[line.id][field] = account[field2]
return res
@classmethod
- def create(cls, vals):
+ def create(cls, vlist):
Selection = Pool().get('analytic_account.account.selection')
- vals = vals.copy()
- selection_vals = {}
- for field in vals.keys():
- if field.startswith('analytic_account_'):
- if vals[field]:
- selection_vals.setdefault('accounts', [])
- selection_vals['accounts'].append(('add', [vals[field]]))
- del vals[field]
- if vals.get('analytic_accounts'):
- Selection.write([Selection(vals['analytic_accounts'])],
- selection_vals)
- elif vals.get('type', 'line') == 'line':
- selection = Selection.create(selection_vals)
- vals['analytic_accounts'] = selection.id
- return super(PurchaseLine, cls).create(vals)
+ vlist = [x.copy() for x in vlist]
+ for vals in vlist:
+ selection_vals = {}
+ for field in vals.keys():
+ if field.startswith('analytic_account_'):
+ if vals[field]:
+ selection_vals.setdefault('accounts', [])
+ selection_vals['accounts'].append(('add',
+ [vals[field]]))
+ del vals[field]
+ if vals.get('analytic_accounts'):
+ Selection.write([Selection(vals['analytic_accounts'])],
+ selection_vals)
+ elif vals.get('type', 'line') == 'line':
+ selection, = Selection.create([selection_vals])
+ vals['analytic_accounts'] = selection.id
+ return super(PurchaseLine, cls).create(vlist)
@classmethod
def write(cls, lines, vals):
@@ -150,7 +157,7 @@ class PurchaseLine:
if not line.analytic_accounts:
# Create missing selection
with Transaction().set_user(0):
- selection = Selection.create({})
+ selection, = Selection.create([{}])
cls.write([line], {
'analytic_accounts': selection.id,
})
@@ -223,12 +230,12 @@ class Account:
PurchaseLine._fields_view_get_cache.clear()
@classmethod
- def create(cls, vals):
+ def create(cls, vlist):
PurchaseLine = Pool().get('purchase.line')
- account = super(Account, cls).create(vals)
+ accounts = super(Account, cls).create(vlist)
# Restart the cache on the fields_view_get method of purchase.line
PurchaseLine._fields_view_get_cache.clear()
- return account
+ return accounts
@classmethod
def write(cls, accounts, vals):
diff --git a/purchase.xml b/purchase.xml
index 6a8a1b9..88f41a7 100644
--- a/purchase.xml
+++ b/purchase.xml
@@ -6,19 +6,7 @@ this repository contains the full copyright notices and license terms. -->
<record model="ir.ui.view" id="purchase_line_view_form">
<field name="model">purchase.line</field>
<field name="inherit" ref="purchase.purchase_line_view_form"/>
- <field name="arch" type="xml">
- <![CDATA[
- <data>
- <xpath
- expr="/form/notebook/page/field[@name="amount"]"
- position="after">
- <group col="4" colspan="4" name="analytic_accounts">
- <field name="analytic_accounts"/>
- </group>
- </xpath>
- </data>
- ]]>
- </field>
+ <field name="name">purchase_line_form</field>
</record>
</data>
</tryton>
diff --git a/setup.py b/setup.py
index 86af905..df77f9d 100644
--- a/setup.py
+++ b/setup.py
@@ -25,10 +25,10 @@ requires = []
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))
+ (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))
+ (major_version, minor_version, major_version, minor_version + 1))
setup(name='trytond_analytic_purchase',
version=info.get('version', '0.0.1'),
@@ -36,16 +36,16 @@ setup(name='trytond_analytic_purchase',
long_description=read('README'),
author='Tryton',
url='http://www.tryton.org/',
- download_url="http://downloads.tryton.org/" + \
- info.get('version', '0.0.1').rsplit('.', 1)[0] + '/',
+ download_url=("http://downloads.tryton.org/" +
+ info.get('version', '0.0.1').rsplit('.', 1)[0] + '/'),
package_dir={'trytond.modules.analytic_purchase': '.'},
packages=[
'trytond.modules.analytic_purchase',
'trytond.modules.analytic_purchase.tests',
],
package_data={
- 'trytond.modules.analytic_purchase': info.get('xml', []) \
- + ['tryton.cfg', 'locale/*.po'],
+ 'trytond.modules.analytic_purchase': (info.get('xml', [])
+ + ['tryton.cfg', 'view/*.xml', 'locale/*.po']),
},
classifiers=[
'Development Status :: 5 - Production/Stable',
@@ -56,6 +56,7 @@ setup(name='trytond_analytic_purchase',
'Intended Audience :: Legal Industry',
'License :: OSI Approved :: GNU General Public License (GPL)',
'Natural Language :: Bulgarian',
+ 'Natural Language :: Catalan',
'Natural Language :: Czech',
'Natural Language :: Dutch',
'Natural Language :: English',
diff --git a/tryton.cfg b/tryton.cfg
index a6edcf0..385ea89 100644
--- a/tryton.cfg
+++ b/tryton.cfg
@@ -1,5 +1,5 @@
[tryton]
-version=2.6.1
+version=2.8.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 1892593..4f13bac 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.6.1
+Version: 2.8.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.6/
+Download-URL: http://downloads.tryton.org/2.8/
Description: trytond_analytic_purchase
=========================
@@ -52,6 +52,7 @@ Classifier: Intended Audience :: Financial and Insurance Industry
Classifier: Intended Audience :: Legal Industry
Classifier: License :: OSI Approved :: GNU General Public License (GPL)
Classifier: Natural Language :: Bulgarian
+Classifier: Natural Language :: Catalan
Classifier: Natural Language :: Czech
Classifier: Natural Language :: Dutch
Classifier: Natural Language :: English
diff --git a/trytond_analytic_purchase.egg-info/SOURCES.txt b/trytond_analytic_purchase.egg-info/SOURCES.txt
index 15f101a..8948d02 100644
--- a/trytond_analytic_purchase.egg-info/SOURCES.txt
+++ b/trytond_analytic_purchase.egg-info/SOURCES.txt
@@ -27,4 +27,5 @@ trytond_analytic_purchase.egg-info/dependency_links.txt
trytond_analytic_purchase.egg-info/entry_points.txt
trytond_analytic_purchase.egg-info/not-zip-safe
trytond_analytic_purchase.egg-info/requires.txt
-trytond_analytic_purchase.egg-info/top_level.txt
\ No newline at end of file
+trytond_analytic_purchase.egg-info/top_level.txt
+view/purchase_line_form.xml
\ No newline at end of file
diff --git a/trytond_analytic_purchase.egg-info/requires.txt b/trytond_analytic_purchase.egg-info/requires.txt
index 3f7a2b8..a2da151 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.6, < 2.7
-trytond_analytic_invoice >= 2.6, < 2.7
-trytond_purchase >= 2.6, < 2.7
-trytond >= 2.6, < 2.7
\ No newline at end of file
+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
diff --git a/view/purchase_line_form.xml b/view/purchase_line_form.xml
new file mode 100644
index 0000000..4b4ef47
--- /dev/null
+++ b/view/purchase_line_form.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0"?>
+<!-- This file is part of Tryton. The COPYRIGHT file at the top level of
+this repository contains the full copyright notices and license terms. -->
+<data>
+ <xpath
+ expr="/form/notebook/page/field[@name='amount']"
+ position="after">
+ <group col="4" colspan="4" name="analytic_accounts">
+ <field name="analytic_accounts"/>
+ </group>
+ </xpath>
+</data>
commit d374fbcf635ffd6a09ec36422a1c009a41215cec
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Fri Feb 15 20:50:34 2013 +0100
Adding upstream version 2.6.1.
diff --git a/CHANGELOG b/CHANGELOG
index e70af61..39c1db7 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+Version 2.6.1 - 2012-12-23
+* Bug fixes (see mercurial logs for details)
+
Version 2.6.0 - 2012-10-22
* Bug fixes (see mercurial logs for details)
diff --git a/PKG-INFO b/PKG-INFO
index 0cc61d7..9eb22a0 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
-Metadata-Version: 1.0
+Metadata-Version: 1.1
Name: trytond_analytic_purchase
-Version: 2.6.0
+Version: 2.6.1
Summary: Tryton module to add analytic accounting on purchase
Home-page: http://www.tryton.org/
Author: Tryton
diff --git a/purchase.py b/purchase.py
index 13e8420..5d31c1d 100644
--- a/purchase.py
+++ b/purchase.py
@@ -122,7 +122,7 @@ class PurchaseLine:
if field.startswith('analytic_account_'):
if vals[field]:
selection_vals.setdefault('accounts', [])
- selection_vals['accounts'].append(('add', vals[field]))
+ selection_vals['accounts'].append(('add', [vals[field]]))
del vals[field]
if vals.get('analytic_accounts'):
Selection.write([Selection(vals['analytic_accounts'])],
diff --git a/tryton.cfg b/tryton.cfg
index 850ab19..a6edcf0 100644
--- a/tryton.cfg
+++ b/tryton.cfg
@@ -1,5 +1,5 @@
[tryton]
-version=2.6.0
+version=2.6.1
depends:
analytic_account
analytic_invoice
diff --git a/trytond_analytic_purchase.egg-info/PKG-INFO b/trytond_analytic_purchase.egg-info/PKG-INFO
index 7d8af17..1892593 100644
--- a/trytond_analytic_purchase.egg-info/PKG-INFO
+++ b/trytond_analytic_purchase.egg-info/PKG-INFO
@@ -1,6 +1,6 @@
-Metadata-Version: 1.0
+Metadata-Version: 1.1
Name: trytond-analytic-purchase
-Version: 2.6.0
+Version: 2.6.1
Summary: Tryton module to add analytic accounting on purchase
Home-page: http://www.tryton.org/
Author: Tryton
commit c7018c20c14fd0de80d5347221cdccd65d3d8fda
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Tue Oct 23 19:53:28 2012 +0200
Adding upstream version 2.6.0.
diff --git a/CHANGELOG b/CHANGELOG
index c3ffbfc..e70af61 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,9 +1,6 @@
-Version 2.4.2 - 2012-09-02
+Version 2.6.0 - 2012-10-22
* Bug fixes (see mercurial logs for details)
-Version 2.4.1 - 2012-04-24
-* Restore es_AR translation
-
Version 2.4.0 - 2012-04-23
* Bug fixes (see mercurial logs for details)
diff --git a/MANIFEST.in b/MANIFEST.in
index 7f5d5fd..44969c7 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -4,6 +4,7 @@ include TODO
include COPYRIGHT
include CHANGELOG
include LICENSE
+include tryton.cfg
include *.xml
include *.odt
include locale/*.po
diff --git a/PKG-INFO b/PKG-INFO
index 2f74806..0cc61d7 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,14 +1,48 @@
Metadata-Version: 1.0
Name: trytond_analytic_purchase
-Version: 2.4.2
-Summary: Add analytic account on purchase lines.
-
+Version: 2.6.0
+Summary: Tryton module to add analytic accounting on purchase
Home-page: http://www.tryton.org/
-Author: B2CK
-Author-email: info at b2ck.com
+Author: Tryton
+Author-email: UNKNOWN
License: GPL-3
-Download-URL: http://downloads.tryton.org/2.4/
-Description: UNKNOWN
+Download-URL: http://downloads.tryton.org/2.6/
+Description: trytond_analytic_purchase
+ =========================
+
+ The analytic_purchase module of the Tryton application platform.
+
+ Installing
+ ----------
+
+ See INSTALL
+
+ Support
+ -------
+
+ If you encounter any problems with Tryton, please don't hesitate to ask
+ questions on the Tryton bug tracker, mailing list, wiki or IRC channel:
+
+ http://bugs.tryton.org/
+ http://groups.tryton.org/
+ http://wiki.tryton.org/
+ irc://irc.freenode.net/tryton
+
+ License
+ -------
+
+ See LICENSE
+
+ Copyright
+ ---------
+
+ See COPYRIGHT
+
+
+ For more information please visit the Tryton web site:
+
+ http://www.tryton.org/
+
Platform: UNKNOWN
Classifier: Development Status :: 5 - Production/Stable
Classifier: Environment :: Plugins
diff --git a/README b/README
index 78c44bf..4f23b62 100644
--- a/README
+++ b/README
@@ -2,7 +2,6 @@ trytond_analytic_purchase
=========================
The analytic_purchase module of the Tryton application platform.
-See __tryton__.py
Installing
----------
diff --git a/__init__.py b/__init__.py
index 5338213..ebcaece 100644
--- a/__init__.py
+++ b/__init__.py
@@ -1,4 +1,13 @@
#This file is part of Tryton. The COPYRIGHT file at the top level of
#this repository contains the full copyright notices and license terms.
+from trytond.pool import Pool
from .purchase import *
+
+
+def register():
+ Pool.register(
+ Purchase,
+ PurchaseLine,
+ Account,
+ module='analytic_purchase', type_='model')
diff --git a/__tryton__.py b/__tryton__.py
deleted file mode 100644
index 91fd2c1..0000000
--- a/__tryton__.py
+++ /dev/null
@@ -1,51 +0,0 @@
-#This file is part of Tryton. The COPYRIGHT file at the top level of
-#this repository contains the full copyright notices and license terms.
-{
- 'name': 'Analytic Purchase',
- 'name_bg_BG': 'Аналитични покупки',
- 'name_ca_ES': 'Compra analítica',
- 'name_de_DE': 'Kostenstellen Einkauf',
- 'name_es_AR': 'Compra Analítica',
- 'name_es_CO': 'Compra Analítica',
- 'name_es_ES': 'Compra analítica',
- 'name_fr_FR': 'Achat analytique',
- 'version': '2.4.2',
- 'author': 'B2CK',
- 'email': 'info at b2ck.com',
- 'website': 'http://www.tryton.org/',
- 'description': '''Add analytic account on purchase lines.
-''',
- 'description_bg_BG': '''Добавя аналитична сметка към редовете на покупка
-''',
- 'description_ca_ES': '''Afegeix comptabilitat analítica a les línies de les
-comandes de compra.''',
- 'description_de_DE': '''Fügt kostenstellen zu Einkaufspositionen hinzu
-''',
- 'description_es_AR': '''Añade contabilidad analítica a las líneas de compra.
-''',
- 'description_es_CO': '''Adiciona contabilidad analítica a las líneas de compra.
-''',
- 'description_es_ES': '''Añade contabilidad analítica a las líneas de los
-pedidos de compra.''',
- 'description_fr_FR': 'Ajoute la comptabilité analytique sur les lignes d\'achat.',
- 'depends': [
- 'purchase',
- 'analytic_account',
- 'analytic_invoice',
- ],
- 'xml': [
- 'purchase.xml',
- ],
- 'translation': [
- 'locale/bg_BG.po',
- 'locale/ca_ES.po',
- 'locale/cs_CZ.po',
- 'locale/de_DE.po',
- 'locale/es_AR.po',
- 'locale/es_CO.po',
- 'locale/es_ES.po',
- 'locale/fr_FR.po',
- 'locale/nl_NL.po',
- 'locale/ru_RU.po',
- ],
-}
diff --git a/locale/ca_ES.po b/locale/ca_ES.po
index 26543e3..e5a6f01 100644
--- a/locale/ca_ES.po
+++ b/locale/ca_ES.po
@@ -2,386 +2,10 @@
msgid ""
msgstr "Content-Type: text/plain; charset=utf-8\n"
-msgctxt "error:analytic_account.account:"
-msgid "You can not create recursive accounts!"
-msgstr "No pot crear comptes recursius"
-
-msgctxt "error:purchase.line:"
-msgid "It misses an \"Account Expense\" on product \"%s\"!"
-msgstr "Falta el «Compte de despeses» en el producte «%s»"
-
-msgctxt "error:purchase.line:"
-msgid "The supplier location is required!"
-msgstr "Es necessita la ubicació del proveïdor"
-
msgctxt "error:purchase.purchase:"
msgid "Analytic account is required on line \"%s\" (%d)!"
-msgstr "Es necessita un compte analític en la línia «%s» (%d)"
-
-msgctxt "error:purchase.purchase:"
-msgid "Invoice addresses must be defined for the quotation."
-msgstr "Es necessita l'adreça de facturació per al pressupost."
-
-msgctxt "error:purchase.purchase:"
-msgid "It misses an \"Account Payable\" on the party \"%s\"!"
-msgstr "Falta el «Compte per pagar» en el tercer «%s»"
-
-msgctxt "field:analytic_account.account,active:"
-msgid "Active"
-msgstr "Activa"
-
-msgctxt "field:analytic_account.account,balance:"
-msgid "Balance"
-msgstr "Balanç"
-
-msgctxt "field:analytic_account.account,childs:"
-msgid "Children"
-msgstr "Fills"
-
-msgctxt "field:analytic_account.account,code:"
-msgid "Code"
-msgstr "Codi"
-
-msgctxt "field:analytic_account.account,company:"
-msgid "Company"
-msgstr "Empresa"
-
-msgctxt "field:analytic_account.account,credit:"
-msgid "Credit"
-msgstr "Haver"
-
-msgctxt "field:analytic_account.account,currency:"
-msgid "Currency"
-msgstr "Divisa"
-
-msgctxt "field:analytic_account.account,currency_digits:"
-msgid "Currency Digits"
-msgstr "Decimals de la divisa"
-
-msgctxt "field:analytic_account.account,debit:"
-msgid "Debit"
-msgstr "Deure"
-
-msgctxt "field:analytic_account.account,display_balance:"
-msgid "Display Balance"
-msgstr "Mostrar balanç"
-
-msgctxt "field:analytic_account.account,mandatory:"
-msgid "Mandatory"
-msgstr "Obligatori"
-
-msgctxt "field:analytic_account.account,name:"
-msgid "Name"
-msgstr "Nom"
-
-msgctxt "field:analytic_account.account,note:"
-msgid "Note"
-msgstr "Nota"
-
-msgctxt "field:analytic_account.account,parent:"
-msgid "Parent"
-msgstr "Pare"
-
-msgctxt "field:analytic_account.account,rec_name:"
-msgid "Name"
-msgstr "Nom"
-
-msgctxt "field:analytic_account.account,root:"
-msgid "Root"
-msgstr "Arrel"
-
-msgctxt "field:analytic_account.account,state:"
-msgid "State"
-msgstr "Estat"
-
-msgctxt "field:analytic_account.account,type:"
-msgid "Type"
-msgstr "Tipus"
-
-msgctxt "field:purchase.line,amount:"
-msgid "Amount"
-msgstr "Quantitat"
+msgstr "És necessari un compte analític en la línia «%s» (%d)."
msgctxt "field:purchase.line,analytic_accounts:"
msgid "Analytic Accounts"
msgstr "Comptes analítics"
-
-msgctxt "field:purchase.line,description:"
-msgid "Description"
-msgstr "Descripció"
-
-msgctxt "field:purchase.line,invoice_lines:"
-msgid "Invoice Lines"
-msgstr "Línies de factura"
-
-msgctxt "field:purchase.line,move_done:"
-msgid "Moves Done"
-msgstr "Moviments acabats"
-
-msgctxt "field:purchase.line,move_exception:"
-msgid "Moves Exception"
-msgstr "Excepció de moviments"
-
-msgctxt "field:purchase.line,moves:"
-msgid "Moves"
-msgstr "Moviments"
-
-msgctxt "field:purchase.line,moves_ignored:"
-msgid "Ignored Moves"
-msgstr "Moviments ignorats"
-
-msgctxt "field:purchase.line,moves_recreated:"
-msgid "Recreated Moves"
-msgstr "Moviments recreats"
-
-msgctxt "field:purchase.line,note:"
-msgid "Note"
-msgstr "Nota"
-
-msgctxt "field:purchase.line,product:"
-msgid "Product"
-msgstr "Producte"
-
-msgctxt "field:purchase.line,purchase:"
-msgid "Purchase"
-msgstr "Compra"
-
-msgctxt "field:purchase.line,quantity:"
-msgid "Quantity"
-msgstr "Quantitat"
-
-msgctxt "field:purchase.line,rec_name:"
-msgid "Name"
-msgstr "Nom"
-
-msgctxt "field:purchase.line,sequence:"
-msgid "Sequence"
-msgstr "Seqüència"
-
-msgctxt "field:purchase.line,taxes:"
-msgid "Taxes"
-msgstr "Impostos"
-
-msgctxt "field:purchase.line,type:"
-msgid "Type"
-msgstr "Tipus"
-
-msgctxt "field:purchase.line,unit:"
-msgid "Unit"
-msgstr "Unitat"
-
-msgctxt "field:purchase.line,unit_digits:"
-msgid "Unit Digits"
-msgstr "Decimals de la unitat"
-
-msgctxt "field:purchase.line,unit_price:"
-msgid "Unit Price"
-msgstr "Preu unitari"
-
-msgctxt "field:purchase.purchase,comment:"
-msgid "Comment"
-msgstr "Comentari"
-
-msgctxt "field:purchase.purchase,company:"
-msgid "Company"
-msgstr "Empresa"
-
-msgctxt "field:purchase.purchase,currency:"
-msgid "Currency"
-msgstr "Divisa"
-
-msgctxt "field:purchase.purchase,currency_digits:"
-msgid "Currency Digits"
-msgstr "Decimals de la divisa"
-
-msgctxt "field:purchase.purchase,description:"
-msgid "Description"
-msgstr "Descripció"
-
-msgctxt "field:purchase.purchase,invoice_address:"
-msgid "Invoice Address"
-msgstr "Adreça de facturació"
-
-msgctxt "field:purchase.purchase,invoice_method:"
-msgid "Invoice Method"
-msgstr "Mètode de facturació"
-
-msgctxt "field:purchase.purchase,invoice_state:"
-msgid "Invoice State"
-msgstr "Estat de factura"
-
-msgctxt "field:purchase.purchase,invoices:"
-msgid "Invoices"
-msgstr "Factures"
-
-msgctxt "field:purchase.purchase,invoices_ignored:"
-msgid "Ignored Invoices"
-msgstr "Factures ignorades"
-
-msgctxt "field:purchase.purchase,invoices_recreated:"
-msgid "Recreated Invoices"
-msgstr "Factures recreades"
-
-msgctxt "field:purchase.purchase,lines:"
-msgid "Lines"
-msgstr "Línies"
-
-msgctxt "field:purchase.purchase,moves:"
-msgid "Moves"
-msgstr "Moviments"
-
-msgctxt "field:purchase.purchase,party:"
-msgid "Party"
-msgstr "Tercer"
-
-msgctxt "field:purchase.purchase,party_lang:"
-msgid "Party Language"
-msgstr "Idioma del tercer"
-
-msgctxt "field:purchase.purchase,payment_term:"
-msgid "Payment Term"
-msgstr "Termini de pagament"
-
-msgctxt "field:purchase.purchase,purchase_date:"
-msgid "Purchase Date"
-msgstr "Data de compra"
-
-msgctxt "field:purchase.purchase,rec_name:"
-msgid "Name"
-msgstr "Nom"
-
-msgctxt "field:purchase.purchase,reference:"
-msgid "Reference"
-msgstr "Referència"
-
-msgctxt "field:purchase.purchase,state:"
-msgid "State"
-msgstr "Estat"
-
-msgctxt "field:purchase.purchase,supplier_reference:"
-msgid "Supplier Reference"
-msgstr "Referència del proveïdor"
-
-msgctxt "field:purchase.purchase,tax_amount:"
-msgid "Tax"
-msgstr "Impost"
-
-msgctxt "field:purchase.purchase,total_amount:"
-msgid "Total"
-msgstr "Total"
-
-msgctxt "field:purchase.purchase,untaxed_amount:"
-msgid "Untaxed"
-msgstr "Sense Impostos"
-
-msgctxt "field:purchase.purchase,warehouse:"
-msgid "Warehouse"
-msgstr "Dipòsit"
-
-msgctxt "model:analytic_account.account,name:"
-msgid "Analytic Account"
-msgstr "Compte analític"
-
-msgctxt "model:purchase.line,name:"
-msgid "Purchase Line"
-msgstr "Línia de compra"
-
-msgctxt "model:purchase.purchase,name:"
-msgid "Purchase"
-msgstr "Compra"
-
-msgctxt "selection:analytic_account.account,display_balance:"
-msgid "Credit - Debit"
-msgstr "Haver - Deure"
-
-msgctxt "selection:analytic_account.account,display_balance:"
-msgid "Debit - Credit"
-msgstr "Deure - Haver"
-
-msgctxt "selection:analytic_account.account,state:"
-msgid "Closed"
-msgstr "Tancat"
-
-msgctxt "selection:analytic_account.account,state:"
-msgid "Draft"
-msgstr "Esborrany"
-
-msgctxt "selection:analytic_account.account,state:"
-msgid "Opened"
-msgstr "Oberta"
-
-msgctxt "selection:analytic_account.account,type:"
-msgid "Normal"
-msgstr "Normal"
-
-msgctxt "selection:analytic_account.account,type:"
-msgid "Root"
-msgstr "Arrel"
-
-msgctxt "selection:analytic_account.account,type:"
-msgid "View"
-msgstr "Vista"
-
-msgctxt "selection:purchase.line,type:"
-msgid "Comment"
-msgstr "Comentari"
-
-msgctxt "selection:purchase.line,type:"
-msgid "Line"
-msgstr "Línia"
-
-msgctxt "selection:purchase.line,type:"
-msgid "Subtotal"
-msgstr "Subtotal"
-
-msgctxt "selection:purchase.line,type:"
-msgid "Title"
-msgstr "Títol"
-
-msgctxt "selection:purchase.purchase,invoice_method:"
-msgid "Based On Order"
-msgstr "Basat en l'ordre"
-
-msgctxt "selection:purchase.purchase,invoice_method:"
-msgid "Based On Shipment"
-msgstr "Basat en l'enviament"
-
-msgctxt "selection:purchase.purchase,invoice_method:"
-msgid "Manual"
-msgstr "Manual"
-
-msgctxt "selection:purchase.purchase,invoice_state:"
-msgid "Exception"
-msgstr "Excepció"
-
-msgctxt "selection:purchase.purchase,invoice_state:"
-msgid "None"
-msgstr "Cap"
-
-msgctxt "selection:purchase.purchase,invoice_state:"
-msgid "Paid"
-msgstr "Pagada"
-
-msgctxt "selection:purchase.purchase,invoice_state:"
-msgid "Waiting"
-msgstr "En espera"
-
-msgctxt "selection:purchase.purchase,state:"
-msgid "Canceled"
-msgstr "Cancel·lada"
-
-msgctxt "selection:purchase.purchase,state:"
-msgid "Confirmed"
-msgstr "Confirmada"
-
-msgctxt "selection:purchase.purchase,state:"
-msgid "Done"
-msgstr "Acabada"
-
-msgctxt "selection:purchase.purchase,state:"
-msgid "Draft"
-msgstr "Esborrany"
-
-msgctxt "selection:purchase.purchase,state:"
-msgid "Quotation"
-msgstr "Pressupost"
diff --git a/locale/es_CO.po b/locale/es_CO.po
index da7f963..1648397 100644
--- a/locale/es_CO.po
+++ b/locale/es_CO.po
@@ -12,7 +12,7 @@ msgstr "Falta una propiedad por defecto \"Account Expense\"!"
msgctxt "error:purchase.line:"
msgid "The supplier location is required!"
-msgstr "Se requiere la localización del proveedor!"
+msgstr "Se requiere la locación del proveedor!"
msgctxt "error:purchase.purchase:"
msgid "Analytic account is required on line \"%s\" (%d)!"
@@ -24,7 +24,7 @@ msgstr "Factura direccionada debe ser definida por el presupuesto."
msgctxt "error:purchase.purchase:"
msgid "It misses an \"Account Payable\" on the party \"%s\"!"
-msgstr "Falta una \"Cuenta Pagadera\" en el tercero \"%s\"!"
+msgstr "Falta una \"Cuenta por Pagar\" en el tercero \"%s\"!"
msgctxt "field:analytic_account.account,active:"
msgid "Active"
@@ -36,7 +36,7 @@ msgstr "Balance"
msgctxt "field:analytic_account.account,childs:"
msgid "Children"
-msgstr "Descendientes"
+msgstr "Hijos"
msgctxt "field:analytic_account.account,code:"
msgid "Code"
@@ -172,7 +172,7 @@ msgstr "Unidad"
msgctxt "field:purchase.line,unit_digits:"
msgid "Unit Digits"
-msgstr "Dígitos de Unidad"
+msgstr "Decimales de Unidad"
msgctxt "field:purchase.line,unit_price:"
msgid "Unit Price"
@@ -240,7 +240,7 @@ msgstr "Idioma del Tercero"
msgctxt "field:purchase.purchase,payment_term:"
msgid "Payment Term"
-msgstr "Término de Pago"
+msgstr "Forma de Pago"
msgctxt "field:purchase.purchase,purchase_date:"
msgid "Purchase Date"
diff --git a/purchase.py b/purchase.py
index 5d1108d..13e8420 100644
--- a/purchase.py
+++ b/purchase.py
@@ -1,93 +1,89 @@
#This file is part of Tryton. The COPYRIGHT file at the top level of
#this repository contains the full copyright notices and license terms.
-from trytond.model import ModelView, ModelSQL, fields
+from trytond.model import fields
from trytond.pyson import Eval
from trytond.transaction import Transaction
-from trytond.pool import Pool
+from trytond.pool import Pool, PoolMeta
+__all__ = ['Purchase', 'PurchaseLine', 'Account']
+__metaclass__ = PoolMeta
-class Purchase(ModelSQL, ModelView):
- _name = "purchase.purchase"
- def __init__(self):
- super(Purchase, self).__init__()
- self._error_messages.update({
+class Purchase:
+ __name__ = "purchase.purchase"
+
+ @classmethod
+ def __setup__(cls):
+ super(Purchase, cls).__setup__()
+ cls._error_messages.update({
'analytic_account_required': 'Analytic account is required ' \
'on line "%s" (%d)!',
})
- def check_for_quotation(self, ids):
- account_selection_obj = Pool().get(
- 'analytic_account.account.selection')
-
- super(Purchase, self).check_for_quotation(ids)
+ def check_for_quotation(self):
+ AccountSelection = Pool().get('analytic_account.account.selection')
- purchases = self.browse(ids)
- for purchase in purchases:
- if not account_selection_obj.check_root(
- [x.analytic_accounts.id for x in purchase.lines
- if x.analytic_accounts.id]):
- for line in purchase.lines:
- if line.type != 'line':
- continue
- if not account_selection_obj.check_root(
- [line.analytic_accounts.id]):
- self.raise_user_error('analytic_account_required',
- (line.rec_name, line.id))
-
-Purchase()
+ super(Purchase, self).check_for_quotation()
+ if not AccountSelection.check_root(
+ [x.analytic_accounts for x in self.lines
+ if x.analytic_accounts]):
+ for line in self.lines:
+ if line.type != 'line':
+ continue
+ if not AccountSelection.check_root([line.analytic_accounts]):
+ self.raise_user_error('analytic_account_required',
+ (line.rec_name, line.id))
-class PurchaseLine(ModelSQL, ModelView):
- _name = 'purchase.line'
+class PurchaseLine:
+ __name__ = 'purchase.line'
analytic_accounts = fields.Many2One('analytic_account.account.selection',
'Analytic Accounts',
states={
'invisible': Eval('type') != 'line',
}, depends=['type'])
- def _view_look_dom_arch(self, tree, type, field_children=None):
- analytic_account_obj = Pool().get('analytic_account.account')
- analytic_account_obj.convert_view(tree)
- arch, fields = super(PurchaseLine, self)._view_look_dom_arch(tree,
+ @classmethod
+ def _view_look_dom_arch(cls, tree, type, field_children=None):
+ AnalyticAccount = Pool().get('analytic_account.account')
+ AnalyticAccount.convert_view(tree)
+ arch, fields = super(PurchaseLine, cls)._view_look_dom_arch(tree,
type, field_children=field_children)
return arch, fields
- def fields_get(self, fields_names=None):
- analytic_account_obj = Pool().get('analytic_account.account')
+ @classmethod
+ def fields_get(cls, fields_names=None):
+ AnalyticAccount = Pool().get('analytic_account.account')
- res = super(PurchaseLine, self).fields_get(fields_names)
+ res = super(PurchaseLine, cls).fields_get(fields_names)
- analytic_accounts_field = super(PurchaseLine, self).fields_get(
+ analytic_accounts_field = super(PurchaseLine, cls).fields_get(
['analytic_accounts'])['analytic_accounts']
- res.update(analytic_account_obj.analytic_accounts_fields_get(
+ res.update(AnalyticAccount.analytic_accounts_fields_get(
analytic_accounts_field, fields_names))
return res
- def default_get(self, fields, with_rec_name=True):
+ @classmethod
+ def default_get(cls, fields, with_rec_name=True):
fields = [x for x in fields if not x.startswith('analytic_account_')]
- return super(PurchaseLine, self).default_get(fields,
+ return super(PurchaseLine, cls).default_get(fields,
with_rec_name=with_rec_name)
- def read(self, ids, fields_names=None):
- int_id = False
- if isinstance(ids, (int, long)):
- int_id = True
- ids = [ids]
-
+ @classmethod
+ def read(cls, ids, fields_names=None):
if fields_names:
fields_names2 = [x for x in fields_names
if not x.startswith('analytic_account_')]
else:
fields_names2 = fields_names
- res = super(PurchaseLine, self).read(ids, fields_names=fields_names2)
+ res = super(PurchaseLine, cls).read(ids, fields_names=fields_names2)
if not fields_names:
- fields_names = list(set(self._columns.keys() \
- + self._inherit_fields.keys()))
+ fields_names = list(set(cls._fields.keys()
+ + cls._inherit_fields.keys()))
root_ids = []
for field in fields_names:
@@ -97,7 +93,7 @@ class PurchaseLine(ModelSQL, ModelView):
id2record = {}
for record in res:
id2record[record['id']] = record
- lines = self.browse(ids)
+ lines = cls.browse(ids)
for line in lines:
for root_id in root_ids:
id2record[line.id]['analytic_account_' \
@@ -115,12 +111,11 @@ class PurchaseLine(ModelSQL, ModelView):
str(account.root.id) + '.'):
ham, field2 = field.split('.', 1)
id2record[line.id][field] = account[field2]
- if int_id:
- return res[0]
return res
- def create(self, vals):
- selection_obj = Pool().get('analytic_account.account.selection')
+ @classmethod
+ def create(cls, vals):
+ Selection = Pool().get('analytic_account.account.selection')
vals = vals.copy()
selection_vals = {}
for field in vals.keys():
@@ -130,17 +125,17 @@ class PurchaseLine(ModelSQL, ModelView):
selection_vals['accounts'].append(('add', vals[field]))
del vals[field]
if vals.get('analytic_accounts'):
- selection_obj.write(vals['analytic_accounts'], selection_vals)
+ Selection.write([Selection(vals['analytic_accounts'])],
+ selection_vals)
elif vals.get('type', 'line') == 'line':
- selection_id = selection_obj.create(selection_vals)
- vals['analytic_accounts'] = selection_id
- return super(PurchaseLine, self).create(vals)
+ selection = Selection.create(selection_vals)
+ vals['analytic_accounts'] = selection.id
+ return super(PurchaseLine, cls).create(vals)
- def write(self, ids, vals):
- selection_obj = Pool().get('analytic_account.account.selection')
+ @classmethod
+ def write(cls, lines, vals):
+ Selection = Pool().get('analytic_account.account.selection')
vals = vals.copy()
- if isinstance(ids, (int, long)):
- ids = [ids]
selection_vals = {}
for field in vals.keys():
if field.startswith('analytic_account_'):
@@ -148,7 +143,6 @@ class PurchaseLine(ModelSQL, ModelView):
selection_vals[root_id] = vals[field]
del vals[field]
if selection_vals:
- lines = self.browse(ids)
for line in lines:
if line.type != 'line':
continue
@@ -156,11 +150,10 @@ class PurchaseLine(ModelSQL, ModelView):
if not line.analytic_accounts:
# Create missing selection
with Transaction().set_user(0):
- selection_id = selection_obj.create({})
- self.write(line.id, {
- 'analytic_accounts': selection_id,
+ selection = Selection.create({})
+ cls.write([line], {
+ 'analytic_accounts': selection.id,
})
- line = self.browse(line.id)
for account in line.analytic_accounts.accounts:
if account.root.id in selection_vals:
value = selection_vals[account.root.id]
@@ -172,88 +165,74 @@ class PurchaseLine(ModelSQL, ModelView):
if account_id \
and account_id not in accounts:
accounts.append(account_id)
- selection_obj.write(line.analytic_accounts.id, {
+ Selection.write([line.analytic_accounts], {
'accounts': [('set', accounts)],
})
- return super(PurchaseLine, self).write(ids, vals)
+ return super(PurchaseLine, cls).write(lines, vals)
- def delete(self, ids):
- selection_obj = Pool().get('analytic_account.account.selection')
+ @classmethod
+ def delete(cls, lines):
+ Selection = Pool().get('analytic_account.account.selection')
- if isinstance(ids, (int, long)):
- ids = [ids]
- selection_ids = []
- lines = self.browse(ids)
+ selections = []
for line in lines:
if line.analytic_accounts:
- selection_ids.append(line.analytic_accounts.id)
-
- res = super(PurchaseLine, self).delete(ids)
- selection_obj.delete(selection_ids)
- return res
+ selections.append(line.analytic_accounts)
- def copy(self, ids, default=None):
- selection_obj = Pool().get('analytic_account.account.selection')
+ super(PurchaseLine, cls).delete(lines)
+ Selection.delete(selections)
- new_ids = super(PurchaseLine, self).copy(ids, default=default)
+ @classmethod
+ def copy(cls, lines, default=None):
+ Selection = Pool().get('analytic_account.account.selection')
- int_id = False
- if isinstance(new_ids, (int, long)):
- int_id = True
- new_ids = [new_ids]
+ new_lines = super(PurchaseLine, cls).copy(lines, default=default)
- for line in self.browse(new_ids):
+ for line in lines:
if line.analytic_accounts:
- selection_id = selection_obj.copy(line.analytic_accounts.id)
- self.write(line.id, {
- 'analytic_accounts': selection_id,
+ selection, = Selection.copy([line.analytic_accounts])
+ cls.write([line], {
+ 'analytic_accounts': selection.id,
})
+ return new_lines
- if int_id:
- return new_ids[0]
- return new_ids
-
- def get_invoice_line(self, line):
- pool = Pool()
- account_selection_obj = pool.get('analytic_account.account.selection')
+ def get_invoice_line(self, invoice_type):
+ AccountSelection = Pool().get('analytic_account.account.selection')
- res = super(PurchaseLine, self).get_invoice_line(line)
- if not res:
- return res
-
- selection_id = False
- if line.analytic_accounts:
- selection_id = account_selection_obj.copy(
- line.analytic_accounts.id)
- for vals in res:
- vals['analytic_accounts'] = selection_id
- return res
+ invoice_lines = super(PurchaseLine, self).get_invoice_line(
+ invoice_type)
+ if not invoice_lines:
+ return invoice_lines
-PurchaseLine()
+ selection = None
+ if self.analytic_accounts:
+ selection, = AccountSelection.copy([self.analytic_accounts])
+ for invoice_line in invoice_lines:
+ invoice_line.analytic_accounts = selection
+ return invoice_lines
-class Account(ModelSQL, ModelView):
- _name = 'analytic_account.account'
+class Account:
+ __name__ = 'analytic_account.account'
- def delete(self, ids):
- purchase_line_obj = Pool().get('purchase.line')
- res = super(Account, self).delete(ids)
+ @classmethod
+ def delete(cls, accounts):
+ PurchaseLine = Pool().get('purchase.line')
+ super(Account, cls).delete(accounts)
# Restart the cache on the fields_view_get method of purchase.line
- purchase_line_obj.fields_view_get.reset()
- return res
+ PurchaseLine._fields_view_get_cache.clear()
- def create(self, vals):
- purchase_line_obj = Pool().get('purchase.line')
- res = super(Account, self).create(vals)
+ @classmethod
+ def create(cls, vals):
+ PurchaseLine = Pool().get('purchase.line')
+ account = super(Account, cls).create(vals)
# Restart the cache on the fields_view_get method of purchase.line
- purchase_line_obj.fields_view_get.reset()
- return res
+ PurchaseLine._fields_view_get_cache.clear()
+ return account
- def write(self, ids, vals):
- purchase_line_obj = Pool().get('purchase.line')
- res = super(Account, self).write(ids, vals)
+ @classmethod
+ def write(cls, accounts, vals):
+ PurchaseLine = Pool().get('purchase.line')
+ super(Account, cls).write(accounts, vals)
# Restart the cache on the fields_view_get method of purchase.line
- purchase_line_obj.fields_view_get.reset()
- return res
-
-Account()
+ PurchaseLine._fields_view_get_cache.clear()
diff --git a/setup.py b/setup.py
index 9b817af..86af905 100644
--- a/setup.py
+++ b/setup.py
@@ -4,8 +4,19 @@
from setuptools import setup
import re
+import os
+import ConfigParser
-info = eval(open('__tryton__.py').read())
+
+def read(fname):
+ return open(os.path.join(os.path.dirname(__file__), fname)).read()
+
+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)
major_version = int(major_version)
minor_version = int(minor_version)
@@ -21,21 +32,21 @@ requires.append('trytond >= %s.%s, < %s.%s' %
setup(name='trytond_analytic_purchase',
version=info.get('version', '0.0.1'),
- description=info.get('description', ''),
- author=info.get('author', ''),
- author_email=info.get('email', ''),
- url=info.get('website', ''),
+ description='Tryton module to add analytic accounting on purchase',
+ long_description=read('README'),
+ author='Tryton',
+ url='http://www.tryton.org/',
download_url="http://downloads.tryton.org/" + \
- info.get('version', '0.0.1').rsplit('.', 1)[0] + '/',
+ info.get('version', '0.0.1').rsplit('.', 1)[0] + '/',
package_dir={'trytond.modules.analytic_purchase': '.'},
packages=[
'trytond.modules.analytic_purchase',
'trytond.modules.analytic_purchase.tests',
- ],
+ ],
package_data={
'trytond.modules.analytic_purchase': info.get('xml', []) \
- + info.get('translation', []),
- },
+ + ['tryton.cfg', 'locale/*.po'],
+ },
classifiers=[
'Development Status :: 5 - Production/Stable',
'Environment :: Plugins',
@@ -57,7 +68,7 @@ setup(name='trytond_analytic_purchase',
'Programming Language :: Python :: 2.7',
'Topic :: Office/Business',
'Topic :: Office/Business :: Financial :: Accounting',
- ],
+ ],
license='GPL-3',
install_requires=requires,
zip_safe=False,
@@ -67,4 +78,4 @@ setup(name='trytond_analytic_purchase',
""",
test_suite='tests',
test_loader='trytond.test_loader:Loader',
-)
+ )
diff --git a/tryton.cfg b/tryton.cfg
new file mode 100644
index 0000000..850ab19
--- /dev/null
+++ b/tryton.cfg
@@ -0,0 +1,8 @@
+[tryton]
+version=2.6.0
+depends:
+ analytic_account
+ analytic_invoice
+ purchase
+xml:
+ purchase.xml
diff --git a/trytond_analytic_purchase.egg-info/PKG-INFO b/trytond_analytic_purchase.egg-info/PKG-INFO
index 5c431de..7d8af17 100644
--- a/trytond_analytic_purchase.egg-info/PKG-INFO
+++ b/trytond_analytic_purchase.egg-info/PKG-INFO
@@ -1,14 +1,48 @@
Metadata-Version: 1.0
Name: trytond-analytic-purchase
-Version: 2.4.2
-Summary: Add analytic account on purchase lines.
-
+Version: 2.6.0
+Summary: Tryton module to add analytic accounting on purchase
Home-page: http://www.tryton.org/
-Author: B2CK
-Author-email: info at b2ck.com
+Author: Tryton
+Author-email: UNKNOWN
License: GPL-3
-Download-URL: http://downloads.tryton.org/2.4/
-Description: UNKNOWN
+Download-URL: http://downloads.tryton.org/2.6/
+Description: trytond_analytic_purchase
+ =========================
+
+ The analytic_purchase module of the Tryton application platform.
+
+ Installing
+ ----------
+
+ See INSTALL
+
+ Support
+ -------
+
+ If you encounter any problems with Tryton, please don't hesitate to ask
+ questions on the Tryton bug tracker, mailing list, wiki or IRC channel:
+
+ http://bugs.tryton.org/
+ http://groups.tryton.org/
+ http://wiki.tryton.org/
+ irc://irc.freenode.net/tryton
+
+ License
+ -------
+
+ See LICENSE
+
+ Copyright
+ ---------
+
+ See COPYRIGHT
+
+
+ For more information please visit the Tryton web site:
+
+ http://www.tryton.org/
+
Platform: UNKNOWN
Classifier: Development Status :: 5 - Production/Stable
Classifier: Environment :: Plugins
diff --git a/trytond_analytic_purchase.egg-info/SOURCES.txt b/trytond_analytic_purchase.egg-info/SOURCES.txt
index b64fd4d..15f101a 100644
--- a/trytond_analytic_purchase.egg-info/SOURCES.txt
+++ b/trytond_analytic_purchase.egg-info/SOURCES.txt
@@ -6,8 +6,8 @@ MANIFEST.in
README
purchase.xml
setup.py
+tryton.cfg
./__init__.py
-./__tryton__.py
./purchase.py
./tests/__init__.py
./tests/test_analytic_purchase.py
diff --git a/trytond_analytic_purchase.egg-info/requires.txt b/trytond_analytic_purchase.egg-info/requires.txt
index be3c5bb..3f7a2b8 100644
--- a/trytond_analytic_purchase.egg-info/requires.txt
+++ b/trytond_analytic_purchase.egg-info/requires.txt
@@ -1,4 +1,4 @@
-trytond_purchase >= 2.4, < 2.5
-trytond_analytic_account >= 2.4, < 2.5
-trytond_analytic_invoice >= 2.4, < 2.5
-trytond >= 2.4, < 2.5
\ No newline at end of file
+trytond_analytic_account >= 2.6, < 2.7
+trytond_analytic_invoice >= 2.6, < 2.7
+trytond_purchase >= 2.6, < 2.7
+trytond >= 2.6, < 2.7
\ No newline at end of file
commit 82526f655892010715f17d9f17adbf6c3221209a
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Tue Sep 11 13:25:49 2012 +0200
Adding upstream version 2.4.2.
diff --git a/CHANGELOG b/CHANGELOG
index dc330ba..c3ffbfc 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+Version 2.4.2 - 2012-09-02
+* Bug fixes (see mercurial logs for details)
+
Version 2.4.1 - 2012-04-24
* Restore es_AR translation
diff --git a/PKG-INFO b/PKG-INFO
index f599716..2f74806 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
Metadata-Version: 1.0
Name: trytond_analytic_purchase
-Version: 2.4.1
+Version: 2.4.2
Summary: Add analytic account on purchase lines.
Home-page: http://www.tryton.org/
diff --git a/__tryton__.py b/__tryton__.py
index bba5c24..91fd2c1 100644
--- a/__tryton__.py
+++ b/__tryton__.py
@@ -9,7 +9,7 @@
'name_es_CO': 'Compra Analítica',
'name_es_ES': 'Compra analítica',
'name_fr_FR': 'Achat analytique',
- 'version': '2.4.1',
+ 'version': '2.4.2',
'author': 'B2CK',
'email': 'info at b2ck.com',
'website': 'http://www.tryton.org/',
diff --git a/purchase.py b/purchase.py
index 98541c5..5d1108d 100644
--- a/purchase.py
+++ b/purchase.py
@@ -16,24 +16,24 @@ class Purchase(ModelSQL, ModelView):
'on line "%s" (%d)!',
})
- def check_for_quotation(self, purchase_id):
+ def check_for_quotation(self, ids):
account_selection_obj = Pool().get(
'analytic_account.account.selection')
- res = super(Purchase, self).check_for_quotation(purchase_id)
-
- purchase = self.browse(purchase_id)
- if not account_selection_obj.check_root(
- [x.analytic_accounts.id for x in purchase.lines
- if x.analytic_accounts.id]):
- for line in purchase.lines:
- if line.type != 'line':
- continue
- if not account_selection_obj.check_root(
- [line.analytic_accounts.id]):
- self.raise_user_error('analytic_account_required',
- (line.rec_name, line.id))
- return res
+ super(Purchase, self).check_for_quotation(ids)
+
+ purchases = self.browse(ids)
+ for purchase in purchases:
+ if not account_selection_obj.check_root(
+ [x.analytic_accounts.id for x in purchase.lines
+ if x.analytic_accounts.id]):
+ for line in purchase.lines:
+ if line.type != 'line':
+ continue
+ if not account_selection_obj.check_root(
+ [line.analytic_accounts.id]):
+ self.raise_user_error('analytic_account_required',
+ (line.rec_name, line.id))
Purchase()
diff --git a/trytond_analytic_purchase.egg-info/PKG-INFO b/trytond_analytic_purchase.egg-info/PKG-INFO
index 4618211..5c431de 100644
--- a/trytond_analytic_purchase.egg-info/PKG-INFO
+++ b/trytond_analytic_purchase.egg-info/PKG-INFO
@@ -1,6 +1,6 @@
Metadata-Version: 1.0
Name: trytond-analytic-purchase
-Version: 2.4.1
+Version: 2.4.2
Summary: Add analytic account on purchase lines.
Home-page: http://www.tryton.org/
commit 3ab7eb5fea9c6852052a03805986f8df80bc2374
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Wed Apr 25 11:03:29 2012 +0200
Adding upstream version 2.4.1.
diff --git a/CHANGELOG b/CHANGELOG
index 875c8bf..dc330ba 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+Version 2.4.1 - 2012-04-24
+* Restore es_AR translation
+
Version 2.4.0 - 2012-04-23
* Bug fixes (see mercurial logs for details)
diff --git a/PKG-INFO b/PKG-INFO
index 78fd5b9..f599716 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
Metadata-Version: 1.0
Name: trytond_analytic_purchase
-Version: 2.4.0
+Version: 2.4.1
Summary: Add analytic account on purchase lines.
Home-page: http://www.tryton.org/
diff --git a/__tryton__.py b/__tryton__.py
index 14f1558..bba5c24 100644
--- a/__tryton__.py
+++ b/__tryton__.py
@@ -9,7 +9,7 @@
'name_es_CO': 'Compra Analítica',
'name_es_ES': 'Compra analítica',
'name_fr_FR': 'Achat analytique',
- 'version': '2.4.0',
+ 'version': '2.4.1',
'author': 'B2CK',
'email': 'info at b2ck.com',
'website': 'http://www.tryton.org/',
diff --git a/locale/es_AR.po b/locale/es_AR.po
index 542f292..b37346e 100644
--- a/locale/es_AR.po
+++ b/locale/es_AR.po
@@ -1,3 +1,387 @@
#
msgid ""
msgstr "Content-Type: text/plain; charset=utf-8\n"
+
+msgctxt "error:analytic_account.account:"
+msgid "You can not create recursive accounts!"
+msgstr "¡No puede crear cuentas recursivas!"
+
+msgctxt "error:purchase.line:"
+msgid "It misses an \"Account Expense\" on product \"%s\"!"
+msgstr "¡Falta la propiedad «Cuenta de gastos» en el producto «%s»!"
+
+msgctxt "error:purchase.line:"
+msgid "The supplier location is required!"
+msgstr "¡Se necesita la ubicación del proveedor!"
+
+msgctxt "error:purchase.purchase:"
+msgid "Analytic account is required on line \"%s\" (%d)!"
+msgstr "¡Se necesita una cuenta analítica en la línea «%s» (%d)!"
+
+msgctxt "error:purchase.purchase:"
+msgid "Invoice addresses must be defined for the quotation."
+msgstr "Se necesita la dirección de facturación para el presupuesto."
+
+msgctxt "error:purchase.purchase:"
+msgid "It misses an \"Account Payable\" on the party \"%s\"!"
+msgstr "¡Falta una «Cuenta por pagar» en la entidad «%s»!"
+
+msgctxt "field:analytic_account.account,active:"
+msgid "Active"
+msgstr "Activa"
+
+msgctxt "field:analytic_account.account,balance:"
+msgid "Balance"
+msgstr "Balance"
+
+msgctxt "field:analytic_account.account,childs:"
+msgid "Children"
+msgstr "Hijos"
+
+msgctxt "field:analytic_account.account,code:"
+msgid "Code"
+msgstr "Código"
+
+msgctxt "field:analytic_account.account,company:"
+msgid "Company"
+msgstr "Empresa"
+
+msgctxt "field:analytic_account.account,credit:"
+msgid "Credit"
+msgstr "Haber"
+
+msgctxt "field:analytic_account.account,currency:"
+msgid "Currency"
+msgstr "Divisa"
+
+msgctxt "field:analytic_account.account,currency_digits:"
+msgid "Currency Digits"
+msgstr "Decimales de la divisa"
+
+msgctxt "field:analytic_account.account,debit:"
+msgid "Debit"
+msgstr "Debe"
+
+msgctxt "field:analytic_account.account,display_balance:"
+msgid "Display Balance"
+msgstr "Mostrar balance"
+
+msgctxt "field:analytic_account.account,mandatory:"
+msgid "Mandatory"
+msgstr "Obligatorio"
+
+msgctxt "field:analytic_account.account,name:"
+msgid "Name"
+msgstr "Nombre"
+
+msgctxt "field:analytic_account.account,note:"
+msgid "Note"
+msgstr "Nota"
+
+msgctxt "field:analytic_account.account,parent:"
+msgid "Parent"
+msgstr "Padre"
+
+msgctxt "field:analytic_account.account,rec_name:"
+msgid "Name"
+msgstr "Nombre"
+
+msgctxt "field:analytic_account.account,root:"
+msgid "Root"
+msgstr "Raíz"
+
+msgctxt "field:analytic_account.account,state:"
+msgid "State"
+msgstr "Estado"
+
+msgctxt "field:analytic_account.account,type:"
+msgid "Type"
+msgstr "Tipo"
+
+msgctxt "field:purchase.line,amount:"
+msgid "Amount"
+msgstr "Cantidad"
+
+msgctxt "field:purchase.line,analytic_accounts:"
+msgid "Analytic Accounts"
+msgstr "Cuentas analíticas"
+
+msgctxt "field:purchase.line,description:"
+msgid "Description"
+msgstr "Descripción"
+
+msgctxt "field:purchase.line,invoice_lines:"
+msgid "Invoice Lines"
+msgstr "Líneas de factura"
+
+msgctxt "field:purchase.line,move_done:"
+msgid "Moves Done"
+msgstr "Movimientos terminados"
+
+msgctxt "field:purchase.line,move_exception:"
+msgid "Moves Exception"
+msgstr "Exepción de movimientos"
+
+msgctxt "field:purchase.line,moves:"
+msgid "Moves"
+msgstr "Movimientos"
+
+msgctxt "field:purchase.line,moves_ignored:"
+msgid "Ignored Moves"
+msgstr "Movimientos ignorados"
+
+msgctxt "field:purchase.line,moves_recreated:"
+msgid "Recreated Moves"
+msgstr "Movimientos recreados"
+
+msgctxt "field:purchase.line,note:"
+msgid "Note"
+msgstr "Nota"
+
+msgctxt "field:purchase.line,product:"
+msgid "Product"
+msgstr "Producto"
+
+msgctxt "field:purchase.line,purchase:"
+msgid "Purchase"
+msgstr "Compra"
+
+msgctxt "field:purchase.line,quantity:"
+msgid "Quantity"
+msgstr "Cantidad"
+
+msgctxt "field:purchase.line,rec_name:"
+msgid "Name"
+msgstr "Nombre"
+
+msgctxt "field:purchase.line,sequence:"
+msgid "Sequence"
+msgstr "Secuencia"
+
+msgctxt "field:purchase.line,taxes:"
+msgid "Taxes"
+msgstr "Impuestos"
+
+msgctxt "field:purchase.line,type:"
+msgid "Type"
+msgstr "Tipo"
+
+msgctxt "field:purchase.line,unit:"
+msgid "Unit"
+msgstr "Unidad"
+
+msgctxt "field:purchase.line,unit_digits:"
+msgid "Unit Digits"
+msgstr "Decimales de la unidad"
+
+msgctxt "field:purchase.line,unit_price:"
+msgid "Unit Price"
+msgstr "Precio unitario"
+
+msgctxt "field:purchase.purchase,comment:"
+msgid "Comment"
+msgstr "Comentario"
+
+msgctxt "field:purchase.purchase,company:"
+msgid "Company"
+msgstr "Empresa"
+
+msgctxt "field:purchase.purchase,currency:"
+msgid "Currency"
+msgstr "Divisa"
+
+msgctxt "field:purchase.purchase,currency_digits:"
+msgid "Currency Digits"
+msgstr "Decimales de la divisa"
+
+msgctxt "field:purchase.purchase,description:"
+msgid "Description"
+msgstr "Descripción"
+
+msgctxt "field:purchase.purchase,invoice_address:"
+msgid "Invoice Address"
+msgstr "Dirección de facturación"
+
+msgctxt "field:purchase.purchase,invoice_method:"
+msgid "Invoice Method"
+msgstr "Método de facturación"
+
+msgctxt "field:purchase.purchase,invoice_state:"
+msgid "Invoice State"
+msgstr "Estado de factura"
+
+msgctxt "field:purchase.purchase,invoices:"
+msgid "Invoices"
+msgstr "Facturas"
+
+msgctxt "field:purchase.purchase,invoices_ignored:"
+msgid "Ignored Invoices"
+msgstr "Facturas ignoradas"
+
+msgctxt "field:purchase.purchase,invoices_recreated:"
+msgid "Recreated Invoices"
+msgstr "Facturas recreadas"
+
+msgctxt "field:purchase.purchase,lines:"
+msgid "Lines"
+msgstr "Líneas"
+
+msgctxt "field:purchase.purchase,moves:"
+msgid "Moves"
+msgstr "Movimientos"
+
+msgctxt "field:purchase.purchase,party:"
+msgid "Party"
+msgstr "Entidad"
+
+msgctxt "field:purchase.purchase,party_lang:"
+msgid "Party Language"
+msgstr "Idioma de la entidad"
+
+msgctxt "field:purchase.purchase,payment_term:"
+msgid "Payment Term"
+msgstr "Plazo de pago"
+
+msgctxt "field:purchase.purchase,purchase_date:"
+msgid "Purchase Date"
+msgstr "Fecha de compra"
+
+msgctxt "field:purchase.purchase,rec_name:"
+msgid "Name"
+msgstr "Nombre"
+
+msgctxt "field:purchase.purchase,reference:"
+msgid "Reference"
+msgstr "Referencia"
+
+msgctxt "field:purchase.purchase,state:"
+msgid "State"
+msgstr "Estado"
+
+msgctxt "field:purchase.purchase,supplier_reference:"
+msgid "Supplier Reference"
+msgstr "Referencia del proveedor"
+
+msgctxt "field:purchase.purchase,tax_amount:"
+msgid "Tax"
+msgstr "Impuesto"
+
+msgctxt "field:purchase.purchase,total_amount:"
+msgid "Total"
+msgstr "Total"
+
+msgctxt "field:purchase.purchase,untaxed_amount:"
+msgid "Untaxed"
+msgstr "Sin Impuestos"
+
+msgctxt "field:purchase.purchase,warehouse:"
+msgid "Warehouse"
+msgstr "Depósito"
+
+msgctxt "model:analytic_account.account,name:"
+msgid "Analytic Account"
+msgstr "Cuenta analítica"
+
+msgctxt "model:purchase.line,name:"
+msgid "Purchase Line"
+msgstr "Línea de compra"
+
+msgctxt "model:purchase.purchase,name:"
+msgid "Purchase"
+msgstr "Compra"
+
+msgctxt "selection:analytic_account.account,display_balance:"
+msgid "Credit - Debit"
+msgstr "Haber - Debe"
+
+msgctxt "selection:analytic_account.account,display_balance:"
+msgid "Debit - Credit"
+msgstr "Debe - Haber"
+
+msgctxt "selection:analytic_account.account,state:"
+msgid "Closed"
+msgstr "Cerrado"
+
+msgctxt "selection:analytic_account.account,state:"
+msgid "Draft"
+msgstr "Borrador"
+
+msgctxt "selection:analytic_account.account,state:"
+msgid "Opened"
+msgstr "Abierta"
+
+msgctxt "selection:analytic_account.account,type:"
+msgid "Normal"
+msgstr "Normal"
+
+msgctxt "selection:analytic_account.account,type:"
+msgid "Root"
+msgstr "Raíz"
+
+msgctxt "selection:analytic_account.account,type:"
+msgid "View"
+msgstr "Vista"
+
+msgctxt "selection:purchase.line,type:"
+msgid "Comment"
+msgstr "Comentario"
+
+msgctxt "selection:purchase.line,type:"
+msgid "Line"
+msgstr "Línea"
+
+msgctxt "selection:purchase.line,type:"
+msgid "Subtotal"
+msgstr "Subtotal"
+
+msgctxt "selection:purchase.line,type:"
+msgid "Title"
+msgstr "Título"
+
+msgctxt "selection:purchase.purchase,invoice_method:"
+msgid "Based On Order"
+msgstr "Basado en la orden"
+
+msgctxt "selection:purchase.purchase,invoice_method:"
+msgid "Based On Shipment"
+msgstr "Basado en el envío"
+
+msgctxt "selection:purchase.purchase,invoice_method:"
+msgid "Manual"
+msgstr "Manual"
+
+msgctxt "selection:purchase.purchase,invoice_state:"
+msgid "Exception"
+msgstr "Excepción"
+
+msgctxt "selection:purchase.purchase,invoice_state:"
+msgid "None"
+msgstr "Ninguno"
+
+msgctxt "selection:purchase.purchase,invoice_state:"
+msgid "Paid"
+msgstr "Pagada"
+
+msgctxt "selection:purchase.purchase,invoice_state:"
+msgid "Waiting"
+msgstr "En espera"
+
+msgctxt "selection:purchase.purchase,state:"
+msgid "Canceled"
+msgstr "Cancelada"
+
+msgctxt "selection:purchase.purchase,state:"
+msgid "Confirmed"
+msgstr "Confirmada"
+
+msgctxt "selection:purchase.purchase,state:"
+msgid "Done"
+msgstr "Terminada"
+
+msgctxt "selection:purchase.purchase,state:"
+msgid "Draft"
+msgstr "Borrador"
+
+msgctxt "selection:purchase.purchase,state:"
+msgid "Quotation"
+msgstr "Presupuesto"
diff --git a/trytond_analytic_purchase.egg-info/PKG-INFO b/trytond_analytic_purchase.egg-info/PKG-INFO
index 6a075c4..4618211 100644
--- a/trytond_analytic_purchase.egg-info/PKG-INFO
+++ b/trytond_analytic_purchase.egg-info/PKG-INFO
@@ -1,6 +1,6 @@
Metadata-Version: 1.0
Name: trytond-analytic-purchase
-Version: 2.4.0
+Version: 2.4.1
Summary: Add analytic account on purchase lines.
Home-page: http://www.tryton.org/
commit 9a5d882b7d3c5beb780bd5ebc7a711e9da287cbd
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Tue Apr 24 19:30:38 2012 +0200
Adding upstream version 2.4.0.
diff --git a/CHANGELOG b/CHANGELOG
index 905eea5..875c8bf 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+Version 2.4.0 - 2012-04-23
+* Bug fixes (see mercurial logs for details)
+
Version 2.2.0 - 2011-10-24
* Bug fixes (see mercurial logs for details)
diff --git a/COPYRIGHT b/COPYRIGHT
index 3d2324b..2057c72 100644
--- a/COPYRIGHT
+++ b/COPYRIGHT
@@ -1,6 +1,6 @@
-Copyright (C) 2008-2011 Cédric Krier.
-Copyright (C) 2008-2011 Bertrand Chenal.
-Copyright (C) 2008-2011 B2CK SPRL.
+Copyright (C) 2008-2012 Cédric Krier.
+Copyright (C) 2008-2012 Bertrand Chenal.
+Copyright (C) 2008-2012 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/INSTALL b/INSTALL
index 8dba8f4..2527253 100644
--- a/INSTALL
+++ b/INSTALL
@@ -4,7 +4,7 @@ Installing trytond_analytic_purchase
Prerequisites
-------------
- * Python 2.5 or later (http://www.python.org/)
+ * Python 2.6 or later (http://www.python.org/)
* trytond (http://www.tryton.org/)
* trytond_analytic_account (http://www.tryton.org/)
* trytond_analytic_invoice (http://www.tryton.org/)
diff --git a/PKG-INFO b/PKG-INFO
index adecbf0..78fd5b9 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,13 +1,13 @@
Metadata-Version: 1.0
Name: trytond_analytic_purchase
-Version: 2.2.0
+Version: 2.4.0
Summary: Add analytic account on purchase lines.
Home-page: http://www.tryton.org/
Author: B2CK
Author-email: info at b2ck.com
License: GPL-3
-Download-URL: http://downloads.tryton.org/2.2/
+Download-URL: http://downloads.tryton.org/2.4/
Description: UNKNOWN
Platform: UNKNOWN
Classifier: Development Status :: 5 - Production/Stable
diff --git a/__init__.py b/__init__.py
index 5720822..5338213 100644
--- a/__init__.py
+++ b/__init__.py
@@ -1,4 +1,4 @@
#This file is part of Tryton. The COPYRIGHT file at the top level of
#this repository contains the full copyright notices and license terms.
-from purchase import *
+from .purchase import *
diff --git a/__tryton__.py b/__tryton__.py
index 087d44b..14f1558 100644
--- a/__tryton__.py
+++ b/__tryton__.py
@@ -3,11 +3,13 @@
{
'name': 'Analytic Purchase',
'name_bg_BG': 'Аналитични покупки',
+ 'name_ca_ES': 'Compra analítica',
'name_de_DE': 'Kostenstellen Einkauf',
+ 'name_es_AR': 'Compra Analítica',
'name_es_CO': 'Compra Analítica',
'name_es_ES': 'Compra analítica',
'name_fr_FR': 'Achat analytique',
- 'version': '2.2.0',
+ 'version': '2.4.0',
'author': 'B2CK',
'email': 'info at b2ck.com',
'website': 'http://www.tryton.org/',
@@ -15,11 +17,16 @@
''',
'description_bg_BG': '''Добавя аналитична сметка към редовете на покупка
''',
+ 'description_ca_ES': '''Afegeix comptabilitat analítica a les línies de les
+comandes de compra.''',
'description_de_DE': '''Fügt kostenstellen zu Einkaufspositionen hinzu
''',
+ 'description_es_AR': '''Añade contabilidad analítica a las líneas de compra.
+''',
'description_es_CO': '''Adiciona contabilidad analítica a las líneas de compra.
''',
- 'description_es_ES': 'Añade contabilidad analítica a las líneas de compra.',
+ 'description_es_ES': '''Añade contabilidad analítica a las líneas de los
+pedidos de compra.''',
'description_fr_FR': 'Ajoute la comptabilité analytique sur les lignes d\'achat.',
'depends': [
'purchase',
@@ -31,8 +38,10 @@
],
'translation': [
'locale/bg_BG.po',
+ 'locale/ca_ES.po',
'locale/cs_CZ.po',
'locale/de_DE.po',
+ 'locale/es_AR.po',
'locale/es_CO.po',
'locale/es_ES.po',
'locale/fr_FR.po',
diff --git a/locale/bg_BG.po b/locale/bg_BG.po
index 34bd171..ee69623 100644
--- a/locale/bg_BG.po
+++ b/locale/bg_BG.po
@@ -2,10 +2,10 @@
msgid ""
msgstr "Content-Type: text/plain; charset=utf-8\n"
-msgctxt "error:purchase.purchase:0"
+msgctxt "error:purchase.purchase:"
msgid "Analytic account is required on line \"%s\" (%d)!"
msgstr "Аналитична сметка е необходима за ред \"%s\" (%d)!"
-msgctxt "field:purchase.line,analytic_accounts:0"
+msgctxt "field:purchase.line,analytic_accounts:"
msgid "Analytic Accounts"
msgstr "Аналитични сметки"
diff --git a/locale/ca_ES.po b/locale/ca_ES.po
new file mode 100644
index 0000000..26543e3
--- /dev/null
+++ b/locale/ca_ES.po
@@ -0,0 +1,387 @@
+#
+msgid ""
+msgstr "Content-Type: text/plain; charset=utf-8\n"
+
+msgctxt "error:analytic_account.account:"
+msgid "You can not create recursive accounts!"
+msgstr "No pot crear comptes recursius"
+
+msgctxt "error:purchase.line:"
+msgid "It misses an \"Account Expense\" on product \"%s\"!"
+msgstr "Falta el «Compte de despeses» en el producte «%s»"
+
+msgctxt "error:purchase.line:"
+msgid "The supplier location is required!"
+msgstr "Es necessita la ubicació del proveïdor"
+
+msgctxt "error:purchase.purchase:"
+msgid "Analytic account is required on line \"%s\" (%d)!"
+msgstr "Es necessita un compte analític en la línia «%s» (%d)"
+
+msgctxt "error:purchase.purchase:"
+msgid "Invoice addresses must be defined for the quotation."
+msgstr "Es necessita l'adreça de facturació per al pressupost."
+
+msgctxt "error:purchase.purchase:"
+msgid "It misses an \"Account Payable\" on the party \"%s\"!"
+msgstr "Falta el «Compte per pagar» en el tercer «%s»"
+
+msgctxt "field:analytic_account.account,active:"
+msgid "Active"
+msgstr "Activa"
+
+msgctxt "field:analytic_account.account,balance:"
+msgid "Balance"
+msgstr "Balanç"
+
+msgctxt "field:analytic_account.account,childs:"
+msgid "Children"
+msgstr "Fills"
+
+msgctxt "field:analytic_account.account,code:"
+msgid "Code"
+msgstr "Codi"
+
+msgctxt "field:analytic_account.account,company:"
+msgid "Company"
+msgstr "Empresa"
+
+msgctxt "field:analytic_account.account,credit:"
+msgid "Credit"
+msgstr "Haver"
+
+msgctxt "field:analytic_account.account,currency:"
+msgid "Currency"
+msgstr "Divisa"
+
+msgctxt "field:analytic_account.account,currency_digits:"
+msgid "Currency Digits"
+msgstr "Decimals de la divisa"
+
+msgctxt "field:analytic_account.account,debit:"
+msgid "Debit"
+msgstr "Deure"
+
+msgctxt "field:analytic_account.account,display_balance:"
+msgid "Display Balance"
+msgstr "Mostrar balanç"
+
+msgctxt "field:analytic_account.account,mandatory:"
+msgid "Mandatory"
+msgstr "Obligatori"
+
+msgctxt "field:analytic_account.account,name:"
+msgid "Name"
+msgstr "Nom"
+
+msgctxt "field:analytic_account.account,note:"
+msgid "Note"
+msgstr "Nota"
+
+msgctxt "field:analytic_account.account,parent:"
+msgid "Parent"
+msgstr "Pare"
+
+msgctxt "field:analytic_account.account,rec_name:"
+msgid "Name"
+msgstr "Nom"
+
+msgctxt "field:analytic_account.account,root:"
+msgid "Root"
+msgstr "Arrel"
+
+msgctxt "field:analytic_account.account,state:"
+msgid "State"
+msgstr "Estat"
+
+msgctxt "field:analytic_account.account,type:"
+msgid "Type"
+msgstr "Tipus"
+
+msgctxt "field:purchase.line,amount:"
+msgid "Amount"
+msgstr "Quantitat"
+
+msgctxt "field:purchase.line,analytic_accounts:"
+msgid "Analytic Accounts"
+msgstr "Comptes analítics"
+
+msgctxt "field:purchase.line,description:"
+msgid "Description"
+msgstr "Descripció"
+
+msgctxt "field:purchase.line,invoice_lines:"
+msgid "Invoice Lines"
+msgstr "Línies de factura"
+
+msgctxt "field:purchase.line,move_done:"
+msgid "Moves Done"
+msgstr "Moviments acabats"
+
+msgctxt "field:purchase.line,move_exception:"
+msgid "Moves Exception"
+msgstr "Excepció de moviments"
+
+msgctxt "field:purchase.line,moves:"
+msgid "Moves"
+msgstr "Moviments"
+
+msgctxt "field:purchase.line,moves_ignored:"
+msgid "Ignored Moves"
+msgstr "Moviments ignorats"
+
+msgctxt "field:purchase.line,moves_recreated:"
+msgid "Recreated Moves"
+msgstr "Moviments recreats"
+
+msgctxt "field:purchase.line,note:"
+msgid "Note"
+msgstr "Nota"
+
+msgctxt "field:purchase.line,product:"
+msgid "Product"
+msgstr "Producte"
+
+msgctxt "field:purchase.line,purchase:"
+msgid "Purchase"
+msgstr "Compra"
+
+msgctxt "field:purchase.line,quantity:"
+msgid "Quantity"
+msgstr "Quantitat"
+
+msgctxt "field:purchase.line,rec_name:"
+msgid "Name"
+msgstr "Nom"
+
+msgctxt "field:purchase.line,sequence:"
+msgid "Sequence"
+msgstr "Seqüència"
+
+msgctxt "field:purchase.line,taxes:"
+msgid "Taxes"
+msgstr "Impostos"
+
+msgctxt "field:purchase.line,type:"
+msgid "Type"
+msgstr "Tipus"
+
+msgctxt "field:purchase.line,unit:"
+msgid "Unit"
+msgstr "Unitat"
+
+msgctxt "field:purchase.line,unit_digits:"
+msgid "Unit Digits"
+msgstr "Decimals de la unitat"
+
+msgctxt "field:purchase.line,unit_price:"
+msgid "Unit Price"
+msgstr "Preu unitari"
+
+msgctxt "field:purchase.purchase,comment:"
+msgid "Comment"
+msgstr "Comentari"
+
+msgctxt "field:purchase.purchase,company:"
+msgid "Company"
+msgstr "Empresa"
+
+msgctxt "field:purchase.purchase,currency:"
+msgid "Currency"
+msgstr "Divisa"
+
+msgctxt "field:purchase.purchase,currency_digits:"
+msgid "Currency Digits"
+msgstr "Decimals de la divisa"
+
+msgctxt "field:purchase.purchase,description:"
+msgid "Description"
+msgstr "Descripció"
+
+msgctxt "field:purchase.purchase,invoice_address:"
+msgid "Invoice Address"
+msgstr "Adreça de facturació"
+
+msgctxt "field:purchase.purchase,invoice_method:"
+msgid "Invoice Method"
+msgstr "Mètode de facturació"
+
+msgctxt "field:purchase.purchase,invoice_state:"
+msgid "Invoice State"
+msgstr "Estat de factura"
+
+msgctxt "field:purchase.purchase,invoices:"
+msgid "Invoices"
+msgstr "Factures"
+
+msgctxt "field:purchase.purchase,invoices_ignored:"
+msgid "Ignored Invoices"
+msgstr "Factures ignorades"
+
+msgctxt "field:purchase.purchase,invoices_recreated:"
+msgid "Recreated Invoices"
+msgstr "Factures recreades"
+
+msgctxt "field:purchase.purchase,lines:"
+msgid "Lines"
+msgstr "Línies"
+
+msgctxt "field:purchase.purchase,moves:"
+msgid "Moves"
+msgstr "Moviments"
+
+msgctxt "field:purchase.purchase,party:"
+msgid "Party"
+msgstr "Tercer"
+
+msgctxt "field:purchase.purchase,party_lang:"
+msgid "Party Language"
+msgstr "Idioma del tercer"
+
+msgctxt "field:purchase.purchase,payment_term:"
+msgid "Payment Term"
+msgstr "Termini de pagament"
+
+msgctxt "field:purchase.purchase,purchase_date:"
+msgid "Purchase Date"
+msgstr "Data de compra"
+
+msgctxt "field:purchase.purchase,rec_name:"
+msgid "Name"
+msgstr "Nom"
+
+msgctxt "field:purchase.purchase,reference:"
+msgid "Reference"
+msgstr "Referència"
+
+msgctxt "field:purchase.purchase,state:"
+msgid "State"
+msgstr "Estat"
+
+msgctxt "field:purchase.purchase,supplier_reference:"
+msgid "Supplier Reference"
+msgstr "Referència del proveïdor"
+
+msgctxt "field:purchase.purchase,tax_amount:"
+msgid "Tax"
+msgstr "Impost"
+
+msgctxt "field:purchase.purchase,total_amount:"
+msgid "Total"
+msgstr "Total"
+
+msgctxt "field:purchase.purchase,untaxed_amount:"
+msgid "Untaxed"
+msgstr "Sense Impostos"
+
+msgctxt "field:purchase.purchase,warehouse:"
+msgid "Warehouse"
+msgstr "Dipòsit"
+
+msgctxt "model:analytic_account.account,name:"
+msgid "Analytic Account"
+msgstr "Compte analític"
+
+msgctxt "model:purchase.line,name:"
+msgid "Purchase Line"
+msgstr "Línia de compra"
+
+msgctxt "model:purchase.purchase,name:"
+msgid "Purchase"
+msgstr "Compra"
+
+msgctxt "selection:analytic_account.account,display_balance:"
+msgid "Credit - Debit"
+msgstr "Haver - Deure"
+
+msgctxt "selection:analytic_account.account,display_balance:"
+msgid "Debit - Credit"
+msgstr "Deure - Haver"
+
+msgctxt "selection:analytic_account.account,state:"
+msgid "Closed"
+msgstr "Tancat"
+
+msgctxt "selection:analytic_account.account,state:"
+msgid "Draft"
+msgstr "Esborrany"
+
+msgctxt "selection:analytic_account.account,state:"
+msgid "Opened"
+msgstr "Oberta"
+
+msgctxt "selection:analytic_account.account,type:"
+msgid "Normal"
+msgstr "Normal"
+
+msgctxt "selection:analytic_account.account,type:"
+msgid "Root"
+msgstr "Arrel"
+
+msgctxt "selection:analytic_account.account,type:"
+msgid "View"
+msgstr "Vista"
+
+msgctxt "selection:purchase.line,type:"
+msgid "Comment"
+msgstr "Comentari"
+
+msgctxt "selection:purchase.line,type:"
+msgid "Line"
+msgstr "Línia"
+
+msgctxt "selection:purchase.line,type:"
+msgid "Subtotal"
+msgstr "Subtotal"
+
+msgctxt "selection:purchase.line,type:"
+msgid "Title"
+msgstr "Títol"
+
+msgctxt "selection:purchase.purchase,invoice_method:"
+msgid "Based On Order"
+msgstr "Basat en l'ordre"
+
+msgctxt "selection:purchase.purchase,invoice_method:"
+msgid "Based On Shipment"
+msgstr "Basat en l'enviament"
+
+msgctxt "selection:purchase.purchase,invoice_method:"
+msgid "Manual"
+msgstr "Manual"
+
+msgctxt "selection:purchase.purchase,invoice_state:"
+msgid "Exception"
+msgstr "Excepció"
+
+msgctxt "selection:purchase.purchase,invoice_state:"
+msgid "None"
+msgstr "Cap"
+
+msgctxt "selection:purchase.purchase,invoice_state:"
+msgid "Paid"
+msgstr "Pagada"
+
+msgctxt "selection:purchase.purchase,invoice_state:"
+msgid "Waiting"
+msgstr "En espera"
+
+msgctxt "selection:purchase.purchase,state:"
+msgid "Canceled"
+msgstr "Cancel·lada"
+
+msgctxt "selection:purchase.purchase,state:"
+msgid "Confirmed"
+msgstr "Confirmada"
+
+msgctxt "selection:purchase.purchase,state:"
+msgid "Done"
+msgstr "Acabada"
+
+msgctxt "selection:purchase.purchase,state:"
+msgid "Draft"
+msgstr "Esborrany"
+
+msgctxt "selection:purchase.purchase,state:"
+msgid "Quotation"
+msgstr "Pressupost"
diff --git a/locale/cs_CZ.po b/locale/cs_CZ.po
index 4ca1fb1..1649ed2 100644
--- a/locale/cs_CZ.po
+++ b/locale/cs_CZ.po
@@ -2,10 +2,10 @@
msgid ""
msgstr "Content-Type: text/plain; charset=utf-8\n"
-msgctxt "error:purchase.purchase:0"
+msgctxt "error:purchase.purchase:"
msgid "Analytic account is required on line \"%s\" (%d)!"
msgstr ""
-msgctxt "field:purchase.line,analytic_accounts:0"
+msgctxt "field:purchase.line,analytic_accounts:"
msgid "Analytic Accounts"
msgstr ""
diff --git a/locale/de_DE.po b/locale/de_DE.po
index 2889ebb..be4f49d 100644
--- a/locale/de_DE.po
+++ b/locale/de_DE.po
@@ -2,10 +2,10 @@
msgid ""
msgstr "Content-Type: text/plain; charset=utf-8\n"
-msgctxt "error:purchase.purchase:0"
+msgctxt "error:purchase.purchase:"
msgid "Analytic account is required on line \"%s\" (%d)!"
msgstr "Kostenstelle ist erforderlich in Zeile \"%s\" (%d)!"
-msgctxt "field:purchase.line,analytic_accounts:0"
+msgctxt "field:purchase.line,analytic_accounts:"
msgid "Analytic Accounts"
msgstr "Kostenstellen"
diff --git a/locale/es_AR.po b/locale/es_AR.po
new file mode 100644
index 0000000..542f292
--- /dev/null
+++ b/locale/es_AR.po
@@ -0,0 +1,3 @@
+#
+msgid ""
+msgstr "Content-Type: text/plain; charset=utf-8\n"
diff --git a/locale/es_CO.po b/locale/es_CO.po
index 7941d64..da7f963 100644
--- a/locale/es_CO.po
+++ b/locale/es_CO.po
@@ -2,394 +2,386 @@
msgid ""
msgstr "Content-Type: text/plain; charset=utf-8\n"
-msgctxt "error:analytic_account.account:0"
+msgctxt "error:analytic_account.account:"
msgid "You can not create recursive accounts!"
msgstr "¡No puede crear cuentas recursivas!"
-msgctxt "error:purchase.line:0"
+msgctxt "error:purchase.line:"
msgid "It misses an \"Account Expense\" on product \"%s\"!"
msgstr "Falta una propiedad por defecto \"Account Expense\"!"
-msgctxt "error:purchase.line:0"
+msgctxt "error:purchase.line:"
msgid "The supplier location is required!"
msgstr "Se requiere la localización del proveedor!"
-msgctxt "error:purchase.purchase:0"
+msgctxt "error:purchase.purchase:"
msgid "Analytic account is required on line \"%s\" (%d)!"
msgstr "Se requiere una cuenta analítica en la línea \"%s\" (%d)!"
-msgctxt "error:purchase.purchase:0"
+msgctxt "error:purchase.purchase:"
msgid "Invoice addresses must be defined for the quotation."
msgstr "Factura direccionada debe ser definida por el presupuesto."
-msgctxt "error:purchase.purchase:0"
+msgctxt "error:purchase.purchase:"
msgid "It misses an \"Account Payable\" on the party \"%s\"!"
msgstr "Falta una \"Cuenta Pagadera\" en el tercero \"%s\"!"
-msgctxt "field:analytic_account.account,active:0"
+msgctxt "field:analytic_account.account,active:"
msgid "Active"
msgstr "Activo"
-msgctxt "field:analytic_account.account,balance:0"
+msgctxt "field:analytic_account.account,balance:"
msgid "Balance"
msgstr "Balance"
-msgctxt "field:analytic_account.account,childs:0"
+msgctxt "field:analytic_account.account,childs:"
msgid "Children"
msgstr "Descendientes"
-msgctxt "field:analytic_account.account,code:0"
+msgctxt "field:analytic_account.account,code:"
msgid "Code"
msgstr "Código"
-msgctxt "field:analytic_account.account,company:0"
+msgctxt "field:analytic_account.account,company:"
msgid "Company"
msgstr "Compañía"
-msgctxt "field:analytic_account.account,credit:0"
+msgctxt "field:analytic_account.account,credit:"
msgid "Credit"
msgstr "Crédito"
-msgctxt "field:analytic_account.account,currency:0"
+msgctxt "field:analytic_account.account,currency:"
msgid "Currency"
msgstr "Moneda"
-msgctxt "field:analytic_account.account,currency_digits:0"
+msgctxt "field:analytic_account.account,currency_digits:"
msgid "Currency Digits"
msgstr "Dígitos de Moneda"
-msgctxt "field:analytic_account.account,debit:0"
+msgctxt "field:analytic_account.account,debit:"
msgid "Debit"
msgstr "Débito"
-msgctxt "field:analytic_account.account,display_balance:0"
+msgctxt "field:analytic_account.account,display_balance:"
msgid "Display Balance"
msgstr "Mostrar Balance"
-msgctxt "field:analytic_account.account,mandatory:0"
+msgctxt "field:analytic_account.account,mandatory:"
msgid "Mandatory"
msgstr "Obligatorio"
-msgctxt "field:analytic_account.account,name:0"
+msgctxt "field:analytic_account.account,name:"
msgid "Name"
msgstr "Nombre"
-msgctxt "field:analytic_account.account,note:0"
+msgctxt "field:analytic_account.account,note:"
msgid "Note"
msgstr "Nota"
-msgctxt "field:analytic_account.account,parent:0"
+msgctxt "field:analytic_account.account,parent:"
msgid "Parent"
msgstr "Padre"
-msgctxt "field:analytic_account.account,rec_name:0"
+msgctxt "field:analytic_account.account,rec_name:"
msgid "Name"
msgstr "Nombre"
-msgctxt "field:analytic_account.account,root:0"
+msgctxt "field:analytic_account.account,root:"
msgid "Root"
msgstr "Raíz"
-msgctxt "field:analytic_account.account,state:0"
+msgctxt "field:analytic_account.account,state:"
msgid "State"
msgstr "Estado"
-msgctxt "field:analytic_account.account,type:0"
+msgctxt "field:analytic_account.account,type:"
msgid "Type"
msgstr "Tipo"
-msgctxt "field:purchase.line,amount:0"
+msgctxt "field:purchase.line,amount:"
msgid "Amount"
msgstr "Cantidad"
-msgctxt "field:purchase.line,analytic_accounts:0"
+msgctxt "field:purchase.line,analytic_accounts:"
msgid "Analytic Accounts"
msgstr "Cuentas Analíticas"
-msgctxt "field:purchase.line,description:0"
+msgctxt "field:purchase.line,description:"
msgid "Description"
msgstr "Descripción"
-msgctxt "field:purchase.line,invoice_lines:0"
+msgctxt "field:purchase.line,invoice_lines:"
msgid "Invoice Lines"
msgstr "Líneas de Factura"
-msgctxt "field:purchase.line,move_done:0"
+msgctxt "field:purchase.line,move_done:"
msgid "Moves Done"
msgstr "Movimientos Hechos"
-msgctxt "field:purchase.line,move_exception:0"
+msgctxt "field:purchase.line,move_exception:"
msgid "Moves Exception"
msgstr "Exepción de Movimientos"
-msgctxt "field:purchase.line,moves:0"
+msgctxt "field:purchase.line,moves:"
msgid "Moves"
msgstr "Movimientos"
-msgctxt "field:purchase.line,moves_ignored:0"
+msgctxt "field:purchase.line,moves_ignored:"
msgid "Ignored Moves"
msgstr "Movimientos Ignorados"
-msgctxt "field:purchase.line,moves_recreated:0"
+msgctxt "field:purchase.line,moves_recreated:"
msgid "Recreated Moves"
msgstr "Movimientos Recreados"
-msgctxt "field:purchase.line,note:0"
+msgctxt "field:purchase.line,note:"
msgid "Note"
msgstr "Nota"
-msgctxt "field:purchase.line,product:0"
+msgctxt "field:purchase.line,product:"
msgid "Product"
msgstr "Producto"
-msgctxt "field:purchase.line,purchase:0"
+msgctxt "field:purchase.line,purchase:"
msgid "Purchase"
msgstr "Compra"
-msgctxt "field:purchase.line,quantity:0"
+msgctxt "field:purchase.line,quantity:"
msgid "Quantity"
msgstr "Cantidad"
-msgctxt "field:purchase.line,rec_name:0"
+msgctxt "field:purchase.line,rec_name:"
msgid "Name"
msgstr "Nombre"
-msgctxt "field:purchase.line,sequence:0"
+msgctxt "field:purchase.line,sequence:"
msgid "Sequence"
msgstr "Secuencia"
-msgctxt "field:purchase.line,taxes:0"
+msgctxt "field:purchase.line,taxes:"
msgid "Taxes"
msgstr "Impuestos"
-msgctxt "field:purchase.line,type:0"
+msgctxt "field:purchase.line,type:"
msgid "Type"
msgstr "Tipo"
-msgctxt "field:purchase.line,unit:0"
+msgctxt "field:purchase.line,unit:"
msgid "Unit"
msgstr "Unidad"
-msgctxt "field:purchase.line,unit_digits:0"
+msgctxt "field:purchase.line,unit_digits:"
msgid "Unit Digits"
msgstr "Dígitos de Unidad"
-msgctxt "field:purchase.line,unit_price:0"
+msgctxt "field:purchase.line,unit_price:"
msgid "Unit Price"
msgstr "Precio Unitario"
-msgctxt "field:purchase.purchase,comment:0"
+msgctxt "field:purchase.purchase,comment:"
msgid "Comment"
msgstr "Comentario"
-msgctxt "field:purchase.purchase,company:0"
+msgctxt "field:purchase.purchase,company:"
msgid "Company"
msgstr "Compañía"
-msgctxt "field:purchase.purchase,currency:0"
+msgctxt "field:purchase.purchase,currency:"
msgid "Currency"
msgstr "Moneda"
-msgctxt "field:purchase.purchase,currency_digits:0"
+msgctxt "field:purchase.purchase,currency_digits:"
msgid "Currency Digits"
msgstr "Dígitos de Moneda"
-msgctxt "field:purchase.purchase,description:0"
+msgctxt "field:purchase.purchase,description:"
msgid "Description"
msgstr "Descripción"
-msgctxt "field:purchase.purchase,invoice_address:0"
+msgctxt "field:purchase.purchase,invoice_address:"
msgid "Invoice Address"
msgstr "Dirección de Facturación"
-msgctxt "field:purchase.purchase,invoice_exception:0"
-msgid "Invoices Exception"
-msgstr "Excepción de Facturación"
-
-msgctxt "field:purchase.purchase,invoice_method:0"
+msgctxt "field:purchase.purchase,invoice_method:"
msgid "Invoice Method"
msgstr "Método de Facturación"
-msgctxt "field:purchase.purchase,invoice_paid:0"
-msgid "Invoices Paid"
-msgstr "Facturas Pagadas"
-
-msgctxt "field:purchase.purchase,invoice_state:0"
+msgctxt "field:purchase.purchase,invoice_state:"
msgid "Invoice State"
msgstr "Estado de Factura"
-msgctxt "field:purchase.purchase,invoices:0"
+msgctxt "field:purchase.purchase,invoices:"
msgid "Invoices"
msgstr "Facturas"
-msgctxt "field:purchase.purchase,invoices_ignored:0"
+msgctxt "field:purchase.purchase,invoices_ignored:"
msgid "Ignored Invoices"
msgstr "Facturas Ignoradas"
-msgctxt "field:purchase.purchase,invoices_recreated:0"
+msgctxt "field:purchase.purchase,invoices_recreated:"
msgid "Recreated Invoices"
msgstr "Facturas Recreadas"
-msgctxt "field:purchase.purchase,lines:0"
+msgctxt "field:purchase.purchase,lines:"
msgid "Lines"
msgstr "Líneas"
-msgctxt "field:purchase.purchase,moves:0"
+msgctxt "field:purchase.purchase,moves:"
msgid "Moves"
msgstr "Movimientos"
-msgctxt "field:purchase.purchase,party:0"
+msgctxt "field:purchase.purchase,party:"
msgid "Party"
msgstr "Tercero"
-msgctxt "field:purchase.purchase,party_lang:0"
+msgctxt "field:purchase.purchase,party_lang:"
msgid "Party Language"
msgstr "Idioma del Tercero"
-msgctxt "field:purchase.purchase,payment_term:0"
+msgctxt "field:purchase.purchase,payment_term:"
msgid "Payment Term"
msgstr "Término de Pago"
-msgctxt "field:purchase.purchase,purchase_date:0"
+msgctxt "field:purchase.purchase,purchase_date:"
msgid "Purchase Date"
msgstr "Fecha de Compra"
-msgctxt "field:purchase.purchase,rec_name:0"
+msgctxt "field:purchase.purchase,rec_name:"
msgid "Name"
msgstr "Nombre"
-msgctxt "field:purchase.purchase,reference:0"
+msgctxt "field:purchase.purchase,reference:"
msgid "Reference"
msgstr "Referencia"
-msgctxt "field:purchase.purchase,state:0"
+msgctxt "field:purchase.purchase,state:"
msgid "State"
msgstr "Estado"
-msgctxt "field:purchase.purchase,supplier_reference:0"
+msgctxt "field:purchase.purchase,supplier_reference:"
msgid "Supplier Reference"
msgstr "Referencia del Proveedor"
-msgctxt "field:purchase.purchase,tax_amount:0"
+msgctxt "field:purchase.purchase,tax_amount:"
msgid "Tax"
msgstr "Impuesto"
-msgctxt "field:purchase.purchase,total_amount:0"
+msgctxt "field:purchase.purchase,total_amount:"
msgid "Total"
msgstr "Total"
-msgctxt "field:purchase.purchase,untaxed_amount:0"
+msgctxt "field:purchase.purchase,untaxed_amount:"
msgid "Untaxed"
msgstr "Sin Impuesto"
-msgctxt "field:purchase.purchase,warehouse:0"
+msgctxt "field:purchase.purchase,warehouse:"
msgid "Warehouse"
msgstr "Depósito"
-msgctxt "model:analytic_account.account,name:0"
+msgctxt "model:analytic_account.account,name:"
msgid "Analytic Account"
msgstr "Cuenta Analítica"
-msgctxt "model:purchase.line,name:0"
+msgctxt "model:purchase.line,name:"
msgid "Purchase Line"
msgstr "Línea de Compra"
-msgctxt "model:purchase.purchase,name:0"
+msgctxt "model:purchase.purchase,name:"
msgid "Purchase"
msgstr "Compra"
-msgctxt "selection:analytic_account.account,display_balance:0"
+msgctxt "selection:analytic_account.account,display_balance:"
msgid "Credit - Debit"
msgstr "Crédito - Débito"
-msgctxt "selection:analytic_account.account,display_balance:0"
+msgctxt "selection:analytic_account.account,display_balance:"
msgid "Debit - Credit"
msgstr "Débito - Crédito"
-msgctxt "selection:analytic_account.account,state:0"
+msgctxt "selection:analytic_account.account,state:"
msgid "Closed"
msgstr "Cerrado"
-msgctxt "selection:analytic_account.account,state:0"
+msgctxt "selection:analytic_account.account,state:"
msgid "Draft"
msgstr "Borrador"
-msgctxt "selection:analytic_account.account,state:0"
+msgctxt "selection:analytic_account.account,state:"
msgid "Opened"
msgstr "Abierto"
-msgctxt "selection:analytic_account.account,type:0"
+msgctxt "selection:analytic_account.account,type:"
msgid "Normal"
msgstr "Normal"
-msgctxt "selection:analytic_account.account,type:0"
+msgctxt "selection:analytic_account.account,type:"
msgid "Root"
msgstr "Raíz"
-msgctxt "selection:analytic_account.account,type:0"
+msgctxt "selection:analytic_account.account,type:"
msgid "View"
msgstr "Vista"
-msgctxt "selection:purchase.line,type:0"
+msgctxt "selection:purchase.line,type:"
msgid "Comment"
msgstr "Comentario"
-msgctxt "selection:purchase.line,type:0"
+msgctxt "selection:purchase.line,type:"
msgid "Line"
msgstr "Línea"
-msgctxt "selection:purchase.line,type:0"
+msgctxt "selection:purchase.line,type:"
msgid "Subtotal"
msgstr "Subtotal"
-msgctxt "selection:purchase.line,type:0"
+msgctxt "selection:purchase.line,type:"
msgid "Title"
msgstr "Título"
-msgctxt "selection:purchase.purchase,invoice_method:0"
+msgctxt "selection:purchase.purchase,invoice_method:"
msgid "Based On Order"
msgstr "Basado En La Orden"
-msgctxt "selection:purchase.purchase,invoice_method:0"
+msgctxt "selection:purchase.purchase,invoice_method:"
msgid "Based On Shipment"
msgstr "Basado En El Envío"
-msgctxt "selection:purchase.purchase,invoice_method:0"
+msgctxt "selection:purchase.purchase,invoice_method:"
msgid "Manual"
msgstr "Manual"
-msgctxt "selection:purchase.purchase,invoice_state:0"
+msgctxt "selection:purchase.purchase,invoice_state:"
msgid "Exception"
msgstr "Excepción"
-msgctxt "selection:purchase.purchase,invoice_state:0"
+msgctxt "selection:purchase.purchase,invoice_state:"
msgid "None"
msgstr "Ninguno"
-msgctxt "selection:purchase.purchase,invoice_state:0"
+msgctxt "selection:purchase.purchase,invoice_state:"
msgid "Paid"
msgstr "Pagado"
-msgctxt "selection:purchase.purchase,invoice_state:0"
+msgctxt "selection:purchase.purchase,invoice_state:"
msgid "Waiting"
msgstr "En Espera"
-msgctxt "selection:purchase.purchase,state:0"
+msgctxt "selection:purchase.purchase,state:"
msgid "Canceled"
msgstr "Cancelado"
-msgctxt "selection:purchase.purchase,state:0"
+msgctxt "selection:purchase.purchase,state:"
msgid "Confirmed"
msgstr "Confirmado"
-msgctxt "selection:purchase.purchase,state:0"
+msgctxt "selection:purchase.purchase,state:"
msgid "Done"
msgstr "Hecho"
-msgctxt "selection:purchase.purchase,state:0"
+msgctxt "selection:purchase.purchase,state:"
msgid "Draft"
msgstr "Borrador"
-msgctxt "selection:purchase.purchase,state:0"
+msgctxt "selection:purchase.purchase,state:"
msgid "Quotation"
msgstr "Cotización"
diff --git a/locale/es_ES.po b/locale/es_ES.po
index ea3c5a4..f9faa44 100644
--- a/locale/es_ES.po
+++ b/locale/es_ES.po
@@ -2,394 +2,386 @@
msgid ""
msgstr "Content-Type: text/plain; charset=utf-8\n"
-msgctxt "error:analytic_account.account:0"
+msgctxt "error:analytic_account.account:"
msgid "You can not create recursive accounts!"
-msgstr "No puede crear cuentas recursivas"
+msgstr "No puede crear cuentas recursivas."
-msgctxt "error:purchase.line:0"
+msgctxt "error:purchase.line:"
msgid "It misses an \"Account Expense\" on product \"%s\"!"
-msgstr "Falta la propiedad «Cuenta de gastos» en el producto «%s»"
+msgstr "Al producto \"%s\" le falta una \"Cuenta de gastos\"."
-msgctxt "error:purchase.line:0"
+msgctxt "error:purchase.line:"
msgid "The supplier location is required!"
-msgstr "Se necesita la ubicación del proveedor"
+msgstr "La ubicación de proveedor es requerida."
-msgctxt "error:purchase.purchase:0"
+msgctxt "error:purchase.purchase:"
msgid "Analytic account is required on line \"%s\" (%d)!"
-msgstr "Se necesita una cuenta analítica en la línea «%s» (%d)"
+msgstr "Es necesaria una cuenta analítica en la línea «%s» (%d)."
-msgctxt "error:purchase.purchase:0"
+msgctxt "error:purchase.purchase:"
msgid "Invoice addresses must be defined for the quotation."
msgstr "Se necesita la dirección de facturación para el presupuesto."
-msgctxt "error:purchase.purchase:0"
+msgctxt "error:purchase.purchase:"
msgid "It misses an \"Account Payable\" on the party \"%s\"!"
-msgstr "Falta una «Cuenta por pagar» en el tercero «%s»"
+msgstr "Al tercero \"%s\" le falta una \"Cuenta a pagar\"."
-msgctxt "field:analytic_account.account,active:0"
+msgctxt "field:analytic_account.account,active:"
msgid "Active"
msgstr "Activa"
-msgctxt "field:analytic_account.account,balance:0"
+msgctxt "field:analytic_account.account,balance:"
msgid "Balance"
msgstr "Balance"
-msgctxt "field:analytic_account.account,childs:0"
+msgctxt "field:analytic_account.account,childs:"
msgid "Children"
msgstr "Hijos"
-msgctxt "field:analytic_account.account,code:0"
+msgctxt "field:analytic_account.account,code:"
msgid "Code"
msgstr "Código"
-msgctxt "field:analytic_account.account,company:0"
+msgctxt "field:analytic_account.account,company:"
msgid "Company"
msgstr "Empresa"
-msgctxt "field:analytic_account.account,credit:0"
+msgctxt "field:analytic_account.account,credit:"
msgid "Credit"
msgstr "Haber"
-msgctxt "field:analytic_account.account,currency:0"
+msgctxt "field:analytic_account.account,currency:"
msgid "Currency"
msgstr "Divisa"
-msgctxt "field:analytic_account.account,currency_digits:0"
+msgctxt "field:analytic_account.account,currency_digits:"
msgid "Currency Digits"
msgstr "Decimales de la divisa"
-msgctxt "field:analytic_account.account,debit:0"
+msgctxt "field:analytic_account.account,debit:"
msgid "Debit"
msgstr "Debe"
-msgctxt "field:analytic_account.account,display_balance:0"
+msgctxt "field:analytic_account.account,display_balance:"
msgid "Display Balance"
msgstr "Mostrar balance"
-msgctxt "field:analytic_account.account,mandatory:0"
+msgctxt "field:analytic_account.account,mandatory:"
msgid "Mandatory"
msgstr "Obligatorio"
-msgctxt "field:analytic_account.account,name:0"
+msgctxt "field:analytic_account.account,name:"
msgid "Name"
msgstr "Nombre"
-msgctxt "field:analytic_account.account,note:0"
+msgctxt "field:analytic_account.account,note:"
msgid "Note"
msgstr "Nota"
-msgctxt "field:analytic_account.account,parent:0"
+msgctxt "field:analytic_account.account,parent:"
msgid "Parent"
msgstr "Padre"
-msgctxt "field:analytic_account.account,rec_name:0"
+msgctxt "field:analytic_account.account,rec_name:"
msgid "Name"
msgstr "Nombre"
-msgctxt "field:analytic_account.account,root:0"
+msgctxt "field:analytic_account.account,root:"
msgid "Root"
msgstr "Raíz"
-msgctxt "field:analytic_account.account,state:0"
+msgctxt "field:analytic_account.account,state:"
msgid "State"
msgstr "Estado"
-msgctxt "field:analytic_account.account,type:0"
+msgctxt "field:analytic_account.account,type:"
msgid "Type"
msgstr "Tipo"
-msgctxt "field:purchase.line,amount:0"
+msgctxt "field:purchase.line,amount:"
msgid "Amount"
-msgstr "Cantidad"
+msgstr "Importe"
-msgctxt "field:purchase.line,analytic_accounts:0"
+msgctxt "field:purchase.line,analytic_accounts:"
msgid "Analytic Accounts"
msgstr "Cuentas analíticas"
-msgctxt "field:purchase.line,description:0"
+msgctxt "field:purchase.line,description:"
msgid "Description"
msgstr "Descripción"
-msgctxt "field:purchase.line,invoice_lines:0"
+msgctxt "field:purchase.line,invoice_lines:"
msgid "Invoice Lines"
msgstr "Líneas de factura"
-msgctxt "field:purchase.line,move_done:0"
+msgctxt "field:purchase.line,move_done:"
msgid "Moves Done"
-msgstr "Movimientos terminados"
+msgstr "Movimientos realizados"
-msgctxt "field:purchase.line,move_exception:0"
+msgctxt "field:purchase.line,move_exception:"
msgid "Moves Exception"
msgstr "Exepción de movimientos"
-msgctxt "field:purchase.line,moves:0"
+msgctxt "field:purchase.line,moves:"
msgid "Moves"
msgstr "Movimientos"
-msgctxt "field:purchase.line,moves_ignored:0"
+msgctxt "field:purchase.line,moves_ignored:"
msgid "Ignored Moves"
msgstr "Movimientos ignorados"
-msgctxt "field:purchase.line,moves_recreated:0"
+msgctxt "field:purchase.line,moves_recreated:"
msgid "Recreated Moves"
msgstr "Movimientos recreados"
-msgctxt "field:purchase.line,note:0"
+msgctxt "field:purchase.line,note:"
msgid "Note"
msgstr "Nota"
-msgctxt "field:purchase.line,product:0"
+msgctxt "field:purchase.line,product:"
msgid "Product"
msgstr "Producto"
-msgctxt "field:purchase.line,purchase:0"
+msgctxt "field:purchase.line,purchase:"
msgid "Purchase"
msgstr "Compra"
-msgctxt "field:purchase.line,quantity:0"
+msgctxt "field:purchase.line,quantity:"
msgid "Quantity"
msgstr "Cantidad"
-msgctxt "field:purchase.line,rec_name:0"
+msgctxt "field:purchase.line,rec_name:"
msgid "Name"
msgstr "Nombre"
-msgctxt "field:purchase.line,sequence:0"
+msgctxt "field:purchase.line,sequence:"
msgid "Sequence"
msgstr "Secuencia"
-msgctxt "field:purchase.line,taxes:0"
+msgctxt "field:purchase.line,taxes:"
msgid "Taxes"
msgstr "Impuestos"
-msgctxt "field:purchase.line,type:0"
+msgctxt "field:purchase.line,type:"
msgid "Type"
msgstr "Tipo"
-msgctxt "field:purchase.line,unit:0"
+msgctxt "field:purchase.line,unit:"
msgid "Unit"
msgstr "Unidad"
-msgctxt "field:purchase.line,unit_digits:0"
+msgctxt "field:purchase.line,unit_digits:"
msgid "Unit Digits"
msgstr "Decimales de la unidad"
-msgctxt "field:purchase.line,unit_price:0"
+msgctxt "field:purchase.line,unit_price:"
msgid "Unit Price"
-msgstr "Precio unitario"
+msgstr "Precio unidad"
-msgctxt "field:purchase.purchase,comment:0"
+msgctxt "field:purchase.purchase,comment:"
msgid "Comment"
msgstr "Comentario"
-msgctxt "field:purchase.purchase,company:0"
+msgctxt "field:purchase.purchase,company:"
msgid "Company"
msgstr "Empresa"
-msgctxt "field:purchase.purchase,currency:0"
+msgctxt "field:purchase.purchase,currency:"
msgid "Currency"
msgstr "Divisa"
-msgctxt "field:purchase.purchase,currency_digits:0"
+msgctxt "field:purchase.purchase,currency_digits:"
msgid "Currency Digits"
msgstr "Decimales de la divisa"
-msgctxt "field:purchase.purchase,description:0"
+msgctxt "field:purchase.purchase,description:"
msgid "Description"
msgstr "Descripción"
-msgctxt "field:purchase.purchase,invoice_address:0"
+msgctxt "field:purchase.purchase,invoice_address:"
msgid "Invoice Address"
msgstr "Dirección de facturación"
-msgctxt "field:purchase.purchase,invoice_exception:0"
-msgid "Invoices Exception"
-msgstr "Excepción de facturas"
-
-msgctxt "field:purchase.purchase,invoice_method:0"
+msgctxt "field:purchase.purchase,invoice_method:"
msgid "Invoice Method"
msgstr "Método de facturación"
-msgctxt "field:purchase.purchase,invoice_paid:0"
-msgid "Invoices Paid"
-msgstr "Facturas pagadas"
-
-msgctxt "field:purchase.purchase,invoice_state:0"
+msgctxt "field:purchase.purchase,invoice_state:"
msgid "Invoice State"
msgstr "Estado de factura"
-msgctxt "field:purchase.purchase,invoices:0"
+msgctxt "field:purchase.purchase,invoices:"
msgid "Invoices"
msgstr "Facturas"
-msgctxt "field:purchase.purchase,invoices_ignored:0"
+msgctxt "field:purchase.purchase,invoices_ignored:"
msgid "Ignored Invoices"
msgstr "Facturas ignoradas"
-msgctxt "field:purchase.purchase,invoices_recreated:0"
+msgctxt "field:purchase.purchase,invoices_recreated:"
msgid "Recreated Invoices"
msgstr "Facturas recreadas"
-msgctxt "field:purchase.purchase,lines:0"
+msgctxt "field:purchase.purchase,lines:"
msgid "Lines"
msgstr "Líneas"
-msgctxt "field:purchase.purchase,moves:0"
+msgctxt "field:purchase.purchase,moves:"
msgid "Moves"
msgstr "Movimientos"
-msgctxt "field:purchase.purchase,party:0"
+msgctxt "field:purchase.purchase,party:"
msgid "Party"
msgstr "Tercero"
-msgctxt "field:purchase.purchase,party_lang:0"
+msgctxt "field:purchase.purchase,party_lang:"
msgid "Party Language"
msgstr "Idioma del tercero"
-msgctxt "field:purchase.purchase,payment_term:0"
+msgctxt "field:purchase.purchase,payment_term:"
msgid "Payment Term"
msgstr "Plazo de pago"
-msgctxt "field:purchase.purchase,purchase_date:0"
+msgctxt "field:purchase.purchase,purchase_date:"
msgid "Purchase Date"
msgstr "Fecha de compra"
-msgctxt "field:purchase.purchase,rec_name:0"
+msgctxt "field:purchase.purchase,rec_name:"
msgid "Name"
msgstr "Nombre"
-msgctxt "field:purchase.purchase,reference:0"
+msgctxt "field:purchase.purchase,reference:"
msgid "Reference"
msgstr "Referencia"
-msgctxt "field:purchase.purchase,state:0"
+msgctxt "field:purchase.purchase,state:"
msgid "State"
msgstr "Estado"
-msgctxt "field:purchase.purchase,supplier_reference:0"
+msgctxt "field:purchase.purchase,supplier_reference:"
msgid "Supplier Reference"
msgstr "Referencia del proveedor"
-msgctxt "field:purchase.purchase,tax_amount:0"
+msgctxt "field:purchase.purchase,tax_amount:"
msgid "Tax"
msgstr "Impuesto"
-msgctxt "field:purchase.purchase,total_amount:0"
+msgctxt "field:purchase.purchase,total_amount:"
msgid "Total"
msgstr "Total"
-msgctxt "field:purchase.purchase,untaxed_amount:0"
+msgctxt "field:purchase.purchase,untaxed_amount:"
msgid "Untaxed"
-msgstr "Sin Impuestos"
+msgstr "Base imponible"
-msgctxt "field:purchase.purchase,warehouse:0"
+msgctxt "field:purchase.purchase,warehouse:"
msgid "Warehouse"
-msgstr "Depósito"
+msgstr "Almacén"
-msgctxt "model:analytic_account.account,name:0"
+msgctxt "model:analytic_account.account,name:"
msgid "Analytic Account"
msgstr "Cuenta analítica"
-msgctxt "model:purchase.line,name:0"
+msgctxt "model:purchase.line,name:"
msgid "Purchase Line"
msgstr "Línea de compra"
-msgctxt "model:purchase.purchase,name:0"
+msgctxt "model:purchase.purchase,name:"
msgid "Purchase"
msgstr "Compra"
-msgctxt "selection:analytic_account.account,display_balance:0"
+msgctxt "selection:analytic_account.account,display_balance:"
msgid "Credit - Debit"
msgstr "Haber - Debe"
-msgctxt "selection:analytic_account.account,display_balance:0"
+msgctxt "selection:analytic_account.account,display_balance:"
msgid "Debit - Credit"
msgstr "Debe - Haber"
-msgctxt "selection:analytic_account.account,state:0"
+msgctxt "selection:analytic_account.account,state:"
msgid "Closed"
msgstr "Cerrado"
-msgctxt "selection:analytic_account.account,state:0"
+msgctxt "selection:analytic_account.account,state:"
msgid "Draft"
msgstr "Borrador"
-msgctxt "selection:analytic_account.account,state:0"
+msgctxt "selection:analytic_account.account,state:"
msgid "Opened"
msgstr "Abierta"
-msgctxt "selection:analytic_account.account,type:0"
+msgctxt "selection:analytic_account.account,type:"
msgid "Normal"
msgstr "Normal"
-msgctxt "selection:analytic_account.account,type:0"
+msgctxt "selection:analytic_account.account,type:"
msgid "Root"
msgstr "Raíz"
-msgctxt "selection:analytic_account.account,type:0"
+msgctxt "selection:analytic_account.account,type:"
msgid "View"
msgstr "Vista"
-msgctxt "selection:purchase.line,type:0"
+msgctxt "selection:purchase.line,type:"
msgid "Comment"
msgstr "Comentario"
-msgctxt "selection:purchase.line,type:0"
+msgctxt "selection:purchase.line,type:"
msgid "Line"
msgstr "Línea"
-msgctxt "selection:purchase.line,type:0"
+msgctxt "selection:purchase.line,type:"
msgid "Subtotal"
msgstr "Subtotal"
-msgctxt "selection:purchase.line,type:0"
+msgctxt "selection:purchase.line,type:"
msgid "Title"
msgstr "Título"
-msgctxt "selection:purchase.purchase,invoice_method:0"
+msgctxt "selection:purchase.purchase,invoice_method:"
msgid "Based On Order"
-msgstr "Basado en la orden"
+msgstr "Basado en el pedido"
-msgctxt "selection:purchase.purchase,invoice_method:0"
+msgctxt "selection:purchase.purchase,invoice_method:"
msgid "Based On Shipment"
msgstr "Basado en el envío"
-msgctxt "selection:purchase.purchase,invoice_method:0"
+msgctxt "selection:purchase.purchase,invoice_method:"
msgid "Manual"
msgstr "Manual"
-msgctxt "selection:purchase.purchase,invoice_state:0"
+msgctxt "selection:purchase.purchase,invoice_state:"
msgid "Exception"
msgstr "Excepción"
-msgctxt "selection:purchase.purchase,invoice_state:0"
+msgctxt "selection:purchase.purchase,invoice_state:"
msgid "None"
msgstr "Ninguno"
-msgctxt "selection:purchase.purchase,invoice_state:0"
+msgctxt "selection:purchase.purchase,invoice_state:"
msgid "Paid"
msgstr "Pagada"
-msgctxt "selection:purchase.purchase,invoice_state:0"
+msgctxt "selection:purchase.purchase,invoice_state:"
msgid "Waiting"
msgstr "En espera"
-msgctxt "selection:purchase.purchase,state:0"
+msgctxt "selection:purchase.purchase,state:"
msgid "Canceled"
msgstr "Cancelada"
-msgctxt "selection:purchase.purchase,state:0"
+msgctxt "selection:purchase.purchase,state:"
msgid "Confirmed"
msgstr "Confirmada"
-msgctxt "selection:purchase.purchase,state:0"
+msgctxt "selection:purchase.purchase,state:"
msgid "Done"
-msgstr "Terminada"
+msgstr "Realizada"
-msgctxt "selection:purchase.purchase,state:0"
+msgctxt "selection:purchase.purchase,state:"
msgid "Draft"
msgstr "Borrador"
-msgctxt "selection:purchase.purchase,state:0"
+msgctxt "selection:purchase.purchase,state:"
msgid "Quotation"
msgstr "Presupuesto"
diff --git a/locale/fr_FR.po b/locale/fr_FR.po
index f242ac2..2f61090 100644
--- a/locale/fr_FR.po
+++ b/locale/fr_FR.po
@@ -2,10 +2,14 @@
msgid ""
msgstr "Content-Type: text/plain; charset=utf-8\n"
-msgctxt "error:purchase.purchase:0"
+msgctxt "error:purchase.purchase:"
msgid "Analytic account is required on line \"%s\" (%d)!"
msgstr "Compte analytique requis sur la ligne \"%s\" (%d)!"
-msgctxt "field:purchase.line,analytic_accounts:0"
+msgctxt "error:purchase.purchase:"
+msgid "Analytic account is required on line \"%s\" (%d)!"
+msgstr "Compte analytique requis sur la ligne \"%s\" (%d)!"
+
+msgctxt "field:purchase.line,analytic_accounts:"
msgid "Analytic Accounts"
msgstr "Comptes analytiques"
diff --git a/locale/nl_NL.po b/locale/nl_NL.po
index 4ca1fb1..1649ed2 100644
--- a/locale/nl_NL.po
+++ b/locale/nl_NL.po
@@ -2,10 +2,10 @@
msgid ""
msgstr "Content-Type: text/plain; charset=utf-8\n"
-msgctxt "error:purchase.purchase:0"
+msgctxt "error:purchase.purchase:"
msgid "Analytic account is required on line \"%s\" (%d)!"
msgstr ""
-msgctxt "field:purchase.line,analytic_accounts:0"
+msgctxt "field:purchase.line,analytic_accounts:"
msgid "Analytic Accounts"
msgstr ""
diff --git a/locale/ru_RU.po b/locale/ru_RU.po
index 4ca1fb1..1649ed2 100644
--- a/locale/ru_RU.po
+++ b/locale/ru_RU.po
@@ -2,10 +2,10 @@
msgid ""
msgstr "Content-Type: text/plain; charset=utf-8\n"
-msgctxt "error:purchase.purchase:0"
+msgctxt "error:purchase.purchase:"
msgid "Analytic account is required on line \"%s\" (%d)!"
msgstr ""
-msgctxt "field:purchase.line,analytic_accounts:0"
+msgctxt "field:purchase.line,analytic_accounts:"
msgid "Analytic Accounts"
msgstr ""
diff --git a/purchase.py b/purchase.py
index ddc3202..98541c5 100644
--- a/purchase.py
+++ b/purchase.py
@@ -19,7 +19,6 @@ class Purchase(ModelSQL, ModelView):
def check_for_quotation(self, purchase_id):
account_selection_obj = Pool().get(
'analytic_account.account.selection')
- purchase_line_obj = Pool().get('purchase.line')
res = super(Purchase, self).check_for_quotation(purchase_id)
@@ -51,8 +50,8 @@ class PurchaseLine(ModelSQL, ModelView):
def _view_look_dom_arch(self, tree, type, field_children=None):
analytic_account_obj = Pool().get('analytic_account.account')
analytic_account_obj.convert_view(tree)
- arch, fields = super(PurchaseLine, self)._view_look_dom_arch(tree, type,
- field_children=field_children)
+ arch, fields = super(PurchaseLine, self)._view_look_dom_arch(tree,
+ type, field_children=field_children)
return arch, fields
def fields_get(self, fields_names=None):
@@ -73,8 +72,6 @@ class PurchaseLine(ModelSQL, ModelView):
with_rec_name=with_rec_name)
def read(self, ids, fields_names=None):
- selection_obj = Pool().get('analytic_account.account.selection')
-
int_id = False
if isinstance(ids, (int, long)):
int_id = True
@@ -104,7 +101,7 @@ class PurchaseLine(ModelSQL, ModelView):
for line in lines:
for root_id in root_ids:
id2record[line.id]['analytic_account_' \
- + str(root_id)] = False
+ + str(root_id)] = None
if line.type != 'line':
continue
if not line.analytic_accounts:
@@ -217,7 +214,8 @@ class PurchaseLine(ModelSQL, ModelView):
return new_ids
def get_invoice_line(self, line):
- account_selection_obj = Pool().get('analytic_account.account.selection')
+ pool = Pool()
+ account_selection_obj = pool.get('analytic_account.account.selection')
res = super(PurchaseLine, self).get_invoice_line(line)
if not res:
@@ -225,7 +223,8 @@ class PurchaseLine(ModelSQL, ModelView):
selection_id = False
if line.analytic_accounts:
- selection_id = account_selection_obj.copy(line.analytic_accounts.id)
+ selection_id = account_selection_obj.copy(
+ line.analytic_accounts.id)
for vals in res:
vals['analytic_accounts'] = selection_id
return res
diff --git a/setup.py b/setup.py
index 1b5cedf..9b817af 100644
--- a/setup.py
+++ b/setup.py
@@ -12,7 +12,7 @@ minor_version = int(minor_version)
requires = []
for dep in info.get('depends', []):
- if not re.match(r'(ir|res|workflow|webdav)(\W|$)', dep):
+ 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))
diff --git a/tests/__init__.py b/tests/__init__.py
index e4f5e7c..5d12558 100644
--- a/tests/__init__.py
+++ b/tests/__init__.py
@@ -1,4 +1,4 @@
#This file is part of Tryton. The COPYRIGHT file at the top level of
#this repository contains the full copyright notices and license terms.
-from test_analytic_purchase import suite
+from .test_analytic_purchase import suite
diff --git a/tests/test_analytic_purchase.py b/tests/test_analytic_purchase.py
index 5a575de..9a9f46b 100644
--- a/tests/test_analytic_purchase.py
+++ b/tests/test_analytic_purchase.py
@@ -2,7 +2,8 @@
#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, os
+import sys
+import os
DIR = os.path.abspath(os.path.normpath(os.path.join(__file__,
'..', '..', '..', '..', '..', 'trytond')))
if os.path.isdir(DIR):
@@ -33,6 +34,7 @@ class AnalyticPurchaseTestCase(unittest.TestCase):
'''
test_depends()
+
def suite():
suite = trytond.tests.test_tryton.suite()
suite.addTests(unittest.TestLoader().loadTestsFromTestCase(
diff --git a/trytond_analytic_purchase.egg-info/PKG-INFO b/trytond_analytic_purchase.egg-info/PKG-INFO
index b4b5247..6a075c4 100644
--- a/trytond_analytic_purchase.egg-info/PKG-INFO
+++ b/trytond_analytic_purchase.egg-info/PKG-INFO
@@ -1,13 +1,13 @@
Metadata-Version: 1.0
Name: trytond-analytic-purchase
-Version: 2.2.0
+Version: 2.4.0
Summary: Add analytic account on purchase lines.
Home-page: http://www.tryton.org/
Author: B2CK
Author-email: info at b2ck.com
License: GPL-3
-Download-URL: http://downloads.tryton.org/2.2/
+Download-URL: http://downloads.tryton.org/2.4/
Description: UNKNOWN
Platform: UNKNOWN
Classifier: Development Status :: 5 - Production/Stable
diff --git a/trytond_analytic_purchase.egg-info/SOURCES.txt b/trytond_analytic_purchase.egg-info/SOURCES.txt
index d915ccb..b64fd4d 100644
--- a/trytond_analytic_purchase.egg-info/SOURCES.txt
+++ b/trytond_analytic_purchase.egg-info/SOURCES.txt
@@ -12,8 +12,10 @@ setup.py
./tests/__init__.py
./tests/test_analytic_purchase.py
locale/bg_BG.po
+locale/ca_ES.po
locale/cs_CZ.po
locale/de_DE.po
+locale/es_AR.po
locale/es_CO.po
locale/es_ES.po
locale/fr_FR.po
diff --git a/trytond_analytic_purchase.egg-info/requires.txt b/trytond_analytic_purchase.egg-info/requires.txt
index 1c47be6..be3c5bb 100644
--- a/trytond_analytic_purchase.egg-info/requires.txt
+++ b/trytond_analytic_purchase.egg-info/requires.txt
@@ -1,4 +1,4 @@
-trytond_purchase >= 2.2, < 2.3
-trytond_analytic_account >= 2.2, < 2.3
-trytond_analytic_invoice >= 2.2, < 2.3
-trytond >= 2.2, < 2.3
\ No newline at end of file
+trytond_purchase >= 2.4, < 2.5
+trytond_analytic_account >= 2.4, < 2.5
+trytond_analytic_invoice >= 2.4, < 2.5
+trytond >= 2.4, < 2.5
\ No newline at end of file
commit 42400eb43f3f95d55e2d2bbe3e0024d986866c29
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Mon Oct 31 16:20:32 2011 +0100
Adding upstream version 2.2.0.
diff --git a/CHANGELOG b/CHANGELOG
index f74f0b3..905eea5 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+Version 2.2.0 - 2011-10-24
+* Bug fixes (see mercurial logs for details)
+
Version 2.0.0 - 2011-04-27
* Bug fixes (see mercurial logs for details)
diff --git a/MANIFEST.in b/MANIFEST.in
index 5343ad8..7f5d5fd 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -6,4 +6,4 @@ include CHANGELOG
include LICENSE
include *.xml
include *.odt
-include *.csv
+include locale/*.po
diff --git a/PKG-INFO b/PKG-INFO
index ad0c50e..adecbf0 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,28 +1,31 @@
Metadata-Version: 1.0
Name: trytond_analytic_purchase
-Version: 2.0.0
+Version: 2.2.0
Summary: Add analytic account on purchase lines.
Home-page: http://www.tryton.org/
Author: B2CK
Author-email: info at b2ck.com
License: GPL-3
-Download-URL: http://downloads.tryton.org/2.0/
+Download-URL: http://downloads.tryton.org/2.2/
Description: UNKNOWN
Platform: UNKNOWN
Classifier: Development Status :: 5 - Production/Stable
Classifier: Environment :: Plugins
+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: Natural Language :: Bulgarian
+Classifier: Natural Language :: Czech
+Classifier: Natural Language :: Dutch
Classifier: Natural Language :: English
Classifier: Natural Language :: French
Classifier: Natural Language :: German
+Classifier: Natural Language :: Russian
Classifier: Natural Language :: Spanish
Classifier: Operating System :: OS Independent
-Classifier: Programming Language :: Python :: 2.5
Classifier: Programming Language :: Python :: 2.6
Classifier: Programming Language :: Python :: 2.7
Classifier: Topic :: Office/Business
diff --git a/__tryton__.py b/__tryton__.py
index 6fdc6d6..087d44b 100644
--- a/__tryton__.py
+++ b/__tryton__.py
@@ -7,7 +7,7 @@
'name_es_CO': 'Compra Analítica',
'name_es_ES': 'Compra analítica',
'name_fr_FR': 'Achat analytique',
- 'version': '2.0.0',
+ 'version': '2.2.0',
'author': 'B2CK',
'email': 'info at b2ck.com',
'website': 'http://www.tryton.org/',
@@ -30,10 +30,13 @@
'purchase.xml',
],
'translation': [
- 'bg_BG.csv',
- 'de_DE.csv',
- 'es_CO.csv',
- 'es_ES.csv',
- 'fr_FR.csv',
+ 'locale/bg_BG.po',
+ 'locale/cs_CZ.po',
+ 'locale/de_DE.po',
+ 'locale/es_CO.po',
+ 'locale/es_ES.po',
+ 'locale/fr_FR.po',
+ 'locale/nl_NL.po',
+ 'locale/ru_RU.po',
],
}
diff --git a/bg_BG.csv b/bg_BG.csv
deleted file mode 100644
index a62d300..0000000
--- a/bg_BG.csv
+++ /dev/null
@@ -1,3 +0,0 @@
-type,name,res_id,src,value,fuzzy
-error,purchase.purchase,0,"Analytic account is required on line ""%s"" (%d)!","Аналитична сметка е необходима за ред ""%s"" (%d)!",0
-field,"purchase.line,analytic_accounts",0,Analytic Accounts,Аналитични сметки,0
diff --git a/de_DE.csv b/de_DE.csv
deleted file mode 100644
index 3abf76c..0000000
--- a/de_DE.csv
+++ /dev/null
@@ -1,3 +0,0 @@
-type,name,res_id,src,value,fuzzy
-error,purchase.purchase,0,"Analytic account is required on line ""%s"" (%d)!","Kostenstelle ist erforderlich in Zeile ""%s"" (%d)!",0
-field,"purchase.line,analytic_accounts",0,Analytic Accounts,Kostenstellen,0
diff --git a/es_CO.csv b/es_CO.csv
deleted file mode 100644
index 55119be..0000000
--- a/es_CO.csv
+++ /dev/null
@@ -1,107 +0,0 @@
-type,name,res_id,src,value,fuzzy
-error,analytic_account.account,0,You can not create recursive accounts!,¡No puede crear cuentas recursivas!,0
-error,purchase.line,0,"It misses an ""Account Expense"" on product ""%s""!","Falta una propiedad por defecto ""Account Expense""!",0
-error,purchase.line,0,The supplier location is required!,Se requiere la localización del proveedor!,0
-error,purchase.purchase,0,"Analytic account is required on line ""%s"" (%d)!","Se requiere una cuenta analítica en la línea ""%s"" (%d)!",0
-error,purchase.purchase,0,Invoice addresses must be defined for the quotation.,Factura direccionada debe ser definida por el presupuesto.,0
-error,purchase.purchase,0,"It misses an ""Account Payable"" on the party ""%s""!","Falta una ""Cuenta Pagadera"" en el tercero ""%s""!",0
-field,"analytic_account.account,active",0,Active,Activo,0
-field,"analytic_account.account,balance",0,Balance,Balance,0
-field,"analytic_account.account,childs",0,Children,Descendientes,0
-field,"analytic_account.account,code",0,Code,Código,0
-field,"analytic_account.account,company",0,Company,Compañía,0
-field,"analytic_account.account,credit",0,Credit,Crédito,0
-field,"analytic_account.account,currency",0,Currency,Moneda,0
-field,"analytic_account.account,currency_digits",0,Currency Digits,Dígitos de Moneda,0
-field,"analytic_account.account,debit",0,Debit,Débito,0
-field,"analytic_account.account,display_balance",0,Display Balance,Mostrar Balance,0
-field,"analytic_account.account,mandatory",0,Mandatory,Obligatorio,0
-field,"analytic_account.account,name",0,Name,Nombre,0
-field,"analytic_account.account,note",0,Note,Nota,0
-field,"analytic_account.account,parent",0,Parent,Padre,0
-field,"analytic_account.account,rec_name",0,Name,Nombre,0
-field,"analytic_account.account,root",0,Root,Raíz,0
-field,"analytic_account.account,state",0,State,Estado,0
-field,"analytic_account.account,type",0,Type,Tipo,0
-field,"purchase.line,amount",0,Amount,Cantidad,0
-field,"purchase.line,analytic_accounts",0,Analytic Accounts,Cuentas Analíticas,0
-field,"purchase.line,description",0,Description,Descripción,0
-field,"purchase.line,invoice_lines",0,Invoice Lines,Líneas de Factura,0
-field,"purchase.line,move_done",0,Moves Done,Movimientos Hechos,0
-field,"purchase.line,move_exception",0,Moves Exception,Exepción de Movimientos,0
-field,"purchase.line,moves",0,Moves,Movimientos,0
-field,"purchase.line,moves_ignored",0,Ignored Moves,Movimientos Ignorados,0
-field,"purchase.line,moves_recreated",0,Recreated Moves,Movimientos Recreados,0
-field,"purchase.line,note",0,Note,Nota,0
-field,"purchase.line,product",0,Product,Producto,0
-field,"purchase.line,purchase",0,Purchase,Compra,0
-field,"purchase.line,quantity",0,Quantity,Cantidad,0
-field,"purchase.line,rec_name",0,Name,Nombre,0
-field,"purchase.line,sequence",0,Sequence,Secuencia,0
-field,"purchase.line,taxes",0,Taxes,Impuestos,0
-field,"purchase.line,type",0,Type,Tipo,0
-field,"purchase.line,unit",0,Unit,Unidad,0
-field,"purchase.line,unit_digits",0,Unit Digits,Dígitos de Unidad,0
-field,"purchase.line,unit_price",0,Unit Price,Precio Unitario,0
-field,"purchase.purchase,comment",0,Comment,Comentario,0
-field,"purchase.purchase,company",0,Company,Compañía,0
-field,"purchase.purchase,currency",0,Currency,Moneda,0
-field,"purchase.purchase,currency_digits",0,Currency Digits,Dígitos de Moneda,0
-field,"purchase.purchase,description",0,Description,Descripción,0
-field,"purchase.purchase,invoice_address",0,Invoice Address,Dirección de Facturación,0
-field,"purchase.purchase,invoice_exception",0,Invoices Exception,Excepción de Facturación,0
-field,"purchase.purchase,invoice_method",0,Invoice Method,Método de Facturación,0
-field,"purchase.purchase,invoice_paid",0,Invoices Paid,Facturas Pagadas,0
-field,"purchase.purchase,invoices",0,Invoices,Facturas,0
-field,"purchase.purchase,invoices_ignored",0,Ignored Invoices,Facturas Ignoradas,0
-field,"purchase.purchase,invoices_recreated",0,Recreated Invoices,Facturas Recreadas,0
-field,"purchase.purchase,invoice_state",0,Invoice State,Estado de Factura,0
-field,"purchase.purchase,lines",0,Lines,Líneas,0
-field,"purchase.purchase,moves",0,Moves,Movimientos,0
-field,"purchase.purchase,packing_done",0,Shipment Done,Envío Finalizado,0
-field,"purchase.purchase,packing_exception",0,Shipments Exception,Excepción de Envíos,0
-field,"purchase.purchase,packings",0,Shipments,Envíos,0
-field,"purchase.purchase,packing_state",0,Shipment State,Estado de Envío,0
-field,"purchase.purchase,party",0,Party,Tercero,0
-field,"purchase.purchase,party_lang",0,Party Language,Idioma del Tercero,0
-field,"purchase.purchase,payment_term",0,Payment Term,Término de Pago,0
-field,"purchase.purchase,purchase_date",0,Purchase Date,Fecha de Compra,0
-field,"purchase.purchase,rec_name",0,Name,Nombre,0
-field,"purchase.purchase,reference",0,Reference,Referencia,0
-field,"purchase.purchase,state",0,State,Estado,0
-field,"purchase.purchase,supplier_reference",0,Supplier Reference,Referencia del Proveedor,0
-field,"purchase.purchase,tax_amount",0,Tax,Impuesto,0
-field,"purchase.purchase,total_amount",0,Total,Total,0
-field,"purchase.purchase,untaxed_amount",0,Untaxed,Sin Impuesto,0
-field,"purchase.purchase,warehouse",0,Warehouse,Depósito,0
-model,"analytic_account.account,name",0,Analytic Account,Cuenta Analítica,0
-model,"purchase.line,name",0,Purchase Line,Línea de Compra,0
-model,"purchase.purchase,name",0,Purchase,Compra,0
-selection,"analytic_account.account,display_balance",0,Credit - Debit,Crédito - Débito,0
-selection,"analytic_account.account,display_balance",0,Debit - Credit,Débito - Crédito,0
-selection,"analytic_account.account,state",0,Closed,Cerrado,0
-selection,"analytic_account.account,state",0,Draft,Borrador,0
-selection,"analytic_account.account,state",0,Opened,Abierto,0
-selection,"analytic_account.account,type",0,Normal,Normal,0
-selection,"analytic_account.account,type",0,Root,Raíz,0
-selection,"analytic_account.account,type",0,View,Vista,0
-selection,"purchase.line,type",0,Comment,Comentario,0
-selection,"purchase.line,type",0,Line,Línea,0
-selection,"purchase.line,type",0,Subtotal,Subtotal,0
-selection,"purchase.line,type",0,Title,Título,0
-selection,"purchase.purchase,invoice_method",0,Based On Order,Basado En La Orden,0
-selection,"purchase.purchase,invoice_method",0,Based On Shipment,Basado En El Envío,0
-selection,"purchase.purchase,invoice_method",0,Manual,Manual,0
-selection,"purchase.purchase,invoice_state",0,Exception,Excepción,0
-selection,"purchase.purchase,invoice_state",0,None,Ninguno,0
-selection,"purchase.purchase,invoice_state",0,Paid,Pagado,0
-selection,"purchase.purchase,invoice_state",0,Waiting,En Espera,0
-selection,"purchase.purchase,packing_state",0,Exception,Excepción,0
-selection,"purchase.purchase,packing_state",0,None,Ninguno,0
-selection,"purchase.purchase,packing_state",0,Received,Recibido,0
-selection,"purchase.purchase,packing_state",0,Waiting,En Espera,0
-selection,"purchase.purchase,state",0,Canceled,Cancelado,0
-selection,"purchase.purchase,state",0,Confirmed,Confirmado,0
-selection,"purchase.purchase,state",0,Done,Hecho,0
-selection,"purchase.purchase,state",0,Draft,Borrador,0
-selection,"purchase.purchase,state",0,Quotation,Cotización,0
diff --git a/es_ES.csv b/es_ES.csv
deleted file mode 100644
index e3b6b93..0000000
--- a/es_ES.csv
+++ /dev/null
@@ -1,99 +0,0 @@
-type,name,res_id,src,value,fuzzy
-error,analytic_account.account,0,You can not create recursive accounts!,No puede crear cuentas recursivas,0
-error,purchase.line,0,"It misses an ""Account Expense"" on product ""%s""!",Falta la propiedad «Cuenta de gastos» en el producto «%s»,0
-error,purchase.line,0,The supplier location is required!,Se necesita la ubicación del proveedor,0
-error,purchase.purchase,0,"Analytic account is required on line ""%s"" (%d)!",Se necesita una cuenta analítica en la línea «%s» (%d),0
-error,purchase.purchase,0,Invoice addresses must be defined for the quotation.,Se necesita la dirección de facturación para el presupuesto.,0
-error,purchase.purchase,0,"It misses an ""Account Payable"" on the party ""%s""!",Falta una «Cuenta por pagar» en el tercero «%s»,0
-field,"analytic_account.account,active",0,Active,Activa,0
-field,"analytic_account.account,balance",0,Balance,Balance,0
-field,"analytic_account.account,childs",0,Children,Hijos,0
-field,"analytic_account.account,code",0,Code,Código,0
-field,"analytic_account.account,company",0,Company,Empresa,0
-field,"analytic_account.account,credit",0,Credit,Haber,0
-field,"analytic_account.account,currency",0,Currency,Divisa,0
-field,"analytic_account.account,currency_digits",0,Currency Digits,Decimales de la divisa,0
-field,"analytic_account.account,debit",0,Debit,Debe,0
-field,"analytic_account.account,display_balance",0,Display Balance,Mostrar balance,0
-field,"analytic_account.account,mandatory",0,Mandatory,Obligatorio,0
-field,"analytic_account.account,name",0,Name,Nombre,0
-field,"analytic_account.account,note",0,Note,Nota,0
-field,"analytic_account.account,parent",0,Parent,Padre,0
-field,"analytic_account.account,rec_name",0,Name,Nombre,0
-field,"analytic_account.account,root",0,Root,Raíz,0
-field,"analytic_account.account,state",0,State,Estado,0
-field,"analytic_account.account,type",0,Type,Tipo,0
-field,"purchase.line,amount",0,Amount,Cantidad,0
-field,"purchase.line,analytic_accounts",0,Analytic Accounts,Cuentas analíticas,0
-field,"purchase.line,description",0,Description,Descripción,0
-field,"purchase.line,invoice_lines",0,Invoice Lines,Líneas de factura,0
-field,"purchase.line,move_done",0,Moves Done,Movimientos terminados,0
-field,"purchase.line,move_exception",0,Moves Exception,Exepción de movimientos,0
-field,"purchase.line,moves",0,Moves,Movimientos,0
-field,"purchase.line,moves_ignored",0,Ignored Moves,Movimientos ignorados,0
-field,"purchase.line,moves_recreated",0,Recreated Moves,Movimientos recreados,0
-field,"purchase.line,note",0,Note,Nota,0
-field,"purchase.line,product",0,Product,Producto,0
-field,"purchase.line,purchase",0,Purchase,Compra,0
-field,"purchase.line,quantity",0,Quantity,Cantidad,0
-field,"purchase.line,rec_name",0,Name,Nombre,0
-field,"purchase.line,sequence",0,Sequence,Secuencia,0
-field,"purchase.line,taxes",0,Taxes,Impuestos,0
-field,"purchase.line,type",0,Type,Tipo,0
-field,"purchase.line,unit",0,Unit,Unidad,0
-field,"purchase.line,unit_digits",0,Unit Digits,Decimales de la unidad,0
-field,"purchase.line,unit_price",0,Unit Price,Precio unitario,0
-field,"purchase.purchase,comment",0,Comment,Comentario,0
-field,"purchase.purchase,company",0,Company,Empresa,0
-field,"purchase.purchase,currency",0,Currency,Divisa,0
-field,"purchase.purchase,currency_digits",0,Currency Digits,Decimales de la divisa,0
-field,"purchase.purchase,description",0,Description,Descripción,0
-field,"purchase.purchase,invoice_address",0,Invoice Address,Dirección de facturación,0
-field,"purchase.purchase,invoice_exception",0,Invoices Exception,Excepción de facturas,0
-field,"purchase.purchase,invoice_method",0,Invoice Method,Método de facturación,0
-field,"purchase.purchase,invoice_paid",0,Invoices Paid,Facturas pagadas,0
-field,"purchase.purchase,invoices",0,Invoices,Facturas,0
-field,"purchase.purchase,invoices_ignored",0,Ignored Invoices,Facturas ignoradas,0
-field,"purchase.purchase,invoices_recreated",0,Recreated Invoices,Facturas recreadas,0
-field,"purchase.purchase,invoice_state",0,Invoice State,Estado de factura,0
-field,"purchase.purchase,lines",0,Lines,Líneas,0
-field,"purchase.purchase,moves",0,Moves,Movimientos,0
-field,"purchase.purchase,party",0,Party,Tercero,0
-field,"purchase.purchase,party_lang",0,Party Language,Idioma del tercero,0
-field,"purchase.purchase,payment_term",0,Payment Term,Plazo de pago,0
-field,"purchase.purchase,purchase_date",0,Purchase Date,Fecha de compra,0
-field,"purchase.purchase,rec_name",0,Name,Nombre,0
-field,"purchase.purchase,reference",0,Reference,Referencia,0
-field,"purchase.purchase,state",0,State,Estado,0
-field,"purchase.purchase,supplier_reference",0,Supplier Reference,Referencia del proveedor,0
-field,"purchase.purchase,tax_amount",0,Tax,Impuesto,0
-field,"purchase.purchase,total_amount",0,Total,Total,0
-field,"purchase.purchase,untaxed_amount",0,Untaxed,Sin Impuestos,0
-field,"purchase.purchase,warehouse",0,Warehouse,Depósito,0
-model,"analytic_account.account,name",0,Analytic Account,Cuenta analítica,0
-model,"purchase.line,name",0,Purchase Line,Línea de compra,0
-model,"purchase.purchase,name",0,Purchase,Compra,0
-selection,"analytic_account.account,display_balance",0,Credit - Debit,Haber - Debe,0
-selection,"analytic_account.account,display_balance",0,Debit - Credit,Debe - Haber,0
-selection,"analytic_account.account,state",0,Closed,Cerrado,0
-selection,"analytic_account.account,state",0,Draft,Borrador,0
-selection,"analytic_account.account,state",0,Opened,Abierta,0
-selection,"analytic_account.account,type",0,Normal,Normal,0
-selection,"analytic_account.account,type",0,Root,Raíz,0
-selection,"analytic_account.account,type",0,View,Vista,0
-selection,"purchase.line,type",0,Comment,Comentario,0
-selection,"purchase.line,type",0,Line,Línea,0
-selection,"purchase.line,type",0,Subtotal,Subtotal,0
-selection,"purchase.line,type",0,Title,Título,0
-selection,"purchase.purchase,invoice_method",0,Based On Order,Basado en la orden,0
-selection,"purchase.purchase,invoice_method",0,Based On Shipment,Basado en el envío,0
-selection,"purchase.purchase,invoice_method",0,Manual,Manual,0
-selection,"purchase.purchase,invoice_state",0,Exception,Excepción,0
-selection,"purchase.purchase,invoice_state",0,None,Ninguno,0
-selection,"purchase.purchase,invoice_state",0,Paid,Pagada,0
-selection,"purchase.purchase,invoice_state",0,Waiting,En espera,0
-selection,"purchase.purchase,state",0,Canceled,Cancelada,0
-selection,"purchase.purchase,state",0,Confirmed,Confirmada,0
-selection,"purchase.purchase,state",0,Done,Terminada,0
-selection,"purchase.purchase,state",0,Draft,Borrador,0
-selection,"purchase.purchase,state",0,Quotation,Presupuesto,0
diff --git a/fr_FR.csv b/fr_FR.csv
deleted file mode 100644
index ca56dbf..0000000
--- a/fr_FR.csv
+++ /dev/null
@@ -1,3 +0,0 @@
-type,name,res_id,src,value,fuzzy
-error,purchase.purchase,0,"Analytic account is required on line ""%s"" (%d)!","Compte analytique requis sur la ligne ""%s"" (%d)!",0
-field,"purchase.line,analytic_accounts",0,Analytic Accounts,Comptes analytiques,0
diff --git a/locale/bg_BG.po b/locale/bg_BG.po
new file mode 100644
index 0000000..34bd171
--- /dev/null
+++ b/locale/bg_BG.po
@@ -0,0 +1,11 @@
+#
+msgid ""
+msgstr "Content-Type: text/plain; charset=utf-8\n"
+
+msgctxt "error:purchase.purchase:0"
+msgid "Analytic account is required on line \"%s\" (%d)!"
+msgstr "Аналитична сметка е необходима за ред \"%s\" (%d)!"
+
+msgctxt "field:purchase.line,analytic_accounts:0"
+msgid "Analytic Accounts"
+msgstr "Аналитични сметки"
diff --git a/locale/cs_CZ.po b/locale/cs_CZ.po
new file mode 100644
index 0000000..4ca1fb1
--- /dev/null
+++ b/locale/cs_CZ.po
@@ -0,0 +1,11 @@
+#
+msgid ""
+msgstr "Content-Type: text/plain; charset=utf-8\n"
+
+msgctxt "error:purchase.purchase:0"
+msgid "Analytic account is required on line \"%s\" (%d)!"
+msgstr ""
+
+msgctxt "field:purchase.line,analytic_accounts:0"
+msgid "Analytic Accounts"
+msgstr ""
diff --git a/locale/de_DE.po b/locale/de_DE.po
new file mode 100644
index 0000000..2889ebb
--- /dev/null
+++ b/locale/de_DE.po
@@ -0,0 +1,11 @@
+#
+msgid ""
+msgstr "Content-Type: text/plain; charset=utf-8\n"
+
+msgctxt "error:purchase.purchase:0"
+msgid "Analytic account is required on line \"%s\" (%d)!"
+msgstr "Kostenstelle ist erforderlich in Zeile \"%s\" (%d)!"
+
+msgctxt "field:purchase.line,analytic_accounts:0"
+msgid "Analytic Accounts"
+msgstr "Kostenstellen"
diff --git a/locale/es_CO.po b/locale/es_CO.po
new file mode 100644
index 0000000..7941d64
--- /dev/null
+++ b/locale/es_CO.po
@@ -0,0 +1,395 @@
+#
+msgid ""
+msgstr "Content-Type: text/plain; charset=utf-8\n"
+
+msgctxt "error:analytic_account.account:0"
+msgid "You can not create recursive accounts!"
+msgstr "¡No puede crear cuentas recursivas!"
+
+msgctxt "error:purchase.line:0"
+msgid "It misses an \"Account Expense\" on product \"%s\"!"
+msgstr "Falta una propiedad por defecto \"Account Expense\"!"
+
+msgctxt "error:purchase.line:0"
+msgid "The supplier location is required!"
+msgstr "Se requiere la localización del proveedor!"
+
+msgctxt "error:purchase.purchase:0"
+msgid "Analytic account is required on line \"%s\" (%d)!"
+msgstr "Se requiere una cuenta analítica en la línea \"%s\" (%d)!"
+
+msgctxt "error:purchase.purchase:0"
+msgid "Invoice addresses must be defined for the quotation."
+msgstr "Factura direccionada debe ser definida por el presupuesto."
+
+msgctxt "error:purchase.purchase:0"
+msgid "It misses an \"Account Payable\" on the party \"%s\"!"
+msgstr "Falta una \"Cuenta Pagadera\" en el tercero \"%s\"!"
+
+msgctxt "field:analytic_account.account,active:0"
+msgid "Active"
+msgstr "Activo"
+
+msgctxt "field:analytic_account.account,balance:0"
+msgid "Balance"
+msgstr "Balance"
+
+msgctxt "field:analytic_account.account,childs:0"
+msgid "Children"
+msgstr "Descendientes"
+
+msgctxt "field:analytic_account.account,code:0"
+msgid "Code"
+msgstr "Código"
+
+msgctxt "field:analytic_account.account,company:0"
+msgid "Company"
+msgstr "Compañía"
+
+msgctxt "field:analytic_account.account,credit:0"
+msgid "Credit"
+msgstr "Crédito"
+
+msgctxt "field:analytic_account.account,currency:0"
+msgid "Currency"
+msgstr "Moneda"
+
+msgctxt "field:analytic_account.account,currency_digits:0"
+msgid "Currency Digits"
+msgstr "Dígitos de Moneda"
+
+msgctxt "field:analytic_account.account,debit:0"
+msgid "Debit"
+msgstr "Débito"
+
+msgctxt "field:analytic_account.account,display_balance:0"
+msgid "Display Balance"
+msgstr "Mostrar Balance"
+
+msgctxt "field:analytic_account.account,mandatory:0"
+msgid "Mandatory"
+msgstr "Obligatorio"
+
+msgctxt "field:analytic_account.account,name:0"
+msgid "Name"
+msgstr "Nombre"
+
+msgctxt "field:analytic_account.account,note:0"
+msgid "Note"
+msgstr "Nota"
+
+msgctxt "field:analytic_account.account,parent:0"
+msgid "Parent"
+msgstr "Padre"
+
+msgctxt "field:analytic_account.account,rec_name:0"
+msgid "Name"
+msgstr "Nombre"
+
+msgctxt "field:analytic_account.account,root:0"
+msgid "Root"
+msgstr "Raíz"
+
+msgctxt "field:analytic_account.account,state:0"
+msgid "State"
+msgstr "Estado"
+
+msgctxt "field:analytic_account.account,type:0"
+msgid "Type"
+msgstr "Tipo"
+
+msgctxt "field:purchase.line,amount:0"
+msgid "Amount"
+msgstr "Cantidad"
+
+msgctxt "field:purchase.line,analytic_accounts:0"
+msgid "Analytic Accounts"
+msgstr "Cuentas Analíticas"
+
+msgctxt "field:purchase.line,description:0"
+msgid "Description"
+msgstr "Descripción"
+
+msgctxt "field:purchase.line,invoice_lines:0"
+msgid "Invoice Lines"
+msgstr "Líneas de Factura"
+
+msgctxt "field:purchase.line,move_done:0"
+msgid "Moves Done"
+msgstr "Movimientos Hechos"
+
+msgctxt "field:purchase.line,move_exception:0"
+msgid "Moves Exception"
+msgstr "Exepción de Movimientos"
+
+msgctxt "field:purchase.line,moves:0"
+msgid "Moves"
+msgstr "Movimientos"
+
+msgctxt "field:purchase.line,moves_ignored:0"
+msgid "Ignored Moves"
+msgstr "Movimientos Ignorados"
+
+msgctxt "field:purchase.line,moves_recreated:0"
+msgid "Recreated Moves"
+msgstr "Movimientos Recreados"
+
+msgctxt "field:purchase.line,note:0"
+msgid "Note"
+msgstr "Nota"
+
+msgctxt "field:purchase.line,product:0"
+msgid "Product"
+msgstr "Producto"
+
+msgctxt "field:purchase.line,purchase:0"
+msgid "Purchase"
+msgstr "Compra"
+
+msgctxt "field:purchase.line,quantity:0"
+msgid "Quantity"
+msgstr "Cantidad"
+
+msgctxt "field:purchase.line,rec_name:0"
+msgid "Name"
+msgstr "Nombre"
+
+msgctxt "field:purchase.line,sequence:0"
+msgid "Sequence"
+msgstr "Secuencia"
+
+msgctxt "field:purchase.line,taxes:0"
+msgid "Taxes"
+msgstr "Impuestos"
+
+msgctxt "field:purchase.line,type:0"
+msgid "Type"
+msgstr "Tipo"
+
+msgctxt "field:purchase.line,unit:0"
+msgid "Unit"
+msgstr "Unidad"
+
+msgctxt "field:purchase.line,unit_digits:0"
+msgid "Unit Digits"
+msgstr "Dígitos de Unidad"
+
+msgctxt "field:purchase.line,unit_price:0"
+msgid "Unit Price"
+msgstr "Precio Unitario"
+
+msgctxt "field:purchase.purchase,comment:0"
+msgid "Comment"
+msgstr "Comentario"
+
+msgctxt "field:purchase.purchase,company:0"
+msgid "Company"
+msgstr "Compañía"
+
+msgctxt "field:purchase.purchase,currency:0"
+msgid "Currency"
+msgstr "Moneda"
+
+msgctxt "field:purchase.purchase,currency_digits:0"
+msgid "Currency Digits"
+msgstr "Dígitos de Moneda"
+
+msgctxt "field:purchase.purchase,description:0"
+msgid "Description"
+msgstr "Descripción"
+
+msgctxt "field:purchase.purchase,invoice_address:0"
+msgid "Invoice Address"
+msgstr "Dirección de Facturación"
+
+msgctxt "field:purchase.purchase,invoice_exception:0"
+msgid "Invoices Exception"
+msgstr "Excepción de Facturación"
+
+msgctxt "field:purchase.purchase,invoice_method:0"
+msgid "Invoice Method"
+msgstr "Método de Facturación"
+
+msgctxt "field:purchase.purchase,invoice_paid:0"
+msgid "Invoices Paid"
+msgstr "Facturas Pagadas"
+
+msgctxt "field:purchase.purchase,invoice_state:0"
+msgid "Invoice State"
+msgstr "Estado de Factura"
+
+msgctxt "field:purchase.purchase,invoices:0"
+msgid "Invoices"
+msgstr "Facturas"
+
+msgctxt "field:purchase.purchase,invoices_ignored:0"
+msgid "Ignored Invoices"
+msgstr "Facturas Ignoradas"
+
+msgctxt "field:purchase.purchase,invoices_recreated:0"
+msgid "Recreated Invoices"
+msgstr "Facturas Recreadas"
+
+msgctxt "field:purchase.purchase,lines:0"
+msgid "Lines"
+msgstr "Líneas"
+
+msgctxt "field:purchase.purchase,moves:0"
+msgid "Moves"
+msgstr "Movimientos"
+
+msgctxt "field:purchase.purchase,party:0"
+msgid "Party"
+msgstr "Tercero"
+
+msgctxt "field:purchase.purchase,party_lang:0"
+msgid "Party Language"
+msgstr "Idioma del Tercero"
+
+msgctxt "field:purchase.purchase,payment_term:0"
+msgid "Payment Term"
+msgstr "Término de Pago"
+
+msgctxt "field:purchase.purchase,purchase_date:0"
+msgid "Purchase Date"
+msgstr "Fecha de Compra"
+
+msgctxt "field:purchase.purchase,rec_name:0"
+msgid "Name"
+msgstr "Nombre"
+
+msgctxt "field:purchase.purchase,reference:0"
+msgid "Reference"
+msgstr "Referencia"
+
+msgctxt "field:purchase.purchase,state:0"
+msgid "State"
+msgstr "Estado"
+
+msgctxt "field:purchase.purchase,supplier_reference:0"
+msgid "Supplier Reference"
+msgstr "Referencia del Proveedor"
+
+msgctxt "field:purchase.purchase,tax_amount:0"
+msgid "Tax"
+msgstr "Impuesto"
+
+msgctxt "field:purchase.purchase,total_amount:0"
+msgid "Total"
+msgstr "Total"
+
+msgctxt "field:purchase.purchase,untaxed_amount:0"
+msgid "Untaxed"
+msgstr "Sin Impuesto"
+
+msgctxt "field:purchase.purchase,warehouse:0"
+msgid "Warehouse"
+msgstr "Depósito"
+
+msgctxt "model:analytic_account.account,name:0"
+msgid "Analytic Account"
+msgstr "Cuenta Analítica"
+
+msgctxt "model:purchase.line,name:0"
+msgid "Purchase Line"
+msgstr "Línea de Compra"
+
+msgctxt "model:purchase.purchase,name:0"
+msgid "Purchase"
+msgstr "Compra"
+
+msgctxt "selection:analytic_account.account,display_balance:0"
+msgid "Credit - Debit"
+msgstr "Crédito - Débito"
+
+msgctxt "selection:analytic_account.account,display_balance:0"
+msgid "Debit - Credit"
+msgstr "Débito - Crédito"
+
+msgctxt "selection:analytic_account.account,state:0"
+msgid "Closed"
+msgstr "Cerrado"
+
+msgctxt "selection:analytic_account.account,state:0"
+msgid "Draft"
+msgstr "Borrador"
+
+msgctxt "selection:analytic_account.account,state:0"
+msgid "Opened"
+msgstr "Abierto"
+
+msgctxt "selection:analytic_account.account,type:0"
+msgid "Normal"
+msgstr "Normal"
+
+msgctxt "selection:analytic_account.account,type:0"
+msgid "Root"
+msgstr "Raíz"
+
+msgctxt "selection:analytic_account.account,type:0"
+msgid "View"
+msgstr "Vista"
+
+msgctxt "selection:purchase.line,type:0"
+msgid "Comment"
+msgstr "Comentario"
+
+msgctxt "selection:purchase.line,type:0"
+msgid "Line"
+msgstr "Línea"
+
+msgctxt "selection:purchase.line,type:0"
+msgid "Subtotal"
+msgstr "Subtotal"
+
+msgctxt "selection:purchase.line,type:0"
+msgid "Title"
+msgstr "Título"
+
+msgctxt "selection:purchase.purchase,invoice_method:0"
+msgid "Based On Order"
+msgstr "Basado En La Orden"
+
+msgctxt "selection:purchase.purchase,invoice_method:0"
+msgid "Based On Shipment"
+msgstr "Basado En El Envío"
+
+msgctxt "selection:purchase.purchase,invoice_method:0"
+msgid "Manual"
+msgstr "Manual"
+
+msgctxt "selection:purchase.purchase,invoice_state:0"
+msgid "Exception"
+msgstr "Excepción"
+
+msgctxt "selection:purchase.purchase,invoice_state:0"
+msgid "None"
+msgstr "Ninguno"
+
+msgctxt "selection:purchase.purchase,invoice_state:0"
+msgid "Paid"
+msgstr "Pagado"
+
+msgctxt "selection:purchase.purchase,invoice_state:0"
+msgid "Waiting"
+msgstr "En Espera"
+
+msgctxt "selection:purchase.purchase,state:0"
+msgid "Canceled"
+msgstr "Cancelado"
+
+msgctxt "selection:purchase.purchase,state:0"
+msgid "Confirmed"
+msgstr "Confirmado"
+
+msgctxt "selection:purchase.purchase,state:0"
+msgid "Done"
+msgstr "Hecho"
+
+msgctxt "selection:purchase.purchase,state:0"
+msgid "Draft"
+msgstr "Borrador"
+
+msgctxt "selection:purchase.purchase,state:0"
+msgid "Quotation"
+msgstr "Cotización"
diff --git a/locale/es_ES.po b/locale/es_ES.po
new file mode 100644
index 0000000..ea3c5a4
--- /dev/null
+++ b/locale/es_ES.po
@@ -0,0 +1,395 @@
+#
+msgid ""
+msgstr "Content-Type: text/plain; charset=utf-8\n"
+
+msgctxt "error:analytic_account.account:0"
+msgid "You can not create recursive accounts!"
+msgstr "No puede crear cuentas recursivas"
+
+msgctxt "error:purchase.line:0"
+msgid "It misses an \"Account Expense\" on product \"%s\"!"
+msgstr "Falta la propiedad «Cuenta de gastos» en el producto «%s»"
+
+msgctxt "error:purchase.line:0"
+msgid "The supplier location is required!"
+msgstr "Se necesita la ubicación del proveedor"
+
+msgctxt "error:purchase.purchase:0"
+msgid "Analytic account is required on line \"%s\" (%d)!"
+msgstr "Se necesita una cuenta analítica en la línea «%s» (%d)"
+
+msgctxt "error:purchase.purchase:0"
+msgid "Invoice addresses must be defined for the quotation."
+msgstr "Se necesita la dirección de facturación para el presupuesto."
+
+msgctxt "error:purchase.purchase:0"
+msgid "It misses an \"Account Payable\" on the party \"%s\"!"
+msgstr "Falta una «Cuenta por pagar» en el tercero «%s»"
+
+msgctxt "field:analytic_account.account,active:0"
+msgid "Active"
+msgstr "Activa"
+
+msgctxt "field:analytic_account.account,balance:0"
+msgid "Balance"
+msgstr "Balance"
+
+msgctxt "field:analytic_account.account,childs:0"
+msgid "Children"
+msgstr "Hijos"
+
+msgctxt "field:analytic_account.account,code:0"
+msgid "Code"
+msgstr "Código"
+
+msgctxt "field:analytic_account.account,company:0"
+msgid "Company"
+msgstr "Empresa"
+
+msgctxt "field:analytic_account.account,credit:0"
+msgid "Credit"
+msgstr "Haber"
+
+msgctxt "field:analytic_account.account,currency:0"
+msgid "Currency"
+msgstr "Divisa"
+
+msgctxt "field:analytic_account.account,currency_digits:0"
+msgid "Currency Digits"
+msgstr "Decimales de la divisa"
+
+msgctxt "field:analytic_account.account,debit:0"
+msgid "Debit"
+msgstr "Debe"
+
+msgctxt "field:analytic_account.account,display_balance:0"
+msgid "Display Balance"
+msgstr "Mostrar balance"
+
+msgctxt "field:analytic_account.account,mandatory:0"
+msgid "Mandatory"
+msgstr "Obligatorio"
+
+msgctxt "field:analytic_account.account,name:0"
+msgid "Name"
+msgstr "Nombre"
+
+msgctxt "field:analytic_account.account,note:0"
+msgid "Note"
+msgstr "Nota"
+
+msgctxt "field:analytic_account.account,parent:0"
+msgid "Parent"
+msgstr "Padre"
+
+msgctxt "field:analytic_account.account,rec_name:0"
+msgid "Name"
+msgstr "Nombre"
+
+msgctxt "field:analytic_account.account,root:0"
+msgid "Root"
+msgstr "Raíz"
+
+msgctxt "field:analytic_account.account,state:0"
+msgid "State"
+msgstr "Estado"
+
+msgctxt "field:analytic_account.account,type:0"
+msgid "Type"
+msgstr "Tipo"
+
+msgctxt "field:purchase.line,amount:0"
+msgid "Amount"
+msgstr "Cantidad"
+
+msgctxt "field:purchase.line,analytic_accounts:0"
+msgid "Analytic Accounts"
+msgstr "Cuentas analíticas"
+
+msgctxt "field:purchase.line,description:0"
+msgid "Description"
+msgstr "Descripción"
+
+msgctxt "field:purchase.line,invoice_lines:0"
+msgid "Invoice Lines"
+msgstr "Líneas de factura"
+
+msgctxt "field:purchase.line,move_done:0"
+msgid "Moves Done"
+msgstr "Movimientos terminados"
+
+msgctxt "field:purchase.line,move_exception:0"
+msgid "Moves Exception"
+msgstr "Exepción de movimientos"
+
+msgctxt "field:purchase.line,moves:0"
+msgid "Moves"
+msgstr "Movimientos"
+
+msgctxt "field:purchase.line,moves_ignored:0"
+msgid "Ignored Moves"
+msgstr "Movimientos ignorados"
+
+msgctxt "field:purchase.line,moves_recreated:0"
+msgid "Recreated Moves"
+msgstr "Movimientos recreados"
+
+msgctxt "field:purchase.line,note:0"
+msgid "Note"
+msgstr "Nota"
+
+msgctxt "field:purchase.line,product:0"
+msgid "Product"
+msgstr "Producto"
+
+msgctxt "field:purchase.line,purchase:0"
+msgid "Purchase"
+msgstr "Compra"
+
+msgctxt "field:purchase.line,quantity:0"
+msgid "Quantity"
+msgstr "Cantidad"
+
+msgctxt "field:purchase.line,rec_name:0"
+msgid "Name"
+msgstr "Nombre"
+
+msgctxt "field:purchase.line,sequence:0"
+msgid "Sequence"
+msgstr "Secuencia"
+
+msgctxt "field:purchase.line,taxes:0"
+msgid "Taxes"
+msgstr "Impuestos"
+
+msgctxt "field:purchase.line,type:0"
+msgid "Type"
+msgstr "Tipo"
+
+msgctxt "field:purchase.line,unit:0"
+msgid "Unit"
+msgstr "Unidad"
+
+msgctxt "field:purchase.line,unit_digits:0"
+msgid "Unit Digits"
+msgstr "Decimales de la unidad"
+
+msgctxt "field:purchase.line,unit_price:0"
+msgid "Unit Price"
+msgstr "Precio unitario"
+
+msgctxt "field:purchase.purchase,comment:0"
+msgid "Comment"
+msgstr "Comentario"
+
+msgctxt "field:purchase.purchase,company:0"
+msgid "Company"
+msgstr "Empresa"
+
+msgctxt "field:purchase.purchase,currency:0"
+msgid "Currency"
+msgstr "Divisa"
+
+msgctxt "field:purchase.purchase,currency_digits:0"
+msgid "Currency Digits"
+msgstr "Decimales de la divisa"
+
+msgctxt "field:purchase.purchase,description:0"
+msgid "Description"
+msgstr "Descripción"
+
+msgctxt "field:purchase.purchase,invoice_address:0"
+msgid "Invoice Address"
+msgstr "Dirección de facturación"
+
+msgctxt "field:purchase.purchase,invoice_exception:0"
+msgid "Invoices Exception"
+msgstr "Excepción de facturas"
+
+msgctxt "field:purchase.purchase,invoice_method:0"
+msgid "Invoice Method"
+msgstr "Método de facturación"
+
+msgctxt "field:purchase.purchase,invoice_paid:0"
+msgid "Invoices Paid"
+msgstr "Facturas pagadas"
+
+msgctxt "field:purchase.purchase,invoice_state:0"
+msgid "Invoice State"
+msgstr "Estado de factura"
+
+msgctxt "field:purchase.purchase,invoices:0"
+msgid "Invoices"
+msgstr "Facturas"
+
+msgctxt "field:purchase.purchase,invoices_ignored:0"
+msgid "Ignored Invoices"
+msgstr "Facturas ignoradas"
+
+msgctxt "field:purchase.purchase,invoices_recreated:0"
+msgid "Recreated Invoices"
+msgstr "Facturas recreadas"
+
+msgctxt "field:purchase.purchase,lines:0"
+msgid "Lines"
+msgstr "Líneas"
+
+msgctxt "field:purchase.purchase,moves:0"
+msgid "Moves"
+msgstr "Movimientos"
+
+msgctxt "field:purchase.purchase,party:0"
+msgid "Party"
+msgstr "Tercero"
+
+msgctxt "field:purchase.purchase,party_lang:0"
+msgid "Party Language"
+msgstr "Idioma del tercero"
+
+msgctxt "field:purchase.purchase,payment_term:0"
+msgid "Payment Term"
+msgstr "Plazo de pago"
+
+msgctxt "field:purchase.purchase,purchase_date:0"
+msgid "Purchase Date"
+msgstr "Fecha de compra"
+
+msgctxt "field:purchase.purchase,rec_name:0"
+msgid "Name"
+msgstr "Nombre"
+
+msgctxt "field:purchase.purchase,reference:0"
+msgid "Reference"
+msgstr "Referencia"
+
+msgctxt "field:purchase.purchase,state:0"
+msgid "State"
+msgstr "Estado"
+
+msgctxt "field:purchase.purchase,supplier_reference:0"
+msgid "Supplier Reference"
+msgstr "Referencia del proveedor"
+
+msgctxt "field:purchase.purchase,tax_amount:0"
+msgid "Tax"
+msgstr "Impuesto"
+
+msgctxt "field:purchase.purchase,total_amount:0"
+msgid "Total"
+msgstr "Total"
+
+msgctxt "field:purchase.purchase,untaxed_amount:0"
+msgid "Untaxed"
+msgstr "Sin Impuestos"
+
+msgctxt "field:purchase.purchase,warehouse:0"
+msgid "Warehouse"
+msgstr "Depósito"
+
+msgctxt "model:analytic_account.account,name:0"
+msgid "Analytic Account"
+msgstr "Cuenta analítica"
+
+msgctxt "model:purchase.line,name:0"
+msgid "Purchase Line"
+msgstr "Línea de compra"
+
+msgctxt "model:purchase.purchase,name:0"
+msgid "Purchase"
+msgstr "Compra"
+
+msgctxt "selection:analytic_account.account,display_balance:0"
+msgid "Credit - Debit"
+msgstr "Haber - Debe"
+
+msgctxt "selection:analytic_account.account,display_balance:0"
+msgid "Debit - Credit"
+msgstr "Debe - Haber"
+
+msgctxt "selection:analytic_account.account,state:0"
+msgid "Closed"
+msgstr "Cerrado"
+
+msgctxt "selection:analytic_account.account,state:0"
+msgid "Draft"
+msgstr "Borrador"
+
+msgctxt "selection:analytic_account.account,state:0"
+msgid "Opened"
+msgstr "Abierta"
+
+msgctxt "selection:analytic_account.account,type:0"
+msgid "Normal"
+msgstr "Normal"
+
+msgctxt "selection:analytic_account.account,type:0"
+msgid "Root"
+msgstr "Raíz"
+
+msgctxt "selection:analytic_account.account,type:0"
+msgid "View"
+msgstr "Vista"
+
+msgctxt "selection:purchase.line,type:0"
+msgid "Comment"
+msgstr "Comentario"
+
+msgctxt "selection:purchase.line,type:0"
+msgid "Line"
+msgstr "Línea"
+
+msgctxt "selection:purchase.line,type:0"
+msgid "Subtotal"
+msgstr "Subtotal"
+
+msgctxt "selection:purchase.line,type:0"
+msgid "Title"
+msgstr "Título"
+
+msgctxt "selection:purchase.purchase,invoice_method:0"
+msgid "Based On Order"
+msgstr "Basado en la orden"
+
+msgctxt "selection:purchase.purchase,invoice_method:0"
+msgid "Based On Shipment"
+msgstr "Basado en el envío"
+
+msgctxt "selection:purchase.purchase,invoice_method:0"
+msgid "Manual"
+msgstr "Manual"
+
+msgctxt "selection:purchase.purchase,invoice_state:0"
+msgid "Exception"
+msgstr "Excepción"
+
+msgctxt "selection:purchase.purchase,invoice_state:0"
+msgid "None"
+msgstr "Ninguno"
+
+msgctxt "selection:purchase.purchase,invoice_state:0"
+msgid "Paid"
+msgstr "Pagada"
+
+msgctxt "selection:purchase.purchase,invoice_state:0"
+msgid "Waiting"
+msgstr "En espera"
+
+msgctxt "selection:purchase.purchase,state:0"
+msgid "Canceled"
+msgstr "Cancelada"
+
+msgctxt "selection:purchase.purchase,state:0"
+msgid "Confirmed"
+msgstr "Confirmada"
+
+msgctxt "selection:purchase.purchase,state:0"
+msgid "Done"
+msgstr "Terminada"
+
+msgctxt "selection:purchase.purchase,state:0"
+msgid "Draft"
+msgstr "Borrador"
+
+msgctxt "selection:purchase.purchase,state:0"
+msgid "Quotation"
+msgstr "Presupuesto"
diff --git a/locale/fr_FR.po b/locale/fr_FR.po
new file mode 100644
index 0000000..f242ac2
--- /dev/null
+++ b/locale/fr_FR.po
@@ -0,0 +1,11 @@
+#
+msgid ""
+msgstr "Content-Type: text/plain; charset=utf-8\n"
+
+msgctxt "error:purchase.purchase:0"
+msgid "Analytic account is required on line \"%s\" (%d)!"
+msgstr "Compte analytique requis sur la ligne \"%s\" (%d)!"
+
+msgctxt "field:purchase.line,analytic_accounts:0"
+msgid "Analytic Accounts"
+msgstr "Comptes analytiques"
diff --git a/locale/nl_NL.po b/locale/nl_NL.po
new file mode 100644
index 0000000..4ca1fb1
--- /dev/null
+++ b/locale/nl_NL.po
@@ -0,0 +1,11 @@
+#
+msgid ""
+msgstr "Content-Type: text/plain; charset=utf-8\n"
+
+msgctxt "error:purchase.purchase:0"
+msgid "Analytic account is required on line \"%s\" (%d)!"
+msgstr ""
+
+msgctxt "field:purchase.line,analytic_accounts:0"
+msgid "Analytic Accounts"
+msgstr ""
diff --git a/locale/ru_RU.po b/locale/ru_RU.po
new file mode 100644
index 0000000..4ca1fb1
--- /dev/null
+++ b/locale/ru_RU.po
@@ -0,0 +1,11 @@
+#
+msgid ""
+msgstr "Content-Type: text/plain; charset=utf-8\n"
+
+msgctxt "error:purchase.purchase:0"
+msgid "Analytic account is required on line \"%s\" (%d)!"
+msgstr ""
+
+msgctxt "field:purchase.line,analytic_accounts:0"
+msgid "Analytic Accounts"
+msgstr ""
diff --git a/purchase.py b/purchase.py
index 89b71ed..ddc3202 100644
--- a/purchase.py
+++ b/purchase.py
@@ -1,9 +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.
-from __future__ import with_statement
from trytond.model import ModelView, ModelSQL, fields
-from trytond.pyson import Not, Equal, Eval
+from trytond.pyson import Eval
from trytond.transaction import Transaction
+from trytond.pool import Pool
class Purchase(ModelSQL, ModelView):
@@ -17,9 +17,9 @@ class Purchase(ModelSQL, ModelView):
})
def check_for_quotation(self, purchase_id):
- account_selection_obj = self.pool.get(
+ account_selection_obj = Pool().get(
'analytic_account.account.selection')
- purchase_line_obj = self.pool.get('purchase.line')
+ purchase_line_obj = Pool().get('purchase.line')
res = super(Purchase, self).check_for_quotation(purchase_id)
@@ -43,20 +43,20 @@ class PurchaseLine(ModelSQL, ModelView):
_name = 'purchase.line'
analytic_accounts = fields.Many2One('analytic_account.account.selection',
- 'Analytic Accounts',
- states={
- 'invisible': Not(Equal(Eval('type'), 'line')),
- })
+ 'Analytic Accounts',
+ states={
+ 'invisible': Eval('type') != 'line',
+ }, depends=['type'])
def _view_look_dom_arch(self, tree, type, field_children=None):
- analytic_account_obj = self.pool.get('analytic_account.account')
+ analytic_account_obj = Pool().get('analytic_account.account')
analytic_account_obj.convert_view(tree)
arch, fields = super(PurchaseLine, self)._view_look_dom_arch(tree, type,
field_children=field_children)
return arch, fields
def fields_get(self, fields_names=None):
- analytic_account_obj = self.pool.get('analytic_account.account')
+ analytic_account_obj = Pool().get('analytic_account.account')
res = super(PurchaseLine, self).fields_get(fields_names)
@@ -67,8 +67,13 @@ class PurchaseLine(ModelSQL, ModelView):
analytic_accounts_field, fields_names))
return res
+ def default_get(self, fields, with_rec_name=True):
+ fields = [x for x in fields if not x.startswith('analytic_account_')]
+ return super(PurchaseLine, self).default_get(fields,
+ with_rec_name=with_rec_name)
+
def read(self, ids, fields_names=None):
- selection_obj = self.pool.get('analytic_account.account.selection')
+ selection_obj = Pool().get('analytic_account.account.selection')
int_id = False
if isinstance(ids, (int, long)):
@@ -118,7 +123,7 @@ class PurchaseLine(ModelSQL, ModelView):
return res
def create(self, vals):
- selection_obj = self.pool.get('analytic_account.account.selection')
+ selection_obj = Pool().get('analytic_account.account.selection')
vals = vals.copy()
selection_vals = {}
for field in vals.keys():
@@ -135,7 +140,7 @@ class PurchaseLine(ModelSQL, ModelView):
return super(PurchaseLine, self).create(vals)
def write(self, ids, vals):
- selection_obj = self.pool.get('analytic_account.account.selection')
+ selection_obj = Pool().get('analytic_account.account.selection')
vals = vals.copy()
if isinstance(ids, (int, long)):
ids = [ids]
@@ -176,7 +181,7 @@ class PurchaseLine(ModelSQL, ModelView):
return super(PurchaseLine, self).write(ids, vals)
def delete(self, ids):
- selection_obj = self.pool.get('analytic_account.account.selection')
+ selection_obj = Pool().get('analytic_account.account.selection')
if isinstance(ids, (int, long)):
ids = [ids]
@@ -191,7 +196,7 @@ class PurchaseLine(ModelSQL, ModelView):
return res
def copy(self, ids, default=None):
- selection_obj = self.pool.get('analytic_account.account.selection')
+ selection_obj = Pool().get('analytic_account.account.selection')
new_ids = super(PurchaseLine, self).copy(ids, default=default)
@@ -212,7 +217,7 @@ class PurchaseLine(ModelSQL, ModelView):
return new_ids
def get_invoice_line(self, line):
- account_selection_obj = self.pool.get('analytic_account.account.selection')
+ account_selection_obj = Pool().get('analytic_account.account.selection')
res = super(PurchaseLine, self).get_invoice_line(line)
if not res:
@@ -232,21 +237,21 @@ class Account(ModelSQL, ModelView):
_name = 'analytic_account.account'
def delete(self, ids):
- purchase_line_obj = self.pool.get('purchase.line')
+ purchase_line_obj = Pool().get('purchase.line')
res = super(Account, self).delete(ids)
# Restart the cache on the fields_view_get method of purchase.line
purchase_line_obj.fields_view_get.reset()
return res
def create(self, vals):
- purchase_line_obj = self.pool.get('purchase.line')
+ purchase_line_obj = Pool().get('purchase.line')
res = super(Account, self).create(vals)
# Restart the cache on the fields_view_get method of purchase.line
purchase_line_obj.fields_view_get.reset()
return res
def write(self, ids, vals):
- purchase_line_obj = self.pool.get('purchase.line')
+ purchase_line_obj = Pool().get('purchase.line')
res = super(Account, self).write(ids, vals)
# Restart the cache on the fields_view_get method of purchase.line
purchase_line_obj.fields_view_get.reset()
diff --git a/setup.py b/setup.py
index c81bccb..1b5cedf 100644
--- a/setup.py
+++ b/setup.py
@@ -39,17 +39,20 @@ setup(name='trytond_analytic_purchase',
classifiers=[
'Development Status :: 5 - Production/Stable',
'Environment :: Plugins',
+ 'Framework :: Tryton',
'Intended Audience :: Developers',
'Intended Audience :: Financial and Insurance Industry',
'Intended Audience :: Legal Industry',
'License :: OSI Approved :: GNU General Public License (GPL)',
'Natural Language :: Bulgarian',
+ 'Natural Language :: Czech',
+ 'Natural Language :: Dutch',
'Natural Language :: English',
'Natural Language :: French',
'Natural Language :: German',
+ 'Natural Language :: Russian',
'Natural Language :: Spanish',
'Operating System :: OS Independent',
- 'Programming Language :: Python :: 2.5',
'Programming Language :: Python :: 2.6',
'Programming Language :: Python :: 2.7',
'Topic :: Office/Business',
diff --git a/tests/test_analytic_purchase.py b/tests/test_analytic_purchase.py
index c8cdefb..5a575de 100644
--- a/tests/test_analytic_purchase.py
+++ b/tests/test_analytic_purchase.py
@@ -10,7 +10,7 @@ if os.path.isdir(DIR):
import unittest
import trytond.tests.test_tryton
-from trytond.tests.test_tryton import test_view
+from trytond.tests.test_tryton import test_view, test_depends
class AnalyticPurchaseTestCase(unittest.TestCase):
@@ -27,6 +27,12 @@ class AnalyticPurchaseTestCase(unittest.TestCase):
'''
test_view('analytic_purchase')
+ def test0006depends(self):
+ '''
+ Test depends.
+ '''
+ test_depends()
+
def suite():
suite = trytond.tests.test_tryton.suite()
suite.addTests(unittest.TestLoader().loadTestsFromTestCase(
diff --git a/trytond_analytic_purchase.egg-info/PKG-INFO b/trytond_analytic_purchase.egg-info/PKG-INFO
index f83f5c9..b4b5247 100644
--- a/trytond_analytic_purchase.egg-info/PKG-INFO
+++ b/trytond_analytic_purchase.egg-info/PKG-INFO
@@ -1,28 +1,31 @@
Metadata-Version: 1.0
Name: trytond-analytic-purchase
-Version: 2.0.0
+Version: 2.2.0
Summary: Add analytic account on purchase lines.
Home-page: http://www.tryton.org/
Author: B2CK
Author-email: info at b2ck.com
License: GPL-3
-Download-URL: http://downloads.tryton.org/2.0/
+Download-URL: http://downloads.tryton.org/2.2/
Description: UNKNOWN
Platform: UNKNOWN
Classifier: Development Status :: 5 - Production/Stable
Classifier: Environment :: Plugins
+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: Natural Language :: Bulgarian
+Classifier: Natural Language :: Czech
+Classifier: Natural Language :: Dutch
Classifier: Natural Language :: English
Classifier: Natural Language :: French
Classifier: Natural Language :: German
+Classifier: Natural Language :: Russian
Classifier: Natural Language :: Spanish
Classifier: Operating System :: OS Independent
-Classifier: Programming Language :: Python :: 2.5
Classifier: Programming Language :: Python :: 2.6
Classifier: Programming Language :: Python :: 2.7
Classifier: Topic :: Office/Business
diff --git a/trytond_analytic_purchase.egg-info/SOURCES.txt b/trytond_analytic_purchase.egg-info/SOURCES.txt
index ef6e9e9..d915ccb 100644
--- a/trytond_analytic_purchase.egg-info/SOURCES.txt
+++ b/trytond_analytic_purchase.egg-info/SOURCES.txt
@@ -4,11 +4,6 @@ INSTALL
LICENSE
MANIFEST.in
README
-bg_BG.csv
-de_DE.csv
-es_CO.csv
-es_ES.csv
-fr_FR.csv
purchase.xml
setup.py
./__init__.py
@@ -16,6 +11,14 @@ setup.py
./purchase.py
./tests/__init__.py
./tests/test_analytic_purchase.py
+locale/bg_BG.po
+locale/cs_CZ.po
+locale/de_DE.po
+locale/es_CO.po
+locale/es_ES.po
+locale/fr_FR.po
+locale/nl_NL.po
+locale/ru_RU.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 f3b8eb7..1c47be6 100644
--- a/trytond_analytic_purchase.egg-info/requires.txt
+++ b/trytond_analytic_purchase.egg-info/requires.txt
@@ -1,4 +1,4 @@
-trytond_purchase >= 2.0, < 2.1
-trytond_analytic_account >= 2.0, < 2.1
-trytond_analytic_invoice >= 2.0, < 2.1
-trytond >= 2.0, < 2.1
\ No newline at end of file
+trytond_purchase >= 2.2, < 2.3
+trytond_analytic_account >= 2.2, < 2.3
+trytond_analytic_invoice >= 2.2, < 2.3
+trytond >= 2.2, < 2.3
\ No newline at end of file
commit 4eef97c29d660e86f741239893dbddecb2c9ea64
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Tue May 24 19:12:41 2011 +0200
Adding upstream version 2.0.0.
diff --git a/CHANGELOG b/CHANGELOG
index 29d9fb1..f74f0b3 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+Version 2.0.0 - 2011-04-27
+* Bug fixes (see mercurial logs for details)
+
Version 1.8.0 - 2010-11-01
* Bug fixes (see mercurial logs for details)
diff --git a/COPYRIGHT b/COPYRIGHT
index cca7db9..3d2324b 100644
--- a/COPYRIGHT
+++ b/COPYRIGHT
@@ -1,6 +1,6 @@
-Copyright (C) 2008-2010 Cédric Krier.
-Copyright (C) 2008-2010 Bertrand Chenal.
-Copyright (C) 2008-2010 B2CK SPRL.
+Copyright (C) 2008-2011 Cédric Krier.
+Copyright (C) 2008-2011 Bertrand Chenal.
+Copyright (C) 2008-2011 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 fe0dfd0..ad0c50e 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,13 +1,13 @@
Metadata-Version: 1.0
Name: trytond_analytic_purchase
-Version: 1.8.0
+Version: 2.0.0
Summary: Add analytic account on purchase lines.
Home-page: http://www.tryton.org/
Author: B2CK
Author-email: info at b2ck.com
License: GPL-3
-Download-URL: http://downloads.tryton.org/1.8/
+Download-URL: http://downloads.tryton.org/2.0/
Description: UNKNOWN
Platform: UNKNOWN
Classifier: Development Status :: 5 - Production/Stable
@@ -16,11 +16,14 @@ 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: Natural Language :: Bulgarian
Classifier: Natural Language :: English
Classifier: Natural Language :: French
Classifier: Natural Language :: German
Classifier: Natural Language :: Spanish
Classifier: Operating System :: OS Independent
-Classifier: Programming Language :: Python
+Classifier: Programming Language :: Python :: 2.5
+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/__tryton__.py b/__tryton__.py
index 04ebe3c..6fdc6d6 100644
--- a/__tryton__.py
+++ b/__tryton__.py
@@ -2,16 +2,19 @@
#this repository contains the full copyright notices and license terms.
{
'name': 'Analytic Purchase',
+ 'name_bg_BG': 'Аналитични покупки',
'name_de_DE': 'Kostenstellen Einkauf',
'name_es_CO': 'Compra Analítica',
'name_es_ES': 'Compra analítica',
'name_fr_FR': 'Achat analytique',
- 'version': '1.8.0',
+ 'version': '2.0.0',
'author': 'B2CK',
'email': 'info at b2ck.com',
'website': 'http://www.tryton.org/',
'description': '''Add analytic account on purchase lines.
''',
+ 'description_bg_BG': '''Добавя аналитична сметка към редовете на покупка
+''',
'description_de_DE': '''Fügt kostenstellen zu Einkaufspositionen hinzu
''',
'description_es_CO': '''Adiciona contabilidad analítica a las líneas de compra.
@@ -27,6 +30,7 @@
'purchase.xml',
],
'translation': [
+ 'bg_BG.csv',
'de_DE.csv',
'es_CO.csv',
'es_ES.csv',
diff --git a/bg_BG.csv b/bg_BG.csv
new file mode 100644
index 0000000..a62d300
--- /dev/null
+++ b/bg_BG.csv
@@ -0,0 +1,3 @@
+type,name,res_id,src,value,fuzzy
+error,purchase.purchase,0,"Analytic account is required on line ""%s"" (%d)!","Аналитична сметка е необходима за ред ""%s"" (%d)!",0
+field,"purchase.line,analytic_accounts",0,Analytic Accounts,Аналитични сметки,0
diff --git a/purchase.py b/purchase.py
index d8e098f..89b71ed 100644
--- a/purchase.py
+++ b/purchase.py
@@ -48,10 +48,11 @@ class PurchaseLine(ModelSQL, ModelView):
'invisible': Not(Equal(Eval('type'), 'line')),
})
- def _view_look_dom_arch(self, tree, type):
+ def _view_look_dom_arch(self, tree, type, field_children=None):
analytic_account_obj = self.pool.get('analytic_account.account')
analytic_account_obj.convert_view(tree)
- arch, fields = super(PurchaseLine, self)._view_look_dom_arch(tree, type)
+ arch, fields = super(PurchaseLine, self)._view_look_dom_arch(tree, type,
+ field_children=field_children)
return arch, fields
def fields_get(self, fields_names=None):
diff --git a/setup.py b/setup.py
index bad615f..c81bccb 100644
--- a/setup.py
+++ b/setup.py
@@ -43,12 +43,15 @@ setup(name='trytond_analytic_purchase',
'Intended Audience :: Financial and Insurance Industry',
'Intended Audience :: Legal Industry',
'License :: OSI Approved :: GNU General Public License (GPL)',
+ 'Natural Language :: Bulgarian',
'Natural Language :: English',
'Natural Language :: French',
'Natural Language :: German',
'Natural Language :: Spanish',
'Operating System :: OS Independent',
- 'Programming Language :: Python',
+ 'Programming Language :: Python :: 2.5',
+ 'Programming Language :: Python :: 2.6',
+ 'Programming Language :: Python :: 2.7',
'Topic :: Office/Business',
'Topic :: Office/Business :: Financial :: Accounting',
],
diff --git a/trytond_analytic_purchase.egg-info/PKG-INFO b/trytond_analytic_purchase.egg-info/PKG-INFO
index 0eefe2d..f83f5c9 100644
--- a/trytond_analytic_purchase.egg-info/PKG-INFO
+++ b/trytond_analytic_purchase.egg-info/PKG-INFO
@@ -1,13 +1,13 @@
Metadata-Version: 1.0
Name: trytond-analytic-purchase
-Version: 1.8.0
+Version: 2.0.0
Summary: Add analytic account on purchase lines.
Home-page: http://www.tryton.org/
Author: B2CK
Author-email: info at b2ck.com
License: GPL-3
-Download-URL: http://downloads.tryton.org/1.8/
+Download-URL: http://downloads.tryton.org/2.0/
Description: UNKNOWN
Platform: UNKNOWN
Classifier: Development Status :: 5 - Production/Stable
@@ -16,11 +16,14 @@ 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: Natural Language :: Bulgarian
Classifier: Natural Language :: English
Classifier: Natural Language :: French
Classifier: Natural Language :: German
Classifier: Natural Language :: Spanish
Classifier: Operating System :: OS Independent
-Classifier: Programming Language :: Python
+Classifier: Programming Language :: Python :: 2.5
+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_purchase.egg-info/SOURCES.txt b/trytond_analytic_purchase.egg-info/SOURCES.txt
index 9f87c27..ef6e9e9 100644
--- a/trytond_analytic_purchase.egg-info/SOURCES.txt
+++ b/trytond_analytic_purchase.egg-info/SOURCES.txt
@@ -4,6 +4,7 @@ INSTALL
LICENSE
MANIFEST.in
README
+bg_BG.csv
de_DE.csv
es_CO.csv
es_ES.csv
diff --git a/trytond_analytic_purchase.egg-info/requires.txt b/trytond_analytic_purchase.egg-info/requires.txt
index c459d25..f3b8eb7 100644
--- a/trytond_analytic_purchase.egg-info/requires.txt
+++ b/trytond_analytic_purchase.egg-info/requires.txt
@@ -1,4 +1,4 @@
-trytond_purchase >= 1.8, < 1.9
-trytond_analytic_account >= 1.8, < 1.9
-trytond_analytic_invoice >= 1.8, < 1.9
-trytond >= 1.8, < 1.9
\ No newline at end of file
+trytond_purchase >= 2.0, < 2.1
+trytond_analytic_account >= 2.0, < 2.1
+trytond_analytic_invoice >= 2.0, < 2.1
+trytond >= 2.0, < 2.1
\ No newline at end of file
commit 103b591b0a19bfba7549ccdd3b3535e93c4fbdca
Author: Daniel Baumann <daniel at debian.org>
Date: Thu Nov 4 20:12:09 2010 +0100
Adding upstream version 1.8.0.
diff --git a/CHANGELOG b/CHANGELOG
index e36b38a..29d9fb1 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+Version 1.8.0 - 2010-11-01
+* Bug fixes (see mercurial logs for details)
+
Version 1.6.0 - 2010-05-13
* Bug fixes (see mercurial logs for details)
diff --git a/INSTALL b/INSTALL
index bb88e44..8dba8f4 100644
--- a/INSTALL
+++ b/INSTALL
@@ -4,7 +4,7 @@ Installing trytond_analytic_purchase
Prerequisites
-------------
- * Python 2.4 or later (http://www.python.org/)
+ * Python 2.5 or later (http://www.python.org/)
* trytond (http://www.tryton.org/)
* trytond_analytic_account (http://www.tryton.org/)
* trytond_analytic_invoice (http://www.tryton.org/)
diff --git a/PKG-INFO b/PKG-INFO
index a66b9dd..fe0dfd0 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,13 +1,13 @@
Metadata-Version: 1.0
Name: trytond_analytic_purchase
-Version: 1.6.0
+Version: 1.8.0
Summary: Add analytic account on purchase lines.
Home-page: http://www.tryton.org/
Author: B2CK
Author-email: info at b2ck.com
License: GPL-3
-Download-URL: http://downloads.tryton.org/1.6/
+Download-URL: http://downloads.tryton.org/1.8/
Description: UNKNOWN
Platform: UNKNOWN
Classifier: Development Status :: 5 - Production/Stable
diff --git a/__tryton__.py b/__tryton__.py
index ae96d87..04ebe3c 100644
--- a/__tryton__.py
+++ b/__tryton__.py
@@ -6,7 +6,7 @@
'name_es_CO': 'Compra Analítica',
'name_es_ES': 'Compra analítica',
'name_fr_FR': 'Achat analytique',
- 'version': '1.6.0',
+ 'version': '1.8.0',
'author': 'B2CK',
'email': 'info at b2ck.com',
'website': 'http://www.tryton.org/',
diff --git a/purchase.py b/purchase.py
index 919d9b3..d8e098f 100644
--- a/purchase.py
+++ b/purchase.py
@@ -1,8 +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.
-"Purchase"
+from __future__ import with_statement
from trytond.model import ModelView, ModelSQL, fields
from trytond.pyson import Not, Equal, Eval
+from trytond.transaction import Transaction
class Purchase(ModelSQL, ModelView):
@@ -15,25 +16,24 @@ class Purchase(ModelSQL, ModelView):
'on line "%s" (%d)!',
})
- def check_for_quotation(self, cursor, user, purchase_id, context=None):
+ def check_for_quotation(self, purchase_id):
account_selection_obj = self.pool.get(
'analytic_account.account.selection')
purchase_line_obj = self.pool.get('purchase.line')
- res = super(Purchase, self).check_for_quotation(cursor, user,
- purchase_id, context=context)
+ res = super(Purchase, self).check_for_quotation(purchase_id)
- purchase = self.browse(cursor, user, purchase_id, context=context)
- if not account_selection_obj.check_root(cursor, user,
+ purchase = self.browse(purchase_id)
+ if not account_selection_obj.check_root(
[x.analytic_accounts.id for x in purchase.lines
if x.analytic_accounts.id]):
for line in purchase.lines:
if line.type != 'line':
continue
- if not account_selection_obj.check_root(cursor, user,
+ if not account_selection_obj.check_root(
[line.analytic_accounts.id]):
- self.raise_user_error(cursor, 'analytic_account_required',
- (line.rec_name, line.id), context=context)
+ self.raise_user_error('analytic_account_required',
+ (line.rec_name, line.id))
return res
Purchase()
@@ -48,28 +48,25 @@ class PurchaseLine(ModelSQL, ModelView):
'invisible': Not(Equal(Eval('type'), 'line')),
})
- def _view_look_dom_arch(self, cursor, user, tree, type, context=None):
+ def _view_look_dom_arch(self, tree, type):
analytic_account_obj = self.pool.get('analytic_account.account')
- analytic_account_obj.convert_view(cursor, user, tree, context=context)
- arch, fields = super(PurchaseLine, self)._view_look_dom_arch(cursor,
- user, tree, type, context=context)
+ analytic_account_obj.convert_view(tree)
+ arch, fields = super(PurchaseLine, self)._view_look_dom_arch(tree, type)
return arch, fields
- def fields_get(self, cursor, user, fields_names=None, context=None):
+ def fields_get(self, fields_names=None):
analytic_account_obj = self.pool.get('analytic_account.account')
- res = super(PurchaseLine, self).fields_get(cursor, user, fields_names,
- context=context)
+ res = super(PurchaseLine, self).fields_get(fields_names)
- analytic_accounts_field = super(PurchaseLine, self).fields_get(cursor,
- user, ['analytic_accounts'],
- context=context)['analytic_accounts']
+ analytic_accounts_field = super(PurchaseLine, self).fields_get(
+ ['analytic_accounts'])['analytic_accounts']
- res.update(analytic_account_obj.analytic_accounts_fields_get(cursor,
- user, analytic_accounts_field, fields_names, context=context))
+ res.update(analytic_account_obj.analytic_accounts_fields_get(
+ analytic_accounts_field, fields_names))
return res
- def read(self, cursor, user, ids, fields_names=None, context=None):
+ def read(self, ids, fields_names=None):
selection_obj = self.pool.get('analytic_account.account.selection')
int_id = False
@@ -83,8 +80,7 @@ class PurchaseLine(ModelSQL, ModelView):
else:
fields_names2 = fields_names
- res = super(PurchaseLine, self).read(cursor, user, ids,
- fields_names=fields_names2, context=context)
+ res = super(PurchaseLine, self).read(ids, fields_names=fields_names2)
if not fields_names:
fields_names = list(set(self._columns.keys() \
@@ -98,8 +94,11 @@ class PurchaseLine(ModelSQL, ModelView):
id2record = {}
for record in res:
id2record[record['id']] = record
- lines = self.browse(cursor, user, ids, context=context)
+ lines = self.browse(ids)
for line in lines:
+ for root_id in root_ids:
+ id2record[line.id]['analytic_account_' \
+ + str(root_id)] = False
if line.type != 'line':
continue
if not line.analytic_accounts:
@@ -117,7 +116,7 @@ class PurchaseLine(ModelSQL, ModelView):
return res[0]
return res
- def create(self, cursor, user, vals, context=None):
+ def create(self, vals):
selection_obj = self.pool.get('analytic_account.account.selection')
vals = vals.copy()
selection_vals = {}
@@ -128,16 +127,13 @@ class PurchaseLine(ModelSQL, ModelView):
selection_vals['accounts'].append(('add', vals[field]))
del vals[field]
if vals.get('analytic_accounts'):
- selection_obj.write(cursor, user, vals['analytic_accounts'],
- selection_vals, context=context)
+ selection_obj.write(vals['analytic_accounts'], selection_vals)
elif vals.get('type', 'line') == 'line':
- selection_id = selection_obj.create(cursor, user, selection_vals,
- context=context)
+ selection_id = selection_obj.create(selection_vals)
vals['analytic_accounts'] = selection_id
- return super(PurchaseLine, self).create(cursor, user, vals,
- context=context)
+ return super(PurchaseLine, self).create(vals)
- def write(self, cursor, user, ids, vals, context=None):
+ def write(self, ids, vals):
selection_obj = self.pool.get('analytic_account.account.selection')
vals = vals.copy()
if isinstance(ids, (int, long)):
@@ -149,19 +145,19 @@ class PurchaseLine(ModelSQL, ModelView):
selection_vals[root_id] = vals[field]
del vals[field]
if selection_vals:
- lines = self.browse(cursor, user, ids, context=context)
+ lines = self.browse(ids)
for line in lines:
if line.type != 'line':
continue
accounts = []
if not line.analytic_accounts:
# Create missing selection
- selection_id = selection_obj.create(cursor, 0, {},
- context=context)
- self.write(cursor, user, line.id, {
+ with Transaction().set_user(0):
+ selection_id = selection_obj.create({})
+ self.write(line.id, {
'analytic_accounts': selection_id,
- }, context=context)
- line = self.browse(cursor, user, line.id, context=context)
+ })
+ line = self.browse(line.id)
for account in line.analytic_accounts.accounts:
if account.root.id in selection_vals:
value = selection_vals[account.root.id]
@@ -173,63 +169,57 @@ class PurchaseLine(ModelSQL, ModelView):
if account_id \
and account_id not in accounts:
accounts.append(account_id)
- selection_obj.write(cursor, user, line.analytic_accounts.id, {
+ selection_obj.write(line.analytic_accounts.id, {
'accounts': [('set', accounts)],
- }, context=context)
- return super(PurchaseLine, self).write(cursor, user, ids, vals,
- context=context)
+ })
+ return super(PurchaseLine, self).write(ids, vals)
- def delete(self, cursor, user, ids, context=None):
+ def delete(self, ids):
selection_obj = self.pool.get('analytic_account.account.selection')
if isinstance(ids, (int, long)):
ids = [ids]
selection_ids = []
- lines = self.browse(cursor, user, ids, context=context)
+ lines = self.browse(ids)
for line in lines:
if line.analytic_accounts:
selection_ids.append(line.analytic_accounts.id)
- res = super(PurchaseLine, self).delete(cursor, user, ids,
- context=context)
- selection_obj.delete(cursor, user, selection_ids, context=context)
+ res = super(PurchaseLine, self).delete(ids)
+ selection_obj.delete(selection_ids)
return res
- def copy(self, cursor, user, ids, default=None, context=None):
+ def copy(self, ids, default=None):
selection_obj = self.pool.get('analytic_account.account.selection')
- new_ids = super(PurchaseLine, self).copy(cursor, user, ids,
- default=default, context=context)
+ new_ids = super(PurchaseLine, self).copy(ids, default=default)
int_id = False
if isinstance(new_ids, (int, long)):
int_id = True
new_ids = [new_ids]
- for line in self.browse(cursor, user, new_ids, context=context):
+ for line in self.browse(new_ids):
if line.analytic_accounts:
- selection_id = selection_obj.copy(cursor, user,
- line.analytic_accounts.id, context=context)
- self.write(cursor, user, line.id, {
+ selection_id = selection_obj.copy(line.analytic_accounts.id)
+ self.write(line.id, {
'analytic_accounts': selection_id,
- }, context=context)
+ })
if int_id:
return new_ids[0]
return new_ids
- def get_invoice_line(self, cursor, user, line, context=None):
+ def get_invoice_line(self, line):
account_selection_obj = self.pool.get('analytic_account.account.selection')
- res = super(PurchaseLine, self).get_invoice_line(cursor, user, line,
- context=context)
+ res = super(PurchaseLine, self).get_invoice_line(line)
if not res:
return res
selection_id = False
if line.analytic_accounts:
- selection_id = account_selection_obj.copy(cursor, user,
- line.analytic_accounts.id, context=context)
+ selection_id = account_selection_obj.copy(line.analytic_accounts.id)
for vals in res:
vals['analytic_accounts'] = selection_id
return res
@@ -240,26 +230,25 @@ PurchaseLine()
class Account(ModelSQL, ModelView):
_name = 'analytic_account.account'
- def delete(self, cursor, user, ids, context=None):
+ def delete(self, ids):
purchase_line_obj = self.pool.get('purchase.line')
- res = super(Account, self).delete(cursor, user, ids, context=context)
+ res = super(Account, self).delete(ids)
# Restart the cache on the fields_view_get method of purchase.line
- purchase_line_obj.fields_view_get(cursor.dbname)
+ purchase_line_obj.fields_view_get.reset()
return res
- def create(self, cursor, user, vals, context=None):
+ def create(self, vals):
purchase_line_obj = self.pool.get('purchase.line')
- res = super(Account, self).create(cursor, user, vals, context=context)
+ res = super(Account, self).create(vals)
# Restart the cache on the fields_view_get method of purchase.line
- purchase_line_obj.fields_view_get(cursor.dbname)
+ purchase_line_obj.fields_view_get.reset()
return res
- def write(self, cursor, user, ids, vals, context=None):
+ def write(self, ids, vals):
purchase_line_obj = self.pool.get('purchase.line')
- res = super(Account, self).write(cursor, user, ids, vals,
- context=context)
+ res = super(Account, self).write(ids, vals)
# Restart the cache on the fields_view_get method of purchase.line
- purchase_line_obj.fields_view_get(cursor.dbname)
+ purchase_line_obj.fields_view_get.reset()
return res
Account()
diff --git a/tests/test_analytic_purchase.py b/tests/test_analytic_purchase.py
index 205c4ff..c8cdefb 100644
--- a/tests/test_analytic_purchase.py
+++ b/tests/test_analytic_purchase.py
@@ -25,7 +25,7 @@ class AnalyticPurchaseTestCase(unittest.TestCase):
'''
Test views.
'''
- self.assertRaises(Exception, test_view('analytic_purchase'))
+ test_view('analytic_purchase')
def suite():
suite = trytond.tests.test_tryton.suite()
diff --git a/trytond_analytic_purchase.egg-info/PKG-INFO b/trytond_analytic_purchase.egg-info/PKG-INFO
index 243eb10..0eefe2d 100644
--- a/trytond_analytic_purchase.egg-info/PKG-INFO
+++ b/trytond_analytic_purchase.egg-info/PKG-INFO
@@ -1,13 +1,13 @@
Metadata-Version: 1.0
Name: trytond-analytic-purchase
-Version: 1.6.0
+Version: 1.8.0
Summary: Add analytic account on purchase lines.
Home-page: http://www.tryton.org/
Author: B2CK
Author-email: info at b2ck.com
License: GPL-3
-Download-URL: http://downloads.tryton.org/1.6/
+Download-URL: http://downloads.tryton.org/1.8/
Description: UNKNOWN
Platform: UNKNOWN
Classifier: Development Status :: 5 - Production/Stable
diff --git a/trytond_analytic_purchase.egg-info/requires.txt b/trytond_analytic_purchase.egg-info/requires.txt
index 7f37ac2..c459d25 100644
--- a/trytond_analytic_purchase.egg-info/requires.txt
+++ b/trytond_analytic_purchase.egg-info/requires.txt
@@ -1,4 +1,4 @@
-trytond_purchase >= 1.6, < 1.7
-trytond_analytic_account >= 1.6, < 1.7
-trytond_analytic_invoice >= 1.6, < 1.7
-trytond >= 1.6, < 1.7
\ No newline at end of file
+trytond_purchase >= 1.8, < 1.9
+trytond_analytic_account >= 1.8, < 1.9
+trytond_analytic_invoice >= 1.8, < 1.9
+trytond >= 1.8, < 1.9
\ No newline at end of file
commit db25d536ffbf5f5c4a47c96f9a480e17c5017634
Author: Mathias Behrle <mathiasb at mbsolutions.selfip.biz>
Date: Thu May 13 20:41:28 2010 +0200
Adding upstream version 1.6.0.
diff --git a/CHANGELOG b/CHANGELOG
index b4765f1..e36b38a 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+Version 1.6.0 - 2010-05-13
+* Bug fixes (see mercurial logs for details)
+
Version 1.4.0 - 2009-10-19
* Bug fixes (see mercurial logs for details)
diff --git a/COPYRIGHT b/COPYRIGHT
index 853f1f7..cca7db9 100644
--- a/COPYRIGHT
+++ b/COPYRIGHT
@@ -1,5 +1,6 @@
-Copyright (C) 2008-2009 Cédric Krier.
-Copyright (C) 2008-2009 B2CK SPRL.
+Copyright (C) 2008-2010 Cédric Krier.
+Copyright (C) 2008-2010 Bertrand Chenal.
+Copyright (C) 2008-2010 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/MANIFEST.in b/MANIFEST.in
index c61b52d..5343ad8 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -7,4 +7,3 @@ include LICENSE
include *.xml
include *.odt
include *.csv
-include tests/*
diff --git a/PKG-INFO b/PKG-INFO
index f597d7a..a66b9dd 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,13 +1,13 @@
Metadata-Version: 1.0
Name: trytond_analytic_purchase
-Version: 1.4.0
+Version: 1.6.0
Summary: Add analytic account on purchase lines.
Home-page: http://www.tryton.org/
Author: B2CK
Author-email: info at b2ck.com
License: GPL-3
-Download-URL: http://downloads.tryton.org/1.4/
+Download-URL: http://downloads.tryton.org/1.6/
Description: UNKNOWN
Platform: UNKNOWN
Classifier: Development Status :: 5 - Production/Stable
diff --git a/__tryton__.py b/__tryton__.py
index fab3a74..ae96d87 100644
--- a/__tryton__.py
+++ b/__tryton__.py
@@ -6,7 +6,7 @@
'name_es_CO': 'Compra Analítica',
'name_es_ES': 'Compra analítica',
'name_fr_FR': 'Achat analytique',
- 'version': '1.4.0',
+ 'version': '1.6.0',
'author': 'B2CK',
'email': 'info at b2ck.com',
'website': 'http://www.tryton.org/',
diff --git a/purchase.py b/purchase.py
index 488b025..919d9b3 100644
--- a/purchase.py
+++ b/purchase.py
@@ -2,6 +2,7 @@
#this repository contains the full copyright notices and license terms.
"Purchase"
from trytond.model import ModelView, ModelSQL, fields
+from trytond.pyson import Not, Equal, Eval
class Purchase(ModelSQL, ModelView):
@@ -44,7 +45,7 @@ class PurchaseLine(ModelSQL, ModelView):
analytic_accounts = fields.Many2One('analytic_account.account.selection',
'Analytic Accounts',
states={
- 'invisible': "type != 'line'",
+ 'invisible': Not(Equal(Eval('type'), 'line')),
})
def _view_look_dom_arch(self, cursor, user, tree, type, context=None):
diff --git a/setup.py b/setup.py
index 84a86f2..bad615f 100644
--- a/setup.py
+++ b/setup.py
@@ -2,19 +2,22 @@
#This file is part of Tryton. The COPYRIGHT file at the top level of
#this repository contains the full copyright notices and license terms.
-from setuptools import setup, find_packages
+from setuptools import setup
import re
-info = eval(file('__tryton__.py').read())
+info = eval(open('__tryton__.py').read())
+major_version, minor_version, _ = info.get('version', '0.0.1').split('.', 2)
+major_version = int(major_version)
+minor_version = int(minor_version)
requires = []
for dep in info.get('depends', []):
if not re.match(r'(ir|res|workflow|webdav)(\W|$)', dep):
- requires.append('trytond_' + dep)
-
-major_version, minor_version, _ = info.get('version', '0.0.1').split('.', 2)
-requires.append('trytond >= %s.%s' % (major_version, minor_version))
-requires.append('trytond < %s.%s' % (major_version, int(minor_version) + 1))
+ 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))
setup(name='trytond_analytic_purchase',
version=info.get('version', '0.0.1'),
@@ -27,6 +30,7 @@ setup(name='trytond_analytic_purchase',
package_dir={'trytond.modules.analytic_purchase': '.'},
packages=[
'trytond.modules.analytic_purchase',
+ 'trytond.modules.analytic_purchase.tests',
],
package_data={
'trytond.modules.analytic_purchase': info.get('xml', []) \
@@ -55,4 +59,6 @@ setup(name='trytond_analytic_purchase',
[trytond.modules]
analytic_purchase = trytond.modules.analytic_purchase
""",
+ test_suite='tests',
+ test_loader='trytond.test_loader:Loader',
)
diff --git a/tests/__init__.py b/tests/__init__.py
index 381ef20..e4f5e7c 100644
--- a/tests/__init__.py
+++ b/tests/__init__.py
@@ -1,4 +1,4 @@
#This file is part of Tryton. The COPYRIGHT file at the top level of
#this repository contains the full copyright notices and license terms.
-from test_analytic_purchase import *
+from test_analytic_purchase import suite
diff --git a/tests/test_analytic_purchase.py b/tests/test_analytic_purchase.py
index 8ef6507..205c4ff 100644
--- a/tests/test_analytic_purchase.py
+++ b/tests/test_analytic_purchase.py
@@ -10,7 +10,7 @@ if os.path.isdir(DIR):
import unittest
import trytond.tests.test_tryton
-from trytond.tests.test_tryton import RPCProxy, CONTEXT, SOCK, test_view
+from trytond.tests.test_tryton import test_view
class AnalyticPurchaseTestCase(unittest.TestCase):
@@ -28,11 +28,10 @@ class AnalyticPurchaseTestCase(unittest.TestCase):
self.assertRaises(Exception, test_view('analytic_purchase'))
def suite():
- return unittest.TestLoader().loadTestsFromTestCase(AnalyticPurchaseTestCase)
+ suite = trytond.tests.test_tryton.suite()
+ suite.addTests(unittest.TestLoader().loadTestsFromTestCase(
+ AnalyticPurchaseTestCase))
+ return suite
if __name__ == '__main__':
- suiteTrytond = trytond.tests.test_tryton.suite()
- suiteAnalyticPurchase = suite()
- alltests = unittest.TestSuite([suiteTrytond, suiteAnalyticPurchase])
- unittest.TextTestRunner(verbosity=2).run(alltests)
- SOCK.disconnect()
+ unittest.TextTestRunner(verbosity=2).run(suite())
diff --git a/trytond_analytic_purchase.egg-info/PKG-INFO b/trytond_analytic_purchase.egg-info/PKG-INFO
index bfd3cf4..243eb10 100644
--- a/trytond_analytic_purchase.egg-info/PKG-INFO
+++ b/trytond_analytic_purchase.egg-info/PKG-INFO
@@ -1,13 +1,13 @@
Metadata-Version: 1.0
Name: trytond-analytic-purchase
-Version: 1.4.0
+Version: 1.6.0
Summary: Add analytic account on purchase lines.
Home-page: http://www.tryton.org/
Author: B2CK
Author-email: info at b2ck.com
License: GPL-3
-Download-URL: http://downloads.tryton.org/1.4/
+Download-URL: http://downloads.tryton.org/1.6/
Description: UNKNOWN
Platform: UNKNOWN
Classifier: Development Status :: 5 - Production/Stable
diff --git a/trytond_analytic_purchase.egg-info/SOURCES.txt b/trytond_analytic_purchase.egg-info/SOURCES.txt
index 1447743..9f87c27 100644
--- a/trytond_analytic_purchase.egg-info/SOURCES.txt
+++ b/trytond_analytic_purchase.egg-info/SOURCES.txt
@@ -13,8 +13,8 @@ setup.py
./__init__.py
./__tryton__.py
./purchase.py
-tests/__init__.py
-tests/test_analytic_purchase.py
+./tests/__init__.py
+./tests/test_analytic_purchase.py
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 48d0de3..7f37ac2 100644
--- a/trytond_analytic_purchase.egg-info/requires.txt
+++ b/trytond_analytic_purchase.egg-info/requires.txt
@@ -1,5 +1,4 @@
-trytond_purchase
-trytond_analytic_account
-trytond_analytic_invoice
-trytond >= 1.4
-trytond < 1.5
\ No newline at end of file
+trytond_purchase >= 1.6, < 1.7
+trytond_analytic_account >= 1.6, < 1.7
+trytond_analytic_invoice >= 1.6, < 1.7
+trytond >= 1.6, < 1.7
\ No newline at end of file
commit 52e89be45ae6e16a06c3b787ff41b8510e06b162
Author: Daniel Baumann <daniel at debian.org>
Date: Mon Oct 19 21:47:42 2009 +0200
Adding upstream version 1.4.0.
diff --git a/CHANGELOG b/CHANGELOG
index d28f483..b4765f1 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+Version 1.4.0 - 2009-10-19
+* Bug fixes (see mercurial logs for details)
+
Version 1.2.0 - 2009-04-20
* Bug fixes (see mercurial logs for details)
* Allow egg installation
diff --git a/INSTALL b/INSTALL
index afd8496..bb88e44 100644
--- a/INSTALL
+++ b/INSTALL
@@ -5,7 +5,7 @@ Prerequisites
-------------
* Python 2.4 or later (http://www.python.org/)
- * trytond 1.1.x (http://www.tryton.org/)
+ * trytond (http://www.tryton.org/)
* trytond_analytic_account (http://www.tryton.org/)
* trytond_analytic_invoice (http://www.tryton.org/)
diff --git a/MANIFEST.in b/MANIFEST.in
index 5343ad8..c61b52d 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -7,3 +7,4 @@ include LICENSE
include *.xml
include *.odt
include *.csv
+include tests/*
diff --git a/PKG-INFO b/PKG-INFO
index 5cd2278..f597d7a 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,13 +1,13 @@
Metadata-Version: 1.0
Name: trytond_analytic_purchase
-Version: 1.2.0
+Version: 1.4.0
Summary: Add analytic account on purchase lines.
Home-page: http://www.tryton.org/
Author: B2CK
Author-email: info at b2ck.com
License: GPL-3
-Download-URL: http://downloads.tryton.org/1.2/
+Download-URL: http://downloads.tryton.org/1.4/
Description: UNKNOWN
Platform: UNKNOWN
Classifier: Development Status :: 5 - Production/Stable
diff --git a/__init__.py b/__init__.py
index dda1fb6..5720822 100644
--- a/__init__.py
+++ b/__init__.py
@@ -1,3 +1,4 @@
-#This file is part of Tryton. The COPYRIGHT file at the top level of this repository contains the full copyright notices and license terms.
+#This file is part of Tryton. The COPYRIGHT file at the top level of
+#this repository contains the full copyright notices and license terms.
from purchase import *
diff --git a/__tryton__.py b/__tryton__.py
index 8d3261b..fab3a74 100644
--- a/__tryton__.py
+++ b/__tryton__.py
@@ -4,9 +4,9 @@
'name': 'Analytic Purchase',
'name_de_DE': 'Kostenstellen Einkauf',
'name_es_CO': 'Compra Analítica',
- 'name_es_ES': 'Compra Analítica',
+ 'name_es_ES': 'Compra analítica',
'name_fr_FR': 'Achat analytique',
- 'version': '1.2.0',
+ 'version': '1.4.0',
'author': 'B2CK',
'email': 'info at b2ck.com',
'website': 'http://www.tryton.org/',
@@ -16,8 +16,7 @@
''',
'description_es_CO': '''Adiciona contabilidad analítica a las líneas de compra.
''',
- 'description_es_ES': '''Adiciona contabilidad analítica a las líneas de compra.
-''',
+ 'description_es_ES': 'Añade contabilidad analítica a las líneas de compra.',
'description_fr_FR': 'Ajoute la comptabilité analytique sur les lignes d\'achat.',
'depends': [
'purchase',
diff --git a/es_CO.csv b/es_CO.csv
index a1b3aa5..55119be 100644
--- a/es_CO.csv
+++ b/es_CO.csv
@@ -1,108 +1,107 @@
type,name,res_id,src,value,fuzzy
-error,analytic_account.account,0,You can not create recursive accounts!,No puede crear cuentas recursivas!,1
-error,purchase.line,0,"It misses an ""account_expense"" default property!","Falta una propiedad por defecto ""account_expense""!",0
+error,analytic_account.account,0,You can not create recursive accounts!,¡No puede crear cuentas recursivas!,0
error,purchase.line,0,"It misses an ""Account Expense"" on product ""%s""!","Falta una propiedad por defecto ""Account Expense""!",0
error,purchase.line,0,The supplier location is required!,Se requiere la localización del proveedor!,0
error,purchase.purchase,0,"Analytic account is required on line ""%s"" (%d)!","Se requiere una cuenta analítica en la línea ""%s"" (%d)!",0
error,purchase.purchase,0,Invoice addresses must be defined for the quotation.,Factura direccionada debe ser definida por el presupuesto.,0
error,purchase.purchase,0,"It misses an ""Account Payable"" on the party ""%s""!","Falta una ""Cuenta Pagadera"" en el tercero ""%s""!",0
-field,"analytic_account.account,active",0,Active,Activo,1
-field,"analytic_account.account,balance",0,Balance,Balance,1
-field,"analytic_account.account,childs",0,Children,Hij at s,1
-field,"analytic_account.account,code",0,Code,Código,1
-field,"analytic_account.account,company",0,Company,Compañía,1
-field,"analytic_account.account,credit",0,Credit,Crédito,1
-field,"analytic_account.account,currency",0,Currency,Moneda,1
-field,"analytic_account.account,currency_digits",0,Currency Digits,Manejo de Moneda,1
-field,"analytic_account.account,debit",0,Debit,Débito,1
-field,"analytic_account.account,display_balance",0,Display Balance,Mostrar Balance,1
+field,"analytic_account.account,active",0,Active,Activo,0
+field,"analytic_account.account,balance",0,Balance,Balance,0
+field,"analytic_account.account,childs",0,Children,Descendientes,0
+field,"analytic_account.account,code",0,Code,Código,0
+field,"analytic_account.account,company",0,Company,Compañía,0
+field,"analytic_account.account,credit",0,Credit,Crédito,0
+field,"analytic_account.account,currency",0,Currency,Moneda,0
+field,"analytic_account.account,currency_digits",0,Currency Digits,Dígitos de Moneda,0
+field,"analytic_account.account,debit",0,Debit,Débito,0
+field,"analytic_account.account,display_balance",0,Display Balance,Mostrar Balance,0
field,"analytic_account.account,mandatory",0,Mandatory,Obligatorio,0
-field,"analytic_account.account,name",0,Name,Nombre del campo,1
-field,"analytic_account.account,note",0,Note,Nota,1
-field,"analytic_account.account,parent",0,Parent,Padre,1
-field,"analytic_account.account,rec_name",0,Name,Nombre del campo,1
+field,"analytic_account.account,name",0,Name,Nombre,0
+field,"analytic_account.account,note",0,Note,Nota,0
+field,"analytic_account.account,parent",0,Parent,Padre,0
+field,"analytic_account.account,rec_name",0,Name,Nombre,0
field,"analytic_account.account,root",0,Root,Raíz,0
-field,"analytic_account.account,state",0,State,Estado,1
-field,"analytic_account.account,type",0,Type,Tipo,1
-field,"purchase.line,amount",0,Amount,Cantidad,1
+field,"analytic_account.account,state",0,State,Estado,0
+field,"analytic_account.account,type",0,Type,Tipo,0
+field,"purchase.line,amount",0,Amount,Cantidad,0
field,"purchase.line,analytic_accounts",0,Analytic Accounts,Cuentas Analíticas,0
-field,"purchase.line,description",0,Description,Descripción,1
-field,"purchase.line,invoice_lines",0,Invoice Lines,Líneas de Factura,1
-field,"purchase.line,move_done",0,Moves Done,Movimientos Hechos,1
-field,"purchase.line,move_exception",0,Moves Exception,Exepción de Movimientos,1
-field,"purchase.line,moves",0,Moves,Movimientos,1
-field,"purchase.line,moves_ignored",0,Ignored Moves,Movimientos Ignorados,1
-field,"purchase.line,moves_recreated",0,Recreated Moves,Rehacer Movimientos,1
-field,"purchase.line,note",0,Note,Nota,1
-field,"purchase.line,product",0,Product,Productos,1
-field,"purchase.line,purchase",0,Purchase,Compras,1
-field,"purchase.line,quantity",0,Quantity,Cantidad,1
-field,"purchase.line,rec_name",0,Name,Nombre del campo,1
-field,"purchase.line,sequence",0,Sequence,Secuencia,1
-field,"purchase.line,taxes",0,Taxes,Impuestos,1
-field,"purchase.line,type",0,Type,Tipo,1
-field,"purchase.line,unit",0,Unit,Unidad,1
-field,"purchase.line,unit_digits",0,Unit Digits,Dígitos Unitarios,1
-field,"purchase.line,unit_price",0,Unit Price,Precio Unitario,1
-field,"purchase.purchase,comment",0,Comment,Comentario,1
-field,"purchase.purchase,company",0,Company,Compañía,1
-field,"purchase.purchase,currency",0,Currency,Moneda,1
-field,"purchase.purchase,currency_digits",0,Currency Digits,Manejo de Moneda,1
-field,"purchase.purchase,description",0,Description,Descripción,1
-field,"purchase.purchase,invoice_address",0,Invoice Address,Dirección de Facturación,1
-field,"purchase.purchase,invoice_exception",0,Invoices Exception,Excepción de Facturación,1
-field,"purchase.purchase,invoice_method",0,Invoice Method,Método de Facturación,1
-field,"purchase.purchase,invoice_paid",0,Invoices Paid,Facturas Pagadas,1
-field,"purchase.purchase,invoices",0,Invoices,Facturas,1
-field,"purchase.purchase,invoices_ignored",0,Ignored Invoices,Facturas Ignoradas,1
-field,"purchase.purchase,invoices_recreated",0,Recreated Invoices,Rehacer facturas,1
-field,"purchase.purchase,invoice_state",0,Invoice State,Estado de Factura,1
-field,"purchase.purchase,lines",0,Lines,Líneas de Inventario,1
-field,"purchase.purchase,moves",0,Moves,Movimientos,1
-field,"purchase.purchase,packing_done",0,Shipment Done,Empacado Finalizado,1
-field,"purchase.purchase,packing_exception",0,Shipments Exception,Excepción de Empaques,1
-field,"purchase.purchase,packings",0,Shipments,Empaques,1
-field,"purchase.purchase,packing_state",0,Shipment State,Estado de Empaque,1
-field,"purchase.purchase,party",0,Party,Terceros,1
-field,"purchase.purchase,party_lang",0,Party Language,Idioma del Tercero,1
-field,"purchase.purchase,payment_term",0,Payment Term,Término de Pago,1
+field,"purchase.line,description",0,Description,Descripción,0
+field,"purchase.line,invoice_lines",0,Invoice Lines,Líneas de Factura,0
+field,"purchase.line,move_done",0,Moves Done,Movimientos Hechos,0
+field,"purchase.line,move_exception",0,Moves Exception,Exepción de Movimientos,0
+field,"purchase.line,moves",0,Moves,Movimientos,0
+field,"purchase.line,moves_ignored",0,Ignored Moves,Movimientos Ignorados,0
+field,"purchase.line,moves_recreated",0,Recreated Moves,Movimientos Recreados,0
+field,"purchase.line,note",0,Note,Nota,0
+field,"purchase.line,product",0,Product,Producto,0
+field,"purchase.line,purchase",0,Purchase,Compra,0
+field,"purchase.line,quantity",0,Quantity,Cantidad,0
+field,"purchase.line,rec_name",0,Name,Nombre,0
+field,"purchase.line,sequence",0,Sequence,Secuencia,0
+field,"purchase.line,taxes",0,Taxes,Impuestos,0
+field,"purchase.line,type",0,Type,Tipo,0
+field,"purchase.line,unit",0,Unit,Unidad,0
+field,"purchase.line,unit_digits",0,Unit Digits,Dígitos de Unidad,0
+field,"purchase.line,unit_price",0,Unit Price,Precio Unitario,0
+field,"purchase.purchase,comment",0,Comment,Comentario,0
+field,"purchase.purchase,company",0,Company,Compañía,0
+field,"purchase.purchase,currency",0,Currency,Moneda,0
+field,"purchase.purchase,currency_digits",0,Currency Digits,Dígitos de Moneda,0
+field,"purchase.purchase,description",0,Description,Descripción,0
+field,"purchase.purchase,invoice_address",0,Invoice Address,Dirección de Facturación,0
+field,"purchase.purchase,invoice_exception",0,Invoices Exception,Excepción de Facturación,0
+field,"purchase.purchase,invoice_method",0,Invoice Method,Método de Facturación,0
+field,"purchase.purchase,invoice_paid",0,Invoices Paid,Facturas Pagadas,0
+field,"purchase.purchase,invoices",0,Invoices,Facturas,0
+field,"purchase.purchase,invoices_ignored",0,Ignored Invoices,Facturas Ignoradas,0
+field,"purchase.purchase,invoices_recreated",0,Recreated Invoices,Facturas Recreadas,0
+field,"purchase.purchase,invoice_state",0,Invoice State,Estado de Factura,0
+field,"purchase.purchase,lines",0,Lines,Líneas,0
+field,"purchase.purchase,moves",0,Moves,Movimientos,0
+field,"purchase.purchase,packing_done",0,Shipment Done,Envío Finalizado,0
+field,"purchase.purchase,packing_exception",0,Shipments Exception,Excepción de Envíos,0
+field,"purchase.purchase,packings",0,Shipments,Envíos,0
+field,"purchase.purchase,packing_state",0,Shipment State,Estado de Envío,0
+field,"purchase.purchase,party",0,Party,Tercero,0
+field,"purchase.purchase,party_lang",0,Party Language,Idioma del Tercero,0
+field,"purchase.purchase,payment_term",0,Payment Term,Término de Pago,0
field,"purchase.purchase,purchase_date",0,Purchase Date,Fecha de Compra,0
-field,"purchase.purchase,rec_name",0,Name,Nombre del campo,1
-field,"purchase.purchase,reference",0,Reference,Referencia,1
-field,"purchase.purchase,state",0,State,Estado,1
+field,"purchase.purchase,rec_name",0,Name,Nombre,0
+field,"purchase.purchase,reference",0,Reference,Referencia,0
+field,"purchase.purchase,state",0,State,Estado,0
field,"purchase.purchase,supplier_reference",0,Supplier Reference,Referencia del Proveedor,0
-field,"purchase.purchase,tax_amount",0,Tax,Impuesto,1
-field,"purchase.purchase,total_amount",0,Total,Total,1
-field,"purchase.purchase,untaxed_amount",0,Untaxed,Sin Impuesto,1
-field,"purchase.purchase,warehouse",0,Warehouse,Depósito,1
-model,"analytic_account.account,name",0,Analytic Account,Cuenta Analítica,1
-model,"purchase.line,name",0,Purchase Line,Línea de Compra,1
-model,"purchase.purchase,name",0,Purchase,Compras,1
-selection,"analytic_account.account,display_balance",0,Credit - Debit,Crédito - Débito,1
-selection,"analytic_account.account,display_balance",0,Debit - Credit,Débito - Crédito,1
-selection,"analytic_account.account,state",0,Closed,Cerrado,1
-selection,"analytic_account.account,state",0,Draft,Borrador,1
-selection,"analytic_account.account,state",0,Opened,Abierto,1
-selection,"analytic_account.account,type",0,Normal,Normal,1
+field,"purchase.purchase,tax_amount",0,Tax,Impuesto,0
+field,"purchase.purchase,total_amount",0,Total,Total,0
+field,"purchase.purchase,untaxed_amount",0,Untaxed,Sin Impuesto,0
+field,"purchase.purchase,warehouse",0,Warehouse,Depósito,0
+model,"analytic_account.account,name",0,Analytic Account,Cuenta Analítica,0
+model,"purchase.line,name",0,Purchase Line,Línea de Compra,0
+model,"purchase.purchase,name",0,Purchase,Compra,0
+selection,"analytic_account.account,display_balance",0,Credit - Debit,Crédito - Débito,0
+selection,"analytic_account.account,display_balance",0,Debit - Credit,Débito - Crédito,0
+selection,"analytic_account.account,state",0,Closed,Cerrado,0
+selection,"analytic_account.account,state",0,Draft,Borrador,0
+selection,"analytic_account.account,state",0,Opened,Abierto,0
+selection,"analytic_account.account,type",0,Normal,Normal,0
selection,"analytic_account.account,type",0,Root,Raíz,0
-selection,"analytic_account.account,type",0,View,Vista,1
-selection,"purchase.line,type",0,Comment,Comentario,1
-selection,"purchase.line,type",0,Line,Línea,1
-selection,"purchase.line,type",0,Subtotal,Subtotal,1
-selection,"purchase.line,type",0,Title,Título,1
+selection,"analytic_account.account,type",0,View,Vista,0
+selection,"purchase.line,type",0,Comment,Comentario,0
+selection,"purchase.line,type",0,Line,Línea,0
+selection,"purchase.line,type",0,Subtotal,Subtotal,0
+selection,"purchase.line,type",0,Title,Título,0
selection,"purchase.purchase,invoice_method",0,Based On Order,Basado En La Orden,0
selection,"purchase.purchase,invoice_method",0,Based On Shipment,Basado En El Envío,0
-selection,"purchase.purchase,invoice_method",0,Manual,Manual,1
-selection,"purchase.purchase,invoice_state",0,Exception,Excepción,1
-selection,"purchase.purchase,invoice_state",0,None,Ninguno,1
-selection,"purchase.purchase,invoice_state",0,Paid,Pagado,1
-selection,"purchase.purchase,invoice_state",0,Waiting,En Espera,1
-selection,"purchase.purchase,packing_state",0,Exception,Excepción,1
-selection,"purchase.purchase,packing_state",0,None,Ninguno,1
-selection,"purchase.purchase,packing_state",0,Received,Recibido,1
-selection,"purchase.purchase,packing_state",0,Waiting,En Espera,1
-selection,"purchase.purchase,state",0,Canceled,Cancelado,1
-selection,"purchase.purchase,state",0,Confirmed,Confirmado,1
-selection,"purchase.purchase,state",0,Done,Hecho,1
-selection,"purchase.purchase,state",0,Draft,Borrador,1
-selection,"purchase.purchase,state",0,Quotation,Cotización,1
+selection,"purchase.purchase,invoice_method",0,Manual,Manual,0
+selection,"purchase.purchase,invoice_state",0,Exception,Excepción,0
+selection,"purchase.purchase,invoice_state",0,None,Ninguno,0
+selection,"purchase.purchase,invoice_state",0,Paid,Pagado,0
+selection,"purchase.purchase,invoice_state",0,Waiting,En Espera,0
+selection,"purchase.purchase,packing_state",0,Exception,Excepción,0
+selection,"purchase.purchase,packing_state",0,None,Ninguno,0
+selection,"purchase.purchase,packing_state",0,Received,Recibido,0
+selection,"purchase.purchase,packing_state",0,Waiting,En Espera,0
+selection,"purchase.purchase,state",0,Canceled,Cancelado,0
+selection,"purchase.purchase,state",0,Confirmed,Confirmado,0
+selection,"purchase.purchase,state",0,Done,Hecho,0
+selection,"purchase.purchase,state",0,Draft,Borrador,0
+selection,"purchase.purchase,state",0,Quotation,Cotización,0
diff --git a/es_ES.csv b/es_ES.csv
index d10abae..e3b6b93 100644
--- a/es_ES.csv
+++ b/es_ES.csv
@@ -1,107 +1,99 @@
type,name,res_id,src,value,fuzzy
-error,analytic_account.account,0,You can not create recursive accounts!,No puede crear cuentas recursivas!,1
-error,purchase.line,0,"It misses an ""Account Expense"" on product ""%s""!","Falta una propiedad por defecto ""Account Expense""!",0
-error,purchase.line,0,The supplier location is required!,Se requiere la localización del proveedor!,0
-error,purchase.purchase,0,"Analytic account is required on line ""%s"" (%d)!","Se requiere una cuenta analítica en la línea ""%s"" (%d)!",0
-error,purchase.purchase,0,Invoice addresses must be defined for the quotation.,Factura direccionada debe ser definida por el presupuesto.,0
-error,purchase.purchase,0,"It misses an ""Account Payable"" on the party ""%s""!","Falta una ""Cuenta Pagadera"" en el tercero ""%s""!",0
-field,"analytic_account.account,active",0,Active,Activo,1
-field,"analytic_account.account,balance",0,Balance,Balance,1
-field,"analytic_account.account,childs",0,Children,Hij at s,1
-field,"analytic_account.account,code",0,Code,Código,1
-field,"analytic_account.account,company",0,Company,Compañía,1
-field,"analytic_account.account,credit",0,Credit,Crédito,1
-field,"analytic_account.account,currency",0,Currency,Moneda,1
-field,"analytic_account.account,currency_digits",0,Currency Digits,Manejo de Moneda,1
-field,"analytic_account.account,debit",0,Debit,Débito,1
-field,"analytic_account.account,display_balance",0,Display Balance,Mostrar Balance,1
+error,analytic_account.account,0,You can not create recursive accounts!,No puede crear cuentas recursivas,0
+error,purchase.line,0,"It misses an ""Account Expense"" on product ""%s""!",Falta la propiedad «Cuenta de gastos» en el producto «%s»,0
+error,purchase.line,0,The supplier location is required!,Se necesita la ubicación del proveedor,0
+error,purchase.purchase,0,"Analytic account is required on line ""%s"" (%d)!",Se necesita una cuenta analítica en la línea «%s» (%d),0
+error,purchase.purchase,0,Invoice addresses must be defined for the quotation.,Se necesita la dirección de facturación para el presupuesto.,0
+error,purchase.purchase,0,"It misses an ""Account Payable"" on the party ""%s""!",Falta una «Cuenta por pagar» en el tercero «%s»,0
+field,"analytic_account.account,active",0,Active,Activa,0
+field,"analytic_account.account,balance",0,Balance,Balance,0
+field,"analytic_account.account,childs",0,Children,Hijos,0
+field,"analytic_account.account,code",0,Code,Código,0
+field,"analytic_account.account,company",0,Company,Empresa,0
+field,"analytic_account.account,credit",0,Credit,Haber,0
+field,"analytic_account.account,currency",0,Currency,Divisa,0
+field,"analytic_account.account,currency_digits",0,Currency Digits,Decimales de la divisa,0
+field,"analytic_account.account,debit",0,Debit,Debe,0
+field,"analytic_account.account,display_balance",0,Display Balance,Mostrar balance,0
field,"analytic_account.account,mandatory",0,Mandatory,Obligatorio,0
-field,"analytic_account.account,name",0,Name,Nombre del campo,1
-field,"analytic_account.account,note",0,Note,Nota,1
-field,"analytic_account.account,parent",0,Parent,Padre,1
-field,"analytic_account.account,rec_name",0,Name,Nombre del campo,1
+field,"analytic_account.account,name",0,Name,Nombre,0
+field,"analytic_account.account,note",0,Note,Nota,0
+field,"analytic_account.account,parent",0,Parent,Padre,0
+field,"analytic_account.account,rec_name",0,Name,Nombre,0
field,"analytic_account.account,root",0,Root,Raíz,0
-field,"analytic_account.account,state",0,State,Estado,1
-field,"analytic_account.account,type",0,Type,Tipo,1
-field,"purchase.line,amount",0,Amount,Cantidad,1
+field,"analytic_account.account,state",0,State,Estado,0
+field,"analytic_account.account,type",0,Type,Tipo,0
+field,"purchase.line,amount",0,Amount,Cantidad,0
field,"purchase.line,analytic_accounts",0,Analytic Accounts,Cuentas analíticas,0
-field,"purchase.line,description",0,Description,Descripción,1
-field,"purchase.line,invoice_lines",0,Invoice Lines,Líneas de Factura,1
-field,"purchase.line,move_done",0,Moves Done,Movimientos Hechos,1
-field,"purchase.line,move_exception",0,Moves Exception,Exepción de Movimientos,1
-field,"purchase.line,moves",0,Moves,Movimientos,1
-field,"purchase.line,moves_ignored",0,Ignored Moves,Movimientos Ignorados,1
-field,"purchase.line,moves_recreated",0,Recreated Moves,Rehacer Movimientos,1
-field,"purchase.line,note",0,Note,Nota,1
-field,"purchase.line,product",0,Product,Productos,1
-field,"purchase.line,purchase",0,Purchase,Compras,1
-field,"purchase.line,quantity",0,Quantity,Cantidad,1
-field,"purchase.line,rec_name",0,Name,Nombre del campo,1
-field,"purchase.line,sequence",0,Sequence,Secuencia,1
-field,"purchase.line,taxes",0,Taxes,Impuestos,1
-field,"purchase.line,type",0,Type,Tipo,1
-field,"purchase.line,unit",0,Unit,Unidad,1
-field,"purchase.line,unit_digits",0,Unit Digits,Dígitos Unitarios,1
-field,"purchase.line,unit_price",0,Unit Price,Precio Unitario,1
-field,"purchase.purchase,comment",0,Comment,Comentario,1
-field,"purchase.purchase,company",0,Company,Compañía,1
-field,"purchase.purchase,currency",0,Currency,Moneda,1
-field,"purchase.purchase,currency_digits",0,Currency Digits,Manejo de Moneda,1
-field,"purchase.purchase,description",0,Description,Descripción,1
-field,"purchase.purchase,invoice_address",0,Invoice Address,Dirección de Facturación,1
-field,"purchase.purchase,invoice_exception",0,Invoices Exception,Excepción de Facturación,1
-field,"purchase.purchase,invoice_method",0,Invoice Method,Método de Facturación,1
-field,"purchase.purchase,invoice_paid",0,Invoices Paid,Facturas Pagadas,1
-field,"purchase.purchase,invoices",0,Invoices,Facturas,1
-field,"purchase.purchase,invoices_ignored",0,Ignored Invoices,Facturas Ignoradas,1
-field,"purchase.purchase,invoices_recreated",0,Recreated Invoices,Rehacer facturas,1
-field,"purchase.purchase,invoice_state",0,Invoice State,Estado de Factura,1
-field,"purchase.purchase,lines",0,Lines,Líneas de Inventario,1
-field,"purchase.purchase,moves",0,Moves,Movimientos,1
-field,"purchase.purchase,packing_done",0,Shipment Done,Empacado Finalizado,1
-field,"purchase.purchase,packing_exception",0,Shipments Exception,Excepción de Empaques,1
-field,"purchase.purchase,packings",0,Shipments,Empaques,1
-field,"purchase.purchase,packing_state",0,Shipment State,Estado de Empaque,1
-field,"purchase.purchase,party",0,Party,Terceros,1
-field,"purchase.purchase,party_lang",0,Party Language,Idioma del Tercero,1
-field,"purchase.purchase,payment_term",0,Payment Term,Término de Pago,1
-field,"purchase.purchase,purchase_date",0,Purchase Date,Fecha de Compra,0
-field,"purchase.purchase,rec_name",0,Name,Nombre del campo,1
-field,"purchase.purchase,reference",0,Reference,Referencia,1
-field,"purchase.purchase,state",0,State,Estado,1
-field,"purchase.purchase,supplier_reference",0,Supplier Reference,Referencia del Proveedor,0
-field,"purchase.purchase,tax_amount",0,Tax,Impuesto,1
-field,"purchase.purchase,total_amount",0,Total,Total,1
-field,"purchase.purchase,untaxed_amount",0,Untaxed,Sin Impuesto,1
-field,"purchase.purchase,warehouse",0,Warehouse,Depósito,1
-model,"analytic_account.account,name",0,Analytic Account,Cuenta Analítica,1
-model,"purchase.line,name",0,Purchase Line,Línea de Compra,1
-model,"purchase.purchase,name",0,Purchase,Compras,1
-selection,"analytic_account.account,display_balance",0,Credit - Debit,Crédito - Débito,1
-selection,"analytic_account.account,display_balance",0,Debit - Credit,Débito - Crédito,1
-selection,"analytic_account.account,state",0,Closed,Cerrado,1
-selection,"analytic_account.account,state",0,Draft,Borrador,1
-selection,"analytic_account.account,state",0,Opened,Abierto,1
-selection,"analytic_account.account,type",0,Normal,Normal,1
+field,"purchase.line,description",0,Description,Descripción,0
+field,"purchase.line,invoice_lines",0,Invoice Lines,Líneas de factura,0
+field,"purchase.line,move_done",0,Moves Done,Movimientos terminados,0
+field,"purchase.line,move_exception",0,Moves Exception,Exepción de movimientos,0
+field,"purchase.line,moves",0,Moves,Movimientos,0
+field,"purchase.line,moves_ignored",0,Ignored Moves,Movimientos ignorados,0
+field,"purchase.line,moves_recreated",0,Recreated Moves,Movimientos recreados,0
+field,"purchase.line,note",0,Note,Nota,0
+field,"purchase.line,product",0,Product,Producto,0
+field,"purchase.line,purchase",0,Purchase,Compra,0
+field,"purchase.line,quantity",0,Quantity,Cantidad,0
+field,"purchase.line,rec_name",0,Name,Nombre,0
+field,"purchase.line,sequence",0,Sequence,Secuencia,0
+field,"purchase.line,taxes",0,Taxes,Impuestos,0
+field,"purchase.line,type",0,Type,Tipo,0
+field,"purchase.line,unit",0,Unit,Unidad,0
+field,"purchase.line,unit_digits",0,Unit Digits,Decimales de la unidad,0
+field,"purchase.line,unit_price",0,Unit Price,Precio unitario,0
+field,"purchase.purchase,comment",0,Comment,Comentario,0
+field,"purchase.purchase,company",0,Company,Empresa,0
+field,"purchase.purchase,currency",0,Currency,Divisa,0
+field,"purchase.purchase,currency_digits",0,Currency Digits,Decimales de la divisa,0
+field,"purchase.purchase,description",0,Description,Descripción,0
+field,"purchase.purchase,invoice_address",0,Invoice Address,Dirección de facturación,0
+field,"purchase.purchase,invoice_exception",0,Invoices Exception,Excepción de facturas,0
+field,"purchase.purchase,invoice_method",0,Invoice Method,Método de facturación,0
+field,"purchase.purchase,invoice_paid",0,Invoices Paid,Facturas pagadas,0
+field,"purchase.purchase,invoices",0,Invoices,Facturas,0
+field,"purchase.purchase,invoices_ignored",0,Ignored Invoices,Facturas ignoradas,0
+field,"purchase.purchase,invoices_recreated",0,Recreated Invoices,Facturas recreadas,0
+field,"purchase.purchase,invoice_state",0,Invoice State,Estado de factura,0
+field,"purchase.purchase,lines",0,Lines,Líneas,0
+field,"purchase.purchase,moves",0,Moves,Movimientos,0
+field,"purchase.purchase,party",0,Party,Tercero,0
+field,"purchase.purchase,party_lang",0,Party Language,Idioma del tercero,0
+field,"purchase.purchase,payment_term",0,Payment Term,Plazo de pago,0
+field,"purchase.purchase,purchase_date",0,Purchase Date,Fecha de compra,0
+field,"purchase.purchase,rec_name",0,Name,Nombre,0
+field,"purchase.purchase,reference",0,Reference,Referencia,0
+field,"purchase.purchase,state",0,State,Estado,0
+field,"purchase.purchase,supplier_reference",0,Supplier Reference,Referencia del proveedor,0
+field,"purchase.purchase,tax_amount",0,Tax,Impuesto,0
+field,"purchase.purchase,total_amount",0,Total,Total,0
+field,"purchase.purchase,untaxed_amount",0,Untaxed,Sin Impuestos,0
+field,"purchase.purchase,warehouse",0,Warehouse,Depósito,0
+model,"analytic_account.account,name",0,Analytic Account,Cuenta analítica,0
+model,"purchase.line,name",0,Purchase Line,Línea de compra,0
+model,"purchase.purchase,name",0,Purchase,Compra,0
+selection,"analytic_account.account,display_balance",0,Credit - Debit,Haber - Debe,0
+selection,"analytic_account.account,display_balance",0,Debit - Credit,Debe - Haber,0
+selection,"analytic_account.account,state",0,Closed,Cerrado,0
+selection,"analytic_account.account,state",0,Draft,Borrador,0
+selection,"analytic_account.account,state",0,Opened,Abierta,0
+selection,"analytic_account.account,type",0,Normal,Normal,0
selection,"analytic_account.account,type",0,Root,Raíz,0
-selection,"analytic_account.account,type",0,View,Vista,1
-selection,"purchase.line,type",0,Comment,Comentario,1
-selection,"purchase.line,type",0,Line,Línea,1
-selection,"purchase.line,type",0,Subtotal,Subtotal,1
-selection,"purchase.line,type",0,Title,Título,1
-selection,"purchase.purchase,invoice_method",0,Based On Order,Basado En La Orden,0
-selection,"purchase.purchase,invoice_method",0,Based On Shipment,Basado En El Envío,0
-selection,"purchase.purchase,invoice_method",0,Manual,Manual,1
-selection,"purchase.purchase,invoice_state",0,Exception,Excepción,1
-selection,"purchase.purchase,invoice_state",0,None,Ninguno,1
-selection,"purchase.purchase,invoice_state",0,Paid,Pagado,1
-selection,"purchase.purchase,invoice_state",0,Waiting,En Espera,1
-selection,"purchase.purchase,packing_state",0,Exception,Excepción,1
-selection,"purchase.purchase,packing_state",0,None,Ninguno,1
-selection,"purchase.purchase,packing_state",0,Received,Recibido,1
-selection,"purchase.purchase,packing_state",0,Waiting,En Espera,1
-selection,"purchase.purchase,state",0,Canceled,Cancelado,1
-selection,"purchase.purchase,state",0,Confirmed,Confirmado,1
-selection,"purchase.purchase,state",0,Done,Hecho,1
-selection,"purchase.purchase,state",0,Draft,Borrador,1
-selection,"purchase.purchase,state",0,Quotation,Cotización,1
+selection,"analytic_account.account,type",0,View,Vista,0
+selection,"purchase.line,type",0,Comment,Comentario,0
+selection,"purchase.line,type",0,Line,Línea,0
+selection,"purchase.line,type",0,Subtotal,Subtotal,0
+selection,"purchase.line,type",0,Title,Título,0
+selection,"purchase.purchase,invoice_method",0,Based On Order,Basado en la orden,0
+selection,"purchase.purchase,invoice_method",0,Based On Shipment,Basado en el envío,0
+selection,"purchase.purchase,invoice_method",0,Manual,Manual,0
+selection,"purchase.purchase,invoice_state",0,Exception,Excepción,0
+selection,"purchase.purchase,invoice_state",0,None,Ninguno,0
+selection,"purchase.purchase,invoice_state",0,Paid,Pagada,0
+selection,"purchase.purchase,invoice_state",0,Waiting,En espera,0
+selection,"purchase.purchase,state",0,Canceled,Cancelada,0
+selection,"purchase.purchase,state",0,Confirmed,Confirmada,0
+selection,"purchase.purchase,state",0,Done,Terminada,0
+selection,"purchase.purchase,state",0,Draft,Borrador,0
+selection,"purchase.purchase,state",0,Quotation,Presupuesto,0
diff --git a/purchase.xml b/purchase.xml
index a536b31..6a8a1b9 100644
--- a/purchase.xml
+++ b/purchase.xml
@@ -1,5 +1,6 @@
<?xml version="1.0"?>
-<!-- This file is part of Tryton. The COPYRIGHT file at the top level of this repository contains the full copyright notices and license terms. -->
+<!-- This file is part of Tryton. The COPYRIGHT file at the top level of
+this repository contains the full copyright notices and license terms. -->
<tryton>
<data>
<record model="ir.ui.view" id="purchase_line_view_form">
diff --git a/setup.py b/setup.py
index 6620494..84a86f2 100644
--- a/setup.py
+++ b/setup.py
@@ -9,17 +9,12 @@ info = eval(file('__tryton__.py').read())
requires = []
for dep in info.get('depends', []):
- match = re.compile(
- '(ir|res|workflow|webdav)((\s|$|<|>|<=|>=|==|!=).*?$)').match(dep)
- if match:
- continue
- else:
- dep = 'trytond_' + dep
- requires.append(dep)
+ if not re.match(r'(ir|res|workflow|webdav)(\W|$)', dep):
+ requires.append('trytond_' + dep)
major_version, minor_version, _ = info.get('version', '0.0.1').split('.', 2)
requires.append('trytond >= %s.%s' % (major_version, minor_version))
-requires.append('trytond < %s.%s' % (major_version, str(int(minor_version) + 1)))
+requires.append('trytond < %s.%s' % (major_version, int(minor_version) + 1))
setup(name='trytond_analytic_purchase',
version=info.get('version', '0.0.1'),
diff --git a/tests/__init__.py b/tests/__init__.py
new file mode 100644
index 0000000..381ef20
--- /dev/null
+++ b/tests/__init__.py
@@ -0,0 +1,4 @@
+#This file is part of Tryton. The COPYRIGHT file at the top level of
+#this repository contains the full copyright notices and license terms.
+
+from test_analytic_purchase import *
diff --git a/tests/test_analytic_purchase.py b/tests/test_analytic_purchase.py
new file mode 100644
index 0000000..8ef6507
--- /dev/null
+++ b/tests/test_analytic_purchase.py
@@ -0,0 +1,38 @@
+#!/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, 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 RPCProxy, CONTEXT, SOCK, test_view
+
+
+class AnalyticPurchaseTestCase(unittest.TestCase):
+ '''
+ Test AnalyticPurchase module.
+ '''
+
+ def setUp(self):
+ trytond.tests.test_tryton.install_module('analytic_purchase')
+
+ def test0005views(self):
+ '''
+ Test views.
+ '''
+ self.assertRaises(Exception, test_view('analytic_purchase'))
+
+def suite():
+ return unittest.TestLoader().loadTestsFromTestCase(AnalyticPurchaseTestCase)
+
+if __name__ == '__main__':
+ suiteTrytond = trytond.tests.test_tryton.suite()
+ suiteAnalyticPurchase = suite()
+ alltests = unittest.TestSuite([suiteTrytond, suiteAnalyticPurchase])
+ unittest.TextTestRunner(verbosity=2).run(alltests)
+ SOCK.disconnect()
diff --git a/trytond_analytic_purchase.egg-info/PKG-INFO b/trytond_analytic_purchase.egg-info/PKG-INFO
index 0ccbe1e..bfd3cf4 100644
--- a/trytond_analytic_purchase.egg-info/PKG-INFO
+++ b/trytond_analytic_purchase.egg-info/PKG-INFO
@@ -1,13 +1,13 @@
Metadata-Version: 1.0
Name: trytond-analytic-purchase
-Version: 1.2.0
+Version: 1.4.0
Summary: Add analytic account on purchase lines.
Home-page: http://www.tryton.org/
Author: B2CK
Author-email: info at b2ck.com
License: GPL-3
-Download-URL: http://downloads.tryton.org/1.2/
+Download-URL: http://downloads.tryton.org/1.4/
Description: UNKNOWN
Platform: UNKNOWN
Classifier: Development Status :: 5 - Production/Stable
diff --git a/trytond_analytic_purchase.egg-info/SOURCES.txt b/trytond_analytic_purchase.egg-info/SOURCES.txt
index abb37c0..1447743 100644
--- a/trytond_analytic_purchase.egg-info/SOURCES.txt
+++ b/trytond_analytic_purchase.egg-info/SOURCES.txt
@@ -13,6 +13,8 @@ setup.py
./__init__.py
./__tryton__.py
./purchase.py
+tests/__init__.py
+tests/test_analytic_purchase.py
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 6cf4887..48d0de3 100644
--- a/trytond_analytic_purchase.egg-info/requires.txt
+++ b/trytond_analytic_purchase.egg-info/requires.txt
@@ -1,5 +1,5 @@
trytond_purchase
trytond_analytic_account
trytond_analytic_invoice
-trytond >= 1.2
-trytond < 1.3
\ No newline at end of file
+trytond >= 1.4
+trytond < 1.5
\ No newline at end of file
commit 8c444a2fa36f56eb88560ce90a229dfe945bd7c2
Author: Daniel Baumann <daniel at debian.org>
Date: Tue Apr 21 11:08:24 2009 +0200
Adding upstream version 1.2.0.
diff --git a/CHANGELOG b/CHANGELOG
index 2521948..d28f483 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,7 +1,5 @@
-Version 1.0.2 - 2009-03-02
-* Some bug fixes (see mercurial logs for details)
-
-Version 1.0.1 - 2008-12-01
+Version 1.2.0 - 2009-04-20
+* Bug fixes (see mercurial logs for details)
* Allow egg installation
Version 1.0.0 - 2008-11-17
diff --git a/INSTALL b/INSTALL
index d71729e..afd8496 100644
--- a/INSTALL
+++ b/INSTALL
@@ -5,14 +5,14 @@ Prerequisites
-------------
* Python 2.4 or later (http://www.python.org/)
- * trytond 0.0.x (http://www.tryton.org/)
+ * trytond 1.1.x (http://www.tryton.org/)
* trytond_analytic_account (http://www.tryton.org/)
* trytond_analytic_invoice (http://www.tryton.org/)
Installation
------------
-Once you've downloaded and unpacked a trytond_analytic_purchase source release, enter the
+Once you've downloaded and unpacked the trytond_analytic_purchase source release, enter the
directory where the archive was unpacked, and run:
python setup.py install
diff --git a/PKG-INFO b/PKG-INFO
index a5a45f6..5cd2278 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,13 +1,13 @@
Metadata-Version: 1.0
Name: trytond_analytic_purchase
-Version: 1.0.2
+Version: 1.2.0
Summary: Add analytic account on purchase lines.
Home-page: http://www.tryton.org/
Author: B2CK
Author-email: info at b2ck.com
License: GPL-3
-Download-URL: http://downloads.tryton.org/1.0/
+Download-URL: http://downloads.tryton.org/1.2/
Description: UNKNOWN
Platform: UNKNOWN
Classifier: Development Status :: 5 - Production/Stable
diff --git a/__tryton__.py b/__tryton__.py
index 5cf2ce7..8d3261b 100644
--- a/__tryton__.py
+++ b/__tryton__.py
@@ -3,9 +3,10 @@
{
'name': 'Analytic Purchase',
'name_de_DE': 'Kostenstellen Einkauf',
- 'name_fr_FR': 'Achat analytique',
+ 'name_es_CO': 'Compra Analítica',
'name_es_ES': 'Compra Analítica',
- 'version': '1.0.2',
+ 'name_fr_FR': 'Achat analytique',
+ 'version': '1.2.0',
'author': 'B2CK',
'email': 'info at b2ck.com',
'website': 'http://www.tryton.org/',
@@ -13,9 +14,11 @@
''',
'description_de_DE': '''Fügt kostenstellen zu Einkaufspositionen hinzu
''',
- 'description_fr_FR': 'Ajoute la comptabilité analytique sur les lignes d\'achat.',
+ 'description_es_CO': '''Adiciona contabilidad analítica a las líneas de compra.
+''',
'description_es_ES': '''Adiciona contabilidad analítica a las líneas de compra.
''',
+ 'description_fr_FR': 'Ajoute la comptabilité analytique sur les lignes d\'achat.',
'depends': [
'purchase',
'analytic_account',
@@ -26,6 +29,7 @@
],
'translation': [
'de_DE.csv',
+ 'es_CO.csv',
'es_ES.csv',
'fr_FR.csv',
],
diff --git a/es_CO.csv b/es_CO.csv
new file mode 100644
index 0000000..a1b3aa5
--- /dev/null
+++ b/es_CO.csv
@@ -0,0 +1,108 @@
+type,name,res_id,src,value,fuzzy
+error,analytic_account.account,0,You can not create recursive accounts!,No puede crear cuentas recursivas!,1
+error,purchase.line,0,"It misses an ""account_expense"" default property!","Falta una propiedad por defecto ""account_expense""!",0
+error,purchase.line,0,"It misses an ""Account Expense"" on product ""%s""!","Falta una propiedad por defecto ""Account Expense""!",0
+error,purchase.line,0,The supplier location is required!,Se requiere la localización del proveedor!,0
+error,purchase.purchase,0,"Analytic account is required on line ""%s"" (%d)!","Se requiere una cuenta analítica en la línea ""%s"" (%d)!",0
+error,purchase.purchase,0,Invoice addresses must be defined for the quotation.,Factura direccionada debe ser definida por el presupuesto.,0
+error,purchase.purchase,0,"It misses an ""Account Payable"" on the party ""%s""!","Falta una ""Cuenta Pagadera"" en el tercero ""%s""!",0
+field,"analytic_account.account,active",0,Active,Activo,1
+field,"analytic_account.account,balance",0,Balance,Balance,1
+field,"analytic_account.account,childs",0,Children,Hij at s,1
+field,"analytic_account.account,code",0,Code,Código,1
+field,"analytic_account.account,company",0,Company,Compañía,1
+field,"analytic_account.account,credit",0,Credit,Crédito,1
+field,"analytic_account.account,currency",0,Currency,Moneda,1
+field,"analytic_account.account,currency_digits",0,Currency Digits,Manejo de Moneda,1
+field,"analytic_account.account,debit",0,Debit,Débito,1
+field,"analytic_account.account,display_balance",0,Display Balance,Mostrar Balance,1
+field,"analytic_account.account,mandatory",0,Mandatory,Obligatorio,0
+field,"analytic_account.account,name",0,Name,Nombre del campo,1
+field,"analytic_account.account,note",0,Note,Nota,1
+field,"analytic_account.account,parent",0,Parent,Padre,1
+field,"analytic_account.account,rec_name",0,Name,Nombre del campo,1
+field,"analytic_account.account,root",0,Root,Raíz,0
+field,"analytic_account.account,state",0,State,Estado,1
+field,"analytic_account.account,type",0,Type,Tipo,1
+field,"purchase.line,amount",0,Amount,Cantidad,1
+field,"purchase.line,analytic_accounts",0,Analytic Accounts,Cuentas Analíticas,0
+field,"purchase.line,description",0,Description,Descripción,1
+field,"purchase.line,invoice_lines",0,Invoice Lines,Líneas de Factura,1
+field,"purchase.line,move_done",0,Moves Done,Movimientos Hechos,1
+field,"purchase.line,move_exception",0,Moves Exception,Exepción de Movimientos,1
+field,"purchase.line,moves",0,Moves,Movimientos,1
+field,"purchase.line,moves_ignored",0,Ignored Moves,Movimientos Ignorados,1
+field,"purchase.line,moves_recreated",0,Recreated Moves,Rehacer Movimientos,1
+field,"purchase.line,note",0,Note,Nota,1
+field,"purchase.line,product",0,Product,Productos,1
+field,"purchase.line,purchase",0,Purchase,Compras,1
+field,"purchase.line,quantity",0,Quantity,Cantidad,1
+field,"purchase.line,rec_name",0,Name,Nombre del campo,1
+field,"purchase.line,sequence",0,Sequence,Secuencia,1
+field,"purchase.line,taxes",0,Taxes,Impuestos,1
+field,"purchase.line,type",0,Type,Tipo,1
+field,"purchase.line,unit",0,Unit,Unidad,1
+field,"purchase.line,unit_digits",0,Unit Digits,Dígitos Unitarios,1
+field,"purchase.line,unit_price",0,Unit Price,Precio Unitario,1
+field,"purchase.purchase,comment",0,Comment,Comentario,1
+field,"purchase.purchase,company",0,Company,Compañía,1
+field,"purchase.purchase,currency",0,Currency,Moneda,1
+field,"purchase.purchase,currency_digits",0,Currency Digits,Manejo de Moneda,1
+field,"purchase.purchase,description",0,Description,Descripción,1
+field,"purchase.purchase,invoice_address",0,Invoice Address,Dirección de Facturación,1
+field,"purchase.purchase,invoice_exception",0,Invoices Exception,Excepción de Facturación,1
+field,"purchase.purchase,invoice_method",0,Invoice Method,Método de Facturación,1
+field,"purchase.purchase,invoice_paid",0,Invoices Paid,Facturas Pagadas,1
+field,"purchase.purchase,invoices",0,Invoices,Facturas,1
+field,"purchase.purchase,invoices_ignored",0,Ignored Invoices,Facturas Ignoradas,1
+field,"purchase.purchase,invoices_recreated",0,Recreated Invoices,Rehacer facturas,1
+field,"purchase.purchase,invoice_state",0,Invoice State,Estado de Factura,1
+field,"purchase.purchase,lines",0,Lines,Líneas de Inventario,1
+field,"purchase.purchase,moves",0,Moves,Movimientos,1
+field,"purchase.purchase,packing_done",0,Shipment Done,Empacado Finalizado,1
+field,"purchase.purchase,packing_exception",0,Shipments Exception,Excepción de Empaques,1
+field,"purchase.purchase,packings",0,Shipments,Empaques,1
+field,"purchase.purchase,packing_state",0,Shipment State,Estado de Empaque,1
+field,"purchase.purchase,party",0,Party,Terceros,1
+field,"purchase.purchase,party_lang",0,Party Language,Idioma del Tercero,1
+field,"purchase.purchase,payment_term",0,Payment Term,Término de Pago,1
+field,"purchase.purchase,purchase_date",0,Purchase Date,Fecha de Compra,0
+field,"purchase.purchase,rec_name",0,Name,Nombre del campo,1
+field,"purchase.purchase,reference",0,Reference,Referencia,1
+field,"purchase.purchase,state",0,State,Estado,1
+field,"purchase.purchase,supplier_reference",0,Supplier Reference,Referencia del Proveedor,0
+field,"purchase.purchase,tax_amount",0,Tax,Impuesto,1
+field,"purchase.purchase,total_amount",0,Total,Total,1
+field,"purchase.purchase,untaxed_amount",0,Untaxed,Sin Impuesto,1
+field,"purchase.purchase,warehouse",0,Warehouse,Depósito,1
+model,"analytic_account.account,name",0,Analytic Account,Cuenta Analítica,1
+model,"purchase.line,name",0,Purchase Line,Línea de Compra,1
+model,"purchase.purchase,name",0,Purchase,Compras,1
+selection,"analytic_account.account,display_balance",0,Credit - Debit,Crédito - Débito,1
+selection,"analytic_account.account,display_balance",0,Debit - Credit,Débito - Crédito,1
+selection,"analytic_account.account,state",0,Closed,Cerrado,1
+selection,"analytic_account.account,state",0,Draft,Borrador,1
+selection,"analytic_account.account,state",0,Opened,Abierto,1
+selection,"analytic_account.account,type",0,Normal,Normal,1
+selection,"analytic_account.account,type",0,Root,Raíz,0
+selection,"analytic_account.account,type",0,View,Vista,1
+selection,"purchase.line,type",0,Comment,Comentario,1
+selection,"purchase.line,type",0,Line,Línea,1
+selection,"purchase.line,type",0,Subtotal,Subtotal,1
+selection,"purchase.line,type",0,Title,Título,1
+selection,"purchase.purchase,invoice_method",0,Based On Order,Basado En La Orden,0
+selection,"purchase.purchase,invoice_method",0,Based On Shipment,Basado En El Envío,0
+selection,"purchase.purchase,invoice_method",0,Manual,Manual,1
+selection,"purchase.purchase,invoice_state",0,Exception,Excepción,1
+selection,"purchase.purchase,invoice_state",0,None,Ninguno,1
+selection,"purchase.purchase,invoice_state",0,Paid,Pagado,1
+selection,"purchase.purchase,invoice_state",0,Waiting,En Espera,1
+selection,"purchase.purchase,packing_state",0,Exception,Excepción,1
+selection,"purchase.purchase,packing_state",0,None,Ninguno,1
+selection,"purchase.purchase,packing_state",0,Received,Recibido,1
+selection,"purchase.purchase,packing_state",0,Waiting,En Espera,1
+selection,"purchase.purchase,state",0,Canceled,Cancelado,1
+selection,"purchase.purchase,state",0,Confirmed,Confirmado,1
+selection,"purchase.purchase,state",0,Done,Hecho,1
+selection,"purchase.purchase,state",0,Draft,Borrador,1
+selection,"purchase.purchase,state",0,Quotation,Cotización,1
diff --git a/es_ES.csv b/es_ES.csv
index 046fb21..d10abae 100644
--- a/es_ES.csv
+++ b/es_ES.csv
@@ -1,2 +1,107 @@
type,name,res_id,src,value,fuzzy
-field,"purchase.line,analytic_accounts",0,Analytic Accounts,Cuentas Analíticas,0
+error,analytic_account.account,0,You can not create recursive accounts!,No puede crear cuentas recursivas!,1
+error,purchase.line,0,"It misses an ""Account Expense"" on product ""%s""!","Falta una propiedad por defecto ""Account Expense""!",0
+error,purchase.line,0,The supplier location is required!,Se requiere la localización del proveedor!,0
+error,purchase.purchase,0,"Analytic account is required on line ""%s"" (%d)!","Se requiere una cuenta analítica en la línea ""%s"" (%d)!",0
+error,purchase.purchase,0,Invoice addresses must be defined for the quotation.,Factura direccionada debe ser definida por el presupuesto.,0
+error,purchase.purchase,0,"It misses an ""Account Payable"" on the party ""%s""!","Falta una ""Cuenta Pagadera"" en el tercero ""%s""!",0
+field,"analytic_account.account,active",0,Active,Activo,1
+field,"analytic_account.account,balance",0,Balance,Balance,1
+field,"analytic_account.account,childs",0,Children,Hij at s,1
+field,"analytic_account.account,code",0,Code,Código,1
+field,"analytic_account.account,company",0,Company,Compañía,1
+field,"analytic_account.account,credit",0,Credit,Crédito,1
+field,"analytic_account.account,currency",0,Currency,Moneda,1
+field,"analytic_account.account,currency_digits",0,Currency Digits,Manejo de Moneda,1
+field,"analytic_account.account,debit",0,Debit,Débito,1
+field,"analytic_account.account,display_balance",0,Display Balance,Mostrar Balance,1
+field,"analytic_account.account,mandatory",0,Mandatory,Obligatorio,0
+field,"analytic_account.account,name",0,Name,Nombre del campo,1
+field,"analytic_account.account,note",0,Note,Nota,1
+field,"analytic_account.account,parent",0,Parent,Padre,1
+field,"analytic_account.account,rec_name",0,Name,Nombre del campo,1
+field,"analytic_account.account,root",0,Root,Raíz,0
+field,"analytic_account.account,state",0,State,Estado,1
+field,"analytic_account.account,type",0,Type,Tipo,1
+field,"purchase.line,amount",0,Amount,Cantidad,1
+field,"purchase.line,analytic_accounts",0,Analytic Accounts,Cuentas analíticas,0
+field,"purchase.line,description",0,Description,Descripción,1
+field,"purchase.line,invoice_lines",0,Invoice Lines,Líneas de Factura,1
+field,"purchase.line,move_done",0,Moves Done,Movimientos Hechos,1
+field,"purchase.line,move_exception",0,Moves Exception,Exepción de Movimientos,1
+field,"purchase.line,moves",0,Moves,Movimientos,1
+field,"purchase.line,moves_ignored",0,Ignored Moves,Movimientos Ignorados,1
+field,"purchase.line,moves_recreated",0,Recreated Moves,Rehacer Movimientos,1
+field,"purchase.line,note",0,Note,Nota,1
+field,"purchase.line,product",0,Product,Productos,1
+field,"purchase.line,purchase",0,Purchase,Compras,1
+field,"purchase.line,quantity",0,Quantity,Cantidad,1
+field,"purchase.line,rec_name",0,Name,Nombre del campo,1
+field,"purchase.line,sequence",0,Sequence,Secuencia,1
+field,"purchase.line,taxes",0,Taxes,Impuestos,1
+field,"purchase.line,type",0,Type,Tipo,1
+field,"purchase.line,unit",0,Unit,Unidad,1
+field,"purchase.line,unit_digits",0,Unit Digits,Dígitos Unitarios,1
+field,"purchase.line,unit_price",0,Unit Price,Precio Unitario,1
+field,"purchase.purchase,comment",0,Comment,Comentario,1
+field,"purchase.purchase,company",0,Company,Compañía,1
+field,"purchase.purchase,currency",0,Currency,Moneda,1
+field,"purchase.purchase,currency_digits",0,Currency Digits,Manejo de Moneda,1
+field,"purchase.purchase,description",0,Description,Descripción,1
+field,"purchase.purchase,invoice_address",0,Invoice Address,Dirección de Facturación,1
+field,"purchase.purchase,invoice_exception",0,Invoices Exception,Excepción de Facturación,1
+field,"purchase.purchase,invoice_method",0,Invoice Method,Método de Facturación,1
+field,"purchase.purchase,invoice_paid",0,Invoices Paid,Facturas Pagadas,1
+field,"purchase.purchase,invoices",0,Invoices,Facturas,1
+field,"purchase.purchase,invoices_ignored",0,Ignored Invoices,Facturas Ignoradas,1
+field,"purchase.purchase,invoices_recreated",0,Recreated Invoices,Rehacer facturas,1
+field,"purchase.purchase,invoice_state",0,Invoice State,Estado de Factura,1
+field,"purchase.purchase,lines",0,Lines,Líneas de Inventario,1
+field,"purchase.purchase,moves",0,Moves,Movimientos,1
+field,"purchase.purchase,packing_done",0,Shipment Done,Empacado Finalizado,1
+field,"purchase.purchase,packing_exception",0,Shipments Exception,Excepción de Empaques,1
+field,"purchase.purchase,packings",0,Shipments,Empaques,1
+field,"purchase.purchase,packing_state",0,Shipment State,Estado de Empaque,1
+field,"purchase.purchase,party",0,Party,Terceros,1
+field,"purchase.purchase,party_lang",0,Party Language,Idioma del Tercero,1
+field,"purchase.purchase,payment_term",0,Payment Term,Término de Pago,1
+field,"purchase.purchase,purchase_date",0,Purchase Date,Fecha de Compra,0
+field,"purchase.purchase,rec_name",0,Name,Nombre del campo,1
+field,"purchase.purchase,reference",0,Reference,Referencia,1
+field,"purchase.purchase,state",0,State,Estado,1
+field,"purchase.purchase,supplier_reference",0,Supplier Reference,Referencia del Proveedor,0
+field,"purchase.purchase,tax_amount",0,Tax,Impuesto,1
+field,"purchase.purchase,total_amount",0,Total,Total,1
+field,"purchase.purchase,untaxed_amount",0,Untaxed,Sin Impuesto,1
+field,"purchase.purchase,warehouse",0,Warehouse,Depósito,1
+model,"analytic_account.account,name",0,Analytic Account,Cuenta Analítica,1
+model,"purchase.line,name",0,Purchase Line,Línea de Compra,1
+model,"purchase.purchase,name",0,Purchase,Compras,1
+selection,"analytic_account.account,display_balance",0,Credit - Debit,Crédito - Débito,1
+selection,"analytic_account.account,display_balance",0,Debit - Credit,Débito - Crédito,1
+selection,"analytic_account.account,state",0,Closed,Cerrado,1
+selection,"analytic_account.account,state",0,Draft,Borrador,1
+selection,"analytic_account.account,state",0,Opened,Abierto,1
+selection,"analytic_account.account,type",0,Normal,Normal,1
+selection,"analytic_account.account,type",0,Root,Raíz,0
+selection,"analytic_account.account,type",0,View,Vista,1
+selection,"purchase.line,type",0,Comment,Comentario,1
+selection,"purchase.line,type",0,Line,Línea,1
+selection,"purchase.line,type",0,Subtotal,Subtotal,1
+selection,"purchase.line,type",0,Title,Título,1
+selection,"purchase.purchase,invoice_method",0,Based On Order,Basado En La Orden,0
+selection,"purchase.purchase,invoice_method",0,Based On Shipment,Basado En El Envío,0
+selection,"purchase.purchase,invoice_method",0,Manual,Manual,1
+selection,"purchase.purchase,invoice_state",0,Exception,Excepción,1
+selection,"purchase.purchase,invoice_state",0,None,Ninguno,1
+selection,"purchase.purchase,invoice_state",0,Paid,Pagado,1
+selection,"purchase.purchase,invoice_state",0,Waiting,En Espera,1
+selection,"purchase.purchase,packing_state",0,Exception,Excepción,1
+selection,"purchase.purchase,packing_state",0,None,Ninguno,1
+selection,"purchase.purchase,packing_state",0,Received,Recibido,1
+selection,"purchase.purchase,packing_state",0,Waiting,En Espera,1
+selection,"purchase.purchase,state",0,Canceled,Cancelado,1
+selection,"purchase.purchase,state",0,Confirmed,Confirmado,1
+selection,"purchase.purchase,state",0,Done,Hecho,1
+selection,"purchase.purchase,state",0,Draft,Borrador,1
+selection,"purchase.purchase,state",0,Quotation,Cotización,1
diff --git a/purchase.py b/purchase.py
index d8ccd8a..488b025 100644
--- a/purchase.py
+++ b/purchase.py
@@ -1,11 +1,10 @@
#This file is part of Tryton. The COPYRIGHT file at the top level of
#this repository contains the full copyright notices and license terms.
"Purchase"
+from trytond.model import ModelView, ModelSQL, fields
-from trytond.osv import fields, OSV
-
-class Purchase(OSV):
+class Purchase(ModelSQL, ModelView):
_name = "purchase.purchase"
def __init__(self):
@@ -24,21 +23,22 @@ class Purchase(OSV):
purchase_id, context=context)
purchase = self.browse(cursor, user, purchase_id, context=context)
- for line in purchase.lines:
- if line.type != 'line':
- continue
- if not account_selection_obj.check_root(cursor, user,
- [line.analytic_accounts.id]):
- line_name = purchase_line_obj.name_get(cursor, user,
- line.id, context=context)[0][1]
- self.raise_user_error(cursor, 'analytic_account_required',
- (line_name, line.id), context=context)
+ if not account_selection_obj.check_root(cursor, user,
+ [x.analytic_accounts.id for x in purchase.lines
+ if x.analytic_accounts.id]):
+ for line in purchase.lines:
+ if line.type != 'line':
+ continue
+ if not account_selection_obj.check_root(cursor, user,
+ [line.analytic_accounts.id]):
+ self.raise_user_error(cursor, 'analytic_account_required',
+ (line.rec_name, line.id), context=context)
return res
Purchase()
-class PurchaseLine(OSV):
+class PurchaseLine(ModelSQL, ModelView):
_name = 'purchase.line'
analytic_accounts = fields.Many2One('analytic_account.account.selection',
@@ -68,15 +68,30 @@ class PurchaseLine(OSV):
user, analytic_accounts_field, fields_names, context=context))
return res
- def _read_flat(self, cursor, user, ids, fields_names, context=None,
- load='_classic_read'):
+ def read(self, cursor, user, ids, fields_names=None, context=None):
selection_obj = self.pool.get('analytic_account.account.selection')
- res = super(PurchaseLine, self)._read_flat(cursor, user, ids,
- fields_names, context=context, load=load)
+
+ int_id = False
+ if isinstance(ids, (int, long)):
+ int_id = True
+ ids = [ids]
+
+ if fields_names:
+ fields_names2 = [x for x in fields_names
+ if not x.startswith('analytic_account_')]
+ else:
+ fields_names2 = fields_names
+
+ res = super(PurchaseLine, self).read(cursor, user, ids,
+ fields_names=fields_names2, context=context)
+
+ if not fields_names:
+ fields_names = list(set(self._columns.keys() \
+ + self._inherit_fields.keys()))
root_ids = []
for field in fields_names:
- if field.startswith('analytic_account_'):
+ if field.startswith('analytic_account_') and '.' not in field:
root_ids.append(int(field[len('analytic_account_'):]))
if root_ids:
id2record = {}
@@ -86,10 +101,19 @@ class PurchaseLine(OSV):
for line in lines:
if line.type != 'line':
continue
+ if not line.analytic_accounts:
+ continue
for account in line.analytic_accounts.accounts:
if account.root.id in root_ids:
id2record[line.id]['analytic_account_' \
+ str(account.root.id)] = account.id
+ for field in fields_names:
+ if field.startswith('analytic_account_' + \
+ str(account.root.id) + '.'):
+ ham, field2 = field.split('.', 1)
+ id2record[line.id][field] = account[field2]
+ if int_id:
+ return res[0]
return res
def create(self, cursor, user, vals, context=None):
@@ -129,6 +153,14 @@ class PurchaseLine(OSV):
if line.type != 'line':
continue
accounts = []
+ if not line.analytic_accounts:
+ # Create missing selection
+ selection_id = selection_obj.create(cursor, 0, {},
+ context=context)
+ self.write(cursor, user, line.id, {
+ 'analytic_accounts': selection_id,
+ }, context=context)
+ line = self.browse(cursor, user, line.id, context=context)
for account in line.analytic_accounts.accounts:
if account.root.id in selection_vals:
value = selection_vals[account.root.id]
@@ -162,21 +194,29 @@ class PurchaseLine(OSV):
selection_obj.delete(cursor, user, selection_ids, context=context)
return res
- def copy(self, cursor, user, line_id, default=None, context=None):
+ def copy(self, cursor, user, ids, default=None, context=None):
selection_obj = self.pool.get('analytic_account.account.selection')
- if default is None:
- default = {}
- default = default.copy()
- line = self.browse(cursor, user, line_id, context=context)
- selection_id = False
- if line.analytic_accounts:
- selection_id = selection_obj.copy(cursor, user,
- line.analytic_accounts.id, context=context)
- default['analytic_accounts'] = selection_id
- return super(PurchaseLine, self).copy(cursor, user, line_id,
+ new_ids = super(PurchaseLine, self).copy(cursor, user, ids,
default=default, context=context)
+ int_id = False
+ if isinstance(new_ids, (int, long)):
+ int_id = True
+ new_ids = [new_ids]
+
+ for line in self.browse(cursor, user, new_ids, context=context):
+ if line.analytic_accounts:
+ selection_id = selection_obj.copy(cursor, user,
+ line.analytic_accounts.id, context=context)
+ self.write(cursor, user, line.id, {
+ 'analytic_accounts': selection_id,
+ }, context=context)
+
+ if int_id:
+ return new_ids[0]
+ return new_ids
+
def get_invoice_line(self, cursor, user, line, context=None):
account_selection_obj = self.pool.get('analytic_account.account.selection')
@@ -196,7 +236,7 @@ class PurchaseLine(OSV):
PurchaseLine()
-class Account(OSV):
+class Account(ModelSQL, ModelView):
_name = 'analytic_account.account'
def delete(self, cursor, user, ids, context=None):
diff --git a/purchase.xml b/purchase.xml
index ba4272a..a536b31 100644
--- a/purchase.xml
+++ b/purchase.xml
@@ -9,7 +9,7 @@
<![CDATA[
<data>
<xpath
- expr="/form/field[@name="amount"]"
+ expr="/form/notebook/page/field[@name="amount"]"
position="after">
<group col="4" colspan="4" name="analytic_accounts">
<field name="analytic_accounts"/>
diff --git a/trytond_analytic_purchase.egg-info/PKG-INFO b/trytond_analytic_purchase.egg-info/PKG-INFO
index c4f2261..0ccbe1e 100644
--- a/trytond_analytic_purchase.egg-info/PKG-INFO
+++ b/trytond_analytic_purchase.egg-info/PKG-INFO
@@ -1,13 +1,13 @@
Metadata-Version: 1.0
Name: trytond-analytic-purchase
-Version: 1.0.2
+Version: 1.2.0
Summary: Add analytic account on purchase lines.
Home-page: http://www.tryton.org/
Author: B2CK
Author-email: info at b2ck.com
License: GPL-3
-Download-URL: http://downloads.tryton.org/1.0/
+Download-URL: http://downloads.tryton.org/1.2/
Description: UNKNOWN
Platform: UNKNOWN
Classifier: Development Status :: 5 - Production/Stable
diff --git a/trytond_analytic_purchase.egg-info/SOURCES.txt b/trytond_analytic_purchase.egg-info/SOURCES.txt
index 92a60b9..abb37c0 100644
--- a/trytond_analytic_purchase.egg-info/SOURCES.txt
+++ b/trytond_analytic_purchase.egg-info/SOURCES.txt
@@ -5,6 +5,7 @@ LICENSE
MANIFEST.in
README
de_DE.csv
+es_CO.csv
es_ES.csv
fr_FR.csv
purchase.xml
diff --git a/trytond_analytic_purchase.egg-info/requires.txt b/trytond_analytic_purchase.egg-info/requires.txt
index 9a15abe..6cf4887 100644
--- a/trytond_analytic_purchase.egg-info/requires.txt
+++ b/trytond_analytic_purchase.egg-info/requires.txt
@@ -1,5 +1,5 @@
trytond_purchase
trytond_analytic_account
trytond_analytic_invoice
-trytond >= 1.0
-trytond < 1.1
\ No newline at end of file
+trytond >= 1.2
+trytond < 1.3
\ No newline at end of file
commit 09101d4f7e427b1abaac222d3fb54a88986381b6
Author: Daniel Baumann <daniel at debian.org>
Date: Mon Mar 23 06:50:03 2009 +0100
Adding upstream version 1.0.2.
diff --git a/CHANGELOG b/CHANGELOG
index 9801fce..2521948 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+Version 1.0.2 - 2009-03-02
+* Some bug fixes (see mercurial logs for details)
+
Version 1.0.1 - 2008-12-01
* Allow egg installation
diff --git a/COPYRIGHT b/COPYRIGHT
index 2afd2a7..853f1f7 100644
--- a/COPYRIGHT
+++ b/COPYRIGHT
@@ -1,5 +1,5 @@
-Copyright (C) 2008 Cédric Krier.
-Copyright (C) 2008 B2CK SPRL.
+Copyright (C) 2008-2009 Cédric Krier.
+Copyright (C) 2008-2009 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 912d3ca..a5a45f6 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
Metadata-Version: 1.0
Name: trytond_analytic_purchase
-Version: 1.0.1
+Version: 1.0.2
Summary: Add analytic account on purchase lines.
Home-page: http://www.tryton.org/
diff --git a/__tryton__.py b/__tryton__.py
index 6dbb47f..5cf2ce7 100644
--- a/__tryton__.py
+++ b/__tryton__.py
@@ -5,7 +5,7 @@
'name_de_DE': 'Kostenstellen Einkauf',
'name_fr_FR': 'Achat analytique',
'name_es_ES': 'Compra Analítica',
- 'version': '1.0.1',
+ 'version': '1.0.2',
'author': 'B2CK',
'email': 'info at b2ck.com',
'website': 'http://www.tryton.org/',
diff --git a/purchase.py b/purchase.py
index b29daff..d8ccd8a 100644
--- a/purchase.py
+++ b/purchase.py
@@ -25,6 +25,8 @@ class Purchase(OSV):
purchase = self.browse(cursor, user, purchase_id, context=context)
for line in purchase.lines:
+ if line.type != 'line':
+ continue
if not account_selection_obj.check_root(cursor, user,
[line.analytic_accounts.id]):
line_name = purchase_line_obj.name_get(cursor, user,
@@ -82,6 +84,8 @@ class PurchaseLine(OSV):
id2record[record['id']] = record
lines = self.browse(cursor, user, ids, context=context)
for line in lines:
+ if line.type != 'line':
+ continue
for account in line.analytic_accounts.accounts:
if account.root.id in root_ids:
id2record[line.id]['analytic_account_' \
diff --git a/trytond_analytic_purchase.egg-info/PKG-INFO b/trytond_analytic_purchase.egg-info/PKG-INFO
index 2c93ac0..c4f2261 100644
--- a/trytond_analytic_purchase.egg-info/PKG-INFO
+++ b/trytond_analytic_purchase.egg-info/PKG-INFO
@@ -1,6 +1,6 @@
Metadata-Version: 1.0
Name: trytond-analytic-purchase
-Version: 1.0.1
+Version: 1.0.2
Summary: Add analytic account on purchase lines.
Home-page: http://www.tryton.org/
commit 29385680369441fe671c95442f0cb4b4f349b158
Author: Daniel Baumann <daniel at debian.org>
Date: Wed Jan 28 14:04:21 2009 +0100
Adding upstream version 1.0.1.
diff --git a/CHANGELOG b/CHANGELOG
index eacaaef..9801fce 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,2 +1,5 @@
+Version 1.0.1 - 2008-12-01
+* Allow egg installation
+
Version 1.0.0 - 2008-11-17
* Initial release
diff --git a/PKG-INFO b/PKG-INFO
index afd67f5..912d3ca 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,12 +1,13 @@
Metadata-Version: 1.0
Name: trytond_analytic_purchase
-Version: 1.0.0
+Version: 1.0.1
Summary: Add analytic account on purchase lines.
Home-page: http://www.tryton.org/
Author: B2CK
Author-email: info at b2ck.com
License: GPL-3
+Download-URL: http://downloads.tryton.org/1.0/
Description: UNKNOWN
Platform: UNKNOWN
Classifier: Development Status :: 5 - Production/Stable
diff --git a/__tryton__.py b/__tryton__.py
index abc6418..6dbb47f 100644
--- a/__tryton__.py
+++ b/__tryton__.py
@@ -5,7 +5,7 @@
'name_de_DE': 'Kostenstellen Einkauf',
'name_fr_FR': 'Achat analytique',
'name_es_ES': 'Compra Analítica',
- 'version': '1.0.0',
+ 'version': '1.0.1',
'author': 'B2CK',
'email': 'info at b2ck.com',
'website': 'http://www.tryton.org/',
diff --git a/setup.py b/setup.py
index eedc844..6620494 100644
--- a/setup.py
+++ b/setup.py
@@ -27,6 +27,8 @@ setup(name='trytond_analytic_purchase',
author=info.get('author', ''),
author_email=info.get('email', ''),
url=info.get('website', ''),
+ download_url="http://downloads.tryton.org/" + \
+ info.get('version', '0.0.1').rsplit('.', 1)[0] + '/',
package_dir={'trytond.modules.analytic_purchase': '.'},
packages=[
'trytond.modules.analytic_purchase',
@@ -53,4 +55,9 @@ setup(name='trytond_analytic_purchase',
],
license='GPL-3',
install_requires=requires,
+ zip_safe=False,
+ entry_points="""
+ [trytond.modules]
+ analytic_purchase = trytond.modules.analytic_purchase
+ """,
)
diff --git a/trytond_analytic_purchase.egg-info/PKG-INFO b/trytond_analytic_purchase.egg-info/PKG-INFO
index 9c3fb57..2c93ac0 100644
--- a/trytond_analytic_purchase.egg-info/PKG-INFO
+++ b/trytond_analytic_purchase.egg-info/PKG-INFO
@@ -1,12 +1,13 @@
Metadata-Version: 1.0
Name: trytond-analytic-purchase
-Version: 1.0.0
+Version: 1.0.1
Summary: Add analytic account on purchase lines.
Home-page: http://www.tryton.org/
Author: B2CK
Author-email: info at b2ck.com
License: GPL-3
+Download-URL: http://downloads.tryton.org/1.0/
Description: UNKNOWN
Platform: UNKNOWN
Classifier: Development Status :: 5 - Production/Stable
diff --git a/trytond_analytic_purchase.egg-info/SOURCES.txt b/trytond_analytic_purchase.egg-info/SOURCES.txt
index 3194b17..92a60b9 100644
--- a/trytond_analytic_purchase.egg-info/SOURCES.txt
+++ b/trytond_analytic_purchase.egg-info/SOURCES.txt
@@ -15,5 +15,7 @@ setup.py
trytond_analytic_purchase.egg-info/PKG-INFO
trytond_analytic_purchase.egg-info/SOURCES.txt
trytond_analytic_purchase.egg-info/dependency_links.txt
+trytond_analytic_purchase.egg-info/entry_points.txt
+trytond_analytic_purchase.egg-info/not-zip-safe
trytond_analytic_purchase.egg-info/requires.txt
trytond_analytic_purchase.egg-info/top_level.txt
\ No newline at end of file
diff --git a/trytond_analytic_purchase.egg-info/entry_points.txt b/trytond_analytic_purchase.egg-info/entry_points.txt
new file mode 100644
index 0000000..a23fcde
--- /dev/null
+++ b/trytond_analytic_purchase.egg-info/entry_points.txt
@@ -0,0 +1,4 @@
+
+ [trytond.modules]
+ analytic_purchase = trytond.modules.analytic_purchase
+
\ No newline at end of file
diff --git a/trytond_analytic_purchase.egg-info/not-zip-safe b/trytond_analytic_purchase.egg-info/not-zip-safe
new file mode 100644
index 0000000..8b13789
--- /dev/null
+++ b/trytond_analytic_purchase.egg-info/not-zip-safe
@@ -0,0 +1 @@
+
commit b86361942aec1ed27b4570b982ec4c6bdc8d604c
Author: Daniel Baumann <daniel at debian.org>
Date: Tue Nov 18 13:05:54 2008 +0100
Adding upstream version 1.0.0.
diff --git a/CHANGELOG b/CHANGELOG
new file mode 100644
index 0000000..eacaaef
--- /dev/null
+++ b/CHANGELOG
@@ -0,0 +1,2 @@
+Version 1.0.0 - 2008-11-17
+* Initial release
diff --git a/COPYRIGHT b/COPYRIGHT
new file mode 100644
index 0000000..2afd2a7
--- /dev/null
+++ b/COPYRIGHT
@@ -0,0 +1,15 @@
+Copyright (C) 2008 Cédric Krier.
+Copyright (C) 2008 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
+the Free Software Foundation, either version 3 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program. If not, see <http://www.gnu.org/licenses/>.
diff --git a/INSTALL b/INSTALL
new file mode 100644
index 0000000..d71729e
--- /dev/null
+++ b/INSTALL
@@ -0,0 +1,31 @@
+Installing trytond_analytic_purchase
+====================================
+
+Prerequisites
+-------------
+
+ * Python 2.4 or later (http://www.python.org/)
+ * trytond 0.0.x (http://www.tryton.org/)
+ * trytond_analytic_account (http://www.tryton.org/)
+ * trytond_analytic_invoice (http://www.tryton.org/)
+
+Installation
+------------
+
+Once you've downloaded and unpacked a trytond_analytic_purchase source release, enter the
+directory where the archive was unpacked, and run:
+
+ python setup.py install
+
+Note that you may need administrator/root privileges for this step, as
+this command will by default attempt to install module to the Python
+site-packages directory on your system.
+
+For advanced options, please refer to the easy_install and/or the distutils
+documentation:
+
+ http://peak.telecommunity.com/DevCenter/EasyInstall
+ http://docs.python.org/inst/inst.html
+
+To use without installation, extract the archive into ``trytond/modules`` with
+the directory name analytic_purchase.
diff --git a/LICENSE b/LICENSE
new file mode 100644
index 0000000..94a9ed0
--- /dev/null
+++ b/LICENSE
@@ -0,0 +1,674 @@
+ GNU GENERAL PUBLIC LICENSE
+ Version 3, 29 June 2007
+
+ Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+ Preamble
+
+ The GNU General Public License is a free, copyleft license for
+software and other kinds of works.
+
+ The licenses for most software and other practical works are designed
+to take away your freedom to share and change the works. By contrast,
+the GNU General Public License is intended to guarantee your freedom to
+share and change all versions of a program--to make sure it remains free
+software for all its users. We, the Free Software Foundation, use the
+GNU General Public License for most of our software; it applies also to
+any other work released this way by its authors. You can apply it to
+your programs, too.
+
+ When we speak of free software, we are referring to freedom, not
+price. Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+them if you wish), that you receive source code or can get it if you
+want it, that you can change the software or use pieces of it in new
+free programs, and that you know you can do these things.
+
+ To protect your rights, we need to prevent others from denying you
+these rights or asking you to surrender the rights. Therefore, you have
+certain responsibilities if you distribute copies of the software, or if
+you modify it: responsibilities to respect the freedom of others.
+
+ For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must pass on to the recipients the same
+freedoms that you received. You must make sure that they, too, receive
+or can get the source code. And you must show them these terms so they
+know their rights.
+
+ Developers that use the GNU GPL protect your rights with two steps:
+(1) assert copyright on the software, and (2) offer you this License
+giving you legal permission to copy, distribute and/or modify it.
+
+ For the developers' and authors' protection, the GPL clearly explains
+that there is no warranty for this free software. For both users' and
+authors' sake, the GPL requires that modified versions be marked as
+changed, so that their problems will not be attributed erroneously to
+authors of previous versions.
+
+ Some devices are designed to deny users access to install or run
+modified versions of the software inside them, although the manufacturer
+can do so. This is fundamentally incompatible with the aim of
+protecting users' freedom to change the software. The systematic
+pattern of such abuse occurs in the area of products for individuals to
+use, which is precisely where it is most unacceptable. Therefore, we
+have designed this version of the GPL to prohibit the practice for those
+products. If such problems arise substantially in other domains, we
+stand ready to extend this provision to those domains in future versions
+of the GPL, as needed to protect the freedom of users.
+
+ Finally, every program is threatened constantly by software patents.
+States should not allow patents to restrict development and use of
+software on general-purpose computers, but in those that do, we wish to
+avoid the special danger that patents applied to a free program could
+make it effectively proprietary. To prevent this, the GPL assures that
+patents cannot be used to render the program non-free.
+
+ The precise terms and conditions for copying, distribution and
+modification follow.
+
+ TERMS AND CONDITIONS
+
+ 0. Definitions.
+
+ "This License" refers to version 3 of the GNU General Public License.
+
+ "Copyright" also means copyright-like laws that apply to other kinds of
+works, such as semiconductor masks.
+
+ "The Program" refers to any copyrightable work licensed under this
+License. Each licensee is addressed as "you". "Licensees" and
+"recipients" may be individuals or organizations.
+
+ To "modify" a work means to copy from or adapt all or part of the work
+in a fashion requiring copyright permission, other than the making of an
+exact copy. The resulting work is called a "modified version" of the
+earlier work or a work "based on" the earlier work.
+
+ A "covered work" means either the unmodified Program or a work based
+on the Program.
+
+ To "propagate" a work means to do anything with it that, without
+permission, would make you directly or secondarily liable for
+infringement under applicable copyright law, except executing it on a
+computer or modifying a private copy. Propagation includes copying,
+distribution (with or without modification), making available to the
+public, and in some countries other activities as well.
+
+ To "convey" a work means any kind of propagation that enables other
+parties to make or receive copies. Mere interaction with a user through
+a computer network, with no transfer of a copy, is not conveying.
+
+ An interactive user interface displays "Appropriate Legal Notices"
+to the extent that it includes a convenient and prominently visible
+feature that (1) displays an appropriate copyright notice, and (2)
+tells the user that there is no warranty for the work (except to the
+extent that warranties are provided), that licensees may convey the
+work under this License, and how to view a copy of this License. If
+the interface presents a list of user commands or options, such as a
+menu, a prominent item in the list meets this criterion.
+
+ 1. Source Code.
+
+ The "source code" for a work means the preferred form of the work
+for making modifications to it. "Object code" means any non-source
+form of a work.
+
+ A "Standard Interface" means an interface that either is an official
+standard defined by a recognized standards body, or, in the case of
+interfaces specified for a particular programming language, one that
+is widely used among developers working in that language.
+
+ The "System Libraries" of an executable work include anything, other
+than the work as a whole, that (a) is included in the normal form of
+packaging a Major Component, but which is not part of that Major
+Component, and (b) serves only to enable use of the work with that
+Major Component, or to implement a Standard Interface for which an
+implementation is available to the public in source code form. A
+"Major Component", in this context, means a major essential component
+(kernel, window system, and so on) of the specific operating system
+(if any) on which the executable work runs, or a compiler used to
+produce the work, or an object code interpreter used to run it.
+
+ The "Corresponding Source" for a work in object code form means all
+the source code needed to generate, install, and (for an executable
+work) run the object code and to modify the work, including scripts to
+control those activities. However, it does not include the work's
+System Libraries, or general-purpose tools or generally available free
+programs which are used unmodified in performing those activities but
+which are not part of the work. For example, Corresponding Source
+includes interface definition files associated with source files for
+the work, and the source code for shared libraries and dynamically
+linked subprograms that the work is specifically designed to require,
+such as by intimate data communication or control flow between those
+subprograms and other parts of the work.
+
+ The Corresponding Source need not include anything that users
+can regenerate automatically from other parts of the Corresponding
+Source.
+
+ The Corresponding Source for a work in source code form is that
+same work.
+
+ 2. Basic Permissions.
+
+ All rights granted under this License are granted for the term of
+copyright on the Program, and are irrevocable provided the stated
+conditions are met. This License explicitly affirms your unlimited
+permission to run the unmodified Program. The output from running a
+covered work is covered by this License only if the output, given its
+content, constitutes a covered work. This License acknowledges your
+rights of fair use or other equivalent, as provided by copyright law.
+
+ You may make, run and propagate covered works that you do not
+convey, without conditions so long as your license otherwise remains
+in force. You may convey covered works to others for the sole purpose
+of having them make modifications exclusively for you, or provide you
+with facilities for running those works, provided that you comply with
+the terms of this License in conveying all material for which you do
+not control copyright. Those thus making or running the covered works
+for you must do so exclusively on your behalf, under your direction
+and control, on terms that prohibit them from making any copies of
+your copyrighted material outside their relationship with you.
+
+ Conveying under any other circumstances is permitted solely under
+the conditions stated below. Sublicensing is not allowed; section 10
+makes it unnecessary.
+
+ 3. Protecting Users' Legal Rights From Anti-Circumvention Law.
+
+ No covered work shall be deemed part of an effective technological
+measure under any applicable law fulfilling obligations under article
+11 of the WIPO copyright treaty adopted on 20 December 1996, or
+similar laws prohibiting or restricting circumvention of such
+measures.
+
+ When you convey a covered work, you waive any legal power to forbid
+circumvention of technological measures to the extent such circumvention
+is effected by exercising rights under this License with respect to
+the covered work, and you disclaim any intention to limit operation or
+modification of the work as a means of enforcing, against the work's
+users, your or third parties' legal rights to forbid circumvention of
+technological measures.
+
+ 4. Conveying Verbatim Copies.
+
+ You may convey verbatim copies of the Program's source code as you
+receive it, in any medium, provided that you conspicuously and
+appropriately publish on each copy an appropriate copyright notice;
+keep intact all notices stating that this License and any
+non-permissive terms added in accord with section 7 apply to the code;
+keep intact all notices of the absence of any warranty; and give all
+recipients a copy of this License along with the Program.
+
+ You may charge any price or no price for each copy that you convey,
+and you may offer support or warranty protection for a fee.
+
+ 5. Conveying Modified Source Versions.
+
+ You may convey a work based on the Program, or the modifications to
+produce it from the Program, in the form of source code under the
+terms of section 4, provided that you also meet all of these conditions:
+
+ a) The work must carry prominent notices stating that you modified
+ it, and giving a relevant date.
+
+ b) The work must carry prominent notices stating that it is
+ released under this License and any conditions added under section
+ 7. This requirement modifies the requirement in section 4 to
+ "keep intact all notices".
+
+ c) You must license the entire work, as a whole, under this
+ License to anyone who comes into possession of a copy. This
+ License will therefore apply, along with any applicable section 7
+ additional terms, to the whole of the work, and all its parts,
+ regardless of how they are packaged. This License gives no
+ permission to license the work in any other way, but it does not
+ invalidate such permission if you have separately received it.
+
+ d) If the work has interactive user interfaces, each must display
+ Appropriate Legal Notices; however, if the Program has interactive
+ interfaces that do not display Appropriate Legal Notices, your
+ work need not make them do so.
+
+ A compilation of a covered work with other separate and independent
+works, which are not by their nature extensions of the covered work,
+and which are not combined with it such as to form a larger program,
+in or on a volume of a storage or distribution medium, is called an
+"aggregate" if the compilation and its resulting copyright are not
+used to limit the access or legal rights of the compilation's users
+beyond what the individual works permit. Inclusion of a covered work
+in an aggregate does not cause this License to apply to the other
+parts of the aggregate.
+
+ 6. Conveying Non-Source Forms.
+
+ You may convey a covered work in object code form under the terms
+of sections 4 and 5, provided that you also convey the
+machine-readable Corresponding Source under the terms of this License,
+in one of these ways:
+
+ a) Convey the object code in, or embodied in, a physical product
+ (including a physical distribution medium), accompanied by the
+ Corresponding Source fixed on a durable physical medium
+ customarily used for software interchange.
+
+ b) Convey the object code in, or embodied in, a physical product
+ (including a physical distribution medium), accompanied by a
+ written offer, valid for at least three years and valid for as
+ long as you offer spare parts or customer support for that product
+ model, to give anyone who possesses the object code either (1) a
+ copy of the Corresponding Source for all the software in the
+ product that is covered by this License, on a durable physical
+ medium customarily used for software interchange, for a price no
+ more than your reasonable cost of physically performing this
+ conveying of source, or (2) access to copy the
+ Corresponding Source from a network server at no charge.
+
+ c) Convey individual copies of the object code with a copy of the
+ written offer to provide the Corresponding Source. This
+ alternative is allowed only occasionally and noncommercially, and
+ only if you received the object code with such an offer, in accord
+ with subsection 6b.
+
+ d) Convey the object code by offering access from a designated
+ place (gratis or for a charge), and offer equivalent access to the
+ Corresponding Source in the same way through the same place at no
+ further charge. You need not require recipients to copy the
+ Corresponding Source along with the object code. If the place to
+ copy the object code is a network server, the Corresponding Source
+ may be on a different server (operated by you or a third party)
+ that supports equivalent copying facilities, provided you maintain
+ clear directions next to the object code saying where to find the
+ Corresponding Source. Regardless of what server hosts the
+ Corresponding Source, you remain obligated to ensure that it is
+ available for as long as needed to satisfy these requirements.
+
+ e) Convey the object code using peer-to-peer transmission, provided
+ you inform other peers where the object code and Corresponding
+ Source of the work are being offered to the general public at no
+ charge under subsection 6d.
+
+ A separable portion of the object code, whose source code is excluded
+from the Corresponding Source as a System Library, need not be
+included in conveying the object code work.
+
+ A "User Product" is either (1) a "consumer product", which means any
+tangible personal property which is normally used for personal, family,
+or household purposes, or (2) anything designed or sold for incorporation
+into a dwelling. In determining whether a product is a consumer product,
+doubtful cases shall be resolved in favor of coverage. For a particular
+product received by a particular user, "normally used" refers to a
+typical or common use of that class of product, regardless of the status
+of the particular user or of the way in which the particular user
+actually uses, or expects or is expected to use, the product. A product
+is a consumer product regardless of whether the product has substantial
+commercial, industrial or non-consumer uses, unless such uses represent
+the only significant mode of use of the product.
+
+ "Installation Information" for a User Product means any methods,
+procedures, authorization keys, or other information required to install
+and execute modified versions of a covered work in that User Product from
+a modified version of its Corresponding Source. The information must
+suffice to ensure that the continued functioning of the modified object
+code is in no case prevented or interfered with solely because
+modification has been made.
+
+ If you convey an object code work under this section in, or with, or
+specifically for use in, a User Product, and the conveying occurs as
+part of a transaction in which the right of possession and use of the
+User Product is transferred to the recipient in perpetuity or for a
+fixed term (regardless of how the transaction is characterized), the
+Corresponding Source conveyed under this section must be accompanied
+by the Installation Information. But this requirement does not apply
+if neither you nor any third party retains the ability to install
+modified object code on the User Product (for example, the work has
+been installed in ROM).
+
+ The requirement to provide Installation Information does not include a
+requirement to continue to provide support service, warranty, or updates
+for a work that has been modified or installed by the recipient, or for
+the User Product in which it has been modified or installed. Access to a
+network may be denied when the modification itself materially and
+adversely affects the operation of the network or violates the rules and
+protocols for communication across the network.
+
+ Corresponding Source conveyed, and Installation Information provided,
+in accord with this section must be in a format that is publicly
+documented (and with an implementation available to the public in
+source code form), and must require no special password or key for
+unpacking, reading or copying.
+
+ 7. Additional Terms.
+
+ "Additional permissions" are terms that supplement the terms of this
+License by making exceptions from one or more of its conditions.
+Additional permissions that are applicable to the entire Program shall
+be treated as though they were included in this License, to the extent
+that they are valid under applicable law. If additional permissions
+apply only to part of the Program, that part may be used separately
+under those permissions, but the entire Program remains governed by
+this License without regard to the additional permissions.
+
+ When you convey a copy of a covered work, you may at your option
+remove any additional permissions from that copy, or from any part of
+it. (Additional permissions may be written to require their own
+removal in certain cases when you modify the work.) You may place
+additional permissions on material, added by you to a covered work,
+for which you have or can give appropriate copyright permission.
+
+ Notwithstanding any other provision of this License, for material you
+add to a covered work, you may (if authorized by the copyright holders of
+that material) supplement the terms of this License with terms:
+
+ a) Disclaiming warranty or limiting liability differently from the
+ terms of sections 15 and 16 of this License; or
+
+ b) Requiring preservation of specified reasonable legal notices or
+ author attributions in that material or in the Appropriate Legal
+ Notices displayed by works containing it; or
+
+ c) Prohibiting misrepresentation of the origin of that material, or
+ requiring that modified versions of such material be marked in
+ reasonable ways as different from the original version; or
+
+ d) Limiting the use for publicity purposes of names of licensors or
+ authors of the material; or
+
+ e) Declining to grant rights under trademark law for use of some
+ trade names, trademarks, or service marks; or
+
+ f) Requiring indemnification of licensors and authors of that
+ material by anyone who conveys the material (or modified versions of
+ it) with contractual assumptions of liability to the recipient, for
+ any liability that these contractual assumptions directly impose on
+ those licensors and authors.
+
+ All other non-permissive additional terms are considered "further
+restrictions" within the meaning of section 10. If the Program as you
+received it, or any part of it, contains a notice stating that it is
+governed by this License along with a term that is a further
+restriction, you may remove that term. If a license document contains
+a further restriction but permits relicensing or conveying under this
+License, you may add to a covered work material governed by the terms
+of that license document, provided that the further restriction does
+not survive such relicensing or conveying.
+
+ If you add terms to a covered work in accord with this section, you
+must place, in the relevant source files, a statement of the
+additional terms that apply to those files, or a notice indicating
+where to find the applicable terms.
+
+ Additional terms, permissive or non-permissive, may be stated in the
+form of a separately written license, or stated as exceptions;
+the above requirements apply either way.
+
+ 8. Termination.
+
+ You may not propagate or modify a covered work except as expressly
+provided under this License. Any attempt otherwise to propagate or
+modify it is void, and will automatically terminate your rights under
+this License (including any patent licenses granted under the third
+paragraph of section 11).
+
+ However, if you cease all violation of this License, then your
+license from a particular copyright holder is reinstated (a)
+provisionally, unless and until the copyright holder explicitly and
+finally terminates your license, and (b) permanently, if the copyright
+holder fails to notify you of the violation by some reasonable means
+prior to 60 days after the cessation.
+
+ Moreover, your license from a particular copyright holder is
+reinstated permanently if the copyright holder notifies you of the
+violation by some reasonable means, this is the first time you have
+received notice of violation of this License (for any work) from that
+copyright holder, and you cure the violation prior to 30 days after
+your receipt of the notice.
+
+ Termination of your rights under this section does not terminate the
+licenses of parties who have received copies or rights from you under
+this License. If your rights have been terminated and not permanently
+reinstated, you do not qualify to receive new licenses for the same
+material under section 10.
+
+ 9. Acceptance Not Required for Having Copies.
+
+ You are not required to accept this License in order to receive or
+run a copy of the Program. Ancillary propagation of a covered work
+occurring solely as a consequence of using peer-to-peer transmission
+to receive a copy likewise does not require acceptance. However,
+nothing other than this License grants you permission to propagate or
+modify any covered work. These actions infringe copyright if you do
+not accept this License. Therefore, by modifying or propagating a
+covered work, you indicate your acceptance of this License to do so.
+
+ 10. Automatic Licensing of Downstream Recipients.
+
+ Each time you convey a covered work, the recipient automatically
+receives a license from the original licensors, to run, modify and
+propagate that work, subject to this License. You are not responsible
+for enforcing compliance by third parties with this License.
+
+ An "entity transaction" is a transaction transferring control of an
+organization, or substantially all assets of one, or subdividing an
+organization, or merging organizations. If propagation of a covered
+work results from an entity transaction, each party to that
+transaction who receives a copy of the work also receives whatever
+licenses to the work the party's predecessor in interest had or could
+give under the previous paragraph, plus a right to possession of the
+Corresponding Source of the work from the predecessor in interest, if
+the predecessor has it or can get it with reasonable efforts.
+
+ You may not impose any further restrictions on the exercise of the
+rights granted or affirmed under this License. For example, you may
+not impose a license fee, royalty, or other charge for exercise of
+rights granted under this License, and you may not initiate litigation
+(including a cross-claim or counterclaim in a lawsuit) alleging that
+any patent claim is infringed by making, using, selling, offering for
+sale, or importing the Program or any portion of it.
+
+ 11. Patents.
+
+ A "contributor" is a copyright holder who authorizes use under this
+License of the Program or a work on which the Program is based. The
+work thus licensed is called the contributor's "contributor version".
+
+ A contributor's "essential patent claims" are all patent claims
+owned or controlled by the contributor, whether already acquired or
+hereafter acquired, that would be infringed by some manner, permitted
+by this License, of making, using, or selling its contributor version,
+but do not include claims that would be infringed only as a
+consequence of further modification of the contributor version. For
+purposes of this definition, "control" includes the right to grant
+patent sublicenses in a manner consistent with the requirements of
+this License.
+
+ Each contributor grants you a non-exclusive, worldwide, royalty-free
+patent license under the contributor's essential patent claims, to
+make, use, sell, offer for sale, import and otherwise run, modify and
+propagate the contents of its contributor version.
+
+ In the following three paragraphs, a "patent license" is any express
+agreement or commitment, however denominated, not to enforce a patent
+(such as an express permission to practice a patent or covenant not to
+sue for patent infringement). To "grant" such a patent license to a
+party means to make such an agreement or commitment not to enforce a
+patent against the party.
+
+ If you convey a covered work, knowingly relying on a patent license,
+and the Corresponding Source of the work is not available for anyone
+to copy, free of charge and under the terms of this License, through a
+publicly available network server or other readily accessible means,
+then you must either (1) cause the Corresponding Source to be so
+available, or (2) arrange to deprive yourself of the benefit of the
+patent license for this particular work, or (3) arrange, in a manner
+consistent with the requirements of this License, to extend the patent
+license to downstream recipients. "Knowingly relying" means you have
+actual knowledge that, but for the patent license, your conveying the
+covered work in a country, or your recipient's use of the covered work
+in a country, would infringe one or more identifiable patents in that
+country that you have reason to believe are valid.
+
+ If, pursuant to or in connection with a single transaction or
+arrangement, you convey, or propagate by procuring conveyance of, a
+covered work, and grant a patent license to some of the parties
+receiving the covered work authorizing them to use, propagate, modify
+or convey a specific copy of the covered work, then the patent license
+you grant is automatically extended to all recipients of the covered
+work and works based on it.
+
+ A patent license is "discriminatory" if it does not include within
+the scope of its coverage, prohibits the exercise of, or is
+conditioned on the non-exercise of one or more of the rights that are
+specifically granted under this License. You may not convey a covered
+work if you are a party to an arrangement with a third party that is
+in the business of distributing software, under which you make payment
+to the third party based on the extent of your activity of conveying
+the work, and under which the third party grants, to any of the
+parties who would receive the covered work from you, a discriminatory
+patent license (a) in connection with copies of the covered work
+conveyed by you (or copies made from those copies), or (b) primarily
+for and in connection with specific products or compilations that
+contain the covered work, unless you entered into that arrangement,
+or that patent license was granted, prior to 28 March 2007.
+
+ Nothing in this License shall be construed as excluding or limiting
+any implied license or other defenses to infringement that may
+otherwise be available to you under applicable patent law.
+
+ 12. No Surrender of Others' Freedom.
+
+ If conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License. If you cannot convey a
+covered work so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you may
+not convey it at all. For example, if you agree to terms that obligate you
+to collect a royalty for further conveying from those to whom you convey
+the Program, the only way you could satisfy both those terms and this
+License would be to refrain entirely from conveying the Program.
+
+ 13. Use with the GNU Affero General Public License.
+
+ Notwithstanding any other provision of this License, you have
+permission to link or combine any covered work with a work licensed
+under version 3 of the GNU Affero General Public License into a single
+combined work, and to convey the resulting work. The terms of this
+License will continue to apply to the part which is the covered work,
+but the special requirements of the GNU Affero General Public License,
+section 13, concerning interaction through a network will apply to the
+combination as such.
+
+ 14. Revised Versions of this License.
+
+ The Free Software Foundation may publish revised and/or new versions of
+the GNU General Public License from time to time. Such new versions will
+be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+ Each version is given a distinguishing version number. If the
+Program specifies that a certain numbered version of the GNU General
+Public License "or any later version" applies to it, you have the
+option of following the terms and conditions either of that numbered
+version or of any later version published by the Free Software
+Foundation. If the Program does not specify a version number of the
+GNU General Public License, you may choose any version ever published
+by the Free Software Foundation.
+
+ If the Program specifies that a proxy can decide which future
+versions of the GNU General Public License can be used, that proxy's
+public statement of acceptance of a version permanently authorizes you
+to choose that version for the Program.
+
+ Later license versions may give you additional or different
+permissions. However, no additional obligations are imposed on any
+author or copyright holder as a result of your choosing to follow a
+later version.
+
+ 15. Disclaimer of Warranty.
+
+ THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
+APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
+HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
+OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
+THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
+IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
+ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+ 16. Limitation of Liability.
+
+ IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
+THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
+GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
+USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
+DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
+PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
+EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
+SUCH DAMAGES.
+
+ 17. Interpretation of Sections 15 and 16.
+
+ If the disclaimer of warranty and limitation of liability provided
+above cannot be given local legal effect according to their terms,
+reviewing courts shall apply local law that most closely approximates
+an absolute waiver of all civil liability in connection with the
+Program, unless a warranty or assumption of liability accompanies a
+copy of the Program in return for a fee.
+
+ END OF TERMS AND CONDITIONS
+
+ How to Apply These Terms to Your New Programs
+
+ If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+ To do so, attach the following notices to the program. It is safest
+to attach them to the start of each source file to most effectively
+state the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+ <one line to give the program's name and a brief idea of what it does.>
+ Copyright (C) <year> <name of author>
+
+ 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
+ the Free Software Foundation, either version 3 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program. If not, see <http://www.gnu.org/licenses/>.
+
+Also add information on how to contact you by electronic and paper mail.
+
+ If the program does terminal interaction, make it output a short
+notice like this when it starts in an interactive mode:
+
+ <program> Copyright (C) <year> <name of author>
+ This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+ This is free software, and you are welcome to redistribute it
+ under certain conditions; type `show c' for details.
+
+The hypothetical commands `show w' and `show c' should show the appropriate
+parts of the General Public License. Of course, your program's commands
+might be different; for a GUI interface, you would use an "about box".
+
+ You should also get your employer (if you work as a programmer) or school,
+if any, to sign a "copyright disclaimer" for the program, if necessary.
+For more information on this, and how to apply and follow the GNU GPL, see
+<http://www.gnu.org/licenses/>.
+
+ The GNU General Public License does not permit incorporating your program
+into proprietary programs. If your program is a subroutine library, you
+may consider it more useful to permit linking proprietary applications with
+the library. If this is what you want to do, use the GNU Lesser General
+Public License instead of this License. But first, please read
+<http://www.gnu.org/philosophy/why-not-lgpl.html>.
diff --git a/MANIFEST.in b/MANIFEST.in
new file mode 100644
index 0000000..5343ad8
--- /dev/null
+++ b/MANIFEST.in
@@ -0,0 +1,9 @@
+include INSTALL
+include README
+include TODO
+include COPYRIGHT
+include CHANGELOG
+include LICENSE
+include *.xml
+include *.odt
+include *.csv
diff --git a/PKG-INFO b/PKG-INFO
new file mode 100644
index 0000000..afd67f5
--- /dev/null
+++ b/PKG-INFO
@@ -0,0 +1,25 @@
+Metadata-Version: 1.0
+Name: trytond_analytic_purchase
+Version: 1.0.0
+Summary: Add analytic account on purchase lines.
+
+Home-page: http://www.tryton.org/
+Author: B2CK
+Author-email: info at b2ck.com
+License: GPL-3
+Description: UNKNOWN
+Platform: UNKNOWN
+Classifier: Development Status :: 5 - Production/Stable
+Classifier: Environment :: Plugins
+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: Natural Language :: English
+Classifier: Natural Language :: French
+Classifier: Natural Language :: German
+Classifier: Natural Language :: Spanish
+Classifier: Operating System :: OS Independent
+Classifier: Programming Language :: Python
+Classifier: Topic :: Office/Business
+Classifier: Topic :: Office/Business :: Financial :: Accounting
diff --git a/README b/README
new file mode 100644
index 0000000..78c44bf
--- /dev/null
+++ b/README
@@ -0,0 +1,36 @@
+trytond_analytic_purchase
+=========================
+
+The analytic_purchase module of the Tryton application platform.
+See __tryton__.py
+
+Installing
+----------
+
+See INSTALL
+
+Support
+-------
+
+If you encounter any problems with Tryton, please don't hesitate to ask
+questions on the Tryton bug tracker, mailing list, wiki or IRC channel:
+
+ http://bugs.tryton.org/
+ http://groups.tryton.org/
+ http://wiki.tryton.org/
+ irc://irc.freenode.net/tryton
+
+License
+-------
+
+See LICENSE
+
+Copyright
+---------
+
+See COPYRIGHT
+
+
+For more information please visit the Tryton web site:
+
+ http://www.tryton.org/
diff --git a/__init__.py b/__init__.py
new file mode 100644
index 0000000..dda1fb6
--- /dev/null
+++ b/__init__.py
@@ -0,0 +1,3 @@
+#This file is part of Tryton. The COPYRIGHT file at the top level of this repository contains the full copyright notices and license terms.
+
+from purchase import *
diff --git a/__tryton__.py b/__tryton__.py
new file mode 100644
index 0000000..abc6418
--- /dev/null
+++ b/__tryton__.py
@@ -0,0 +1,32 @@
+#This file is part of Tryton. The COPYRIGHT file at the top level of
+#this repository contains the full copyright notices and license terms.
+{
+ 'name': 'Analytic Purchase',
+ 'name_de_DE': 'Kostenstellen Einkauf',
+ 'name_fr_FR': 'Achat analytique',
+ 'name_es_ES': 'Compra Analítica',
+ 'version': '1.0.0',
+ 'author': 'B2CK',
+ 'email': 'info at b2ck.com',
+ 'website': 'http://www.tryton.org/',
+ 'description': '''Add analytic account on purchase lines.
+''',
+ 'description_de_DE': '''Fügt kostenstellen zu Einkaufspositionen hinzu
+''',
+ 'description_fr_FR': 'Ajoute la comptabilité analytique sur les lignes d\'achat.',
+ 'description_es_ES': '''Adiciona contabilidad analítica a las líneas de compra.
+''',
+ 'depends': [
+ 'purchase',
+ 'analytic_account',
+ 'analytic_invoice',
+ ],
+ 'xml': [
+ 'purchase.xml',
+ ],
+ 'translation': [
+ 'de_DE.csv',
+ 'es_ES.csv',
+ 'fr_FR.csv',
+ ],
+}
diff --git a/de_DE.csv b/de_DE.csv
new file mode 100644
index 0000000..3abf76c
--- /dev/null
+++ b/de_DE.csv
@@ -0,0 +1,3 @@
+type,name,res_id,src,value,fuzzy
+error,purchase.purchase,0,"Analytic account is required on line ""%s"" (%d)!","Kostenstelle ist erforderlich in Zeile ""%s"" (%d)!",0
+field,"purchase.line,analytic_accounts",0,Analytic Accounts,Kostenstellen,0
diff --git a/es_ES.csv b/es_ES.csv
new file mode 100644
index 0000000..046fb21
--- /dev/null
+++ b/es_ES.csv
@@ -0,0 +1,2 @@
+type,name,res_id,src,value,fuzzy
+field,"purchase.line,analytic_accounts",0,Analytic Accounts,Cuentas Analíticas,0
diff --git a/fr_FR.csv b/fr_FR.csv
new file mode 100644
index 0000000..ca56dbf
--- /dev/null
+++ b/fr_FR.csv
@@ -0,0 +1,3 @@
+type,name,res_id,src,value,fuzzy
+error,purchase.purchase,0,"Analytic account is required on line ""%s"" (%d)!","Compte analytique requis sur la ligne ""%s"" (%d)!",0
+field,"purchase.line,analytic_accounts",0,Analytic Accounts,Comptes analytiques,0
diff --git a/purchase.py b/purchase.py
new file mode 100644
index 0000000..b29daff
--- /dev/null
+++ b/purchase.py
@@ -0,0 +1,220 @@
+#This file is part of Tryton. The COPYRIGHT file at the top level of
+#this repository contains the full copyright notices and license terms.
+"Purchase"
+
+from trytond.osv import fields, OSV
+
+
+class Purchase(OSV):
+ _name = "purchase.purchase"
+
+ def __init__(self):
+ super(Purchase, self).__init__()
+ self._error_messages.update({
+ 'analytic_account_required': 'Analytic account is required ' \
+ 'on line "%s" (%d)!',
+ })
+
+ def check_for_quotation(self, cursor, user, purchase_id, context=None):
+ account_selection_obj = self.pool.get(
+ 'analytic_account.account.selection')
+ purchase_line_obj = self.pool.get('purchase.line')
+
+ res = super(Purchase, self).check_for_quotation(cursor, user,
+ purchase_id, context=context)
+
+ purchase = self.browse(cursor, user, purchase_id, context=context)
+ for line in purchase.lines:
+ if not account_selection_obj.check_root(cursor, user,
+ [line.analytic_accounts.id]):
+ line_name = purchase_line_obj.name_get(cursor, user,
+ line.id, context=context)[0][1]
+ self.raise_user_error(cursor, 'analytic_account_required',
+ (line_name, line.id), context=context)
+ return res
+
+Purchase()
+
+
+class PurchaseLine(OSV):
+ _name = 'purchase.line'
+
+ analytic_accounts = fields.Many2One('analytic_account.account.selection',
+ 'Analytic Accounts',
+ states={
+ 'invisible': "type != 'line'",
+ })
+
+ def _view_look_dom_arch(self, cursor, user, tree, type, context=None):
+ analytic_account_obj = self.pool.get('analytic_account.account')
+ analytic_account_obj.convert_view(cursor, user, tree, context=context)
+ arch, fields = super(PurchaseLine, self)._view_look_dom_arch(cursor,
+ user, tree, type, context=context)
+ return arch, fields
+
+ def fields_get(self, cursor, user, fields_names=None, context=None):
+ analytic_account_obj = self.pool.get('analytic_account.account')
+
+ res = super(PurchaseLine, self).fields_get(cursor, user, fields_names,
+ context=context)
+
+ analytic_accounts_field = super(PurchaseLine, self).fields_get(cursor,
+ user, ['analytic_accounts'],
+ context=context)['analytic_accounts']
+
+ res.update(analytic_account_obj.analytic_accounts_fields_get(cursor,
+ user, analytic_accounts_field, fields_names, context=context))
+ return res
+
+ def _read_flat(self, cursor, user, ids, fields_names, context=None,
+ load='_classic_read'):
+ selection_obj = self.pool.get('analytic_account.account.selection')
+ res = super(PurchaseLine, self)._read_flat(cursor, user, ids,
+ fields_names, context=context, load=load)
+
+ root_ids = []
+ for field in fields_names:
+ if field.startswith('analytic_account_'):
+ root_ids.append(int(field[len('analytic_account_'):]))
+ if root_ids:
+ id2record = {}
+ for record in res:
+ id2record[record['id']] = record
+ lines = self.browse(cursor, user, ids, context=context)
+ for line in lines:
+ for account in line.analytic_accounts.accounts:
+ if account.root.id in root_ids:
+ id2record[line.id]['analytic_account_' \
+ + str(account.root.id)] = account.id
+ return res
+
+ def create(self, cursor, user, vals, context=None):
+ selection_obj = self.pool.get('analytic_account.account.selection')
+ vals = vals.copy()
+ selection_vals = {}
+ for field in vals.keys():
+ if field.startswith('analytic_account_'):
+ if vals[field]:
+ selection_vals.setdefault('accounts', [])
+ selection_vals['accounts'].append(('add', vals[field]))
+ del vals[field]
+ if vals.get('analytic_accounts'):
+ selection_obj.write(cursor, user, vals['analytic_accounts'],
+ selection_vals, context=context)
+ elif vals.get('type', 'line') == 'line':
+ selection_id = selection_obj.create(cursor, user, selection_vals,
+ context=context)
+ vals['analytic_accounts'] = selection_id
+ return super(PurchaseLine, self).create(cursor, user, vals,
+ context=context)
+
+ def write(self, cursor, user, ids, vals, context=None):
+ selection_obj = self.pool.get('analytic_account.account.selection')
+ vals = vals.copy()
+ if isinstance(ids, (int, long)):
+ ids = [ids]
+ selection_vals = {}
+ for field in vals.keys():
+ if field.startswith('analytic_account_'):
+ root_id = int(field[len('analytic_account_'):])
+ selection_vals[root_id] = vals[field]
+ del vals[field]
+ if selection_vals:
+ lines = self.browse(cursor, user, ids, context=context)
+ for line in lines:
+ if line.type != 'line':
+ continue
+ accounts = []
+ for account in line.analytic_accounts.accounts:
+ if account.root.id in selection_vals:
+ value = selection_vals[account.root.id]
+ if value:
+ accounts.append(value)
+ else:
+ accounts.append(account.id)
+ for account_id in selection_vals.values():
+ if account_id \
+ and account_id not in accounts:
+ accounts.append(account_id)
+ selection_obj.write(cursor, user, line.analytic_accounts.id, {
+ 'accounts': [('set', accounts)],
+ }, context=context)
+ return super(PurchaseLine, self).write(cursor, user, ids, vals,
+ context=context)
+
+ def delete(self, cursor, user, ids, context=None):
+ selection_obj = self.pool.get('analytic_account.account.selection')
+
+ if isinstance(ids, (int, long)):
+ ids = [ids]
+ selection_ids = []
+ lines = self.browse(cursor, user, ids, context=context)
+ for line in lines:
+ if line.analytic_accounts:
+ selection_ids.append(line.analytic_accounts.id)
+
+ res = super(PurchaseLine, self).delete(cursor, user, ids,
+ context=context)
+ selection_obj.delete(cursor, user, selection_ids, context=context)
+ return res
+
+ def copy(self, cursor, user, line_id, default=None, context=None):
+ selection_obj = self.pool.get('analytic_account.account.selection')
+
+ if default is None:
+ default = {}
+ default = default.copy()
+ line = self.browse(cursor, user, line_id, context=context)
+ selection_id = False
+ if line.analytic_accounts:
+ selection_id = selection_obj.copy(cursor, user,
+ line.analytic_accounts.id, context=context)
+ default['analytic_accounts'] = selection_id
+ return super(PurchaseLine, self).copy(cursor, user, line_id,
+ default=default, context=context)
+
+ def get_invoice_line(self, cursor, user, line, context=None):
+ account_selection_obj = self.pool.get('analytic_account.account.selection')
+
+ res = super(PurchaseLine, self).get_invoice_line(cursor, user, line,
+ context=context)
+ if not res:
+ return res
+
+ selection_id = False
+ if line.analytic_accounts:
+ selection_id = account_selection_obj.copy(cursor, user,
+ line.analytic_accounts.id, context=context)
+ for vals in res:
+ vals['analytic_accounts'] = selection_id
+ return res
+
+PurchaseLine()
+
+
+class Account(OSV):
+ _name = 'analytic_account.account'
+
+ def delete(self, cursor, user, ids, context=None):
+ purchase_line_obj = self.pool.get('purchase.line')
+ res = super(Account, self).delete(cursor, user, ids, context=context)
+ # Restart the cache on the fields_view_get method of purchase.line
+ purchase_line_obj.fields_view_get(cursor.dbname)
+ return res
+
+ def create(self, cursor, user, vals, context=None):
+ purchase_line_obj = self.pool.get('purchase.line')
+ res = super(Account, self).create(cursor, user, vals, context=context)
+ # Restart the cache on the fields_view_get method of purchase.line
+ purchase_line_obj.fields_view_get(cursor.dbname)
+ return res
+
+ def write(self, cursor, user, ids, vals, context=None):
+ purchase_line_obj = self.pool.get('purchase.line')
+ res = super(Account, self).write(cursor, user, ids, vals,
+ context=context)
+ # Restart the cache on the fields_view_get method of purchase.line
+ purchase_line_obj.fields_view_get(cursor.dbname)
+ return res
+
+Account()
diff --git a/purchase.xml b/purchase.xml
new file mode 100644
index 0000000..ba4272a
--- /dev/null
+++ b/purchase.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0"?>
+<!-- This file is part of Tryton. The COPYRIGHT file at the top level of this repository contains the full copyright notices and license terms. -->
+<tryton>
+ <data>
+ <record model="ir.ui.view" id="purchase_line_view_form">
+ <field name="model">purchase.line</field>
+ <field name="inherit" ref="purchase.purchase_line_view_form"/>
+ <field name="arch" type="xml">
+ <![CDATA[
+ <data>
+ <xpath
+ expr="/form/field[@name="amount"]"
+ position="after">
+ <group col="4" colspan="4" name="analytic_accounts">
+ <field name="analytic_accounts"/>
+ </group>
+ </xpath>
+ </data>
+ ]]>
+ </field>
+ </record>
+ </data>
+</tryton>
diff --git a/setup.cfg b/setup.cfg
new file mode 100644
index 0000000..861a9f5
--- /dev/null
+++ b/setup.cfg
@@ -0,0 +1,5 @@
+[egg_info]
+tag_build =
+tag_date = 0
+tag_svn_revision = 0
+
diff --git a/setup.py b/setup.py
new file mode 100644
index 0000000..eedc844
--- /dev/null
+++ b/setup.py
@@ -0,0 +1,56 @@
+#!/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.
+
+from setuptools import setup, find_packages
+import re
+
+info = eval(file('__tryton__.py').read())
+
+requires = []
+for dep in info.get('depends', []):
+ match = re.compile(
+ '(ir|res|workflow|webdav)((\s|$|<|>|<=|>=|==|!=).*?$)').match(dep)
+ if match:
+ continue
+ else:
+ dep = 'trytond_' + dep
+ requires.append(dep)
+
+major_version, minor_version, _ = info.get('version', '0.0.1').split('.', 2)
+requires.append('trytond >= %s.%s' % (major_version, minor_version))
+requires.append('trytond < %s.%s' % (major_version, str(int(minor_version) + 1)))
+
+setup(name='trytond_analytic_purchase',
+ version=info.get('version', '0.0.1'),
+ description=info.get('description', ''),
+ author=info.get('author', ''),
+ author_email=info.get('email', ''),
+ url=info.get('website', ''),
+ package_dir={'trytond.modules.analytic_purchase': '.'},
+ packages=[
+ 'trytond.modules.analytic_purchase',
+ ],
+ package_data={
+ 'trytond.modules.analytic_purchase': info.get('xml', []) \
+ + info.get('translation', []),
+ },
+ classifiers=[
+ 'Development Status :: 5 - Production/Stable',
+ 'Environment :: Plugins',
+ 'Intended Audience :: Developers',
+ 'Intended Audience :: Financial and Insurance Industry',
+ 'Intended Audience :: Legal Industry',
+ 'License :: OSI Approved :: GNU General Public License (GPL)',
+ 'Natural Language :: English',
+ 'Natural Language :: French',
+ 'Natural Language :: German',
+ 'Natural Language :: Spanish',
+ 'Operating System :: OS Independent',
+ 'Programming Language :: Python',
+ 'Topic :: Office/Business',
+ 'Topic :: Office/Business :: Financial :: Accounting',
+ ],
+ license='GPL-3',
+ install_requires=requires,
+)
diff --git a/trytond_analytic_purchase.egg-info/PKG-INFO b/trytond_analytic_purchase.egg-info/PKG-INFO
new file mode 100644
index 0000000..9c3fb57
--- /dev/null
+++ b/trytond_analytic_purchase.egg-info/PKG-INFO
@@ -0,0 +1,25 @@
+Metadata-Version: 1.0
+Name: trytond-analytic-purchase
+Version: 1.0.0
+Summary: Add analytic account on purchase lines.
+
+Home-page: http://www.tryton.org/
+Author: B2CK
+Author-email: info at b2ck.com
+License: GPL-3
+Description: UNKNOWN
+Platform: UNKNOWN
+Classifier: Development Status :: 5 - Production/Stable
+Classifier: Environment :: Plugins
+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: Natural Language :: English
+Classifier: Natural Language :: French
+Classifier: Natural Language :: German
+Classifier: Natural Language :: Spanish
+Classifier: Operating System :: OS Independent
+Classifier: Programming Language :: Python
+Classifier: Topic :: Office/Business
+Classifier: Topic :: Office/Business :: Financial :: Accounting
diff --git a/trytond_analytic_purchase.egg-info/SOURCES.txt b/trytond_analytic_purchase.egg-info/SOURCES.txt
new file mode 100644
index 0000000..3194b17
--- /dev/null
+++ b/trytond_analytic_purchase.egg-info/SOURCES.txt
@@ -0,0 +1,19 @@
+CHANGELOG
+COPYRIGHT
+INSTALL
+LICENSE
+MANIFEST.in
+README
+de_DE.csv
+es_ES.csv
+fr_FR.csv
+purchase.xml
+setup.py
+./__init__.py
+./__tryton__.py
+./purchase.py
+trytond_analytic_purchase.egg-info/PKG-INFO
+trytond_analytic_purchase.egg-info/SOURCES.txt
+trytond_analytic_purchase.egg-info/dependency_links.txt
+trytond_analytic_purchase.egg-info/requires.txt
+trytond_analytic_purchase.egg-info/top_level.txt
\ No newline at end of file
diff --git a/trytond_analytic_purchase.egg-info/dependency_links.txt b/trytond_analytic_purchase.egg-info/dependency_links.txt
new file mode 100644
index 0000000..8b13789
--- /dev/null
+++ b/trytond_analytic_purchase.egg-info/dependency_links.txt
@@ -0,0 +1 @@
+
diff --git a/trytond_analytic_purchase.egg-info/requires.txt b/trytond_analytic_purchase.egg-info/requires.txt
new file mode 100644
index 0000000..9a15abe
--- /dev/null
+++ b/trytond_analytic_purchase.egg-info/requires.txt
@@ -0,0 +1,5 @@
+trytond_purchase
+trytond_analytic_account
+trytond_analytic_invoice
+trytond >= 1.0
+trytond < 1.1
\ No newline at end of file
diff --git a/trytond_analytic_purchase.egg-info/top_level.txt b/trytond_analytic_purchase.egg-info/top_level.txt
new file mode 100644
index 0000000..93df119
--- /dev/null
+++ b/trytond_analytic_purchase.egg-info/top_level.txt
@@ -0,0 +1 @@
+trytond
--
tryton-modules-analytic-purchase
More information about the tryton-debian-vcs
mailing list