[tryton-debian-vcs] tryton-modules-sale-supply-drop-shipment branch debian updated. debian/3.8.0-2-6-gc365ce7
Mathias Behrle
tryton-debian-vcs at alioth.debian.org
Thu Jun 2 16:02:01 UTC 2016
The following commit has been merged in the debian branch:
https://alioth.debian.org/plugins/scmgit/cgi-bin/gitweb.cgi/?p=tryton/tryton-modules-sale-supply-drop-shipment.git;a=commitdiff;h=debian/3.8.0-2-6-gc365ce7
commit c365ce76971d9d8b682b5e3c87432a9292ab8841
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Wed Jun 1 21:45:02 2016 +0200
Releasing debian version 4.0.1-1.
Signed-off-by: Mathias Behrle <mathiasb at m9s.biz>
diff --git a/debian/changelog b/debian/changelog
index a8bdfa9..35acf60 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+tryton-modules-sale-supply-drop-shipment (4.0.1-1) unstable; urgency=medium
+
+ * Updating signing-key.asc with the actual upstream maintainer keys.
+ * Merging upstream version 4.0.0.
+ * Merging upstream version 4.0.1.
+ * Updating the copyright file.
+ * Updating Depends.
+
+ -- Mathias Behrle <mathiasb at m9s.biz> Wed, 01 Jun 2016 21:44:09 +0200
+
tryton-modules-sale-supply-drop-shipment (3.8.0-2) unstable; urgency=medium
* Updating to standards version 3.9.7, no changes needed.
commit fddec4ff8a928d977566ea79ae71f5c3531b077f
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Tue May 31 15:35:26 2016 +0200
Updating Depends.
diff --git a/debian/control b/debian/control
index 77e1099..aec01e9 100644
--- a/debian/control
+++ b/debian/control
@@ -20,6 +20,7 @@ Depends:
python-pkg-resources,
tryton-modules-company (>= ${version:major}),
tryton-modules-purchase (>= ${version:major}),
+ tryton-modules-purchase-request (>= ${version:major}),
tryton-modules-sale (>= ${version:major}),
tryton-modules-sale-supply (>= ${version:major}),
tryton-modules-stock (>= ${version:major}),
diff --git a/debian/pydist-overrides b/debian/pydist-overrides
index 78f83fb..13f0392 100644
--- a/debian/pydist-overrides
+++ b/debian/pydist-overrides
@@ -1 +1 @@
-trytond_sale_supply tryton-modules-sale-supply
+trytond_purchase_request tryton-modules-purchase-request
commit 6fc8e98c7fbacf47d413dea2bbb7ea2c3376b8f8
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Fri May 27 19:01:03 2016 +0200
Updating the copyright file.
diff --git a/debian/copyright b/debian/copyright
index 3e86df4..a19fa73 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,13 +1,13 @@
Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
Files: *
-Copyright: 2011-2015 Cédric Krier
- 2011-2015 B2CK SPRL
+Copyright: 2011-2016 Cédric Krier
+ 2011-2016 B2CK SPRL
License: GPL-3+
Files: debian/*
Copyright: 2009-2012 Daniel Baumann <daniel at debian.org>
- 2012-2015 Mathias Behrle <mathiasb at m9s.biz>
+ 2012-2016 Mathias Behrle <mathiasb at m9s.biz>
License: GPL-3+
License: GPL-3+
commit 2847332dbfef52b9052bb089e2f4ee57e521ac5a
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Fri May 27 18:35:31 2016 +0200
Merging upstream version 4.0.1.
diff --git a/CHANGELOG b/CHANGELOG
index 476653d..f1ed9c2 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+Version 4.0.1 - 2016-05-11
+* Bug fixes (see mercurial logs for details)
+
Version 4.0.0 - 2016-05-02
* Bug fixes (see mercurial logs for details)
* Add Python3 support
diff --git a/PKG-INFO b/PKG-INFO
index 48a3be7..b8783cc 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
Metadata-Version: 1.1
Name: trytond_sale_supply_drop_shipment
-Version: 4.0.0
+Version: 4.0.1
Summary: Tryton module for sale supply drop shipment
Home-page: http://www.tryton.org/
Author: Tryton
diff --git a/locale/es_AR.po b/locale/es_AR.po
index de70876..d89504b 100644
--- a/locale/es_AR.po
+++ b/locale/es_AR.po
@@ -30,7 +30,7 @@ msgstr "Cliente"
msgctxt "field:purchase.purchase,delivery_address:"
msgid "Delivery Address"
-msgstr "Dirección envío"
+msgstr "Dirección de envío"
msgctxt "field:purchase.purchase,drop_location:"
msgid "Drop Location"
@@ -46,7 +46,7 @@ msgstr "Cliente"
msgctxt "field:purchase.request,delivery_address:"
msgid "Delivery Address"
-msgstr "Dirección envío"
+msgstr "Dirección de envío"
msgctxt "field:sale.configuration,sale_drop_location:"
msgid "Sale Drop Location"
@@ -98,7 +98,7 @@ msgstr "Movimientos de cliente"
msgctxt "field:stock.shipment.drop,delivery_address:"
msgid "Delivery Address"
-msgstr "Dirección envío"
+msgstr "Dirección de envío"
msgctxt "field:stock.shipment.drop,effective_date:"
msgid "Effective Date"
diff --git a/locale/es_CO.po b/locale/es_CO.po
index f062736..1cb0b0d 100644
--- a/locale/es_CO.po
+++ b/locale/es_CO.po
@@ -5,7 +5,7 @@ msgstr "Content-Type: text/plain; charset=utf-8\n"
msgctxt "error:purchase.purchase:"
msgid "A delivery address must be defined for quotation of purchase \"%s\"."
msgstr ""
-"Una dirección de entrega debe definirse en la cotización de la compra "
+"Debe definirse una dirección de entrega en la cotización de la compra "
"\"%s\"."
msgctxt "error:stock.shipment.drop:"
@@ -18,11 +18,11 @@ msgstr ""
msgctxt "field:purchase.configuration,purchase_drop_location:"
msgid "Purchase Drop Location"
-msgstr ""
+msgstr "Bodega de Eliminación de la Compra"
msgctxt "field:purchase.product_supplier,drop_shipment:"
msgid "Drop Shipment"
-msgstr "Entrega de Envío"
+msgstr "Eliminar Envío"
msgctxt "field:purchase.purchase,customer:"
msgid "Customer"
@@ -34,11 +34,11 @@ msgstr "Dirección de Envío"
msgctxt "field:purchase.purchase,drop_location:"
msgid "Drop Location"
-msgstr ""
+msgstr "Bodega de Eliminación"
msgctxt "field:purchase.purchase,drop_shipments:"
msgid "Drop Shipments"
-msgstr "Entrega de Envíos"
+msgstr "Eliminar Envíos"
msgctxt "field:purchase.request,customer:"
msgid "Customer"
@@ -50,11 +50,11 @@ msgstr "Dirección de Envío"
msgctxt "field:sale.configuration,sale_drop_location:"
msgid "Sale Drop Location"
-msgstr ""
+msgstr "Bodega de Eliminación de la Venta"
msgctxt "field:sale.sale,drop_location:"
msgid "Drop Location"
-msgstr ""
+msgstr "Bodega de Eliminación"
msgctxt "field:sale.sale,drop_shipments:"
msgid "Drop Shipments"
@@ -62,7 +62,7 @@ msgstr "Entrega de Envíos"
msgctxt "field:stock.configuration,shipment_drop_sequence:"
msgid "Drop Shipment Sequence"
-msgstr "Secuencia Entrega de Envíos"
+msgstr "Secuencia Eliminación de Envíos"
msgctxt "field:stock.move,customer_drop:"
msgid "Drop Customer"
@@ -94,7 +94,7 @@ msgstr "Cliente"
msgctxt "field:stock.shipment.drop,customer_moves:"
msgid "Customer Moves"
-msgstr ""
+msgstr "Movimientos de Cliente"
msgctxt "field:stock.shipment.drop,delivery_address:"
msgid "Delivery Address"
@@ -134,7 +134,7 @@ msgstr "Proveedor"
msgctxt "field:stock.shipment.drop,supplier_moves:"
msgid "Supplier Moves"
-msgstr ""
+msgstr "Asientos de Proveedor"
msgctxt "field:stock.shipment.drop,write_date:"
msgid "Write Date"
@@ -146,15 +146,15 @@ msgstr "Modificado por Usuario"
msgctxt "model:ir.action,name:act_purchase_drop_shipment_form"
msgid "Drop Shipments"
-msgstr "Entrega de Envíos"
+msgstr "Eliminación de Envíos"
msgctxt "model:ir.action,name:act_sale_drop_shipment_form"
msgid "Drop Shipments"
-msgstr "Entrega de Envíos"
+msgstr "Eliminación de Envíos"
msgctxt "model:ir.action,name:act_shipment_drop_form"
msgid "Drop Shipments"
-msgstr "Entrega de Envíos"
+msgstr "Eliminación de Envíos"
msgctxt ""
"model:ir.action.act_window.domain,name:act_shipment_drop_form_domain_all"
@@ -169,7 +169,7 @@ msgstr "Borrador"
msgctxt ""
"model:ir.action.act_window.domain,name:act_shipment_drop_form_domain_shipped"
msgid "Shipped"
-msgstr ""
+msgstr "Enviado"
msgctxt ""
"model:ir.action.act_window.domain,name:act_shipment_drop_form_domain_waiting"
@@ -178,19 +178,19 @@ msgstr "En Espera"
msgctxt "model:ir.sequence,name:sequence_shipment_drop"
msgid "Drop Shipment"
-msgstr "Entrega de Envío"
+msgstr "Eliminación de Envío"
msgctxt "model:ir.sequence.type,name:sequence_type_shipment_drop"
msgid "Drop Shipment"
-msgstr "Entrega de Envío"
+msgstr "Eliminación de Envío"
msgctxt "model:ir.ui.menu,name:menu_shipment_drop_form"
msgid "Drop Shipments"
-msgstr "Entrega de Envíos"
+msgstr "Eliminación de Envíos"
msgctxt "model:stock.location,name:location_drop"
msgid "Drop"
-msgstr ""
+msgstr "Envio"
msgctxt "model:stock.shipment.drop,name:"
msgid "Drop Shipment"
@@ -210,7 +210,7 @@ msgstr "Borrador"
msgctxt "selection:stock.shipment.drop,state:"
msgid "Shipped"
-msgstr ""
+msgstr "Enviado"
msgctxt "selection:stock.shipment.drop,state:"
msgid "Waiting"
@@ -218,7 +218,7 @@ msgstr "En Espera"
msgctxt "view:stock.shipment.drop:"
msgid "Cancel"
-msgstr "Cancelar"
+msgstr "Anular"
msgctxt "view:stock.shipment.drop:"
msgid "Done"
@@ -230,7 +230,7 @@ msgstr "Borrador"
msgctxt "view:stock.shipment.drop:"
msgid "Drop Shipment"
-msgstr "Entrega de Envío"
+msgstr "Eliminación de Envío"
msgctxt "view:stock.shipment.drop:"
msgid "Drop Shipments"
@@ -238,7 +238,7 @@ msgstr "Entrega de Envíos"
msgctxt "view:stock.shipment.drop:"
msgid "Ship"
-msgstr ""
+msgstr "Enviar"
msgctxt "view:stock.shipment.drop:"
msgid "Wait"
diff --git a/tryton.cfg b/tryton.cfg
index d3e63e5..9fa6bb2 100644
--- a/tryton.cfg
+++ b/tryton.cfg
@@ -1,5 +1,5 @@
[tryton]
-version=4.0.0
+version=4.0.1
depends:
company
ir
diff --git a/trytond_sale_supply_drop_shipment.egg-info/PKG-INFO b/trytond_sale_supply_drop_shipment.egg-info/PKG-INFO
index 42b4ead..0c8151e 100644
--- a/trytond_sale_supply_drop_shipment.egg-info/PKG-INFO
+++ b/trytond_sale_supply_drop_shipment.egg-info/PKG-INFO
@@ -1,6 +1,6 @@
Metadata-Version: 1.1
Name: trytond-sale-supply-drop-shipment
-Version: 4.0.0
+Version: 4.0.1
Summary: Tryton module for sale supply drop shipment
Home-page: http://www.tryton.org/
Author: Tryton
diff --git a/trytond_sale_supply_drop_shipment.egg-info/SOURCES.txt b/trytond_sale_supply_drop_shipment.egg-info/SOURCES.txt
index fffffd9..0b519c4 100644
--- a/trytond_sale_supply_drop_shipment.egg-info/SOURCES.txt
+++ b/trytond_sale_supply_drop_shipment.egg-info/SOURCES.txt
@@ -30,11 +30,13 @@ tryton.cfg
./locale/hu_HU.po
./locale/it_IT.po
./locale/ja_JP.po
+./locale/lo_LA.po
./locale/lt_LT.po
./locale/nl_NL.po
./locale/pt_BR.po
./locale/ru_RU.po
./locale/sl_SI.po
+./locale/zh_CN.po
./tests/__init__.py
./tests/scenario_sale_supply_drop_shipment.rst
./tests/test_sale_supply_drop_shipment.py
diff --git a/trytond_sale_supply_drop_shipment.egg-info/requires.txt b/trytond_sale_supply_drop_shipment.egg-info/requires.txt
index 8c64054..a946f6a 100644
--- a/trytond_sale_supply_drop_shipment.egg-info/requires.txt
+++ b/trytond_sale_supply_drop_shipment.egg-info/requires.txt
@@ -4,4 +4,4 @@ trytond_purchase_request >= 4.0, < 4.1
trytond_sale >= 4.0, < 4.1
trytond_sale_supply >= 4.0, < 4.1
trytond_stock >= 4.0, < 4.1
-trytond >= 4.0, < 4.1
\ No newline at end of file
+trytond >= 4.0, < 4.1
commit 315e3376d71e782cf7eed8ae9501476f6577e5e4
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Fri May 27 18:26:18 2016 +0200
Merging upstream version 4.0.0.
diff --git a/CHANGELOG b/CHANGELOG
index 106f5ad..476653d 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,7 @@
+Version 4.0.0 - 2016-05-02
+* Bug fixes (see mercurial logs for details)
+* Add Python3 support
+
Version 3.8.0 - 2015-11-02
* Bug fixes (see mercurial logs for details)
* Split moves into supplier and customer moves
diff --git a/COPYRIGHT b/COPYRIGHT
index 196a420..93ef5be 100644
--- a/COPYRIGHT
+++ b/COPYRIGHT
@@ -1,5 +1,5 @@
-Copyright (C) 2011-2015 Cédric Krier.
-Copyright (C) 2011-2015 B2CK SPRL.
+Copyright (C) 2011-2016 Cédric Krier.
+Copyright (C) 2011-2016 B2CK SPRL.
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/PKG-INFO b/PKG-INFO
index d0b191b..48a3be7 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,12 +1,12 @@
Metadata-Version: 1.1
Name: trytond_sale_supply_drop_shipment
-Version: 3.8.0
+Version: 4.0.0
Summary: Tryton module for sale supply drop shipment
Home-page: http://www.tryton.org/
Author: Tryton
Author-email: issue_tracker at tryton.org
License: GPL-3
-Download-URL: http://downloads.tryton.org/3.8/
+Download-URL: http://downloads.tryton.org/4.0/
Description: sale_supply_drop_shipment
=========================
@@ -54,6 +54,7 @@ Classifier: Intended Audience :: Legal Industry
Classifier: License :: OSI Approved :: GNU General Public License (GPL)
Classifier: Natural Language :: Bulgarian
Classifier: Natural Language :: Catalan
+Classifier: Natural Language :: Chinese (Simplified)
Classifier: Natural Language :: Czech
Classifier: Natural Language :: Dutch
Classifier: Natural Language :: English
@@ -67,6 +68,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 :: Implementation :: CPython
Classifier: Programming Language :: Python :: Implementation :: PyPy
Classifier: Topic :: Office/Business
diff --git a/locale/bg_BG.po b/locale/bg_BG.po
index 861a3aa..af42203 100644
--- a/locale/bg_BG.po
+++ b/locale/bg_BG.po
@@ -239,17 +239,20 @@ msgctxt "selection:stock.shipment.drop,state:"
msgid "Waiting"
msgstr "Очакване"
+#, fuzzy
msgctxt "view:stock.shipment.drop:"
msgid "Cancel"
-msgstr ""
+msgstr "Отказан"
+#, fuzzy
msgctxt "view:stock.shipment.drop:"
msgid "Done"
-msgstr ""
+msgstr "Приключено"
+#, fuzzy
msgctxt "view:stock.shipment.drop:"
msgid "Draft"
-msgstr ""
+msgstr "Проект"
msgctxt "view:stock.shipment.drop:"
msgid "Drop Shipment"
diff --git a/locale/de_DE.po b/locale/de_DE.po
index 851979c..ad6bbd3 100644
--- a/locale/de_DE.po
+++ b/locale/de_DE.po
@@ -243,11 +243,3 @@ msgstr "Versenden"
msgctxt "view:stock.shipment.drop:"
msgid "Wait"
msgstr "Warten"
-
-msgctxt "wizard_button:purchase.request.create_purchase,ask_party,end:"
-msgid "Cancel"
-msgstr "Abbrechen"
-
-msgctxt "wizard_button:purchase.request.create_purchase,ask_party,start:"
-msgid "Continue"
-msgstr "Fortfahren"
diff --git a/locale/es_MX.po b/locale/es_MX.po
index 2bb91bc..d3c3c52 100644
--- a/locale/es_MX.po
+++ b/locale/es_MX.po
@@ -216,25 +216,30 @@ msgctxt "selection:stock.shipment.drop,state:"
msgid "Waiting"
msgstr "En espera"
+#, fuzzy
msgctxt "view:stock.shipment.drop:"
msgid "Cancel"
-msgstr ""
+msgstr "Cancelado"
+#, fuzzy
msgctxt "view:stock.shipment.drop:"
msgid "Done"
-msgstr ""
+msgstr "Finalizado"
+#, fuzzy
msgctxt "view:stock.shipment.drop:"
msgid "Draft"
-msgstr ""
+msgstr "Borrador"
+#, fuzzy
msgctxt "view:stock.shipment.drop:"
msgid "Drop Shipment"
-msgstr ""
+msgstr "Envío directo"
+#, fuzzy
msgctxt "view:stock.shipment.drop:"
msgid "Drop Shipments"
-msgstr ""
+msgstr "Envíos directos"
msgctxt "view:stock.shipment.drop:"
msgid "Ship"
diff --git a/locale/nl_NL.po b/locale/lo_LA.po
similarity index 90%
copy from locale/nl_NL.po
copy to locale/lo_LA.po
index 1465088..b8fbee0 100644
--- a/locale/nl_NL.po
+++ b/locale/lo_LA.po
@@ -20,10 +20,9 @@ msgctxt "field:purchase.product_supplier,drop_shipment:"
msgid "Drop Shipment"
msgstr ""
-#, fuzzy
msgctxt "field:purchase.purchase,customer:"
msgid "Customer"
-msgstr "Klant"
+msgstr ""
msgctxt "field:purchase.purchase,delivery_address:"
msgid "Delivery Address"
@@ -37,10 +36,9 @@ msgctxt "field:purchase.purchase,drop_shipments:"
msgid "Drop Shipments"
msgstr ""
-#, fuzzy
msgctxt "field:purchase.request,customer:"
msgid "Customer"
-msgstr "Klant"
+msgstr ""
msgctxt "field:purchase.request,delivery_address:"
msgid "Delivery Address"
@@ -66,15 +64,13 @@ msgctxt "field:stock.move,customer_drop:"
msgid "Drop Customer"
msgstr ""
-#, fuzzy
msgctxt "field:stock.shipment.drop,code:"
msgid "Code"
-msgstr "Code"
+msgstr ""
-#, fuzzy
msgctxt "field:stock.shipment.drop,company:"
msgid "Company"
-msgstr "Bedrijf"
+msgstr ""
msgctxt "field:stock.shipment.drop,contact_address:"
msgid "Contact Address"
@@ -88,10 +84,9 @@ msgctxt "field:stock.shipment.drop,create_uid:"
msgid "Create User"
msgstr ""
-#, fuzzy
msgctxt "field:stock.shipment.drop,customer:"
msgid "Customer"
-msgstr "Klant"
+msgstr ""
msgctxt "field:stock.shipment.drop,customer_moves:"
msgid "Customer Moves"
@@ -101,43 +96,37 @@ msgctxt "field:stock.shipment.drop,delivery_address:"
msgid "Delivery Address"
msgstr ""
-#, fuzzy
msgctxt "field:stock.shipment.drop,effective_date:"
msgid "Effective Date"
-msgstr "Effectieve datum"
+msgstr ""
msgctxt "field:stock.shipment.drop,id:"
msgid "ID"
msgstr ""
-#, fuzzy
msgctxt "field:stock.shipment.drop,moves:"
msgid "Moves"
-msgstr "Boekingen"
+msgstr ""
msgctxt "field:stock.shipment.drop,planned_date:"
msgid "Planned Date"
msgstr ""
-#, fuzzy
msgctxt "field:stock.shipment.drop,rec_name:"
msgid "Name"
-msgstr "Naam bijlage"
+msgstr ""
-#, fuzzy
msgctxt "field:stock.shipment.drop,reference:"
msgid "Reference"
-msgstr "Referentie"
+msgstr ""
-#, fuzzy
msgctxt "field:stock.shipment.drop,state:"
msgid "State"
-msgstr "Status"
+msgstr ""
-#, fuzzy
msgctxt "field:stock.shipment.drop,supplier:"
msgid "Supplier"
-msgstr "Leverancier"
+msgstr ""
msgctxt "field:stock.shipment.drop,supplier_moves:"
msgid "Supplier Moves"
@@ -168,22 +157,20 @@ msgctxt ""
msgid "All"
msgstr ""
-#, fuzzy
msgctxt ""
"model:ir.action.act_window.domain,name:act_shipment_drop_form_domain_draft"
msgid "Draft"
-msgstr "Concept"
+msgstr ""
msgctxt ""
"model:ir.action.act_window.domain,name:act_shipment_drop_form_domain_shipped"
msgid "Shipped"
msgstr ""
-#, fuzzy
msgctxt ""
"model:ir.action.act_window.domain,name:act_shipment_drop_form_domain_waiting"
msgid "Waiting"
-msgstr "In afwachting"
+msgstr ""
msgctxt "model:ir.sequence,name:sequence_shipment_drop"
msgid "Drop Shipment"
@@ -205,29 +192,25 @@ msgctxt "model:stock.shipment.drop,name:"
msgid "Drop Shipment"
msgstr ""
-#, fuzzy
msgctxt "selection:stock.shipment.drop,state:"
msgid "Canceled"
-msgstr "Geannuleerd"
+msgstr ""
-#, fuzzy
msgctxt "selection:stock.shipment.drop,state:"
msgid "Done"
-msgstr "Klaar"
+msgstr ""
-#, fuzzy
msgctxt "selection:stock.shipment.drop,state:"
msgid "Draft"
-msgstr "Concept"
+msgstr ""
msgctxt "selection:stock.shipment.drop,state:"
msgid "Shipped"
msgstr ""
-#, fuzzy
msgctxt "selection:stock.shipment.drop,state:"
msgid "Waiting"
-msgstr "In afwachting"
+msgstr ""
msgctxt "view:stock.shipment.drop:"
msgid "Cancel"
diff --git a/locale/nl_NL.po b/locale/nl_NL.po
index 1465088..5dd01e1 100644
--- a/locale/nl_NL.po
+++ b/locale/nl_NL.po
@@ -229,17 +229,20 @@ msgctxt "selection:stock.shipment.drop,state:"
msgid "Waiting"
msgstr "In afwachting"
+#, fuzzy
msgctxt "view:stock.shipment.drop:"
msgid "Cancel"
-msgstr ""
+msgstr "Geannuleerd"
+#, fuzzy
msgctxt "view:stock.shipment.drop:"
msgid "Done"
-msgstr ""
+msgstr "Klaar"
+#, fuzzy
msgctxt "view:stock.shipment.drop:"
msgid "Draft"
-msgstr ""
+msgstr "Concept"
msgctxt "view:stock.shipment.drop:"
msgid "Drop Shipment"
diff --git a/locale/ru_RU.po b/locale/ru_RU.po
index 4e6fd37..37bc515 100644
--- a/locale/ru_RU.po
+++ b/locale/ru_RU.po
@@ -240,17 +240,20 @@ msgctxt "selection:stock.shipment.drop,state:"
msgid "Waiting"
msgstr "Ожидание"
+#, fuzzy
msgctxt "view:stock.shipment.drop:"
msgid "Cancel"
-msgstr ""
+msgstr "Отменено"
+#, fuzzy
msgctxt "view:stock.shipment.drop:"
msgid "Done"
-msgstr ""
+msgstr "Выполнено"
+#, fuzzy
msgctxt "view:stock.shipment.drop:"
msgid "Draft"
-msgstr ""
+msgstr "Черновик"
msgctxt "view:stock.shipment.drop:"
msgid "Drop Shipment"
diff --git a/locale/nl_NL.po b/locale/zh_CN.po
similarity index 90%
copy from locale/nl_NL.po
copy to locale/zh_CN.po
index 1465088..b8fbee0 100644
--- a/locale/nl_NL.po
+++ b/locale/zh_CN.po
@@ -20,10 +20,9 @@ msgctxt "field:purchase.product_supplier,drop_shipment:"
msgid "Drop Shipment"
msgstr ""
-#, fuzzy
msgctxt "field:purchase.purchase,customer:"
msgid "Customer"
-msgstr "Klant"
+msgstr ""
msgctxt "field:purchase.purchase,delivery_address:"
msgid "Delivery Address"
@@ -37,10 +36,9 @@ msgctxt "field:purchase.purchase,drop_shipments:"
msgid "Drop Shipments"
msgstr ""
-#, fuzzy
msgctxt "field:purchase.request,customer:"
msgid "Customer"
-msgstr "Klant"
+msgstr ""
msgctxt "field:purchase.request,delivery_address:"
msgid "Delivery Address"
@@ -66,15 +64,13 @@ msgctxt "field:stock.move,customer_drop:"
msgid "Drop Customer"
msgstr ""
-#, fuzzy
msgctxt "field:stock.shipment.drop,code:"
msgid "Code"
-msgstr "Code"
+msgstr ""
-#, fuzzy
msgctxt "field:stock.shipment.drop,company:"
msgid "Company"
-msgstr "Bedrijf"
+msgstr ""
msgctxt "field:stock.shipment.drop,contact_address:"
msgid "Contact Address"
@@ -88,10 +84,9 @@ msgctxt "field:stock.shipment.drop,create_uid:"
msgid "Create User"
msgstr ""
-#, fuzzy
msgctxt "field:stock.shipment.drop,customer:"
msgid "Customer"
-msgstr "Klant"
+msgstr ""
msgctxt "field:stock.shipment.drop,customer_moves:"
msgid "Customer Moves"
@@ -101,43 +96,37 @@ msgctxt "field:stock.shipment.drop,delivery_address:"
msgid "Delivery Address"
msgstr ""
-#, fuzzy
msgctxt "field:stock.shipment.drop,effective_date:"
msgid "Effective Date"
-msgstr "Effectieve datum"
+msgstr ""
msgctxt "field:stock.shipment.drop,id:"
msgid "ID"
msgstr ""
-#, fuzzy
msgctxt "field:stock.shipment.drop,moves:"
msgid "Moves"
-msgstr "Boekingen"
+msgstr ""
msgctxt "field:stock.shipment.drop,planned_date:"
msgid "Planned Date"
msgstr ""
-#, fuzzy
msgctxt "field:stock.shipment.drop,rec_name:"
msgid "Name"
-msgstr "Naam bijlage"
+msgstr ""
-#, fuzzy
msgctxt "field:stock.shipment.drop,reference:"
msgid "Reference"
-msgstr "Referentie"
+msgstr ""
-#, fuzzy
msgctxt "field:stock.shipment.drop,state:"
msgid "State"
-msgstr "Status"
+msgstr ""
-#, fuzzy
msgctxt "field:stock.shipment.drop,supplier:"
msgid "Supplier"
-msgstr "Leverancier"
+msgstr ""
msgctxt "field:stock.shipment.drop,supplier_moves:"
msgid "Supplier Moves"
@@ -168,22 +157,20 @@ msgctxt ""
msgid "All"
msgstr ""
-#, fuzzy
msgctxt ""
"model:ir.action.act_window.domain,name:act_shipment_drop_form_domain_draft"
msgid "Draft"
-msgstr "Concept"
+msgstr ""
msgctxt ""
"model:ir.action.act_window.domain,name:act_shipment_drop_form_domain_shipped"
msgid "Shipped"
msgstr ""
-#, fuzzy
msgctxt ""
"model:ir.action.act_window.domain,name:act_shipment_drop_form_domain_waiting"
msgid "Waiting"
-msgstr "In afwachting"
+msgstr ""
msgctxt "model:ir.sequence,name:sequence_shipment_drop"
msgid "Drop Shipment"
@@ -205,29 +192,25 @@ msgctxt "model:stock.shipment.drop,name:"
msgid "Drop Shipment"
msgstr ""
-#, fuzzy
msgctxt "selection:stock.shipment.drop,state:"
msgid "Canceled"
-msgstr "Geannuleerd"
+msgstr ""
-#, fuzzy
msgctxt "selection:stock.shipment.drop,state:"
msgid "Done"
-msgstr "Klaar"
+msgstr ""
-#, fuzzy
msgctxt "selection:stock.shipment.drop,state:"
msgid "Draft"
-msgstr "Concept"
+msgstr ""
msgctxt "selection:stock.shipment.drop,state:"
msgid "Shipped"
msgstr ""
-#, fuzzy
msgctxt "selection:stock.shipment.drop,state:"
msgid "Waiting"
-msgstr "In afwachting"
+msgstr ""
msgctxt "view:stock.shipment.drop:"
msgid "Cancel"
diff --git a/purchase.py b/purchase.py
index 6092e13..4319d34 100644
--- a/purchase.py
+++ b/purchase.py
@@ -1,6 +1,6 @@
# 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.model import fields, ModelView, Workflow
+from trytond.model import fields
from trytond.pyson import Eval
from trytond.pool import Pool, PoolMeta
from trytond.transaction import Transaction
@@ -9,10 +9,10 @@ from trytond.tools import grouped_slice
__all__ = ['PurchaseRequest', 'PurchaseConfig', 'Purchase', 'PurchaseLine',
'ProductSupplier', 'CreatePurchase', 'PurchaseHandleShipmentException']
-__metaclass__ = PoolMeta
class PurchaseRequest:
+ __metaclass__ = PoolMeta
__name__ = 'purchase.request'
customer = fields.Many2One('party.party', 'Customer', readonly=True,
@@ -29,6 +29,7 @@ class PurchaseRequest:
class PurchaseConfig:
+ __metaclass__ = PoolMeta
__name__ = 'purchase.configuration'
purchase_drop_location = fields.Property(
@@ -37,6 +38,7 @@ class PurchaseConfig:
class Purchase:
+ __metaclass__ = PoolMeta
__name__ = 'purchase.purchase'
customer = fields.Many2One('party.party', 'Customer', readonly=True,
@@ -122,26 +124,9 @@ class Purchase:
delivery_address=self.delivery_address,
)
- @classmethod
- @ModelView.button
- @Workflow.transition('cancel')
- def cancel(cls, purchases):
- pool = Pool()
- SaleLine = pool.get('sale.line')
- Move = pool.get('stock.move')
-
- super(Purchase, cls).cancel(purchases)
- sale_lines = []
- for sub_purchases in grouped_slice(purchases):
- sale_lines += SaleLine.search([
- ('purchase_request.purchase_line.purchase', 'in',
- [p.id for p in sub_purchases]),
- ])
- Move.cancel([m for sl in sale_lines for m in sl.moves
- if m.state != 'done' and m.from_location.type == 'drop'])
-
class PurchaseLine:
+ __metaclass__ = PoolMeta
__name__ = 'purchase.line'
def get_to_location(self, name):
@@ -150,14 +135,15 @@ class PurchaseLine:
return self.purchase.drop_location.id
return result
- def get_move(self):
- move = super(PurchaseLine, self).get_move()
+ def get_move(self, move_type):
+ move = super(PurchaseLine, self).get_move(move_type)
if move and self.purchase.customer:
move.cost_price = move.unit_price
return move
class ProductSupplier:
+ __metaclass__ = PoolMeta
__name__ = 'purchase.product_supplier'
drop_shipment = fields.Boolean('Drop Shipment',
@@ -168,6 +154,7 @@ class ProductSupplier:
class CreatePurchase:
+ __metaclass__ = PoolMeta
__name__ = 'purchase.request.create_purchase'
@classmethod
@@ -183,6 +170,7 @@ class CreatePurchase:
class PurchaseHandleShipmentException:
+ __metaclass__ = PoolMeta
__name__ = 'purchase.handle.shipment.exception'
def transition_handle(self):
diff --git a/purchase.xml b/purchase.xml
index 0c6c05e..78b9460 100644
--- a/purchase.xml
+++ b/purchase.xml
@@ -37,14 +37,14 @@ this repository contains the full copyright notices and license terms. -->
<record model="ir.ui.view" id="purchase_request_view_form">
<field name="model">purchase.request</field>
- <field name="inherit" ref="stock_supply.purchase_request_view_form"/>
+ <field name="inherit" ref="purchase_request.purchase_request_view_form"/>
<field name="name">purchase_request_form</field>
</record>
<record model="ir.ui.view" id="purchase_request_view_tree">
<field name="model">purchase.request</field>
<field name="inherit"
- ref="stock_supply.purchase_request_view_tree"/>
+ ref="purchase_request.purchase_request_view_tree"/>
<field name="name">purchase_request_tree</field>
</record>
diff --git a/sale.py b/sale.py
index 9848943..e1f1a7c 100644
--- a/sale.py
+++ b/sale.py
@@ -6,10 +6,10 @@ from trytond.pool import Pool, PoolMeta
from trytond.transaction import Transaction
__all__ = ['SaleConfig', 'Sale', 'SaleLine']
-__metaclass__ = PoolMeta
class SaleConfig:
+ __metaclass__ = PoolMeta
__name__ = 'sale.configuration'
sale_drop_location = fields.Property(
@@ -18,6 +18,7 @@ class SaleConfig:
class Sale:
+ __metaclass__ = PoolMeta
__name__ = 'sale.sale'
drop_shipments = fields.Function(fields.One2Many('stock.shipment.drop',
@@ -60,6 +61,7 @@ class Sale:
class SaleLine:
+ __metaclass__ = PoolMeta
__name__ = 'sale.line'
@property
diff --git a/setup.py b/setup.py
index afed3e3..9acd867 100644
--- a/setup.py
+++ b/setup.py
@@ -5,11 +5,17 @@
from setuptools import setup
import re
import os
-import ConfigParser
+import io
+try:
+ from configparser import ConfigParser
+except ImportError:
+ from ConfigParser import ConfigParser
def read(fname):
- return open(os.path.join(os.path.dirname(__file__), fname)).read()
+ return io.open(
+ os.path.join(os.path.dirname(__file__), fname),
+ 'r', encoding='utf-8').read()
def get_require_version(name):
@@ -21,7 +27,7 @@ def get_require_version(name):
major_version, minor_version + 1)
return require
-config = ConfigParser.ConfigParser()
+config = ConfigParser()
config.readfp(open('tryton.cfg'))
info = dict(config.items('tryton'))
for key in ('depends', 'extras_depend', 'xml'):
@@ -43,7 +49,7 @@ if minor_version % 2:
requires = []
for dep in info.get('depends', []):
- if not re.match(r'(ir|res|webdav)(\W|$)', dep):
+ if not re.match(r'(ir|res)(\W|$)', dep):
requires.append(get_require_version('trytond_%s' % dep))
requires.append(get_require_version('trytond'))
@@ -81,6 +87,7 @@ setup(name=name,
'License :: OSI Approved :: GNU General Public License (GPL)',
'Natural Language :: Bulgarian',
'Natural Language :: Catalan',
+ 'Natural Language :: Chinese (Simplified)',
'Natural Language :: Czech',
'Natural Language :: Dutch',
'Natural Language :: English',
@@ -94,6 +101,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 :: Implementation :: CPython',
'Programming Language :: Python :: Implementation :: PyPy',
'Topic :: Office/Business',
@@ -110,4 +120,8 @@ setup(name=name,
test_suite='tests',
test_loader='trytond.test_loader:Loader',
tests_require=tests_require,
+ use_2to3=True,
+ convert_2to3_doctests=[
+ 'tests/scenario_sale_supply_drop_shipment.rst',
+ ],
)
diff --git a/stock.py b/stock.py
index c4f5c3f..90a5f23 100644
--- a/stock.py
+++ b/stock.py
@@ -14,10 +14,10 @@ from trytond.tools import grouped_slice
__all__ = ['Configuration', 'ShipmentDrop', 'Move']
-__metaclass__ = PoolMeta
class Configuration:
+ __metaclass__ = PoolMeta
__name__ = 'stock.configuration'
shipment_drop_sequence = fields.Property(fields.Many2One('ir.sequence',
@@ -125,7 +125,7 @@ class ShipmentDrop(Workflow, ModelSQL, ModelView):
purchase_request = PurchaseRequest.__table__()
sale_line = SaleLine.__table__()
location = Location.__table__()
- cursor = Transaction().cursor
+ cursor = Transaction().connection.cursor()
super(ShipmentDrop, cls).__register__(module_name)
@@ -445,6 +445,7 @@ class ShipmentDrop(Workflow, ModelSQL, ModelView):
class Move:
+ __metaclass__ = PoolMeta
__name__ = 'stock.move'
customer_drop = fields.Function(fields.Many2One('party.party',
diff --git a/tests/__init__.py b/tests/__init__.py
index a1d8f9e..204397c 100644
--- a/tests/__init__.py
+++ b/tests/__init__.py
@@ -1,6 +1,9 @@
# 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 test_sale_supply_drop_shipment import suite
+try:
+ from trytond.modules.sale_supply_drop_shipment.tests.test_sale_supply_drop_shipment import suite
+except ImportError:
+ from .test_sale_supply_drop_shipment import suite
__all__ = ['suite']
diff --git a/tests/scenario_sale_supply_drop_shipment.rst b/tests/scenario_sale_supply_drop_shipment.rst
index 64da2fc..061e37c 100644
--- a/tests/scenario_sale_supply_drop_shipment.rst
+++ b/tests/scenario_sale_supply_drop_shipment.rst
@@ -12,7 +12,7 @@ Imports::
... get_company
>>> from trytond.modules.account.tests.tools import create_fiscalyear, \
... create_chart, get_accounts
- >>> from.trytond.modules.account_invoice.tests.tools import \
+ >>> from trytond.modules.account_invoice.tests.tools import \
... set_fiscalyear_invoice_sequences, create_payment_term
>>> today = datetime.date.today()
@@ -101,12 +101,6 @@ Create parties::
>>> customer = Party(name='Customer')
>>> customer.save()
-Create category::
-
- >>> ProductCategory = Model.get('product.category')
- >>> category = ProductCategory(name='Category')
- >>> category.save()
-
Create product::
>>> ProductUom = Model.get('product.uom')
@@ -117,7 +111,6 @@ Create product::
>>> product = Product()
>>> template = ProductTemplate()
>>> template.name = 'product'
- >>> template.category = category
>>> template.default_uom = unit
>>> template.type = 'goods'
>>> template.purchasable = True
@@ -134,7 +127,7 @@ Create product::
>>> product_supplier.product = template
>>> product_supplier.party = supplier
>>> product_supplier.drop_shipment = True
- >>> product_supplier.delivery_time = 0
+ >>> product_supplier.lead_time = datetime.timedelta(0)
>>> product_supplier.save()
Create payment term::
@@ -276,6 +269,37 @@ Cancelling the workflow on the purchase step::
... [purchase_request])
>>> purchase, = Purchase.find([('state', '=', 'draft')])
>>> purchase.click('cancel')
+ >>> purchase_request.state
+ 'exception'
+
+Let's reset the purchase request and create a new purchase::
+
+ >>> handle_exception = Wizard(
+ ... 'purchase.request.handle.purchase.cancellation',
+ ... [purchase_request])
+ >>> handle_exception.execute('reset')
+ >>> purchase_request.state
+ 'draft'
+
+ >>> create_purchase = Wizard('purchase.request.create_purchase',
+ ... [purchase_request])
+ >>> purchase, = Purchase.find([('state', '=', 'draft')])
+ >>> purchase_request.state
+ 'purchased'
+
+Let's cancel it again and cancel the request in order to manage the process on
+the sale::
+
+ >>> purchase.click('cancel')
+ >>> purchase_request.reload()
+ >>> purchase_request.state
+ 'exception'
+ >>> handle_exception = Wizard(
+ ... 'purchase.request.handle.purchase.cancellation',
+ ... [purchase_request])
+ >>> handle_exception.execute('cancel_request')
+ >>> purchase_request.state
+ 'cancel'
The sale is then in exception::
diff --git a/tests/test_sale_supply_drop_shipment.py b/tests/test_sale_supply_drop_shipment.py
index bcb51b2..d4e90cd 100644
--- a/tests/test_sale_supply_drop_shipment.py
+++ b/tests/test_sale_supply_drop_shipment.py
@@ -5,6 +5,7 @@ import doctest
import trytond.tests.test_tryton
from trytond.tests.test_tryton import ModuleTestCase
from trytond.tests.test_tryton import doctest_setup, doctest_teardown
+from trytond.tests.test_tryton import doctest_checker
class SaleSupplyDropShipmentTestCase(ModuleTestCase):
@@ -19,5 +20,6 @@ def suite():
suite.addTests(doctest.DocFileSuite(
'scenario_sale_supply_drop_shipment.rst',
setUp=doctest_setup, tearDown=doctest_teardown, encoding='utf-8',
+ checker=doctest_checker,
optionflags=doctest.REPORT_ONLY_FIRST_FAILURE))
return suite
diff --git a/tryton.cfg b/tryton.cfg
index 833794e..d3e63e5 100644
--- a/tryton.cfg
+++ b/tryton.cfg
@@ -1,9 +1,10 @@
[tryton]
-version=3.8.0
+version=4.0.0
depends:
company
ir
purchase
+ purchase_request
sale
sale_supply
stock
diff --git a/trytond_sale_supply_drop_shipment.egg-info/PKG-INFO b/trytond_sale_supply_drop_shipment.egg-info/PKG-INFO
index cca4d21..42b4ead 100644
--- a/trytond_sale_supply_drop_shipment.egg-info/PKG-INFO
+++ b/trytond_sale_supply_drop_shipment.egg-info/PKG-INFO
@@ -1,12 +1,12 @@
Metadata-Version: 1.1
Name: trytond-sale-supply-drop-shipment
-Version: 3.8.0
+Version: 4.0.0
Summary: Tryton module for sale supply drop shipment
Home-page: http://www.tryton.org/
Author: Tryton
Author-email: issue_tracker at tryton.org
License: GPL-3
-Download-URL: http://downloads.tryton.org/3.8/
+Download-URL: http://downloads.tryton.org/4.0/
Description: sale_supply_drop_shipment
=========================
@@ -54,6 +54,7 @@ Classifier: Intended Audience :: Legal Industry
Classifier: License :: OSI Approved :: GNU General Public License (GPL)
Classifier: Natural Language :: Bulgarian
Classifier: Natural Language :: Catalan
+Classifier: Natural Language :: Chinese (Simplified)
Classifier: Natural Language :: Czech
Classifier: Natural Language :: Dutch
Classifier: Natural Language :: English
@@ -67,6 +68,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 :: Implementation :: CPython
Classifier: Programming Language :: Python :: Implementation :: PyPy
Classifier: Topic :: Office/Business
diff --git a/trytond_sale_supply_drop_shipment.egg-info/SOURCES.txt b/trytond_sale_supply_drop_shipment.egg-info/SOURCES.txt
index 9c4b57f..fffffd9 100644
--- a/trytond_sale_supply_drop_shipment.egg-info/SOURCES.txt
+++ b/trytond_sale_supply_drop_shipment.egg-info/SOURCES.txt
@@ -62,11 +62,13 @@ locale/fr_FR.po
locale/hu_HU.po
locale/it_IT.po
locale/ja_JP.po
+locale/lo_LA.po
locale/lt_LT.po
locale/nl_NL.po
locale/pt_BR.po
locale/ru_RU.po
locale/sl_SI.po
+locale/zh_CN.po
tests/scenario_sale_supply_drop_shipment.rst
trytond_sale_supply_drop_shipment.egg-info/PKG-INFO
trytond_sale_supply_drop_shipment.egg-info/SOURCES.txt
diff --git a/trytond_sale_supply_drop_shipment.egg-info/requires.txt b/trytond_sale_supply_drop_shipment.egg-info/requires.txt
index 2e81335..8c64054 100644
--- a/trytond_sale_supply_drop_shipment.egg-info/requires.txt
+++ b/trytond_sale_supply_drop_shipment.egg-info/requires.txt
@@ -1,6 +1,7 @@
-trytond_company >= 3.8, < 3.9
-trytond_purchase >= 3.8, < 3.9
-trytond_sale >= 3.8, < 3.9
-trytond_sale_supply >= 3.8, < 3.9
-trytond_stock >= 3.8, < 3.9
-trytond >= 3.8, < 3.9
\ No newline at end of file
+trytond_company >= 4.0, < 4.1
+trytond_purchase >= 4.0, < 4.1
+trytond_purchase_request >= 4.0, < 4.1
+trytond_sale >= 4.0, < 4.1
+trytond_sale_supply >= 4.0, < 4.1
+trytond_stock >= 4.0, < 4.1
+trytond >= 4.0, < 4.1
\ No newline at end of file
diff --git a/view/product_supplier_form.xml b/view/product_supplier_form.xml
index f304bb4..7de0c1e 100644
--- a/view/product_supplier_form.xml
+++ b/view/product_supplier_form.xml
@@ -2,7 +2,7 @@
<!-- This file is part of Tryton. The COPYRIGHT file at the top level of
this repository contains the full copyright notices and license terms. -->
<data>
- <xpath expr="/form/field[@name='delivery_time']" position="after">
+ <xpath expr="/form/field[@name='lead_time']" position="after">
<label name="drop_shipment"/>
<field name="drop_shipment"/>
</xpath>
diff --git a/view/purchase_form.xml b/view/purchase_form.xml
index 4fa2dc8..fbbcc75 100644
--- a/view/purchase_form.xml
+++ b/view/purchase_form.xml
@@ -2,7 +2,7 @@
<!-- This file is part of Tryton. The COPYRIGHT file at the top level of
this repository contains the full copyright notices and license terms. -->
<data>
- <xpath expr="/form/field[@name='supplier_reference']" position="after">
+ <xpath expr="/form/field[@name='reference']" position="after">
<label name="customer"/>
<field name="customer"/>
<label name="delivery_address"/>
--
tryton-modules-sale-supply-drop-shipment
More information about the tryton-debian-vcs
mailing list