[tryton-debian-vcs] tryton-modules-purchase branch debian-wheezy-2.6 created. 60ee4fe47a8e8259b663b08fa07c216a98d0b138
Mathias Behrle
tryton-debian-vcs at alioth.debian.org
Wed Nov 27 17:07:42 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-purchase.git;a=commitdiff;h=60ee4fe47a8e8259b663b08fa07c216a98d0b138
commit 60ee4fe47a8e8259b663b08fa07c216a98d0b138
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 46331e4..fc18652 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+tryton-modules-purchase (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:06 +0200
+
tryton-modules-purchase (2.6.2-1) experimental; urgency=low
* Removing Daniel from Uploaders. Thanks for your work! (Closes: #704395).
commit 95cfd8679d8ebf5c6a6c2cf8c97182e78e80996c
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Thu Oct 17 13:15:43 2013 +0200
Merging upstream version 2.6.3.
diff --git a/CHANGELOG b/CHANGELOG
index 0b606e4..5ac8b2b 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-05-02
* Bug fixes (see mercurial logs for details)
diff --git a/PKG-INFO b/PKG-INFO
index 146b20b..f77119e 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
Metadata-Version: 1.1
Name: trytond_purchase
-Version: 2.6.2
+Version: 2.6.3
Summary: Tryton module for purchase
Home-page: http://www.tryton.org/
Author: Tryton
diff --git a/invoice.py b/invoice.py
index bf7c732..3bf5f56 100644
--- a/invoice.py
+++ b/invoice.py
@@ -56,8 +56,8 @@ class Invoice:
cursor.execute('SELECT id FROM purchase_invoices_rel ' \
'WHERE invoice IN (' + ','.join(('%s',) * len(invoices)) + ')',
[i.id for i in invoices])
- if cursor.fetchone():
- cls.raise_user_error('delete_purchase_invoice')
+ if cursor.fetchone():
+ cls.raise_user_error('delete_purchase_invoice')
super(Invoice, cls).delete(invoices)
@classmethod
diff --git a/purchase.py b/purchase.py
index 1114480..2e59ad9 100644
--- a/purchase.py
+++ b/purchase.py
@@ -1120,6 +1120,7 @@ class PurchaseLine(ModelSQL, ModelView):
invoice_line.note = self.note
if self.type != 'line':
if (self.purchase.invoice_method == 'order'
+ and not self.invoice_lines
and ((all(l.quantity >= 0 for l in self.purchase.lines
if l.type == 'line')
and invoice_type == 'in_invoice')
diff --git a/tryton.cfg b/tryton.cfg
index 9ec5b0b..ef5e959 100644
--- a/tryton.cfg
+++ b/tryton.cfg
@@ -1,5 +1,5 @@
[tryton]
-version=2.6.2
+version=2.6.3
depends:
account
account_invoice
diff --git a/trytond_purchase.egg-info/PKG-INFO b/trytond_purchase.egg-info/PKG-INFO
index cb0d099..3a40c9f 100644
--- a/trytond_purchase.egg-info/PKG-INFO
+++ b/trytond_purchase.egg-info/PKG-INFO
@@ -1,6 +1,6 @@
Metadata-Version: 1.1
Name: trytond-purchase
-Version: 2.6.2
+Version: 2.6.3
Summary: Tryton module for purchase
Home-page: http://www.tryton.org/
Author: Tryton
commit be0dc3e541378c60d5b5475ddda86d6c86a1db69
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Sat May 4 12:07:19 2013 +0200
Releasing debian version 2.6.2-1.
diff --git a/debian/changelog b/debian/changelog
index 3448c3d..46331e4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+tryton-modules-purchase (2.6.2-1) experimental; urgency=low
+
+ * Removing Daniel from Uploaders. Thanks for your work! (Closes: #704395).
+ * 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> Sat, 04 May 2013 02:39:08 +0200
+
tryton-modules-purchase (2.6.1-2) experimental; urgency=low
* Updating Vcs-Git to correct address.
commit c8a121f5869e7a6b6727936edc18ee7925a7a7f0
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Sat May 4 02:14:01 2013 +0200
Updating copyright.
diff --git a/debian/copyright b/debian/copyright
index 899bb6c..20b2b42 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,9 +1,9 @@
Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
Files: *
-Copyright: 2008-2012 Cédric Krier
+Copyright: 2008-2013 Cédric Krier
2008-2012 Bertrand Chenal
- 2008-2012 B2CK SPRL
+ 2008-2013 B2CK SPRL
2004-2008 Tiny SPRL
License: GPL-3+
commit 08504e87f97156f7d1046d726e64b87c2c151b9d
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Sat May 4 02:12:32 2013 +0200
Merging upstream version 2.6.2.
diff --git a/CHANGELOG b/CHANGELOG
index 7f55da7..0b606e4 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+Version 2.6.2 - 2013-05-02
+* Bug fixes (see mercurial logs for details)
+
Version 2.6.1 - 2012-12-23
* Bug fixes (see mercurial logs for details)
diff --git a/COPYRIGHT b/COPYRIGHT
index ede3fac..6e948f6 100644
--- a/COPYRIGHT
+++ b/COPYRIGHT
@@ -1,6 +1,6 @@
-Copyright (C) 2008-2012 Cédric Krier.
+Copyright (C) 2008-2013 Cédric Krier.
Copyright (C) 2008-2012 Bertrand Chenal.
-Copyright (C) 2008-2012 B2CK SPRL.
+Copyright (C) 2008-2013 B2CK SPRL.
Copyright (C) 2004-2008 Tiny SPRL.
This program is free software: you can redistribute it and/or modify
diff --git a/PKG-INFO b/PKG-INFO
index ee5c3e1..146b20b 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
Metadata-Version: 1.1
Name: trytond_purchase
-Version: 2.6.1
+Version: 2.6.2
Summary: Tryton module for purchase
Home-page: http://www.tryton.org/
Author: Tryton
diff --git a/purchase.py b/purchase.py
index 6b1dce4..1114480 100644
--- a/purchase.py
+++ b/purchase.py
@@ -1586,7 +1586,7 @@ class ShipmentIn:
with Transaction().set_user(0, set_context=True):
purchases = Purchase.browse([p.id for p in purchases])
- Purchase.process(purchases)
+ Purchase.process(purchases)
@classmethod
@ModelView.button
@@ -1634,7 +1634,7 @@ class ShipmentInReturn:
with Transaction().set_user(0, set_context=True):
purchases = Purchase.browse([p.id for p in purchases])
- Purchase.process(purchases)
+ Purchase.process(purchases)
@classmethod
@ModelView.button
@@ -1753,7 +1753,7 @@ class Move(ModelSQL, ModelView):
if purchases:
with Transaction().set_user(0, set_context=True):
purchases = Purchase.browse([p.id for p in purchases])
- Purchase.process(purchases)
+ Purchase.process(purchases)
@classmethod
def delete(cls, moves):
@@ -1774,7 +1774,7 @@ class Move(ModelSQL, ModelView):
if purchases:
with Transaction().set_user(0, set_context=True):
purchases = Purchase.browse([p.id for p in purchases])
- Purchase.process(purchases)
+ Purchase.process(purchases)
class OpenSupplier(Wizard):
diff --git a/tryton.cfg b/tryton.cfg
index 675c575..9ec5b0b 100644
--- a/tryton.cfg
+++ b/tryton.cfg
@@ -1,5 +1,5 @@
[tryton]
-version=2.6.1
+version=2.6.2
depends:
account
account_invoice
diff --git a/trytond_purchase.egg-info/PKG-INFO b/trytond_purchase.egg-info/PKG-INFO
index a581e0d..cb0d099 100644
--- a/trytond_purchase.egg-info/PKG-INFO
+++ b/trytond_purchase.egg-info/PKG-INFO
@@ -1,6 +1,6 @@
Metadata-Version: 1.1
Name: trytond-purchase
-Version: 2.6.1
+Version: 2.6.2
Summary: Tryton module for purchase
Home-page: http://www.tryton.org/
Author: Tryton
commit cac429a09a45acee3c609d6c02f84ab421d4cd2a
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 1a6d3e2..00c798c 100644
--- a/debian/control
+++ b/debian/control
@@ -13,12 +13,15 @@ X-Python-Version: >= 2.6
Package: tryton-modules-purchase
Architecture: all
Depends:
- ${misc:Depends}, ${python:Depends}, tryton-server (>= 2.6),
- tryton-modules-account (>= 2.6), tryton-modules-account-invoice (>= 2.6),
- tryton-modules-account-product (>= 2.6), tryton-modules-company (>= 2.6),
- tryton-modules-currency (>= 2.6), tryton-modules-party (>= 2.6),
- tryton-modules-product (>= 2.6), tryton-modules-stock (>= 2.6),
- python-pkg-resources
+ ${misc:Depends}, ${python:Depends}, tryton-server (>= ${version:major}),
+ tryton-modules-account (>= ${version:major}),
+ tryton-modules-account-invoice (>= ${version:major}),
+ tryton-modules-account-product (>= ${version:major}),
+ tryton-modules-company (>= ${version:major}),
+ tryton-modules-currency (>= ${version:major}),
+ tryton-modules-party (>= ${version:major}),
+ tryton-modules-product (>= ${version:major}),
+ tryton-modules-stock (>= ${version:major}), python-pkg-resources
Description: Tryton Application Platform (Purchase 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 e3ce17cd022426a6fec523254429cedee51150d0
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Wed Apr 24 00:59:47 2013 +0200
Versioning watch file for Tryton branch 2.6.
diff --git a/debian/watch b/debian/watch
index 8f3bf91..4e52753 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,2 +1,2 @@
version=3
-http://downloads.tryton.org/current/ .*trytond_purchase-(\d.*)\.(?:tgz|tbz2|txz|tar\.(?:gz|bz2|xz))
+http://downloads.tryton.org/2.6/ .*trytond_purchase-(\d.*)\.(?:tgz|tbz2|txz|tar\.(?:gz|bz2|xz))
--
tryton-modules-purchase
More information about the tryton-debian-vcs
mailing list