diff -Nru tryton-modules-analytic-purchase-2.2.0/CHANGELOG tryton-modules-analytic-purchase-2.8.0/CHANGELOG --- tryton-modules-analytic-purchase-2.2.0/CHANGELOG 2011-10-24 15:51:51.000000000 +0000 +++ tryton-modules-analytic-purchase-2.8.0/CHANGELOG 2013-04-22 08:57:25.000000000 +0000 @@ -1,3 +1,12 @@ +Version 2.8.0 - 2013-04-22 +* Bug fixes (see mercurial logs for details) + +Version 2.6.0 - 2012-10-22 +* Bug fixes (see mercurial logs for details) + +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 -Nru tryton-modules-analytic-purchase-2.2.0/COPYRIGHT tryton-modules-analytic-purchase-2.8.0/COPYRIGHT --- tryton-modules-analytic-purchase-2.2.0/COPYRIGHT 2011-07-06 07:56:05.000000000 +0000 +++ tryton-modules-analytic-purchase-2.8.0/COPYRIGHT 2013-04-22 08:57:24.000000000 +0000 @@ -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-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 -Nru tryton-modules-analytic-purchase-2.2.0/INSTALL tryton-modules-analytic-purchase-2.8.0/INSTALL --- tryton-modules-analytic-purchase-2.2.0/INSTALL 2011-07-06 07:56:05.000000000 +0000 +++ tryton-modules-analytic-purchase-2.8.0/INSTALL 2012-03-25 17:25:11.000000000 +0000 @@ -4,7 +4,7 @@ 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 -Nru tryton-modules-analytic-purchase-2.2.0/MANIFEST.in tryton-modules-analytic-purchase-2.8.0/MANIFEST.in --- tryton-modules-analytic-purchase-2.2.0/MANIFEST.in 2011-10-04 11:43:55.000000000 +0000 +++ tryton-modules-analytic-purchase-2.8.0/MANIFEST.in 2013-03-03 18:13:22.000000000 +0000 @@ -4,6 +4,8 @@ include COPYRIGHT include CHANGELOG include LICENSE +include tryton.cfg include *.xml +include view/*.xml include *.odt include locale/*.po diff -Nru tryton-modules-analytic-purchase-2.2.0/PKG-INFO tryton-modules-analytic-purchase-2.8.0/PKG-INFO --- tryton-modules-analytic-purchase-2.2.0/PKG-INFO 2011-10-24 15:52:39.000000000 +0000 +++ tryton-modules-analytic-purchase-2.8.0/PKG-INFO 2013-04-22 08:57:29.000000000 +0000 @@ -1,14 +1,48 @@ -Metadata-Version: 1.0 +Metadata-Version: 1.1 Name: trytond_analytic_purchase -Version: 2.2.0 -Summary: Add analytic account on purchase lines. - +Version: 2.8.0 +Summary: Tryton module to add analytic accounting on purchase Home-page: http://www.tryton.org/ -Author: B2CK -Author-email: info@b2ck.com +Author: Tryton +Author-email: UNKNOWN License: GPL-3 -Download-URL: http://downloads.tryton.org/2.2/ -Description: UNKNOWN +Download-URL: http://downloads.tryton.org/2.8/ +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 @@ -18,6 +52,7 @@ 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 -Nru tryton-modules-analytic-purchase-2.2.0/README tryton-modules-analytic-purchase-2.8.0/README --- tryton-modules-analytic-purchase-2.2.0/README 2011-07-06 07:56:05.000000000 +0000 +++ tryton-modules-analytic-purchase-2.8.0/README 2012-06-08 17:35:31.000000000 +0000 @@ -2,7 +2,6 @@ ========================= The analytic_purchase module of the Tryton application platform. -See __tryton__.py Installing ---------- diff -Nru tryton-modules-analytic-purchase-2.2.0/__init__.py tryton-modules-analytic-purchase-2.8.0/__init__.py --- tryton-modules-analytic-purchase-2.2.0/__init__.py 2011-07-06 07:56:05.000000000 +0000 +++ tryton-modules-analytic-purchase-2.8.0/__init__.py 2012-09-24 20:22:02.000000000 +0000 @@ -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 purchase import * +from trytond.pool import Pool +from .purchase import * + + +def register(): + Pool.register( + Purchase, + PurchaseLine, + Account, + module='analytic_purchase', type_='model') diff -Nru tryton-modules-analytic-purchase-2.2.0/__tryton__.py tryton-modules-analytic-purchase-2.8.0/__tryton__.py --- tryton-modules-analytic-purchase-2.2.0/__tryton__.py 2011-10-24 15:52:01.000000000 +0000 +++ tryton-modules-analytic-purchase-2.8.0/__tryton__.py 1970-01-01 00:00:00.000000000 +0000 @@ -1,42 +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_de_DE': 'Kostenstellen Einkauf', - 'name_es_CO': 'Compra Analítica', - 'name_es_ES': 'Compra analítica', - 'name_fr_FR': 'Achat analytique', - 'version': '2.2.0', - 'author': 'B2CK', - 'email': 'info@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. -''', - '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', - 'analytic_account', - 'analytic_invoice', - ], - 'xml': [ - 'purchase.xml', - ], - 'translation': [ - '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 -Nru tryton-modules-analytic-purchase-2.2.0/debian/changelog tryton-modules-analytic-purchase-2.8.0/debian/changelog --- tryton-modules-analytic-purchase-2.2.0/debian/changelog 2012-06-30 16:09:14.000000000 +0000 +++ tryton-modules-analytic-purchase-2.8.0/debian/changelog 2013-05-31 15:40:15.000000000 +0000 @@ -1,10 +1,49 @@ -tryton-modules-analytic-purchase (2.2.0-2) unstable; urgency=low +tryton-modules-analytic-purchase (2.8.0-2) unstable; urgency=low - [ Mathias Behrle ] - * Updating to Standards-Version: 3.9.3, no changes needed. - * Updating year in copyright. - * Adding myself to copyright. - * Adding Format header for DEP5. + * Adding epoch of tryton-modules-analytic-invoice in Depends. + * Removing needless empty line in rules. + + -- Mathias Behrle Fri, 31 May 2013 17:26:11 +0200 + +tryton-modules-analytic-purchase (2.8.0-1) experimental; urgency=low + + * Merging upstream version 2.8.0. + * Updating copyright. + + -- Mathias Behrle Thu, 02 May 2013 15:19:44 +0200 + +tryton-modules-analytic-purchase (2.6.1-3) experimental; urgency=low + + * Removing Daniel from Uploaders. Thanks for your work! (Closes: #704371). + * Improving update of major version in Depends. + + -- Mathias Behrle Sat, 27 Apr 2013 15:05:56 +0200 + +tryton-modules-analytic-purchase (2.6.1-2) experimental; urgency=low + + * Updating Vcs-Git to correct address. + * Adding watch file. Thanks to Bart Martens . + + -- Mathias Behrle Sat, 23 Mar 2013 14:00:19 +0100 + +tryton-modules-analytic-purchase (2.6.1-1) experimental; urgency=low + + * Removing obsolete Dm-Upload-Allowed + * Updating to Standards-Version: 3.9.4, no changes needed. + * Merging upstream version 2.6.1. + * Updating copyright. + + -- Mathias Behrle Sat, 16 Feb 2013 21:36:36 +0100 + +tryton-modules-analytic-purchase (2.6.0-1) experimental; urgency=low + + * Merging upstream version 2.6.0. + * Bumping versioned tryton depends to 2.6. + * Adding xz compression to source/options. + + -- Mathias Behrle Wed, 24 Oct 2012 14:24:08 +0200 + +tryton-modules-analytic-purchase (2.4.2-2) experimental; urgency=low [ Daniel Baumann ] * Updating maintainers field. @@ -13,7 +52,29 @@ * Switching to xz compression. * Updating to debhelper version 9. - -- Daniel Baumann Sat, 30 Jun 2012 18:09:02 +0200 + [ Mathias Behrle ] + * Merging branch debian-wheezy-2.2 (Closes: #687755). + + -- Mathias Behrle Tue, 18 Sep 2012 13:34:10 +0200 + +tryton-modules-analytic-purchase (2.4.2-1) experimental; urgency=low + + * Merging upstream version 2.4.2. + + -- Mathias Behrle Tue, 11 Sep 2012 13:27:13 +0200 + +tryton-modules-analytic-purchase (2.4.1-1) experimental; urgency=low + + * Updating to Standards-Version: 3.9.3, no changes needed. + * Updating year in copyright. + * Adding myself to copyright. + * Adding Format header for DEP5. + * Merging upstream version 2.4.0. + * Merging upstream version 2.4.1. + * Updating Copyright. + * Bumping versioned tryton depends to 2.4. + + -- Mathias Behrle Thu, 26 Apr 2012 19:36:00 +0200 tryton-modules-analytic-purchase (2.2.0-1) unstable; urgency=low diff -Nru tryton-modules-analytic-purchase-2.2.0/debian/control tryton-modules-analytic-purchase-2.8.0/debian/control --- tryton-modules-analytic-purchase-2.2.0/debian/control 2012-06-30 16:02:07.000000000 +0000 +++ tryton-modules-analytic-purchase-2.8.0/debian/control 2013-05-11 15:40:25.000000000 +0000 @@ -2,22 +2,21 @@ Section: python Priority: optional Maintainer: Debian Tryton Maintainers -Uploaders: Daniel Baumann , Mathias Behrle -Dm-Upload-Allowed: yes +Uploaders: Mathias Behrle Build-Depends: debhelper (>= 9), python (>= 2.6.6-3~), python-setuptools -Standards-Version: 3.9.3 +Standards-Version: 3.9.4 Homepage: http://www.tryton.org/ Vcs-Browser: http://debian.tryton.org/gitweb/?p=packages/tryton-modules-analytic-purchase.git -Vcs-Git: git://debian.tryton.org/git/packages/tryton-modules-analytic-purchase.git +Vcs-Git: git://debian.tryton.org/packages/tryton-modules-analytic-purchase.git X-Python-Version: >= 2.6 Package: tryton-modules-analytic-purchase Architecture: all Depends: - ${misc:Depends}, ${python:Depends}, tryton-server (>= 2.2), - tryton-modules-analytic-account (>= 2.2), - tryton-modules-analytic-invoice (>= 2.2), tryton-modules-purchase (>= 2.2), - python-pkg-resources + ${misc:Depends}, ${python:Depends}, tryton-server (>= ${version:major}), + tryton-modules-analytic-account (>= ${version:major}), + tryton-modules-analytic-invoice (>= 1:${version:major}), + tryton-modules-purchase (>= ${version:major}), python-pkg-resources Description: Tryton Application Platform (Financial and Accounting Module) Tryton is a high-level general purpose application platform written in Python and using PostgreSQL as database engine. It is the core base of a complete diff -Nru tryton-modules-analytic-purchase-2.2.0/debian/copyright tryton-modules-analytic-purchase-2.8.0/debian/copyright --- tryton-modules-analytic-purchase-2.2.0/debian/copyright 2012-06-30 15:57:26.000000000 +0000 +++ tryton-modules-analytic-purchase-2.8.0/debian/copyright 2013-05-11 15:40:25.000000000 +0000 @@ -1,14 +1,14 @@ Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ Files: * -Copyright: 2008-2011 Cedric Krier - 2008-2011 Bertrand Chenal - 2008-2011 B2CK SPRL +Copyright: 2008-2013 Cédric Krier + 2008-2013 Bertrand Chenal + 2008-2013 B2CK SPRL License: GPL-3+ Files: debian/* Copyright: 2009-2012 Daniel Baumann - 2012 Mathias Behrle + 2012-2013 Mathias Behrle License: GPL-3+ License: GPL-3+ diff -Nru tryton-modules-analytic-purchase-2.2.0/debian/rules tryton-modules-analytic-purchase-2.8.0/debian/rules --- tryton-modules-analytic-purchase-2.2.0/debian/rules 2012-06-30 15:57:27.000000000 +0000 +++ tryton-modules-analytic-purchase-2.8.0/debian/rules 2013-05-29 15:16:07.000000000 +0000 @@ -1,12 +1,16 @@ #!/usr/bin/make -f +MAJOR := $(shell python setup.py --version | awk -F "." '{print $$1 "." $$2}') + %: dh ${@} --with python2 override_dh_auto_clean: dh_auto_clean - rm -rf *.egg-info +override_dh_gencontrol: + dh_gencontrol -- -Vversion:major="$(MAJOR)" + override_dh_builddeb: dh_builddeb -- -Zxz -z9 diff -Nru tryton-modules-analytic-purchase-2.2.0/debian/source/options tryton-modules-analytic-purchase-2.8.0/debian/source/options --- tryton-modules-analytic-purchase-2.2.0/debian/source/options 2012-06-30 15:52:55.000000000 +0000 +++ tryton-modules-analytic-purchase-2.8.0/debian/source/options 2013-05-11 15:40:25.000000000 +0000 @@ -1,2 +1,2 @@ -compression = gzip +compression = xz compression-level = 9 diff -Nru tryton-modules-analytic-purchase-2.2.0/debian/watch tryton-modules-analytic-purchase-2.8.0/debian/watch --- tryton-modules-analytic-purchase-2.2.0/debian/watch 1970-01-01 00:00:00.000000000 +0000 +++ tryton-modules-analytic-purchase-2.8.0/debian/watch 2013-05-11 15:40:25.000000000 +0000 @@ -0,0 +1,2 @@ +version=3 +http://downloads.tryton.org/current/ .*trytond_analytic_purchase-(\d.*)\.(?:tgz|tbz2|txz|tar\.(?:gz|bz2|xz)) diff -Nru tryton-modules-analytic-purchase-2.2.0/locale/bg_BG.po tryton-modules-analytic-purchase-2.8.0/locale/bg_BG.po --- tryton-modules-analytic-purchase-2.2.0/locale/bg_BG.po 2011-10-23 16:55:01.000000000 +0000 +++ tryton-modules-analytic-purchase-2.8.0/locale/bg_BG.po 2013-04-21 13:32:40.000000000 +0000 @@ -2,10 +2,10 @@ 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 "error:purchase.purchase:" +msgid "Analytic account is required on line \"%s\"." +msgstr "" -msgctxt "field:purchase.line,analytic_accounts:0" +msgctxt "field:purchase.line,analytic_accounts:" msgid "Analytic Accounts" msgstr "Аналитични сметки" diff -Nru tryton-modules-analytic-purchase-2.2.0/locale/ca_ES.po tryton-modules-analytic-purchase-2.8.0/locale/ca_ES.po --- tryton-modules-analytic-purchase-2.2.0/locale/ca_ES.po 1970-01-01 00:00:00.000000000 +0000 +++ tryton-modules-analytic-purchase-2.8.0/locale/ca_ES.po 2013-04-21 13:37:38.000000000 +0000 @@ -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 "El compte analític a la línia \"%s\" és obligatori." + +msgctxt "field:purchase.line,analytic_accounts:" +msgid "Analytic Accounts" +msgstr "Comptes analítics" diff -Nru tryton-modules-analytic-purchase-2.2.0/locale/cs_CZ.po tryton-modules-analytic-purchase-2.8.0/locale/cs_CZ.po --- tryton-modules-analytic-purchase-2.2.0/locale/cs_CZ.po 2011-10-23 16:57:37.000000000 +0000 +++ tryton-modules-analytic-purchase-2.8.0/locale/cs_CZ.po 2013-04-21 13:45:20.000000000 +0000 @@ -2,10 +2,10 @@ msgid "" msgstr "Content-Type: text/plain; charset=utf-8\n" -msgctxt "error:purchase.purchase:0" -msgid "Analytic account is required on line \"%s\" (%d)!" +msgctxt "error:purchase.purchase:" +msgid "Analytic account is required on line \"%s\"." msgstr "" -msgctxt "field:purchase.line,analytic_accounts:0" +msgctxt "field:purchase.line,analytic_accounts:" msgid "Analytic Accounts" msgstr "" diff -Nru tryton-modules-analytic-purchase-2.2.0/locale/de_DE.po tryton-modules-analytic-purchase-2.8.0/locale/de_DE.po --- tryton-modules-analytic-purchase-2.2.0/locale/de_DE.po 2011-10-23 16:56:13.000000000 +0000 +++ tryton-modules-analytic-purchase-2.8.0/locale/de_DE.po 2013-04-21 13:52:08.000000000 +0000 @@ -2,10 +2,10 @@ 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 "error:purchase.purchase:" +msgid "Analytic account is required on line \"%s\"." +msgstr "Kostenstelle ist erforderlich auf Zeile \"%s\"." -msgctxt "field:purchase.line,analytic_accounts:0" +msgctxt "field:purchase.line,analytic_accounts:" msgid "Analytic Accounts" msgstr "Kostenstellen" diff -Nru tryton-modules-analytic-purchase-2.2.0/locale/es_AR.po tryton-modules-analytic-purchase-2.8.0/locale/es_AR.po --- tryton-modules-analytic-purchase-2.2.0/locale/es_AR.po 1970-01-01 00:00:00.000000000 +0000 +++ tryton-modules-analytic-purchase-2.8.0/locale/es_AR.po 2013-04-21 13:55:48.000000000 +0000 @@ -0,0 +1,367 @@ +# +msgid "" +msgstr "Content-Type: text/plain; charset=utf-8\n" + +msgctxt "error:purchase.purchase:" +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" +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 "Dígitos de 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 "Importe" + +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 realizados" + +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 "Dígitos de 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 "Dígitos de 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 "Término 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 "Base imponible" + +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 "Realizada" + +msgctxt "selection:purchase.purchase,state:" +msgid "Draft" +msgstr "Borrador" + +msgctxt "selection:purchase.purchase,state:" +msgid "Quotation" +msgstr "Presupuesto" diff -Nru tryton-modules-analytic-purchase-2.2.0/locale/es_CO.po tryton-modules-analytic-purchase-2.8.0/locale/es_CO.po --- tryton-modules-analytic-purchase-2.2.0/locale/es_CO.po 2011-10-23 16:59:31.000000000 +0000 +++ tryton-modules-analytic-purchase-2.8.0/locale/es_CO.po 2013-04-21 14:03:17.000000000 +0000 @@ -2,394 +2,366 @@ 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 "error:purchase.purchase:" +msgid "Analytic account is required on line \"%s\"." +msgstr "" -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" +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 "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" +msgstr "Decimales 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" +msgstr "Forma 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 -Nru tryton-modules-analytic-purchase-2.2.0/locale/es_ES.po tryton-modules-analytic-purchase-2.8.0/locale/es_ES.po --- tryton-modules-analytic-purchase-2.2.0/locale/es_ES.po 2011-10-23 17:01:01.000000000 +0000 +++ tryton-modules-analytic-purchase-2.8.0/locale/es_ES.po 2013-04-21 13:59:05.000000000 +0000 @@ -2,394 +2,366 @@ 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 "error:purchase.purchase:" +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: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" +msgstr "Moneda" -msgctxt "field:analytic_account.account,currency_digits:0" +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: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" +msgstr "Moneda" -msgctxt "field:purchase.purchase,currency_digits:0" +msgctxt "field:purchase.purchase,currency_digits:" msgid "Currency Digits" -msgstr "Decimales de la divisa" +msgstr "Decimales de la 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 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 -Nru tryton-modules-analytic-purchase-2.2.0/locale/fr_FR.po tryton-modules-analytic-purchase-2.8.0/locale/fr_FR.po --- tryton-modules-analytic-purchase-2.2.0/locale/fr_FR.po 2011-10-23 17:03:15.000000000 +0000 +++ tryton-modules-analytic-purchase-2.8.0/locale/fr_FR.po 2013-04-21 14:08:09.000000000 +0000 @@ -2,10 +2,10 @@ 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 "error:purchase.purchase:" +msgid "Analytic account is required on line \"%s\"." +msgstr "Le compte analytique est requis sur la ligne \"%s\"" -msgctxt "field:purchase.line,analytic_accounts:0" +msgctxt "field:purchase.line,analytic_accounts:" msgid "Analytic Accounts" msgstr "Comptes analytiques" diff -Nru tryton-modules-analytic-purchase-2.2.0/locale/nl_NL.po tryton-modules-analytic-purchase-2.8.0/locale/nl_NL.po --- tryton-modules-analytic-purchase-2.2.0/locale/nl_NL.po 2011-10-23 17:05:45.000000000 +0000 +++ tryton-modules-analytic-purchase-2.8.0/locale/nl_NL.po 2013-04-21 14:16:42.000000000 +0000 @@ -2,10 +2,10 @@ msgid "" msgstr "Content-Type: text/plain; charset=utf-8\n" -msgctxt "error:purchase.purchase:0" -msgid "Analytic account is required on line \"%s\" (%d)!" +msgctxt "error:purchase.purchase:" +msgid "Analytic account is required on line \"%s\"." msgstr "" -msgctxt "field:purchase.line,analytic_accounts:0" +msgctxt "field:purchase.line,analytic_accounts:" msgid "Analytic Accounts" msgstr "" diff -Nru tryton-modules-analytic-purchase-2.2.0/locale/ru_RU.po tryton-modules-analytic-purchase-2.8.0/locale/ru_RU.po --- tryton-modules-analytic-purchase-2.2.0/locale/ru_RU.po 2011-10-23 17:07:08.000000000 +0000 +++ tryton-modules-analytic-purchase-2.8.0/locale/ru_RU.po 2013-04-21 14:20:41.000000000 +0000 @@ -2,10 +2,10 @@ 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 "error:purchase.purchase:" +msgid "Analytic account is required on line \"%s\"." +msgstr "Счет аналитики необходим для строки \"%s\"." -msgctxt "field:purchase.line,analytic_accounts:0" +msgctxt "field:purchase.line,analytic_accounts:" msgid "Analytic Accounts" -msgstr "" +msgstr "Счета аналитики" diff -Nru tryton-modules-analytic-purchase-2.2.0/purchase.py tryton-modules-analytic-purchase-2.8.0/purchase.py --- tryton-modules-analytic-purchase-2.2.0/purchase.py 2011-08-22 12:25:27.000000000 +0000 +++ tryton-modules-analytic-purchase-2.8.0/purchase.py 2013-03-20 21:54:04.000000000 +0000 @@ -1,96 +1,94 @@ #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 +from trytond.exceptions import UserError +__all__ = ['Purchase', 'PurchaseLine', 'Account'] +__metaclass__ = PoolMeta -class Purchase(ModelSQL, ModelView): - _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, 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) - - 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: +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".'), + }) + + def check_for_quotation(self): + AccountSelection = Pool().get('analytic_account.account.selection') + + super(Purchase, self).check_for_quotation() + + try: + AccountSelection.check_root( + [x.analytic_accounts for x in self.lines + if x.analytic_accounts]) + except UserError: + for line in self.lines: if line.type != 'line': continue - if not account_selection_obj.check_root( - [line.analytic_accounts.id]): + try: + AccountSelection.check_root([line.analytic_accounts]) + except UserError: self.raise_user_error('analytic_account_required', - (line.rec_name, line.id)) - return res - -Purchase() - + (line.rec_name,)) + raise -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, type, - field_children=field_children) + @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): - selection_obj = Pool().get('analytic_account.account.selection') - - 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 = cls._fields.keys() root_ids = [] for field in fields_names: @@ -100,50 +98,51 @@ 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_' \ - + str(root_id)] = False + 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] - if int_id: - return res[0] return res - def create(self, vals): - selection_obj = 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(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) - - def write(self, ids, vals): - selection_obj = Pool().get('analytic_account.account.selection') + @classmethod + def create(cls, vlist): + Selection = Pool().get('analytic_account.account.selection') + 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): + 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_'): @@ -151,7 +150,6 @@ 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 @@ -159,11 +157,10 @@ 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] @@ -175,86 +172,74 @@ 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) + selections.append(line.analytic_accounts) - res = super(PurchaseLine, self).delete(ids) - selection_obj.delete(selection_ids) - return res - - 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): - account_selection_obj = 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 - -PurchaseLine() - + def get_invoice_line(self, invoice_type): + AccountSelection = Pool().get('analytic_account.account.selection') -class Account(ModelSQL, ModelView): - _name = 'analytic_account.account' - - def delete(self, ids): - purchase_line_obj = Pool().get('purchase.line') - res = super(Account, self).delete(ids) + invoice_lines = super(PurchaseLine, self).get_invoice_line( + invoice_type) + if not invoice_lines: + return invoice_lines + + 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: + __name__ = 'analytic_account.account' + + @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, vlist): + PurchaseLine = Pool().get('purchase.line') + accounts = super(Account, cls).create(vlist) # 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 accounts - 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 -Nru tryton-modules-analytic-purchase-2.2.0/purchase.xml tryton-modules-analytic-purchase-2.8.0/purchase.xml --- tryton-modules-analytic-purchase-2.2.0/purchase.xml 2011-07-06 07:56:05.000000000 +0000 +++ tryton-modules-analytic-purchase-2.8.0/purchase.xml 2013-03-03 18:13:22.000000000 +0000 @@ -6,19 +6,7 @@ purchase.line - - - - - - - - - ]]> - + purchase_line_form diff -Nru tryton-modules-analytic-purchase-2.2.0/setup.py tryton-modules-analytic-purchase-2.8.0/setup.py --- tryton-modules-analytic-purchase-2.2.0/setup.py 2011-10-23 22:46:58.000000000 +0000 +++ tryton-modules-analytic-purchase-2.8.0/setup.py 2013-04-20 09:15:35.000000000 +0000 @@ -4,38 +4,49 @@ 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) 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)) + (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'), - description=info.get('description', ''), - 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] + '/', + 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] + '/'), 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', []), - }, + 'trytond.modules.analytic_purchase': (info.get('xml', []) + + ['tryton.cfg', 'view/*.xml', 'locale/*.po']), + }, classifiers=[ 'Development Status :: 5 - Production/Stable', 'Environment :: Plugins', @@ -45,6 +56,7 @@ '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', @@ -57,7 +69,7 @@ 'Programming Language :: Python :: 2.7', 'Topic :: Office/Business', 'Topic :: Office/Business :: Financial :: Accounting', - ], + ], license='GPL-3', install_requires=requires, zip_safe=False, @@ -67,4 +79,4 @@ """, test_suite='tests', test_loader='trytond.test_loader:Loader', -) + ) diff -Nru tryton-modules-analytic-purchase-2.2.0/tests/__init__.py tryton-modules-analytic-purchase-2.8.0/tests/__init__.py --- tryton-modules-analytic-purchase-2.2.0/tests/__init__.py 2011-07-06 07:56:05.000000000 +0000 +++ tryton-modules-analytic-purchase-2.8.0/tests/__init__.py 2011-12-14 21:27:15.000000000 +0000 @@ -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 -Nru tryton-modules-analytic-purchase-2.2.0/tests/test_analytic_purchase.py tryton-modules-analytic-purchase-2.8.0/tests/test_analytic_purchase.py --- tryton-modules-analytic-purchase-2.2.0/tests/test_analytic_purchase.py 2011-07-31 18:46:09.000000000 +0000 +++ tryton-modules-analytic-purchase-2.8.0/tests/test_analytic_purchase.py 2012-04-03 18:15:09.000000000 +0000 @@ -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 @@ ''' test_depends() + def suite(): suite = trytond.tests.test_tryton.suite() suite.addTests(unittest.TestLoader().loadTestsFromTestCase( diff -Nru tryton-modules-analytic-purchase-2.2.0/tryton.cfg tryton-modules-analytic-purchase-2.8.0/tryton.cfg --- tryton-modules-analytic-purchase-2.2.0/tryton.cfg 1970-01-01 00:00:00.000000000 +0000 +++ tryton-modules-analytic-purchase-2.8.0/tryton.cfg 2013-04-22 08:57:21.000000000 +0000 @@ -0,0 +1,8 @@ +[tryton] +version=2.8.0 +depends: + analytic_account + analytic_invoice + purchase +xml: + purchase.xml diff -Nru tryton-modules-analytic-purchase-2.2.0/trytond_analytic_purchase.egg-info/PKG-INFO tryton-modules-analytic-purchase-2.8.0/trytond_analytic_purchase.egg-info/PKG-INFO --- tryton-modules-analytic-purchase-2.2.0/trytond_analytic_purchase.egg-info/PKG-INFO 2011-10-24 15:52:39.000000000 +0000 +++ tryton-modules-analytic-purchase-2.8.0/trytond_analytic_purchase.egg-info/PKG-INFO 2013-04-22 08:57:28.000000000 +0000 @@ -1,14 +1,48 @@ -Metadata-Version: 1.0 +Metadata-Version: 1.1 Name: trytond-analytic-purchase -Version: 2.2.0 -Summary: Add analytic account on purchase lines. - +Version: 2.8.0 +Summary: Tryton module to add analytic accounting on purchase Home-page: http://www.tryton.org/ -Author: B2CK -Author-email: info@b2ck.com +Author: Tryton +Author-email: UNKNOWN License: GPL-3 -Download-URL: http://downloads.tryton.org/2.2/ -Description: UNKNOWN +Download-URL: http://downloads.tryton.org/2.8/ +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 @@ -18,6 +52,7 @@ 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 -Nru tryton-modules-analytic-purchase-2.2.0/trytond_analytic_purchase.egg-info/SOURCES.txt tryton-modules-analytic-purchase-2.8.0/trytond_analytic_purchase.egg-info/SOURCES.txt --- tryton-modules-analytic-purchase-2.2.0/trytond_analytic_purchase.egg-info/SOURCES.txt 2011-10-24 15:52:39.000000000 +0000 +++ tryton-modules-analytic-purchase-2.8.0/trytond_analytic_purchase.egg-info/SOURCES.txt 2013-04-22 08:57:28.000000000 +0000 @@ -6,14 +6,16 @@ README purchase.xml setup.py +tryton.cfg ./__init__.py -./__tryton__.py ./purchase.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 @@ -25,4 +27,5 @@ 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 -Nru tryton-modules-analytic-purchase-2.2.0/trytond_analytic_purchase.egg-info/requires.txt tryton-modules-analytic-purchase-2.8.0/trytond_analytic_purchase.egg-info/requires.txt --- tryton-modules-analytic-purchase-2.2.0/trytond_analytic_purchase.egg-info/requires.txt 2011-10-24 15:52:39.000000000 +0000 +++ tryton-modules-analytic-purchase-2.8.0/trytond_analytic_purchase.egg-info/requires.txt 2013-04-22 08:57:28.000000000 +0000 @@ -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_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 -Nru tryton-modules-analytic-purchase-2.2.0/view/purchase_line_form.xml tryton-modules-analytic-purchase-2.8.0/view/purchase_line_form.xml --- tryton-modules-analytic-purchase-2.2.0/view/purchase_line_form.xml 1970-01-01 00:00:00.000000000 +0000 +++ tryton-modules-analytic-purchase-2.8.0/view/purchase_line_form.xml 2013-03-03 18:13:22.000000000 +0000 @@ -0,0 +1,12 @@ + + + + + + + + +