[tryton-debian-vcs] tryton-modules-account branch upstream-3.0 updated. upstream/3.0.5-1-ga3ac990

Mathias Behrle tryton-debian-vcs at alioth.debian.org
Wed Nov 12 13:48:01 UTC 2014 

The following commit has been merged in the upstream-3.0 branch:
https://alioth.debian.org/plugins/scmgit/cgi-bin/gitweb.cgi/?p=tryton/tryton-modules-account.git;a=commitdiff;h=upstream/3.0.5-1-ga3ac990

commit a3ac99018796b7750e4f088783813ca9a3bc2c72
Author: Mathias Behrle <mathiasb at m9s.biz>
Date:   Wed Nov 12 13:54:31 2014 +0100

    Adding upstream version 3.0.6.
    
    Signed-off-by: Mathias Behrle <mathiasb at m9s.biz>

diff --git a/CHANGELOG b/CHANGELOG
index 38e3999..b7483eb 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+Version 3.0.6 - 2014-11-06
+* Bug fixes (see mercurial logs for details)
+
 Version 3.0.5 - 2014-08-03
 * Bug fixes (see mercurial logs for details)
 
diff --git a/PKG-INFO b/PKG-INFO
index c1b68e5..003fae8 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
 Metadata-Version: 1.1
 Name: trytond_account
-Version: 3.0.5
+Version: 3.0.6
 Summary: Tryton module for accounting
 Home-page: http://www.tryton.org/
 Author: Tryton
diff --git a/move.py b/move.py
index 6f6a8c4..13e5379 100644
--- a/move.py
+++ b/move.py
@@ -184,7 +184,9 @@ class Move(ModelSQL, ModelView):
     def check_date(self):
         if (self.date < self.period.start_date
                 or self.date > self.period.end_date):
-            self.raise_user_error('date_outside_period', (self.rec_name,))
+            self.raise_user_error('date_outside_period', {
+                        'move': self.rec_name,
+                        })
 
     @classmethod
     def check_modify(cls, moves):
@@ -357,11 +359,13 @@ class Move(ModelSQL, ModelView):
                     move.period.post_move_sequence_used.id)
             cls.write([move], values)
 
+            keyfunc = lambda l: (l.party, l.account)
             to_reconcile = [l for l in move.lines
                 if ((l.debit == l.credit == Decimal('0'))
                     and l.account.reconcile)]
-            if to_reconcile:
-                Line.reconcile(to_reconcile)
+            to_reconcile = sorted(to_reconcile, key=keyfunc)
+            for _, zero_lines in groupby(to_reconcile, keyfunc):
+                Line.reconcile(list(zero_lines))
 
     @classmethod
     @ModelView.button
diff --git a/tryton.cfg b/tryton.cfg
index 5203fc4..da20866 100644
--- a/tryton.cfg
+++ b/tryton.cfg
@@ -1,5 +1,5 @@
 [tryton]
-version=3.0.5
+version=3.0.6
 depends:
     company
     currency
diff --git a/trytond_account.egg-info/PKG-INFO b/trytond_account.egg-info/PKG-INFO
index 14e6426..c7b839e 100644
--- a/trytond_account.egg-info/PKG-INFO
+++ b/trytond_account.egg-info/PKG-INFO
@@ -1,6 +1,6 @@
 Metadata-Version: 1.1
 Name: trytond-account
-Version: 3.0.5
+Version: 3.0.6
 Summary: Tryton module for accounting
 Home-page: http://www.tryton.org/
 Author: Tryton
diff --git a/trytond_account.egg-info/SOURCES.txt b/trytond_account.egg-info/SOURCES.txt
index fc423fc..6ff9350 100644
--- a/trytond_account.egg-info/SOURCES.txt
+++ b/trytond_account.egg-info/SOURCES.txt
@@ -22,15 +22,129 @@ trial_balance.odt
 tryton.cfg
 ./__init__.py
 ./account.py
+./account.xml
+./aged_balance.odt
 ./configuration.py
+./configuration.xml
 ./fiscalyear.py
+./fiscalyear.xml
+./general_journal.odt
+./general_ledger.odt
 ./journal.py
+./journal.xml
 ./move.py
+./move.xml
 ./party.py
+./party.xml
 ./period.py
