[tryton-debian-vcs] tryton-modules-account-invoice branch debian-wheezy-2.2 created. 80480c4215adac1af55483d8eced8fad0c9f24a4
Mathias Behrle
tryton-debian-vcs at alioth.debian.org
Wed Nov 27 16:55:20 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-account-invoice.git;a=commitdiff;h=80480c4215adac1af55483d8eced8fad0c9f24a4
commit 80480c4215adac1af55483d8eced8fad0c9f24a4
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Sat May 4 17:05:14 2013 +0200
Releasing debian version 2.2.3-1.
diff --git a/debian/changelog b/debian/changelog
index 76a60cf..d78c320 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+tryton-modules-account-invoice (2.2.3-1) unstable; urgency=low
+
+ * Merging upstream version 2.2.3.
+ * Updating copyright.
+
+ -- Mathias Behrle <mathiasb at m9s.biz> Sat, 04 May 2013 16:56:32 +0200
+
tryton-modules-account-invoice (2.2.2-2) unstable; urgency=low
* Updating maintainers field.
commit 3479963d77cf45ec2d25d312e13060bce1a81387
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Sat May 4 16:50:58 2013 +0200
Updating copyright.
diff --git a/debian/copyright b/debian/copyright
index fc94d87..a7678ac 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,10 +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-2013 Cédric Krier
2008-2011 Bertrand Chenal
- 2008-2012 B2CK SPRL
+ 2008-2013 B2CK SPRL
+ 2004-2008 Tiny SPRL
License: GPL-3+
Files: debian/*
commit 955f3139b7f017efa3c6eb9d1e482b4b93d9066d
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Sat May 4 15:35:38 2013 +0200
Merging upstream version 2.2.3.
diff --git a/CHANGELOG b/CHANGELOG
index c865b2f..49f0fb1 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+Version 2.2.3 - 2013-05-02
+* Bug fixes (see mercurial logs for details)
+
Version 2.2.2 - 2012-05-07
* Bug fixes (see mercurial logs for details)
diff --git a/COPYRIGHT b/COPYRIGHT
index 83c0f58..244bb5d 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-2011 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 18378dc..c6da85c 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
Metadata-Version: 1.1
Name: trytond_account_invoice
-Version: 2.2.2
+Version: 2.2.3
Summary: Financial and Accounting Module with:
- Payment Term
- Invoice / Credit Note
diff --git a/__tryton__.py b/__tryton__.py
index 1d86fb5..90c134e 100644
--- a/__tryton__.py
+++ b/__tryton__.py
@@ -8,7 +8,7 @@
'name_es_ES': 'Facturación',
'name_fr_FR': 'Facturation',
'name_nl_NL': 'Facturatie',
- 'version': '2.2.2',
+ 'version': '2.2.3',
'author': 'B2CK',
'email': 'info at b2ck.com',
'website': 'http://www.tryton.org/',
diff --git a/invoice.py b/invoice.py
index bb3dacb..a8bda5c 100644
--- a/invoice.py
+++ b/invoice.py
@@ -384,6 +384,7 @@ class Invoice(ModelWorkflow, ModelSQL, ModelView):
def _on_change_lines_taxes(self, vals):
currency_obj = Pool().get('currency.currency')
tax_obj = Pool().get('account.tax')
+ invoice_tax_obj = Pool().get('account.invoice.tax')
res = {
'untaxed_amount': Decimal('0.0'),
'tax_amount': Decimal('0.0'),
@@ -459,7 +460,8 @@ class Invoice(ModelWorkflow, ModelSQL, ModelView):
if key not in tax_keys:
res['tax_amount'] += computed_taxes[key]['amount']
res['taxes'].setdefault('add', [])
- value = tax_obj.default_get(tax_obj._columns.keys())
+ value = invoice_tax_obj.default_get(
+ invoice_tax_obj._columns.keys())
value.update(computed_taxes[key])
res['taxes']['add'].append(value)
if currency:
diff --git a/trytond_account_invoice.egg-info/PKG-INFO b/trytond_account_invoice.egg-info/PKG-INFO
index e05271a..537feff 100644
--- a/trytond_account_invoice.egg-info/PKG-INFO
+++ b/trytond_account_invoice.egg-info/PKG-INFO
@@ -1,6 +1,6 @@
Metadata-Version: 1.1
Name: trytond-account-invoice
-Version: 2.2.2
+Version: 2.2.3
Summary: Financial and Accounting Module with:
- Payment Term
- Invoice / Credit Note
commit d40d5ce97939f1807780029c9fb77e1ffecf610e
Author: Daniel Baumann <daniel at debian.org>
Date: Sat Jun 30 18:05:25 2012 +0200
Releasing debian version 2.2.2-2.
diff --git a/debian/changelog b/debian/changelog
index f5fc1b1..76a60cf 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+tryton-modules-account-invoice (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:05:18 +0200
+
tryton-modules-account-invoice (2.2.2-1) unstable; urgency=low
* Updating to Standards-Version: 3.9.3, no changes needed.
commit df54e66e4439f88f93771370cef790c3d76572ae
Author: Daniel Baumann <daniel at debian.org>
Date: Sat Jun 30 18:02:28 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 65f3d4e..caf9249 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-account-invoice.git
commit ad28ec357bd23ab706d3ee5eae25984f7dec93a4
Author: Daniel Baumann <daniel at debian.org>
Date: Sat Jun 30 17:53:50 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
commit 4997e9b7ae6f7ce751aade860d6d22b9045cf2f8
Author: Daniel Baumann <daniel at debian.org>
Date: Sat Jun 30 17:50:23 2012 +0200
Correcting copyright file to match format version 1.0.
diff --git a/debian/copyright b/debian/copyright
index f432143..fc94d87 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,17 +1,15 @@
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
+Copyright: 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>
+Copyright: 2009-2012 Daniel Baumann <daniel at debian.org>
+ 2012 Mathias Behrle <mathiasb at m9s.biz>
License: GPL-3+
License: GPL-3+
commit 740576214e01336e0ed0216a25c72c4ee377f038
Author: Daniel Baumann <daniel at 127011.net>
Date: Sat Jun 30 16:55:03 2012 +0200
Updating vcs fields.
diff --git a/debian/control b/debian/control
index 74eaf6d..65f3d4e 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-account-invoice.git
-Vcs-Git: git://git.debian-maintainers.org/git/tryton/tryton-modules-account-invoice.git
+Vcs-Browser: http://debian.tryton.org/gitweb/?p=packages/tryton-modules-account-invoice.git
+Vcs-Git: git://debian.tryton.org/git/packages/tryton-modules-account-invoice.git
X-Python-Version: >= 2.6
Package: tryton-modules-account-invoice
commit 4255e32aeedb1439e485a373b3ac864a6ddaa1ba
Author: Daniel Baumann <daniel at 127011.net>
Date: Sat Jun 30 16:52:29 2012 +0200
Updating maintainers field.
diff --git a/debian/control b/debian/control
index e0bde83..74eaf6d 100644
--- a/debian/control
+++ b/debian/control
@@ -1,7 +1,7 @@
Source: tryton-modules-account-invoice
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 46920349cc280e19c41e49db7ee5e24961cfa02c
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Wed May 9 13:13:22 2012 +0200
Releasing debian version 2.2.2-1.
diff --git a/debian/changelog b/debian/changelog
index 96ace14..f5fc1b1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,14 @@
+tryton-modules-account-invoice (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:57:32 +0200
+
tryton-modules-account-invoice (2.2.1-1) unstable; urgency=low
* Merging upstream version 2.2.1.
commit 0444877aa70d29590e21947487c42911a687d9c2
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Wed May 9 11:57:27 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 e515d6c3b6edbc1cc40ad00f7b92cc6bd6df6d77
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 a86d3b4..c865b2f 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 7b43f96..18378dc 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
Metadata-Version: 1.1
Name: trytond_account_invoice
-Version: 2.2.1
+Version: 2.2.2
Summary: Financial and Accounting Module with:
- Payment Term
- Invoice / Credit Note
diff --git a/__tryton__.py b/__tryton__.py
index 51239e5..1d86fb5 100644
--- a/__tryton__.py
+++ b/__tryton__.py
@@ -8,7 +8,7 @@
'name_es_ES': 'Facturación',
'name_fr_FR': 'Facturation',
'name_nl_NL': 'Facturatie',
- '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 4c20569..bb3dacb 100644
--- a/invoice.py
+++ b/invoice.py
@@ -190,15 +190,23 @@ class Invoice(ModelWorkflow, ModelSQL, ModelView):
if (table.column_exist('invoice_report')
and table.column_exist('invoice_report_cache')):
- cursor.execute('SELECT id, invoice_report '
+ limit = cursor.IN_MAX
+ cursor.execute('SELECT COUNT(id) '
'FROM "' + self._table + '"')
- for invoice_id, report in cursor.fetchall():
- if report:
- report = buffer(base64.decodestring(str(report)))
- cursor.execute('UPDATE "' + self._table + '" '
- 'SET invoice_report_cache = %s '
- 'WHERE id = %s', (report, invoice_id))
- table.drop_column('invoice_report')
+ invoice_count, = cursor.fetchone()
+ for offset in range(0, invoice_count, limit):
+ cursor.execute(cursor.limit_clause(
+ 'SELECT id, invoice_report '
+ 'FROM "' + self._table + '"'
+ 'ORDER BY id',
+ limit, offset))
+ for invoice_id, report in cursor.fetchall():
+ if report:
+ report = buffer(base64.decodestring(str(report)))
+ cursor.execute('UPDATE "' + self._table + '" '
+ 'SET invoice_report_cache = %s '
+ 'WHERE id = %s', (report, invoice_id))
+ table.drop_column('invoice_report')
# Add index on create_date
table.index_action('create_date', action='add')
@@ -451,7 +459,9 @@ class Invoice(ModelWorkflow, ModelSQL, ModelView):
if key not in tax_keys:
res['tax_amount'] += computed_taxes[key]['amount']
res['taxes'].setdefault('add', [])
- res['taxes']['add'].append(computed_taxes[key])
+ value = tax_obj.default_get(tax_obj._columns.keys())
+ value.update(computed_taxes[key])
+ res['taxes']['add'].append(value)
if currency:
res['untaxed_amount'] = currency_obj.round(currency,
res['untaxed_amount'])
@@ -1135,7 +1145,7 @@ class Invoice(ModelWorkflow, ModelSQL, ModelView):
'amount_second_currency': amount_second_currency,
'second_currency': second_currency,
})
- if invoice.account.id == journal.debit_account.id:
+ if invoice.account.id == journal.credit_account.id:
self.raise_user_error('same_credit_account')
if not journal.credit_account:
self.raise_user_error('missing_credit_account')
diff --git a/trytond_account_invoice.egg-info/PKG-INFO b/trytond_account_invoice.egg-info/PKG-INFO
index d26eb65..e05271a 100644
--- a/trytond_account_invoice.egg-info/PKG-INFO
+++ b/trytond_account_invoice.egg-info/PKG-INFO
@@ -1,6 +1,6 @@
Metadata-Version: 1.1
Name: trytond-account-invoice
-Version: 2.2.1
+Version: 2.2.2
Summary: Financial and Accounting Module with:
- Payment Term
- Invoice / Credit Note
--
tryton-modules-account-invoice
More information about the tryton-debian-vcs
mailing list