[tryton-debian-vcs] tryton-modules-sale-shipment-cost branch upstream-3.2 updated. upstream/3.2.0-1-g8e05332
Mathias Behrle
tryton-debian-vcs at alioth.debian.org
Wed Feb 25 00:45:00 UTC 2015
The following commit has been merged in the upstream-3.2 branch:
https://alioth.debian.org/plugins/scmgit/cgi-bin/gitweb.cgi/?p=tryton/tryton-modules-sale-shipment-cost.git;a=commitdiff;h=upstream/3.2.0-1-g8e05332
commit 8e05332ac13f3fadf50c44299b955103c1ad2daf
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Tue Feb 24 20:26:00 2015 +0100
Adding upstream version 3.2.1.
Signed-off-by: Mathias Behrle <mathiasb at m9s.biz>
diff --git a/CHANGELOG b/CHANGELOG
index 5b37101..795ac0f 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+Version 3.2.1 - 2015-02-21
+* Bug fixes (see mercurial logs for details)
+
Version 3.2.0 - 2014-04-21
* Bug fixes (see mercurial logs for details)
diff --git a/COPYRIGHT b/COPYRIGHT
index 36b0b21..501e672 100644
--- a/COPYRIGHT
+++ b/COPYRIGHT
@@ -1,7 +1,7 @@
-Copyright (C) 2011-2014 Cédric Krier.
+Copyright (C) 2011-2015 Cédric Krier.
Copyright (C) 2011-2013 Bertrand Chenal.
-Copyright (C) 2011-2014 Nicolas Évrard.
-Copyright (C) 2011-2014 B2CK SPRL.
+Copyright (C) 2011-2015 Nicolas Évrard.
+Copyright (C) 2011-2015 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 87cf390..83b8b26 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
Metadata-Version: 1.1
Name: trytond_sale_shipment_cost
-Version: 3.2.0
+Version: 3.2.1
Summary: Tryton module for sale shipment cost
Home-page: http://www.tryton.org/
Author: Tryton
diff --git a/setup.py b/setup.py
index 404f1da..70b89cb 100644
--- a/setup.py
+++ b/setup.py
@@ -50,6 +50,10 @@ requires.append(get_require_version('trytond'))
tests_require = [get_require_version('proteus')]
for dep in ['account', 'party', 'stock']:
tests_require.append(get_require_version('trytond_%s' % dep))
+dependency_links = []
+if minor_version % 2:
+ # Add development index for testing with proteus
+ dependency_links.append('https://trydevpi.tryton.org/')
setup(name=name,
version=version,
@@ -96,6 +100,7 @@ setup(name=name,
install_requires=requires,
extras_require={
},
+ dependency_links=dependency_links,
zip_safe=False,
entry_points="""
[trytond.modules]
diff --git a/tryton.cfg b/tryton.cfg
index 2fa3972..56d4cad 100644
--- a/tryton.cfg
+++ b/tryton.cfg
@@ -1,5 +1,5 @@
[tryton]
-version=3.2.0
+version=3.2.1
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..5fe8833 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.2.0
+Version: 3.2.1
Summary: Tryton module for sale shipment cost
Home-page: http://www.tryton.org/
Author: Tryton
diff --git a/trytond_sale_shipment_cost.egg-info/SOURCES.txt b/trytond_sale_shipment_cost.egg-info/SOURCES.txt
index 7bbe4ef..9d1b701 100644
--- a/trytond_sale_shipment_cost.egg-info/SOURCES.txt
+++ b/trytond_sale_shipment_cost.egg-info/SOURCES.txt
@@ -10,9 +10,28 @@ 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_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
--
tryton-modules-sale-shipment-cost
More information about the tryton-debian-vcs
mailing list