[tryton-debian-vcs] tryton-modules-sale branch debian-wheezy-2.6 created. 398abc15f86b92ec3c958e9d715b253c46fa1080
Mathias Behrle
tryton-debian-vcs at alioth.debian.org
Wed Nov 27 17:08: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-sale.git;a=commitdiff;h=398abc15f86b92ec3c958e9d715b253c46fa1080
commit 398abc15f86b92ec3c958e9d715b253c46fa1080
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 eb52722..a682f50 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+tryton-modules-sale (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:39 +0200
+
tryton-modules-sale (2.6.2-1) unstable; urgency=low
* Removing Daniel from Uploaders. Thanks for your work! (Closes: #704397).
commit a531383e4f8237c06f3b495851812740d10d1e84
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Thu Oct 17 13:15:44 2013 +0200
Merging upstream version 2.6.3.
diff --git a/CHANGELOG b/CHANGELOG
index dcb5245..ee9059f 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-06-09
* Bug fixes (see mercurial logs for details)
diff --git a/PKG-INFO b/PKG-INFO
index 9635b23..32bb665 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
Metadata-Version: 1.1
Name: trytond_sale
-Version: 2.6.2
+Version: 2.6.3
Summary: Tryton module for sale
Home-page: http://www.tryton.org/
Author: Tryton
diff --git a/sale.py b/sale.py
index bbc3470..b0dcd0c 100644
--- a/sale.py
+++ b/sale.py
@@ -1216,6 +1216,7 @@ class SaleLine(ModelSQL, ModelView):
invoice_line.note = self.note
if self.type != 'line':
if (self.sale.invoice_method == 'order'
+ and not self.invoice_lines
and ((all(l.quantity >= 0 for l in self.sale.lines
if l.type == 'line')
and invoice_type == 'out_invoice')
diff --git a/tryton.cfg b/tryton.cfg
index a1f70b1..2a90c4b 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_sale.egg-info/PKG-INFO b/trytond_sale.egg-info/PKG-INFO
index 1b3b8e3..9a1bee4 100644
--- a/trytond_sale.egg-info/PKG-INFO
+++ b/trytond_sale.egg-info/PKG-INFO
@@ -1,6 +1,6 @@
Metadata-Version: 1.1
Name: trytond-sale
-Version: 2.6.2
+Version: 2.6.3
Summary: Tryton module for sale
Home-page: http://www.tryton.org/
Author: Tryton
commit 7a3366688161d6af0d2acd2ec29d010762968f73
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Tue Jun 11 13:42:25 2013 +0200
Releasing debian version 2.6.2-1.
diff --git a/debian/changelog b/debian/changelog
index c8d8b11..eb52722 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+tryton-modules-sale (2.6.2-1) unstable; urgency=low
+
+ * Removing Daniel from Uploaders. Thanks for your work! (Closes: #704397).
+ * 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> Mon, 10 Jun 2013 18:20:54 +0200
+
tryton-modules-sale (2.6.1-2) experimental; urgency=low
* Updating Vcs-Git to correct address.
commit 0af61cab68c2999b5dc11e2e5cc2d6abf203e2d3
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Mon Jun 10 18:17:47 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 1b2bf1e0507a7cea25959cc95d4bdf975fa73088
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Mon Jun 10 18:12:37 2013 +0200
Merging upstream version 2.6.2.
diff --git a/CHANGELOG b/CHANGELOG
index 649851b..dcb5245 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+Version 2.6.2 - 2013-06-09
+* 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 7e060ee..9635b23 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
Metadata-Version: 1.1
Name: trytond_sale
-Version: 2.6.1
+Version: 2.6.2
Summary: Tryton module for sale
Home-page: http://www.tryton.org/
Author: Tryton
diff --git a/sale.py b/sale.py
index 63bf9de..bbc3470 100644
--- a/sale.py
+++ b/sale.py
@@ -1511,17 +1511,13 @@ class ShipmentOut:
for shipment in shipments:
move_ids.extend([x.id for x in shipment.outgoing_moves])
- sale_lines = SaleLine.search([
- ('moves', 'in', move_ids),
- ])
- if sale_lines:
- for sale_line in sale_lines:
- if sale_line.sale not in sales:
- sales.append(sale_line.sale)
-
with Transaction().set_user(0, set_context=True):
- sales = Sale.browse([s.id for s in sales])
- Sale.process(sales)
+ sale_lines = SaleLine.search([
+ ('moves', 'in', move_ids),
+ ])
+ if sale_lines:
+ sales = list(set(l.sale for l in sale_lines))
+ Sale.process(sales)
@classmethod
@ModelView.button
@@ -1560,17 +1556,17 @@ class ShipmentOutReturn:
for shipment in shipments:
move_ids.extend([x.id for x in shipment.incoming_moves])
- sale_lines = SaleLine.search([
- ('moves', 'in', move_ids),
- ])
- if sale_lines:
- for sale_line in sale_lines:
- if sale_line.sale not in sales:
- sales.append(sale_line.sale)
-
with Transaction().set_user(0, set_context=True):
- sales = Sale.browse([s.id for s in sales])
- Sale.process(sales)
+ sale_lines = SaleLine.search([
+ ('moves', 'in', move_ids),
+ ])
+ if sale_lines:
+ for sale_line in sale_lines:
+ if sale_line.sale not in sales:
+ sales.append(sale_line.sale)
+
+ sales = Sale.browse([s.id for s in sales])
+ Sale.process(sales)
@classmethod
@ModelView.button
@@ -1624,17 +1620,13 @@ class Move:
super(Move, cls).write(moves, vals)
if 'state' in vals and vals['state'] in ('cancel',):
- sales = set()
- sale_lines = SaleLine.search([
- ('moves', 'in', [m.id for m in moves]),
- ])
- if sale_lines:
- for sale_line in sale_lines:
- sales.add(sale_line.sale)
- if sales:
- with Transaction().set_user(0, set_context=True):
- sales = Sale.browse([s.id for s in sales])
- Sale.process(sales)
+ with Transaction().set_user(0, set_context=True):
+ sale_lines = SaleLine.search([
+ ('moves', 'in', [m.id for m in moves]),
+ ])
+ if sale_lines:
+ sales = list(set(l.sale for l in sale_lines))
+ Sale.process(sales)
@classmethod
def delete(cls, moves):
@@ -1642,20 +1634,17 @@ class Move:
Sale = pool.get('sale.sale')
SaleLine = pool.get('sale.line')
- sales = set()
- sale_lines = SaleLine.search([
- ('moves', 'in', [m.id for m in moves]),
- ])
+ with Transaction().set_user(0, set_context=True):
+ sale_lines = SaleLine.search([
+ ('moves', 'in', [m.id for m in moves]),
+ ])
super(Move, cls).delete(moves)
if sale_lines:
- for sale_line in sale_lines:
- sales.add(sale_line.sale)
- if sales:
- with Transaction().set_user(0, set_context=True):
- sales = Sale.browse([s.id for s in sales])
- Sale.process(list(sales))
+ sales = list(set(l.sale for l in sale_lines))
+ with Transaction().set_user(0, set_context=True):
+ Sale.process(sales)
class OpenCustomer(Wizard):
diff --git a/tryton.cfg b/tryton.cfg
index b1dd302..a1f70b1 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_sale.egg-info/PKG-INFO b/trytond_sale.egg-info/PKG-INFO
index 36a4cce..1b3b8e3 100644
--- a/trytond_sale.egg-info/PKG-INFO
+++ b/trytond_sale.egg-info/PKG-INFO
@@ -1,6 +1,6 @@
Metadata-Version: 1.1
Name: trytond-sale
-Version: 2.6.1
+Version: 2.6.2
Summary: Tryton module for sale
Home-page: http://www.tryton.org/
Author: Tryton
commit f4f240a79cf688533ef33ffa693817403fdd0e28
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 c472034..822d097 100644
--- a/debian/control
+++ b/debian/control
@@ -13,12 +13,15 @@ X-Python-Version: >= 2.6
Package: tryton-modules-sale
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 (Sale 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 3a4270f6e1a9f0ea64bfbd40bc3226dbcd065b4e
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 91f75fb..716277d 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,2 +1,2 @@
version=3
-http://downloads.tryton.org/current/ .*trytond_sale-(\d.*)\.(?:tgz|tbz2|txz|tar\.(?:gz|bz2|xz))
+http://downloads.tryton.org/2.6/ .*trytond_sale-(\d.*)\.(?:tgz|tbz2|txz|tar\.(?:gz|bz2|xz))
--
tryton-modules-sale
More information about the tryton-debian-vcs
mailing list