diff -Nru tryton-modules-purchase-shipment-cost-4.4.0/CHANGELOG tryton-modules-purchase-shipment-cost-4.6.0/CHANGELOG
--- tryton-modules-purchase-shipment-cost-4.4.0/CHANGELOG	2017-05-01 19:22:49.000000000 +0000
+++ tryton-modules-purchase-shipment-cost-4.6.0/CHANGELOG	2017-10-30 14:32:00.000000000 +0000
@@ -1,3 +1,6 @@
+Version 4.6.0 - 2017-10-30
+* Bug fixes (see mercurial logs for details)
+
 Version 4.4.0 - 2017-05-01
 * Bug fixes (see mercurial logs for details)
 
diff -Nru tryton-modules-purchase-shipment-cost-4.4.0/debian/changelog tryton-modules-purchase-shipment-cost-4.6.0/debian/changelog
--- tryton-modules-purchase-shipment-cost-4.4.0/debian/changelog	2017-08-18 13:35:33.000000000 +0000
+++ tryton-modules-purchase-shipment-cost-4.6.0/debian/changelog	2017-11-07 09:20:26.000000000 +0000
@@ -1,3 +1,12 @@
+tryton-modules-purchase-shipment-cost (4.6.0-1) unstable; urgency=medium
+
+  * Bump the Standards-Version to 4.1.0, no changes needed.
+  * Bump the Standards-Version to 4.1.1, no changes needed.
+  * Merging upstream version 4.6.0.
+  * Use https in the watch file.
+
+ -- Mathias Behrle <mathiasb@m9s.biz>  Tue, 07 Nov 2017 10:20:26 +0100
+
 tryton-modules-purchase-shipment-cost (4.4.0-4) unstable; urgency=medium
 
   * Switch to Python3.
diff -Nru tryton-modules-purchase-shipment-cost-4.4.0/debian/control tryton-modules-purchase-shipment-cost-4.6.0/debian/control
--- tryton-modules-purchase-shipment-cost-4.4.0/debian/control	2017-08-18 12:13:08.000000000 +0000
+++ tryton-modules-purchase-shipment-cost-4.6.0/debian/control	2017-11-06 13:41:12.000000000 +0000
@@ -8,7 +8,7 @@
  dh-python,
  python3,
  python3-setuptools,
-Standards-Version: 4.0.1
+Standards-Version: 4.1.1
 Homepage: http://www.tryton.org/
 Vcs-Browser: https://anonscm.debian.org/cgit/tryton/tryton-modules-purchase-shipment-cost.git
 Vcs-Git: https://anonscm.debian.org/cgit/tryton/tryton-modules-purchase-shipment-cost.git
diff -Nru tryton-modules-purchase-shipment-cost-4.4.0/debian/watch tryton-modules-purchase-shipment-cost-4.6.0/debian/watch
--- tryton-modules-purchase-shipment-cost-4.4.0/debian/watch	2017-08-17 13:11:32.000000000 +0000
+++ tryton-modules-purchase-shipment-cost-4.6.0/debian/watch	2017-11-07 09:15:37.000000000 +0000
@@ -1,2 +1,2 @@
 version=3