+./period.xml
 ./tax.py
+./tax.xml
+./third_party_balance.odt
+./trial_balance.odt
+./tryton.cfg
+./icons/tryton-financial.svg
+./locale/bg_BG.po
+./locale/ca_ES.po
+./locale/cs_CZ.po
+./locale/de_DE.po
+./locale/es_AR.po
+./locale/es_CO.po
+./locale/es_ES.po
+./locale/fr_FR.po
+./locale/nl_NL.po
+./locale/ru_RU.po
+./locale/sl_SI.po
 ./tests/__init__.py
+./tests/scenario_account_reconciliation.rst
 ./tests/test_account.py
+./view/account_balance_sheet_tree.xml
+./view/account_deferral_form.xml
+./view/account_deferral_tree.xml
+./view/account_form.xml
+./view/account_income_statement_tree.xml
+./view/account_list.xml
+./view/account_list2.xml
+./view/account_template_form.xml
+./view/account_template_list.xml
+./view/account_template_tree.xml
+./view/account_tree.xml
+./view/account_tree2.xml
+./view/account_type_form.xml
+./view/account_type_list.xml
+./view/account_type_template_form.xml
+./view/account_type_template_list.xml
+./view/account_type_template_tree.xml
+./view/account_type_tree.xml
+./view/configuration_form.xml
+./view/create_chart_account_form.xml
+./view/create_chart_properties_form.xml
+./view/create_chart_start_form.xml
+./view/fiscalyear_balance_non_deferral_start_form.xml
+./view/fiscalyear_close_start_form.xml
+./view/fiscalyear_form.xml
+./view/fiscalyear_tree.xml
+./view/journal_form.xml
+./view/journal_period_form.xml
+./view/journal_period_tree.xml
+./view/journal_tree.xml
+./view/journal_type_form.xml
+./view/journal_type_tree.xml
+./view/journal_view_column_form.xml
+./view/journal_view_column_list.xml
+./view/journal_view_column_list_sequence.xml
+./view/journal_view_form.xml
+./view/journal_view_tree.xml
+./view/move_form.xml
+./view/move_line_form.xml
+./view/move_line_form_move.xml
+./view/move_line_tree.xml
+./view/move_line_tree_move.xml
+./view/move_reconciliation_form.xml
+./view/move_reconciliation_tree.xml
+./view/move_tree.xml
+./view/open_aged_balance_start_form.xml
+./view/open_balance_sheet_start_form.xml
+./view/open_chart_start_form.xml
+./view/open_income_statement_start_form.xml
+./view/open_journal_ask_form.xml
+./view/open_reconcile_lines_start_form.xml
+./view/open_third_party_balance_start_form.xml
+./view/party_form.xml
+./view/party_tree.xml
+./view/period_form.xml
+./view/period_tree.xml
+./view/print_general_journal_start_form.xml
+./view/print_general_legder_start_form.xml
+./view/print_trial_balance_start_form.xml
+./view/reconcile_lines_writeoff_form.xml
+./view/tax_code_form.xml
+./view/tax_code_list.xml
+./view/tax_code_open_chart_start_form.xml
+./view/tax_code_template_form.xml
+./view/tax_code_template_tree.xml
+./view/tax_code_tree.xml
+./view/tax_code_tree2.xml
+./view/tax_form.xml
+./view/tax_group_form.xml
+./view/tax_group_tree.xml
+./view/tax_line_form.xml
+./view/tax_line_tree.xml
+./view/tax_list.xml
+./view/tax_rule_form.xml
+./view/tax_rule_line_form.xml
+./view/tax_rule_line_template_form.xml
+./view/tax_rule_line_template_tree.xml
+./view/tax_rule_line_tree.xml
+./view/tax_rule_line_tree_sequence.xml
+./view/tax_rule_template_form.xml
+./view/tax_rule_template_tree.xml
+./view/tax_rule_tree.xml
+./view/tax_template_form.xml
+./view/tax_template_tree.xml
+./view/tax_tree.xml
+./view/update_chart_start_form.xml
+./view/update_chart_succeed_form.xml
 doc/index.rst
 icons/tryton-financial.svg
 locale/bg_BG.po
-- 
tryton-modules-account

More information about the tryton-debian-vcs mailing list