[tryton-commits] changeset in modules/stock_package_shipping_sendcloud:default In...

2022-10-31 Thread Cédric Krier
changeset 246aa6831760 in modules/stock_package_shipping_sendcloud:default
details: 
https://hg.tryton.org/modules/stock_package_shipping_sendcloud?cmd=changeset=246aa6831760
description:
Increase version number
diffstat:

 tryton.cfg |  2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diffs (10 lines):

diff -r 6dfae082ca03 -r 246aa6831760 tryton.cfg
--- a/tryton.cfgMon Oct 31 17:32:09 2022 +0100
+++ b/tryton.cfgMon Oct 31 17:32:20 2022 +0100
@@ -1,5 +1,5 @@
 [tryton]
-version=6.6.0
+version=6.7.0
 depends:
 carrier
 company



[tryton-commits] changeset in modules/stock_package_shipping_sendcloud:default Ad...

2022-10-31 Thread Cédric Krier
changeset 6dfae082ca03 in modules/stock_package_shipping_sendcloud:default
details: 
https://hg.tryton.org/modules/stock_package_shipping_sendcloud?cmd=changeset=6dfae082ca03
description:
Add tag 6.6.0 [skip ci]
diffstat:

 .hgtags |  1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diffs (7 lines):

diff -r 086fa4d627bd -r 6dfae082ca03 .hgtags
--- a/.hgtags   Mon Oct 31 17:32:09 2022 +0100
+++ b/.hgtags   Mon Oct 31 17:32:09 2022 +0100
@@ -1,2 +1,3 @@
 7bdde48affeaf205d5698d453b5ae136c8dcf69a 6.2.0
 85f567bf416a2e725f88c9e68f11cec2fb97ba53 6.4.0
+086fa4d627bd13cea36e72e923ae18e7b387fe12 6.6.0



[tryton-commits] changeset in modules/stock_package_shipping_sendcloud:default Pr...

2022-10-31 Thread Cédric Krier
changeset 086fa4d627bd in modules/stock_package_shipping_sendcloud:default
details: 
https://hg.tryton.org/modules/stock_package_shipping_sendcloud?cmd=changeset=086fa4d627bd
description:
Prepare release 6.6.0 [skip ci]
diffstat:

 CHANGELOG  |  3 +++
 tryton.cfg |  2 +-
 2 files changed, 4 insertions(+), 1 deletions(-)

diffs (20 lines):

diff -r 80a9c9867d54 -r 086fa4d627bd CHANGELOG
--- a/CHANGELOG Mon Oct 31 16:16:19 2022 +0100
+++ b/CHANGELOG Mon Oct 31 17:32:09 2022 +0100
@@ -1,3 +1,6 @@
+Version 6.6.0 - 2022-10-31
+--
+* Bug fixes (see mercurial logs for details)
 * Use contact mechanism from address
 
 Version 6.4.0 - 2022-05-02
diff -r 80a9c9867d54 -r 086fa4d627bd tryton.cfg
--- a/tryton.cfgMon Oct 31 16:16:19 2022 +0100
+++ b/tryton.cfgMon Oct 31 17:32:09 2022 +0100
@@ -1,5 +1,5 @@
 [tryton]
-version=6.5.0
+version=6.6.0
 depends:
 carrier
 company



[tryton-commits] changeset in modules/stock_package_shipping_sendcloud:default Us...

2022-10-31 Thread Cédric Krier
changeset 80a9c9867d54 in modules/stock_package_shipping_sendcloud:default
details: 
https://hg.tryton.org/modules/stock_package_shipping_sendcloud?cmd=changeset=80a9c9867d54
description:
Use ** to match directories for coverage 6.6.0b1 [skip ci]

issue11844
diffstat:

 tox.ini |  4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diffs (14 lines):

diff -r ded605ecd2e7 -r 80a9c9867d54 tox.ini
--- a/tox.ini   Sat Oct 29 09:54:14 2022 +0200
+++ b/tox.ini   Mon Oct 31 16:16:19 2022 +0100
@@ -4,8 +4,8 @@
 [testenv]
 extras = test
 commands =
