[tryton-debian-vcs] tryton-modules-account-product branch debian updated. debian/3.4.1-1-2-g33f46a7

Mathias Behrle tryton-debian-vcs at alioth.debian.org
Thu Apr 23 16:02:08 UTC 2015


The following commit has been merged in the debian branch:
https://alioth.debian.org/plugins/scmgit/cgi-bin/gitweb.cgi/?p=tryton/tryton-modules-account-product.git;a=commitdiff;h=debian/3.4.1-1-2-g33f46a7

commit 33f46a7997bb9064a5eb6de99518f711a9afa24e
Author: Mathias Behrle <mathiasb at m9s.biz>
Date:   Thu Apr 23 16:59:52 2015 +0200

    Merging upstream version 3.6.0.

diff --git a/CHANGELOG b/CHANGELOG
index 92afdc5..b9a7369 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,6 +1,6 @@
-Version 3.4.1 - 2015-03-01
+Version 3.6.0 - 2015-04-20
 * Bug fixes (see mercurial logs for details)
-
+* Add support for PyPy
 Version 3.4.0 - 2014-10-20
 * Bug fixes (see mercurial logs for details)
 
diff --git a/PKG-INFO b/PKG-INFO
index 05cf03c..51b19de 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,12 +1,12 @@
 Metadata-Version: 1.1
 Name: trytond_account_product
-Version: 3.4.1
+Version: 3.6.0
 Summary: Tryton module to add accounting on product
 Home-page: http://www.tryton.org/
 Author: Tryton
 Author-email: issue_tracker at tryton.org
 License: GPL-3
-Download-URL: http://downloads.tryton.org/3.4/
+Download-URL: http://downloads.tryton.org/3.6/
 Description: trytond_account_product
         =======================
         
@@ -64,5 +64,7 @@ Classifier: Natural Language :: Slovenian
 Classifier: Natural Language :: Spanish
 Classifier: Operating System :: OS Independent
 Classifier: Programming Language :: Python :: 2.7
+Classifier: Programming Language :: Python :: Implementation :: CPython
+Classifier: Programming Language :: Python :: Implementation :: PyPy
 Classifier: Topic :: Office/Business
 Classifier: Topic :: Office/Business :: Financial :: Accounting
diff --git a/__init__.py b/__init__.py
index 1e0a874..561f1cf 100644
--- a/__init__.py
+++ b/__init__.py
@@ -1,5 +1,5 @@
-#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 trytond.pool import Pool
 from .product import *
diff --git a/locale/es_EC.po b/locale/es_EC.po
index 99e1496..c05fa71 100644
--- a/locale/es_EC.po
+++ b/locale/es_EC.po
@@ -14,43 +14,43 @@ msgstr ""
 
 msgctxt "field:product.category,account_expense:"
 msgid "Account Expense"
-msgstr "Cuenta de Gastos"
+msgstr "Cuenta de gastos"
 
 msgctxt "field:product.category,account_expense_used:"
 msgid "Account Expense Used"
-msgstr "Cuenta de Gastos Utilizada"
+msgstr "Cuenta de gastos utilizada"
 
 msgctxt "field:product.category,account_parent:"
 msgid "Use Parent's accounts"
-msgstr "Utilizar las Cuentas del Padre"
+msgstr "Utilizar las cuentas del padre"
 
 msgctxt "field:product.category,account_revenue:"
 msgid "Account Revenue"
-msgstr "Cuenta de Ingresos"
+msgstr "Cuenta de ingresos"
 
 msgctxt "field:product.category,account_revenue_used:"
 msgid "Account Revenue Used"
-msgstr "Cuenta de Ingresos Utilizada"
+msgstr "Cuenta de ingresos utilizada"
 
 msgctxt "field:product.category,customer_taxes:"
 msgid "Customer Taxes"
-msgstr "Impuestos de Cliente"
+msgstr "Impuestos de vliente"
 
 msgctxt "field:product.category,customer_taxes_used:"
 msgid "Customer Taxes Used"
-msgstr "Impuestos de Cliente Utilizados"
+msgstr "Impuestos de cliente utilizados"
 
 msgctxt "field:product.category,supplier_taxes:"
 msgid "Supplier Taxes"
-msgstr "Impuestos de Proveedor"
+msgstr "Impuestos de proveedor"
 
 msgctxt "field:product.category,supplier_taxes_used:"
 msgid "Supplier Taxes Used"
