From 6b373c79175e79fa23c21442e8028bbbb7ebf04a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Tue, 20 Oct 2009 19:11:40 +0200 Subject: [PATCH 01/29] Increase version number --- __tryton__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/__tryton__.py b/__tryton__.py index f3f40d5890..d066ff13ee 100644 --- a/__tryton__.py +++ b/__tryton__.py @@ -6,7 +6,7 @@ 'name_es_CO': 'Contabilidad', 'name_es_ES': 'Contabilidad', 'name_fr_FR': 'Comptabilité', - 'version': '1.4.0', + 'version': '1.4.1', 'author': 'B2CK', 'email': 'info@b2ck.com', 'website': 'http://www.tryton.org/', From 9d24217a9f22c3bf08ced0565deafb33121e599d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Mon, 2 Nov 2009 10:16:40 +0100 Subject: [PATCH 02/29] Fix company context domain when company is not in context (transplanted from c9ac47a6fea863c54cb8501a22564a3e5b519628) --- fiscalyear.py | 3 ++- tax.py | 6 ++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/fiscalyear.py b/fiscalyear.py index db8a4eaf1f..9937f95015 100644 --- a/fiscalyear.py +++ b/fiscalyear.py @@ -36,7 +36,8 @@ class FiscalYear(ModelSQL, ModelView): context="{'code': 'account.move', 'company': company}", depends=['company']) company = fields.Many2One('company.company', 'Company', required=True, - domain=["('id', '=', context.get('company', False))"]) + domain=["('id', 'company' in context and '=' or '!=', " \ + "context.get('company', 0))"]) def __init__(self): super(FiscalYear, self).__init__() diff --git a/tax.py b/tax.py index 0beac79e8d..6561b899cd 100644 --- a/tax.py +++ b/tax.py @@ -616,7 +616,8 @@ class Tax(ModelSQL, ModelView): parent = fields.Many2One('account.tax', 'Parent', ondelete='CASCADE') childs = fields.One2Many('account.tax', 'parent', 'Children') company = fields.Many2One('company.company', 'Company', required=True, - domain=["('id', '=', context.get('company', 0))"]) + domain=["('id', 'company' in context and '=' or '!=', " \ + "context.get('company', 0))"]) invoice_account = fields.Many2One('account.account', 'Invoice Account', domain=["('company', '=', company)", ('kind', '!=', 'view')], @@ -1043,7 +1044,8 @@ class Rule(ModelSQL, ModelView): _description = __doc__ name = fields.Char('Name', required=True, translate=True) company = fields.Many2One('company.company', 'Company', required=True, - select=1, domain=["('id', '=', context.get('company', 0))"]) + select=1, domain=["('id', 'company' in context and '=' or '!=', " \ + "context.get('company', 0))"]) lines = fields.One2Many('account.tax.rule.line', 'rule', 'Lines') template = fields.Many2One('account.tax.rule.template', 'Template') From 253f2eab122413e4733847dbfe234f1482260e5d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Fri, 6 Nov 2009 08:13:03 +0100 Subject: [PATCH 03/29] Fix domain and depends on journal because company is not always in context (transplanted from 5852812e3433f86f52c43a8bf0daa1abd721add7) --- journal.py | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/journal.py b/journal.py index 5cfa2edf03..6bebb786b7 100644 --- a/journal.py +++ b/journal.py @@ -90,20 +90,22 @@ class Journal(ModelSQL, ModelView): context={'code': 'account.journal'}) credit_account = fields.Property(type='many2one', relation='account.account', string='Default Credit Account', - domain=[('kind', '!=', 'view'), "('company', '=', company)"], + domain=[('kind', '!=', 'view'), + "('company', '=', context.get('company'))"], states={ 'required': "centralised or " \ "(type == 'cash' and context.get('company'))", 'invisible': "not context.get('company')", - }, depends=['company', 'type', 'centralised']) + }, depends=['type', 'centralised']) debit_account = fields.Property(type='many2one', relation='account.account', string='Default Debit Account', - domain=[('kind', '!=', 'view'), "('company', '=', company)"], + domain=[('kind', '!=', 'view'), + "('company', '=', context.get('company'))"], states={ 'required': "centralised or " \ "(type == 'cash' and context.get('company'))", 'invisible': "not context.get('company')", - }, depends=['company', 'type', 'centralised']) + }, depends=['type', 'centralised']) def __init__(self): super(Journal, self).__init__() From 351c98798bde11ffbe955820ed837044debd1864 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Mon, 23 Nov 2009 18:07:22 +0100 Subject: [PATCH 04/29] Prepare release 1.4.1 --- CHANGELOG | 3 +++ 1 file changed, 3 insertions(+) diff --git a/CHANGELOG b/CHANGELOG index b4258559cf..87425cd90d 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,3 +1,6 @@ +Version 1.4.1 - 2009-11-23 +* Some bug fixes (see mercurial logs for details) + Version 1.4.0 - 2009-10-19 * Bug fixes (see mercurial logs for details) * Add origin_tax field on account.tax.rule From 16afdd323a8103996bf2e35b8f11b9fb124253c1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Mon, 23 Nov 2009 18:07:26 +0100 Subject: [PATCH 05/29] Added tag 1.4.1 for changeset f30c17a700ba --- .hgtags | 1 + 1 file changed, 1 insertion(+) diff --git a/.hgtags b/.hgtags index 648e1270d3..5913621843 100644 --- a/.hgtags +++ b/.hgtags @@ -1,3 +1,4 @@ 04925636777da31ceff8c5315ab32acc5d727931 1.0.0 c25f8bf80f1f8f92954cfed3a6dd2f799bd370e4 1.2.0 34f1b2a0557f504ee70664ff922faee63924aef0 1.4.0 +f30c17a700ba05228b70c3e90582494169148a48 1.4.1 From 5e1ce48019a663bedee0ec1d287bf75521a648ea Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Mon, 23 Nov 2009 18:09:15 +0100 Subject: [PATCH 06/29] Increase version number --- __tryton__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/__tryton__.py b/__tryton__.py index d066ff13ee..fc774dd553 100644 --- a/__tryton__.py +++ b/__tryton__.py @@ -6,7 +6,7 @@ 'name_es_CO': 'Contabilidad', 'name_es_ES': 'Contabilidad', 'name_fr_FR': 'Comptabilité', - 'version': '1.4.1', + 'version': '1.4.2', 'author': 'B2CK', 'email': 'info@b2ck.com', 'website': 'http://www.tryton.org/', From a94fb3012e97f2df39269f640525b8ddbbbfc04f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Mon, 21 Dec 2009 12:01:56 +0100 Subject: [PATCH 07/29] Use root user for create/delete default properties in account chart creation (transplanted from 6a5adb9683c2c26293ad3f946b0a42d3f08780c2) --- account.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/account.py b/account.py index f4501b40da..45e0c072d1 100644 --- a/account.py +++ b/account.py @@ -1905,8 +1905,8 @@ class CreateChartAccount(Wizard): ('res', '=', False), ('company', '=', datas['form']['company']), ], context=context) - property_obj.delete(cursor, user, property_ids, context=context) - property_obj.create(cursor, user, { + property_obj.delete(cursor, 0, property_ids, context=context) + property_obj.create(cursor, 0, { 'name': 'account_receivable', 'field': account_receivable_field_id, 'value': 'account.account,' + \ @@ -1923,8 +1923,8 @@ class CreateChartAccount(Wizard): ('res', '=', False), ('company', '=', datas['form']['company']), ], context=context) - property_obj.delete(cursor, user, property_ids, context=context) - property_obj.create(cursor, user, { + property_obj.delete(cursor, 0, property_ids, context=context) + property_obj.create(cursor, 0, { 'name': 'account_payable', 'field': account_payable_field_id, 'value': 'account.account,' + \ From 90b49f5f656d71a7f0b9ccc5ef3981b185bdcdeb Mon Sep 17 00:00:00 2001 From: Mathias Behrle Date: Mon, 4 Jan 2010 17:42:53 +0100 Subject: [PATCH 08/29] Remove surplus argument for issue 1363. (transplanted from 78254a0c1336465b459882fa1c412c3dabde7254) --- journal.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/journal.py b/journal.py index 6bebb786b7..4edf840a3c 100644 --- a/journal.py +++ b/journal.py @@ -242,8 +242,7 @@ class Period(ModelSQL, ModelView): def delete(self, cursor, user, ids, context=None): self._check(cursor, user, ids, context=context) - return super(Period, self).delete(cursor, user, ids, vals, - context=context) + return super(Period, self).delete(cursor, user, ids, context=context) def close(self, cursor, user, ids, context=None): ''' From 468a47801bf594e26068edf98b23e030a251ccb6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Mon, 25 Jan 2010 09:21:09 +0100 Subject: [PATCH 09/29] Update COPYRIGHT --- COPYRIGHT | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/COPYRIGHT b/COPYRIGHT index 9504fb1693..94a43fbe61 100644 --- a/COPYRIGHT +++ b/COPYRIGHT @@ -1,7 +1,7 @@ Copyright (C) 2004-2008 Tiny SPRL. -Copyright (C) 2008-2009 Cédric Krier. -Copyright (C) 2008 Bertrand Chenal. -Copyright (C) 2008-2009 B2CK SPRL. +Copyright (C) 2008-2010 Cédric Krier. +Copyright (C) 2008-2010 Bertrand Chenal. +Copyright (C) 2008-2010 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 0a30006b75b15d300961bd83ada8111a1bdfd8d3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Fri, 12 Feb 2010 10:46:38 +0100 Subject: [PATCH 10/29] Use globals() also in domain for issue1386 --- party.py | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/party.py b/party.py index fcdd9ee691..faeb509235 100644 --- a/party.py +++ b/party.py @@ -8,27 +8,29 @@ class Party(ModelSQL, ModelView): _name = 'party.party' account_payable = fields.Property(type='many2one', relation='account.account', string='Account Payable', - domain=[('kind', '=', 'payable'), "('company', '=', company)"], + domain=[('kind', '=', 'payable'), + "('company', '=', globals().get('company', 0))"], states={ 'required': "globals().get('company') and bool(company)", 'invisible': "not globals().get('company') or not bool(company)", }) account_receivable = fields.Property(type='many2one', relation='account.account', string='Account Receivable', - domain=[('kind', '=', 'receivable'), "('company', '=', company)"], + domain=[('kind', '=', 'receivable'), + "('company', '=', globals().get('company', 0))"], states={ 'required': "globals().get('company') and bool(company)", 'invisible': "not globals().get('company') or not bool(company)", }) customer_tax_rule = fields.Property(type='many2one', relation='account.tax.rule', string='Customer Tax Rule', - domain=["('company', '=', company)"], + domain=["('company', '=', globals().get('company', 0))"], states={ 'invisible': "not globals().get('company') or not bool(company)", }, help='Apply this rule on taxes when party is customer.') supplier_tax_rule = fields.Property(type='many2one', relation='account.tax.rule', string='Supplier Tax Rule', - domain=["('company', '=', company)"], + domain=["('company', '=', globals().get('company', 0))"], states={ 'invisible': "not globals().get('company') or not bool(company)", }, help='Apply this rule on taxes when party is supplier.') From 566923eaa36a2fa91fcbbcc62b5e9bc0cd7c14e5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Tue, 16 Feb 2010 10:23:01 +0100 Subject: [PATCH 11/29] Prepare release 1.4.2 --- CHANGELOG | 3 +++ 1 file changed, 3 insertions(+) diff --git a/CHANGELOG b/CHANGELOG index 87425cd90d..b4b63978bc 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,3 +1,6 @@ +Version 1.4.2 - 2010-02-16 +* Some bug fixes (see mercurial logs for details) + Version 1.4.1 - 2009-11-23 * Some bug fixes (see mercurial logs for details) From 7c9b3d8b95c94875f0f742324a2643b3139573b2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Tue, 16 Feb 2010 10:23:10 +0100 Subject: [PATCH 12/29] Added tag 1.4.2 for changeset 9fca875cf36e --- .hgtags | 1 + 1 file changed, 1 insertion(+) diff --git a/.hgtags b/.hgtags index 5913621843..1a2bf6e025 100644 --- a/.hgtags +++ b/.hgtags @@ -2,3 +2,4 @@ c25f8bf80f1f8f92954cfed3a6dd2f799bd370e4 1.2.0 34f1b2a0557f504ee70664ff922faee63924aef0 1.4.0 f30c17a700ba05228b70c3e90582494169148a48 1.4.1 +9fca875cf36eb1cfc65f739309e7105de454ef53 1.4.2 From accb29a9bbd43f377cfc0c03d377268826f1b2b8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Tue, 16 Feb 2010 10:25:26 +0100 Subject: [PATCH 13/29] Increase version number --- __tryton__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/__tryton__.py b/__tryton__.py index fc774dd553..f0c73fe281 100644 --- a/__tryton__.py +++ b/__tryton__.py @@ -6,7 +6,7 @@ 'name_es_CO': 'Contabilidad', 'name_es_ES': 'Contabilidad', 'name_fr_FR': 'Comptabilité', - 'version': '1.4.2', + 'version': '1.4.3', 'author': 'B2CK', 'email': 'info@b2ck.com', 'website': 'http://www.tryton.org/', From b5a2684ccd32ef2f4f274e90adc2a7f51df104b6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Tue, 11 May 2010 22:31:14 +0200 Subject: [PATCH 14/29] Don't include .pyc from tests (transplanted from e76066d660a5db564d8b202b7e40a56c62628d47) --- MANIFEST.in | 1 - 1 file changed, 1 deletion(-) diff --git a/MANIFEST.in b/MANIFEST.in index b2a140eeeb..dcb2afa6dc 100644 --- a/MANIFEST.in +++ b/MANIFEST.in @@ -7,5 +7,4 @@ include LICENSE include *.xml include *.odt include *.csv -include tests/* include doc/* From 2e8cd0d4dad5abd347ecd9705f9c5164fdd50093 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Thu, 17 Jun 2010 20:09:01 +0200 Subject: [PATCH 15/29] Add recursive check on account type for issue1590 (transplanted from e58b929959c8ee31e10b897b4572d03c71aad5aa) --- account.py | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/account.py b/account.py index 45e0c072d1..e049575de8 100644 --- a/account.py +++ b/account.py @@ -30,6 +30,12 @@ class TypeTemplate(ModelSQL, ModelView): def __init__(self): super(TypeTemplate, self).__init__() + self._constraints += [ + ('check_recursion', 'recursive_types'), + ] + self._error_messages.update({ + 'recursive_types': 'You can not create recursive types!', + }) self._order.insert(0, ('sequence', 'ASC')) def default_balance_sheet(self, cursor, user, context=None): @@ -169,6 +175,12 @@ class Type(ModelSQL, ModelView): def __init__(self): super(Type, self).__init__() + self._constraints += [ + ('check_recursion', 'recursive_types'), + ] + self._error_messages.update({ + 'recursive_types': 'You can not create recursive types!', + }) self._order.insert(0, ('sequence', 'ASC')) def default_balance_sheet(self, cursor, user, context=None): From 2cbe2f70354f442933284e937f93c00b12278b5c Mon Sep 17 00:00:00 2001 From: Mathias Behrle Date: Tue, 2 Nov 2010 21:12:08 +0100 Subject: [PATCH 16/29] Prepare release 1.4.3 --- CHANGELOG | 3 +++ 1 file changed, 3 insertions(+) diff --git a/CHANGELOG b/CHANGELOG index b4b63978bc..15b6682bc2 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,3 +1,6 @@ +Version 1.4.3 - 2010-11-02 +* Bug fixes (see mercurial logs for details) + Version 1.4.2 - 2010-02-16 * Some bug fixes (see mercurial logs for details) From 04d4c07b56e0b78c30ce1a73368abe7e469b8528 Mon Sep 17 00:00:00 2001 From: Mathias Behrle Date: Tue, 2 Nov 2010 21:12:08 +0100 Subject: [PATCH 17/29] Added tag 1.4.3 for changeset 19c4cb98502a --- .hgtags | 1 + 1 file changed, 1 insertion(+) diff --git a/.hgtags b/.hgtags index 1a2bf6e025..205fdd7dc8 100644 --- a/.hgtags +++ b/.hgtags @@ -3,3 +3,4 @@ c25f8bf80f1f8f92954cfed3a6dd2f799bd370e4 1.2.0 34f1b2a0557f504ee70664ff922faee63924aef0 1.4.0 f30c17a700ba05228b70c3e90582494169148a48 1.4.1 9fca875cf36eb1cfc65f739309e7105de454ef53 1.4.2 +19c4cb98502a52f7875916399ffdaa9ed01d1155 1.4.3 From 7051a6d3773003ecc19487858939c6f8ee594b0a Mon Sep 17 00:00:00 2001 From: Mathias Behrle Date: Tue, 2 Nov 2010 21:12:09 +0100 Subject: [PATCH 18/29] Increase version number --- __tryton__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/__tryton__.py b/__tryton__.py index f0c73fe281..b1a46625fe 100644 --- a/__tryton__.py +++ b/__tryton__.py @@ -6,7 +6,7 @@ 'name_es_CO': 'Contabilidad', 'name_es_ES': 'Contabilidad', 'name_fr_FR': 'Comptabilité', - 'version': '1.4.3', + 'version': '1.4.4', 'author': 'B2CK', 'email': 'info@b2ck.com', 'website': 'http://www.tryton.org/', From 21ed71bb6e4624d0a322ea8d4e5a31a8b64a5e03 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Fri, 31 Dec 2010 12:41:01 +0100 Subject: [PATCH 19/29] Prevent overlapping of periods in aged balance for issue1764 (transplanted from 14828419189f9c6035ab12253f523046f615c284) --- account.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/account.py b/account.py index e049575de8..41e9cbf3af 100644 --- a/account.py +++ b/account.py @@ -2385,7 +2385,7 @@ class AgedBalance(Report): datetime.timedelta(days=term*coef),) else: term_query = '(l.maturity_date <= %s '\ - 'AND l.maturity_date >= %s) ' + 'AND l.maturity_date > %s) ' term_args = ( date_obj.today(cursor, user, context=context) + \ datetime.timedelta(days=term*coef), From 27a184259567e75b6bbc8205b90f1e099952243a Mon Sep 17 00:00:00 2001 From: Mathias Behrle Date: Sun, 13 Feb 2011 16:40:40 +0100 Subject: [PATCH 20/29] Update COPYRIGHT --- COPYRIGHT | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/COPYRIGHT b/COPYRIGHT index 94a43fbe61..97eff54014 100644 --- a/COPYRIGHT +++ b/COPYRIGHT @@ -1,7 +1,7 @@ Copyright (C) 2004-2008 Tiny SPRL. -Copyright (C) 2008-2010 Cédric Krier. -Copyright (C) 2008-2010 Bertrand Chenal. -Copyright (C) 2008-2010 B2CK SPRL. +Copyright (C) 2008-2011 Cédric Krier. +Copyright (C) 2008-2011 Bertrand Chenal. +Copyright (C) 2008-2011 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 9058fdb0410c49476e5f1d39fc7b3fba4563f26a Mon Sep 17 00:00:00 2001 From: Mathias Behrle Date: Sun, 13 Feb 2011 17:28:26 +0100 Subject: [PATCH 21/29] Prepare release 1.4.4 --- CHANGELOG | 3 +++ 1 file changed, 3 insertions(+) diff --git a/CHANGELOG b/CHANGELOG index 15b6682bc2..41e4ea0204 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,3 +1,6 @@ +Version 1.4.4 - 2011-02-13 +* Bug fixes (see mercurial logs for details) + Version 1.4.3 - 2010-11-02 * Bug fixes (see mercurial logs for details) From 1d6213f90a245accdb087de64e97a57cbde994dd Mon Sep 17 00:00:00 2001 From: Mathias Behrle Date: Sun, 13 Feb 2011 17:28:27 +0100 Subject: [PATCH 22/29] Added tag 1.4.4 for changeset 0de67e70a944 --- .hgtags | 1 + 1 file changed, 1 insertion(+) diff --git a/.hgtags b/.hgtags index 205fdd7dc8..d57b0e91e6 100644 --- a/.hgtags +++ b/.hgtags @@ -4,3 +4,4 @@ c25f8bf80f1f8f92954cfed3a6dd2f799bd370e4 1.2.0 f30c17a700ba05228b70c3e90582494169148a48 1.4.1 9fca875cf36eb1cfc65f739309e7105de454ef53 1.4.2 19c4cb98502a52f7875916399ffdaa9ed01d1155 1.4.3 +0de67e70a9447c3cf60d003e314ea8a90ee8f9c6 1.4.4 From 89697e7f4eade13dab5ceac9fb2dcaaf1bc959bc Mon Sep 17 00:00:00 2001 From: Mathias Behrle Date: Sun, 13 Feb 2011 17:28:39 +0100 Subject: [PATCH 23/29] Increase version number --- __tryton__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/__tryton__.py b/__tryton__.py index b1a46625fe..efed7fa3da 100644 --- a/__tryton__.py +++ b/__tryton__.py @@ -6,7 +6,7 @@ 'name_es_CO': 'Contabilidad', 'name_es_ES': 'Contabilidad', 'name_fr_FR': 'Comptabilité', - 'version': '1.4.4', + 'version': '1.4.5', 'author': 'B2CK', 'email': 'info@b2ck.com', 'website': 'http://www.tryton.org/', From 23d173b67bc626d81e2c486a683b7f2432fb6550 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicolas=20=C3=89vrard?= Date: Fri, 28 Oct 2011 10:28:26 +0200 Subject: [PATCH 24/29] Fix typo (transplanted from d47f438ca66c72ba98bec1e125e990944dfd6881) --- move.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/move.py b/move.py index f2952872aa..b741cf8e31 100644 --- a/move.py +++ b/move.py @@ -853,7 +853,7 @@ class Line(ModelSQL, ModelView): amount = cursor.fetchone()[0] # SQLite uses float for SUM if not isinstance(amount, Decimal): - amout = Decimal(str(amount)) + amount = Decimal(str(amount)) if not currency_obj.is_zero(cursor, user, party.account_receivable.currency, amount): if amount > Decimal('0.0'): From b76cd160cc6d77838e3c3bc54cabb9238a6b559e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Mon, 14 Nov 2011 17:59:24 +0100 Subject: [PATCH 25/29] Create property for default account only if value is set issue2259 review174001 (transplanted from 2475a84195d25ba0b6c72637604fa2bfbac03959) --- account.py | 30 ++++++++++++++++-------------- 1 file changed, 16 insertions(+), 14 deletions(-) diff --git a/account.py b/account.py index 41e9cbf3af..ad8ec3e92f 100644 --- a/account.py +++ b/account.py @@ -1918,13 +1918,14 @@ class CreateChartAccount(Wizard): ('company', '=', datas['form']['company']), ], context=context) property_obj.delete(cursor, 0, property_ids, context=context) - property_obj.create(cursor, 0, { - 'name': 'account_receivable', - 'field': account_receivable_field_id, - 'value': 'account.account,' + \ - str(datas['form']['account_receivable']), - 'company': datas['form']['company'], - }, context=context) + if datas['form']['account_receivable']: + property_obj.create(cursor, 0, { + 'name': 'account_receivable', + 'field': account_receivable_field_id, + 'value': 'account.account,' + \ + str(datas['form']['account_receivable']), + 'company': datas['form']['company'], + }, context=context) account_payable_field_id = model_field_obj.search(cursor, user, [ ('model.model', '=', 'party.party'), @@ -1936,13 +1937,14 @@ class CreateChartAccount(Wizard): ('company', '=', datas['form']['company']), ], context=context) property_obj.delete(cursor, 0, property_ids, context=context) - property_obj.create(cursor, 0, { - 'name': 'account_payable', - 'field': account_payable_field_id, - 'value': 'account.account,' + \ - str(datas['form']['account_payable']), - 'company': datas['form']['company'], - }, context=context) + if datas['form']['account_payable']: + property_obj.create(cursor, 0, { + 'name': 'account_payable', + 'field': account_payable_field_id, + 'value': 'account.account,' + \ + str(datas['form']['account_payable']), + 'company': datas['form']['company'], + }, context=context) return {} CreateChartAccount() From acdd69f90d236df722e4dca8408415d246e1f68b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Fri, 2 Dec 2011 11:42:35 +0100 Subject: [PATCH 26/29] Convert value to Decimal when searching receivabel/payable issue2299 review191001 (transplanted from e0e172026e4683c47ab6681203912cb9962d906f) --- party.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/party.py b/party.py index faeb509235..2852f0476f 100644 --- a/party.py +++ b/party.py @@ -181,7 +181,7 @@ class Party(ModelSQL, ModelView): 'HAVING ' + \ 'AND'.join('(SUM((COALESCE(l.debit, 0) - COALESCE(l.credit, 0))) ' \ + ' ' + x[1] + ' %s) ' for x in args), - [code] + today_value + [company_id] + [x[2] for x in args]) + [code] + today_value + [company_id] + [Decimal(x[2]) for x in args]) return [('id', 'in', [x[0] for x in cursor.fetchall()])] Party() From 6e5a3a74db8aea8e93655008ea249e9c4e59f1fd Mon Sep 17 00:00:00 2001 From: Mathias Behrle Date: Mon, 26 Dec 2011 10:33:24 +0100 Subject: [PATCH 27/29] Prepare release 1.4.5 --- CHANGELOG | 3 +++ 1 file changed, 3 insertions(+) diff --git a/CHANGELOG b/CHANGELOG index 41e4ea0204..39a4915585 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,3 +1,6 @@ +Version 1.4.5 - 2011-12-26 +* Bug fixes (see mercurial logs for details) + Version 1.4.4 - 2011-02-13 * Bug fixes (see mercurial logs for details) From 9c9ca39299bda60ea1b547590a3c33311bcef69e Mon Sep 17 00:00:00 2001 From: Mathias Behrle Date: Mon, 26 Dec 2011 10:33:24 +0100 Subject: [PATCH 28/29] Added tag 1.4.5 for changeset 9c6a6b4bc4c8 --- .hgtags | 1 + 1 file changed, 1 insertion(+) diff --git a/.hgtags b/.hgtags index d57b0e91e6..c78179a856 100644 --- a/.hgtags +++ b/.hgtags @@ -5,3 +5,4 @@ f30c17a700ba05228b70c3e90582494169148a48 1.4.1 9fca875cf36eb1cfc65f739309e7105de454ef53 1.4.2 19c4cb98502a52f7875916399ffdaa9ed01d1155 1.4.3 0de67e70a9447c3cf60d003e314ea8a90ee8f9c6 1.4.4 +9c6a6b4bc4c877e2ad4362e465f63f953b3b987c 1.4.5 From ba9fdebb8260bcf676a825fe62ff2151d66ac955 Mon Sep 17 00:00:00 2001 From: Mathias Behrle Date: Mon, 26 Dec 2011 10:33:36 +0100 Subject: [PATCH 29/29] Increase version number --- __tryton__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/__tryton__.py b/__tryton__.py index efed7fa3da..81ec1d1453 100644 --- a/__tryton__.py +++ b/__tryton__.py @@ -6,7 +6,7 @@ 'name_es_CO': 'Contabilidad', 'name_es_ES': 'Contabilidad', 'name_fr_FR': 'Comptabilité', - 'version': '1.4.5', + 'version': '1.4.6', 'author': 'B2CK', 'email': 'info@b2ck.com', 'website': 'http://www.tryton.org/',