From 0e00a89b657acc2edeaf905b070540bc95a03de8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Sun, 30 Mar 2008 17:03:45 +0200 Subject: [PATCH] Add General Journal --- general_journal.odt | Bin 0 -> 13072 bytes move.py | 95 ++++++++++++++++++++++++++++++++++++++++++++ move.xml | 33 +++++++++++++++ 3 files changed, 128 insertions(+) create mode 100644 general_journal.odt diff --git a/general_journal.odt b/general_journal.odt new file mode 100644 index 0000000000000000000000000000000000000000..05e7540143a4dbe5c309b1d0451efc6f6c85ba89 GIT binary patch literal 13072 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', datas['form']['from_date']), + ('post_date', '<=', datas['form']['to_date']), + ('state', '=', 'posted'), + ], order='post_date, reference, id', context=context) + else: + move_ids = move_obj.search(cursor, user, [ + ('date', '>=', datas['form']['from_date']), + ('date', '<=', datas['form']['to_date']), + ], order='COALESCE(post_date, date), reference, id', + context=context) + return move_obj.browse(cursor, user, move_ids, context=context) + + def parse(self, cursor, user, content, objects, datas, context): + if context is None: + context = {} + company_obj = self.pool.get('company.company') + context = context.copy() + + company = company_obj.browse(cursor, user, + datas['form']['company'], context=context) + + context['company'] = company + context['digits'] = company.currency.digits + context['from_date'] = datas['form']['from_date'] + context['to_date'] = datas['form']['to_date'] + + return super(GeneralJournal, self).parse(cursor, user, content, + objects, datas, context) + +GeneralJournal() diff --git a/move.xml b/move.xml index 9da6a96583..0b6d78d48d 100644 --- a/move.xml +++ b/move.xml @@ -375,5 +375,38 @@ ]]> + + + account.move.print_general_journal.init + form + + + + + + Print General Journal + account.move.print_general_journal + + + + + General Journal + account.move + account.move.general_journal + account/general_journal.odt +