[tryton-debian-vcs] tryton-modules-stock-package-shipping-ups branch upstream updated. upstream/4.4.1-1-gd7e7218

Mathias Behrle tryton-debian-vcs at alioth.debian.org
Fri Nov 10 12:22:15 UTC 2017


The following commit has been merged in the upstream branch:
https://alioth.debian.org/plugins/scmgit/cgi-bin/gitweb.cgi/?p=tryton/tryton-modules-stock-package-shipping-ups.git;a=commitdiff;h=upstream/4.4.1-1-gd7e7218

commit d7e7218d0c632600af04aa90d0e66a22721c2aa3
Author: Mathias Behrle <mathiasb at m9s.biz>
Date:   Mon Nov 6 14:41:27 2017 +0100

    Adding upstream version 4.6.0.
    
    Signed-off-by: Mathias Behrle <mathiasb at m9s.biz>

diff --git a/.drone.yml b/.drone.yml
new file mode 100644
index 0000000..a296cdc
--- /dev/null
+++ b/.drone.yml
@@ -0,0 +1,52 @@
+clone:
+    hg:
+        image: plugins/hg
+
+pipeline:
+    tox:
+        image: ${IMAGE}
+        environment:
+            - CFLAGS=-O0
+            - DB_CACHE=/cache
+            - TOX_TESTENV_PASSENV=CFLAGS DB_CACHE UPS_USER_ID UPS_PASSWORD UPS_ACCOUNT_NUMBER UPS_LICENSE
+            - POSTGRESQL_URI=postgresql://postgres@postgresql:5432/
+        secrets: [ ups_user_id, ups_password, ups_account_number, ups_license ]
+        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 --git a/CHANGELOG b/CHANGELOG
index 63ba49a..2ea012f 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,4 +1,4 @@
-Version 4.4.1 - 2017-07-01
+Version 4.6.0 - 2017-10-30
 * Bug fixes (see mercurial logs for details)
 
 Version 4.4.0 - 2017-05-01