-msgstr "Impuestos de Proveedor Utilizados"
+msgstr "Impuestos de proveedor utilizados"
 
 msgctxt "field:product.category,taxes_parent:"
 msgid "Use the Parent's Taxes"
-msgstr "Utilizar los Impuestos del Padre"
+msgstr "Utilizar los impuestos del padre"
 
 msgctxt "field:product.category-customer-account.tax,category:"
 msgid "Category"
@@ -58,11 +58,11 @@ msgstr "Categoría"
 
 msgctxt "field:product.category-customer-account.tax,create_date:"
 msgid "Create Date"
-msgstr "Fecha de Creación"
+msgstr "Fecha de creación"
 
 msgctxt "field:product.category-customer-account.tax,create_uid:"
 msgid "Create User"
-msgstr "Creado por Usuario"
+msgstr "Creado por usuario"
 
 msgctxt "field:product.category-customer-account.tax,id:"
 msgid "ID"
@@ -78,11 +78,11 @@ msgstr "Impuesto"
 
 msgctxt "field:product.category-customer-account.tax,write_date:"
 msgid "Write Date"
-msgstr "Fecha de Modificación"
+msgstr "Fecha de modificación"
 
 msgctxt "field:product.category-customer-account.tax,write_uid:"
 msgid "Write User"
-msgstr "Modificado por Usuario"
+msgstr "Modificado por usuario"
 
 msgctxt "field:product.category-supplier-account.tax,category:"
 msgid "Category"
@@ -90,11 +90,11 @@ msgstr "Categoría"
 
 msgctxt "field:product.category-supplier-account.tax,create_date:"
 msgid "Create Date"
-msgstr "Fecha de Creación"
+msgstr "Fecha de creación"
 
 msgctxt "field:product.category-supplier-account.tax,create_uid:"
 msgid "Create User"
-msgstr "Creado por Usuario"
+msgstr "Creado por usuario"
 
 msgctxt "field:product.category-supplier-account.tax,id:"
 msgid "ID"
@@ -110,59 +110,59 @@ msgstr "Impuesto"
 
 msgctxt "field:product.category-supplier-account.tax,write_date:"
 msgid "Write Date"
-msgstr "Fecha de Modificación"
+msgstr "Fecha de modificación"
 
 msgctxt "field:product.category-supplier-account.tax,write_uid:"
 msgid "Write User"
-msgstr "Modificado por Usuario"
+msgstr "Modificado por usuario"
 
 msgctxt "field:product.template,account_category:"
 msgid "Use Category's accounts"
-msgstr "Utilizar las Cuentas de la Categoría"
+msgstr "Utilizar las cuentas de la categoría"
 
 msgctxt "field:product.template,account_expense:"
 msgid "Account Expense"
-msgstr "Cuenta de Gastos"
+msgstr "Cuenta de gastos"
 
 msgctxt "field:product.template,account_expense_used:"
 msgid "Account Expense Used"
-msgstr "Cuenta de Gastos Utilizada"
+msgstr "Cuenta de gastos utilizada"
 
 msgctxt "field:product.template,account_revenue:"
 msgid "Account Revenue"
-msgstr "Cuenta de Ingresos"
+msgstr "Cuenta de ingresos"
 
 msgctxt "field:product.template,account_revenue_used:"
 msgid "Account Revenue Used"
-msgstr "Cuenta de Ingresos Utilizada"
+msgstr "Cuenta de ingresos utilizada"
 
 msgctxt "field:product.template,customer_taxes:"
 msgid "Customer Taxes"
-msgstr "Impuestos de Cliente"
+msgstr "Impuestos de cliente"
 
 msgctxt "field:product.template,customer_taxes_used:"
 msgid "Customer Taxes Used"
-msgstr "Impuestos de Cliente Utilizados"
+msgstr "Impuestos de cliente utilizados"
 
 msgctxt "field:product.template,supplier_taxes:"
 msgid "Supplier Taxes"
-msgstr "Impuestos de Proveedor"
+msgstr "Impuestos de proveedor"
 
 msgctxt "field:product.template,supplier_taxes_used:"
 msgid "Supplier Taxes Used"
-msgstr "Impuestos de Proveedor Utilizados"
+msgstr "Impuestos de proveedor utilizados"
 
 msgctxt "field:product.template,taxes_category:"
 msgid "Use Category's Taxes"
