From 205ebf1aa2cb4bfd5273b8be317403f18f05252c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Tue, 18 Nov 2008 18:17:21 +0100 Subject: [PATCH 01/15] Increase version number --- __tryton__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/__tryton__.py b/__tryton__.py index abc6418a5c..6dbb47fca7 100644 --- a/__tryton__.py +++ b/__tryton__.py @@ -5,7 +5,7 @@ 'name_de_DE': 'Kostenstellen Einkauf', 'name_fr_FR': 'Achat analytique', 'name_es_ES': 'Compra Analítica', - 'version': '1.0.0', + 'version': '1.0.1', 'author': 'B2CK', 'email': 'info@b2ck.com', 'website': 'http://www.tryton.org/', From 22af253278ad4588d486f3d2a49a0013ba62ea5d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Tue, 18 Nov 2008 18:18:49 +0100 Subject: [PATCH 02/15] Allow egg installation --- CHANGELOG | 2 ++ setup.py | 7 +++++++ 2 files changed, 9 insertions(+) diff --git a/CHANGELOG b/CHANGELOG index eacaaefa7d..44de11f380 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,2 +1,4 @@ +* Allow egg installation + Version 1.0.0 - 2008-11-17 * Initial release diff --git a/setup.py b/setup.py index eedc8446e3..662049473c 100644 --- a/setup.py +++ b/setup.py @@ -27,6 +27,8 @@ setup(name='trytond_analytic_purchase', author=info.get('author', ''), author_email=info.get('email', ''), url=info.get('website', ''), + download_url="http://downloads.tryton.org/" + \ + info.get('version', '0.0.1').rsplit('.', 1)[0] + '/', package_dir={'trytond.modules.analytic_purchase': '.'}, packages=[ 'trytond.modules.analytic_purchase', @@ -53,4 +55,9 @@ setup(name='trytond_analytic_purchase', ], license='GPL-3', install_requires=requires, + zip_safe=False, + entry_points=""" + [trytond.modules] + analytic_purchase = trytond.modules.analytic_purchase + """, ) From e116770f1d29ab867cf5766205ca9e710333c444 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Mon, 1 Dec 2008 13:45:31 +0100 Subject: [PATCH 03/15] Prepare changelog for release 1.0.1 --- CHANGELOG | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG b/CHANGELOG index 44de11f380..9801fce04d 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,3 +1,4 @@ +Version 1.0.1 - 2008-12-01 * Allow egg installation Version 1.0.0 - 2008-11-17 From c9cb95feafa438c6f324841e10f6ef3cdec242e1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Mon, 1 Dec 2008 13:45:37 +0100 Subject: [PATCH 04/15] Added tag 1.0.1 for changeset 20fb1c3e8b7e --- .hgtags | 1 + 1 file changed, 1 insertion(+) diff --git a/.hgtags b/.hgtags index aa129e9a47..a9431cf8b8 100644 --- a/.hgtags +++ b/.hgtags @@ -1 +1,2 @@ 781153e4585ec0241f868393ee6f3b9242fb0499 1.0.0 +20fb1c3e8b7ed7e44f7eecd7764c128802d84408 1.0.1 From 800bdaf86bc617b908f473679b234363f55a7341 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Mon, 1 Dec 2008 13:46:12 +0100 Subject: [PATCH 05/15] Increase version number --- __tryton__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/__tryton__.py b/__tryton__.py index 6dbb47fca7..5cf2ce7dc0 100644 --- a/__tryton__.py +++ b/__tryton__.py @@ -5,7 +5,7 @@ 'name_de_DE': 'Kostenstellen Einkauf', 'name_fr_FR': 'Achat analytique', 'name_es_ES': 'Compra Analítica', - 'version': '1.0.1', + 'version': '1.0.2', 'author': 'B2CK', 'email': 'info@b2ck.com', 'website': 'http://www.tryton.org/', From 786dcfad452fbe0569d5e000d43da41c54fd3d49 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Fri, 9 Jan 2009 16:21:46 +0100 Subject: [PATCH 06/15] Update copyright --- COPYRIGHT | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/COPYRIGHT b/COPYRIGHT index 2afd2a7ae6..853f1f7584 100644 --- a/COPYRIGHT +++ b/COPYRIGHT @@ -1,5 +1,5 @@ -Copyright (C) 2008 Cédric Krier. -Copyright (C) 2008 B2CK SPRL. +Copyright (C) 2008-2009 Cédric Krier. +Copyright (C) 2008-2009 B2CK SPRL. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by From 48abfb3fce85fc82bd10fc6112908cf23fb97743 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Fri, 9 Jan 2009 16:22:00 +0100 Subject: [PATCH 07/15] Fix read of not line type --- purchase.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/purchase.py b/purchase.py index b29dafffb9..34d1faf24e 100644 --- a/purchase.py +++ b/purchase.py @@ -82,6 +82,8 @@ class PurchaseLine(OSV): id2record[record['id']] = record lines = self.browse(cursor, user, ids, context=context) for line in lines: + if line.type != 'line': + continue for account in line.analytic_accounts.accounts: if account.root.id in root_ids: id2record[line.id]['analytic_account_' \ From 51367dc1ee45ef2fcc4c014b0c05c89a11dfe95e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Sat, 10 Jan 2009 22:47:36 +0100 Subject: [PATCH 08/15] Fix check_for_quotation for not line type for issue741 --- purchase.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/purchase.py b/purchase.py index 34d1faf24e..d8ccd8aa9e 100644 --- a/purchase.py +++ b/purchase.py @@ -25,6 +25,8 @@ class Purchase(OSV): purchase = self.browse(cursor, user, purchase_id, context=context) for line in purchase.lines: + if line.type != 'line': + continue if not account_selection_obj.check_root(cursor, user, [line.analytic_accounts.id]): line_name = purchase_line_obj.name_get(cursor, user, From 1f8f7ac8e51b89fba841966cf0dab82e4e755b26 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Mon, 2 Mar 2009 10:14:42 +0100 Subject: [PATCH 09/15] Prepare changelog for release 1.0.2 --- CHANGELOG | 3 +++ 1 file changed, 3 insertions(+) diff --git a/CHANGELOG b/CHANGELOG index 9801fce04d..2521948763 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,3 +1,6 @@ +Version 1.0.2 - 2009-03-02 +* Some bug fixes (see mercurial logs for details) + Version 1.0.1 - 2008-12-01 * Allow egg installation From 5833fcbd41c1ae29050d202fd0f5f7ce1a52fda5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Mon, 2 Mar 2009 10:14:48 +0100 Subject: [PATCH 10/15] Added tag 1.0.2 for changeset db70ff211c7d --- .hgtags | 1 + 1 file changed, 1 insertion(+) diff --git a/.hgtags b/.hgtags index a9431cf8b8..b3c1c73c01 100644 --- a/.hgtags +++ b/.hgtags @@ -1,2 +1,3 @@ 781153e4585ec0241f868393ee6f3b9242fb0499 1.0.0 20fb1c3e8b7ed7e44f7eecd7764c128802d84408 1.0.1 +db70ff211c7d0377a8a71a22fc3ec37bd08bf49a 1.0.2 From 80d51cd125d4e8fa404143cf8a94936f86e52b79 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Mon, 2 Mar 2009 10:15:36 +0100 Subject: [PATCH 11/15] Increase version number --- __tryton__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/__tryton__.py b/__tryton__.py index 5cf2ce7dc0..667eb19ff2 100644 --- a/__tryton__.py +++ b/__tryton__.py @@ -5,7 +5,7 @@ 'name_de_DE': 'Kostenstellen Einkauf', 'name_fr_FR': 'Achat analytique', 'name_es_ES': 'Compra Analítica', - 'version': '1.0.2', + 'version': '1.0.3', 'author': 'B2CK', 'email': 'info@b2ck.com', 'website': 'http://www.tryton.org/', From e20402d0fa3edbb42c0670c3b47cc949ab27450d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Wed, 15 Apr 2009 11:38:49 +0200 Subject: [PATCH 12/15] Create missing analytic_accounts on write and skip it on read for issue993 --- purchase.py | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/purchase.py b/purchase.py index d8ccd8aa9e..2e087859b8 100644 --- a/purchase.py +++ b/purchase.py @@ -86,6 +86,8 @@ class PurchaseLine(OSV): for line in lines: if line.type != 'line': continue + if not line.analytic_accounts: + continue for account in line.analytic_accounts.accounts: if account.root.id in root_ids: id2record[line.id]['analytic_account_' \ @@ -129,6 +131,14 @@ class PurchaseLine(OSV): if line.type != 'line': continue accounts = [] + if not line.analytic_accounts: + # Create missing selection + selection_id = selection_obj.create(cursor, 0, {}, + context=context) + self.write(cursor, user, line.id, { + 'analytic_accounts': selection_id, + }, context=context) + line = self.browse(cursor, user, line.id, context=context) for account in line.analytic_accounts.accounts: if account.root.id in selection_vals: value = selection_vals[account.root.id] From 41c676e8fc1e481c9eccecdcbfc823b5314d294c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Mon, 11 May 2009 19:11:45 +0200 Subject: [PATCH 13/15] Prepare changelog for release 1.0.3 --- CHANGELOG | 3 +++ 1 file changed, 3 insertions(+) diff --git a/CHANGELOG b/CHANGELOG index 2521948763..19e9bb28c5 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,3 +1,6 @@ +Version 1.0.3 - 2009-05-11 +* Some bug fixes (see mercurial logs for details) + Version 1.0.2 - 2009-03-02 * Some bug fixes (see mercurial logs for details) From 29379d8b9a6cf94a06d4ae57397fccc68b7b2839 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Mon, 11 May 2009 19:11:49 +0200 Subject: [PATCH 14/15] Added tag 1.0.3 for changeset b69300df7f00 --- .hgtags | 1 + 1 file changed, 1 insertion(+) diff --git a/.hgtags b/.hgtags index b3c1c73c01..10b36abef2 100644 --- a/.hgtags +++ b/.hgtags @@ -1,3 +1,4 @@ 781153e4585ec0241f868393ee6f3b9242fb0499 1.0.0 20fb1c3e8b7ed7e44f7eecd7764c128802d84408 1.0.1 db70ff211c7d0377a8a71a22fc3ec37bd08bf49a 1.0.2 +b69300df7f001c7d26cc428cff92979b6410837d 1.0.3 From 5f7e799e23999e2b50787b4d911d8c1c1d9f96f1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Mon, 11 May 2009 19:12:28 +0200 Subject: [PATCH 15/15] Increase version number --- __tryton__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/__tryton__.py b/__tryton__.py index 667eb19ff2..f3ac60ace7 100644 --- a/__tryton__.py +++ b/__tryton__.py @@ -5,7 +5,7 @@ 'name_de_DE': 'Kostenstellen Einkauf', 'name_fr_FR': 'Achat analytique', 'name_es_ES': 'Compra Analítica', - 'version': '1.0.3', + 'version': '1.0.4', 'author': 'B2CK', 'email': 'info@b2ck.com', 'website': 'http://www.tryton.org/',