[tryton-debian-vcs] tryton-modules-sale-shipment-cost branch debian-jessie-3.4 updated. debian/3.4.1-1-6-g1afe978
Mathias Behrle
tryton-debian-vcs at alioth.debian.org
Tue Jul 12 13:05:50 UTC 2016
The following commit has been merged in the debian-jessie-3.4 branch:
https://alioth.debian.org/plugins/scmgit/cgi-bin/gitweb.cgi/?p=tryton/tryton-modules-sale-shipment-cost.git;a=commitdiff;h=debian/3.4.1-1-6-g1afe978
commit 1afe97827f6df312fb2762b38672116901cd2ef7
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Mon Jul 11 20:52:29 2016 +0200
Releasing debian version 3.4.2-1.
Signed-off-by: Mathias Behrle <mathiasb at m9s.biz>
diff --git a/debian/changelog b/debian/changelog
index 4c55d31..c6b63ff 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+tryton-modules-sale-shipment-cost (3.4.2-1) unstable; urgency=medium
+
+ * Wrapping and sorting control files (wrap-and-sort -bts).
+ * Setting the branch in the watch file to the fixed version 3.4.
+ * Updating signing-key.asc with the actual upstream maintainer keys.
+ * Merging upstream version 3.4.2.
+ * Updating copyright file.
+
+ -- Mathias Behrle <mathiasb at m9s.biz> Mon, 11 Jul 2016 20:52:29 +0200
+
tryton-modules-sale-shipment-cost (3.4.1-1) unstable; urgency=medium
* Adding actual upstream signing key.
commit 212049cb939582f693d8431e4cd0ca9a30cf95ee
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Mon Jul 11 20:52:28 2016 +0200
Updating copyright file.
diff --git a/debian/copyright b/debian/copyright
index a9ce73b..c6df40f 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,10 +1,10 @@
Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
Files: *
-Copyright: 2011-2015 Cédric Krier
+Copyright: 2011-2016 Cédric Krier
2011-2013 Bertrand Chenal
- 2011-2015 Nicolas Évrard
- 2011-2015 B2CK SPRL
+ 2011-2016 Nicolas Évrard
+ 2011-2016 B2CK SPRL
License: GPL-3+
Files: debian/*
commit c34d4ae4e4e853048ecc9fa558f0be428fe5509c
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Mon Jul 11 20:52:28 2016 +0200
Merging upstream version 3.4.2.
diff --git a/CHANGELOG b/CHANGELOG
index 81a75de..8eba94e 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+Version 3.4.2 - 2016-07-05
+* Bug fixes (see mercurial logs for details)
+
Version 3.4.1 - 2015-02-21
* Bug fixes (see mercurial logs for details)
diff --git a/COPYRIGHT b/COPYRIGHT
index 501e672..2d2b387 100644
--- a/COPYRIGHT
+++ b/COPYRIGHT
@@ -1,7 +1,7 @@
-Copyright (C) 2011-2015 Cédric Krier.
+Copyright (C) 2011-2016 Cédric Krier.
Copyright (C) 2011-2013 Bertrand Chenal.
-Copyright (C) 2011-2015 Nicolas Évrard.
-Copyright (C) 2011-2015 B2CK SPRL.
+Copyright (C) 2011-2016 Nicolas Évrard.
+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 dfa5ef8..93c48e6 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
Metadata-Version: 1.1
Name: trytond_sale_shipment_cost
-Version: 3.4.1
+Version: 3.4.2
Summary: Tryton module for sale shipment cost
Home-page: http://www.tryton.org/
Author: Tryton
diff --git a/sale.py b/sale.py
index 9dc2dab..873c179 100644
--- a/sale.py
+++ b/sale.py
@@ -77,7 +77,7 @@ class Sale:
with Transaction().set_context(self._get_carrier_context()):
cost, currency_id = self.carrier.get_sale_price()
- party = None
+ party = self.party
party_context = {}
if self.party:
if self.party.lang:
diff --git a/tryton.cfg b/tryton.cfg
index 1790e97..5f9aa72 100644
--- a/tryton.cfg
+++ b/tryton.cfg
@@ -1,5 +1,5 @@
[tryton]
-version=3.4.1
+version=3.4.2
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 28ebf0c..72d5c8d 100644
--- a/trytond_sale_shipment_cost.egg-info/PKG-INFO
+++ b/trytond_sale_shipment_cost.egg-info/PKG-INFO
@@ -1,6 +1,6 @@
Metadata-Version: 1.1
Name: trytond-sale-shipment-cost
-Version: 3.4.1
+Version: 3.4.2
Summary: Tryton module for sale shipment cost
Home-page: http://www.tryton.org/
Author: Tryton
diff --git a/trytond_sale_shipment_cost.egg-info/requires.txt b/trytond_sale_shipment_cost.egg-info/requires.txt
index bf502e9..5e06102 100644
--- a/trytond_sale_shipment_cost.egg-info/requires.txt
+++ b/trytond_sale_shipment_cost.egg-info/requires.txt
@@ -3,4 +3,4 @@ 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
+trytond >= 3.4, < 3.5
--
tryton-modules-sale-shipment-cost
More information about the tryton-debian-vcs
mailing list