-msgstr "Utilizar los Impuestos de la Categoría"
+msgstr "Utilizar los impuestos de la categoría"
 
 msgctxt "field:product.template-customer-account.tax,create_date:"
 msgid "Create Date"
-msgstr "Fecha de Creación"
+msgstr "Fecha de creación"
 
 msgctxt "field:product.template-customer-account.tax,create_uid:"
 msgid "Create User"
-msgstr "Creado por Usuario"
+msgstr "Creado por usuario"
 
 msgctxt "field:product.template-customer-account.tax,id:"
 msgid "ID"
@@ -170,7 +170,7 @@ msgstr "ID"
 
 msgctxt "field:product.template-customer-account.tax,product:"
 msgid "Product Template"
-msgstr "Plantilla de Producto"
+msgstr "Plantilla de producto"
 
 msgctxt "field:product.template-customer-account.tax,rec_name:"
 msgid "Name"
@@ -182,19 +182,19 @@ msgstr "Impuesto"
 
 msgctxt "field:product.template-customer-account.tax,write_date:"
 msgid "Write Date"
-msgstr "Fecha de Modificación"
+msgstr "Fecha de modificación"
 
 msgctxt "field:product.template-customer-account.tax,write_uid:"
 msgid "Write User"
-msgstr "Modificado por Usuario"
+msgstr "Modificado por usuario"
 
 msgctxt "field:product.template-supplier-account.tax,create_date:"
 msgid "Create Date"
-msgstr "Fecha de Creación"
+msgstr "Fecha de creación"
 
 msgctxt "field:product.template-supplier-account.tax,create_uid:"
 msgid "Create User"
-msgstr "Creado por Usuario"
+msgstr "Creado por usuario"
 
 msgctxt "field:product.template-supplier-account.tax,id:"
 msgid "ID"
@@ -202,7 +202,7 @@ msgstr "ID"
 
 msgctxt "field:product.template-supplier-account.tax,product:"
 msgid "Product Template"
-msgstr "Plantilla de Producto"
+msgstr "Plantilla de producto"
 
 msgctxt "field:product.template-supplier-account.tax,rec_name:"
 msgid "Name"
@@ -214,11 +214,11 @@ msgstr "Impuesto"
 
 msgctxt "field:product.template-supplier-account.tax,write_date:"
 msgid "Write Date"
-msgstr "Fecha de Modificación"
+msgstr "Fecha de modificación"
 
 msgctxt "field:product.template-supplier-account.tax,write_uid:"
 msgid "Write User"
-msgstr "Modificado por Usuario"
+msgstr "Modificado por usuario"
 
 msgctxt "help:product.category,account_parent:"
 msgid "Use the accounts defined on the parent category"
@@ -234,11 +234,11 @@ msgstr "Utilizar las cuentas definidas en la categoría"
 
 msgctxt "help:product.template,account_expense:"
 msgid "This account will be used instead of the one defined on the category."
-msgstr "Esta cuenta se utilizará en lugar de la definida en la categoría."
+msgstr "Se utilizará esta cuenta en lugar de la definida en la categoría."
 
 msgctxt "help:product.template,account_revenue:"
 msgid "This account will be used instead of the one defined on the category."
-msgstr "Esta cuenta se utilizará en lugar de la definida en la categoría."
+msgstr "Se utilizará esta cuenta en lugar de la definida en la categoría."
 
 msgctxt "help:product.template,taxes_category:"
 msgid "Use the taxes defined on the category"
@@ -246,19 +246,19 @@ msgstr "Utilizar los impuestos definidos en la categoría"
 
 msgctxt "model:product.category-customer-account.tax,name:"
 msgid "Category - Customer Tax"
-msgstr "Categoría - Impuesto de Cliente"
+msgstr "Categoría - Impuesto de cliente"
 
 msgctxt "model:product.category-supplier-account.tax,name:"
 msgid "Category - Supplier Tax"
-msgstr "Categoría - Impuesto de Proveedor"
+msgstr "Categoría - Impuesto de proveedor"
 
 msgctxt "model:product.template-customer-account.tax,name:"
 msgid "Product Template - Customer Tax"
-msgstr "Plantilla de Producto - Impuesto de Cliente"
+msgstr "Plantilla de producto - Impuesto de cliente"
 
 msgctxt "model:product.template-supplier-account.tax,name:"
 msgid "Product Template - Supplier Tax"
