[tryton-debian-vcs] tryton-modules-sale-shipment-cost branch upstream-2.6 created. 0e7e2ced4dcce138e9f2a0466b07613f0f379e75
Mathias Behrle
tryton-debian-vcs at alioth.debian.org
Wed Nov 27 17:09:27 UTC 2013
The following commit has been merged in the upstream-2.6 branch:
https://alioth.debian.org/plugins/scmgit/cgi-bin/gitweb.cgi/?p=tryton/tryton-modules-sale-shipment-cost.git;a=commitdiff;h=0e7e2ced4dcce138e9f2a0466b07613f0f379e75
commit 0e7e2ced4dcce138e9f2a0466b07613f0f379e75
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Mon Jun 10 18:10:39 2013 +0200
Adding upstream version 2.6.1.
diff --git a/CHANGELOG b/CHANGELOG
index 7324ddf..563c09f 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+Version 2.6.1 - 2013-06-09
+* Bug fixes (see mercurial logs for details)
+
Version 2.6.0 - 2012-10-22
* Bug fixes (see mercurial logs for details)
diff --git a/COPYRIGHT b/COPYRIGHT
index 36d3778..1b2e231 100644
--- a/COPYRIGHT
+++ b/COPYRIGHT
@@ -1,7 +1,7 @@
-Copyright (C) 2011-2012 Cédric Krier.
+Copyright (C) 2011-2013 Cédric Krier.
Copyright (C) 2011 Bertrand Chenal.
Copyright (C) 2011-2012 Nicolas Évrard.
-Copyright (C) 2011-2012 B2CK SPRL.
+Copyright (C) 2011-2013 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 7b41686..21199ee 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
-Metadata-Version: 1.0
+Metadata-Version: 1.1
Name: trytond_sale_shipment_cost
-Version: 2.6.0
+Version: 2.6.1
Summary: Tryton module for sale shipment cost
Home-page: http://www.tryton.org/
Author: Tryton
diff --git a/sale.py b/sale.py
index 4fecfa2..1fe7254 100644
--- a/sale.py
+++ b/sale.py
@@ -20,8 +20,7 @@ class Configuration:
], 'Sale Shipment Cost Method',
states={
'required': Bool(Eval('context', {}).get('company', 0)),
- },
- depends=['company']))
+ }))
@staticmethod
def default_sale_shipment_cost_method():
diff --git a/tryton.cfg b/tryton.cfg
index 2130e93..1f19805 100644
--- a/tryton.cfg
+++ b/tryton.cfg
@@ -1,5 +1,5 @@
[tryton]
-version=2.6.0
+version=2.6.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 631612d..9d987cb 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.0
+Metadata-Version: 1.1
Name: trytond-sale-shipment-cost
-Version: 2.6.0
+Version: 2.6.1
Summary: Tryton module for sale shipment cost
Home-page: http://www.tryton.org/
Author: Tryton
--
tryton-modules-sale-shipment-cost
More information about the tryton-debian-vcs
mailing list