-opts=pgpsigurlmangle=s/$/.asc/ http://downloads.tryton.org/current/ .*trytond_purchase_shipment_cost-(\d.*)\.(?:tgz|tbz2|txz|tar\.(?:gz|bz2|xz))
+opts=pgpsigurlmangle=s/$/.asc/ https://downloads.tryton.org/current/ .*trytond_purchase_shipment_cost-(\d.*)\.(?:tgz|tbz2|txz|tar\.(?:gz|bz2|xz))
diff -Nru tryton-modules-purchase-shipment-cost-4.4.0/.drone.yml tryton-modules-purchase-shipment-cost-4.6.0/.drone.yml
--- tryton-modules-purchase-shipment-cost-4.4.0/.drone.yml	1970-01-01 00:00:00.000000000 +0000
+++ tryton-modules-purchase-shipment-cost-4.6.0/.drone.yml	2017-10-23 22:08:01.000000000 +0000
@@ -0,0 +1,51 @@
+clone:
+    hg:
+        image: plugins/hg
+
+pipeline:
+    tox:
+        image: ${IMAGE}
+        environment:
+            - CFLAGS=-O0
+            - DB_CACHE=/cache
+            - TOX_TESTENV_PASSENV=CFLAGS DB_CACHE
+            - POSTGRESQL_URI=postgresql://postgres@postgresql:5432/
+        commands:
+            - pip install tox
+            - tox -e "${TOXENV}-${DATABASE}"
+        volumes:
+            - cache:/root/.cache
+
+services:
+    postgresql:
+        image: postgres
+        when:
+            matrix:
+                DATABASE: postgresql
+
+matrix:
+    include:
+        - IMAGE: python:2.7
+          TOXENV: py27
+          DATABASE: sqlite
+        - IMAGE: python:2.7
+          TOXENV: py27
+          DATABASE: postgresql
+        - IMAGE: python:3.4
+          TOXENV: py34
+          DATABASE: sqlite
+        - IMAGE: python:3.4
+          TOXENV: py34
+          DATABASE: postgresql
+        - IMAGE: python:3.5
+          TOXENV: py35
+          DATABASE: sqlite
+        - IMAGE: python:3.5
+          TOXENV: py35
+          DATABASE: postgresql
+        - IMAGE: python:3.6
+          TOXENV: py36
+          DATABASE: sqlite
+        - IMAGE: python:3.6
+          TOXENV: py36
+          DATABASE: postgresql
diff -Nru tryton-modules-purchase-shipment-cost-4.4.0/.hgtags tryton-modules-purchase-shipment-cost-4.6.0/.hgtags
--- tryton-modules-purchase-shipment-cost-4.4.0/.hgtags	1970-01-01 00:00:00.000000000 +0000
+++ tryton-modules-purchase-shipment-cost-4.6.0/.hgtags	2017-10-30 14:32:00.000000000 +0000
@@ -0,0 +1,12 @@
+6b4b291f70b6ad9ead4cbe9f8c2da88b5c324c8b 2.4.0
+1ee11d51aa0b6c2ecc06cb00ef9ef941d10fb3e7 2.6.0
+cd43d73b08c73a75fecae0b59e5da96a89d68498 2.8.0
+8ec1c5e5086391eef8c93b129311f19a52072f4d 3.0.0
+2dbc358ddf12b5b77705805bc72e17fe38f01a19 3.2.0
+63b3d63e95e64905bccc9dcf0e4e685dac81dfd3 3.4.0
+59d25a92cc7e19b50f6a11181bcf02b78dc4c09a 3.6.0
+bbdb8fc7bf4aea317d452b38798f2d7d915e5a75 3.8.0
+ad55847e968de20322cc71d504e48f769aa22baf 4.0.0
+173cf80a9a9df5f685c12d2acfa0faddacc94222 4.2.0
+07a2480b0e2834e758862e8230d8e93d28a57223 4.4.0
+b0428a99c8532d7a580ef686b853880b27beda3d 4.6.0
diff -Nru tryton-modules-purchase-shipment-cost-4.4.0/locale/bg.po tryton-modules-purchase-shipment-cost-4.6.0/locale/bg.po
--- tryton-modules-purchase-shipment-cost-4.4.0/locale/bg.po	2016-11-25 21:14:49.000000000 +0000
+++ tryton-modules-purchase-shipment-cost-4.6.0/locale/bg.po	2017-10-28 22:46:41.000000000 +0000
@@ -1,4 +1,4 @@
-# 
+#
 msgid ""
 msgstr "Content-Type: text/plain; charset=utf-8\n"
 
diff -Nru tryton-modules-purchase-shipment-cost-4.4.0/locale/ca.po tryton-modules-purchase-shipment-cost-4.6.0/locale/ca.po
--- tryton-modules-purchase-shipment-cost-4.4.0/locale/ca.po	2016-11-25 21:15:13.000000000 +0000
+++ tryton-modules-purchase-shipment-cost-4.6.0/locale/ca.po	2017-10-28 22:46:41.000000000 +0000
@@ -1,4 +1,4 @@
-# 
+#
 msgid ""
 msgstr "Content-Type: text/plain; charset=utf-8\n"
 
diff -Nru tryton-modules-purchase-shipment-cost-4.4.0/locale/cs.po tryton-modules-purchase-shipment-cost-4.6.0/locale/cs.po
--- tryton-modules-purchase-shipment-cost-4.4.0/locale/cs.po	2016-11-25 21:15:28.000000000 +0000
+++ tryton-modules-purchase-shipment-cost-4.6.0/locale/cs.po	2017-10-28 22:46:41.000000000 +0000
@@ -1,4 +1,4 @@
-# 
+#
 msgid ""
 msgstr "Content-Type: text/plain; charset=utf-8\n"
 
