[tryton-debian-vcs] tryton-modules-sale branch debian-wheezy-2.2 created. 27b0f98f4bf7aeeb7bfa9b34d996edd0e365e369
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.2 branch:
https://alioth.debian.org/plugins/scmgit/cgi-bin/gitweb.cgi/?p=tryton/tryton-modules-sale.git;a=commitdiff;h=27b0f98f4bf7aeeb7bfa9b34d996edd0e365e369
commit 27b0f98f4bf7aeeb7bfa9b34d996edd0e365e369
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Tue Mar 19 19:25:28 2013 +0100
Releasing debian version 2.2.3-1.
diff --git a/debian/changelog b/debian/changelog
index 7ba914c..e6bb066 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+tryton-modules-sale (2.2.3-1) unstable; urgency=low
+
+ * Merging upstream version 2.2.3.
+ * Updating to Standards-Version: 3.9.4, no changes needed.
+ * Removing obsolete Dm-Upload-Allowed
+ * Updating copyright.
+
+ -- Mathias Behrle <mathiasb at m9s.biz> Sun, 24 Feb 2013 22:13:10 +0100
+
tryton-modules-sale (2.2.2-2) unstable; urgency=low
* Updating maintainers field.
commit 8ab3d375f324665af1cb15f8830ec4f9cd41725d
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Sun Feb 24 22:09:31 2013 +0100
Updating copyright.
diff --git a/debian/copyright b/debian/copyright
index bf0e801..c5fd09e 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,11 +1,10 @@
Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
Files: *
-Copyright:
- 2004-2008 Tiny SPRL
- 2008-2012 Cedric Krier
+Copyright: 2008-2012 Cédric Krier
2008-2011 Bertrand Chenal
2008-2012 B2CK SPRL
+ 2004-2008 Tiny SPRL
License: GPL-3+
Files: debian/*
commit 388288cba8a16eba5b8c3a857b5e5ea7397897a6
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Sun Feb 24 22:01:47 2013 +0100
Removing obsolete Dm-Upload-Allowed
diff --git a/debian/control b/debian/control
index 6a850e0..64368e1 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,6 @@ Section: python
Priority: optional
Maintainer: Debian Tryton Maintainers <maintainers at debian.tryton.org>
Uploaders: Daniel Baumann <daniel at debian.org>, Mathias Behrle <mathiasb at m9s.biz>
-Dm-Upload-Allowed: yes
Build-Depends: debhelper (>= 9), python (>= 2.6.6-3~), python-setuptools
Standards-Version: 3.9.4
Homepage: http://www.tryton.org/
commit 11d58d8f53feb2770cc1f432721341b00d60c68e
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Sun Feb 24 22:01:09 2013 +0100
Updating to Standards-Version: 3.9.4, no changes needed.
diff --git a/debian/control b/debian/control
index 82b38da..6a850e0 100644
--- a/debian/control
+++ b/debian/control
@@ -5,7 +5,7 @@ Maintainer: Debian Tryton Maintainers <maintainers at debian.tryton.org>
Uploaders: Daniel Baumann <daniel at debian.org>, Mathias Behrle <mathiasb at m9s.biz>
Dm-Upload-Allowed: yes
Build-Depends: debhelper (>= 9), python (>= 2.6.6-3~), python-setuptools
-Standards-Version: 3.9.3
+Standards-Version: 3.9.4
Homepage: http://www.tryton.org/
Vcs-Browser: http://debian.tryton.org/gitweb/?p=packages/tryton-modules-sale.git
Vcs-Git: git://debian.tryton.org/git/packages/tryton-modules-sale.git
commit c50063c530c4e050085883b40d7c2485005dfde7
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Sun Feb 24 19:48:26 2013 +0100
Merging upstream version 2.2.3.
diff --git a/CHANGELOG b/CHANGELOG
index 9c2d639..2a08e05 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+Version 2.2.3 - 2012-11-05
+* Bug fixes (see mercurial logs for details)
+
Version 2.2.2 - 2012-05-07
* Bug fixes (see mercurial logs for details)
diff --git a/PKG-INFO b/PKG-INFO
index b7072d4..467c044 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
Metadata-Version: 1.1
Name: trytond_sale
-Version: 2.2.2
+Version: 2.2.3
Summary: Define sale order.
Add to product sale informations.
Define the sale price as the list price.
diff --git a/__tryton__.py b/__tryton__.py
index 777bbca..36b35aa 100644
--- a/__tryton__.py
+++ b/__tryton__.py
@@ -8,7 +8,7 @@
'name_es_ES': 'Venta',
'name_fr_FR': 'Vente',
'name_nl_NL': 'Verkoop',
- 'version': '2.2.2',
+ 'version': '2.2.3',
'author': 'B2CK',
'email': 'info at b2ck.com',
'website': 'http://www.tryton.org/',
diff --git a/sale.py b/sale.py
index 25c3151..adf44cb 100644
--- a/sale.py
+++ b/sale.py
@@ -1044,7 +1044,8 @@ class SaleLine(ModelSQL, ModelView):
'required': Eval('type') == 'line',
'readonly': ~Eval('_parent_sale', {}),
}, on_change=['product', 'quantity', 'unit',
- '_parent_sale.currency', '_parent_sale.party'],
+ '_parent_sale.currency', '_parent_sale.party',
+ '_parent_sale.sale_date'],
depends=['type', 'unit_digits'])
unit = fields.Many2One('product.uom', 'Unit',
states={
@@ -1070,7 +1071,8 @@ class SaleLine(ModelSQL, ModelView):
'readonly': ~Eval('_parent_sale', {}),
},
on_change=['product', 'unit', 'quantity', 'description',
- '_parent_sale.party', '_parent_sale.currency'],
+ '_parent_sale.party', '_parent_sale.currency',
+ '_parent_sale.sale_date'],
context={
'locations': If(Bool(Eval('_parent_sale', {}).get( 'warehouse')),
[Eval('_parent_sale', {}).get('warehouse', 0)], []),
diff --git a/setup.py b/setup.py
index 721a34e..e711ce0 100644
--- a/setup.py
+++ b/setup.py
@@ -67,5 +67,5 @@ setup(name='trytond_sale',
sale = trytond.modules.sale
""",
test_suite='tests',
- test_loader='trytond.test_loader:Loader',
+ tests_loader='trytond.test_loader:Loader',
)
diff --git a/trytond_sale.egg-info/PKG-INFO b/trytond_sale.egg-info/PKG-INFO
index 7d649ae..c553d62 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.2.2
+Version: 2.2.3
Summary: Define sale order.
Add to product sale informations.
Define the sale price as the list price.
commit 057bedb602c6acdce6ff69c94a5f06e5cfaf4be2
Author: Daniel Baumann <daniel at debian.org>
Date: Sat Jun 30 18:29:37 2012 +0200
Releasing debian version 2.2.2-2.
diff --git a/debian/changelog b/debian/changelog
index e6932e1..7ba914c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+tryton-modules-sale (2.2.2-2) unstable; urgency=low
+
+ * Updating maintainers field.
+ * Updating vcs fields.
+ * Correcting copyright file to match format version 1.0.
+ * Switching to xz compression.
+ * Updating to debhelper version 9.
+
+ -- Daniel Baumann <daniel at debian.org> Sat, 30 Jun 2012 18:28:32 +0200
+
tryton-modules-sale (2.2.2-1) unstable; urgency=low
* Updating to Standards-Version: 3.9.3, no changes needed.
commit 57146cb80dbc8a6db4d4bfc626d2086f770a2008
Author: Daniel Baumann <daniel at debian.org>
Date: Sat Jun 30 18:02:29 2012 +0200
Updating to debhelper version 9.
diff --git a/debian/compat b/debian/compat
index 45a4fb7..ec63514 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-8
+9
diff --git a/debian/control b/debian/control
index c34645f..82b38da 100644
--- a/debian/control
+++ b/debian/control
@@ -4,7 +4,7 @@ Priority: optional
Maintainer: Debian Tryton Maintainers <maintainers at debian.tryton.org>
Uploaders: Daniel Baumann <daniel at debian.org>, Mathias Behrle <mathiasb at m9s.biz>
Dm-Upload-Allowed: yes
-Build-Depends: debhelper (>= 8), python (>= 2.6.6-3~), python-setuptools
+Build-Depends: debhelper (>= 9), python (>= 2.6.6-3~), python-setuptools
Standards-Version: 3.9.3
Homepage: http://www.tryton.org/
Vcs-Browser: http://debian.tryton.org/gitweb/?p=packages/tryton-modules-sale.git
commit 56651eb12b886764b2f80f3bb82669d069adb78c
Author: Daniel Baumann <daniel at debian.org>
Date: Sat Jun 30 17:54:37 2012 +0200
Switching to xz compression.
diff --git a/debian/rules b/debian/rules
index e32b791..1ae0776 100755
--- a/debian/rules
+++ b/debian/rules
@@ -7,3 +7,6 @@ override_dh_auto_clean:
dh_auto_clean
rm -rf *.egg-info
+
+override_dh_builddeb:
+ dh_builddeb -- -Zxz -z9
diff --git a/debian/source/options b/debian/source/options
index d053b65..22a4de9 100644
--- a/debian/source/options
+++ b/debian/source/options
@@ -1,2 +1,2 @@
-compression = gzip
+compression = xz
compression-level = 9
commit 67f16bb3f01b5b5fb102451782f400367d420d7a
Author: Daniel Baumann <daniel at debian.org>
Date: Sat Jun 30 17:50:24 2012 +0200
Correcting copyright file to match format version 1.0.
diff --git a/debian/copyright b/debian/copyright
index f432143..bf0e801 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -2,16 +2,16 @@ Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
Files: *
Copyright:
- (C) 2004-2008 Tiny SPRL
- (C) 2008-2012 Cedric Krier
- (C) 2008-2011 Bertrand Chenal
- (C) 2008-2012 B2CK SPRL
+ 2004-2008 Tiny SPRL
+ 2008-2012 Cedric Krier
+ 2008-2011 Bertrand Chenal
+ 2008-2012 B2CK SPRL
License: GPL-3+
Files: debian/*
Copyright:
- (C) 2009-2012 Daniel Baumann <daniel at debian.org>
- (C) 2012 Mathias Behrle <mathiasb at m9s.biz>
+ 2009-2012 Daniel Baumann <daniel at debian.org>
+ 2012 Mathias Behrle <mathiasb at m9s.biz>
License: GPL-3+
License: GPL-3+
commit 7947b128db3d04cb909d62059d81ee72001325a5
Author: Daniel Baumann <daniel at 127011.net>
Date: Sat Jun 30 16:55:04 2012 +0200
Updating vcs fields.
diff --git a/debian/control b/debian/control
index 52cd2b3..c34645f 100644
--- a/debian/control
+++ b/debian/control
@@ -7,8 +7,8 @@ Dm-Upload-Allowed: yes
Build-Depends: debhelper (>= 8), python (>= 2.6.6-3~), python-setuptools
Standards-Version: 3.9.3
Homepage: http://www.tryton.org/
-Vcs-Browser: http://git.debian-maintainers.org/?p=tryton/tryton-modules-sale.git
-Vcs-Git: git://git.debian-maintainers.org/git/tryton/tryton-modules-sale.git
+Vcs-Browser: http://debian.tryton.org/gitweb/?p=packages/tryton-modules-sale.git
+Vcs-Git: git://debian.tryton.org/git/packages/tryton-modules-sale.git
X-Python-Version: >= 2.6
Package: tryton-modules-sale
commit 5a84b5176ea36a18030039a9193eee5e05fc72f8
Author: Daniel Baumann <daniel at 127011.net>
Date: Sat Jun 30 16:52:31 2012 +0200
Updating maintainers field.
diff --git a/debian/control b/debian/control
index df3f92d..52cd2b3 100644
--- a/debian/control
+++ b/debian/control
@@ -1,7 +1,7 @@
Source: tryton-modules-sale
Section: python
Priority: optional
-Maintainer: Debian Tryton Maintainers <tryton at lists.debian-maintainers.org>
+Maintainer: Debian Tryton Maintainers <maintainers at debian.tryton.org>
Uploaders: Daniel Baumann <daniel at debian.org>, Mathias Behrle <mathiasb at m9s.biz>
Dm-Upload-Allowed: yes
Build-Depends: debhelper (>= 8), python (>= 2.6.6-3~), python-setuptools
commit 4c9e117cbe8cec1021ec35f50aea5015676ec1c9
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Wed May 9 13:13:23 2012 +0200
Releasing debian version 2.2.2-1.
diff --git a/debian/changelog b/debian/changelog
index cb2d277..e6932e1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,14 @@
+tryton-modules-sale (2.2.2-1) unstable; urgency=low
+
+ * Updating to Standards-Version: 3.9.3, no changes needed.
+ * Updating year in copyright.
+ * Adding myself to copyright.
+ * Adding Format header for DEP5.
+ * Merging upstream version 2.2.2.
+ * Updating years in copyright.
+
+ -- Mathias Behrle <mathiasb at m9s.biz> Wed, 09 May 2012 11:56:20 +0200
+
tryton-modules-sale (2.2.1-1) unstable; urgency=low
* Merging upstream version 2.2.1.
commit 780c984a5a76716d440755ed6fe855863fbe52de
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Wed May 9 11:56:14 2012 +0200
Updating years in copyright.
diff --git a/debian/copyright b/debian/copyright
index 21a85a7..f432143 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -3,9 +3,9 @@ Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
Files: *
Copyright:
(C) 2004-2008 Tiny SPRL
- (C) 2008-2011 Cedric Krier
+ (C) 2008-2012 Cedric Krier
(C) 2008-2011 Bertrand Chenal
- (C) 2008-2011 B2CK SPRL
+ (C) 2008-2012 B2CK SPRL
License: GPL-3+
Files: debian/*
commit bd69807c73ab91083e682fea9bbd537683fffd2c
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Wed May 9 11:47:28 2012 +0200
Merging upstream version 2.2.2.
diff --git a/CHANGELOG b/CHANGELOG
index c07ac6e..9c2d639 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+Version 2.2.2 - 2012-05-07
+* Bug fixes (see mercurial logs for details)
+
Version 2.2.1 - 2011-12-26
* Bug fixes (see mercurial logs for details)
diff --git a/COPYRIGHT b/COPYRIGHT
index a9feb41..83c0f58 100644
--- a/COPYRIGHT
+++ b/COPYRIGHT
@@ -1,6 +1,6 @@
-Copyright (C) 2008-2011 Cédric Krier.
+Copyright (C) 2008-2012 Cédric Krier.
Copyright (C) 2008-2011 Bertrand Chenal.
-Copyright (C) 2008-2011 B2CK SPRL.
+Copyright (C) 2008-2012 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 d2cf512..b7072d4 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
Metadata-Version: 1.1
Name: trytond_sale
-Version: 2.2.1
+Version: 2.2.2
Summary: Define sale order.
Add to product sale informations.
Define the sale price as the list price.
diff --git a/__tryton__.py b/__tryton__.py
index f57b590..777bbca 100644
--- a/__tryton__.py
+++ b/__tryton__.py
@@ -8,7 +8,7 @@
'name_es_ES': 'Venta',
'name_fr_FR': 'Vente',
'name_nl_NL': 'Verkoop',
- 'version': '2.2.1',
+ 'version': '2.2.2',
'author': 'B2CK',
'email': 'info at b2ck.com',
'website': 'http://www.tryton.org/',
diff --git a/invoice.py b/invoice.py
index 447bcd0..b936a9a 100644
--- a/invoice.py
+++ b/invoice.py
@@ -9,6 +9,13 @@ class Invoice(ModelSQL, ModelView):
sales = fields.Many2Many('sale.sale-account.invoice',
'invoice', 'sale', 'Sales', readonly=True)
+ def copy(self, ids, default=None):
+ if default is None:
+ default = {}
+ default = default.copy()
+ default.setdefault('sales', False)
+ return super(Invoice, self).copy(ids, default=default)
+
Invoice()
@@ -18,4 +25,11 @@ class InvoiceLine(ModelSQL, ModelView):
sale_lines = fields.Many2Many('sale.line-account.invoice.line',
'invoice_line', 'sale_line', 'Sale Lines', readonly=True)
+ def copy(self, ids, default=None):
+ if default is None:
+ default = {}
+ default = default.copy()
+ default.setdefault('sale_lines', False)
+ return super(InvoiceLine, self).copy(ids, default=default)
+
InvoiceLine()
diff --git a/sale.py b/sale.py
index c817e99..25c3151 100644
--- a/sale.py
+++ b/sale.py
@@ -1088,7 +1088,7 @@ class SaleLine(ModelSQL, ModelView):
states={
'invisible': ~Eval('type').in_(['line', 'subtotal']),
'readonly': ~Eval('_parent_sale'),
- }, on_change_with=['type', 'quantity', 'unit_price',
+ }, on_change_with=['type', 'quantity', 'unit_price', 'unit',
'_parent_sale.currency'],
depends=['type']), 'get_amount')
description = fields.Text('Description', size=None, required=True)
@@ -1370,6 +1370,8 @@ class SaleLine(ModelSQL, ModelView):
ignored_ids = set(
l.id for i in line.sale.invoices_ignored for l in i.lines)
for invoice_line in line.invoice_lines:
+ if invoice_line.type != 'line':
+ continue
if ((invoice_line.invoice and
invoice_line.invoice.state != 'cancel') or
invoice_line.id in ignored_ids):
diff --git a/trytond_sale.egg-info/PKG-INFO b/trytond_sale.egg-info/PKG-INFO
index 9f8ee0f..7d649ae 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.2.1
+Version: 2.2.2
Summary: Define sale order.
Add to product sale informations.
Define the sale price as the list price.
--
tryton-modules-sale
More information about the tryton-debian-vcs
mailing list