-coverage run --include=.*/stock_package_shipping_sendcloud/* -m unittest 
discover -s tests
-coverage report --include=.*/stock_package_shipping_sendcloud/* 
--omit=*/tests/*
+coverage run --include=./**/stock_package_shipping_sendcloud/* -m unittest 
discover -s tests
+coverage report --include=./**/stock_package_shipping_sendcloud/* 
--omit=*/tests/*
 deps =
 coverage
 postgresql: psycopg2 >= 2.7.0



[tryton-commits] changeset in modules/stock_package_shipping_sendcloud:default Up...

2022-10-29 Thread Cédric Krier
changeset ded605ecd2e7 in modules/stock_package_shipping_sendcloud:default
details: 
https://hg.tryton.org/modules/stock_package_shipping_sendcloud?cmd=changeset=ded605ecd2e7
description:
Update translations [skip ci]
diffstat:

 locale/id.po |4 +-
 locale/it.po |   60 ++-
 locale/uk.po |  127 +++
 3 files changed, 161 insertions(+), 30 deletions(-)

diffs (312 lines):

diff -r 8da356a6fc28 -r ded605ecd2e7 locale/id.po
--- a/locale/id.po  Sat Oct 29 09:38:10 2022 +0200
+++ b/locale/id.po  Sat Oct 29 09:54:14 2022 +0200
@@ -12,7 +12,7 @@
 
 msgctxt "field:carrier.credential.sendcloud,company:"
 msgid "Company"
-msgstr ""
+msgstr "Perusahaan"
 
 msgctxt "field:carrier.credential.sendcloud,public_key:"
 msgid "Public Key"
@@ -28,7 +28,7 @@
 
 msgctxt "field:carrier.sendcloud.address,address:"
 msgid "Address"
-msgstr ""
+msgstr "Alamat"
 
 msgctxt "field:carrier.sendcloud.address,sendcloud:"
 msgid "Sendcloud"
diff -r 8da356a6fc28 -r ded605ecd2e7 locale/it.po
--- a/locale/it.po  Sat Oct 29 09:38:10 2022 +0200
+++ b/locale/it.po  Sat Oct 29 09:54:14 2022 +0200
@@ -4,124 +4,128 @@
 
 msgctxt "field:carrier,sendcloud_format:"
 msgid "Format"
-msgstr ""
+msgstr "Formato"
 
 msgctxt "field:carrier.credential.sendcloud,addresses:"
 msgid "Addresses"
-msgstr ""
+msgstr "Indirizzi"
 
 msgctxt "field:carrier.credential.sendcloud,company:"
 msgid "Company"
-msgstr ""
+msgstr "Azienda"
 
 msgctxt "field:carrier.credential.sendcloud,public_key:"
 msgid "Public Key"
-msgstr ""
+msgstr "Chiave pubblica"
 
 msgctxt "field:carrier.credential.sendcloud,secret_key:"
 msgid "Secret Key"
-msgstr ""
+msgstr "Chiave segreta"
 
 msgctxt "field:carrier.credential.sendcloud,shipping_methods:"
 msgid "Methods"
-msgstr ""
+msgstr "Metodi"
 
 msgctxt "field:carrier.sendcloud.address,address:"
 msgid "Address"
-msgstr ""
+msgstr "Indirizzo"
 
 msgctxt "field:carrier.sendcloud.address,sendcloud:"
 msgid "Sendcloud"
-msgstr ""
+msgstr "Sendcloud"
 
 msgctxt "field:carrier.sendcloud.address,warehouse:"
 msgid "Warehouse"
-msgstr ""
+msgstr "Magazzino"
 
 msgctxt "field:carrier.sendcloud.shipping_method,carrier:"
 msgid "Carrier"
-msgstr ""
+msgstr "Vettore"
 
 msgctxt "field:carrier.sendcloud.shipping_method,sendcloud:"
 msgid "Sendcloud"
-msgstr ""
+msgstr "Sendcloud"
 
 msgctxt "field:carrier.sendcloud.shipping_method,shipping_method:"
 msgid "Shipping Method"
-msgstr ""
+msgstr "Metodo di spedizione"
 
 msgctxt "field:stock.package,sendcloud_shipping_id:"
 msgid "ID"
-msgstr ""
+msgstr "ID"
 
 msgctxt "field:stock.package,sendcloud_shipping_tracking_url:"
 msgid "Tracking URL"
-msgstr ""
+msgstr "URL di tracciamento"
 
 msgctxt "help:carrier.sendcloud.address,address:"
 msgid "Leave empty for the Sendcloud default."
-msgstr ""
+msgstr "Lascia vuoto per l'impostazione predefinita di Sendcloud."
 
 msgctxt "model:carrier.credential.sendcloud,name:"
 msgid "Sendcloud Credential"
-msgstr ""
+msgstr "Credenziali Sendcloud"
 
 msgctxt "model:carrier.sendcloud.address,name:"
 msgid "Sendcloud Address"
-msgstr ""
+msgstr "Indirizzo Sendcloud"
 
 msgctxt "model:carrier.sendcloud.shipping_method,name:"
 msgid "Sendcloud Shipping Method"
-msgstr ""
+msgstr "Metodo di spedizione Sendcloud"
 
 msgctxt "model:ir.action,name:act_create_shipping_wizard"
 msgid "Create Sendcloud Shipping for Packages"
-msgstr ""
+msgstr "Crea spedizione Sendcloud per i pacchi"
 
 msgctxt "model:ir.action,name:act_credential_form"
 msgid "Sendcloud Credentials"
-msgstr ""
+msgstr "Credenziali Sendcloud"
 
 msgctxt "model:ir.message,text:msg_sendcloud_webserver_error"
 msgid ""
 "Sendcloud webservice call failed with the following error message:\n"
 "%(message)s"
 msgstr ""
+"La chiamata al servizio web Sendcloud non è fallita con il seguente messaggio 
di errore:\n"
+"%(message)s"
 
 msgctxt "model:ir.message,text:msg_shipment_has_reference_number"
 msgid ""
 "You cannot create a shipping label for shipment \"%(shipment)s\" because it "
 "already has a reference number."
 msgstr ""
+"Non puoi creare un'etichetta di spedizione per la spedizione "
+"\"%(shipment)s\" perché ha già un numero di riferimento."
 
 msgctxt "model:ir.ui.menu,name:menu_credential_form"
 msgid "Sendcloud Credentials"
-msgstr ""
+msgstr "Credenziali Sendcloud"
 
 msgctxt "selection:carrier,sendcloud_format:"
 msgid "A4 - Bottom left"
-msgstr ""
+msgstr "A4 - In basso a sinistra"
 
 msgctxt "selection:carrier,sendcloud_format:"
 msgid "A4 - Bottom right"
-msgstr ""
+msgstr "A4 - In basso a destra"
 
 msgctxt "selection:carrier,sendcloud_format:"
 msgid "A4 - Top left"
-msgstr ""
+msgstr "A4 - In alto a sinistra"
 
 msgctxt "selection:carrier,sendcloud_format:"
 msgid "A4 - Top right"
-msgstr ""
+msgstr "A4 - In alto a destra"
 
 msgctxt "selection:carrier,sendcloud_format:"
 msgid "A6 - Full page"
-msgstr ""
+msgstr "A6 - Pagina intera"
 
 msgctxt "selection:carrier,shipping_service:"
 msgid 

[tryton-commits] changeset in modules/stock_package_shipping_sendcloud:default Ad...

2022-10-29 Thread Cédric Krier
changeset 8da356a6fc28 in modules/stock_package_shipping_sendcloud:default
details: 
https://hg.tryton.org/modules/stock_package_shipping_sendcloud?cmd=changeset=8da356a6fc28
description:
Add Ukrainian [skip ci]

issue11449
review413281003
diffstat:

 setup.py |  1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diffs (11 lines):

diff -r 5283fa09459b -r 8da356a6fc28 setup.py
--- a/setup.py  Thu Oct 27 13:24:21 2022 +0200
+++ b/setup.py  Sat Oct 29 09:38:10 2022 +0200
@@ -138,6 +138,7 @@
 'Natural Language :: Slovenian',
 'Natural Language :: Spanish',
 'Natural Language :: Turkish',
+'Natural Language :: Ukrainian',
 'Operating System :: OS Independent',
 'Programming Language :: Python :: 3',
 'Programming Language :: Python :: 3.7',



[tryton-commits] changeset in modules/stock_package_shipping_sendcloud:default Pu...

2022-10-27 Thread Cédric Krier
changeset 5283fa09459b in modules/stock_package_shipping_sendcloud:default
details: 
https://hg.tryton.org/modules/stock_package_shipping_sendcloud?cmd=changeset=5283fa09459b
description:
Publish changelog in the documentation

issue11805
review431781003
diffstat:

 CHANGELOG|  2 ++
 doc/index.rst|  1 +
 doc/releases.rst |  7 +++
 3 files changed, 10 insertions(+), 0 deletions(-)

diffs (34 lines):

diff -r dd8f97e409f7 -r 5283fa09459b CHANGELOG
--- a/CHANGELOG Sun Oct 16 14:14:12 2022 +0200
+++ b/CHANGELOG Thu Oct 27 13:24:21 2022 +0200
@@ -1,9 +1,11 @@
 * Use contact mechanism from address
 
 Version 6.4.0 - 2022-05-02
+--
 * Bug fixes (see mercurial logs for details)
 * Add support for Python 3.10
 * Remove support for Python 3.6
 
 Version 6.2.0 - 2021-11-01
+--
 * Initial release
diff -r dd8f97e409f7 -r 5283fa09459b doc/index.rst
--- a/doc/index.rst Sun Oct 16 14:14:12 2022 +0200
+++ b/doc/index.rst Thu Oct 27 13:24:21 2022 +0200
@@ -11,3 +11,4 @@
 
configuration
design
+   releases
diff -r dd8f97e409f7 -r 5283fa09459b doc/releases.rst
--- /dev/null   Thu Jan 01 00:00:00 1970 +
+++ b/doc/releases.rst  Thu Oct 27 13:24:21 2022 +0200
@@ -0,0 +1,7 @@
+.. _releases-index:
+
+=
+Release notes
+=
+
+.. include:: ../CHANGELOG



[tryton-commits] changeset in modules/stock_package_shipping_sendcloud:default Gr...

2022-10-16 Thread Cédric Krier
changeset dd8f97e409f7 in modules/stock_package_shipping_sendcloud:default
details: 
https://hg.tryton.org/modules/stock_package_shipping_sendcloud?cmd=changeset=dd8f97e409f7
description:
Graft doc and include icon license

issue11495
diffstat:

 MANIFEST.in |  1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diffs (9 lines):

diff -r 8e58c6c8a4f8 -r dd8f97e409f7 MANIFEST.in
--- a/MANIFEST.in   Sat Oct 01 14:52:06 2022 +0200
+++ b/MANIFEST.in   Sun Oct 16 14:14:12 2022 +0200
@@ -2,4 +2,5 @@
 include COPYRIGHT
 include LICENSE
 include README.rst
+include icons/LICENSE
 graft doc



[tryton-commits] changeset in modules/stock_package_shipping_sendcloud:default Ad...

2022-10-01 Thread Cédric Krier
changeset 8e58c6c8a4f8 in modules/stock_package_shipping_sendcloud:default
details: 
https://hg.tryton.org/modules/stock_package_shipping_sendcloud?cmd=changeset=8e58c6c8a4f8
description:
Add optional address to contact mechanism

issue11705
review421691006
diffstat:

 CHANGELOG |  2 ++
 stock.py  |  4 ++--
 2 files changed, 4 insertions(+), 2 deletions(-)

diffs (24 lines):

diff -r be45a89c656a -r 8e58c6c8a4f8 CHANGELOG
--- a/CHANGELOG Sun Sep 25 20:27:25 2022 +0200
+++ b/CHANGELOG Sat Oct 01 14:52:06 2022 +0200
@@ -1,3 +1,5 @@
+* Use contact mechanism from address
+
 Version 6.4.0 - 2022-05-02
 * Bug fixes (see mercurial logs for details)
 * Add support for Python 3.10
diff -r be45a89c656a -r 8e58c6c8a4f8 stock.py
--- a/stock.py  Sun Sep 25 20:27:25 2022 +0200
+++ b/stock.py  Sat Oct 01 14:52:06 2022 +0200
@@ -147,9 +147,9 @@
 cm = UoM(ModelData.get_id('product', 'uom_centimeter'))
 party = shipment.shipping_to
 address = shipment.shipping_to_address
-phone = party.contact_mechanism_get(
+phone = address.contact_mechanism_get(
 {'phone', 'mobile'}, usage=usage)
-email = party.contact_mechanism_get('email', usage=usage)
+email = address.contact_mechanism_get('email', usage=usage)
 street_lines = (address.street or '').splitlines()
 parcel = {
 'name': address.party_full_name,



[tryton-commits] changeset in modules/stock_package_shipping_sendcloud:default Do...

2022-09-25 Thread Cédric Krier
changeset be45a89c656a in modules/stock_package_shipping_sendcloud:default
details: 
https://hg.tryton.org/modules/stock_package_shipping_sendcloud?cmd=changeset=be45a89c656a
description:
Do not use international shipping in test scenario

issue11718
review423881003
diffstat:

 tests/scenario_stock_package_shipping_sendcloud.rst |  24 ++--
 1 files changed, 12 insertions(+), 12 deletions(-)

diffs (40 lines):

diff -r 935edca4f028 -r be45a89c656a 
tests/scenario_stock_package_shipping_sendcloud.rst
--- a/tests/scenario_stock_package_shipping_sendcloud.rst   Mon Sep 19 
21:25:55 2022 +0200
+++ b/tests/scenario_stock_package_shipping_sendcloud.rst   Sun Sep 25 
20:27:25 2022 +0200
@@ -71,24 +71,24 @@
 
 >>> belgium = Country(code='BE', name='Belgium')
 >>> belgium.save()
->>> britain = Country(code='GB', name='Great Britain')
->>> subdivision = britain.subdivisions.new()
->>> subdivision.name = "Liverpool"
->>> subdivision.code = 'GB-LIV'
->>> subdivision.type = 'metropolitan district'
->>> britain.save()
+>>> france = Country(code='FR', name='France')
+>>> subdivision = france.subdivisions.new()
+>>> subdivision.name = "Paris"
+>>> subdivision.code = 'FR-75'
+>>> subdivision.type = 'metropolitan department'
+>>> france.save()
 >>> customer = Party(name='Customer')
 >>> customer.save()
 >>> customer_address = customer.addresses.new()
->>> customer_address.street = 'Anfield Road'
->>> customer_address.postal_code = 'L40TH'
->>> customer_address.city = 'Liverpool'
->>> customer_address.country = britain
->>> customer_address.subdivision = britain.subdivisions[0]
+>>> customer_address.street = 'Champs élysées'
+>>> customer_address.postal_code = '75008'
+>>> customer_address.city = 'Paris'
+>>> customer_address.country = france
+>>> customer_address.subdivision = france.subdivisions[0]
 >>> customer_address.save()
 >>> customer_phone = customer.contact_mechanisms.new()
 >>> customer_phone.type = 'phone'
->>> customer_phone.value = '+44 151 260 6677'
+>>> customer_phone.value = '+33 93 842 8862'
 >>> customer_phone.save()
 
 Set the warehouse address::



[tryton-commits] changeset in modules/stock_package_shipping_sendcloud:default Ad...

2022-09-19 Thread Cédric Krier
changeset 935edca4f028 in modules/stock_package_shipping_sendcloud:default
details: 
https://hg.tryton.org/modules/stock_package_shipping_sendcloud?cmd=changeset=935edca4f028
description:
Add option to remove leading and trailing white spaces from char

issue7914
review340511008
diffstat:

 carrier.py |  4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diffs (14 lines):

diff -r e862349cecd1 -r 935edca4f028 carrier.py
--- a/carrier.pyWed Sep 14 09:01:32 2022 +0200
+++ b/carrier.pyMon Sep 19 21:25:55 2022 +0200
@@ -53,8 +53,8 @@
 __name__ = 'carrier.credential.sendcloud'
 
 company = fields.Many2One('company.company', "Company")
-public_key = fields.Char("Public Key", required=True)
-secret_key = fields.Char("Secret Key", required=True)
+public_key = fields.Char("Public Key", required=True, strip=False)
+secret_key = fields.Char("Secret Key", required=True, strip=False)
 
 addresses = fields.One2Many(
 'carrier.sendcloud.address', 'sendcloud', "Addresses",



[tryton-commits] changeset in modules/stock_package_shipping_sendcloud:default Re...

2022-09-14 Thread Cédric Krier
changeset e862349cecd1 in modules/stock_package_shipping_sendcloud:default
details: 
https://hg.tryton.org/modules/stock_package_shipping_sendcloud?cmd=changeset=e862349cecd1
description:
Remove excessive backquote in configuration documentation
diffstat:

 doc/configuration.rst |  12 ++--
 1 files changed, 6 insertions(+), 6 deletions(-)

diffs (36 lines):

diff -r 7cb25cafdbb6 -r e862349cecd1 doc/configuration.rst
--- a/doc/configuration.rst Mon May 02 17:59:54 2022 +0200
+++ b/doc/configuration.rst Wed Sep 14 09:01:32 2022 +0200
@@ -8,8 +8,8 @@
 
 .. _config-stock_package_shipping_sendcloud.addresses_cache:
 
-``addresses_cache```
-
+``addresses_cache``
+===
 
 The ``addresses_cache`` defines the duration in seconds the sender addresses
 are kept in the cache.
@@ -18,8 +18,8 @@
 
 .. _config-stock_package_shipping_sendcloud.shipping_methods_cache:
 
-```shipping_methods_cache```
-
+``shipping_methods_cache``
+==
 
 The ``shipping_methods_cache`` defines the duration in seconds the shipping
 methods are kept in the cache.
@@ -28,8 +28,8 @@
 
 .. _config-stock_package_shipping_sendcloud.requests_timeout:
 
-```requests_timeout```
-==
+``requests_timeout``
+
 
 The ``requests_timeout`` defines the time in seconds the module is waiting for
 a response from the Sendcloud server.



[tryton-commits] changeset in modules/stock_package_shipping_sendcloud:default In...

2022-05-02 Thread Cédric Krier
changeset 7cb25cafdbb6 in modules/stock_package_shipping_sendcloud:default
details: 
https://hg.tryton.org/modules/stock_package_shipping_sendcloud?cmd=changeset=7cb25cafdbb6
description:
Increase version number
diffstat:

 tryton.cfg |  2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diffs (10 lines):

diff -r ac92f657e81f -r 7cb25cafdbb6 tryton.cfg
--- a/tryton.cfgMon May 02 17:59:35 2022 +0200
+++ b/tryton.cfgMon May 02 17:59:54 2022 +0200
@@ -1,5 +1,5 @@
 [tryton]
-version=6.4.0
+version=6.5.0
 depends:
 carrier
 company



[tryton-commits] changeset in modules/stock_package_shipping_sendcloud:default Ad...

2022-05-02 Thread Cédric Krier
changeset ac92f657e81f in modules/stock_package_shipping_sendcloud:default
details: 
https://hg.tryton.org/modules/stock_package_shipping_sendcloud?cmd=changeset=ac92f657e81f
description:
Add tag 6.4.0 [skip ci]
diffstat:

 .hgtags |  1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diffs (6 lines):

diff -r 85f567bf416a -r ac92f657e81f .hgtags
--- a/.hgtags   Mon May 02 17:59:35 2022 +0200
+++ b/.hgtags   Mon May 02 17:59:35 2022 +0200
@@ -1,1 +1,2 @@
 7bdde48affeaf205d5698d453b5ae136c8dcf69a 6.2.0
+85f567bf416a2e725f88c9e68f11cec2fb97ba53 6.4.0



[tryton-commits] changeset in modules/stock_package_shipping_sendcloud:default Pr...

2022-05-02 Thread Cédric Krier
changeset 85f567bf416a in modules/stock_package_shipping_sendcloud:default
details: 
https://hg.tryton.org/modules/stock_package_shipping_sendcloud?cmd=changeset=85f567bf416a
description:
Prepare release 6.4.0 [skip ci]
diffstat:

 CHANGELOG  |  2 ++
 COPYRIGHT  |  4 ++--
 tryton.cfg |  2 +-
 3 files changed, 5 insertions(+), 3 deletions(-)

diffs (30 lines):

diff -r a37dad53ab6d -r 85f567bf416a CHANGELOG
--- a/CHANGELOG Mon Apr 25 18:34:07 2022 +0200
+++ b/CHANGELOG Mon May 02 17:59:35 2022 +0200
@@ -1,3 +1,5 @@
+Version 6.4.0 - 2022-05-02
+* Bug fixes (see mercurial logs for details)
 * Add support for Python 3.10
 * Remove support for Python 3.6
 
diff -r a37dad53ab6d -r 85f567bf416a COPYRIGHT
--- a/COPYRIGHT Mon Apr 25 18:34:07 2022 +0200
+++ b/COPYRIGHT Mon May 02 17:59:35 2022 +0200
@@ -1,5 +1,5 @@
-Copyright (C) 2021 B2CK
-Copyright (C) 2021 Cédric Krier
+Copyright (C) 2021-2022 B2CK
+Copyright (C) 2021-2022 Cédric Krier
 
 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 -r a37dad53ab6d -r 85f567bf416a tryton.cfg
--- a/tryton.cfgMon Apr 25 18:34:07 2022 +0200
+++ b/tryton.cfgMon May 02 17:59:35 2022 +0200
@@ -1,5 +1,5 @@
 [tryton]
-version=6.3.0
+version=6.4.0
 depends:
 carrier
 company



[tryton-commits] changeset in modules/stock_package_shipping_sendcloud:default Ch...

2022-04-25 Thread Cédric Krier
changeset a37dad53ab6d in modules/stock_package_shipping_sendcloud:default
details: 
https://hg.tryton.org/modules/stock_package_shipping_sendcloud?cmd=changeset=a37dad53ab6d
description:
Check links in documentation

issue11409
review390641002
diffstat:

 .drone.yml |  1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diffs (11 lines):

diff -r d8dc5ac2591e -r a37dad53ab6d .drone.yml
--- a/.drone.ymlMon Apr 25 18:11:20 2022 +0200
+++ b/.drone.ymlMon Apr 25 18:34:07 2022 +0200
@@ -37,6 +37,7 @@
 commands:
 - pip install sphinx
 - python -m sphinx -T -E -W -n -b html doc _build/html
+- python -m sphinx -T -E -W -n -b linkcheck doc _build
 volumes:
 - cache:/root/.cache
 



[tryton-commits] changeset in modules/stock_package_shipping_sendcloud:default Su...

2022-04-25 Thread Cédric Krier
changeset d8dc5ac2591e in modules/stock_package_shipping_sendcloud:default
details: 
https://hg.tryton.org/modules/stock_package_shipping_sendcloud?cmd=changeset=d8dc5ac2591e
description:
Support testNamePatterns for doc tests

issue11423
review382481002
diffstat:

 tests/test_scenario.py |  23 +--
 1 files changed, 5 insertions(+), 18 deletions(-)

diffs (33 lines):

diff -r 2feefbc7b168 -r d8dc5ac2591e tests/test_scenario.py
--- a/tests/test_scenario.pySat Apr 16 18:30:19 2022 +0200
+++ b/tests/test_scenario.pyMon Apr 25 18:11:20 2022 +0200
@@ -1,24 +1,11 @@
 # This file is part of Tryton.  The COPYRIGHT file at the top level of
 # this repository contains the full copyright notices and license terms.
 
-import doctest
-import glob
 import os
 
-from trytond.tests.test_tryton import doctest_checker, doctest_teardown
-
+from trytond.tests.test_tryton import load_doc_tests
 
-def load_tests(loader, tests, pattern):
-if (os.getenv('SENDCLOUD_PUBLIC_KEY')
-and os.getenv('SENDCLOUD_SECRET_KEY')):
-cwd = os.getcwd()
-try:
-os.chdir(os.path.dirname(__file__))
-for scenario in glob.glob('*.rst'):
-tests.addTests(doctest.DocFileSuite(
-scenario, tearDown=doctest_teardown, encoding='utf-8',
-checker=doctest_checker,
-optionflags=doctest.REPORT_ONLY_FIRST_FAILURE))
-finally:
-os.chdir(cwd)
-return tests
+if (os.getenv('SENDCLOUD_PUBLIC_KEY')
+and os.getenv('SENDCLOUD_SECRET_KEY')):
+def load_tests(*args, **kwargs):
+return load_doc_tests(__name__, __file__, *args, **kwargs)



[tryton-commits] changeset in modules/stock_package_shipping_sendcloud:default Re...

2022-04-16 Thread Cédric Krier
changeset 2feefbc7b168 in modules/stock_package_shipping_sendcloud:default
details: 
https://hg.tryton.org/modules/stock_package_shipping_sendcloud?cmd=changeset=2feefbc7b168
description:
Replace test setuptools command by unittest discover

issue9215
review389851002
diffstat:

 setup.py   |   6 ++--
 tests/__init__.py  |   8 ---
 tests/test_module.py   |  12 ++
 tests/test_scenario.py |  24 +
 tests/test_stock_package_shipping_sendcloud.py |  29 --
 tox.ini|   3 +-
 6 files changed, 41 insertions(+), 41 deletions(-)

diffs (125 lines):

diff -r 5390979cf859 -r 2feefbc7b168 setup.py
--- a/setup.py  Sun Apr 10 19:11:40 2022 +0200
+++ b/setup.py  Sat Apr 16 18:30:19 2022 +0200
@@ -150,13 +150,13 @@
 license='GPL-3',
 python_requires='>=3.7',
 install_requires=requires,
+extras_require={
+'test': tests_require,
+},
 dependency_links=dependency_links,
 zip_safe=False,
 entry_points="""
 [trytond.modules]
 stock_package_shipping_sendcloud = 
trytond.modules.stock_package_shipping_sendcloud
 """,  # noqa: E501
-test_suite='tests',
-test_loader='trytond.test_loader:Loader',
-tests_require=tests_require,
 )
diff -r 5390979cf859 -r 2feefbc7b168 tests/__init__.py
--- a/tests/__init__.py Sun Apr 10 19:11:40 2022 +0200
+++ b/tests/__init__.py Sat Apr 16 18:30:19 2022 +0200
@@ -1,10 +1,2 @@
 # This file is part of Tryton.  The COPYRIGHT file at the top level of
 # this repository contains the full copyright notices and license terms.
-
-try:
-from 
trytond.modules.stock_package_shipping_sendcloud.tests.test_stock_package_shipping_sendcloud
 import \
-suite  # noqa: E501
-except ImportError:
-from .test_stock_package_shipping_sendcloud import suite
-
-__all__ = ['suite']
diff -r 5390979cf859 -r 2feefbc7b168 tests/test_module.py
--- /dev/null   Thu Jan 01 00:00:00 1970 +
+++ b/tests/test_module.py  Sat Apr 16 18:30:19 2022 +0200
@@ -0,0 +1,12 @@
+# This file is part of Tryton.  The COPYRIGHT file at the top level of
+# this repository contains the full copyright notices and license terms.
+
+from trytond.tests.test_tryton import ModuleTestCase
+
+
+class StockPackageShippingSendcloudTestCase(ModuleTestCase):
+'Test Stock Package Shipping Sendcloud module'
+module = 'stock_package_shipping_sendcloud'
+
+
+del ModuleTestCase
diff -r 5390979cf859 -r 2feefbc7b168 tests/test_scenario.py
--- /dev/null   Thu Jan 01 00:00:00 1970 +
+++ b/tests/test_scenario.pySat Apr 16 18:30:19 2022 +0200
@@ -0,0 +1,24 @@
+# This file is part of Tryton.  The COPYRIGHT file at the top level of
+# this repository contains the full copyright notices and license terms.
+
+import doctest
+import glob
+import os
+
+from trytond.tests.test_tryton import doctest_checker, doctest_teardown
+
+
+def load_tests(loader, tests, pattern):
+if (os.getenv('SENDCLOUD_PUBLIC_KEY')
+and os.getenv('SENDCLOUD_SECRET_KEY')):
+cwd = os.getcwd()
+try:
+os.chdir(os.path.dirname(__file__))
+for scenario in glob.glob('*.rst'):
+tests.addTests(doctest.DocFileSuite(
+scenario, tearDown=doctest_teardown, encoding='utf-8',
+checker=doctest_checker,
+optionflags=doctest.REPORT_ONLY_FIRST_FAILURE))
+finally:
+os.chdir(cwd)
+return tests
diff -r 5390979cf859 -r 2feefbc7b168 
tests/test_stock_package_shipping_sendcloud.py
--- a/tests/test_stock_package_shipping_sendcloud.pySun Apr 10 19:11:40 
2022 +0200
+++ /dev/null   Thu Jan 01 00:00:00 1970 +
@@ -1,29 +0,0 @@
-# This file is part of Tryton.  The COPYRIGHT file at the top level of
-# this repository contains the full copyright notices and license terms.
-
-import doctest
-import os
-import unittest
-
-from trytond.tests.test_tryton import (
-ModuleTestCase, doctest_checker, doctest_teardown)
-from trytond.tests.test_tryton import suite as test_suite
-
-
-class StockPackageShippingSendcloudTestCase(ModuleTestCase):
-'Test Stock Package Shipping Sendcloud module'
-module = 'stock_package_shipping_sendcloud'
-
-
-def suite():
-suite = test_suite()
-suite.addTests(unittest.TestLoader().loadTestsFromTestCase(
-StockPackageShippingSendcloudTestCase))
-if (os.getenv('SENDCLOUD_PUBLIC_KEY')
-and os.getenv('SENDCLOUD_SECRET_KEY')):
-suite.addTests(doctest.DocFileSuite(
-'scenario_stock_package_shipping_sendcloud.rst',
-tearDown=doctest_teardown, encoding='utf-8',
-checker=doctest_checker,
-optionflags=doctest.REPORT_ONLY_FIRST_FAILURE))
-return suite
diff -r 5390979cf859 -r 2feefbc7b168 tox.ini
--- 

[tryton-commits] changeset in modules/stock_package_shipping_sendcloud:default Dr...

2022-04-10 Thread Cédric Krier
changeset 5390979cf859 in modules/stock_package_shipping_sendcloud:default
details: 
https://hg.tryton.org/modules/stock_package_shipping_sendcloud?cmd=changeset=5390979cf859
description:
Drop support for PyPy and psycopg2cffi [skip ci]

issue11330
review386371003
diffstat:

 setup.py |  1 -
 tox.ini  |  5 ++---
 2 files changed, 2 insertions(+), 4 deletions(-)

diffs (31 lines):

diff -r b77b97a3eef4 -r 5390979cf859 setup.py
--- a/setup.py  Fri Apr 08 19:07:14 2022 +0200
+++ b/setup.py  Sun Apr 10 19:11:40 2022 +0200
@@ -145,7 +145,6 @@
 'Programming Language :: Python :: 3.9',
 'Programming Language :: Python :: 3.10',
 'Programming Language :: Python :: Implementation :: CPython',
-'Programming Language :: Python :: Implementation :: PyPy',
 'Topic :: Office/Business',
 ],
 license='GPL-3',
diff -r b77b97a3eef4 -r 5390979cf859 tox.ini
--- a/tox.ini   Fri Apr 08 19:07:14 2022 +0200
+++ b/tox.ini   Sun Apr 10 19:11:40 2022 +0200
@@ -1,5 +1,5 @@
 [tox]
-envlist = {py37,py38,py39,py310}-{sqlite,postgresql},pypy3-{sqlite,postgresql}
+envlist = {py37,py38,py39,py310}-{sqlite,postgresql}
 
 [testenv]
 commands =
@@ -7,8 +7,7 @@
 coverage report --include=.*/stock_package_shipping_sendcloud/* 
--omit=*/tests/*
 deps =
 coverage
-{py37,py38,py39,py310}-postgresql: psycopg2 >= 2.5
-pypy3-postgresql: psycopg2cffi >= 2.5
+postgresql: psycopg2 >= 2.7.0
 setenv =
 sqlite: TRYTOND_DATABASE_URI={env:SQLITE_URI:sqlite://}
 postgresql: TRYTOND_DATABASE_URI={env:POSTGRESQL_URI:postgresql://}



[tryton-commits] changeset in modules/stock_package_shipping_sendcloud:default Se...

2022-04-08 Thread Nicolas Évrard
changeset b77b97a3eef4 in modules/stock_package_shipping_sendcloud:default
details: 
https://hg.tryton.org/modules/stock_package_shipping_sendcloud?cmd=changeset=b77b97a3eef4
description:
Send only the required fields when fetching a readonly view definition

issue11134
review380081002
diffstat:

 carrier.py |  9 +++--
 1 files changed, 3 insertions(+), 6 deletions(-)

diffs (30 lines):

diff -r b6fcc1bf5be4 -r b77b97a3eef4 carrier.py
--- a/carrier.pyWed Apr 06 23:37:44 2022 +0200
+++ b/carrier.pyFri Apr 08 19:07:14 2022 +0200
@@ -60,14 +60,12 @@
 'carrier.sendcloud.address', 'sendcloud', "Addresses",
 states={
 'readonly': ~Eval('id') | (Eval('id', -1) < 0),
-},
-depends=['id'])
+})
 shipping_methods = fields.One2Many(
 'carrier.sendcloud.shipping_method', 'sendcloud', "Methods",
 states={
 'readonly': ~Eval('id') | (Eval('id', -1) < 0),
-},
-depends=['id'])
+})
 
 _addresses_sender_cache = Cache(
 'carrier.credential.sendcloud.addresses_sender',
@@ -252,8 +250,7 @@
 states={
 'invisible': Eval('shipping_service') != 'sendcloud',
 'required': Eval('shipping_service') == 'sendcloud',
-},
-depends=['shipping_service'])
+})
 
 @classmethod
 def __setup__(cls):



[tryton-commits] changeset in modules/stock_package_shipping_sendcloud:default Ad...

2022-04-06 Thread Cédric Krier
changeset b6fcc1bf5be4 in modules/stock_package_shipping_sendcloud:default
details: 
https://hg.tryton.org/modules/stock_package_shipping_sendcloud?cmd=changeset=b6fcc1bf5be4
description:
Add cache volume for check pipelines
diffstat:

 .drone.yml |  4 
 1 files changed, 4 insertions(+), 0 deletions(-)

diffs (19 lines):

diff -r 413bd88ae791 -r b6fcc1bf5be4 .drone.yml
--- a/.drone.ymlWed Apr 06 18:24:28 2022 +0200
+++ b/.drone.ymlWed Apr 06 23:37:44 2022 +0200
@@ -30,11 +30,15 @@
 - pip install twine
 - python setup.py sdist
 - twine check dist/*
+volumes:
+- cache:/root/.cache
 check_doc:
 image: ${IMAGE}
 commands:
 - pip install sphinx
 - python -m sphinx -T -E -W -n -b html doc _build/html
+volumes:
+- cache:/root/.cache
 
 services:
 postgresql:



[tryton-commits] changeset in modules/stock_package_shipping_sendcloud:default Us...

2022-04-06 Thread Cédric Krier
changeset 413bd88ae791 in modules/stock_package_shipping_sendcloud:default
details: 
https://hg.tryton.org/modules/stock_package_shipping_sendcloud?cmd=changeset=413bd88ae791
description:
Use correct image substitution in check_doc

issue11367
diffstat:

 .drone.yml |  2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diffs (12 lines):

diff -r 1dcee078b867 -r 413bd88ae791 .drone.yml
--- a/.drone.ymlWed Apr 06 18:19:49 2022 +0200
+++ b/.drone.ymlWed Apr 06 18:24:28 2022 +0200
@@ -31,7 +31,7 @@
 - python setup.py sdist
 - twine check dist/*
 check_doc:
-image: ${IMAGE]
+image: ${IMAGE}
 commands:
 - pip install sphinx
 - python -m sphinx -T -E -W -n -b html doc _build/html



[tryton-commits] changeset in modules/stock_package_shipping_sendcloud:default Te...

2022-04-06 Thread Cédric Krier
changeset 1dcee078b867 in modules/stock_package_shipping_sendcloud:default
details: 
https://hg.tryton.org/modules/stock_package_shipping_sendcloud?cmd=changeset=1dcee078b867
description:
Test building documentation

issue11367
review397811002
diffstat:

 .drone.yml |  5 +
 doc/design.rst |  2 +-
 tryton.cfg |  1 +
 3 files changed, 7 insertions(+), 1 deletions(-)

diffs (36 lines):

diff -r 9424e865e9d6 -r 1dcee078b867 .drone.yml
--- a/.drone.ymlMon Mar 07 00:23:41 2022 +0100
+++ b/.drone.ymlWed Apr 06 18:19:49 2022 +0200
@@ -30,6 +30,11 @@
 - pip install twine
 - python setup.py sdist
 - twine check dist/*
+check_doc:
+image: ${IMAGE]
+commands:
+- pip install sphinx
+- python -m sphinx -T -E -W -n -b html doc _build/html
 
 services:
 postgresql:
diff -r 9424e865e9d6 -r 1dcee078b867 doc/design.rst
--- a/doc/design.rstMon Mar 07 00:23:41 2022 +0100
+++ b/doc/design.rstWed Apr 06 18:19:49 2022 +0200
@@ -37,5 +37,5 @@
 
 .. seealso::
 
-   The `Carrier ` concept is introduced by the
+   The :doc:`Carrier ` concept is introduced by the
:doc:`Carrier Module `.
diff -r 9424e865e9d6 -r 1dcee078b867 tryton.cfg
--- a/tryton.cfgMon Mar 07 00:23:41 2022 +0100
+++ b/tryton.cfgWed Apr 06 18:19:49 2022 +0200
@@ -1,6 +1,7 @@
 [tryton]
 version=6.3.0
 depends:
+carrier
 company
 ir
 party



[tryton-commits] changeset in modules/stock_package_shipping_sendcloud:default Ad...

2022-03-06 Thread Cédric Krier
changeset 9424e865e9d6 in modules/stock_package_shipping_sendcloud:default
details: 
https://hg.tryton.org/modules/stock_package_shipping_sendcloud?cmd=changeset=9424e865e9d6
description:
Add usage parameter for shipping contact mechanism

issue11238
review374861002
diffstat:

 stock.py |  7 ---
 1 files changed, 4 insertions(+), 3 deletions(-)

diffs (24 lines):

diff -r 2f2acdd5cce1 -r 9424e865e9d6 stock.py
--- a/stock.py  Sun Jan 30 13:13:12 2022 +0100
+++ b/stock.py  Mon Mar 07 00:23:41 2022 +0100
@@ -139,7 +139,7 @@
 
 return 'end'
 
-def get_parcel(self, shipment, package, credential):
+def get_parcel(self, shipment, package, credential, usage=None):
 pool = Pool()
 UoM = pool.get('product.uom')
 ModelData = pool.get('ir.model.data')
@@ -147,8 +147,9 @@
 cm = UoM(ModelData.get_id('product', 'uom_centimeter'))
 party = shipment.shipping_to
 address = shipment.shipping_to_address
-phone = party.contact_mechanism_get({'phone', 'mobile'})
-email = party.contact_mechanism_get('email')
+phone = party.contact_mechanism_get(
+{'phone', 'mobile'}, usage=usage)
+email = party.contact_mechanism_get('email', usage=usage)
 street_lines = (address.street or '').splitlines()
 parcel = {
 'name': address.party_full_name,



[tryton-commits] changeset in modules/stock_package_shipping_sendcloud:default Ad...

2022-01-30 Thread Cédric Krier
changeset 2f2acdd5cce1 in modules/stock_package_shipping_sendcloud:default
details: 
https://hg.tryton.org/modules/stock_package_shipping_sendcloud?cmd=changeset=2f2acdd5cce1
description:
Add printer suffix after testing if it is an index

issue11177
review366611002
diffstat:

 stock.py |  2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diffs (15 lines):

diff -r 2aa37ba611d6 -r 2f2acdd5cce1 stock.py
--- a/stock.py  Sat Dec 18 16:34:36 2021 +0100
+++ b/stock.py  Sun Jan 30 13:13:12 2022 +0100
@@ -118,10 +118,10 @@
 format_ = shipment.carrier.sendcloud_format.split()
 label_url = parcel['label']
 for key in format_:
-key += '_printer'
 try:
 index = int(key)
 except ValueError:
+key += '_printer'
 label_url = label_url[key]
 else:
 label_url = label_url[index]



[tryton-commits] changeset in modules/stock_package_shipping_sendcloud:default Ad...

2021-12-18 Thread Cédric Krier
changeset 2aa37ba611d6 in modules/stock_package_shipping_sendcloud:default
details: 
https://hg.tryton.org/modules/stock_package_shipping_sendcloud?cmd=changeset=2aa37ba611d6
description:
Add support for Python 3.10

and remove support for Python 3.6.

issue11048
review364451002
diffstat:

 .drone.yml |  12 ++--
 CHANGELOG  |   3 +++
 setup.py   |   4 ++--
 tox.ini|   6 ++
 4 files changed, 13 insertions(+), 12 deletions(-)

diffs (82 lines):

diff -r 57a4d9a7d1b8 -r 2aa37ba611d6 .drone.yml
--- a/.drone.ymlMon Dec 13 23:10:12 2021 +0100
+++ b/.drone.ymlSat Dec 18 16:34:36 2021 +0100
@@ -43,12 +43,6 @@
 
 matrix:
 include:
-- IMAGE: python:3.6
-  TOXENV: py36
-  DATABASE: sqlite
-- IMAGE: python:3.6
-  TOXENV: py36
-  DATABASE: postgresql
 - IMAGE: python:3.7
   TOXENV: py37
   DATABASE: sqlite
@@ -67,3 +61,9 @@
 - IMAGE: python:3.9
   TOXENV: py39
   DATABASE: postgresql
+- IMAGE: python:3.10
+  TOXENV: py310
+  DATABASE: sqlite
+- IMAGE: python:3.10
+  TOXENV: py310
+  DATABASE: postgresql
diff -r 57a4d9a7d1b8 -r 2aa37ba611d6 CHANGELOG
--- a/CHANGELOG Mon Dec 13 23:10:12 2021 +0100
+++ b/CHANGELOG Sat Dec 18 16:34:36 2021 +0100
@@ -1,2 +1,5 @@
+* Add support for Python 3.10
+* Remove support for Python 3.6
+
 Version 6.2.0 - 2021-11-01
 * Initial release
diff -r 57a4d9a7d1b8 -r 2aa37ba611d6 setup.py
--- a/setup.py  Mon Dec 13 23:10:12 2021 +0100
+++ b/setup.py  Sat Dec 18 16:34:36 2021 +0100
@@ -140,16 +140,16 @@
 'Natural Language :: Turkish',
 'Operating System :: OS Independent',
 'Programming Language :: Python :: 3',
-'Programming Language :: Python :: 3.6',
 'Programming Language :: Python :: 3.7',
 'Programming Language :: Python :: 3.8',
 'Programming Language :: Python :: 3.9',
+'Programming Language :: Python :: 3.10',
 'Programming Language :: Python :: Implementation :: CPython',
 'Programming Language :: Python :: Implementation :: PyPy',
 'Topic :: Office/Business',
 ],
 license='GPL-3',
-python_requires='>=3.6',
+python_requires='>=3.7',
 install_requires=requires,
 dependency_links=dependency_links,
 zip_safe=False,
diff -r 57a4d9a7d1b8 -r 2aa37ba611d6 tox.ini
--- a/tox.ini   Mon Dec 13 23:10:12 2021 +0100
+++ b/tox.ini   Sat Dec 18 16:34:36 2021 +0100
@@ -1,5 +1,5 @@
 [tox]
-envlist = {py36,py37,py38,py39}-{sqlite,postgresql},pypy3-{sqlite,postgresql}
+envlist = {py37,py38,py39,py310}-{sqlite,postgresql},pypy3-{sqlite,postgresql}
 
 [testenv]
 commands =
@@ -7,13 +7,11 @@
 coverage report --include=.*/stock_package_shipping_sendcloud/* 
--omit=*/tests/*
 deps =
 coverage
-{py36,py37,py38,py39}-postgresql: psycopg2 >= 2.5
+{py37,py38,py39,py310}-postgresql: psycopg2 >= 2.5
 pypy3-postgresql: psycopg2cffi >= 2.5
-py36-sqlite: sqlitebck
 setenv =
 sqlite: TRYTOND_DATABASE_URI={env:SQLITE_URI:sqlite://}
 postgresql: TRYTOND_DATABASE_URI={env:POSTGRESQL_URI:postgresql://}
 sqlite: DB_NAME={env:SQLITE_NAME::memory:}
 postgresql: DB_NAME={env:POSTGRESQL_NAME:test}
-passenv = SENDCLOUD_PUBLIC_KEY SENDCLOUD_SECRET_KEY
 install_command = pip install --pre --find-links 
https://trydevpi.tryton.org/?local_version={env:CI_JOB_ID:{env:CI_BUILD_NUMBER:}.{env:CI_JOB_NUMBER:}}
 {opts} {packages}



[tryton-commits] changeset in modules/stock_package_shipping_sendcloud:default Ad...

2021-12-13 Thread Cédric Krier
changeset 57a4d9a7d1b8 in modules/stock_package_shipping_sendcloud:default
details: 
https://hg.tryton.org/modules/stock_package_shipping_sendcloud?cmd=changeset=57a4d9a7d1b8
description:
Add coverage to tox

issue7685
review51501002
diffstat:

 tox.ini |  5 -
 1 files changed, 4 insertions(+), 1 deletions(-)

diffs (16 lines):

diff -r 8e944f582711 -r 57a4d9a7d1b8 tox.ini
--- a/tox.ini   Sat Dec 11 17:58:44 2021 +0100
+++ b/tox.ini   Mon Dec 13 23:10:12 2021 +0100
@@ -2,8 +2,11 @@
 envlist = {py36,py37,py38,py39}-{sqlite,postgresql},pypy3-{sqlite,postgresql}
 
 [testenv]
-commands = {envpython} setup.py test
+commands =
+coverage run --include=.*/stock_package_shipping_sendcloud/* setup.py test
+coverage report --include=.*/stock_package_shipping_sendcloud/* 
--omit=*/tests/*
 deps =
+coverage
 {py36,py37,py38,py39}-postgresql: psycopg2 >= 2.5
 pypy3-postgresql: psycopg2cffi >= 2.5
 py36-sqlite: sqlitebck



[tryton-commits] changeset in modules/stock_package_shipping_sendcloud:default Fo...

2021-12-11 Thread Cédric Krier
changeset 8e944f582711 in modules/stock_package_shipping_sendcloud:default
details: 
https://hg.tryton.org/modules/stock_package_shipping_sendcloud?cmd=changeset=8e944f582711
description:
Follow isort formatting

issue10928
diffstat:

 .isort.cfg |  3 +++
 __init__.py|  3 +--
 carrier.py |  5 +++--
 setup.py   |  3 ++-
 stock.py   |  4 ++--
 tests/__init__.py  |  3 ++-
 tests/test_stock_package_shipping_sendcloud.py |  5 ++---
 7 files changed, 15 insertions(+), 11 deletions(-)

diffs (102 lines):

diff -r d12ba663d03b -r 8e944f582711 .isort.cfg
--- /dev/null   Thu Jan 01 00:00:00 1970 +
+++ b/.isort.cfgSat Dec 11 17:58:44 2021 +0100
@@ -0,0 +1,3 @@
+[settings]
+multi_line_output=4
+known_first_party=trytond
diff -r d12ba663d03b -r 8e944f582711 __init__.py
--- a/__init__.py   Mon Nov 01 17:39:01 2021 +0100
+++ b/__init__.py   Sat Dec 11 17:58:44 2021 +0100
@@ -3,8 +3,7 @@
 
 from trytond.pool import Pool
 
-from . import carrier
-from . import stock
+from . import carrier, stock
 
 __all__ = ['register']
 
diff -r d12ba663d03b -r 8e944f582711 carrier.py
--- a/carrier.pyMon Nov 01 17:39:01 2021 +0100
+++ b/carrier.pySat Dec 11 17:58:44 2021 +0100
@@ -2,6 +2,7 @@
 # this repository contains the full copyright notices and license terms.
 import time
 from functools import wraps
+
 try:
 from http import HTTPStatus
 except ImportError:
@@ -9,11 +10,11 @@
 
 import requests
 
-from trytond.i18n import gettext
 from trytond.cache import Cache
 from trytond.config import config
+from trytond.i18n import gettext
 from trytond.model import (
-ModelSQL, ModelView, MatchMixin, sequence_ordered, fields)
+MatchMixin, ModelSQL, ModelView, fields, sequence_ordered)
 from trytond.pool import PoolMeta
 from trytond.pyson import Eval
 
diff -r d12ba663d03b -r 8e944f582711 setup.py
--- a/setup.py  Mon Nov 01 17:39:01 2021 +0100
+++ b/setup.py  Sat Dec 11 17:58:44 2021 +0100
@@ -6,7 +6,8 @@
 import os
 import re
 from configparser import ConfigParser
-from setuptools import setup, find_packages
+
+from setuptools import find_packages, setup
 
 
 def read(fname):
diff -r d12ba663d03b -r 8e944f582711 stock.py
--- a/stock.py  Mon Nov 01 17:39:01 2021 +0100
+++ b/stock.py  Sat Dec 11 17:58:44 2021 +0100
@@ -5,9 +5,9 @@
 from trytond.i18n import gettext
 from trytond.model import fields
 from trytond.model.exceptions import AccessError
-from trytond.pool import PoolMeta, Pool
+from trytond.pool import Pool, PoolMeta
 from trytond.transaction import Transaction
-from trytond.wizard import Wizard, StateAction, StateTransition
+from trytond.wizard import StateAction, StateTransition, Wizard
 
 
 class Package(metaclass=PoolMeta):
diff -r d12ba663d03b -r 8e944f582711 tests/__init__.py
--- a/tests/__init__.py Mon Nov 01 17:39:01 2021 +0100
+++ b/tests/__init__.py Sat Dec 11 17:58:44 2021 +0100
@@ -2,7 +2,8 @@
 # this repository contains the full copyright notices and license terms.
 
 try:
-from 
trytond.modules.stock_package_shipping_sendcloud.tests.test_stock_package_shipping_sendcloud
 import suite  # noqa: E501
+from 
trytond.modules.stock_package_shipping_sendcloud.tests.test_stock_package_shipping_sendcloud
 import \
+suite  # noqa: E501
 except ImportError:
 from .test_stock_package_shipping_sendcloud import suite
 
diff -r d12ba663d03b -r 8e944f582711 
tests/test_stock_package_shipping_sendcloud.py
--- a/tests/test_stock_package_shipping_sendcloud.pyMon Nov 01 17:39:01 
2021 +0100
+++ b/tests/test_stock_package_shipping_sendcloud.pySat Dec 11 17:58:44 
2021 +0100
@@ -5,10 +5,9 @@
 import os
 import unittest
 
-from trytond.tests.test_tryton import ModuleTestCase
+from trytond.tests.test_tryton import (
+ModuleTestCase, doctest_checker, doctest_teardown)
 from trytond.tests.test_tryton import suite as test_suite
-from trytond.tests.test_tryton import doctest_teardown
-from trytond.tests.test_tryton import doctest_checker
 
 
 class StockPackageShippingSendcloudTestCase(ModuleTestCase):



[tryton-commits] changeset in modules/stock_package_shipping_sendcloud:default In...

2021-11-01 Thread Cédric Krier
changeset d12ba663d03b in modules/stock_package_shipping_sendcloud:default
details: 
https://hg.tryton.org/modules/stock_package_shipping_sendcloud?cmd=changeset=d12ba663d03b
description:
Increase version number
diffstat:

 tryton.cfg |  2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diffs (10 lines):

diff -r 77ef2b6e53c5 -r d12ba663d03b tryton.cfg
--- a/tryton.cfgMon Nov 01 17:38:51 2021 +0100
+++ b/tryton.cfgMon Nov 01 17:39:01 2021 +0100
@@ -1,5 +1,5 @@
 [tryton]
-version=6.2.0
+version=6.3.0
 depends:
 company
 ir



[tryton-commits] changeset in modules/stock_package_shipping_sendcloud:default Ad...

2021-11-01 Thread Cédric Krier
changeset 77ef2b6e53c5 in modules/stock_package_shipping_sendcloud:default
details: 
https://hg.tryton.org/modules/stock_package_shipping_sendcloud?cmd=changeset=77ef2b6e53c5
description:
Add tag 6.2.0 [skip ci]
diffstat:

 .hgtags |  1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diffs (5 lines):

diff -r 7bdde48affea -r 77ef2b6e53c5 .hgtags
--- /dev/null   Thu Jan 01 00:00:00 1970 +
+++ b/.hgtags   Mon Nov 01 17:38:51 2021 +0100
@@ -0,0 +1,1 @@
+7bdde48affeaf205d5698d453b5ae136c8dcf69a 6.2.0



[tryton-commits] changeset in modules/stock_package_shipping_sendcloud:default Pr...

2021-11-01 Thread Cédric Krier
changeset 7bdde48affea in modules/stock_package_shipping_sendcloud:default
details: 
https://hg.tryton.org/modules/stock_package_shipping_sendcloud?cmd=changeset=7bdde48affea
description:
Prepare release 6.2.0 [skip ci]
diffstat:

 CHANGELOG  |  2 ++
 tryton.cfg |  2 +-
 2 files changed, 3 insertions(+), 1 deletions(-)

diffs (16 lines):

diff -r b0546aa7a73b -r 7bdde48affea CHANGELOG
--- /dev/null   Thu Jan 01 00:00:00 1970 +
+++ b/CHANGELOG Mon Nov 01 17:38:51 2021 +0100
@@ -0,0 +1,2 @@
+Version 6.2.0 - 2021-11-01
+* Initial release
diff -r b0546aa7a73b -r 7bdde48affea tryton.cfg
--- a/tryton.cfgSat Oct 30 11:32:04 2021 +0200
+++ b/tryton.cfgMon Nov 01 17:38:51 2021 +0100
@@ -1,5 +1,5 @@
 [tryton]
-version=6.1.0
+version=6.2.0
 depends:
 company
 ir



[tryton-commits] changeset in modules/stock_package_shipping_sendcloud:default Up...

2021-10-30 Thread Cédric Krier
changeset b0546aa7a73b in modules/stock_package_shipping_sendcloud:default
details: 
https://hg.tryton.org/modules/stock_package_shipping_sendcloud?cmd=changeset=b0546aa7a73b
description:
Update translations [skip ci]
diffstat:

 locale/bg.po |  127 +
 locale/ca.po |  131 +++
 locale/cs.po |  127 +
 locale/de.po |  131 +++
 locale/es.po |  131 +++
 locale/es_419.po |  127 +
 locale/et.po |  127 +
 locale/fa.po |  127 +
 locale/fi.po |  127 +
 locale/fr.po |  131 +++
 locale/hu.po |  127 +
 locale/id.po |  127 +
 locale/it.po |  127 +
 locale/lo.po |  127 +
 locale/lt.po |  127 +
 locale/nl.po |  131 +++
 locale/pl.po |  127 +
 locale/pt.po |  127 +
 locale/ro.po |  129 ++
 locale/ru.po |  127 +
 locale/sl.po |  127 +
 locale/tr.po |  127 +
 locale/zh_CN.po  |  127 +
 23 files changed, 2943 insertions(+), 0 deletions(-)

diffs (3035 lines):

diff -r 5e6b045a155b -r b0546aa7a73b locale/bg.po
--- /dev/null   Thu Jan 01 00:00:00 1970 +
+++ b/locale/bg.po  Sat Oct 30 11:32:04 2021 +0200
@@ -0,0 +1,127 @@
+#
+msgid ""
+msgstr "Content-Type: text/plain; charset=utf-8\n"
+
+msgctxt "field:carrier,sendcloud_format:"
+msgid "Format"
+msgstr ""
+
+msgctxt "field:carrier.credential.sendcloud,addresses:"
+msgid "Addresses"
+msgstr ""
+
+msgctxt "field:carrier.credential.sendcloud,company:"
+msgid "Company"
+msgstr ""
+
+msgctxt "field:carrier.credential.sendcloud,public_key:"
+msgid "Public Key"
+msgstr ""
+
+msgctxt "field:carrier.credential.sendcloud,secret_key:"
+msgid "Secret Key"
+msgstr ""
+
+msgctxt "field:carrier.credential.sendcloud,shipping_methods:"
+msgid "Methods"
+msgstr ""
+
+msgctxt "field:carrier.sendcloud.address,address:"
+msgid "Address"
+msgstr ""
+
+msgctxt "field:carrier.sendcloud.address,sendcloud:"
+msgid "Sendcloud"
+msgstr ""
+
+msgctxt "field:carrier.sendcloud.address,warehouse:"
+msgid "Warehouse"
+msgstr ""
+
+msgctxt "field:carrier.sendcloud.shipping_method,carrier:"
+msgid "Carrier"
+msgstr ""
+
+msgctxt "field:carrier.sendcloud.shipping_method,sendcloud:"
+msgid "Sendcloud"
+msgstr ""
+
+msgctxt "field:carrier.sendcloud.shipping_method,shipping_method:"
+msgid "Shipping Method"
+msgstr ""
+
+msgctxt "field:stock.package,sendcloud_shipping_id:"
+msgid "ID"
+msgstr ""
+
+msgctxt "field:stock.package,sendcloud_shipping_tracking_url:"
+msgid "Tracking URL"
+msgstr ""
+
+msgctxt "help:carrier.sendcloud.address,address:"
+msgid "Leave empty for the Sendcloud default."
+msgstr ""
+
+msgctxt "model:carrier.credential.sendcloud,name:"
+msgid "Sendcloud Credential"
+msgstr ""
+
+msgctxt "model:carrier.sendcloud.address,name:"
+msgid "Sendcloud Address"
+msgstr ""
+
+msgctxt "model:carrier.sendcloud.shipping_method,name:"
+msgid "Sendcloud Shipping Method"
+msgstr ""
+
+msgctxt "model:ir.action,name:act_create_shipping_wizard"
+msgid "Create Sendcloud Shipping for Packages"
+msgstr ""
+
+msgctxt "model:ir.action,name:act_credential_form"
+msgid "Sendcloud Credentials"
+msgstr ""
+
+msgctxt "model:ir.message,text:msg_sendcloud_webserver_error"
+msgid ""
+"Sendcloud webservice call failed with the following error message:\n"
+"%(message)s"
+msgstr ""
+
+msgctxt "model:ir.message,text:msg_shipment_has_reference_number"
+msgid ""
+"You cannot create a shipping label for shipment \"%(shipment)s\" because it "
+"already has a reference number."
+msgstr ""
+
+msgctxt "model:ir.ui.menu,name:menu_credential_form"
+msgid "Sendcloud Credentials"
+msgstr ""
+
+msgctxt "selection:carrier,sendcloud_format:"
+msgid "A4 - Bottom left"
+msgstr ""
+
+msgctxt "selection:carrier,sendcloud_format:"
+msgid "A4 - Bottom right"
+msgstr ""
+
+msgctxt "selection:carrier,sendcloud_format:"
+msgid "A4 - Top left"
+msgstr ""
+
+msgctxt 

[tryton-commits] changeset in modules/stock_package_shipping_sendcloud:default Se...

2021-10-29 Thread Cédric Krier
changeset 5e6b045a155b in modules/stock_package_shipping_sendcloud:default
details: 
https://hg.tryton.org/modules/stock_package_shipping_sendcloud?cmd=changeset=5e6b045a155b
description:
Set remaining street lines as address_2

issue10904
review344921002
diffstat:

 stock.py |  3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diffs (13 lines):

diff -r 2715226e8445 -r 5e6b045a155b stock.py
--- a/stock.py  Fri Oct 22 10:53:53 2021 +0200
+++ b/stock.py  Sat Oct 30 02:14:52 2021 +0200
@@ -156,7 +156,8 @@
 party.full_name if party.full_name != address.party_full_name
 else None),
 'address': street_lines[0] if street_lines else '',
-'address_2': street_lines[1] if len(street_lines) > 1 else '',
+'address_2': (
+' '.join(street_lines[1:]) if len(street_lines) > 1 else ''),
 'city': address.city,
 'postal_code': address.postal_code,
 'country': address.country.code if address.country else None,



[tryton-commits] changeset in modules/stock_package_shipping_sendcloud:default Se...

2021-10-22 Thread Cédric Krier
changeset 2715226e8445 in modules/stock_package_shipping_sendcloud:default
details: 
https://hg.tryton.org/modules/stock_package_shipping_sendcloud?cmd=changeset=2715226e8445
description:
Set drone secrets to environment
diffstat:

 .drone.yml |  3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diffs (14 lines):

diff -r e9c23790683c -r 2715226e8445 .drone.yml
--- a/.drone.ymlMon Oct 11 18:50:11 2021 +0200
+++ b/.drone.ymlFri Oct 22 10:53:53 2021 +0200
@@ -12,8 +12,9 @@
 environment:
 - CFLAGS=-O0
 - DB_CACHE=/cache
-- TOX_TESTENV_PASSENV=CFLAGS DB_CACHE CI_BUILD_NUMBER 
CI_JOB_NUMBER CI_JOB_ID
+- TOX_TESTENV_PASSENV=CFLAGS DB_CACHE CI_BUILD_NUMBER 
CI_JOB_NUMBER CI_JOB_ID SENDCLOUD_PUBLIC_KEY SENDCLOUD_SECRET_KEY
 - POSTGRESQL_URI=postgresql://postgres@postgresql:5432/
+secrets: [ sendcloud_public_key, sendcloud_secret_key ]
 commands:
 - echo "[extensions]" >> /root/.hgrc
 - echo "hgext.share =" >> /root/.hgrc



[tryton-commits] changeset in modules/stock_package_shipping_sendcloud:default Ad...

2021-10-11 Thread Cédric Krier
changeset e9c23790683c in modules/stock_package_shipping_sendcloud:default
details: 
https://hg.tryton.org/modules/stock_package_shipping_sendcloud?cmd=changeset=e9c23790683c
description:
Add wizard to print shipping labels

issue10834
review375701002
diffstat:

 carrier.py  |  7 +++
 stock.py|  2 ++
 tests/scenario_stock_package_shipping_sendcloud.rst |  2 ++
 3 files changed, 11 insertions(+), 0 deletions(-)

diffs (45 lines):

diff -r 05cdb0cacf43 -r e9c23790683c carrier.py
--- a/carrier.pyTue Oct 05 12:45:39 2021 +0200
+++ b/carrier.pyMon Oct 11 18:50:11 2021 +0200
@@ -270,3 +270,10 @@
 'invisible': Eval('shipping_service') != 'sendcloud',
 }),
 ]
+
+@property
+def shipping_label_mimetype(self):
+mimetype = super().shipping_label_mimetype
+if self.shipping_service == 'sendcloud':
+mimetype = 'application/pdf'
+return mimetype
diff -r 05cdb0cacf43 -r e9c23790683c stock.py
--- a/stock.py  Tue Oct 05 12:45:39 2021 +0200
+++ b/stock.py  Mon Oct 11 18:50:11 2021 +0200
@@ -106,6 +106,7 @@
 shipment=shipment.rec_name))
 
 credential = shipment.get_sendcloud_credential()
+carrier = shipment.carrier
 packages = shipment.root_packages
 
 parcels = []
@@ -126,6 +127,7 @@
 label_url = label_url[index]
 package.sendcloud_shipping_id = parcel['id']
 package.shipping_label = credential.get_label(label_url)
+package.shipping_label_mimetype = carrier.shipping_label_mimetype
 package.shipping_reference = parcel['tracking_number']
 package.sendcloud_shipping_tracking_url = parcel['tracking_url']
 if not shipment.reference:
diff -r 05cdb0cacf43 -r e9c23790683c 
tests/scenario_stock_package_shipping_sendcloud.rst
--- a/tests/scenario_stock_package_shipping_sendcloud.rst   Tue Oct 05 
12:45:39 2021 +0200
+++ b/tests/scenario_stock_package_shipping_sendcloud.rst   Mon Oct 11 
18:50:11 2021 +0200
@@ -219,6 +219,8 @@
 True
 >>> pack.shipping_label is not None
 True
+>>> pack.shipping_label_mimetype
+'application/pdf'
 >>> pack.shipping_reference is not None
 True
 >>> pack.shipping_tracking_url.startswith('http')



[tryton-commits] changeset in modules/stock_package_shipping_sendcloud:default Pl...

2021-10-05 Thread Cédric Krier
changeset 05cdb0cacf43 in modules/stock_package_shipping_sendcloud:default
details: 
https://hg.tryton.org/modules/stock_package_shipping_sendcloud?cmd=changeset=05cdb0cacf43
description:
Place shipping setup after the shipping_service field
diffstat:

 view/carrier_form.xml |  2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diffs (12 lines):

diff -r c0b8d9ef4290 -r 05cdb0cacf43 view/carrier_form.xml
--- a/view/carrier_form.xml Tue Oct 05 12:41:03 2021 +0200
+++ b/view/carrier_form.xml Tue Oct 05 12:45:39 2021 +0200
@@ -2,7 +2,7 @@
 
 
-
+
 
 
 



[tryton-commits] changeset in modules/stock_package_shipping_sendcloud:default Hi...

2021-10-05 Thread Cédric Krier
changeset c0b8d9ef4290 in modules/stock_package_shipping_sendcloud:default
details: 
https://hg.tryton.org/modules/stock_package_shipping_sendcloud?cmd=changeset=c0b8d9ef4290
description:
Hide sendcloud separator when it is not the shipping service
diffstat:

 carrier.py |  8 
 1 files changed, 8 insertions(+), 0 deletions(-)

diffs (15 lines):

diff -r 816f8f4ca824 -r c0b8d9ef4290 carrier.py
--- a/carrier.pyTue Oct 05 12:02:05 2021 +0200
+++ b/carrier.pyTue Oct 05 12:41:03 2021 +0200
@@ -262,3 +262,11 @@
 @classmethod
 def default_sendcloud_format(cls):
 return 'label'
+
+@classmethod
+def view_attributes(cls):
+return super(Carrier, cls).view_attributes() + [
+("/form/separator[@id='sendcloud']", 'states', {
+'invisible': Eval('shipping_service') != 'sendcloud',
+}),
+]



[tryton-commits] changeset in modules/stock_package_shipping_sendcloud:default Do...

2021-10-05 Thread Cédric Krier
changeset 816f8f4ca824 in modules/stock_package_shipping_sendcloud:default
details: 
https://hg.tryton.org/modules/stock_package_shipping_sendcloud?cmd=changeset=816f8f4ca824
description:
Do not copy sendcloud_shipping_id
diffstat:

 stock.py |  1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diffs (11 lines):

diff -r 35d3edf1d98e -r 816f8f4ca824 stock.py
--- a/stock.py  Sun Oct 03 00:27:12 2021 +0200
+++ b/stock.py  Tue Oct 05 12:02:05 2021 +0200
@@ -33,6 +33,7 @@
 default = {}
 else:
 default = default.copy()
+default.setdefault('sendcloud_shipping_id')
 default.setdefault('sendcloud_shipping_tracking_url')
 return super().copy(packages, default=default)
 



[tryton-commits] changeset in modules/stock_package_shipping_sendcloud:default Do...

2021-10-02 Thread Cédric Krier
changeset 35d3edf1d98e in modules/stock_package_shipping_sendcloud:default
details: 
https://hg.tryton.org/modules/stock_package_shipping_sendcloud?cmd=changeset=35d3edf1d98e
description:
Do not create inactive carrier configuration menu

issue10775
review364041003
diffstat:

 carrier.xml |  3 ---
 1 files changed, 0 insertions(+), 3 deletions(-)

diffs (13 lines):

diff -r 9b89f6e92519 -r 35d3edf1d98e carrier.xml
--- a/carrier.xml   Sun Sep 26 23:07:57 2021 +0200
+++ b/carrier.xml   Sun Oct 03 00:27:12 2021 +0200
@@ -33,9 +33,6 @@
 action="act_credential_form"
 sequence="20"
 id="menu_credential_form"/>
-
-
-
 
 
 



[tryton-commits] changeset in modules/stock_package_shipping_sendcloud:default Us...

2021-09-26 Thread Cédric Krier
changeset 9b89f6e92519 in modules/stock_package_shipping_sendcloud:default
details: 
https://hg.tryton.org/modules/stock_package_shipping_sendcloud?cmd=changeset=9b89f6e92519
description:
Use contact_mechanism_get to get phone and email

issue10752
review336931002
diffstat:

 stock.py |  14 --
 1 files changed, 4 insertions(+), 10 deletions(-)

diffs (31 lines):

diff -r 8a80f8167db0 -r 9b89f6e92519 stock.py
--- a/stock.py  Thu Sep 23 23:12:35 2021 +0200
+++ b/stock.py  Sun Sep 26 23:07:57 2021 +0200
@@ -144,14 +144,8 @@
 cm = UoM(ModelData.get_id('product', 'uom_centimeter'))
 party = shipment.shipping_to
 address = shipment.shipping_to_address
-phone = email = None
-for mechanism in party.contact_mechanisms:
-if mechanism.type in {'phone', 'mobile'} and not phone:
-phone = mechanism.value
-if mechanism.type == 'email' and not email:
-email = mechanism.value
-if phone and email:
-break
+phone = party.contact_mechanism_get({'phone', 'mobile'})
+email = party.contact_mechanism_get('email')
 street_lines = (address.street or '').splitlines()
 parcel = {
 'name': address.party_full_name,
@@ -166,8 +160,8 @@
 'country_state': (
 address.subdivision.code.split('-', 1)[1]
 if address.subdivision else None),
-'telephone': phone,
-'email': email,
+'telephone': phone.value if phone else None,
+'email': email.value if email else None,
 'sender_address': credential.get_sender_address(shipment),
 'external_reference': '/'.join([shipment.number, package.code]),
 'quantity': 1,



[tryton-commits] changeset in modules/stock_package_shipping_sendcloud:default En...

2021-09-23 Thread Cédric Krier
changeset 8a80f8167db0 in modules/stock_package_shipping_sendcloud:default
details: 
https://hg.tryton.org/modules/stock_package_shipping_sendcloud?cmd=changeset=8a80f8167db0
description:
Ensure that objects in the Pool has __slots__

issue10719
review375361002
diffstat:

 stock.py |  1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diffs (11 lines):

diff -r 1efc9a3e76a5 -r 8a80f8167db0 stock.py
--- a/stock.py  Thu Sep 23 10:06:16 2021 +0200
+++ b/stock.py  Thu Sep 23 23:12:35 2021 +0200
@@ -38,6 +38,7 @@
 
 
 class ShippingSendcloudMixin:
+__slots__ = ()
 
 def get_sendcloud_credential(self):
 pool = Pool()



[tryton-commits] changeset in modules/stock_package_shipping_sendcloud:default Ad...

2021-09-23 Thread Cédric Krier
changeset 1efc9a3e76a5 in modules/stock_package_shipping_sendcloud:default
details: 
https://hg.tryton.org/modules/stock_package_shipping_sendcloud?cmd=changeset=1efc9a3e76a5
description:
Add timeout configuration for requests

issue10746
review371891002
diffstat:

 carrier.py|  12 +++-
 doc/configuration.rst |  10 ++
 2 files changed, 17 insertions(+), 5 deletions(-)

diffs (74 lines):

diff -r 9c0c6b7e7317 -r 1efc9a3e76a5 carrier.py
--- a/carrier.pySat Aug 21 19:38:04 2021 +0200
+++ b/carrier.pyThu Sep 23 10:06:16 2021 +0200
@@ -20,6 +20,8 @@
 from .exceptions import SendcloudError
 
 SENDCLOUD_API_URL = 'https://panel.sendcloud.sc/api/v2/'
+TIMEOUT = config.getfloat(
+'stock_package_shipping_sendcloud', 'requests_timeout', default=300)
 
 
 def sendcloud_api(func):
@@ -90,7 +92,7 @@
 return addresses
 response = requests.get(
 SENDCLOUD_API_URL + 'user/addresses/sender',
-auth=self.auth)
+auth=self.auth, timeout=TIMEOUT)
 response.raise_for_status()
 addresses = response.json()['sender_addresses']
 self._addresses_sender_cache.set(self.id, addresses)
@@ -124,7 +126,7 @@
 params['is_return'] = is_return
 response = requests.get(
 SENDCLOUD_API_URL + 'shipping_methods', params=params,
-auth=self.auth)
+auth=self.auth, timeout=TIMEOUT)
 response.raise_for_status()
 methods = response.json()['shipping_methods']
 self._shiping_methods_cache.set(key, methods)
@@ -149,7 +151,7 @@
 def get_parcel(self, id):
 response = requests.get(
 SENDCLOUD_API_URL + 'parcels/%s' % id,
-auth=self.auth)
+auth=self.auth, timeout=TIMEOUT)
 response.raise_for_status()
 return response.json()['parcel']
 
@@ -157,7 +159,7 @@
 def create_parcels(self, parcels):
 response = requests.post(
 SENDCLOUD_API_URL + 'parcels', json={'parcels': parcels},
-auth=self.auth)
+auth=self.auth, timeout=TIMEOUT)
 if response.status_code == 400:
 msg = response.json()['error']['message']
 raise requests.HTTPError(msg, response=response)
@@ -166,7 +168,7 @@
 
 @sendcloud_api
 def get_label(self, url):
-response = requests.get(url, auth=self.auth)
+response = requests.get(url, auth=self.auth, timeout=TIMEOUT)
 response.raise_for_status()
 return response.content
 
diff -r 9c0c6b7e7317 -r 1efc9a3e76a5 doc/configuration.rst
--- a/doc/configuration.rst Sat Aug 21 19:38:04 2021 +0200
+++ b/doc/configuration.rst Thu Sep 23 10:06:16 2021 +0200
@@ -25,3 +25,13 @@
 methods are kept in the cache.
 
 The default value is: ``60 * 60``.
+
+.. _config-stock_package_shipping_sendcloud.requests_timeout:
+
+```requests_timeout```
+==
+
+The ``requests_timeout`` defines the time in seconds the module is waiting for
+a response from the Sendcloud server.
+
+The default value is: ``300``.



[tryton-commits] changeset in modules/stock_package_shipping_sendcloud:default Ad...

2021-08-21 Thread Cédric Krier
changeset 9c0c6b7e7317 in modules/stock_package_shipping_sendcloud:default
details: 
https://hg.tryton.org/modules/stock_package_shipping_sendcloud?cmd=changeset=9c0c6b7e7317
description:
Add stock_package_shipping_sendcloud module

issue10492
review358221002
diffstat:

 .drone.yml  |   68 ++
 .flake8 |2 +
 COPYRIGHT   |   15 +
 LICENSE |  674 
 MANIFEST.in |5 +
 README.rst  |1 +
 __init__.py |   27 +
 carrier.py  |  262 +++
 carrier.xml |  116 +++
 doc/conf.py |   61 +
 doc/configuration.rst   |   27 +
 doc/design.rst  |   41 +
 doc/index.rst   |   13 +
 exceptions.py   |8 +
 message.xml |   14 +
 setup.py|  162 
 stock.py|  185 +
 stock.xml   |   11 +
 tests/__init__.py   |9 +
 tests/scenario_stock_package_shipping_sendcloud.rst |  230 ++
 tests/test_stock_package_shipping_sendcloud.py  |   30 +
 tox.ini |   16 +
 tryton.cfg  |   15 +
 view/carrier_address_form.xml   |   14 +
 view/carrier_address_list.xml   |8 +
 view/carrier_form.xml   |   10 +
 view/carrier_shipping_method_form.xml   |   14 +
 view/carrier_shipping_method_list.xml   |8 +
 view/credential_form.xml|   18 +
 view/credential_list.xml|7 +
 30 files changed, 2071 insertions(+), 0 deletions(-)

diffs (2192 lines):

diff -r  -r 9c0c6b7e7317 .drone.yml
--- /dev/null   Thu Jan 01 00:00:00 1970 +
+++ b/.drone.ymlSat Aug 21 19:38:04 2021 +0200
@@ -0,0 +1,68 @@
+clone:
+hg:
+image: plugins/hg
+environment:
+- HG_SHARE_POOL=/root/.cache/hg
+volumes:
+- cache:/root/.cache
+
+pipeline:
+tox:
+image: ${IMAGE}
+environment:
+- CFLAGS=-O0
+- DB_CACHE=/cache
+- TOX_TESTENV_PASSENV=CFLAGS DB_CACHE CI_BUILD_NUMBER 
CI_JOB_NUMBER CI_JOB_ID
+- POSTGRESQL_URI=postgresql://postgres@postgresql:5432/
+commands:
+- echo "[extensions]" >> /root/.hgrc
+- echo "hgext.share =" >> /root/.hgrc
+- echo "[share]" >> /root/.hgrc
+- echo "pool = /root/.cache/hg" >> /root/.hgrc
+- pip install tox
+- tox -e "${TOXENV}-${DATABASE}"
+volumes:
+- cache:/root/.cache
+check_dist:
+image: ${IMAGE}
+commands:
+- pip install twine
+- python setup.py sdist
+- twine check dist/*
+
+services:
+postgresql:
+image: postgres
+environment:
+- POSTGRES_HOST_AUTH_METHOD=trust
+command: "-c fsync=off -c synchronous_commit=off -c 
full_page_writes=off"
+when:
+matrix:
+DATABASE: postgresql
+
+matrix:
+include:
+- IMAGE: python:3.6
+  TOXENV: py36
+  DATABASE: sqlite
+- IMAGE: python:3.6
+  TOXENV: py36
+  DATABASE: postgresql
+- IMAGE: python:3.7
+  TOXENV: py37
+  DATABASE: sqlite
+- IMAGE: python:3.7
+  TOXENV: py37
+  DATABASE: postgresql
+- IMAGE: python:3.8
+  TOXENV: py38
+  DATABASE: sqlite
+- IMAGE: python:3.8
+  TOXENV: py38
+  DATABASE: postgresql
+- IMAGE: python:3.9
+  TOXENV: py39
+  DATABASE: sqlite
+- IMAGE: python:3.9
+  TOXENV: py39
+  DATABASE: postgresql
diff -r  -r 9c0c6b7e7317 .flake8
--- /dev/null   Thu Jan 01 00:00:00 1970 +
+++ b/.flake8   Sat Aug 21 19:38:04 2021 +0200
@@ -0,0 +1,2 @@
+[flake8]
+ignore=E123,E124,E126,E128,E741,W503
diff -r  -r 9c0c6b7e7317 COPYRIGHT
--- /dev/null   Thu Jan 01 00:00:00 1970 +
+++ b/COPYRIGHT Sat Aug 21 19:38:04 2021 +0200
@@ -0,0 +1,15 @@
+Copyright (C) 2021 B2CK
+Copyright (C) 2021 Cédric Krier
+
+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
+the Free Software Foundation, either version 3 of the