[tryton-debian-vcs] tryton-modules-sale-opportunity branch upstream-2.6 created. e363bd0c8b4a615bfaa67042dccef0dd4c30e6a3

[Mathias Behrle]

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-opportunity.git;a=commitdiff;h=e363bd0c8b4a615bfaa67042dccef0dd4c30e6a3
commit e363bd0c8b4a615bfaa67042dccef0dd4c30e6a3
Author: Mathias Behrle <mathiasb at m9s.biz>
Date:   Thu Oct 17 13:15:44 2013 +0200

    Adding upstream version 2.6.3.

diff --git a/CHANGELOG b/CHANGELOG
index 4e50cf9..13c6f48 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+Version 2.6.3 - 2013-10-01
+* Bug fixes (see mercurial logs for details)
+
 Version 2.6.2 - 2013-07-22
 * Bug fixes (see mercurial logs for details)
 
diff --git a/PKG-INFO b/PKG-INFO
index e9c5600..c9a6053 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
 Metadata-Version: 1.1
 Name: trytond_sale_opportunity
-Version: 2.6.2
+Version: 2.6.3
 Summary: Tryton module with leads and opportunities
 Home-page: http://www.tryton.org/
 Author: Tryton
diff --git a/opportunity.py b/opportunity.py
index b5a2e94..9fb9e7d 100644
--- a/opportunity.py
+++ b/opportunity.py
@@ -264,7 +264,7 @@ class SaleOpportunity(Workflow, ModelSQL, ModelView):
         # Cancel before delete
         cls.cancel(opportunities)
         for opportunity in opportunities:
-            if opportunity.state != 'cancel':
+            if opportunity.state != 'cancelled':
                 cls.raise_user_error('delete_cancel', opportunity.rec_name)
         super(SaleOpportunity, cls).delete(opportunities)
 
diff --git a/tryton.cfg b/tryton.cfg
index 30f7341..1e05a22 100644
--- a/tryton.cfg
+++ b/tryton.cfg
@@ -1,5 +1,5 @@
 [tryton]
-version=2.6.2
+version=2.6.3
 depends:
     account
     company
diff --git a/trytond_sale_opportunity.egg-info/PKG-INFO b/trytond_sale_opportunity.egg-info/PKG-INFO
index c08a804..467a9ef 100644
--- a/trytond_sale_opportunity.egg-info/PKG-INFO
+++ b/trytond_sale_opportunity.egg-info/PKG-INFO
@@ -1,6 +1,6 @@
 Metadata-Version: 1.1
 Name: trytond-sale-opportunity
-Version: 2.6.2
+Version: 2.6.3
 Summary: Tryton module with leads and opportunities
 Home-page: http://www.tryton.org/
 Author: Tryton
commit 4b95140466f16f1f7afcaa0277eef68b4f51cb40
Author: Mathias Behrle <mathiasb at m9s.biz>
Date:   Wed Aug 7 16:41:02 2013 +0200

    Adding upstream version 2.6.2.

diff --git a/CHANGELOG b/CHANGELOG
index 3d508d1..4e50cf9 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+Version 2.6.2 - 2013-07-22
+* Bug fixes (see mercurial logs for details)
+
 Version 2.6.1 - 2013-02-12
 * Bug fixes (see mercurial logs for details)
 
diff --git a/COPYRIGHT b/COPYRIGHT
index 1dfd029..b2b3c67 100644
--- a/COPYRIGHT
+++ b/COPYRIGHT
@@ -1,6 +1,6 @@
 Copyright (C) 2010-2011 Open Labs Business Solutions.
-Copyright (C) 2010-2012 Cédric Krier.
-Copyright (C) 2010-2012 B2CK SPRL.
+Copyright (C) 2010-2013 Cédric Krier.
+Copyright (C) 2010-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 de69bd6..e9c5600 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
 Metadata-Version: 1.1
 Name: trytond_sale_opportunity
-Version: 2.6.1
+Version: 2.6.2
 Summary: Tryton module with leads and opportunities
 Home-page: http://www.tryton.org/
 Author: Tryton
diff --git a/opportunity.py b/opportunity.py
index e6ecd59..b5a2e94 100644
--- a/opportunity.py
+++ b/opportunity.py
@@ -198,8 +198,9 @@ class SaleOpportunity(Workflow, ModelSQL, ModelView):
                     self.party.customer_payment_term.rec_name
         if not res['payment_term']:
             res['payment_term'] = self.default_payment_term()
-            res['payment_term.rec_name'] = PaymentTerm(
-                res['payment_term']).rec_name
+            if res['payment_term']:
+                res['payment_term.rec_name'] = PaymentTerm(
+                    res['payment_term']).rec_name
         return res
 
     def _get_sale_line_opportunity_line(self, sale):
diff --git a/tryton.cfg b/tryton.cfg
index f748840..30f7341 100644
--- a/tryton.cfg
+++ b/tryton.cfg
@@ -1,5 +1,5 @@
 [tryton]
-version=2.6.1
+version=2.6.2
 depends:
     account
     company
diff --git a/trytond_sale_opportunity.egg-info/PKG-INFO b/trytond_sale_opportunity.egg-info/PKG-INFO
index 5f7fe88..c08a804 100644
--- a/trytond_sale_opportunity.egg-info/PKG-INFO
+++ b/trytond_sale_opportunity.egg-info/PKG-INFO
@@ -1,6 +1,6 @@
 Metadata-Version: 1.1
 Name: trytond-sale-opportunity
-Version: 2.6.1
+Version: 2.6.2
 Summary: Tryton module with leads and opportunities
 Home-page: http://www.tryton.org/
 Author: Tryton
-- 
tryton-modules-sale-opportunity