[tryton-debian-vcs] tryton-modules-sale-shipment-cost branch debian updated. debian/3.2.0-1-5-g1038454
Mathias Behrle
tryton-debian-vcs at alioth.debian.org
Thu Oct 23 12:18:08 UTC 2014
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/3.2.0-1-5-g1038454
commit 1038454a3a40ca51bf83f50f4b959efaba9abb96
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Thu Oct 23 13:32:07 2014 +0200
Releasing debian version 3.4.0-1.
Signed-off-by: Mathias Behrle <mathiasb at m9s.biz>
diff --git a/debian/changelog b/debian/changelog
index 6954530..182bcee 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+tryton-modules-sale-shipment-cost (3.4.0-1) unstable; urgency=medium
+
+ * Updating signing key while using now plain .asc files instead of .pgp
+ binaries.
+ * Adding actual upstream signing key.
+ * Updating to Standards-Version: 3.9.6, no changes needed.
+ * Merging upstream version 3.4.0.
+
+ -- Mathias Behrle <mathiasb at m9s.biz> Tue, 21 Oct 2014 20:24:26 +0200
+
tryton-modules-sale-shipment-cost (3.2.0-1) unstable; urgency=medium
* Removing LC_ALL=C.UTF-8 as build environment.
commit d0025f544c73bdf5fee812c707a96c8daa18b528
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Tue Oct 21 11:29:20 2014 +0200
Merging upstream version 3.4.0.
diff --git a/CHANGELOG b/CHANGELOG
index 5b37101..dba091d 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+Version 3.4.0 - 2014-10-20
+* Bug fixes (see mercurial logs for details)
+
Version 3.2.0 - 2014-04-21
* Bug fixes (see mercurial logs for details)
diff --git a/PKG-INFO b/PKG-INFO
index 87cf390..8e5e32c 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,12 +1,12 @@
Metadata-Version: 1.1
Name: trytond_sale_shipment_cost
-Version: 3.2.0
+Version: 3.4.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/3.2/
+Download-URL: http://downloads.tryton.org/3.4/
Description: trytond_sale_shipment_cost
==========================
diff --git a/locale/fr_FR.po b/locale/es_EC.po
similarity index 71%
copy from locale/fr_FR.po
copy to locale/es_EC.po
index 8b26571..e883924 100644
--- a/locale/fr_FR.po
+++ b/locale/es_EC.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 "Le compte des revenus est manquant sur le tiers \"%s\"."
+msgstr "Falta la \"Cuenta de Ingresos\" en el producto \"%s\"."
msgctxt "field:sale.configuration,sale_carrier:"
msgid "Carrier"
-msgstr "Transporteur"
+msgstr "Transporte"
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"
+msgstr "Método de Costo de Envío de Venta"
msgctxt "field:sale.line,shipment_cost:"
msgid "Shipment Cost"
-msgstr "Coût d'expédition"
+msgstr "Costo de Envío"
msgctxt "field:sale.sale,carrier:"
msgid "Carrier"
-msgstr "Transporteur"
+msgstr "Transporte"
msgctxt "field:sale.sale,shipment_cost_method:"
msgid "Shipment Cost Method"
-msgstr "Méthode de coût d'expédition"
+msgstr "Método de Costo de Envío"
msgctxt "field:stock.shipment.out,carrier:"
msgid "Carrier"
-msgstr "Transporteur"
+msgstr "Transporte"
msgctxt "field:stock.shipment.out,cost:"
msgid "Cost"
-msgstr "Coût"
+msgstr "Costo"
msgctxt "field:stock.shipment.out,cost_currency:"
msgid "Cost Currency"
-msgstr "Devise du coût"
+msgstr "Moneda del Costo"
msgctxt "field:stock.shipment.out,cost_currency_digits:"
msgid "Cost Currency Digits"
-msgstr "Décimales de la devise du coût"
+msgstr "Decimales de Moneda del Costo"
msgctxt "field:stock.shipment.out,cost_invoice_line:"
msgid "Cost Invoice Line"
-msgstr "Ligne de facture du coût"
+msgstr "Línea de Factura de Costo"
msgctxt "selection:sale.configuration,sale_shipment_cost_method:"
msgid "On Order"
-msgstr "À la commande"
+msgstr "Sobre el Pedido"
msgctxt "selection:sale.configuration,sale_shipment_cost_method:"
msgid "On Shipment"
-msgstr "À l'expédition"
+msgstr "Sobre el Envío"
msgctxt "selection:sale.sale,shipment_cost_method:"
msgid "On Order"
-msgstr "À la commande"
+msgstr "Sobre el Pedido"
msgctxt "selection:sale.sale,shipment_cost_method:"
msgid "On Shipment"
-msgstr "À l'expédition"
+msgstr "Sobre el Envío"
diff --git a/locale/fr_FR.po b/locale/fr_FR.po
index 8b26571..6b5913a 100644
--- a/locale/fr_FR.po
+++ b/locale/fr_FR.po
@@ -4,7 +4,7 @@ msgstr "Content-Type: text/plain; charset=utf-8\n"
msgctxt "error:stock.shipment.out:"
msgid "Missing \"Account Revenue\" on product \"%s\"."
-msgstr "Le compte des revenus est manquant sur le tiers \"%s\"."
+msgstr "Le compte des revenus est manquant sur le tiers « %s »."
msgctxt "field:sale.configuration,sale_carrier:"
msgid "Carrier"
diff --git a/sale.py b/sale.py
index 406ec91..9dc2dab 100644
--- a/sale.py
+++ b/sale.py
@@ -160,12 +160,11 @@ class Sale:
with Transaction().set_context(
shipment.get_carrier_context()):
cost, currency_id = self.carrier.get_sale_price()
- with Transaction().set_user(0, set_context=True):
- Shipment.write([shipment], {
- 'carrier': self.carrier.id,
- 'cost': cost,
- 'cost_currency': currency_id,
- })
+ Shipment.write([shipment], {
+ 'carrier': self.carrier.id,
+ 'cost': cost,
+ 'cost_currency': currency_id,
+ })
return shipments
def _get_invoice_line_sale_line(self, invoice_type):
@@ -185,8 +184,6 @@ class Sale:
if (invoice
and invoice_type == 'out_invoice'
and self.shipment_cost_method == 'shipment'):
- with Transaction().set_user(0, set_context=True):
- invoice = Invoice(invoice.id)
for shipment in self.shipments:
if (shipment.state == 'done'
and shipment.carrier
@@ -200,8 +197,7 @@ class Sale:
Shipment.write([shipment], {
'cost_invoice_line': invoice_line.id,
})
- with Transaction().set_user(0, set_context=True):
- Invoice.update_taxes([invoice])
+ Invoice.update_taxes([invoice])
return invoice
diff --git a/stock.py b/stock.py
index 6d83c88..a83a864 100644
--- a/stock.py
+++ b/stock.py
@@ -88,8 +88,7 @@ class ShipmentOut:
if not self.cost:
return {}
- with Transaction().set_user(0, set_context=True):
- invoice_line = InvoiceLine()
+ invoice_line = InvoiceLine()
product = self.carrier.carrier_product
invoice_line.type = 'line'
diff --git a/tests/test_sale_shipment_cost.py b/tests/test_sale_shipment_cost.py
index 5a19c69..0f987b3 100644
--- a/tests/test_sale_shipment_cost.py
+++ b/tests/test_sale_shipment_cost.py
@@ -3,7 +3,8 @@
import unittest
import doctest
import trytond.tests.test_tryton
-from trytond.tests.test_tryton import test_view, test_depends, doctest_dropdb
+from trytond.tests.test_tryton import test_view, test_depends
+from trytond.tests.test_tryton import doctest_setup, doctest_teardown
class SaleShipmentCostTestCase(unittest.TestCase):
@@ -26,6 +27,6 @@ def suite():
suite.addTests(unittest.TestLoader().loadTestsFromTestCase(
SaleShipmentCostTestCase))
suite.addTests(doctest.DocFileSuite('scenario_sale_shipment_cost.rst',
- setUp=doctest_dropdb, tearDown=doctest_dropdb, encoding='utf-8',
+ setUp=doctest_setup, tearDown=doctest_teardown, encoding='utf-8',
optionflags=doctest.REPORT_ONLY_FIRST_FAILURE))
return suite
diff --git a/tryton.cfg b/tryton.cfg
index 2fa3972..b1b1cd9 100644
--- a/tryton.cfg
+++ b/tryton.cfg
@@ -1,5 +1,5 @@
[tryton]
-version=3.2.0
+version=3.4.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 6460ee8..dd133e2 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: 3.2.0
+Version: 3.4.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/3.2/
+Download-URL: http://downloads.tryton.org/3.4/
Description: trytond_sale_shipment_cost
==========================
diff --git a/trytond_sale_shipment_cost.egg-info/SOURCES.txt b/trytond_sale_shipment_cost.egg-info/SOURCES.txt
index 7bbe4ef..c9f32b1 100644
--- a/trytond_sale_shipment_cost.egg-info/SOURCES.txt
+++ b/trytond_sale_shipment_cost.egg-info/SOURCES.txt
@@ -10,9 +10,29 @@ stock.xml
tryton.cfg
./__init__.py
./sale.py
+./sale.xml
./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/fr_FR.po
+./locale/nl_NL.po
+./locale/ru_RU.po
+./locale/sl_SI.po
./tests/__init__.py
+./tests/scenario_sale_shipment_cost.rst
./tests/test_sale_shipment_cost.py
+./view/configuration_form.xml
+./view/sale_form.xml
+./view/sale_line_tree_sequence.xml
+./view/shipment_out_form.xml
doc/index.rst
locale/bg_BG.po
locale/ca_ES.po
@@ -20,6 +40,7 @@ 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/fr_FR.po
locale/nl_NL.po
diff --git a/trytond_sale_shipment_cost.egg-info/requires.txt b/trytond_sale_shipment_cost.egg-info/requires.txt
index e11bdfd..bf502e9 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 >= 3.2, < 3.3
-trytond_carrier >= 3.2, < 3.3
-trytond_currency >= 3.2, < 3.3
-trytond_sale >= 3.2, < 3.3
-trytond_stock >= 3.2, < 3.3
-trytond >= 3.2, < 3.3
\ No newline at end of file
+trytond_account_invoice >= 3.4, < 3.5
+trytond_carrier >= 3.4, < 3.5
+trytond_currency >= 3.4, < 3.5
+trytond_sale >= 3.4, < 3.5
+trytond_stock >= 3.4, < 3.5
+trytond >= 3.4, < 3.5
\ No newline at end of file
--
tryton-modules-sale-shipment-cost
More information about the tryton-debian-vcs
mailing list