diff -Nru tryton-modules-purchase-shipment-cost-4.4.0/locale/de.po tryton-modules-purchase-shipment-cost-4.6.0/locale/de.po
--- tryton-modules-purchase-shipment-cost-4.4.0/locale/de.po	2016-11-25 21:15:46.000000000 +0000
+++ tryton-modules-purchase-shipment-cost-4.6.0/locale/de.po	2017-10-28 22:46:41.000000000 +0000
@@ -1,4 +1,4 @@
-# 
+#
 msgid ""
 msgstr "Content-Type: text/plain; charset=utf-8\n"
 
diff -Nru tryton-modules-purchase-shipment-cost-4.4.0/locale/es_419.po tryton-modules-purchase-shipment-cost-4.6.0/locale/es_419.po
--- tryton-modules-purchase-shipment-cost-4.4.0/locale/es_419.po	2016-11-25 21:16:08.000000000 +0000
+++ tryton-modules-purchase-shipment-cost-4.6.0/locale/es_419.po	2017-10-28 22:46:41.000000000 +0000
@@ -1,4 +1,4 @@
-# 
+#
 msgid ""
 msgstr "Content-Type: text/plain; charset=utf-8\n"
 
diff -Nru tryton-modules-purchase-shipment-cost-4.4.0/locale/es.po tryton-modules-purchase-shipment-cost-4.6.0/locale/es.po
--- tryton-modules-purchase-shipment-cost-4.4.0/locale/es.po	2016-11-25 21:15:53.000000000 +0000
+++ tryton-modules-purchase-shipment-cost-4.6.0/locale/es.po	2017-10-28 22:46:41.000000000 +0000
@@ -1,4 +1,4 @@
-# 
+#
 msgid ""
 msgstr "Content-Type: text/plain; charset=utf-8\n"
 
diff -Nru tryton-modules-purchase-shipment-cost-4.4.0/locale/fr.po tryton-modules-purchase-shipment-cost-4.6.0/locale/fr.po
--- tryton-modules-purchase-shipment-cost-4.4.0/locale/fr.po	2016-11-25 21:16:33.000000000 +0000
+++ tryton-modules-purchase-shipment-cost-4.6.0/locale/fr.po	2017-10-28 22:46:41.000000000 +0000
@@ -1,4 +1,4 @@
-# 
+#
 msgid ""
 msgstr "Content-Type: text/plain; charset=utf-8\n"
 
diff -Nru tryton-modules-purchase-shipment-cost-4.4.0/locale/hu_HU.po tryton-modules-purchase-shipment-cost-4.6.0/locale/hu_HU.po
--- tryton-modules-purchase-shipment-cost-4.4.0/locale/hu_HU.po	2016-11-25 21:16:43.000000000 +0000
+++ tryton-modules-purchase-shipment-cost-4.6.0/locale/hu_HU.po	2017-10-28 22:46:41.000000000 +0000
@@ -1,4 +1,4 @@
-# 
+#
 msgid ""
 msgstr "Content-Type: text/plain; charset=utf-8\n"
 
diff -Nru tryton-modules-purchase-shipment-cost-4.4.0/locale/it_IT.po tryton-modules-purchase-shipment-cost-4.6.0/locale/it_IT.po
--- tryton-modules-purchase-shipment-cost-4.4.0/locale/it_IT.po	2016-11-25 21:16:57.000000000 +0000
+++ tryton-modules-purchase-shipment-cost-4.6.0/locale/it_IT.po	2017-10-28 22:46:41.000000000 +0000
@@ -1,4 +1,4 @@
-# 
+#
 msgid ""
 msgstr "Content-Type: text/plain; charset=utf-8\n"
 
diff -Nru tryton-modules-purchase-shipment-cost-4.4.0/locale/ja_JP.po tryton-modules-purchase-shipment-cost-4.6.0/locale/ja_JP.po
--- tryton-modules-purchase-shipment-cost-4.4.0/locale/ja_JP.po	2016-11-25 21:18:25.000000000 +0000
+++ tryton-modules-purchase-shipment-cost-4.6.0/locale/ja_JP.po	2017-10-28 22:46:41.000000000 +0000
@@ -1,4 +1,4 @@
-# 
+#
 msgid ""
 msgstr "Content-Type: text/plain; charset=utf-8\n"
 
diff -Nru tryton-modules-purchase-shipment-cost-4.4.0/locale/lo.po tryton-modules-purchase-shipment-cost-4.6.0/locale/lo.po
--- tryton-modules-purchase-shipment-cost-4.4.0/locale/lo.po	2017-04-29 17:09:29.000000000 +0000
+++ tryton-modules-purchase-shipment-cost-4.6.0/locale/lo.po	2017-10-28 22:46:41.000000000 +0000
@@ -1,4 +1,4 @@
-# 
+#
 msgid ""
 msgstr "Content-Type: text/plain; charset=utf-8\n"
 
