[tryton-debian-vcs] tryton-modules-sale-shipment-cost branch debian updated. debian/4.0.0-1-4-g70d6f6a
Mathias Behrle
tryton-debian-vcs at alioth.debian.org
Tue Dec 6 16:06:31 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-shipment-cost.git;a=commitdiff;h=debian/4.0.0-1-4-g70d6f6a
commit 70d6f6ad29538a7ed7376ab627e2a4ca4f52811d
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Tue Dec 6 10:58:26 2016 +0100
Releasing debian version 4.2.0-1.
Signed-off-by: Mathias Behrle <mathiasb at m9s.biz>
diff --git a/debian/changelog b/debian/changelog
index 9bf28cc..e73b7aa 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+tryton-modules-sale-shipment-cost (4.2.0-1) unstable; urgency=medium
+
+ * Updating to Standards-Version: 3.9.8, no changes needed.
+ * Merging upstream version 4.2.0.
+ * Updating debian/copyright.
+
+ -- Mathias Behrle <mathiasb at m9s.biz> Mon, 05 Dec 2016 15:31:34 +0100
+
tryton-modules-sale-shipment-cost (4.0.0-1) unstable; urgency=medium
* Updating signing-key.asc with the actual upstream maintainer keys.
commit e5c1be76c7f8f9b5dc4ba89d589cb71bf360dd26
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Mon Dec 5 09:42:23 2016 +0100
Updating debian/copyright.
diff --git a/debian/copyright b/debian/copyright
index 4e87fd8..829d2db 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -3,7 +3,7 @@ Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
Files: *
Copyright: 2011-2016 Cédric Krier
2011-2013 Bertrand Chenal
- 2011-2015 Nicolas Évrard
+ 2011-2016 Nicolas Évrard
2011-2016 B2CK SPRL
License: GPL-3+
commit 2daad339fb0975d9eb834cb8dbe476feee65b34a
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Mon Dec 5 09:34:44 2016 +0100
Merging upstream version 4.2.0.
diff --git a/CHANGELOG b/CHANGELOG
index b1e4f3a..80f3050 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,7 @@
+Version 4.2.0 - 2016-11-28
+* Bug fixes (see mercurial logs for details)
+* Use Carrier Selection instead of a company wise default value
+
Version 4.0.0 - 2016-05-02
* Bug fixes (see mercurial logs for details)
* Add Python3 support
diff --git a/COPYRIGHT b/COPYRIGHT
index b8eb554..2d2b387 100644
--- a/COPYRIGHT
+++ b/COPYRIGHT
@@ -1,6 +1,6 @@
Copyright (C) 2011-2016 Cédric Krier.
Copyright (C) 2011-2013 Bertrand Chenal.
-Copyright (C) 2011-2015 Nicolas Évrard.
+Copyright (C) 2011-2016 Nicolas Évrard.
Copyright (C) 2011-2016 B2CK SPRL.
This program is free software: you can redistribute it and/or modify
diff --git a/INSTALL b/INSTALL
index 0a6912f..ffeb05a 100644
--- a/INSTALL
+++ b/INSTALL
@@ -27,7 +27,7 @@ site-packages directory on your system.
For advanced options, please refer to the easy_install and/or the distutils
documentation:
- http://peak.telecommunity.com/DevCenter/EasyInstall
+ http://setuptools.readthedocs.io/en/latest/easy_install.html
http://docs.python.org/inst/inst.html
To use without installation, extract the archive into ``trytond/modules`` with
diff --git a/PKG-INFO b/PKG-INFO
index 7f38c65..6be448f 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,12 +1,12 @@
Metadata-Version: 1.1
Name: trytond_sale_shipment_cost
-Version: 4.0.0
+Version: 4.2.0
Summary: Tryton module for sale shipment cost
Home-page: http://www.tryton.org/
Author: Tryton
Author-email: issue_tracker at tryton.org
License: GPL-3
-Download-URL: http://downloads.tryton.org/4.0/
+Download-URL: http://downloads.tryton.org/4.2/
Description: trytond_sale_shipment_cost
==========================
@@ -63,6 +63,7 @@ Classifier: Natural Language :: French
Classifier: Natural Language :: German
Classifier: Natural Language :: Hungarian
Classifier: Natural Language :: Italian
+Classifier: Natural Language :: Polish
Classifier: Natural Language :: Portuguese (Brazilian)
Classifier: Natural Language :: Russian
Classifier: Natural Language :: Slovenian
diff --git a/locale/bg_BG.po b/locale/bg.po
similarity index 94%
rename from locale/bg_BG.po
rename to locale/bg.po
index d8c84c9..2536e13 100644
--- a/locale/bg_BG.po
+++ b/locale/bg.po
@@ -6,10 +6,6 @@ msgctxt "error:stock.shipment.out:"
msgid "Missing \"Account Revenue\" on product \"%s\"."
msgstr ""
-msgctxt "field:sale.configuration,sale_carrier:"
-msgid "Carrier"
-msgstr "Превозвач"
-
msgctxt "field:sale.configuration,sale_shipment_cost_method:"
msgid "Sale Shipment Cost Method"
msgstr "Начин на остойностяване на доставка на продажба"
@@ -18,6 +14,10 @@ msgctxt "field:sale.line,shipment_cost:"
msgid "Shipment Cost"
msgstr "Стойност на пратка"
+msgctxt "field:sale.sale,available_carriers:"
+msgid "Available Carriers"
+msgstr ""
+
msgctxt "field:sale.sale,carrier:"
msgid "Carrier"
msgstr "Превозвач"
diff --git a/locale/ca_ES.po b/locale/ca.po
similarity index 93%
rename from locale/ca_ES.po
rename to locale/ca.po
index 4479e5e..44c2029 100644
--- a/locale/ca_ES.po
+++ b/locale/ca.po
@@ -6,10 +6,6 @@ msgctxt "error:stock.shipment.out:"
msgid "Missing \"Account Revenue\" on product \"%s\"."
msgstr "No es troba el \"Compte d'ingressos\" al producte \"%s\"."
-msgctxt "field:sale.configuration,sale_carrier:"
-msgid "Carrier"
-msgstr "Transportista"
-
msgctxt "field:sale.configuration,sale_shipment_cost_method:"
msgid "Sale Shipment Cost Method"
msgstr "Mètode de cost enviament"
@@ -18,6 +14,10 @@ msgctxt "field:sale.line,shipment_cost:"
msgid "Shipment Cost"
msgstr "Cost d'enviament"
+msgctxt "field:sale.sale,available_carriers:"
+msgid "Available Carriers"
+msgstr "Transportistes disponibles"
+
msgctxt "field:sale.sale,carrier:"
msgid "Carrier"
msgstr "Transportista"
diff --git a/locale/cs_CZ.po b/locale/cs.po
similarity index 94%
rename from locale/cs_CZ.po
rename to locale/cs.po
index ee9d41e..0b53c50 100644
--- a/locale/cs_CZ.po
+++ b/locale/cs.po
@@ -6,10 +6,6 @@ msgctxt "error:stock.shipment.out:"
msgid "Missing \"Account Revenue\" on product \"%s\"."
msgstr ""
-msgctxt "field:sale.configuration,sale_carrier:"
-msgid "Carrier"
-msgstr ""
-
msgctxt "field:sale.configuration,sale_shipment_cost_method:"
msgid "Sale Shipment Cost Method"
msgstr ""
@@ -18,6 +14,10 @@ msgctxt "field:sale.line,shipment_cost:"
msgid "Shipment Cost"
msgstr ""
+msgctxt "field:sale.sale,available_carriers:"
+msgid "Available Carriers"
+msgstr ""
+
msgctxt "field:sale.sale,carrier:"
msgid "Carrier"
msgstr ""
diff --git a/locale/de_DE.po b/locale/de.po
similarity index 93%
rename from locale/de_DE.po
rename to locale/de.po
index 8ad1465..268ccd6 100644
--- a/locale/de_DE.po
+++ b/locale/de.po
@@ -6,10 +6,6 @@ msgctxt "error:stock.shipment.out:"
msgid "Missing \"Account Revenue\" on product \"%s\"."
msgstr "Fehlendes Ertragskonto für Artikel \"%s\"."
-msgctxt "field:sale.configuration,sale_carrier:"
-msgid "Carrier"
-msgstr "Frachtführer"
-
msgctxt "field:sale.configuration,sale_shipment_cost_method:"
msgid "Sale Shipment Cost Method"
msgstr "Lieferposten Kostenmethode Verkauf"
@@ -18,6 +14,10 @@ msgctxt "field:sale.line,shipment_cost:"
msgid "Shipment Cost"
msgstr "Lieferposten Kosten"
+msgctxt "field:sale.sale,available_carriers:"
+msgid "Available Carriers"
+msgstr "Verfügbare Frachtführer"
+
msgctxt "field:sale.sale,carrier:"
msgid "Carrier"
msgstr "Frachtführer"
diff --git a/locale/es_ES.po b/locale/es.po
similarity index 93%
rename from locale/es_ES.po
rename to locale/es.po
index 7cde4ce..517e8e7 100644
--- a/locale/es_ES.po
+++ b/locale/es.po
@@ -6,10 +6,6 @@ msgctxt "error:stock.shipment.out:"
msgid "Missing \"Account Revenue\" on product \"%s\"."
msgstr "Falta la \"Cuenta de ingresos\" en el producto \"%s\"."
-msgctxt "field:sale.configuration,sale_carrier:"
-msgid "Carrier"
-msgstr "Transportista"
-
msgctxt "field:sale.configuration,sale_shipment_cost_method:"
msgid "Sale Shipment Cost Method"
msgstr "Método de coste envío"
@@ -18,6 +14,10 @@ msgctxt "field:sale.line,shipment_cost:"
msgid "Shipment Cost"
msgstr "Coste de envío"
+msgctxt "field:sale.sale,available_carriers:"
+msgid "Available Carriers"
+msgstr "Transportistas disponibles"
+
msgctxt "field:sale.sale,carrier:"
msgid "Carrier"
msgstr "Transportista"
diff --git a/locale/es_EC.po b/locale/es_419.po
similarity index 82%
rename from locale/es_EC.po
rename to locale/es_419.po
index 340c063..bd698d7 100644
--- a/locale/es_EC.po
+++ b/locale/es_419.po
@@ -4,11 +4,7 @@ msgstr "Content-Type: text/plain; charset=utf-8\n"
msgctxt "error:stock.shipment.out:"
msgid "Missing \"Account Revenue\" on product \"%s\"."
-msgstr "Falta la \"Cuenta de ingresos\" en el producto \"%s\"."
-
-msgctxt "field:sale.configuration,sale_carrier:"
-msgid "Carrier"
-msgstr "Transporte"
+msgstr ""
msgctxt "field:sale.configuration,sale_shipment_cost_method:"
msgid "Sale Shipment Cost Method"
@@ -18,9 +14,13 @@ msgctxt "field:sale.line,shipment_cost:"
msgid "Shipment Cost"
msgstr "Costo de envío"
+msgctxt "field:sale.sale,available_carriers:"
+msgid "Available Carriers"
+msgstr ""
+
msgctxt "field:sale.sale,carrier:"
msgid "Carrier"
-msgstr "Transporte"
+msgstr ""
msgctxt "field:sale.sale,shipment_cost_method:"
msgid "Shipment Cost Method"
@@ -28,7 +28,7 @@ msgstr "Método de costo de envío"
msgctxt "field:stock.shipment.out,carrier:"
msgid "Carrier"
-msgstr "Transporte"
+msgstr ""
msgctxt "field:stock.shipment.out,cost:"
msgid "Cost"
@@ -48,16 +48,16 @@ msgstr "Línea de factura de costo"
msgctxt "selection:sale.configuration,sale_shipment_cost_method:"
msgid "On Order"
-msgstr "Sobre el pedido"
+msgstr ""
msgctxt "selection:sale.configuration,sale_shipment_cost_method:"
msgid "On Shipment"
-msgstr "Sobre el envío"
+msgstr "En el envío"
msgctxt "selection:sale.sale,shipment_cost_method:"
msgid "On Order"
-msgstr "Sobre el pedido"
+msgstr ""
msgctxt "selection:sale.sale,shipment_cost_method:"
msgid "On Shipment"
-msgstr "Sobre el envío"
+msgstr "En el envío"
diff --git a/locale/es_AR.po b/locale/es_AR.po
deleted file mode 100644
index c2c4ffe..0000000
--- a/locale/es_AR.po
+++ /dev/null
@@ -1,63 +0,0 @@
-#
-msgid ""
-msgstr "Content-Type: text/plain; charset=utf-8\n"
-
-msgctxt "error:stock.shipment.out:"
-msgid "Missing \"Account Revenue\" on product \"%s\"."
-msgstr "Falta la «Cuenta de ingresos» en el producto «%s»."
-
-msgctxt "field:sale.configuration,sale_carrier:"
-msgid "Carrier"
-msgstr "Transportista"
-
-msgctxt "field:sale.configuration,sale_shipment_cost_method:"
-msgid "Sale Shipment Cost Method"
-msgstr "Método de costo de la venta"
-
-msgctxt "field:sale.line,shipment_cost:"
-msgid "Shipment Cost"
-msgstr "Costo de envío"
-
-msgctxt "field:sale.sale,carrier:"
-msgid "Carrier"
-msgstr "Transportista"
-
-msgctxt "field:sale.sale,shipment_cost_method:"
-msgid "Shipment Cost Method"
-msgstr "Método de costo de envío"
-
-msgctxt "field:stock.shipment.out,carrier:"
-msgid "Carrier"
-msgstr "Transportista"
-
-msgctxt "field:stock.shipment.out,cost:"
-msgid "Cost"
-msgstr "Costo"
-
-msgctxt "field:stock.shipment.out,cost_currency:"
-msgid "Cost Currency"
-msgstr "Moneda del costo"
-
-msgctxt "field:stock.shipment.out,cost_currency_digits:"
-msgid "Cost Currency Digits"
-msgstr "Decimales de moneda del costo"
-
-msgctxt "field:stock.shipment.out,cost_invoice_line:"
-msgid "Cost Invoice Line"
-msgstr "Costo de la línea de factura"
-
-msgctxt "selection:sale.configuration,sale_shipment_cost_method:"
-msgid "On Order"
-msgstr "Al ordenar"
-
-msgctxt "selection:sale.configuration,sale_shipment_cost_method:"
-msgid "On Shipment"
-msgstr "Al enviar"
-
-msgctxt "selection:sale.sale,shipment_cost_method:"
-msgid "On Order"
-msgstr "Al ordenar"
-
-msgctxt "selection:sale.sale,shipment_cost_method:"
-msgid "On Shipment"
-msgstr "Al enviar"
diff --git a/locale/es_CO.po b/locale/es_CO.po
deleted file mode 100644
index db1c949..0000000
--- a/locale/es_CO.po
+++ /dev/null
@@ -1,63 +0,0 @@
-#
-msgid ""
-msgstr "Content-Type: text/plain; charset=utf-8\n"
-
-msgctxt "error:stock.shipment.out:"
-msgid "Missing \"Account Revenue\" on product \"%s\"."
-msgstr "Falta la \"Cuenta de Ingresos\" del producto \"%s\"."
-
-msgctxt "field:sale.configuration,sale_carrier:"
-msgid "Carrier"
-msgstr "Transportadora"
-
-msgctxt "field:sale.configuration,sale_shipment_cost_method:"
-msgid "Sale Shipment Cost Method"
-msgstr "Método de Costeo de Envio de Venta"
-
-msgctxt "field:sale.line,shipment_cost:"
-msgid "Shipment Cost"
-msgstr "Costo de Envío"
-
-msgctxt "field:sale.sale,carrier:"
-msgid "Carrier"
-msgstr "Transportadora"
-
-msgctxt "field:sale.sale,shipment_cost_method:"
-msgid "Shipment Cost Method"
-msgstr "Método de Costeo de Envio"
-
-msgctxt "field:stock.shipment.out,carrier:"
-msgid "Carrier"
-msgstr "Transportadora"
-
-msgctxt "field:stock.shipment.out,cost:"
-msgid "Cost"
-msgstr "Costo"
-
-msgctxt "field:stock.shipment.out,cost_currency:"
-msgid "Cost Currency"
-msgstr "Moneda del Costo"
-
-msgctxt "field:stock.shipment.out,cost_currency_digits:"
-msgid "Cost Currency Digits"
-msgstr "Decimales de Moneda del Costo"
-
-msgctxt "field:stock.shipment.out,cost_invoice_line:"
-msgid "Cost Invoice Line"
-msgstr "Línea de Factura de Costo"
-
-msgctxt "selection:sale.configuration,sale_shipment_cost_method:"
-msgid "On Order"
-msgstr "Sobre el Pedido"
-
-msgctxt "selection:sale.configuration,sale_shipment_cost_method:"
-msgid "On Shipment"
-msgstr "Sobre el Envío"
-
-msgctxt "selection:sale.sale,shipment_cost_method:"
-msgid "On Order"
-msgstr "Sobre el Pedido"
-
-msgctxt "selection:sale.sale,shipment_cost_method:"
-msgid "On Shipment"
-msgstr "Sobre el Envío"
diff --git a/locale/es_MX.po b/locale/es_MX.po
deleted file mode 100644
index f766512..0000000
--- a/locale/es_MX.po
+++ /dev/null
@@ -1,63 +0,0 @@
-#
-msgid ""
-msgstr "Content-Type: text/plain; charset=utf-8\n"
-
-msgctxt "error:stock.shipment.out:"
-msgid "Missing \"Account Revenue\" on product \"%s\"."
-msgstr "Falta la \"Cuenta de ingresos\" en el producto \"%s\"."
-
-msgctxt "field:sale.configuration,sale_carrier:"
-msgid "Carrier"
-msgstr "Transporte"
-
-msgctxt "field:sale.configuration,sale_shipment_cost_method:"
-msgid "Sale Shipment Cost Method"
-msgstr "Método de costo envío"
-
-msgctxt "field:sale.line,shipment_cost:"
-msgid "Shipment Cost"
-msgstr "Costo de envío"
-
-msgctxt "field:sale.sale,carrier:"
-msgid "Carrier"
-msgstr "Transporte"
-
-msgctxt "field:sale.sale,shipment_cost_method:"
-msgid "Shipment Cost Method"
-msgstr "Método de costo envío"
-
-msgctxt "field:stock.shipment.out,carrier:"
-msgid "Carrier"
-msgstr "Transporte"
-
-msgctxt "field:stock.shipment.out,cost:"
-msgid "Cost"
-msgstr "Costo"
-
-msgctxt "field:stock.shipment.out,cost_currency:"
-msgid "Cost Currency"
-msgstr "Divisa del costo"
-
-msgctxt "field:stock.shipment.out,cost_currency_digits:"
-msgid "Cost Currency Digits"
-msgstr "Decimales de la divisa de costo"
-
-msgctxt "field:stock.shipment.out,cost_invoice_line:"
-msgid "Cost Invoice Line"
-msgstr "Costo de la línea de factura"
-
-msgctxt "selection:sale.configuration,sale_shipment_cost_method:"
-msgid "On Order"
-msgstr "En el pedido"
-
-msgctxt "selection:sale.configuration,sale_shipment_cost_method:"
-msgid "On Shipment"
-msgstr "En el envío"
-
-msgctxt "selection:sale.sale,shipment_cost_method:"
-msgid "On Order"
-msgstr "En el pedido"
-
-msgctxt "selection:sale.sale,shipment_cost_method:"
-msgid "On Shipment"
-msgstr "En el envío"
diff --git a/locale/fr_FR.po b/locale/fr.po
similarity index 93%
rename from locale/fr_FR.po
rename to locale/fr.po
index 6b5913a..3e022f2 100644
--- a/locale/fr_FR.po
+++ b/locale/fr.po
@@ -6,10 +6,6 @@ msgctxt "error:stock.shipment.out:"
msgid "Missing \"Account Revenue\" on product \"%s\"."
msgstr "Le compte des revenus est manquant sur le tiers « %s »."
-msgctxt "field:sale.configuration,sale_carrier:"
-msgid "Carrier"
-msgstr "Transporteur"
-
msgctxt "field:sale.configuration,sale_shipment_cost_method:"
msgid "Sale Shipment Cost Method"
msgstr "Méthode de coût de l'expédition de vente"
@@ -18,6 +14,10 @@ msgctxt "field:sale.line,shipment_cost:"
msgid "Shipment Cost"
msgstr "Coût d'expédition"
+msgctxt "field:sale.sale,available_carriers:"
+msgid "Available Carriers"
+msgstr "Transporteurs disponibles"
+
msgctxt "field:sale.sale,carrier:"
msgid "Carrier"
msgstr "Transporteur"
diff --git a/locale/hu_HU.po b/locale/hu_HU.po
index ee9d41e..21b1c7f 100644
--- a/locale/hu_HU.po
+++ b/locale/hu_HU.po
@@ -6,10 +6,6 @@ msgctxt "error:stock.shipment.out:"
msgid "Missing \"Account Revenue\" on product \"%s\"."
msgstr ""
-msgctxt "field:sale.configuration,sale_carrier:"
-msgid "Carrier"
-msgstr ""
-
msgctxt "field:sale.configuration,sale_shipment_cost_method:"
msgid "Sale Shipment Cost Method"
msgstr ""
@@ -18,6 +14,10 @@ msgctxt "field:sale.line,shipment_cost:"
msgid "Shipment Cost"
msgstr ""
+msgctxt "field:sale.sale,available_carriers:"
+msgid "Available Carriers"
+msgstr ""
+
msgctxt "field:sale.sale,carrier:"
msgid "Carrier"
msgstr ""
@@ -30,9 +30,10 @@ msgctxt "field:stock.shipment.out,carrier:"
msgid "Carrier"
msgstr ""
+#, fuzzy
msgctxt "field:stock.shipment.out,cost:"
msgid "Cost"
-msgstr ""
+msgstr "Költség"
msgctxt "field:stock.shipment.out,cost_currency:"
msgid "Cost Currency"
diff --git a/locale/it_IT.po b/locale/it_IT.po
index ee9d41e..1d6ac7b 100644
--- a/locale/it_IT.po
+++ b/locale/it_IT.po
@@ -4,60 +4,60 @@ msgstr "Content-Type: text/plain; charset=utf-8\n"
msgctxt "error:stock.shipment.out:"
msgid "Missing \"Account Revenue\" on product \"%s\"."
-msgstr ""
-
-msgctxt "field:sale.configuration,sale_carrier:"
-msgid "Carrier"
-msgstr ""
+msgstr "Manca \"conto di ricavo\" su prodotto \"%s\"."
msgctxt "field:sale.configuration,sale_shipment_cost_method:"
msgid "Sale Shipment Cost Method"
-msgstr ""
+msgstr "Metodo costo di spedizione per vendita"
msgctxt "field:sale.line,shipment_cost:"
msgid "Shipment Cost"
-msgstr ""
+msgstr "costo di spedizione"
+
+msgctxt "field:sale.sale,available_carriers:"
+msgid "Available Carriers"
+msgstr "Vettori disponibili"
msgctxt "field:sale.sale,carrier:"
msgid "Carrier"
-msgstr ""
+msgstr "Vettore"
msgctxt "field:sale.sale,shipment_cost_method:"
msgid "Shipment Cost Method"
-msgstr ""
+msgstr "Metodo di costo per spedizione"
msgctxt "field:stock.shipment.out,carrier:"
msgid "Carrier"
-msgstr ""
+msgstr "Vettore"
msgctxt "field:stock.shipment.out,cost:"
msgid "Cost"
-msgstr ""
+msgstr "Costo"
msgctxt "field:stock.shipment.out,cost_currency:"
msgid "Cost Currency"
-msgstr ""
+msgstr "Valuta costo"
msgctxt "field:stock.shipment.out,cost_currency_digits:"
msgid "Cost Currency Digits"
-msgstr ""
+msgstr "posizioni valuta costo"
msgctxt "field:stock.shipment.out,cost_invoice_line:"
msgid "Cost Invoice Line"
-msgstr ""
+msgstr "Riga fattura costo"
msgctxt "selection:sale.configuration,sale_shipment_cost_method:"
msgid "On Order"
-msgstr ""
+msgstr "su Ordine"
msgctxt "selection:sale.configuration,sale_shipment_cost_method:"
msgid "On Shipment"
-msgstr ""
+msgstr "su Spedizione"
msgctxt "selection:sale.sale,shipment_cost_method:"
msgid "On Order"
-msgstr ""
+msgstr "su Ordine"
msgctxt "selection:sale.sale,shipment_cost_method:"
msgid "On Shipment"
-msgstr ""
+msgstr "su Spedizione"
diff --git a/locale/ja_JP.po b/locale/ja_JP.po
index ee9d41e..0b53c50 100644
--- a/locale/ja_JP.po
+++ b/locale/ja_JP.po
@@ -6,10 +6,6 @@ msgctxt "error:stock.shipment.out:"
msgid "Missing \"Account Revenue\" on product \"%s\"."
msgstr ""
-msgctxt "field:sale.configuration,sale_carrier:"
-msgid "Carrier"
-msgstr ""
-
msgctxt "field:sale.configuration,sale_shipment_cost_method:"
msgid "Sale Shipment Cost Method"
msgstr ""
@@ -18,6 +14,10 @@ msgctxt "field:sale.line,shipment_cost:"
msgid "Shipment Cost"
msgstr ""
+msgctxt "field:sale.sale,available_carriers:"
+msgid "Available Carriers"
+msgstr ""
+
msgctxt "field:sale.sale,carrier:"
msgid "Carrier"
msgstr ""
diff --git a/locale/hu_HU.po b/locale/lo.po
similarity index 94%
copy from locale/hu_HU.po
copy to locale/lo.po
index ee9d41e..0b53c50 100644
--- a/locale/hu_HU.po
+++ b/locale/lo.po
@@ -6,10 +6,6 @@ msgctxt "error:stock.shipment.out:"
msgid "Missing \"Account Revenue\" on product \"%s\"."
msgstr ""
-msgctxt "field:sale.configuration,sale_carrier:"
-msgid "Carrier"
-msgstr ""
-
msgctxt "field:sale.configuration,sale_shipment_cost_method:"
msgid "Sale Shipment Cost Method"
msgstr ""
@@ -18,6 +14,10 @@ msgctxt "field:sale.line,shipment_cost:"
msgid "Shipment Cost"
msgstr ""
+msgctxt "field:sale.sale,available_carriers:"
+msgid "Available Carriers"
+msgstr ""
+
msgctxt "field:sale.sale,carrier:"
msgid "Carrier"
msgstr ""
diff --git a/locale/lo_LA.po b/locale/lo_LA.po
deleted file mode 100644
index ee9d41e..0000000
--- a/locale/lo_LA.po
+++ /dev/null
@@ -1,63 +0,0 @@
-#
-msgid ""
-msgstr "Content-Type: text/plain; charset=utf-8\n"
-
-msgctxt "error:stock.shipment.out:"
-msgid "Missing \"Account Revenue\" on product \"%s\"."
-msgstr ""
-
-msgctxt "field:sale.configuration,sale_carrier:"
-msgid "Carrier"
-msgstr ""
-
-msgctxt "field:sale.configuration,sale_shipment_cost_method:"
-msgid "Sale Shipment Cost Method"
-msgstr ""
-
-msgctxt "field:sale.line,shipment_cost:"
-msgid "Shipment Cost"
-msgstr ""
-
-msgctxt "field:sale.sale,carrier:"
-msgid "Carrier"
-msgstr ""
-
-msgctxt "field:sale.sale,shipment_cost_method:"
-msgid "Shipment Cost Method"
-msgstr ""
-
-msgctxt "field:stock.shipment.out,carrier:"
-msgid "Carrier"
-msgstr ""
-
-msgctxt "field:stock.shipment.out,cost:"
-msgid "Cost"
-msgstr ""
-
-msgctxt "field:stock.shipment.out,cost_currency:"
-msgid "Cost Currency"
-msgstr ""
-
-msgctxt "field:stock.shipment.out,cost_currency_digits:"
-msgid "Cost Currency Digits"
-msgstr ""
-
-msgctxt "field:stock.shipment.out,cost_invoice_line:"
-msgid "Cost Invoice Line"
-msgstr ""
-
-msgctxt "selection:sale.configuration,sale_shipment_cost_method:"
-msgid "On Order"
-msgstr ""
-
-msgctxt "selection:sale.configuration,sale_shipment_cost_method:"
-msgid "On Shipment"
-msgstr ""
-
-msgctxt "selection:sale.sale,shipment_cost_method:"
-msgid "On Order"
-msgstr ""
-
-msgctxt "selection:sale.sale,shipment_cost_method:"
-msgid "On Shipment"
-msgstr ""
diff --git a/locale/hu_HU.po b/locale/lt.po
similarity index 94%
copy from locale/hu_HU.po
copy to locale/lt.po
index ee9d41e..0b53c50 100644
--- a/locale/hu_HU.po
+++ b/locale/lt.po
@@ -6,10 +6,6 @@ msgctxt "error:stock.shipment.out:"
msgid "Missing \"Account Revenue\" on product \"%s\"."
msgstr ""
-msgctxt "field:sale.configuration,sale_carrier:"
-msgid "Carrier"
-msgstr ""
-
msgctxt "field:sale.configuration,sale_shipment_cost_method:"
msgid "Sale Shipment Cost Method"
msgstr ""
@@ -18,6 +14,10 @@ msgctxt "field:sale.line,shipment_cost:"
msgid "Shipment Cost"
msgstr ""
+msgctxt "field:sale.sale,available_carriers:"
+msgid "Available Carriers"
+msgstr ""
+
msgctxt "field:sale.sale,carrier:"
msgid "Carrier"
msgstr ""
diff --git a/locale/lt_LT.po b/locale/lt_LT.po
deleted file mode 100644
index ee9d41e..0000000
--- a/locale/lt_LT.po
+++ /dev/null
@@ -1,63 +0,0 @@
-#
-msgid ""
-msgstr "Content-Type: text/plain; charset=utf-8\n"
-
-msgctxt "error:stock.shipment.out:"
-msgid "Missing \"Account Revenue\" on product \"%s\"."
-msgstr ""
-
-msgctxt "field:sale.configuration,sale_carrier:"
-msgid "Carrier"
-msgstr ""
-
-msgctxt "field:sale.configuration,sale_shipment_cost_method:"
-msgid "Sale Shipment Cost Method"
-msgstr ""
-
-msgctxt "field:sale.line,shipment_cost:"
-msgid "Shipment Cost"
-msgstr ""
-
-msgctxt "field:sale.sale,carrier:"
-msgid "Carrier"
-msgstr ""
-
-msgctxt "field:sale.sale,shipment_cost_method:"
-msgid "Shipment Cost Method"
-msgstr ""
-
-msgctxt "field:stock.shipment.out,carrier:"
-msgid "Carrier"
-msgstr ""
-
-msgctxt "field:stock.shipment.out,cost:"
-msgid "Cost"
-msgstr ""
-
-msgctxt "field:stock.shipment.out,cost_currency:"
-msgid "Cost Currency"
-msgstr ""
-
-msgctxt "field:stock.shipment.out,cost_currency_digits:"
-msgid "Cost Currency Digits"
-msgstr ""
-
-msgctxt "field:stock.shipment.out,cost_invoice_line:"
-msgid "Cost Invoice Line"
-msgstr ""
-
-msgctxt "selection:sale.configuration,sale_shipment_cost_method:"
-msgid "On Order"
-msgstr ""
-
-msgctxt "selection:sale.configuration,sale_shipment_cost_method:"
-msgid "On Shipment"
-msgstr ""
-
-msgctxt "selection:sale.sale,shipment_cost_method:"
-msgid "On Order"
-msgstr ""
-
-msgctxt "selection:sale.sale,shipment_cost_method:"
-msgid "On Shipment"
-msgstr ""
diff --git a/locale/hu_HU.po b/locale/nl.po
similarity index 94%
copy from locale/hu_HU.po
copy to locale/nl.po
index ee9d41e..0b53c50 100644
--- a/locale/hu_HU.po
+++ b/locale/nl.po
@@ -6,10 +6,6 @@ msgctxt "error:stock.shipment.out:"
msgid "Missing \"Account Revenue\" on product \"%s\"."
msgstr ""
-msgctxt "field:sale.configuration,sale_carrier:"
-msgid "Carrier"
-msgstr ""
-
msgctxt "field:sale.configuration,sale_shipment_cost_method:"
msgid "Sale Shipment Cost Method"
msgstr ""
@@ -18,6 +14,10 @@ msgctxt "field:sale.line,shipment_cost:"
msgid "Shipment Cost"
msgstr ""
+msgctxt "field:sale.sale,available_carriers:"
+msgid "Available Carriers"
+msgstr ""
+
msgctxt "field:sale.sale,carrier:"
msgid "Carrier"
msgstr ""
diff --git a/locale/nl_NL.po b/locale/nl_NL.po
deleted file mode 100644
index ee9d41e..0000000
--- a/locale/nl_NL.po
+++ /dev/null
@@ -1,63 +0,0 @@
-#
-msgid ""
-msgstr "Content-Type: text/plain; charset=utf-8\n"
-
-msgctxt "error:stock.shipment.out:"
-msgid "Missing \"Account Revenue\" on product \"%s\"."
-msgstr ""
-
-msgctxt "field:sale.configuration,sale_carrier:"
-msgid "Carrier"
-msgstr ""
-
-msgctxt "field:sale.configuration,sale_shipment_cost_method:"
-msgid "Sale Shipment Cost Method"
-msgstr ""
-
-msgctxt "field:sale.line,shipment_cost:"
-msgid "Shipment Cost"
-msgstr ""
-
-msgctxt "field:sale.sale,carrier:"
-msgid "Carrier"
-msgstr ""
-
-msgctxt "field:sale.sale,shipment_cost_method:"
-msgid "Shipment Cost Method"
-msgstr ""
-
-msgctxt "field:stock.shipment.out,carrier:"
-msgid "Carrier"
-msgstr ""
-
-msgctxt "field:stock.shipment.out,cost:"
-msgid "Cost"
-msgstr ""
-
-msgctxt "field:stock.shipment.out,cost_currency:"
-msgid "Cost Currency"
-msgstr ""
-
-msgctxt "field:stock.shipment.out,cost_currency_digits:"
-msgid "Cost Currency Digits"
-msgstr ""
-
-msgctxt "field:stock.shipment.out,cost_invoice_line:"
-msgid "Cost Invoice Line"
-msgstr ""
-
-msgctxt "selection:sale.configuration,sale_shipment_cost_method:"
-msgid "On Order"
-msgstr ""
-
-msgctxt "selection:sale.configuration,sale_shipment_cost_method:"
-msgid "On Shipment"
-msgstr ""
-
-msgctxt "selection:sale.sale,shipment_cost_method:"
-msgid "On Order"
-msgstr ""
-
-msgctxt "selection:sale.sale,shipment_cost_method:"
-msgid "On Shipment"
-msgstr ""
diff --git a/locale/hu_HU.po b/locale/pl.po
similarity index 94%
copy from locale/hu_HU.po
copy to locale/pl.po
index ee9d41e..0b53c50 100644
--- a/locale/hu_HU.po
+++ b/locale/pl.po
@@ -6,10 +6,6 @@ msgctxt "error:stock.shipment.out:"
msgid "Missing \"Account Revenue\" on product \"%s\"."
msgstr ""
-msgctxt "field:sale.configuration,sale_carrier:"
-msgid "Carrier"
-msgstr ""
-
msgctxt "field:sale.configuration,sale_shipment_cost_method:"
msgid "Sale Shipment Cost Method"
msgstr ""
@@ -18,6 +14,10 @@ msgctxt "field:sale.line,shipment_cost:"
msgid "Shipment Cost"
msgstr ""
+msgctxt "field:sale.sale,available_carriers:"
+msgid "Available Carriers"
+msgstr ""
+
msgctxt "field:sale.sale,carrier:"
msgid "Carrier"
msgstr ""
diff --git a/locale/pt_BR.po b/locale/pt_BR.po
index 4a3481d..0868e5e 100644
--- a/locale/pt_BR.po
+++ b/locale/pt_BR.po
@@ -6,10 +6,6 @@ msgctxt "error:stock.shipment.out:"
msgid "Missing \"Account Revenue\" on product \"%s\"."
msgstr "A \"Conta de Receitas\" está faltando para o produto \"%s\"."
-msgctxt "field:sale.configuration,sale_carrier:"
-msgid "Carrier"
-msgstr "Transportadora"
-
msgctxt "field:sale.configuration,sale_shipment_cost_method:"
msgid "Sale Shipment Cost Method"
msgstr "Método de custo da remessa ao cliente"
@@ -18,6 +14,10 @@ msgctxt "field:sale.line,shipment_cost:"
msgid "Shipment Cost"
msgstr "Custo de remessa"
+msgctxt "field:sale.sale,available_carriers:"
+msgid "Available Carriers"
+msgstr ""
+
msgctxt "field:sale.sale,carrier:"
msgid "Carrier"
msgstr "Transportadora"
diff --git a/locale/ru_RU.po b/locale/ru.po
similarity index 94%
rename from locale/ru_RU.po
rename to locale/ru.po
index 0d2f111..80d47a4 100644
--- a/locale/ru_RU.po
+++ b/locale/ru.po
@@ -6,10 +6,6 @@ msgctxt "error:stock.shipment.out:"
msgid "Missing \"Account Revenue\" on product \"%s\"."
msgstr ""
-msgctxt "field:sale.configuration,sale_carrier:"
-msgid "Carrier"
-msgstr ""
-
msgctxt "field:sale.configuration,sale_shipment_cost_method:"
msgid "Sale Shipment Cost Method"
msgstr ""
@@ -18,6 +14,10 @@ msgctxt "field:sale.line,shipment_cost:"
msgid "Shipment Cost"
msgstr ""
+msgctxt "field:sale.sale,available_carriers:"
+msgid "Available Carriers"
+msgstr ""
+
msgctxt "field:sale.sale,carrier:"
msgid "Carrier"
msgstr ""
diff --git a/locale/sl_SI.po b/locale/sl.po
similarity index 94%
rename from locale/sl_SI.po
rename to locale/sl.po
index 8def492..909269f 100644
--- a/locale/sl_SI.po
+++ b/locale/sl.po
@@ -6,10 +6,6 @@ msgctxt "error:stock.shipment.out:"
msgid "Missing \"Account Revenue\" on product \"%s\"."
msgstr "Pri izdelku \"%s\" manjka prihodkovni konto."
-msgctxt "field:sale.configuration,sale_carrier:"
-msgid "Carrier"
-msgstr "Špediter"
-
msgctxt "field:sale.configuration,sale_shipment_cost_method:"
msgid "Sale Shipment Cost Method"
msgstr "Obračun odpreme"
@@ -18,6 +14,10 @@ msgctxt "field:sale.line,shipment_cost:"
msgid "Shipment Cost"
msgstr "Strošek dostave"
+msgctxt "field:sale.sale,available_carriers:"
+msgid "Available Carriers"
+msgstr ""
+
msgctxt "field:sale.sale,carrier:"
msgid "Carrier"
msgstr "Špediter"
diff --git a/locale/zh_CN.po b/locale/zh_CN.po
index ee9d41e..0b53c50 100644
--- a/locale/zh_CN.po
+++ b/locale/zh_CN.po
@@ -6,10 +6,6 @@ msgctxt "error:stock.shipment.out:"
msgid "Missing \"Account Revenue\" on product \"%s\"."
msgstr ""
-msgctxt "field:sale.configuration,sale_carrier:"
-msgid "Carrier"
-msgstr ""
-
msgctxt "field:sale.configuration,sale_shipment_cost_method:"
msgid "Sale Shipment Cost Method"
msgstr ""
@@ -18,6 +14,10 @@ msgctxt "field:sale.line,shipment_cost:"
msgid "Shipment Cost"
msgstr ""
+msgctxt "field:sale.sale,available_carriers:"
+msgid "Available Carriers"
+msgstr ""
+
msgctxt "field:sale.sale,carrier:"
msgid "Carrier"
msgstr ""
diff --git a/sale.py b/sale.py
index 5550ba1..cbb1512 100644
--- a/sale.py
+++ b/sale.py
@@ -2,7 +2,7 @@
# this repository contains the full copyright notices and license terms.
from trytond.model import ModelView, Workflow, fields
from trytond.transaction import Transaction
-from trytond.pyson import Eval, Bool
+from trytond.pyson import Eval, Bool, If
from trytond.pool import Pool, PoolMeta
__all__ = ['Configuration', 'Sale', 'SaleLine']
@@ -11,9 +11,6 @@ __all__ = ['Configuration', 'Sale', 'SaleLine']
class Configuration:
__metaclass__ = PoolMeta
__name__ = 'sale.configuration'
- sale_carrier = fields.Property(fields.Many2One('carrier', 'Carrier',
- domain=[('carrier_product.salable', '=', True)],
- ))
sale_shipment_cost_method = fields.Property(fields.Selection([
('order', 'On Order'),
('shipment', 'On Shipment'),
@@ -31,11 +28,19 @@ class Sale:
__metaclass__ = PoolMeta
__name__ = 'sale.sale'
carrier = fields.Many2One('carrier', 'Carrier',
- domain=[('carrier_product.salable', '=', True)],
+ domain=[
+ ('carrier_product.salable', '=', True),
+ If(Eval('state').in_(['draft', 'quotation']),
+ ('id', 'in', Eval('available_carriers', [])),
+ ()),
+ ],
states={
'readonly': Eval('state') != 'draft',
},
- depends=['state'])
+ depends=['state', 'available_carriers'])
+ available_carriers = fields.Function(
+ fields.Many2Many('carrier', None, None, 'Available Carriers'),
+ 'on_change_with_available_carriers')
shipment_cost_method = fields.Selection([
('order', 'On Order'),
('shipment', 'On Shipment'),
@@ -44,17 +49,68 @@ class Sale:
}, depends=['state'])
@staticmethod
- def default_carrier():
- Config = Pool().get('sale.configuration')
- config = Config(1)
- return config.sale_carrier.id if config.sale_carrier else None
-
- @staticmethod
def default_shipment_cost_method():
Config = Pool().get('sale.configuration')
config = Config(1)
return config.sale_shipment_cost_method
+ def _get_carrier_selection_pattern(self):
+ pattern = {}
+ if (self.warehouse
+ and self.warehouse.address
+ and self.warehouse.address.country):
+ pattern['from_country'] = self.warehouse.address.country.id
+ if self.shipment_address and self.shipment_address.country:
+ pattern['to_country'] = self.shipment_address.country.id
+ return pattern
+
+ @fields.depends('warehouse', 'shipment_address')
+ def on_change_with_available_carriers(self, name=None):
+ pool = Pool()
+ CarrierSelection = pool.get('carrier.selection')
+
+ pattern = self._get_carrier_selection_pattern()
+ carriers = CarrierSelection.get_carriers(pattern)
+ return [c.id for c in carriers]
+
+ # XXX We must have the same depends than on_change_with_available_carriers,
+ # for now it is maintain manually until we can specify cross-kind depends
+ # on on_changes
+ @fields.depends('warehouse', 'shipment_address')
+ def on_change_party(self):
+ super(Sale, self).on_change_party()
+ self.available_carriers = self.on_change_with_available_carriers()
+ if self.available_carriers:
+ self.carrier = self.available_carriers[0]
+ else:
+ self.carrier = None
+
+ @fields.depends('carrier', 'warehouse', 'shipment_address')
+ def on_change_shipment_party(self):
+ super(Sale, self).on_change_shipment_party()
+ self.available_carriers = self.on_change_with_available_carriers()
+ if self.available_carriers and (not self.carrier
+ or self.carrier not in self.available_carriers):
+ self.carrier = self.available_carriers[0]
+ else:
+ self.carrier = None
+
+ @fields.depends('carrier', 'warehouse', 'shipment_address')
+ def on_change_shipment_address(self):
+ try:
+ super_on_change = super(Sale, self).on_change_shipment_address
+ except AttributeError:
+ pass
+ else:
+ super_on_change()
+
+ self.available_carriers = self.on_change_with_available_carriers()
+ if self.available_carriers and (not self.carrier
+ or self.carrier not in self.available_carriers):
+ self.carrier = self.available_carriers[0]
+ else:
+ self.carrier = None
+
@classmethod
@ModelView.button
@Workflow.transition('quotation')
diff --git a/sale.xml b/sale.xml
index a7be683..09a800d 100644
--- a/sale.xml
+++ b/sale.xml
@@ -10,12 +10,6 @@ this repository contains the full copyright notices and license terms. -->
<field name="name">configuration_form</field>
</record>
- <record model="ir.property" id="property_sale_shipment_cost_method">
- <field name="field"
- search="[('model.model', '=', 'sale.configuration'), ('name', '=', 'sale_shipment_cost_method')]" />
- <field name="value">,order</field>
- </record>
-
<record model="ir.ui.view" id="sale_view_form">
<field name="model">sale.sale</field>
<field name="type" eval="None"/>
@@ -31,4 +25,11 @@ this repository contains the full copyright notices and license terms. -->
</record>
</data>
+ <data noupdate="1">
+ <record model="ir.property" id="property_sale_shipment_cost_method">
+ <field name="field"
+ search="[('model.model', '=', 'sale.configuration'), ('name', '=', 'sale_shipment_cost_method')]" />
+ <field name="value">,order</field>
+ </record>
+ </data>
</tryton>
diff --git a/setup.py b/setup.py
index 4355890..30d8252 100644
--- a/setup.py
+++ b/setup.py
@@ -98,6 +98,7 @@ setup(name=name,
'Natural Language :: German',
'Natural Language :: Hungarian',
'Natural Language :: Italian',
+ 'Natural Language :: Polish',
'Natural Language :: Portuguese (Brazilian)',
'Natural Language :: Russian',
'Natural Language :: Slovenian',
diff --git a/stock.py b/stock.py
index 1a4e95e..0c62897 100644
--- a/stock.py
+++ b/stock.py
@@ -43,7 +43,7 @@ class ShipmentOut:
'product "%s".'),
})
- @fields.depends('currency')
+ @fields.depends('cost_currency')
def on_change_with_cost_currency_digits(self, name=None):
if self.cost_currency:
return self.cost_currency.digits
diff --git a/tests/scenario_sale_shipment_cost.rst b/tests/scenario_sale_shipment_cost.rst
index 824e53e..efc640b 100644
--- a/tests/scenario_sale_shipment_cost.rst
+++ b/tests/scenario_sale_shipment_cost.rst
@@ -7,7 +7,8 @@ Imports::
>>> import datetime
>>> from dateutil.relativedelta import relativedelta
>>> from decimal import Decimal
- >>> from proteus import config, Model, Wizard
+ >>> from proteus import Model, Wizard
+ >>> from trytond.tests.tools import activate_modules
>>> from trytond.modules.company.tests.tools import create_company, \
... get_company
>>> from trytond.modules.account.tests.tools import create_fiscalyear, \
@@ -16,32 +17,19 @@ Imports::
... set_fiscalyear_invoice_sequences, create_payment_term
>>> today = datetime.date.today()
-Create database::
-
- >>> config = config.set_trytond()
- >>> config.pool.test = True
-
Install sale_shipment_cost, sale and account_invoice::
- >>> Module = Model.get('ir.module')
- >>> modules = Module.find([
- ... ('name', 'in', ('sale_shipment_cost',
- ... 'sale', 'account_invoice')),
+ >>> config = activate_modules([
+ ... 'sale_shipment_cost',
+ ... 'sale',
+ ... 'account_invoice',
... ])
- >>> for module in modules:
- ... module.click('install')
- >>> Wizard('ir.module.install_upgrade').execute('upgrade')
Create company::
>>> _ = create_company()
>>> company = get_company()
-Reload the context::
-
- >>> User = Model.get('res.user')
- >>> config._context = User.get_preferences(True, config.context)
-
Create fiscal year::
>>> fiscalyear = set_fiscalyear_invoice_sequences(
@@ -104,6 +92,12 @@ Create carrier::
>>> carrier.carrier_product = carrier_product
>>> carrier.save()
+Use it as the default carrier::
+
+ >>> CarrierSelection = Model.get('carrier.selection')
+ >>> csc = CarrierSelection(carrier=carrier)
+ >>> csc.save()
+
Create payment term::
>>> payment_term = create_payment_term()
diff --git a/tests/test_sale_shipment_cost.py b/tests/test_sale_shipment_cost.py
index efeaa91..226f812 100644
--- a/tests/test_sale_shipment_cost.py
+++ b/tests/test_sale_shipment_cost.py
@@ -4,7 +4,7 @@ import unittest
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_teardown
from trytond.tests.test_tryton import doctest_checker
@@ -18,7 +18,7 @@ def suite():
suite.addTests(unittest.TestLoader().loadTestsFromTestCase(
SaleShipmentCostTestCase))
suite.addTests(doctest.DocFileSuite('scenario_sale_shipment_cost.rst',
- setUp=doctest_setup, tearDown=doctest_teardown, encoding='utf-8',
+ 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 8346aa8..a28eae7 100644
--- a/tryton.cfg
+++ b/tryton.cfg
@@ -1,5 +1,5 @@
[tryton]
-version=4.0.0
+version=4.2.0
depends:
account_invoice
carrier
diff --git a/trytond_sale_shipment_cost.egg-info/PKG-INFO b/trytond_sale_shipment_cost.egg-info/PKG-INFO
index a0fe7e1..50163f5 100644
--- a/trytond_sale_shipment_cost.egg-info/PKG-INFO
+++ b/trytond_sale_shipment_cost.egg-info/PKG-INFO
@@ -1,12 +1,12 @@
Metadata-Version: 1.1
Name: trytond-sale-shipment-cost
-Version: 4.0.0
+Version: 4.2.0
Summary: Tryton module for sale shipment cost
Home-page: http://www.tryton.org/
Author: Tryton
Author-email: issue_tracker at tryton.org
License: GPL-3
-Download-URL: http://downloads.tryton.org/4.0/
+Download-URL: http://downloads.tryton.org/4.2/
Description: trytond_sale_shipment_cost
==========================
@@ -63,6 +63,7 @@ Classifier: Natural Language :: French
Classifier: Natural Language :: German
Classifier: Natural Language :: Hungarian
Classifier: Natural Language :: Italian
+Classifier: Natural Language :: Polish
Classifier: Natural Language :: Portuguese (Brazilian)
Classifier: Natural Language :: Russian
Classifier: Natural Language :: Slovenian
diff --git a/trytond_sale_shipment_cost.egg-info/SOURCES.txt b/trytond_sale_shipment_cost.egg-info/SOURCES.txt
index 41e621c..e1d6a4b 100644
--- a/trytond_sale_shipment_cost.egg-info/SOURCES.txt
+++ b/trytond_sale_shipment_cost.egg-info/SOURCES.txt
@@ -14,24 +14,24 @@ tryton.cfg
./stock.py
./stock.xml
./tryton.cfg
-./locale/bg_BG.po
-./locale/ca_ES.po
-./locale/cs_CZ.po
-./locale/de_DE.po
-./locale/es_AR.po
-./locale/es_CO.po
-./locale/es_EC.po
-./locale/es_ES.po
-./locale/es_MX.po
-./locale/fr_FR.po
+./locale/bg.po
+./locale/ca.po
+./locale/cs.po
+./locale/de.po
+./locale/es.po
+./locale/es_419.po
+./locale/fr.po
./locale/hu_HU.po
./locale/it_IT.po
./locale/ja_JP.po
-./locale/lt_LT.po
-./locale/nl_NL.po
+./locale/lo.po
+./locale/lt.po
+./locale/nl.po
+./locale/pl.po
./locale/pt_BR.po
-./locale/ru_RU.po
-./locale/sl_SI.po
+./locale/ru.po
+./locale/sl.po
+./locale/zh_CN.po
./tests/__init__.py
./tests/scenario_sale_shipment_cost.rst
./tests/test_sale_shipment_cost.py
@@ -40,25 +40,23 @@ tryton.cfg
./view/sale_line_tree_sequence.xml
./view/shipment_out_form.xml
doc/index.rst
-locale/bg_BG.po
-locale/ca_ES.po
-locale/cs_CZ.po
-locale/de_DE.po
-locale/es_AR.po
-locale/es_CO.po
-locale/es_EC.po
-locale/es_ES.po
-locale/es_MX.po
-locale/fr_FR.po
+locale/bg.po
+locale/ca.po
+locale/cs.po
+locale/de.po
+locale/es.po
+locale/es_419.po
+locale/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/lo.po
+locale/lt.po
+locale/nl.po
+locale/pl.po
locale/pt_BR.po
-locale/ru_RU.po
-locale/sl_SI.po
+locale/ru.po
+locale/sl.po
locale/zh_CN.po
tests/scenario_sale_shipment_cost.rst
trytond_sale_shipment_cost.egg-info/PKG-INFO
diff --git a/trytond_sale_shipment_cost.egg-info/requires.txt b/trytond_sale_shipment_cost.egg-info/requires.txt
index 570d875..ee14637 100644
--- a/trytond_sale_shipment_cost.egg-info/requires.txt
+++ b/trytond_sale_shipment_cost.egg-info/requires.txt
@@ -1,6 +1,6 @@
-trytond_account_invoice >= 4.0, < 4.1
-trytond_carrier >= 4.0, < 4.1
-trytond_currency >= 4.0, < 4.1
-trytond_sale >= 4.0, < 4.1
-trytond_stock >= 4.0, < 4.1
-trytond >= 4.0, < 4.1
\ No newline at end of file
+trytond_account_invoice >= 4.2, < 4.3
+trytond_carrier >= 4.2, < 4.3
+trytond_currency >= 4.2, < 4.3
+trytond_sale >= 4.2, < 4.3
+trytond_stock >= 4.2, < 4.3
+trytond >= 4.2, < 4.3
diff --git a/view/configuration_form.xml b/view/configuration_form.xml
index ad3d99e..3deae19 100644
--- a/view/configuration_form.xml
+++ b/view/configuration_form.xml
@@ -3,8 +3,6 @@
this repository contains the full copyright notices and license terms. -->
<data>
<xpath expr="/form/field[@name='sale_shipment_method']" position="after">
- <label name="sale_carrier"/>
- <field name="sale_carrier"/>
<label name="sale_shipment_cost_method"/>
<field name="sale_shipment_cost_method"/>
</xpath>
--
tryton-modules-sale-shipment-cost
More information about the tryton-debian-vcs
mailing list