[tryton-debian-vcs] tryton-modules-stock-package-shipping-ups branch upstream updated. upstream/4.2.0-1-g40354f4
Mathias Behrle
tryton-debian-vcs at alioth.debian.org
Wed Jun 7 13:37:03 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.2.0-1-g40354f4
commit 40354f4b1409de3d89e563af8c8cff76cac08638
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Wed Jun 7 15:27:05 2017 +0200
Adding upstream version 4.4.0.
Signed-off-by: Mathias Behrle <mathiasb at m9s.biz>
diff --git a/CHANGELOG b/CHANGELOG
index 1c72ee3..f24f5fc 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,2 +1,6 @@
+Version 4.4.0 - 2017-05-01
+* Bug fixes (see mercurial logs for details)
+* Use total weight of package
+
Version 4.2.0 - 2016-11-28
-* Initial release
\ No newline at end of file
+* Initial release
diff --git a/COPYRIGHT b/COPYRIGHT
index 0f0e2e0..fd60d86 100644
--- a/COPYRIGHT
+++ b/COPYRIGHT
@@ -1,5 +1,5 @@
-Copyright (C) 2016 B2CK.
-Copyright (C) 2016 Nicolas Évrard.
+Copyright (C) 2016-2017 B2CK.
+Copyright (C) 2016-2017 Nicolas Évrard.
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 --git a/INSTALL b/INSTALL
index 1d88956..a2528d3 100644
--- a/INSTALL
+++ b/INSTALL
@@ -6,6 +6,12 @@ Prerequisites
* Python 2.7 or later (http://www.python.org/)
* trytond (http://www.tryton.org/)
+ * trytond_party (http://www.tryton.org/)
+ * trytond_product (http://www.tryton.org/)
+ * trytond_stock (http://www.tryton.org/)
+ * trytond_stock_shipment_measurements (http://www.tryton.org/)
+ * trytond_stock_package (http://www.tryton.org/)
+ * trytond_stock_package_shipping (http://www.tryton.org/)
Installation
------------
diff --git a/PKG-INFO b/PKG-INFO
index c27ce23..2958393 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,12 +1,12 @@
Metadata-Version: 1.1
Name: trytond_stock_package_shipping_ups
-Version: 4.2.0
+Version: 4.4.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.2/
+Download-URL: http://downloads.tryton.org/4.4/
Description: trytond_stock_package_shipping_ups
==================================
@@ -62,7 +62,7 @@ Classifier: Framework :: Tryton
Classifier: Intended Audience :: Developers
Classifier: Intended Audience :: Financial and Insurance Industry
Classifier: Intended Audience :: Legal Industry
-Classifier: License :: OSI Approved :: GNU General Public License (GPL)
+Classifier: License :: OSI Approved :: GNU General Public License v3 or later (GPLv3+)
Classifier: Natural Language :: Bulgarian
Classifier: Natural Language :: Catalan
Classifier: Natural Language :: Czech
diff --git a/doc/index.rst b/doc/index.rst
index f8c5136..07eb9ce 100644
--- a/doc/index.rst
+++ b/doc/index.rst
@@ -9,7 +9,7 @@ The credential for the webservice is specified by the following fields:
UPS Carrier Credential
**********************
-This model allows to define the credential used to connect the the UPS API.
+This model allows to define the credential used to connect the UPS API.
The credentials used to connect to the UPS API will be automatically retrieved
based on the company of the Shipment.
diff --git a/locale/pt_BR.po b/locale/pt_BR.po
index ca54c13..94e1275 100644
--- a/locale/pt_BR.po
+++ b/locale/pt_BR.po
@@ -4,7 +4,7 @@ msgstr "Content-Type: text/plain; charset=utf-8\n"
msgctxt "error:stock.shipment.create_shipping.ups:"
msgid "Shipment \"%(shipment)s\" already has a reference number."
-msgstr ""
+msgstr "O Envio \"%(shipment)s\" já possui número de referência."
msgctxt "error:stock.shipment.create_shipping.ups:"
msgid ""
@@ -12,130 +12,122 @@ msgid ""
"\n"
"%(message)s"
msgstr ""
+"A chamada ao serviço web UPS falhou com a seguinte mensagem:\n"
+"\n"
+"%(message)s"
msgctxt "error:stock.shipment.out:"
msgid "A phone number is required for party \"%(party)s\"."
-msgstr ""
+msgstr "Um número de telefone é necessário para a pessoa \"%(party)s\"."
msgctxt "error:stock.shipment.out:"
msgid "A shipping description is required for shipment \"%(shipment)s\"."
-msgstr ""
+msgstr "É necessária uma descrição de remessa para o envio \"%(shipment)s\"."
msgctxt "field:carrier,ups_label_height:"
msgid "Label Height"
-msgstr ""
+msgstr "Altura da Etiqueta"
msgctxt "field:carrier,ups_label_image_format:"
msgid "Label Image Format"
-msgstr ""
+msgstr "Formato da Imagem da Etiqueta"
msgctxt "field:carrier,ups_service_type:"
msgid "Service Type"
-msgstr ""
+msgstr "Tipo de serviço"
-#, fuzzy
msgctxt "field:carrier.credential.ups,account_number:"
msgid "Account Number"
msgstr "Número da Conta"
-#, fuzzy
msgctxt "field:carrier.credential.ups,company:"
msgid "Company"
msgstr "Empresa"
-#, fuzzy
msgctxt "field:carrier.credential.ups,create_date:"
msgid "Create Date"
msgstr "Data de criação"
-#, fuzzy
msgctxt "field:carrier.credential.ups,create_uid:"
msgid "Create User"
-msgstr "Usuário de Criação"
+msgstr "Criado por"
-#, fuzzy
msgctxt "field:carrier.credential.ups,id:"
msgid "ID"
msgstr "ID"
msgctxt "field:carrier.credential.ups,license:"
msgid "License"
-msgstr ""
+msgstr "Licença"
-#, fuzzy
msgctxt "field:carrier.credential.ups,password:"
msgid "Password"
msgstr "Senha"
-#, fuzzy
msgctxt "field:carrier.credential.ups,rec_name:"
msgid "Name"
msgstr "Nome"
-#, fuzzy
msgctxt "field:carrier.credential.ups,server:"
msgid "Server"
msgstr "Servidor"
msgctxt "field:carrier.credential.ups,use_metric:"
msgid "Use Metric"
-msgstr ""
+msgstr "Usar Métrica"
msgctxt "field:carrier.credential.ups,user_id:"
msgid "User ID"
-msgstr ""
+msgstr "ID de usuário"
-#, fuzzy
msgctxt "field:carrier.credential.ups,write_date:"
msgid "Write Date"
-msgstr "Editado por"
+msgstr "Data de edição"
-#, fuzzy
msgctxt "field:carrier.credential.ups,write_uid:"
msgid "Write User"
-msgstr "Gravado por"
+msgstr "Editado por"
msgctxt "field:stock.package.type,ups_code:"
msgid "UPS Code"
-msgstr ""
+msgstr "Código UPS"
msgctxt "model:carrier.credential.ups,name:"
msgid "UPS Credential"
-msgstr ""
+msgstr "Credencial UPS"
msgctxt "model:ir.action,name:act_create_shipping_ups_wizard"
msgid "Create UPS Shipping for Packages"
-msgstr ""
+msgstr "Criar Envio UPS para Pacotes"
msgctxt "model:ir.action,name:act_ups_credential_form"
msgid "UPS Credentials"
-msgstr ""
+msgstr "Credenciais UPS"
msgctxt "model:ir.ui.menu,name:menu_ups_credential_form"
msgid "UPS Credentials"
-msgstr ""
+msgstr "Credenciais UPS"
msgctxt "selection:carrier,shipping_service:"
msgid "UPS"
-msgstr ""
+msgstr "UPS"
-#, fuzzy
msgctxt "selection:carrier.credential.ups,server:"
msgid "Production"
msgstr "Produção"
msgctxt "selection:carrier.credential.ups,server:"
msgid "Testing"
-msgstr ""
+msgstr "Testando"
msgctxt "view:carrier.credential.ups:"
msgid "Credential Informations"
-msgstr ""
+msgstr "Informações da Credencial"
msgctxt "view:carrier:"
msgid "UPS"
-msgstr ""
+msgstr "UPS"
msgctxt "view:stock.package.type:"
msgid "UPS"
-msgstr ""
+msgstr "UPS"
diff --git a/locale/sl.po b/locale/sl.po
index 5bc534f..84942ca 100644
--- a/locale/sl.po
+++ b/locale/sl.po
@@ -4,7 +4,7 @@ msgstr "Content-Type: text/plain; charset=utf-8\n"
msgctxt "error:stock.shipment.create_shipping.ups:"
msgid "Shipment \"%(shipment)s\" already has a reference number."
-msgstr ""
+msgstr "Pošiljka \"%(shipment)s\" že ima sklicno številko."
msgctxt "error:stock.shipment.create_shipping.ups:"
msgid ""
@@ -12,57 +12,54 @@ msgid ""
"\n"
"%(message)s"
msgstr ""
+"Sporočilo napake pri klicu UPS spletne storitve:\n"
+"\n"
+"%(message)s"
msgctxt "error:stock.shipment.out:"
msgid "A phone number is required for party \"%(party)s\"."
-msgstr ""
+msgstr "Pri partnerju \"%(party)s\" je telefonska številka obvezna."
msgctxt "error:stock.shipment.out:"
msgid "A shipping description is required for shipment \"%(shipment)s\"."
-msgstr ""
+msgstr "Za pošiljko \"%(shipment)s\" je opis pošiljke obvezen."
msgctxt "field:carrier,ups_label_height:"
msgid "Label Height"
-msgstr ""
+msgstr "Velikost nalepke"
msgctxt "field:carrier,ups_label_image_format:"
msgid "Label Image Format"
-msgstr ""
+msgstr "Format nalepke"
msgctxt "field:carrier,ups_service_type:"
msgid "Service Type"
-msgstr ""
+msgstr "Vrsta storitve"
-#, fuzzy
msgctxt "field:carrier.credential.ups,account_number:"
msgid "Account Number"
-msgstr "Bančni račun"
+msgstr "Številka računa"
-#, fuzzy
msgctxt "field:carrier.credential.ups,company:"
msgid "Company"
msgstr "Družba"
-#, fuzzy
msgctxt "field:carrier.credential.ups,create_date:"
msgid "Create Date"
msgstr "Izdelano"
-#, fuzzy
msgctxt "field:carrier.credential.ups,create_uid:"
msgid "Create User"
msgstr "Izdelal"
-#, fuzzy
msgctxt "field:carrier.credential.ups,id:"
msgid "ID"
msgstr "ID"
msgctxt "field:carrier.credential.ups,license:"
msgid "License"
-msgstr ""
+msgstr "Dovoljenje"
-#, fuzzy
msgctxt "field:carrier.credential.ups,password:"
msgid "Password"
msgstr "Geslo"
@@ -71,48 +68,45 @@ msgctxt "field:carrier.credential.ups,rec_name:"
msgid "Name"
msgstr "Ime"
-#, fuzzy
msgctxt "field:carrier.credential.ups,server:"
msgid "Server"
msgstr "Strežnik"
msgctxt "field:carrier.credential.ups,use_metric:"
msgid "Use Metric"
-msgstr ""
+msgstr "Metrični sistem"
msgctxt "field:carrier.credential.ups,user_id:"
msgid "User ID"
-msgstr ""
+msgstr "Uporabnikov ID"
-#, fuzzy
msgctxt "field:carrier.credential.ups,write_date:"
msgid "Write Date"
msgstr "Zapisano"
-#, fuzzy
msgctxt "field:carrier.credential.ups,write_uid:"
msgid "Write User"
msgstr "Zapisal"
msgctxt "field:stock.package.type,ups_code:"
msgid "UPS Code"
-msgstr ""
+msgstr "UPS Šifra"
msgctxt "model:carrier.credential.ups,name:"
msgid "UPS Credential"
-msgstr ""
+msgstr "UPS prijava"
msgctxt "model:ir.action,name:act_create_shipping_ups_wizard"
msgid "Create UPS Shipping for Packages"
-msgstr ""
+msgstr "Izdelava UPS paketne dostave"
msgctxt "model:ir.action,name:act_ups_credential_form"
msgid "UPS Credentials"
-msgstr ""
+msgstr "UPS prijava"
msgctxt "model:ir.ui.menu,name:menu_ups_credential_form"
msgid "UPS Credentials"
-msgstr ""
+msgstr "UPS prijava"
msgctxt "selection:carrier,shipping_service:"
msgid "UPS"
@@ -128,11 +122,11 @@ msgstr "Preizkusni"
msgctxt "view:carrier.credential.ups:"
msgid "Credential Informations"
-msgstr ""
+msgstr "Prijava"
msgctxt "view:carrier:"
msgid "UPS"
-msgstr ""
+msgstr "UPS"
msgctxt "view:stock.package.type:"
msgid "UPS"
diff --git a/setup.py b/setup.py
index 3ac1682..a38e538 100644
--- a/setup.py
+++ b/setup.py
@@ -85,7 +85,7 @@ setup(name=name,
'Intended Audience :: Developers',
'Intended Audience :: Financial and Insurance Industry',
'Intended Audience :: Legal Industry',
- 'License :: OSI Approved :: GNU General Public License (GPL)',
+ 'License :: OSI Approved :: GNU General Public License v3 or later (GPLv3+)',
'Natural Language :: Bulgarian',
'Natural Language :: Catalan',
'Natural Language :: Czech',
diff --git a/stock.py b/stock.py
index 28f6b30..2e01bee 100644
--- a/stock.py
+++ b/stock.py
@@ -242,12 +242,9 @@ class CreateShippingUPS(Wizard):
}
def get_shipping_party(self, party, address):
- assert party == address.party
-
shipping_party = {
'Name': party.name[:35],
- 'AttentionName': (address.name[:35]
- if address.name else party.name[:35]),
+ 'AttentionName': party.name[:35],
'Address': {
'AddressLine': (address.street or '').splitlines(),
'City': address.city,
@@ -309,7 +306,7 @@ class CreateShippingUPS(Wizard):
'UnitOfMeasurement': {
'Code': 'KGS' if use_metric else 'LBS',
},
- 'Weight': str(UoM.compute_qty(kg, package.weight,
+ 'Weight': str(UoM.compute_qty(kg, package.total_weight,
kg if use_metric else lb)),
},
}
diff --git a/tryton.cfg b/tryton.cfg
index 0b7d53c..355a588 100644
--- a/tryton.cfg
+++ b/tryton.cfg
@@ -1,11 +1,12 @@
[tryton]
-version=4.2.0
+version=4.4.0
depends:
ir
res
party
product
stock
+ stock_shipment_measurements
stock_package
stock_package_shipping
xml:
diff --git a/trytond_stock_package_shipping_ups.egg-info/PKG-INFO b/trytond_stock_package_shipping_ups.egg-info/PKG-INFO
index 632e7a3..6262dc7 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.2.0
+Version: 4.4.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.2/
+Download-URL: http://downloads.tryton.org/4.4/
Description: trytond_stock_package_shipping_ups
==================================
@@ -62,7 +62,7 @@ Classifier: Framework :: Tryton
Classifier: Intended Audience :: Developers
Classifier: Intended Audience :: Financial and Insurance Industry
Classifier: Intended Audience :: Legal Industry
-Classifier: License :: OSI Approved :: GNU General Public License (GPL)
+Classifier: License :: OSI Approved :: GNU General Public License v3 or later (GPLv3+)
Classifier: Natural Language :: Bulgarian
Classifier: Natural Language :: Catalan
Classifier: Natural Language :: Czech
diff --git a/trytond_stock_package_shipping_ups.egg-info/requires.txt b/trytond_stock_package_shipping_ups.egg-info/requires.txt
index 1730e10..96d266d 100644
--- a/trytond_stock_package_shipping_ups.egg-info/requires.txt
+++ b/trytond_stock_package_shipping_ups.egg-info/requires.txt
@@ -1,7 +1,8 @@
requests
-trytond_party >= 4.2, < 4.3
-trytond_product >= 4.2, < 4.3
-trytond_stock >= 4.2, < 4.3
-trytond_stock_package >= 4.2, < 4.3
-trytond_stock_package_shipping >= 4.2, < 4.3
-trytond >= 4.2, < 4.3
+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
--
tryton-modules-stock-package-shipping-ups
More information about the tryton-debian-vcs
mailing list