diff -Nru tryton-modules-purchase-shipment-cost-4.4.0/locale/lt.po tryton-modules-purchase-shipment-cost-4.6.0/locale/lt.po
--- tryton-modules-purchase-shipment-cost-4.4.0/locale/lt.po	2016-11-25 21:17:22.000000000 +0000
+++ tryton-modules-purchase-shipment-cost-4.6.0/locale/lt.po	2017-10-28 22:46:41.000000000 +0000
@@ -1,4 +1,4 @@
-# 
+#
 msgid ""
 msgstr "Content-Type: text/plain; charset=utf-8\n"
 
diff -Nru tryton-modules-purchase-shipment-cost-4.4.0/locale/nl.po tryton-modules-purchase-shipment-cost-4.6.0/locale/nl.po
--- tryton-modules-purchase-shipment-cost-4.4.0/locale/nl.po	2016-11-25 21:17:28.000000000 +0000
+++ tryton-modules-purchase-shipment-cost-4.6.0/locale/nl.po	2017-10-28 22:46:41.000000000 +0000
@@ -1,4 +1,4 @@
-# 
+#
 msgid ""
 msgstr "Content-Type: text/plain; charset=utf-8\n"
 
diff -Nru tryton-modules-purchase-shipment-cost-4.4.0/locale/pl.po tryton-modules-purchase-shipment-cost-4.6.0/locale/pl.po
--- tryton-modules-purchase-shipment-cost-4.4.0/locale/pl.po	2016-11-25 21:16:21.000000000 +0000
+++ tryton-modules-purchase-shipment-cost-4.6.0/locale/pl.po	2017-10-28 22:46:41.000000000 +0000
@@ -1,4 +1,4 @@
-# 
+#
 msgid ""
 msgstr "Content-Type: text/plain; charset=utf-8\n"
 
@@ -16,16 +16,16 @@
 
 msgctxt "field:stock.shipment.in,cost:"
 msgid "Cost"
-msgstr ""
+msgstr "Koszt"
 
 msgctxt "field:stock.shipment.in,cost_currency:"
 msgid "Cost Currency"
-msgstr ""
+msgstr "Koszt waluty"
 
 msgctxt "field:stock.shipment.in,cost_currency_digits:"
 msgid "Cost Currency Digits"
-msgstr ""
+msgstr "Cyfry kosztu waluty"
 
 msgctxt "selection:carrier,carrier_cost_allocation_method:"
 msgid "By Value"
-msgstr ""
+msgstr "Wg wartości"
diff -Nru tryton-modules-purchase-shipment-cost-4.4.0/locale/pt_BR.po tryton-modules-purchase-shipment-cost-4.6.0/locale/pt_BR.po
--- tryton-modules-purchase-shipment-cost-4.4.0/locale/pt_BR.po	2016-11-25 21:17:43.000000000 +0000
+++ tryton-modules-purchase-shipment-cost-4.6.0/locale/pt_BR.po	2017-10-28 22:46:41.000000000 +0000
@@ -1,4 +1,4 @@
-# 
+#
 msgid ""
 msgstr "Content-Type: text/plain; charset=utf-8\n"
 
diff -Nru tryton-modules-purchase-shipment-cost-4.4.0/locale/ru.po tryton-modules-purchase-shipment-cost-4.6.0/locale/ru.po
--- tryton-modules-purchase-shipment-cost-4.4.0/locale/ru.po	2016-11-25 21:17:52.000000000 +0000
+++ tryton-modules-purchase-shipment-cost-4.6.0/locale/ru.po	2017-10-28 22:46:41.000000000 +0000
@@ -1,4 +1,4 @@
-# 
+#
 msgid ""
 msgstr "Content-Type: text/plain; charset=utf-8\n"
 
diff -Nru tryton-modules-purchase-shipment-cost-4.4.0/locale/sl.po tryton-modules-purchase-shipment-cost-4.6.0/locale/sl.po
--- tryton-modules-purchase-shipment-cost-4.4.0/locale/sl.po	2016-11-25 21:18:08.000000000 +0000
+++ tryton-modules-purchase-shipment-cost-4.6.0/locale/sl.po	2017-10-28 22:46:41.000000000 +0000
@@ -1,4 +1,4 @@
-# 
+#
 msgid ""
 msgstr "Content-Type: text/plain; charset=utf-8\n"
 
