[tryton-debian-vcs] tryton-modules-sale-supply branch debian updated. debian/3.0.0-3-4-gc4b7172

Mathias Behrle tryton-debian-vcs at alioth.debian.org
Wed Mar 26 19:50:01 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-supply.git;a=commitdiff;h=debian/3.0.0-3-4-gc4b7172

commit c4b7172a4c73610c862c50aee3aceaf4c151f425
Author: Mathias Behrle <mathiasb at m9s.biz>
Date:   Wed Mar 26 20:49:11 2014 +0100

    Releasing debian version 3.0.1-1.

diff --git a/debian/changelog b/debian/changelog
index 3ade3ee..4879066 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+tryton-modules-sale-supply (3.0.1-1) unstable; urgency=medium
+
+  * Removing  LC_ALL=C.UTF-8 as build environment.
+  * Merging upstream version 3.0.1.
+  * Updating copyright.
+
+ -- Mathias Behrle <mathiasb at m9s.biz>  Wed, 26 Mar 2014 18:50:04 +0100
+
 tryton-modules-sale-supply (3.0.0-3) unstable; urgency=medium
 
   * Updating year in debian copyright.
commit 68734051710978d1ee7a3a0d1dc99662452be8f7
Author: Mathias Behrle <mathiasb at m9s.biz>
Date:   Wed Mar 26 18:47:17 2014 +0100

    Updating copyright.

diff --git a/debian/copyright b/debian/copyright
index b9721e9..9bec2ff 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,8 +1,8 @@
 Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 
 Files: *
-Copyright: 2011-2013 Cédric Krier
-           2011-2013 B2CK SPRL
+Copyright: 2011-2014 Cédric Krier
+           2011-2014 B2CK SPRL
 License: GPL-3+
 
 Files: debian/*
commit 873bf4f6dd61ed487be611abec435d6f71208509
Author: Mathias Behrle <mathiasb at m9s.biz>
Date:   Wed Mar 26 18:45:27 2014 +0100

    Merging upstream version 3.0.1.

diff --git a/CHANGELOG b/CHANGELOG
index cd2dc58..d739b92 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+Version 3.0.1 - 2014-03-22
+* Bug fixes (see mercurial logs for details)
+
 Version 3.0.0 - 2013-10-21
 * 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 96d965c..1225971 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
 Metadata-Version: 1.1
 Name: trytond_sale_supply
-Version: 3.0.0
+Version: 3.0.1
 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 4595cb7..10ce152 100644
--- a/tryton.cfg
+++ b/tryton.cfg
@@ -1,5 +1,5 @@
 [tryton]
-version=3.0.0
+version=3.0.1
 depends:
     ir
     purchase
diff --git a/trytond_sale_supply.egg-info/PKG-INFO b/trytond_sale_supply.egg-info/PKG-INFO
index 40a45e0..e324eb2 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: 3.0.0
+Version: 3.0.1
 Summary: Tryton module for sale supply
 Home-page: http://www.tryton.org/
 Author: Tryton
-- 
tryton-modules-sale-supply



More information about the tryton-debian-vcs mailing list