[tryton-debian-vcs] tryton-modules-sale-supply branch upstream-2.8 updated. upstream/2.8.2-1-g73ddadb

[Mathias Behrle]

The following commit has been merged in the upstream-2.8 branch:
https://alioth.debian.org/plugins/scmgit/cgi-bin/gitweb.cgi/?p=tryton/tryton-modules-sale-supply.git;a=commitdiff;h=upstream/2.8.2-1-g73ddadb

commit 73ddadbac43a316ebc08618899bcae852de77f65
Author: Mathias Behrle <mathiasb at m9s.biz>
Date:   Wed Mar 26 21:24:02 2014 +0100

    Adding upstream version 2.8.3.

diff --git a/CHANGELOG b/CHANGELOG
index 9b74847..2651b07 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+Version 2.8.3 - 2014-03-22
+* Bug fixes (see mercurial logs for details)
+
 Version 2.8.2 - 2013-12-04
 * Bug fixes (see mercurial logs for details)
 
diff --git a/COPYRIGHT b/COPYRIGHT
index cd6950c..7bcdb7f 100644
--- a/COPYRIGHT
+++ b/COPYRIGHT
@@ -1,5 +1,5 @@
-Copyright (C) 2011-2013 Cédric Krier.
-Copyright (C) 2011-2013 B2CK SPRL.
+Copyright (C) 2011-2014 Cédric Krier.
+Copyright (C) 2011-2014 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 ff26e74..1542e77 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
 Metadata-Version: 1.1
 Name: trytond_sale_supply
-Version: 2.8.2
+Version: 2.8.3
 Summary: Tryton module for sale supply
 Home-page: http://www.tryton.org/
 Author: Tryton
diff --git a/sale.py b/sale.py
index deb97ed..9be31f9 100644
--- a/sale.py
+++ b/sale.py
@@ -75,7 +75,8 @@ class SaleLine:
         if (self.type != 'line'
                 or not self.product
                 or self.quantity <= 0
-                or not self.product.purchasable):
+                or not self.product.purchasable
+                or any(m.state != 'cancel' for m in self.moves)):
             return False
         return self.product.supply_on_sale
 
diff --git a/tryton.cfg b/tryton.cfg
index ef24d67..1c2d032 100644
--- a/tryton.cfg
+++ b/tryton.cfg
@@ -1,5 +1,5 @@
 [tryton]
-version=2.8.2
+version=2.8.3
 depends:
     ir
     purchase
diff --git a/trytond_sale_supply.egg-info/PKG-INFO b/trytond_sale_supply.egg-info/PKG-INFO
index 70e56ac..34b0c4a 100644
--- a/trytond_sale_supply.egg-info/PKG-INFO
+++ b/trytond_sale_supply.egg-info/PKG-INFO
@@ -1,6 +1,6 @@
 Metadata-Version: 1.1
 Name: trytond-sale-supply
-Version: 2.8.2
+Version: 2.8.3
 Summary: Tryton module for sale supply
 Home-page: http://www.tryton.org/
 Author: Tryton
-- 
tryton-modules-sale-supply