diff -Nru tryton-modules-purchase-shipment-cost-4.4.0/locale/zh_CN.po tryton-modules-purchase-shipment-cost-4.6.0/locale/zh_CN.po
--- tryton-modules-purchase-shipment-cost-4.4.0/locale/zh_CN.po	2016-11-25 21:18:17.000000000 +0000
+++ tryton-modules-purchase-shipment-cost-4.6.0/locale/zh_CN.po	2017-10-28 22:46:41.000000000 +0000
@@ -1,4 +1,4 @@
-# 
+#
 msgid ""
 msgstr "Content-Type: text/plain; charset=utf-8\n"
 
diff -Nru tryton-modules-purchase-shipment-cost-4.4.0/PKG-INFO tryton-modules-purchase-shipment-cost-4.6.0/PKG-INFO
--- tryton-modules-purchase-shipment-cost-4.4.0/PKG-INFO	2017-05-01 19:23:05.000000000 +0000
+++ tryton-modules-purchase-shipment-cost-4.6.0/PKG-INFO	2017-10-30 14:32:03.000000000 +0000
@@ -1,12 +1,12 @@
 Metadata-Version: 1.1
 Name: trytond_purchase_shipment_cost
-Version: 4.4.0
+Version: 4.6.0
 Summary: Tryton module for purchase shipment cost
 Home-page: http://www.tryton.org/
 Author: Tryton
 Author-email: issue_tracker@tryton.org
 License: GPL-3
-Download-URL: http://downloads.tryton.org/4.4/
+Download-URL: http://downloads.tryton.org/4.6/
 Description: trytond_purchase_shipment_cost
         ==============================
         
@@ -70,9 +70,9 @@
 Classifier: Natural Language :: Spanish
 Classifier: Operating System :: OS Independent
 Classifier: Programming Language :: Python :: 2.7
-Classifier: Programming Language :: Python :: 3.3
 Classifier: Programming Language :: Python :: 3.4
 Classifier: Programming Language :: Python :: 3.5
+Classifier: Programming Language :: Python :: 3.6
 Classifier: Programming Language :: Python :: Implementation :: CPython
 Classifier: Programming Language :: Python :: Implementation :: PyPy
 Classifier: Topic :: Office/Business
diff -Nru tryton-modules-purchase-shipment-cost-4.4.0/setup.cfg tryton-modules-purchase-shipment-cost-4.6.0/setup.cfg
--- tryton-modules-purchase-shipment-cost-4.4.0/setup.cfg	2017-05-01 19:23:05.000000000 +0000
+++ tryton-modules-purchase-shipment-cost-4.6.0/setup.cfg	2017-10-30 14:32:03.000000000 +0000
@@ -1,5 +1,4 @@
 [egg_info]
 tag_build = 
 tag_date = 0
-tag_svn_revision = 0
 
diff -Nru tryton-modules-purchase-shipment-cost-4.4.0/setup.py tryton-modules-purchase-shipment-cost-4.6.0/setup.py
--- tryton-modules-purchase-shipment-cost-4.4.0/setup.py	2017-02-14 09:16:55.000000000 +0000
+++ tryton-modules-purchase-shipment-cost-4.6.0/setup.py	2017-10-23 22:08:01.000000000 +0000
@@ -112,9 +112,9 @@
         'Natural Language :: Spanish',
         'Operating System :: OS Independent',
         'Programming Language :: Python :: 2.7',
-        'Programming Language :: Python :: 3.3',
         'Programming Language :: Python :: 3.4',
         'Programming Language :: Python :: 3.5',
+        'Programming Language :: Python :: 3.6',
         'Programming Language :: Python :: Implementation :: CPython',
         'Programming Language :: Python :: Implementation :: PyPy',
         'Topic :: Office/Business',
diff -Nru tryton-modules-purchase-shipment-cost-4.4.0/tests/scenario_purchase_shipment_cost.rst tryton-modules-purchase-shipment-cost-4.6.0/tests/scenario_purchase_shipment_cost.rst
--- tryton-modules-purchase-shipment-cost-4.4.0/tests/scenario_purchase_shipment_cost.rst	2016-10-21 16:42:45.000000000 +0000
+++ tryton-modules-purchase-shipment-cost-4.6.0/tests/scenario_purchase_shipment_cost.rst	2017-07-05 12:55:46.000000000 +0000
@@ -32,28 +32,27 @@
 
     >>> ProductUom = Model.get('product.uom')
     >>> ProductTemplate = Model.get('product.template')
-    >>> Product = Model.get('product.product')
     >>> unit, = ProductUom.find([('name', '=', 'Unit')])
