Upgrade to 4.9

carrier.py

@@ -9,8 +9,7 @@ from trytond.modules.product import price_digits
 __all__ = ['Carrier']
 
 
-class Carrier:
-    __metaclass__ = PoolMeta
+class Carrier(metaclass=PoolMeta):
     __name__ = 'carrier'
     dua = fields.Boolean('DUA')
     dua_product = fields.Many2One('product.product', 'DUA Product',

sale.py

@@ -8,8 +8,7 @@ from trytond.pyson import Eval
 __all__ = ['Sale', 'SaleLine']
 
 
-class Sale:
-    __metaclass__ = PoolMeta
+class Sale(metaclass=PoolMeta):
     __name__ = 'sale.sale'
 
     @classmethod
@@ -72,8 +71,7 @@ class Sale:
         return cost_line
 
 
-class SaleLine:
-    __metaclass__ = PoolMeta
+class SaleLine(metaclass=PoolMeta):
     __name__ = 'sale.line'
     dua_cost = fields.Numeric('Dua Cost',
         digits=(16, Eval('_parent_sale', {}).get('currency_digits', 2)))

setup.py

@@ -7,10 +7,7 @@ from setuptools import setup
 import re
 import os
 import io
-try:
-    from configparser import ConfigParser
-except ImportError:
-    from ConfigParser import ConfigParser
+from configparser import ConfigParser
 
 MODULE2PREFIX = {}
 

tests/scenario_sale_shipment_dua.rst

@@ -40,17 +40,29 @@ Create chart of accounts::
     >>> revenue = accounts['revenue']
     >>> expense = accounts['expense']
 
+Create tax::
+
+    >>> tax = create_tax(Decimal('.10'))
+    >>> tax.save()
+
 Create customer::
 
     >>> Party = Model.get('party.party')
     >>> customer = Party(name='Customer')
     >>> customer.save()
 
-Create category::
+Create account categories::
 
     >>> ProductCategory = Model.get('product.category')
-    >>> category = ProductCategory(name='Category')
-    >>> category.save()
+    >>> account_category = ProductCategory(name="Account Category")
+    >>> account_category.accounting = True
+    >>> account_category.account_expense = expense
+    >>> account_category.account_revenue = revenue
+    >>> account_category.save()
+
+    >>> account_category_tax, = account_category.duplicate()
+    >>> account_category_tax.customer_taxes.append(tax)
+    >>> account_category_tax.save()
 
 Create product::
 
@@ -65,10 +77,7 @@ Create product::
     >>> template.purchasable = True
     >>> template.salable = True
     >>> template.list_price = Decimal('20')
-    >>> template.cost_price = Decimal('8')
-    >>> template.cost_price_method = 'fixed'
-    >>> template.account_expense = expense
-    >>> template.account_revenue = revenue
+    >>> template.account_category = account_category_tax
     >>> template.save()
     >>> product, = template.products
 
@@ -76,14 +85,12 @@ Create carrier product::
 
     >>> carrier_template = ProductTemplate()
     >>> carrier_template.name = 'carrier product'
-    >>> carrier_template.category = category
     >>> carrier_template.default_uom = unit
     >>> carrier_template.type = 'service'
     >>> carrier_template.salable = True
     >>> carrier_template.delivery_time = 0
     >>> carrier_template.list_price = Decimal('3')
-    >>> carrier_template.cost_price = Decimal(0)
-    >>> carrier_template.account_revenue = revenue
+    >>> carrier_template.account_category = account_category_tax
     >>> carrier_template.save()
     >>> carrier_product, = carrier_template.products
     >>> carrier_product.save()
@@ -92,14 +99,12 @@ Create carrier DUA product::
 
     >>> carrier_dua_template = ProductTemplate()
     >>> carrier_dua_template.name = 'DUA carrier product'
-    >>> carrier_dua_template.category = category
     >>> carrier_dua_template.default_uom = unit
     >>> carrier_dua_template.type = 'service'
     >>> carrier_dua_template.salable = True
     >>> carrier_dua_template.delivery_time = 0
     >>> carrier_dua_template.list_price = Decimal('3')
-    >>> carrier_dua_template.cost_price = Decimal(0)
-    >>> carrier_dua_template.account_revenue = revenue
+    >>> carrier_dua_template.account_category = account_category_tax
     >>> carrier_dua_template.save()
     >>> carrier_dua_product, = carrier_dua_template.products
     >>> carrier_dua_product.save()

tryton.cfg

@@ -1,5 +1,5 @@
 [tryton]
-version=4.8.0
+version=4.9.0
 depends:
     ir
     carrier