diff --git a/MANIFEST.in b/MANIFEST.in
index fb91042..4a5843d 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -6,7 +6,7 @@ include LICENSE
 include tryton.cfg
 include *.xml
 include view/*.xml
-include *.odt
+include *.fodt
 include locale/*.po
 include doc/*
 include icons/*
diff --git a/PKG-INFO b/PKG-INFO
index f2c62c4..89cdd92 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,12 +1,12 @@
 Metadata-Version: 1.1
 Name: trytond_stock_package_shipping_ups
-Version: 4.4.1
+Version: 4.6.0
 Summary: UPS connector for the Tryton application plateform
 Home-page: http://www.tryton.org/
 Author: Tryton
 Author-email: issue_tracker at tryton.org
 License: GPL-3
-Download-URL: http://downloads.tryton.org/4.4/
+Download-URL: http://downloads.tryton.org/4.6/
 Description: trytond_stock_package_shipping_ups
         ==================================
         
@@ -79,9 +79,9 @@ Classifier: Natural Language :: Slovenian
 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 --git a/locale/bg.po b/locale/bg.po
index a455384..8129ac2 100644
--- a/locale/bg.po
+++ b/locale/bg.po
@@ -1,4 +1,4 @@
-# 
+#
 msgid ""
 msgstr "Content-Type: text/plain; charset=utf-8\n"
 
@@ -66,10 +66,9 @@ msgctxt "field:carrier.credential.ups,password:"
 msgid "Password"
 msgstr "Парола"
 
-#, fuzzy
 msgctxt "field:carrier.credential.ups,rec_name:"
-msgid "Name"
-msgstr "Условие за плащане"
+msgid "Record Name"
+msgstr ""
 
 #, fuzzy
 msgctxt "field:carrier.credential.ups,server:"
diff --git a/locale/ca.po b/locale/ca.po
index 00ccb9c..5faf929 100644
--- a/locale/ca.po
+++ b/locale/ca.po
@@ -1,4 +1,4 @@
-# 
+#
 msgid ""
 msgstr "Content-Type: text/plain; charset=utf-8\n"
 
@@ -66,8 +66,8 @@ msgid "Password"
 msgstr "Contrasenya"
 
 msgctxt "field:carrier.credential.ups,rec_name:"
-msgid "Name"
-msgstr "Nom"
+msgid "Record Name"
+msgstr "Nom del registre"
 
 msgctxt "field:carrier.credential.ups,server:"
 msgid "Server"
diff --git a/locale/cs.po b/locale/cs.po
index 750095f..6577a0f 100644
--- a/locale/cs.po
+++ b/locale/cs.po
@@ -1,4 +1,4 @@
-# 
+#
 msgid ""
 msgstr "Content-Type: text/plain; charset=utf-8\n"
 
@@ -61,10 +61,9 @@ msgctxt "field:carrier.credential.ups,password:"
 msgid "Password"
 msgstr ""
 
-#, fuzzy
 msgctxt "field:carrier.credential.ups,rec_name:"
-msgid "Name"
-msgstr "Namu"
+msgid "Record Name"
+msgstr ""
 
 msgctxt "field:carrier.credential.ups,server:"
 msgid "Server"
diff --git a/locale/de.po b/locale/de.po
index 15a6ba4..68ec061 100644
--- a/locale/de.po
+++ b/locale/de.po
@@ -1,4 +1,4 @@
-# 
+#
 msgid ""
 msgstr "Content-Type: text/plain; charset=utf-8\n"
 
@@ -67,8 +67,8 @@ msgid "Password"
 msgstr "Passwort"
 
 msgctxt "field:carrier.credential.ups,rec_name:"
-msgid "Name"
-msgstr "Name"
+msgid "Record Name"
+msgstr ""
 
 msgctxt "field:carrier.credential.ups,server:"
 msgid "Server"
diff --git a/locale/es.po b/locale/es.po
index ac38783..6be1ebc 100644
--- a/locale/es.po
+++ b/locale/es.po
@@ -1,4 +1,4 @@
-# 
+#
 msgid ""
 msgstr "Content-Type: text/plain; charset=utf-8\n"
 
@@ -65,8 +65,8 @@ msgid "Password"
 msgstr "Contraseña"
 
 msgctxt "field:carrier.credential.ups,rec_name:"
-msgid "Name"
-msgstr "Nombre"
+msgid "Record Name"
+msgstr "Nombre del registro"
 
 msgctxt "field:carrier.credential.ups,server:"
 msgid "Server"
diff --git a/locale/es_419.po b/locale/es_419.po
index cc7839b..4c5d096 100644
--- a/locale/es_419.po
+++ b/locale/es_419.po
@@ -1,4 +1,4 @@
-# 
+#
 msgid ""
 msgstr "Content-Type: text/plain; charset=utf-8\n"
 
@@ -62,7 +62,7 @@ msgid "Password"
 msgstr ""
 
 msgctxt "field:carrier.credential.ups,rec_name:"
-msgid "Name"
+msgid "Record Name"
 msgstr ""
 
 msgctxt "field:carrier.credential.ups,server:"
diff --git a/locale/fr.po b/locale/fr.po
index dca5a67..685e609 100644
--- a/locale/fr.po
+++ b/locale/fr.po
@@ -1,4 +1,4 @@
-# 
+#
 msgid ""
 msgstr "Content-Type: text/plain; charset=utf-8\n"
 
@@ -23,7 +23,7 @@ msgstr "Un numéro de téléphone est requis pour le tiers « %(party)s »."
 msgctxt "error:stock.shipment.out:"
 msgid "A shipping description is required for shipment \"%(shipment)s\"."
 msgstr ""
-"Une description de livraison est requise pour la livraison « %(shipment)s »."
+"Une description de livraison est requise pour l’expédition « %(shipment)s »."
 
 msgctxt "field:carrier,ups_label_height:"
 msgid "Label Height"
@@ -66,8 +66,8 @@ msgid "Password"
 msgstr "Mot de passe"
 
 msgctxt "field:carrier.credential.ups,rec_name:"
-msgid "Name"
-msgstr "Nom"
+msgid "Record Name"
+msgstr "Nom de l'enregistrement"
 
 msgctxt "field:carrier.credential.ups,server:"
 msgid "Server"
diff --git a/locale/hu_HU.po b/locale/hu_HU.po
index 244aa0c..ab446a7 100644
--- a/locale/hu_HU.po
+++ b/locale/hu_HU.po
@@ -1,4 +1,4 @@
-# 
+#
 msgid ""
 msgstr "Content-Type: text/plain; charset=utf-8\n"
 
@@ -66,10 +66,9 @@ msgctxt "field:carrier.credential.ups,password:"
 msgid "Password"
 msgstr "Jelszó"
 
-#, fuzzy
 msgctxt "field:carrier.credential.ups,rec_name:"
-msgid "Name"
-msgstr "Név"
+msgid "Record Name"
+msgstr ""
 
 msgctxt "field:carrier.credential.ups,server:"
 msgid "Server"
diff --git a/locale/it_IT.po b/locale/it_IT.po
index f1bb2f5..3b57110 100644
--- a/locale/it_IT.po
+++ b/locale/it_IT.po
@@ -1,4 +1,4 @@
-# 
+#
 msgid ""
 msgstr "Content-Type: text/plain; charset=utf-8\n"
 
@@ -67,10 +67,9 @@ msgctxt "field:carrier.credential.ups,password:"
 msgid "Password"
 msgstr "Password"
 
-#, fuzzy
 msgctxt "field:carrier.credential.ups,rec_name:"
-msgid "Name"
-msgstr "Nome"
+msgid "Record Name"
+msgstr ""
 
 msgctxt "field:carrier.credential.ups,server:"
 msgid "Server"
diff --git a/locale/ja_JP.po b/locale/ja_JP.po
index bc433f4..95b0c09 100644
--- a/locale/ja_JP.po
+++ b/locale/ja_JP.po
@@ -1,4 +1,4 @@
-# 
+#
 msgid ""
 msgstr "Content-Type: text/plain; charset=utf-8\n"
 
@@ -62,7 +62,7 @@ msgid "Password"
 msgstr ""
 
 msgctxt "field:carrier.credential.ups,rec_name:"
-msgid "Name"
+msgid "Record Name"
 msgstr ""
 
 msgctxt "field:carrier.credential.ups,server:"
diff --git a/locale/lo.po b/locale/lo.po
index 5794f23..aced722 100644
--- a/locale/lo.po
+++ b/locale/lo.po
@@ -1,4 +1,4 @@
-# 
+#
 msgid ""
 msgstr "Content-Type: text/plain; charset=utf-8\n"
 
@@ -65,10 +65,9 @@ msgctxt "field:carrier.credential.ups,password:"
 msgid "Password"
 msgstr ""
 
-#, fuzzy
 msgctxt "field:carrier.credential.ups,rec_name:"
-msgid "Name"
-msgstr "ຊື່"
+msgid "Record Name"
+msgstr ""
 
 msgctxt "field:carrier.credential.ups,server:"
 msgid "Server"
diff --git a/locale/lt.po b/locale/lt.po
index 750095f..6577a0f 100644
--- a/locale/lt.po
+++ b/locale/lt.po
@@ -1,4 +1,4 @@
-# 
+#
 msgid ""
 msgstr "Content-Type: text/plain; charset=utf-8\n"
 
@@ -61,10 +61,9 @@ msgctxt "field:carrier.credential.ups,password:"
 msgid "Password"
 msgstr ""
 
-#, fuzzy
 msgctxt "field:carrier.credential.ups,rec_name:"
-msgid "Name"
-msgstr "Namu"
+msgid "Record Name"
+msgstr ""
 
 msgctxt "field:carrier.credential.ups,server:"
 msgid "Server"
diff --git a/locale/nl.po b/locale/nl.po
index 8311c15..53d4a45 100644
--- a/locale/nl.po
+++ b/locale/nl.po
@@ -1,4 +1,4 @@
-# 
+#
 msgid ""
 msgstr "Content-Type: text/plain; charset=utf-8\n"
 
@@ -65,10 +65,9 @@ msgctxt "field:carrier.credential.ups,password:"
 msgid "Password"
 msgstr ""
 
-#, fuzzy
 msgctxt "field:carrier.credential.ups,rec_name:"
-msgid "Name"
-msgstr "Naam bijlage"
+msgid "Record Name"
+msgstr ""
 
 msgctxt "field:carrier.credential.ups,server:"
 msgid "Server"
diff --git a/locale/pl.po b/locale/pl.po
index bc433f4..31d06b0 100644
--- a/locale/pl.po
+++ b/locale/pl.po
@@ -1,4 +1,4 @@
-# 
+#
 msgid ""
 msgstr "Content-Type: text/plain; charset=utf-8\n"
 
@@ -15,7 +15,7 @@ msgstr ""
 
 msgctxt "error:stock.shipment.out:"
 msgid "A phone number is required for party \"%(party)s\"."
-msgstr ""
+msgstr "Numer telefonu jest wymagany dla strony \"%(party)s\"."
 
 msgctxt "error:stock.shipment.out:"
 msgid "A shipping description is required for shipment \"%(shipment)s\"."
@@ -31,43 +31,43 @@ msgstr ""
 
 msgctxt "field:carrier,ups_service_type:"
 msgid "Service Type"
-msgstr ""
+msgstr "Typ usługi"
 
 msgctxt "field:carrier.credential.ups,account_number:"
 msgid "Account Number"
-msgstr ""
+msgstr "Numer konta"
 
 msgctxt "field:carrier.credential.ups,company:"
 msgid "Company"
-msgstr ""
+msgstr "Firma"
 
 msgctxt "field:carrier.credential.ups,create_date:"
 msgid "Create Date"
-msgstr ""
+msgstr "Data utworzenia"
 
 msgctxt "field:carrier.credential.ups,create_uid:"
 msgid "Create User"
-msgstr ""
+msgstr "Utworzył"
 
 msgctxt "field:carrier.credential.ups,id:"
 msgid "ID"
-msgstr ""
+msgstr "ID"
 
 msgctxt "field:carrier.credential.ups,license:"
 msgid "License"
-msgstr ""
+msgstr "Licencja"
 
 msgctxt "field:carrier.credential.ups,password:"
 msgid "Password"
-msgstr ""
+msgstr "Hasło"
 
 msgctxt "field:carrier.credential.ups,rec_name:"
-msgid "Name"
-msgstr ""
+msgid "Record Name"
+msgstr "Nazwa rekordu"
 
 msgctxt "field:carrier.credential.ups,server:"
 msgid "Server"
-msgstr ""
+msgstr "Serwer"
 
 msgctxt "field:carrier.credential.ups,use_metric:"
 msgid "Use Metric"
@@ -75,19 +75,19 @@ msgstr ""
 
 msgctxt "field:carrier.credential.ups,user_id:"
 msgid "User ID"
-msgstr ""
+msgstr "ID użytkownika"
 
 msgctxt "field:carrier.credential.ups,write_date:"
 msgid "Write Date"
-msgstr ""
+msgstr "Data zapisu"
 
 msgctxt "field:carrier.credential.ups,write_uid:"
 msgid "Write User"
-msgstr ""
+msgstr "Zapisał"
 
 msgctxt "field:stock.package.type,ups_code:"
 msgid "UPS Code"
-msgstr ""
+msgstr "Kod UPS"
 
 #, fuzzy
 msgctxt "model:carrier.credential.ups,name:"
@@ -96,23 +96,23 @@ msgstr "UPS Credentials"
 
 msgctxt "model:ir.action,name:act_create_shipping_ups_wizard"
 msgid "Create UPS Shipping for Packages"
-msgstr "Create UPS Shipping for Packages"
+msgstr ""
 
 msgctxt "model:ir.action,name:act_ups_credential_form"
 msgid "UPS Credentials"
-msgstr "UPS Credentials"
+msgstr ""
 
 msgctxt "model:ir.ui.menu,name:menu_ups_credential_form"
 msgid "UPS Credentials"
-msgstr "UPS Credentials"
+msgstr ""
 
 msgctxt "selection:carrier,shipping_service:"
 msgid "UPS"
-msgstr ""
+msgstr "UPS"
 
 msgctxt "selection:carrier.credential.ups,server:"
 msgid "Production"
-msgstr ""
+msgstr "Produkcja"
 
 msgctxt "selection:carrier.credential.ups,server:"
 msgid "Testing"
@@ -124,8 +124,8 @@ msgstr ""
 
 msgctxt "view:carrier:"
 msgid "UPS"
-msgstr ""
+msgstr "UPS"
 
 msgctxt "view:stock.package.type:"
 msgid "UPS"
-msgstr ""
+msgstr "UPS"
diff --git a/locale/pt_BR.po b/locale/pt_BR.po
index 94e1275..f3e9c75 100644
--- a/locale/pt_BR.po
+++ b/locale/pt_BR.po
@@ -1,4 +1,4 @@
-# 
+#
 msgid ""
 msgstr "Content-Type: text/plain; charset=utf-8\n"
 
@@ -65,8 +65,8 @@ msgid "Password"
 msgstr "Senha"
 
 msgctxt "field:carrier.credential.ups,rec_name:"
-msgid "Name"
-msgstr "Nome"
+msgid "Record Name"
+msgstr "Nome do Registro"
 
 msgctxt "field:carrier.credential.ups,server:"
 msgid "Server"
diff --git a/locale/ru.po b/locale/ru.po
index c398ead..3863dbb 100644
--- a/locale/ru.po
+++ b/locale/ru.po
@@ -1,4 +1,4 @@
-# 
+#
 msgid ""
 msgstr "Content-Type: text/plain; charset=utf-8\n"
 
@@ -66,10 +66,9 @@ msgctxt "field:carrier.credential.ups,password:"
 msgid "Password"
 msgstr "Пароль"
 
-#, fuzzy
 msgctxt "field:carrier.credential.ups,rec_name:"
-msgid "Name"
-msgstr "Правило оплаты"
+msgid "Record Name"
+msgstr ""
 
 #, fuzzy
 msgctxt "field:carrier.credential.ups,server:"
diff --git a/locale/sl.po b/locale/sl.po
index 84942ca..c080737 100644
--- a/locale/sl.po
+++ b/locale/sl.po
@@ -1,4 +1,4 @@
-# 
+#
 msgid ""
 msgstr "Content-Type: text/plain; charset=utf-8\n"
 
@@ -65,8 +65,8 @@ msgid "Password"
 msgstr "Geslo"
 
 msgctxt "field:carrier.credential.ups,rec_name:"
-msgid "Name"
-msgstr "Ime"
+msgid "Record Name"
+msgstr ""
 
 msgctxt "field:carrier.credential.ups,server:"
 msgid "Server"
diff --git a/locale/zh_CN.po b/locale/zh_CN.po
index bd138a0..e6e6519 100644
--- a/locale/zh_CN.po
+++ b/locale/zh_CN.po
@@ -1,4 +1,4 @@
-# 
+#
 msgid ""
 msgstr "Content-Type: text/plain; charset=utf-8\n"
 
@@ -65,10 +65,9 @@ msgctxt "field:carrier.credential.ups,password:"
 msgid "Password"
 msgstr "密码"
 
-#, fuzzy
 msgctxt "field:carrier.credential.ups,rec_name:"
-msgid "Name"
-msgstr "纳木"
+msgid "Record Name"
+msgstr ""
 
 msgctxt "field:carrier.credential.ups,server:"
 msgid "Server"
diff --git a/setup.py b/setup.py
index a38e538..b702a32 100644
--- a/setup.py
+++ b/setup.py
@@ -75,7 +75,7 @@ setup(name=name,
         ],
     package_data={
         'trytond.modules.stock_package_shipping_ups': (info.get('xml', [])
-            + ['tryton.cfg', 'view/*.xml', 'locale/*.po', '*.odt',
+            + ['tryton.cfg', 'view/*.xml', 'locale/*.po', '*.fodt',
                 'icons/*.svg', 'tests/*.rst']),
         },
     classifiers=[
@@ -102,9 +102,9 @@ setup(name=name,
         '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 --git a/stock.py b/stock.py
index e35ce4b..14685e3 100644
--- a/stock.py
+++ b/stock.py
@@ -237,18 +237,19 @@ class CreateShippingUPS(Wizard):
         return {
             'RequestOption': 'validate',
             'TransactionReference': {
-                'CustomerContext': shipment.number,
+                'CustomerContext': (shipment.number or '')[:512],
                 },
             }
 
     def get_shipping_party(self, party, address):
         shipping_party = {
             'Name': party.name[:35],
-            'AttentionName': party.name[:35],
+            'AttentionName': address.party.name[:35],
             'Address': {
-                'AddressLine': (address.street or '').splitlines(),
-                'City': address.city,
-                'PostalCode': address.zip,
+                'AddressLine': [l[:35]
+                    for l in (address.street or '').splitlines()[:3]],
+                'City': address.city[:30],
+                'PostalCode': (address.zip or '')[:9],
                 'CountryCode': address.country.code if address.country else '',
                 },
             }
@@ -325,7 +326,7 @@ class CreateShippingUPS(Wizard):
             'ShipmentRequest': {
                 'Request': self.get_request_container(shipment),
                 'Shipment': {
-                    'Description': shipment.shipping_description,
+                    'Description': (shipment.shipping_description or '')[:50],
                     'Shipper': shipper,
                     'ShipTo': self.get_shipping_party(shipment.customer,
                         shipment.delivery_address),
diff --git a/tests/scenario_shipping_ups.rst b/tests/scenario_shipping_ups.rst
index 0aeab64..61b14c0 100644
--- a/tests/scenario_shipping_ups.rst
+++ b/tests/scenario_shipping_ups.rst
@@ -98,8 +98,7 @@ Create product::
     >>> 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
@@ -108,13 +107,10 @@ Create product::
     >>> template.weight = 100
     >>> template.weight_uom = g
     >>> template.list_price = Decimal('10')
-    >>> template.cost_price = Decimal('5')
-    >>> template.cost_price_method = 'fixed'
     >>> template.account_expense = expense
     >>> template.account_revenue = revenue
     >>> template.save()
-    >>> product.template = template
-    >>> product.save()
+    >>> product, = template.products
 
 Create an Inventory::
 
@@ -156,20 +152,16 @@ Create a UPS Carrier and the related credential::
     >>> credential.server = 'testing'
     >>> credential.save()
 
-    >>> carrier_product = Product()
     >>> carrier_product_template = ProductTemplate()
     >>> carrier_product_template.name = 'UPS Ground'
     >>> carrier_product_template.default_uom = unit
     >>> carrier_product_template.type = 'service'
     >>> carrier_product_template.salable = True
     >>> carrier_product_template.list_price = Decimal(20)
-    >>> carrier_product_template.cost_price = Decimal(14)
-    >>> carrier_product_template.cost_price_method = 'fixed'
     >>> carrier_product_template.account_expense = expense
     >>> carrier_product_template.account_revenue = revenue
     >>> carrier_product_template.save()
-    >>> carrier_product.template = carrier_product_template
-    >>> carrier_product.save()
+    >>> carrier_product, = carrier_product_template.products
 
     >>> ups = Party(name='UPS')
     >>> ups.save()
diff --git a/tox.ini b/tox.ini
new file mode 100644
index 0000000..2792438
--- /dev/null
+++ b/tox.ini
@@ -0,0 +1,19 @@
+[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}
+passenv = UPS_USER_ID UPS_PASSWORD UPS_ACCOUNT_NUMBER UPS_LICENSE
+install_command = pip install --pre --find-links https://trydevpi.tryton.org/ {opts} {packages}
diff --git a/tryton.cfg b/tryton.cfg
index 3e4820e..ff12fc1 100644
--- a/tryton.cfg
+++ b/tryton.cfg
@@ -1,5 +1,5 @@
 [tryton]
-version=4.4.1
+version=4.6.0
 depends:
     ir
     res
diff --git a/trytond_stock_package_shipping_ups.egg-info/PKG-INFO b/trytond_stock_package_shipping_ups.egg-info/PKG-INFO
index 73279f4..7a70f98 100644
--- a/trytond_stock_package_shipping_ups.egg-info/PKG-INFO
+++ b/trytond_stock_package_shipping_ups.egg-info/PKG-INFO
@@ -1,12 +1,12 @@
 Metadata-Version: 1.1
 Name: trytond-stock-package-shipping-ups
-Version: 4.4.1
+Version: 4.6.0
 Summary: UPS connector for the Tryton application plateform
 Home-page: http://www.tryton.org/
 Author: Tryton
 Author-email: issue_tracker at tryton.org
 License: GPL-3
-Download-URL: http://downloads.tryton.org/4.4/
+Download-URL: http://downloads.tryton.org/4.6/
 Description: trytond_stock_package_shipping_ups
         ==================================
         
@@ -79,9 +79,9 @@ Classifier: Natural Language :: Slovenian
 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 --git a/trytond_stock_package_shipping_ups.egg-info/SOURCES.txt b/trytond_stock_package_shipping_ups.egg-info/SOURCES.txt
index 5213b35..4075983 100644
--- a/trytond_stock_package_shipping_ups.egg-info/SOURCES.txt
+++ b/trytond_stock_package_shipping_ups.egg-info/SOURCES.txt
@@ -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,7 +64,9 @@ locale/pt_BR.po
 locale/ru.po
 locale/sl.po
 locale/zh_CN.po
+tests/__init__.py
 tests/scenario_shipping_ups.rst
+tests/test_shipping_ups.py
 trytond_stock_package_shipping_ups.egg-info/PKG-INFO
 trytond_stock_package_shipping_ups.egg-info/SOURCES.txt
 trytond_stock_package_shipping_ups.egg-info/dependency_links.txt
diff --git a/trytond_stock_package_shipping_ups.egg-info/requires.txt b/trytond_stock_package_shipping_ups.egg-info/requires.txt
index 96d266d..c7047d9 100644
--- a/trytond_stock_package_shipping_ups.egg-info/requires.txt
+++ b/trytond_stock_package_shipping_ups.egg-info/requires.txt
@@ -1,8 +1,8 @@
 requests
-trytond_party >= 4.4, < 4.5
-trytond_product >= 4.4, < 4.5
-trytond_stock >= 4.4, < 4.5
-trytond_stock_shipment_measurements >= 4.4, < 4.5
-trytond_stock_package >= 4.4, < 4.5
-trytond_stock_package_shipping >= 4.4, < 4.5
-trytond >= 4.4, < 4.5
+trytond_party >= 4.6, < 4.7
+trytond_product >= 4.6, < 4.7
+trytond_stock >= 4.6, < 4.7
+trytond_stock_shipment_measurements >= 4.6, < 4.7
+trytond_stock_package >= 4.6, < 4.7
+trytond_stock_package_shipping >= 4.6, < 4.7
+trytond >= 4.6, < 4.7
-- 
tryton-modules-stock-package-shipping-ups



More information about the tryton-debian-vcs mailing list