-    >>> product = Product()
+
     >>> template = ProductTemplate()
     >>> template.name = 'Product'
     >>> template.default_uom = unit
     >>> template.type = 'goods'
     >>> template.list_price = Decimal('20')
-    >>> template.cost_price = Decimal('8')
+    >>> product, = template.products
+    >>> product.cost_price = Decimal('8')
     >>> template.save()
-    >>> product.template = template
-    >>> product.save()
-    >>> carrier_product = Product()
+    >>> product, = template.products
+
     >>> carrier_template = ProductTemplate()
     >>> carrier_template.name = 'Carrier Product'
     >>> carrier_template.default_uom = unit
     >>> carrier_template.type = 'service'
     >>> carrier_template.list_price = Decimal('5')
-    >>> carrier_template.cost_price = Decimal('3')
+    >>> carrier_product, = carrier_template.products
+    >>> carrier_product.cost_price = Decimal('3')
     >>> carrier_template.save()
-    >>> carrier_product.template = carrier_template
-    >>> carrier_product.save()
+    >>> carrier_product, = carrier_template.products
 
 Create carrier::
 
diff -Nru tryton-modules-purchase-shipment-cost-4.4.0/tests/scenario_purchase_shipment_cost_with_account_stock_anglo_saxon.rst tryton-modules-purchase-shipment-cost-4.6.0/tests/scenario_purchase_shipment_cost_with_account_stock_anglo_saxon.rst
--- tryton-modules-purchase-shipment-cost-4.4.0/tests/scenario_purchase_shipment_cost_with_account_stock_anglo_saxon.rst	2016-10-21 16:42:45.000000000 +0000
+++ tryton-modules-purchase-shipment-cost-4.6.0/tests/scenario_purchase_shipment_cost_with_account_stock_anglo_saxon.rst	2017-07-05 12:55:46.000000000 +0000
@@ -71,15 +71,13 @@
     >>> ProductUom = Model.get('product.uom')
     >>> unit, = ProductUom.find([('name', '=', 'Unit')])
     >>> ProductTemplate = Model.get('product.template')
-    >>> Product = Model.get('product.product')
-    >>> product = Product()
+
     >>> template = ProductTemplate()
     >>> template.name = 'product'
     >>> template.default_uom = unit
     >>> template.type = 'goods'
     >>> template.purchasable = True
     >>> template.list_price = Decimal('10')
-    >>> template.cost_price = Decimal('5')
     >>> template.cost_price_method = 'average'
     >>> template.account_expense = expense
     >>> template.account_revenue = revenue
@@ -92,21 +90,22 @@
     >>> template.account_journal_stock_supplier = stock_journal
     >>> template.account_journal_stock_customer = stock_journal
     >>> template.account_journal_stock_lost_found = stock_journal
+    >>> product, = template.products
+    >>> product.cost_price = Decimal('5')
     >>> template.save()
-    >>> product.template = template
-    >>> product.save()
-    >>> carrier_product = Product()
+    >>> product, = template.products
+
     >>> carrier_template = ProductTemplate()
     >>> carrier_template.name = 'Carrier Product'
     >>> carrier_template.default_uom = unit
     >>> carrier_template.type = 'service'
     >>> carrier_template.list_price = Decimal('5')
-    >>> carrier_template.cost_price = Decimal('3')
     >>> carrier_template.account_expense = expense
     >>> carrier_template.account_revenue = revenue
+    >>> carrier_product, = carrier_template.products
+    >>> carrier_product.cost_price = Decimal('3')
     >>> carrier_template.save()
-    >>> carrier_product.template = carrier_template
-    >>> carrier_product.save()
+    >>> carrier_product, = carrier_template.products
 
 Create carrier::
 
diff -Nru tryton-modules-purchase-shipment-cost-4.4.0/tests/scenario_purchase_shipment_cost_with_account_stock.rst tryton-modules-purchase-shipment-cost-4.6.0/tests/scenario_purchase_shipment_cost_with_account_stock.rst
--- tryton-modules-purchase-shipment-cost-4.4.0/tests/scenario_purchase_shipment_cost_with_account_stock.rst	2016-10-21 16:42:45.000000000 +0000
+++ tryton-modules-purchase-shipment-cost-4.6.0/tests/scenario_purchase_shipment_cost_with_account_stock.rst	2017-07-05 12:55:46.000000000 +0000
@@ -63,15 +63,13 @@
 
     >>> ProductUom = Model.get('product.uom')
     >>> ProductTemplate = Model.get('product.template')
-    >>> Product = Model.get('product.product')
     >>> unit, = ProductUom.find([('name', '=', 'Unit')])
