[tryton-debian-vcs] tryton-modules-purchase branch debian-wheezy-2.2 created. 56c59865861bd31615b890dcc78c32324e3992bd
Mathias Behrle
tryton-debian-vcs at alioth.debian.org
Wed Nov 27 17:07:41 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-purchase.git;a=commitdiff;h=56c59865861bd31615b890dcc78c32324e3992bd
commit 56c59865861bd31615b890dcc78c32324e3992bd
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Tue Mar 19 19:25:28 2013 +0100
Releasing debian version 2.2.2-1.
diff --git a/debian/changelog b/debian/changelog
index a79ec45..94a3306 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+tryton-modules-purchase (2.2.2-1) unstable; urgency=low
+
+ * Merging upstream version 2.2.2.
+ * 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:15:27 +0100
+
tryton-modules-purchase (2.2.1-2) unstable; urgency=low
* Updating maintainers field.
commit 7d13ba3a8dd8d9cddd68830549c3e785e012f77f
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 94252d443e9ced37dc57807ff5e88ef0ae135e43
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 1117c7e..e85f1e4 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 d76df1c52531b3f4a4e243a1e01bcf5a6171a6ce
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 34c635e..1117c7e 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-purchase.git
Vcs-Git: git://debian.tryton.org/git/packages/tryton-modules-purchase.git
commit 69351508b41d76ec07afbc4c0f4ad5cfeb6ed5bf
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Sun Feb 24 19:46:20 2013 +0100
Merging upstream version 2.2.2.
diff --git a/CHANGELOG b/CHANGELOG
index 7aaf5f3..63b2c4f 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+Version 2.2.2 - 2012-11-05
+* Bug fixes (see mercurial logs for details)
+
Version 2.2.1 - 2012-05-07
* Bug fixes (see mercurial logs for details)
diff --git a/PKG-INFO b/PKG-INFO
index c42f61d..3450098 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
Metadata-Version: 1.1
Name: trytond_purchase
-Version: 2.2.1
+Version: 2.2.2
Summary: Define purchase order.
Add product supplier and purchase informations.
Define the purchase price as the supplier price or the cost price.
diff --git a/__tryton__.py b/__tryton__.py
index 55cfc67..85b0b1d 100644
--- a/__tryton__.py
+++ b/__tryton__.py
@@ -7,7 +7,7 @@
'name_es_CO': 'Compras',
'name_es_ES': 'Compras',
'name_fr_FR': 'Achat',
- 'version': '2.2.1',
+ 'version': '2.2.2',
'author': 'B2CK',
'email': 'info at b2ck.com',
'website': 'http://www.tryton.org/',
diff --git a/purchase.py b/purchase.py
index 6a733ed..f3e4462 100644
--- a/purchase.py
+++ b/purchase.py
@@ -888,7 +888,8 @@ class PurchaseLine(ModelSQL, ModelView):
'required': Eval('type') == 'line',
'readonly': ~Eval('_parent_purchase'),
}, on_change=['product', 'quantity', 'unit',
- '_parent_purchase.currency', '_parent_purchase.party'],
+ '_parent_purchase.currency', '_parent_purchase.party',
+ '_parent_purchase.purchase_date'],
depends=['unit_digits', 'type'])
unit = fields.Many2One('product.uom', 'Unit',
states={
@@ -913,7 +914,8 @@ class PurchaseLine(ModelSQL, ModelView):
'invisible': Eval('type') != 'line',
'readonly': ~Eval('_parent_purchase'),
}, on_change=['product', 'unit', 'quantity', 'description',
- '_parent_purchase.party', '_parent_purchase.currency'],
+ '_parent_purchase.party', '_parent_purchase.currency',
+ '_parent_purchase.purchase_date'],
context={
'locations': If(Bool(Eval('_parent_purchase', {}).get(
'warehouse')),
@@ -1748,7 +1750,7 @@ class Move(ModelSQL, ModelView):
return res
def search_purchase(self, name, clause):
- return [('purchase_line.' + name,) + clause[1:]]
+ return [('purchase_line.' + name,) + tuple(clause[1:])]
def get_purchase_fields(self, ids, names):
res = {}
@@ -1806,7 +1808,7 @@ class Move(ModelSQL, ModelView):
return res
def search_supplier(self, name, clause):
- return [('purchase_line.purchase.party',) + clause[1:]]
+ return [('purchase_line.purchase.party',) + tuple(clause[1:])]
def write(self, ids, vals):
purchase_obj = Pool().get('purchase.purchase')
diff --git a/trytond_purchase.egg-info/PKG-INFO b/trytond_purchase.egg-info/PKG-INFO
index 2ff677d..d55ee35 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.2.1
+Version: 2.2.2
Summary: Define purchase order.
Add product supplier and purchase informations.
Define the purchase price as the supplier price or the cost price.
commit 4e5226ab19d94cb203821f7bd6afe6c98e5c344d
Author: Daniel Baumann <daniel at debian.org>
Date: Sat Jun 30 18:27:48 2012 +0200
Releasing debian version 2.2.1-2.
diff --git a/debian/changelog b/debian/changelog
index 693b2d1..a79ec45 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+tryton-modules-purchase (2.2.1-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:27:38 +0200
+
tryton-modules-purchase (2.2.1-1) unstable; urgency=low
* Updating to Standards-Version: 3.9.3, no changes needed.
commit 01ca637af87f81b4f2cc4aeec51e7461a386b416
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 6302299..34c635e 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-purchase.git
commit 3ed8f2f483412356a71944ed4607ad05ac2e019a
Author: Daniel Baumann <daniel at debian.org>
Date: Sat Jun 30 17:54:36 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 3e3f6f2e0a236ce626a2b7e27605ebfe8f35e767
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 329ad150bce19d23c2deeccbf0380282651d482c
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 d884d63..6302299 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-purchase.git
-Vcs-Git: git://git.debian-maintainers.org/git/tryton/tryton-modules-purchase.git
+Vcs-Browser: http://debian.tryton.org/gitweb/?p=packages/tryton-modules-purchase.git
+Vcs-Git: git://debian.tryton.org/git/packages/tryton-modules-purchase.git
X-Python-Version: >= 2.6
Package: tryton-modules-purchase
commit b8ca7054019d87e27b7855e369928e3cd0627463
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 453fc5e..d884d63 100644
--- a/debian/control
+++ b/debian/control
@@ -1,7 +1,7 @@
Source: tryton-modules-purchase
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 6f194792ed6055f2ddc48a62ae35bf9aab7e102f
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Wed May 9 13:12:38 2012 +0200
Releasing debian version 2.2.1-1.
diff --git a/debian/changelog b/debian/changelog
index 5107cc9..693b2d1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,14 @@
+tryton-modules-purchase (2.2.1-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.1.
+ * Updating years in copyright.
+
+ -- Mathias Behrle <mathiasb at m9s.biz> Wed, 09 May 2012 12:02:53 +0200
+
tryton-modules-purchase (2.2.0-1) unstable; urgency=low
* Bumping X-Python-Version to >=2.6.
commit 0c7fda0de0f64440c358dba4e0e706c1f9a2b9d2
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Wed May 9 12:02:47 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 ef09ea1cb93b6532ad18107908f2c0e42a4bb5d5
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Wed May 9 12:01:18 2012 +0200
Merging upstream version 2.2.1.
diff --git a/CHANGELOG b/CHANGELOG
index 9e84f65..7aaf5f3 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+Version 2.2.1 - 2012-05-07
+* Bug fixes (see mercurial logs for details)
+
Version 2.2.0 - 2011-10-25
* 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 0ced27d..c42f61d 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
-Metadata-Version: 1.0
+Metadata-Version: 1.1
Name: trytond_purchase
-Version: 2.2.0
+Version: 2.2.1
Summary: Define purchase order.
Add product supplier and purchase informations.
Define the purchase price as the supplier price or the cost price.
diff --git a/__tryton__.py b/__tryton__.py
index 57f5d5f..55cfc67 100644
--- a/__tryton__.py
+++ b/__tryton__.py
@@ -7,7 +7,7 @@
'name_es_CO': 'Compras',
'name_es_ES': 'Compras',
'name_fr_FR': 'Achat',
- 'version': '2.2.0',
+ 'version': '2.2.1',
'author': 'B2CK',
'email': 'info at b2ck.com',
'website': 'http://www.tryton.org/',
diff --git a/invoice.py b/invoice.py
index 07e14b8..4baf305 100644
--- a/invoice.py
+++ b/invoice.py
@@ -9,6 +9,13 @@ class Invoice(ModelSQL, ModelView):
purchases = fields.Many2Many('purchase.purchase-account.invoice',
'invoice', 'purchase', 'Purchases', readonly=True)
+ def copy(self, ids, default=None):
+ if default is None:
+ default = {}
+ default = default.copy()
+ default.setdefault('purchases', False)
+ return super(Invoice, self).copy(ids, default=default)
+
Invoice()
@@ -18,4 +25,11 @@ class InvoiceLine(ModelSQL, ModelView):
purchase_lines = fields.Many2Many('purchase.line-account.invoice.line',
'invoice_line', 'purchase_line', 'Purchase Lines', readonly=True)
+ def copy(self, ids, default=None):
+ if default is None:
+ default = {}
+ default = default.copy()
+ default.setdefault('purchase_lines', False)
+ return super(InvoiceLine, self).copy(ids, default=default)
+
InvoiceLine()
diff --git a/purchase.py b/purchase.py
index 9d3fbb5..6a733ed 100644
--- a/purchase.py
+++ b/purchase.py
@@ -935,7 +935,7 @@ class PurchaseLine(ModelSQL, ModelView):
states={
'invisible': ~Eval('type').in_(['line', 'subtotal']),
'readonly': ~Eval('_parent_purchase'),
- }, on_change_with=['type', 'quantity', 'unit_price',
+ }, on_change_with=['type', 'quantity', 'unit_price', 'unit',
'_parent_purchase.currency'],
depends=['type']), 'get_amount')
description = fields.Text('Description', size=None, required=True)
@@ -1226,6 +1226,8 @@ class PurchaseLine(ModelSQL, ModelView):
else:
ignored_ids = ()
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_purchase.egg-info/PKG-INFO b/trytond_purchase.egg-info/PKG-INFO
index c64b585..2ff677d 100644
--- a/trytond_purchase.egg-info/PKG-INFO
+++ b/trytond_purchase.egg-info/PKG-INFO
@@ -1,6 +1,6 @@
-Metadata-Version: 1.0
+Metadata-Version: 1.1
Name: trytond-purchase
-Version: 2.2.0
+Version: 2.2.1
Summary: Define purchase order.
Add product supplier and purchase informations.
Define the purchase price as the supplier price or the cost price.
--
tryton-modules-purchase
More information about the tryton-debian-vcs
mailing list