[tryton-debian-vcs] tryton-modules-stock-package-shipping-dpd branch upstream updated. upstream/4.2.0-1-gf0effe8
Mathias Behrle
tryton-debian-vcs at alioth.debian.org
Wed Jun 7 13:37:01 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-dpd.git;a=commitdiff;h=upstream/4.2.0-1-gf0effe8
commit f0effe8c594fe27917961d182a560415a17ec83e
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Wed Jun 7 15:27:04 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 a6d8107..b04d16a 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/)
* zeep (http://www.python-zeep.org/)
* PyPDF2 (https://mstamy2.github.io/PyPDF2/)
diff --git a/PKG-INFO b/PKG-INFO
index 6a1e497..a723bbc 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,12 +1,12 @@
Metadata-Version: 1.1
Name: trytond_stock_package_shipping_dpd
-Version: 4.2.0
+Version: 4.4.0
Summary: DPD connector for the Tryton application platform
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_dpd
==================================
@@ -57,7 +57,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 4d8d591..402e22a 100644
--- a/doc/index.rst
+++ b/doc/index.rst
@@ -3,6 +3,9 @@ Stock Package Shipping DPD Module
The Stock Package Shipping DPD module allows you to generate the DPD label
using the DPD webservices.
+DPD has many different web services, the module supports:
+
+- `public-ws.dpd.com`
Carrier Credential
******************
diff --git a/locale/pt_BR.po b/locale/pt_BR.po
index 409b984..2882284 100644
--- a/locale/pt_BR.po
+++ b/locale/pt_BR.po
@@ -8,6 +8,9 @@ msgid ""
"\n"
"%(message)s"
msgstr ""
+"A chamada ao serviço web DPD falhou com a mensagem de erro:\n"
+"\n"
+"%(message)s"
msgctxt "error:stock.shipment.create_shipping.dpd:"
msgid ""
@@ -15,101 +18,94 @@ msgid ""
"\n"
"%(message)s"
msgstr ""
+"A chamada ao serviço web DPD falhou com a mensagem de erro:\n"
+"\n"
+"%(message)s"
msgctxt "error:stock.shipment.create_shipping.dpd:"
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.out:"
msgid "An address is required for warehouse \"%(warehouse)s\"."
-msgstr ""
+msgstr "É necessário um endereço para o almoxarifado \"%(warehouse)s\"."
-#, fuzzy
msgctxt "field:carrier.credential.dpd,company:"
msgid "Company"
msgstr "Empresa"
-#, fuzzy
msgctxt "field:carrier.credential.dpd,create_date:"
msgid "Create Date"
msgstr "Data de criação"
-#, fuzzy
msgctxt "field:carrier.credential.dpd,create_uid:"
msgid "Create User"
-msgstr "Usuário de Criação"
+msgstr "Criado por"
msgctxt "field:carrier.credential.dpd,depot:"
msgid "Depot"
-msgstr ""
+msgstr "Depósito"
-#, fuzzy
msgctxt "field:carrier.credential.dpd,id:"
msgid "ID"
msgstr "ID"
-#, fuzzy
msgctxt "field:carrier.credential.dpd,password:"
msgid "Password"
msgstr "Senha"
-#, fuzzy
msgctxt "field:carrier.credential.dpd,rec_name:"
msgid "Name"
msgstr "Nome"
-#, fuzzy
msgctxt "field:carrier.credential.dpd,server:"
msgid "Server"
msgstr "Servidor"
msgctxt "field:carrier.credential.dpd,token:"
msgid "Token"
-msgstr ""
+msgstr "Token:"
msgctxt "field:carrier.credential.dpd,user_id:"
msgid "User ID"
-msgstr ""
+msgstr "ID de usuário"
-#, fuzzy
msgctxt "field:carrier.credential.dpd,write_date:"
msgid "Write Date"
-msgstr "Editado por"
+msgstr "Data de edição"
-#, fuzzy
msgctxt "field:carrier.credential.dpd,write_uid:"
msgid "Write User"
-msgstr "Gravado por"
+msgstr "Editado por"
msgctxt "model:carrier.credential.dpd,name:"
msgid "DPD Credential"
-msgstr ""
+msgstr "Credencial DPD"
msgctxt "model:ir.action,name:act_create_shipping_dpd_wizard"
msgid "Create DPD Shipping for Packages"
-msgstr ""
+msgstr "Criar Envio DPD para Pacotes"
msgctxt "model:ir.action,name:act_dpd_credential_form"
msgid "DPD Credentials"
-msgstr ""
+msgstr "Credenciais DPD"
msgctxt "model:ir.ui.menu,name:menu_dpd_credential_form"
msgid "DPD Credentials"
-msgstr ""
+msgstr "Credenciais DPD"
msgctxt "selection:carrier,shipping_service:"
msgid "DPD"
-msgstr ""
+msgstr "DPD"
-#, fuzzy
msgctxt "selection:carrier.credential.dpd,server:"
msgid "Production"
msgstr "Produção"
msgctxt "selection:carrier.credential.dpd,server:"
msgid "Testing"
-msgstr ""
+msgstr "Testando"
msgctxt "view:carrier.credential.dpd:"
msgid "Credential Informations"
-msgstr ""
+msgstr "Informações da Credencial"
diff --git a/locale/sl.po b/locale/sl.po
index 543b59e..f8697b8 100644
--- a/locale/sl.po
+++ b/locale/sl.po
@@ -18,40 +18,38 @@ msgid ""
"\n"
"%(message)s"
msgstr ""
+"Sporočilo napake pri klicu DPD spletne storitve:\n"
+"\n"
+"%(message)s"
msgctxt "error:stock.shipment.create_shipping.dpd:"
msgid "Shipment \"%(shipment)s\" already has a reference number."
-msgstr ""
+msgstr "Pošiljka \"%(shipment)s\" že ima sklicno številko."
msgctxt "error:stock.shipment.out:"
msgid "An address is required for warehouse \"%(warehouse)s\"."
-msgstr ""
+msgstr "Za skladišče \"%(warehouse)s\" je naslov obvezen."
-#, fuzzy
msgctxt "field:carrier.credential.dpd,company:"
msgid "Company"
msgstr "Družba"
-#, fuzzy
msgctxt "field:carrier.credential.dpd,create_date:"
msgid "Create Date"
msgstr "Izdelano"
-#, fuzzy
msgctxt "field:carrier.credential.dpd,create_uid:"
msgid "Create User"
msgstr "Izdelal"
msgctxt "field:carrier.credential.dpd,depot:"
msgid "Depot"
-msgstr ""
+msgstr "Skladišče"
-#, fuzzy
msgctxt "field:carrier.credential.dpd,id:"
msgid "ID"
msgstr "ID"
-#, fuzzy
msgctxt "field:carrier.credential.dpd,password:"
msgid "Password"
msgstr "Geslo"
@@ -60,7 +58,6 @@ msgctxt "field:carrier.credential.dpd,rec_name:"
msgid "Name"
msgstr "Ime"
-#, fuzzy
msgctxt "field:carrier.credential.dpd,server:"
msgid "Server"
msgstr "Strežnik"
@@ -73,12 +70,10 @@ msgctxt "field:carrier.credential.dpd,user_id:"
msgid "User ID"
msgstr "Uporabnik"
-#, fuzzy
msgctxt "field:carrier.credential.dpd,write_date:"
msgid "Write Date"
msgstr "Zapisano"
-#, fuzzy
msgctxt "field:carrier.credential.dpd,write_uid:"
msgid "Write User"
msgstr "Zapisal"
diff --git a/setup.py b/setup.py
index f676e92..80f66ba 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 5ae371f..69626ee 100644
--- a/stock.py
+++ b/stock.py
@@ -173,7 +173,6 @@ class CreateDPDShipping(Wizard):
return {
'printerLanguage': 'PDF',
'paperFormat': 'A6',
- 'startPosition': 'UPPER_LEFT',
}
def shipping_party(self, party, address):
@@ -208,7 +207,7 @@ class CreateDPDShipping(Wizard):
parcel = {
'customerReferenceNumber1': package.code,
- 'weight': int(package.weight * 10) * 10
+ 'weight': int(package.total_weight * 10) * 10
}
length = UoM.compute_qty(
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_dpd.egg-info/PKG-INFO b/trytond_stock_package_shipping_dpd.egg-info/PKG-INFO
index 102a7c9..7ff4e14 100644
--- a/trytond_stock_package_shipping_dpd.egg-info/PKG-INFO
+++ b/trytond_stock_package_shipping_dpd.egg-info/PKG-INFO
@@ -1,12 +1,12 @@
Metadata-Version: 1.1
Name: trytond-stock-package-shipping-dpd
-Version: 4.2.0
+Version: 4.4.0
Summary: DPD connector for the Tryton application platform
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_dpd
==================================
@@ -57,7 +57,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_dpd.egg-info/requires.txt b/trytond_stock_package_shipping_dpd.egg-info/requires.txt
index a54fcb3..f6524f1 100644
--- a/trytond_stock_package_shipping_dpd.egg-info/requires.txt
+++ b/trytond_stock_package_shipping_dpd.egg-info/requires.txt
@@ -1,8 +1,9 @@
zeep >= 0.12
PyPDF2
-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-dpd
More information about the tryton-debian-vcs
mailing list