-    >>> product = Product()
+
     >>> template = ProductTemplate()
     >>> template.name = 'Product'
     >>> template.default_uom = unit
     >>> template.type = 'goods'
     >>> template.list_price = Decimal('20')
-    >>> template.cost_price = Decimal('8')
     >>> template.account_expense = expense
     >>> template.account_revenue = revenue
     >>> template.account_stock = stock
@@ -82,28 +80,26 @@
     >>> template.account_journal_stock_supplier = stock_journal
     >>> template.account_journal_stock_customer = stock_journal
     >>> template.account_journal_stock_lost_found = stock_journal
+    >>> product, = template.products
+    >>> product.cost_price = Decimal('8')
     >>> template.save()
-    >>> product.template = template
-    >>> product.save()
-    >>> template_average, = ProductTemplate.duplicate([template])
-    >>> template_average.cost_price_method = 'average'
-    >>> template_average.save()
-    >>> product_average, = Product.duplicate([product], {
-    ...         'template': template_average.id,
+    >>> product, = template.products
+    >>> template_average, = template.duplicate({
+    ...         'cost_price_method': 'average',
     ...         })
+    >>> product_average, = template_average.products
 
-    >>> carrier_product = Product()
     >>> carrier_template = ProductTemplate()
     >>> carrier_template.name = 'Carrier Product'
     >>> carrier_template.default_uom = unit
     >>> carrier_template.type = 'service'
     >>> carrier_template.list_price = Decimal('5')
-    >>> carrier_template.cost_price = Decimal('3')
     >>> carrier_template.account_expense = expense
     >>> carrier_template.account_revenue = revenue
+    >>> carrier_product, = carrier_template.products
+    >>> carrier_product.cost_price = Decimal('3')
     >>> carrier_template.save()
-    >>> carrier_product.template = carrier_template
-    >>> carrier_product.save()
+    >>> carrier_product, = carrier_template.products
 
 Create carrier::
 
diff -Nru tryton-modules-purchase-shipment-cost-4.4.0/tox.ini tryton-modules-purchase-shipment-cost-4.6.0/tox.ini
--- tryton-modules-purchase-shipment-cost-4.4.0/tox.ini	1970-01-01 00:00:00.000000000 +0000
+++ tryton-modules-purchase-shipment-cost-4.6.0/tox.ini	2017-10-23 22:08:01.000000000 +0000
@@ -0,0 +1,18 @@
+[tox]
+envlist = {py27,py34,py35,py36}-{sqlite,postgresql,mysql},pypy-{sqlite,postgresql}
+
+[testenv]
+commands = {envpython} setup.py test
+deps =
+    {py27,py34,py35,py36}-postgresql: psycopg2 >= 2.5
+    pypy-postgresql: psycopg2cffi >= 2.5
+    mysql: MySQL-python
+    sqlite: sqlitebck
+setenv =
+    sqlite: TRYTOND_DATABASE_URI={env:SQLITE_URI:sqlite://}
+    postgresql: TRYTOND_DATABASE_URI={env:POSTGRESQL_URI:postgresql://}
+    mysql: TRYTOND_DATABASE_URI={env:MYSQL_URI:mysql://}
+    sqlite: DB_NAME={env:SQLITE_NAME::memory:}
+    postgresql: DB_NAME={env:POSTGRESQL_NAME:test}
+    mysql: DB_NAME={env:MYSQL_NAME:test}
+install_command = pip install --pre --find-links https://trydevpi.tryton.org/ {opts} {packages}
diff -Nru tryton-modules-purchase-shipment-cost-4.4.0/tryton.cfg tryton-modules-purchase-shipment-cost-4.6.0/tryton.cfg
--- tryton-modules-purchase-shipment-cost-4.4.0/tryton.cfg	2017-05-01 19:22:36.000000000 +0000
+++ tryton-modules-purchase-shipment-cost-4.6.0/tryton.cfg	2017-10-30 14:31:59.000000000 +0000
@@ -1,5 +1,5 @@
 [tryton]
-version=4.4.0
+version=4.6.0
 depends:
     carrier
     currency
diff -Nru tryton-modules-purchase-shipment-cost-4.4.0/trytond_purchase_shipment_cost.egg-info/PKG-INFO tryton-modules-purchase-shipment-cost-4.6.0/trytond_purchase_shipment_cost.egg-info/PKG-INFO
--- tryton-modules-purchase-shipment-cost-4.4.0/trytond_purchase_shipment_cost.egg-info/PKG-INFO	2017-05-01 19:23:03.000000000 +0000
+++ tryton-modules-purchase-shipment-cost-4.6.0/trytond_purchase_shipment_cost.egg-info/PKG-INFO	2017-10-30 14:32:01.000000000 +0000
@@ -1,12 +1,12 @@
 Metadata-Version: 1.1
 Name: trytond-purchase-shipment-cost
-Version: 4.4.0
+Version: 4.6.0
 Summary: Tryton module for purchase shipment cost
 Home-page: http://www.tryton.org/
 Author: Tryton
 Author-email: issue_tracker@tryton.org
 License: GPL-3
-Download-URL: http://downloads.tryton.org/4.4/
+Download-URL: http://downloads.tryton.org/4.6/
 Description: trytond_purchase_shipment_cost
         ==============================
         
@@ -70,9 +70,9 @@
 Classifier: Natural Language :: Spanish
 Classifier: Operating System :: OS Independent
 Classifier: Programming Language :: Python :: 2.7
-Classifier: Programming Language :: Python :: 3.3
 Classifier: Programming Language :: Python :: 3.4
 Classifier: Programming Language :: Python :: 3.5
+Classifier: Programming Language :: Python :: 3.6
 Classifier: Programming Language :: Python :: Implementation :: CPython
 Classifier: Programming Language :: Python :: Implementation :: PyPy
 Classifier: Topic :: Office/Business
diff -Nru tryton-modules-purchase-shipment-cost-4.4.0/trytond_purchase_shipment_cost.egg-info/requires.txt tryton-modules-purchase-shipment-cost-4.6.0/trytond_purchase_shipment_cost.egg-info/requires.txt
--- tryton-modules-purchase-shipment-cost-4.4.0/trytond_purchase_shipment_cost.egg-info/requires.txt	2017-05-01 19:23:03.000000000 +0000
+++ tryton-modules-purchase-shipment-cost-4.6.0/trytond_purchase_shipment_cost.egg-info/requires.txt	2017-10-30 14:32:01.000000000 +0000
@@ -1,13 +1,13 @@
-trytond_carrier >= 4.4, < 4.5
-trytond_currency >= 4.4, < 4.5
-trytond_stock >= 4.4, < 4.5
-trytond >= 4.4, < 4.5
+trytond_carrier >= 4.6, < 4.7
+trytond_currency >= 4.6, < 4.7
+trytond_stock >= 4.6, < 4.7
+trytond >= 4.6, < 4.7
 
 [account_product]
-trytond_account_product >= 4.4, < 4.5
+trytond_account_product >= 4.6, < 4.7
 
 [account_stock_anglo_saxon]
-trytond_account_stock_anglo_saxon >= 4.4, < 4.5
+trytond_account_stock_anglo_saxon >= 4.6, < 4.7
 
 [account_stock_continental]
-trytond_account_stock_continental >= 4.4, < 4.5
+trytond_account_stock_continental >= 4.6, < 4.7
diff -Nru tryton-modules-purchase-shipment-cost-4.4.0/trytond_purchase_shipment_cost.egg-info/SOURCES.txt tryton-modules-purchase-shipment-cost-4.6.0/trytond_purchase_shipment_cost.egg-info/SOURCES.txt
--- tryton-modules-purchase-shipment-cost-4.4.0/trytond_purchase_shipment_cost.egg-info/SOURCES.txt	2017-05-01 19:23:03.000000000 +0000
+++ tryton-modules-purchase-shipment-cost-4.6.0/trytond_purchase_shipment_cost.egg-info/SOURCES.txt	2017-10-30 14:32:01.000000000 +0000
@@ -1,12 +1,18 @@
+.drone.yml
+.hgtags
 CHANGELOG
 COPYRIGHT
 INSTALL
 LICENSE
 MANIFEST.in
 README
+__init__.py
+carrier.py
 carrier.xml
 setup.py
+stock.py
 stock.xml
+tox.ini
 tryton.cfg
 ./__init__.py
 ./carrier.py
@@ -58,9 +64,11 @@
 locale/ru.po
 locale/sl.po
 locale/zh_CN.po
+tests/__init__.py
 tests/scenario_purchase_shipment_cost.rst
 tests/scenario_purchase_shipment_cost_with_account_stock.rst
 tests/scenario_purchase_shipment_cost_with_account_stock_anglo_saxon.rst
+tests/test_purchase_shipment_cost.py
 trytond_purchase_shipment_cost.egg-info/PKG-INFO
 trytond_purchase_shipment_cost.egg-info/SOURCES.txt
 trytond_purchase_shipment_cost.egg-info/dependency_links.txt