[tryton-debian-vcs] tryton-modules-sale-opportunity branch debian-wheezy-2.6 created. 50729df608174e9b31b25a148f747d4d0dbefcd9

Mathias Behrle tryton-debian-vcs at alioth.debian.org
Wed Nov 27 17:09:08 UTC 2013 

The following commit has been merged in the debian-wheezy-2.6 branch:
https://alioth.debian.org/plugins/scmgit/cgi-bin/gitweb.cgi/?p=tryton/tryton-modules-sale-opportunity.git;a=commitdiff;h=50729df608174e9b31b25a148f747d4d0dbefcd9
commit 50729df608174e9b31b25a148f747d4d0dbefcd9
Author: Mathias Behrle <mathiasb at m9s.biz>
Date:   Thu Oct 17 13:54:32 2013 +0200

    Releasing debian version 2.6.3-1.

diff --git a/debian/changelog b/debian/changelog
index ec3c32a..56d9f8b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+tryton-modules-sale-opportunity (2.6.3-1) unstable; urgency=low
+
+  * Merging upstream version 2.6.3.
+
+ -- Mathias Behrle <mathiasb at m9s.biz>  Thu, 17 Oct 2013 13:16:53 +0200
+
 tryton-modules-sale-opportunity (2.6.2-1) unstable; urgency=low
 
   * Removing Daniel from Uploaders. Thanks for your work! (Closes:
commit 70d5f1677d97b814e184aea51945b3405862d102
Author: Mathias Behrle <mathiasb at m9s.biz>
Date:   Thu Oct 17 13:15:45 2013 +0200

    Merging 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 1a01216dad0ee882499ff2d757f2e3ab01207a39
Author: Mathias Behrle <mathiasb at m9s.biz>
Date:   Wed Aug 7 17:00:34 2013 +0200

    Releasing debian version 2.6.2-1.

diff --git a/debian/changelog b/debian/changelog
index 0a8dfca..ec3c32a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,14 @@
+tryton-modules-sale-opportunity (2.6.2-1) unstable; urgency=low
+
+  * Removing Daniel from Uploaders. Thanks for your work! (Closes:
+    #704398).
+  * Versioning watch file for Tryton branch 2.6.
+  * Improving update of major version in Depends.
+  * Merging upstream version 2.6.2.
+  * Updating copyright.
+
+ -- Mathias Behrle <mathiasb at m9s.biz>  Wed, 07 Aug 2013 16:47:32 +0200
+
 tryton-modules-sale-opportunity (2.6.1-2) experimental; urgency=low
 
   * Updating Vcs-Git to correct address.
commit b97c77f5017f8951846a4b813f98c8227679f2d7
Author: Mathias Behrle <mathiasb at m9s.biz>
Date:   Wed Aug 7 16:44:57 2013 +0200

    Updating copyright.

diff --git a/debian/copyright b/debian/copyright
index 0eef6d9..081710c 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -2,8 +2,8 @@ Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 
 Files: *
 Copyright: 2010-2011 Open Labs Business Solutions
-           2010-2012 Cédric Krier
-           2010-2012 B2CK SPRL
+           2010-2013 Cédric Krier
+           2010-2013 B2CK SPRL
 License: GPL-3+
 
 Files: debian/*
commit 94224cf63a26193f741194162cda53cc2d820eef
Author: Mathias Behrle <mathiasb at m9s.biz>
Date:   Wed Aug 7 16:41:02 2013 +0200

    Merging 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
commit 42381617d33486f7fbeddbbeabec0e673a3ce3c2
Author: Mathias Behrle <mathiasb at m9s.biz>
Date:   Sat Apr 27 14:54:48 2013 +0200

    Improving update of major version in Depends.
    
    Pulling the major version for Depends directly from the package version.
    Thanks to Ilya Melnikov for pushing the idea.

diff --git a/debian/control b/debian/control
index 3533edb..f1371c6 100644
--- a/debian/control
+++ b/debian/control
@@ -13,10 +13,11 @@ X-Python-Version: >= 2.6
 Package: tryton-modules-sale-opportunity
 Architecture: all
 Depends:
- ${misc:Depends}, ${python:Depends}, tryton-server (>= 2.6),
- tryton-modules-company (>= 2.6), tryton-modules-party (>= 2.6),
- tryton-modules-product (>= 2.6), tryton-modules-sale (>= 2.6),
- python-pkg-resources
+ ${misc:Depends}, ${python:Depends}, tryton-server (>= ${version:major}),
+ tryton-modules-company (>= ${version:major}),
+ tryton-modules-party (>= ${version:major}),
+ tryton-modules-product (>= ${version:major}),
+ tryton-modules-sale (>= ${version:major}), python-pkg-resources
 Description: Tryton Application Platform (Sale Opportunity Module)
  Tryton is a high-level general purpose application platform written in Python
  and using PostgreSQL as database engine. It is the core base of a complete
diff --git a/debian/rules b/debian/rules
index 1ae0776..0f63ab4 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,5 +1,7 @@
 #!/usr/bin/make -f
 
+MAJOR := $(shell python setup.py --version | awk -F "." '{print $$1 "." $$2}')
+
 %:
 	dh ${@} --with python2
 
@@ -8,5 +10,8 @@ override_dh_auto_clean:
 
 	rm -rf *.egg-info
 
+override_dh_gencontrol:
+	dh_gencontrol -- -Vversion:major="$(MAJOR)"
+
 override_dh_builddeb:
 	dh_builddeb -- -Zxz -z9
commit 7d64c102e0300a67c108a4d8e7d31d877fce9e07
Author: Mathias Behrle <mathiasb at m9s.biz>
Date:   Wed Apr 24 00:59:48 2013 +0200

    Versioning watch file for Tryton branch 2.6.

diff --git a/debian/watch b/debian/watch
index 5c00699..ddc1910 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,2 +1,2 @@
 version=3
-http://downloads.tryton.org/current/ .*trytond_sale_opportunity-(\d.*)\.(?:tgz|tbz2|txz|tar\.(?:gz|bz2|xz))
+http://downloads.tryton.org/2.6/ .*trytond_sale_opportunity-(\d.*)\.(?:tgz|tbz2|txz|tar\.(?:gz|bz2|xz))
-- 
tryton-modules-sale-opportunity

More information about the tryton-debian-vcs mailing list