-msgstr "Plantilla de Producto - Impuesto de Proveedor"
+msgstr "Plantilla de producto - Impuesto de proveedor"
 
 msgctxt "view:product.category:"
 msgid "Accounting"
diff --git a/product.py b/product.py
index dec3a69..4056249 100644
--- a/product.py
+++ b/product.py
@@ -1,5 +1,5 @@
-#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.
 import copy
 
 from trytond.model import ModelSQL, fields
@@ -71,6 +71,7 @@ class Category:
         help='Use the taxes defined on the parent category')
     customer_taxes = fields.Many2Many('product.category-customer-account.tax',
         'category', 'tax', 'Customer Taxes',
+        order=[('tax.sequence', 'ASC'), ('tax.id', 'ASC')],
         domain=[('parent', '=', None), ['OR',
                 ('group', '=', None),
                 ('group.kind', 'in', ['sale', 'both'])],
@@ -82,6 +83,7 @@ class Category:
         depends=['taxes_parent'])
     supplier_taxes = fields.Many2Many('product.category-supplier-account.tax',
         'category', 'tax', 'Supplier Taxes',
+        order=[('tax.sequence', 'ASC'), ('tax.id', 'ASC')],
         domain=[('parent', '=', None), ['OR',
                 ('group', '=', None),
                 ('group.kind', 'in', ['purchase', 'both'])],
@@ -125,23 +127,17 @@ class Category:
 
     @fields.depends('account_expense')
     def on_change_account_expense(self):
-        supplier_taxes = []
-        result = {
-            'supplier_taxes': supplier_taxes,
-            }
         if self.account_expense:
-            supplier_taxes.extend(tax.id for tax in self.account_expense.taxes)
-        return result
+            self.supplier_taxes = self.account_expense.taxes
+        else:
+            self.supplier_taxes = []
 
     @fields.depends('account_revenue')
     def on_change_account_revenue(self):
-        customer_taxes = []
-        result = {
-            'customer_taxes': customer_taxes,
-            }
         if self.account_revenue:
-            customer_taxes.extend(tax.id for tax in self.account_revenue.taxes)
-        return result
+            self.customer_taxes = self.account_revenue.taxes
+        else:
+            self.customer_taxes = []
 
 
 class CategoryCustomerTax(ModelSQL):
@@ -222,6 +218,7 @@ class Template:
             help='Use the taxes defined on the category')
     customer_taxes = fields.Many2Many('product.template-customer-account.tax',
         'product', 'tax', 'Customer Taxes',
+        order=[('tax.sequence', 'ASC'), ('tax.id', 'ASC')],
         domain=[('parent', '=', None), ['OR',
                 ('group', '=', None),
                 ('group.kind', 'in', ['sale', 'both'])],
@@ -232,6 +229,7 @@ class Template:
             }, depends=['taxes_category'])
     supplier_taxes = fields.Many2Many('product.template-supplier-account.tax',
         'product', 'tax', 'Supplier Taxes',
+        order=[('tax.sequence', 'ASC'), ('tax.id', 'ASC')],
         domain=[('parent', '=', None), ['OR',
                 ('group', '=', None),
                 ('group.kind', 'in', ['purchase', 'both'])],
@@ -276,29 +274,19 @@ class Template:
 
     @fields.depends('account_category', 'account_expense')
     def on_change_account_expense(self):
-        result = {}
         if not self.account_category:
-            supplier_taxes = []
-            result = {
-                'supplier_taxes': supplier_taxes,
-            }
             if self.account_expense:
-                supplier_taxes.extend(
-                    tax.id for tax in self.account_expense.taxes)
-        return result
+                self.supplier_taxes = self.account_expense.taxes
+            else:
+                self.supplier_taxes = []
 
     @fields.depends('account_category', 'account_revenue')
     def on_change_account_revenue(self):
-        result = {}
         if not self.account_category:
-            customer_taxes = []
-            result = {
-                'customer_taxes': customer_taxes,
-            }
             if self.account_revenue:
-                customer_taxes.extend(
-                    tax.id for tax in self.account_revenue.taxes)
-        return result
+                self.customer_taxes = self.account_revenue.taxes
+            else:
+                self.customer_taxes = []
 
 
 class TemplateCustomerTax(ModelSQL):
diff --git a/setup.py b/setup.py
index e4740f2..3ac6815 100644
--- a/setup.py
+++ b/setup.py
@@ -1,6 +1,6 @@
 #!/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.
+# 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
 import re
@@ -85,6 +85,8 @@ setup(name=name,
         'Natural Language :: Spanish',
         'Operating System :: OS Independent',
         'Programming Language :: Python :: 2.7',
+        'Programming Language :: Python :: Implementation :: CPython',
+        'Programming Language :: Python :: Implementation :: PyPy',
         'Topic :: Office/Business',
         'Topic :: Office/Business :: Financial :: Accounting',
         ],
diff --git a/tests/__init__.py b/tests/__init__.py
index 4932a5b..3675e1b 100644
--- a/tests/__init__.py
+++ b/tests/__init__.py
@@ -1,5 +1,5 @@
-#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 .test_account_product import suite
 
diff --git a/tests/test_account_product.py b/tests/test_account_product.py
index 86f5ded..7d9c434 100644
--- a/tests/test_account_product.py
+++ b/tests/test_account_product.py
@@ -1,29 +1,19 @@
-#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.
 import unittest
 import doctest
 from decimal import Decimal
 
 import trytond.tests.test_tryton
-from trytond.tests.test_tryton import test_view, test_depends
+from trytond.tests.test_tryton import ModuleTestCase
 from trytond.tests.test_tryton import POOL, DB_NAME, USER, CONTEXT
 from trytond.transaction import Transaction
 from trytond.exceptions import UserError
 
 
-class AccountProductTestCase(unittest.TestCase):
+class AccountProductTestCase(ModuleTestCase):
     'Test AccountProduct module'
-
-    def setUp(self):
-        trytond.tests.test_tryton.install_module('account_product')
-
-    def test0005views(self):
-        'Test views'
-        test_view('account_product')
-
-    def test0006depends(self):
-        'Test depends'
-        test_depends()
+    module = 'account_product'
 
     def test_account_used(self):
         'Test account used'
diff --git a/tryton.cfg b/tryton.cfg
index c33c3b7..e6429bf 100644
--- a/tryton.cfg
+++ b/tryton.cfg
@@ -1,5 +1,5 @@
 [tryton]
-version=3.4.1
+version=3.6.0
 depends:
     account
     company
diff --git a/trytond_account_product.egg-info/PKG-INFO b/trytond_account_product.egg-info/PKG-INFO
index 8d6bdee..6d04e56 100644
--- a/trytond_account_product.egg-info/PKG-INFO
+++ b/trytond_account_product.egg-info/PKG-INFO
@@ -1,12 +1,12 @@
 Metadata-Version: 1.1
 Name: trytond-account-product
-Version: 3.4.1
+Version: 3.6.0
 Summary: Tryton module to add accounting on product
 Home-page: http://www.tryton.org/
 Author: Tryton
 Author-email: issue_tracker at tryton.org
 License: GPL-3
-Download-URL: http://downloads.tryton.org/3.4/
+Download-URL: http://downloads.tryton.org/3.6/
 Description: trytond_account_product
         =======================
         
@@ -64,5 +64,7 @@ Classifier: Natural Language :: Slovenian
 Classifier: Natural Language :: Spanish
 Classifier: Operating System :: OS Independent
 Classifier: Programming Language :: Python :: 2.7
+Classifier: Programming Language :: Python :: Implementation :: CPython
+Classifier: Programming Language :: Python :: Implementation :: PyPy
 Classifier: Topic :: Office/Business
 Classifier: Topic :: Office/Business :: Financial :: Accounting
diff --git a/trytond_account_product.egg-info/requires.txt b/trytond_account_product.egg-info/requires.txt
index 9ce85f2..f932a94 100644
--- a/trytond_account_product.egg-info/requires.txt
+++ b/trytond_account_product.egg-info/requires.txt
@@ -1,4 +1,4 @@
-trytond_account >= 3.4, < 3.5
-trytond_company >= 3.4, < 3.5
-trytond_product >= 3.4, < 3.5
-trytond >= 3.4, < 3.5
\ No newline at end of file
+trytond_account >= 3.6, < 3.7
+trytond_company >= 3.6, < 3.7
+trytond_product >= 3.6, < 3.7
+trytond >= 3.6, < 3.7
\ No newline at end of file
-- 
tryton-modules-account-product



More information about the tryton-debian-vcs mailing list