From b445553ed2c04b9949b400c4a5fa41d0aa758032 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Tue, 18 Nov 2008 18:26:04 +0100 Subject: [PATCH 01/21] Increase version number --- __tryton__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/__tryton__.py b/__tryton__.py index 53a588e2db..78152fd613 100644 --- a/__tryton__.py +++ b/__tryton__.py @@ -6,7 +6,7 @@ 'name_fr_FR': 'Tiers', 'name_de_DE': 'Kontakte', 'name_es_ES': 'Terceros', - 'version' : '1.0.0', + 'version' : '1.0.1', 'author' : 'B2CK', 'email': 'info@b2ck.com', 'website': 'http://www.tryton.org/', From 605d80a2ad63c0741d3a9a7f04a3c7330b5c9a7e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Tue, 18 Nov 2008 18:27:59 +0100 Subject: [PATCH 02/21] 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 59c5d4a50a..55e406558b 100644 --- a/setup.py +++ b/setup.py @@ -27,6 +27,8 @@ setup(name='trytond_party', 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.party': '.'}, packages=[ 'trytond.modules.party', @@ -57,4 +59,9 @@ setup(name='trytond_party', extras_require={ 'VAT': ['vatnumber'], }, + zip_safe=False, + entry_points=""" + [trytond.modules] + party = trytond.modules.party + """, ) From 434964d3a38e5d1ecd87ceb6a85af036c87e8e2d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Tue, 18 Nov 2008 19:18:41 +0100 Subject: [PATCH 03/21] Add default categories from context and use it in act_party_by_category --- party.py | 5 +++++ party.xml | 1 + 2 files changed, 6 insertions(+) diff --git a/party.py b/party.py index da7a4e6f37..9b8f5163d5 100644 --- a/party.py +++ b/party.py @@ -74,6 +74,11 @@ class Party(OSV): def default_active(self, cursor, user, context=None): return True + def default_categories(self, cursor, user, context=None): + if context is None: + context = {} + return context.get('categories', []) + def get_vat_code(self, cursor, user, ids, name, arg, context=None): if not ids: return [] diff --git a/party.xml b/party.xml index 8d4777abe6..d858ccb5b5 100644 --- a/party.xml +++ b/party.xml @@ -125,6 +125,7 @@ this repository contains the full copyright notices and license terms. --> Parties by Category party.party form + {'categories': [active_id]} [('categories', 'child_of', [active_id], 'parent')] From 12953083ff123844566b7b30f0c71a7b77c5ed1c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Tue, 18 Nov 2008 19:19:50 +0100 Subject: [PATCH 04/21] Add missing changelog --- CHANGELOG | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG b/CHANGELOG index 44de11f380..d5942159bb 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,3 +1,4 @@ +* Add default categories on party with context * Allow egg installation Version 1.0.0 - 2008-11-17 From 6d2357a3d5ba9e4f5dcf64619c657b6457a2b9f4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Thu, 27 Nov 2008 20:13:15 +0100 Subject: [PATCH 05/21] Improve invisible on value of contact mechanism --- contact_mechanism.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/contact_mechanism.py b/contact_mechanism.py index 05e0464521..3a1105c1f1 100644 --- a/contact_mechanism.py +++ b/contact_mechanism.py @@ -31,7 +31,7 @@ class ContactMechanism(OSV): sort=False) value = fields.Char('Value', select=1, states={ - 'invisible': "type in ('email', 'website')", + 'invisible': "type in ('email', 'website', 'skype', 'sip')", 'required': "type not in ('email', 'website')", 'readonly': "active == False", }, on_change=['value']) From 8b76f36d6f74cde4a01128d4e0bdbc8bc8501160 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Mon, 1 Dec 2008 13:57:16 +0100 Subject: [PATCH 06/21] Prepare changelog for release 1.0.1 --- CHANGELOG | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG b/CHANGELOG index d5942159bb..0e6e3dae68 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,3 +1,4 @@ +Version 1.0.1 - 2008-12-01 * Add default categories on party with context * Allow egg installation From 849612aeed3bcd926dd0da537de98edd94214b62 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Mon, 1 Dec 2008 13:57:21 +0100 Subject: [PATCH 07/21] Added tag 1.0.1 for changeset 122023dfa119 --- .hgtags | 1 + 1 file changed, 1 insertion(+) diff --git a/.hgtags b/.hgtags index affc2fca86..bf4e34a919 100644 --- a/.hgtags +++ b/.hgtags @@ -1 +1,2 @@ db4cdd2f163118bc9bfe61accd52c8c671144111 1.0.0 +122023dfa119d1ea5154ded7515e25cbe3f758ce 1.0.1 From 7c4f4d97cf0fa50765f33b698551aafe084e2ef7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Mon, 1 Dec 2008 13:58:05 +0100 Subject: [PATCH 08/21] Increase version number --- __tryton__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/__tryton__.py b/__tryton__.py index 78152fd613..f8ff81760d 100644 --- a/__tryton__.py +++ b/__tryton__.py @@ -6,7 +6,7 @@ 'name_fr_FR': 'Tiers', 'name_de_DE': 'Kontakte', 'name_es_ES': 'Terceros', - 'version' : '1.0.1', + 'version' : '1.0.2', 'author' : 'B2CK', 'email': 'info@b2ck.com', 'website': 'http://www.tryton.org/', From 09a5007f4f4aebfc4f8e277b0ad5b54ca1a98f4e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Sun, 4 Jan 2009 15:33:00 +0100 Subject: [PATCH 09/21] Add missing search function for vat_code --- party.py | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/party.py b/party.py index 9b8f5163d5..5fc7f98627 100644 --- a/party.py +++ b/party.py @@ -35,7 +35,8 @@ class Party(OSV): states=STATES) vat_country = fields.Selection(VAT_COUNTRIES, 'VAT Country', states=STATES, help="Setting VAT country will enable verification of the VAT number.") - vat_code = fields.Function('get_vat_code', type='char', string="VAT Code") + vat_code = fields.Function('get_vat_code', type='char', string="VAT Code", + fnct_search='search_vat_code') addresses = fields.One2Many('party.address', 'party', 'Addresses', states=STATES) contact_mechanisms = fields.One2Many('party.contact_mechanism', 'party', @@ -87,6 +88,20 @@ class Party(OSV): res[party.id] = (party.vat_country or '') + (party.vat_number or '') return res + def search_vat_code(self, cursor, user, name, args, context=None): + args2 = [] + i = 0 + while i < len(args): + value = args[i][2] + for country, _ in VAT_COUNTRIES: + if value.startswith(country) and country: + args2.append(('vat_country', '=', country)) + value = value[len(country):] + break + args2.append(('vat_number', args[i][1], value)) + i += 1 + return args2 + def get_full_name(self, cursor, user, ids, name, arg, context=None): if not ids: return [] From 869f80c602008f4f9a58d8105d22b294560be451 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Tue, 6 Jan 2009 13:45:00 +0100 Subject: [PATCH 10/21] Prepare changelog for release 1.0.2 --- CHANGELOG | 3 +++ 1 file changed, 3 insertions(+) diff --git a/CHANGELOG b/CHANGELOG index 0e6e3dae68..4b867f88c0 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,3 +1,6 @@ +Version 1.0.2 - 2009-01-06 +* Some bug fixes (see mercurial logs for details) + Version 1.0.1 - 2008-12-01 * Add default categories on party with context * Allow egg installation From 2bb8ef5be665d416d5e42bfeeca32c89dd46e43b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Tue, 6 Jan 2009 13:45:36 +0100 Subject: [PATCH 11/21] Added tag 1.0.2 for changeset b12e15da90af --- .hgtags | 1 + 1 file changed, 1 insertion(+) diff --git a/.hgtags b/.hgtags index bf4e34a919..facf026cee 100644 --- a/.hgtags +++ b/.hgtags @@ -1,2 +1,3 @@ db4cdd2f163118bc9bfe61accd52c8c671144111 1.0.0 122023dfa119d1ea5154ded7515e25cbe3f758ce 1.0.1 +b12e15da90af98036f6c9651467a5121738188c4 1.0.2 From fe476dbf3f61d834b7c0ea4addcc5d0786830639 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Tue, 6 Jan 2009 13:46:22 +0100 Subject: [PATCH 12/21] Increase version number --- __tryton__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/__tryton__.py b/__tryton__.py index f8ff81760d..4ed721fdbe 100644 --- a/__tryton__.py +++ b/__tryton__.py @@ -6,7 +6,7 @@ 'name_fr_FR': 'Tiers', 'name_de_DE': 'Kontakte', 'name_es_ES': 'Terceros', - 'version' : '1.0.2', + 'version' : '1.0.3', 'author' : 'B2CK', 'email': 'info@b2ck.com', 'website': 'http://www.tryton.org/', From db49870564e195fc9c32778522d94e36482a4348 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Mon, 30 Mar 2009 10:42:33 +0200 Subject: [PATCH 13/21] Fix search_vat_code for empty value and lower case country code --- party.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/party.py b/party.py index 5fc7f98627..75b0104a29 100644 --- a/party.py +++ b/party.py @@ -94,7 +94,9 @@ class Party(OSV): while i < len(args): value = args[i][2] for country, _ in VAT_COUNTRIES: - if value.startswith(country) and country: + if isinstance(value, basestring) \ + and country \ + and value.upper().startswith(country): args2.append(('vat_country', '=', country)) value = value[len(country):] break From 3b8bdfbf34cf032e7f485435466bbcad4e98c5de Mon Sep 17 00:00:00 2001 From: Bertrand Chenal Date: Wed, 15 Apr 2009 22:24:40 +0200 Subject: [PATCH 14/21] Fix get_mechanism to stop searching for a matching mechanism when the first one is encountered --- party.py | 1 + 1 file changed, 1 insertion(+) diff --git a/party.py b/party.py index 75b0104a29..4a7c04f78b 100644 --- a/party.py +++ b/party.py @@ -121,6 +121,7 @@ class Party(OSV): for mechanism in party.contact_mechanisms: if mechanism.type == arg: res[party.id] = mechanism.value + break return res def create(self, cursor, user, values, context=None): From b649af55eca3e63ba87a9be833e330e43b6f31c8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Mon, 11 May 2009 19:17:57 +0200 Subject: [PATCH 15/21] Prepare changelog for release 1.0.3 --- CHANGELOG | 3 +++ 1 file changed, 3 insertions(+) diff --git a/CHANGELOG b/CHANGELOG index 4b867f88c0..bbeca46bc3 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-01-06 * Some bug fixes (see mercurial logs for details) From 931ecc9097eee1db5f376d499fa5779730aa112c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Mon, 11 May 2009 19:18:04 +0200 Subject: [PATCH 16/21] Added tag 1.0.3 for changeset 474aa962ed9c --- .hgtags | 1 + 1 file changed, 1 insertion(+) diff --git a/.hgtags b/.hgtags index facf026cee..c91accf48e 100644 --- a/.hgtags +++ b/.hgtags @@ -1,3 +1,4 @@ db4cdd2f163118bc9bfe61accd52c8c671144111 1.0.0 122023dfa119d1ea5154ded7515e25cbe3f758ce 1.0.1 b12e15da90af98036f6c9651467a5121738188c4 1.0.2 +474aa962ed9c0101e1a7e14fa4c25436cd25622b 1.0.3 From 96040a9d42e5b46433cd5db937be366f49d9676d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Mon, 11 May 2009 19:18:39 +0200 Subject: [PATCH 17/21] Increase version number --- __tryton__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/__tryton__.py b/__tryton__.py index 4ed721fdbe..b53ad1daa3 100644 --- a/__tryton__.py +++ b/__tryton__.py @@ -6,7 +6,7 @@ 'name_fr_FR': 'Tiers', 'name_de_DE': 'Kontakte', 'name_es_ES': 'Terceros', - 'version' : '1.0.3', + 'version' : '1.0.4', 'author' : 'B2CK', 'email': 'info@b2ck.com', 'website': 'http://www.tryton.org/', From 573278b55ac53f382ecb70a3c65a72d48664fb89 Mon Sep 17 00:00:00 2001 From: Bertrand Chenal Date: Wed, 29 Jul 2009 13:15:24 +0200 Subject: [PATCH 18/21] Fix get_rec_name on category when there are more than two level of categories --- category.py | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/category.py b/category.py index 81e7fddc36..2b72d91882 100644 --- a/category.py +++ b/category.py @@ -41,14 +41,16 @@ class Category(OSV): def name_get(self, cursor, user, ids, context=None): if not ids: return [] - categories = self.browse(cursor, user, ids, context=context) - res = [] - for category in categories: - if category.parent: - name = category.parent.name+' / '+ category.name + res = {} + def _name(category): + if category.id in res: + return res[category.id] + elif category.parent: + return _name(category.parent) + ' / ' + category.name else: - name = category.name - res.append((category.id, name)) - return res + return category.name + for category in self.browse(cursor, user, ids, context=context): + res[category.id] = _name(category) + return res.items() Category() From 021d1041a275f04b4691552086e05608851f9f24 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Mon, 31 Aug 2009 10:19:41 +0200 Subject: [PATCH 19/21] Prepare changelog for release 1.0.4 --- CHANGELOG | 3 +++ 1 file changed, 3 insertions(+) diff --git a/CHANGELOG b/CHANGELOG index bbeca46bc3..5dbb37c4eb 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,3 +1,6 @@ +Version 1.0.4 - 2009-08-31 +* Some bug fixes (see mercurial logs for details) + Version 1.0.3 - 2009-05-11 * Some bug fixes (see mercurial logs for details) From 767180626317997a7db17fc4700d852a4da7d277 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Mon, 31 Aug 2009 10:19:45 +0200 Subject: [PATCH 20/21] Added tag 1.0.4 for changeset 0ce0fda170c2 --- .hgtags | 1 + 1 file changed, 1 insertion(+) diff --git a/.hgtags b/.hgtags index c91accf48e..f1a18feeaa 100644 --- a/.hgtags +++ b/.hgtags @@ -2,3 +2,4 @@ db4cdd2f163118bc9bfe61accd52c8c671144111 1.0.0 122023dfa119d1ea5154ded7515e25cbe3f758ce 1.0.1 b12e15da90af98036f6c9651467a5121738188c4 1.0.2 474aa962ed9c0101e1a7e14fa4c25436cd25622b 1.0.3 +0ce0fda170c2dba3c1e184dd49934c7b73710cbb 1.0.4 From f26d1c57f3a0a78cbc0bc7e7213fa3a2f96c5c9d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Mon, 31 Aug 2009 10:21:34 +0200 Subject: [PATCH 21/21] Increase version number --- __tryton__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/__tryton__.py b/__tryton__.py index b53ad1daa3..020ce6f26c 100644 --- a/__tryton__.py +++ b/__tryton__.py @@ -6,7 +6,7 @@ 'name_fr_FR': 'Tiers', 'name_de_DE': 'Kontakte', 'name_es_ES': 'Terceros', - 'version' : '1.0.4', + 'version' : '1.0.5', 'author' : 'B2CK', 'email': 'info@b2ck.com', 'website': 'http://www.tryton.org/',