Merge lp:~luc-demeyer/account-financial-report/7.0-account_financial_report_webkit-fixes into lp:~account-report-core-editor/account-financial-report/7.0

Proposed by Luc De Meyer (Noviat)
Status: Rejected
Rejected by: Nhomar - Vauxoo
Proposed branch: lp:~luc-demeyer/account-financial-report/7.0-account_financial_report_webkit-fixes
Merge into: lp:~account-report-core-editor/account-financial-report/7.0
Diff against target: 1074 lines (+960/-3)
6 files modified
account_financial_report_webkit/__init__.py (+1/-0)
account_financial_report_webkit/account_period.py (+42/-0)
account_financial_report_webkit/i18n/nl.po (+877/-0)
account_financial_report_webkit/report/common_partner_reports.py (+8/-1)
account_financial_report_webkit/report/common_reports.py (+10/-1)
account_financial_report_webkit/report/general_ledger.py (+22/-1)
To merge this branch: bzr merge lp:~luc-demeyer/account-financial-report/7.0-account_financial_report_webkit-fixes
Reviewer Review Type Date Requested Status
Nhomar - Vauxoo Disapprove
Maxime Chambreuil (http://www.savoirfairelinux.com) Disapprove
Guewen Baconnier @ Camptocamp Needs Resubmitting
Yannick Vaucher @ Camptocamp Needs Resubmitting
Review via email: mp+172359@code.launchpad.net

Description of the change

This merge proposal contains a couple of enhancements/fixes:

1) dutch translation

2) General Ledger should include accounting move lines in close & opening periods

3) Add support for customers who start to use OpenERP accounting after one of more years of using OpenERP for other purposes by changing the '_get_first_special_period' logic.

To post a comment you must log in.
Revision history for this message
Yannick Vaucher @ Camptocamp (yvaucher-c2c) wrote :

Please don't change executable property of files

review: Needs Fixing (file rights)
Revision history for this message
Yannick Vaucher @ Camptocamp (yvaucher-c2c) wrote :

By openerp <openerp@oerp70> on 2013-05-13
a couple of fixes

Don't you want to set the right email in your bzr whoami to be properly linked on launchpad ?
Plus could you use [FIX] or [ADD] tag on your commit message ?

Otherwise, for other change needed:

l43 + l48 Use orm.Model instead of osv.osv

l62 can be removed as not needed anymore since v6.1

l976 - 978 added comment here seems strange

Furthermore, about point 2, is there a bug report on launchpad about it ? Would be great to have one and link your commit to it by using parameter --fixes lp:<bug number>

As you might want to resubmit your MP to fix the commit message and author, I think it would be better to separate those 3 points in 3 different merge proposals. So I set you MP as "Resubmit" so you can fix those.

Thanks for contributing, and looking forward for those few improvements

review: Needs Resubmitting
Revision history for this message
Guewen Baconnier @ Camptocamp (gbaconnier-c2c) wrote :

Hi,

Thanks for your proposal.

I would be glad if you could propose your 3 changes in independents MP as Yannick said, because I think we can merge the translations just like that but some modifications or discussions will be needed for the 2 other changes.

I'll discuss some issues once the changes are split if you don't mind.

Thanks
Guewen

review: Needs Resubmitting
Revision history for this message
Luc De Meyer (Noviat) (luc-demeyer) wrote :

Geuwen,

Splitting the module in three parts takes some time so if you don't mind I prefer to discuss about this via the same MP.

Regards,
Luc

-----Original Message-----
From: <email address hidden> [mailto:<email address hidden>] On Behalf Of Guewen Baconnier @ Camptocamp
Sent: dinsdag 2 juli 2013 11:29
To: <email address hidden>
Subject: Re: [Merge] lp:~luc-demeyer/account-financial-report/7.0-account_financial_report_webkit-fixes into lp:account-financial-report

Review: Resubmit

Hi,

Thanks for your proposal.

I would be glad if you could propose your 3 changes in independents MP as Yannick said, because I think we can merge the translations just like that but some modifications or discussions will be needed for the 2 other changes.

I'll discuss some issues once the changes are split if you don't mind.

Thanks
Guewen
--
https://code.launchpad.net/~luc-demeyer/account-financial-report/7.0-account_financial_report_webkit-fixes/+merge/172359
You are the owner of lp:~luc-demeyer/account-financial-report/7.0-account_financial_report_webkit-fixes.

Revision history for this message
Yannick Vaucher @ Camptocamp (yvaucher-c2c) wrote :

Luc,

If you don't split this merge in 3 parts it will certainly take even more time to be reviewed.

Keep in mind that big merge proposal take longer to review and are less likely to be quick checked by other people who want to take time for that but doesn't necessarily have more time than you to spend on it.

Plus, see my previous remarks, you better have to make a new merge proposal anyway, so why not take a bit more of time to make 3?

Regards,
Yannick

Revision history for this message
Luc De Meyer (Noviat) (luc-demeyer) wrote :

Yannick,

I am at the community days right now and leave immediately after these on holiday.
Hence I would like to get this rolling before I leave.
I'll have my iPad with me on holiday hence mail access will work but I don't intend to take my PC to do 'real' work.

Luc

-----Original Message-----
From: <email address hidden> [mailto:<email address hidden>] On Behalf Of Yannick Vaucher @ Camptocamp
Sent: donderdag 4 juli 2013 9:43
To: <email address hidden>
Subject: Re: [Merge] lp:~luc-demeyer/account-financial-report/7.0-account_financial_report_webkit-fixes into lp:account-financial-report

Luc,

If you don't split this merge in 3 parts it will certainly take even more time to be reviewed.

Keep in mind that big merge proposal take longer to review and are less likely to be quick checked by other people who want to take time for that but doesn't necessarily have more time than you to spend on it.

Plus, see my previous remarks, you better have to make a new merge proposal anyway, so why not take a bit more of time to make 3?

Regards,
Yannick
--
https://code.launchpad.net/~luc-demeyer/account-financial-report/7.0-account_financial_report_webkit-fixes/+merge/172359
You are the owner of lp:~luc-demeyer/account-financial-report/7.0-account_financial_report_webkit-fixes.

Revision history for this message
Yannick Vaucher @ Camptocamp (yvaucher-c2c) wrote :

Hello Luc,

A little reminder to know if there is any chance to see your welcomed contributions adapted to let reviewers validating them.

Regards,
Yannick

Revision history for this message
Maxime Chambreuil (http://www.savoirfairelinux.com) (max3903) wrote :

Luc,

Please refer to the community guidelines to get your contributions merged:
https://doc.openerp.com/contribute/15_guidelines/contribution_guidelines/#merge-proposal-guidelines

"Work on a separate feature/bug/whatever at a time. Do not mix lots of changes in one merge proposal, as it will be too complicated to review, thus refused."

review: Disapprove
Revision history for this message
Luc De Meyer (Noviat) (luc-demeyer) wrote :

I have splitted the merge into three separate merge proposals in order to facilitate the review.

1) dutch translations

     Cf. https://code.launchpad.net/~luc-demeyer/account-financial-report/7.0-account_financial_report_webkit-dutch-xlats/+merge/193704

2) General Ledger should include accounting move lines in close & opening periods

      Cf. https://code.launchpad.net/~luc-demeyer/account-financial-report/7.0-account_financial_report_webkit-GL-fix/+merge/193709

3) Add support for customers who start to use OpenERP accounting after one of more years of using OpenERP for other purposes by changing the '_get_first_special_period' logic.

     Cf. https://code.launchpad.net/~luc-demeyer/account-financial-report/7.0-account_financial_report_webkit-first-special-fix/+merge/193717

Regards,
Luc

-----Original Message-----
From: <email address hidden> [mailto:<email address hidden>] On Behalf Of Maxime Chambreuil (http://www.savoirfairelinux.com)
Sent: zondag 3 november 2013 15:50
To: <email address hidden>
Subject: Re: [Merge] lp:~luc-demeyer/account-financial-report/7.0-account_financial_report_webkit-fixes into lp:account-financial-report

Review: Disapprove

Luc,

Please refer to the community guidelines to get your contributions merged:
https://doc.openerp.com/contribute/15_guidelines/contribution_guidelines/#merge-proposal-guidelines

"Work on a separate feature/bug/whatever at a time. Do not mix lots of changes in one merge proposal, as it will be too complicated to review, thus refused."
--
https://code.launchpad.net/~luc-demeyer/account-financial-report/7.0-account_financial_report_webkit-fixes/+merge/172359
You are the owner of lp:~luc-demeyer/account-financial-report/7.0-account_financial_report_webkit-fixes.

Revision history for this message
Guewen Baconnier @ Camptocamp (gbaconnier-c2c) wrote :

Thanks for the split

Revision history for this message
Nhomar - Vauxoo (nhomar) wrote :

I will cancel this MP due to the split of the fixes in separate branches, if you are disagreed be free to resubmit this MP thanks.

review: Disapprove

Unmerged revisions

29. By openerp <openerp@oerp70>

a couple of fixes

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'account_financial_report_webkit/__init__.py' (properties changed: -x to +x)
--- account_financial_report_webkit/__init__.py 2012-03-06 09:13:59 +0000
+++ account_financial_report_webkit/__init__.py 2013-07-01 16:07:28 +0000
@@ -18,6 +18,7 @@
18#18#
19##############################################################################19##############################################################################
20import account20import account
21import account_period # FIX by Noviat
21from . import wizard22from . import wizard
22from . import report23from . import report
23from . import account_move_line24from . import account_move_line
24\ No newline at end of file25\ No newline at end of file
2526
=== modified file 'account_financial_report_webkit/__openerp__.py' (properties changed: -x to +x)
=== modified file 'account_financial_report_webkit/account.py' (properties changed: -x to +x)
=== modified file 'account_financial_report_webkit/account_move_line.py' (properties changed: -x to +x)
=== added file 'account_financial_report_webkit/account_period.py'
--- account_financial_report_webkit/account_period.py 1970-01-01 00:00:00 +0000
+++ account_financial_report_webkit/account_period.py 2013-07-01 16:07:28 +0000
@@ -0,0 +1,42 @@
1# -*- encoding: utf-8 -*-
2##############################################################################
3#
4# OpenERP, Open Source Management Solution
5#
6# Copyright (c) 2013 Noviat nv/sa (www.noviat.be). All rights reserved.
7#
8# This program is free software: you can redistribute it and/or modify
9# it under the terms of the GNU Affero General Public License as
10# published by the Free Software Foundation, either version 3 of the
11# License, or (at your option) any later version.
12#
13# This program is distributed in the hope that it will be useful,
14# but WITHOUT ANY WARRANTY; without even the implied warranty of
15# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
16# GNU Affero General Public License for more details.
17#
18# You should have received a copy of the GNU Affero General Public License
19# along with this program. If not, see <http://www.gnu.org/licenses/>.
20#
21##############################################################################
22
23from osv import fields, osv
24from tools.translate import _
25import logging
26_logger = logging.getLogger(__name__)
27
28class account_period(osv.osv):
29 _inherit = 'account.period'
30
31 def build_ctx_periods(self, cr, uid, period_from_id, period_to_id):
32 """ add close periods """
33 period_ids = super(account_period, self).build_ctx_periods(cr, uid, period_from_id, period_to_id)
34 period_to = self.browse(cr, uid, period_to_id)
35 period_date_stop = period_to.date_stop
36 close_period_ids = self.search(cr, uid, [('date_stop', '=', period_date_stop), ('special', '=', True), ('company_id', '=', period_to.company_id.id)])
37 for p in close_period_ids:
38 if p not in period_ids:
39 period_ids.append(p)
40 return period_ids
41
42account_period()
043
=== modified file 'account_financial_report_webkit/account_view.xml' (properties changed: -x to +x)
=== modified file 'account_financial_report_webkit/data/financial_webkit_header.xml' (properties changed: -x to +x)
=== modified file 'account_financial_report_webkit/i18n/account_financial_report_webkit.pot' (properties changed: -x to +x)
=== modified file 'account_financial_report_webkit/i18n/de.po' (properties changed: -x to +x)
=== modified file 'account_financial_report_webkit/i18n/en_US.po' (properties changed: -x to +x)
=== modified file 'account_financial_report_webkit/i18n/fr.po' (properties changed: -x to +x)
=== added file 'account_financial_report_webkit/i18n/nl.po'
--- account_financial_report_webkit/i18n/nl.po 1970-01-01 00:00:00 +0000
+++ account_financial_report_webkit/i18n/nl.po 2013-07-01 16:07:28 +0000
@@ -0,0 +1,877 @@
1# Translation of OpenERP Server.
2# This file contains the translation of the following modules:
3# * account_financial_report_webkit
4#
5msgid ""
6msgstr ""
7"Project-Id-Version: OpenERP Server 6.0.3\n"
8"Report-Msgid-Bugs-To: support@openerp.com\n"
9"POT-Creation-Date: 2012-01-20 10:47+0000\n"
10"PO-Revision-Date: 2012-01-20 10:47+0000\n"
11"Last-Translator: <>\n"
12"Language-Team: \n"
13"MIME-Version: 1.0\n"
14"Content-Type: text/plain; charset=UTF-8\n"
15"Content-Transfer-Encoding: \n"
16"Plural-Forms: \n"
17
18#. module: account_financial_report_webkit
19#: field:account.common.balance.report,account_ids:0
20#: field:general.ledger.webkit,account_ids:0
21#: field:partner.balance.webkit,account_ids:0
22#: field:trial.balance.webkit,account_ids:0
23msgid "Filter on accounts"
24msgstr "Filter per rekening"
25
26#. module: account_financial_report_webkit
27#: code:addons/account_financial_report_webkit/report/common_reports.py:424
28#, python-format
29msgid "Please set a valid time filter"
30msgstr "Selecteer geldige tijdsfilter"
31
32#. module: account_financial_report_webkit
33#: view:general.ledger.webkit:0
34#: view:open.invoices.webkit:0
35#: view:partners.ledger.webkit:0
36msgid "Layout Options"
37msgstr "Layout opties"
38
39#. module: account_financial_report_webkit
40#: report:addons/account_financial_report_webkit/report/templates/account_report_general_ledger.mako:203
41#: report:addons/account_financial_report_webkit/report/templates/account_report_open_invoices.mako:223
42#: report:addons/account_financial_report_webkit/report/templates/account_report_partners_ledger.mako:253
43msgid "Cumulated Balance on Account"
44msgstr "Cumulatief saldo"
45
46#. module: account_financial_report_webkit
47#: field:general.ledger.webkit,centralize:0
48msgid "Activate Centralization"
49msgstr "Activeer Centralisatie"
50
51#. module: account_financial_report_webkit
52#: report:addons/account_financial_report_webkit/report/templates/account_report_partner_balance.mako:154
53#: report:addons/account_financial_report_webkit/report/templates/account_report_partner_balance.mako:161
54#: report:addons/account_financial_report_webkit/report/templates/account_report_profit_loss.mako:120
55#: report:addons/account_financial_report_webkit/report/templates/account_report_profit_loss.mako:127
56#: report:addons/account_financial_report_webkit/report/templates/account_report_trial_balance.mako:135
57#: report:addons/account_financial_report_webkit/report/templates/account_report_trial_balance.mako:142
58msgid "Balance %s"
59msgstr "Balans %s"
60
61#. module: account_financial_report_webkit
62#: code:addons/account_financial_report_webkit/report/webkit_parser_header_fix.py:172
63#, python-format
64msgid "No header defined for this Webkit report!"
65msgstr "Geen header gedefinieerd voor dit webkit rapport !"
66
67#. module: account_financial_report_webkit
68#: model:ir.actions.act_window,name:account_financial_report_webkit.action_account_trial_balance_menu_webkit
69#: model:ir.actions.report.xml,name:account_financial_report_webkit.account_report_trial_balance_webkit
70msgid "Trial Balance Webkit"
71msgstr "Proefbalans"
72
73#. module: account_financial_report_webkit
74#: view:partner.balance.webkit:0
75msgid "This report is an analysis done by a partner, It is a PDF report containing one line per partner representing the cumulative credit balance"
76msgstr "Dit rapport toont de gecumuleerde balans per klant of leverancier."
77
78#. module: account_financial_report_webkit
79#: report:addons/account_financial_report_webkit/report/templates/account_report_partner_balance.mako:138
80msgid "Account / Partner Name"
81msgstr "Rekening / Partner"
82
83#. module: account_financial_report_webkit
84#: field:account.common.balance.report,journal_ids:0
85#: field:general.ledger.webkit,journal_ids:0
86#: field:open.invoices.webkit,journal_ids:0
87#: field:partner.balance.webkit,journal_ids:0
88#: field:partners.ledger.webkit,journal_ids:0
89#: field:trial.balance.webkit,journal_ids:0
90msgid "Journals"
91msgstr "Dagboeken"
92
93#. module: account_financial_report_webkit
94#: help:general.ledger.webkit,amount_currency:0
95#: help:open.invoices.webkit,amount_currency:0
96#: help:partners.ledger.webkit,amount_currency:0
97msgid "It adds the currency column"
98msgstr "Toevoegen bedrag in secundaire munteenheid"
99
100#. module: account_financial_report_webkit
101#: selection:open.invoices.webkit,result_selection:0
102#: selection:partner.balance.webkit,result_selection:0
103#: selection:partners.ledger.webkit,result_selection:0
104#: code:addons/account_financial_report_webkit/report/common_reports.py:73
105#, python-format
106msgid "Receivable and Payable Accounts"
107msgstr "Rekeningen Klanten/Leveranciers"
108
109#. module: account_financial_report_webkit
110#: report:addons/account_financial_report_webkit/report/templates/account_report_profit_loss.mako:104
111#: report:addons/account_financial_report_webkit/report/templates/account_report_trial_balance.mako:119
112#: model:ir.model,name:account_financial_report_webkit.model_account_account
113msgid "Account"
114msgstr "Rekening"
115
116#. module: account_financial_report_webkit
117#: code:addons/account_financial_report_webkit/report/trial_balance.py:42
118#, python-format
119msgid "TRIAL BALANCE"
120msgstr "PROEFBALANS"
121
122#. module: account_financial_report_webkit
123#: report:addons/account_financial_report_webkit/report/templates/account_report_open_invoices.mako:118
124msgid "Due Date"
125msgstr "Vervaldatum"
126
127#. module: account_financial_report_webkit
128#: model:ir.model,name:account_financial_report_webkit.model_account_report_partner_balance_webkit
129msgid "Partner Balance Report"
130msgstr "Partner Balans"
131
132#. module: account_financial_report_webkit
133#: code:addons/account_financial_report_webkit/report/webkit_parser_header_fix.py:167
134#, python-format
135msgid "Error!"
136msgstr "Fout!"
137
138#. module: account_financial_report_webkit
139#: model:ir.model,name:account_financial_report_webkit.model_account_report_trial_balance_webkit
140msgid "Trial Balance Report"
141msgstr "Proefbalans"
142
143#. module: account_financial_report_webkit
144#: report:addons/account_financial_report_webkit/report/templates/account_report_trial_balance.mako:117
145msgid "Code"
146msgstr "Code"
147
148#. module: account_financial_report_webkit
149#: model:ir.actions.act_window,name:account_financial_report_webkit.action_account_partners_ledger_menu_webkit
150#: model:ir.actions.report.xml,name:account_financial_report_webkit.account_report_partners_ledger_webkit
151msgid "Partner Ledger Webkit"
152msgstr "Grootboek Partners"
153
154#. module: account_financial_report_webkit
155#: report:addons/account_financial_report_webkit/report/templates/account_report_partner_balance.mako:192
156msgid "Unallocated"
157msgstr "Niet toegewezen"
158
159#. module: account_financial_report_webkit
160#: report:addons/account_financial_report_webkit/report/templates/account_report_open_invoices.mako:116
161#: report:addons/account_financial_report_webkit/report/templates/account_report_partners_ledger.mako:112
162msgid "Rec."
163msgstr "Rec."
164
165#. module: account_financial_report_webkit
166#: code:addons/account_financial_report_webkit/report/webkit_parser_header_fix.py:123
167#, python-format
168msgid "Webkit raise an error"
169msgstr "Webkit fout"
170
171#. module: account_financial_report_webkit
172#: selection:open.invoices.webkit,result_selection:0
173#: selection:partner.balance.webkit,result_selection:0
174#: selection:partners.ledger.webkit,result_selection:0
175#: code:addons/account_financial_report_webkit/report/common_reports.py:69
176#, python-format
177msgid "Receivable Accounts"
178msgstr "Rekening klanten"
179
180#. module: account_financial_report_webkit
181#: model:ir.actions.act_window,name:account_financial_report_webkit.action_account_general_ledger_menu_webkit
182#: model:ir.actions.report.xml,name:account_financial_report_webkit.account_report_general_ledger_webkit
183msgid "General Ledger Webkit"
184msgstr "Grootboek"
185
186#. module: account_financial_report_webkit
187#: field:account.common.balance.report,period_from:0
188#: field:general.ledger.webkit,period_from:0
189#: field:open.invoices.webkit,period_from:0
190#: field:partner.balance.webkit,period_from:0
191#: field:partners.ledger.webkit,period_from:0
192#: field:trial.balance.webkit,period_from:0
193msgid "Start period"
194msgstr "Startperiode"
195
196#. module: account_financial_report_webkit
197#: model:ir.model,name:account_financial_report_webkit.model_account_report_open_transactions_webkit
198msgid "Open Transactions Report"
199msgstr "Open transacties"
200
201#. module: account_financial_report_webkit
202#: report:addons/account_financial_report_webkit/report/templates/account_report_general_ledger.mako:33
203#: report:addons/account_financial_report_webkit/report/templates/account_report_open_invoices.mako:37
204#: report:addons/account_financial_report_webkit/report/templates/account_report_partner_balance.mako:46
205#: report:addons/account_financial_report_webkit/report/templates/account_report_partners_ledger.mako:34
206#: report:addons/account_financial_report_webkit/report/templates/account_report_trial_balance.mako:58
207msgid "Periods Filter"
208msgstr "Filter - periode"
209
210#. module: account_financial_report_webkit
211#: report:addons/account_financial_report_webkit/report/templates/account_report_general_ledger.mako:38
212#: report:addons/account_financial_report_webkit/report/templates/account_report_general_ledger.mako:139
213#: report:addons/account_financial_report_webkit/report/templates/account_report_partner_balance.mako:52
214#: report:addons/account_financial_report_webkit/report/templates/account_report_partner_balance.mako:142
215#: report:addons/account_financial_report_webkit/report/templates/account_report_partners_ledger.mako:39
216#: report:addons/account_financial_report_webkit/report/templates/account_report_partners_ledger.mako:153
217#: report:addons/account_financial_report_webkit/report/templates/account_report_profit_loss.mako:50
218#: report:addons/account_financial_report_webkit/report/templates/account_report_profit_loss.mako:108
219#: report:addons/account_financial_report_webkit/report/templates/account_report_trial_balance.mako:63
220#: report:addons/account_financial_report_webkit/report/templates/account_report_trial_balance.mako:123
221msgid "Initial Balance"
222msgstr "Beginbalans"
223
224#. module: account_financial_report_webkit
225#: field:account.common.balance.report,period_to:0
226#: field:general.ledger.webkit,period_to:0
227#: field:open.invoices.webkit,period_to:0
228#: field:partner.balance.webkit,period_to:0
229#: field:partners.ledger.webkit,period_to:0
230#: field:trial.balance.webkit,period_to:0
231msgid "End period"
232msgstr "Eindperiode"
233
234#. module: account_financial_report_webkit
235#: model:ir.model,name:account_financial_report_webkit.model_account_report_general_ledger_webkit
236msgid "General Ledger Report"
237msgstr "Grootboek"
238
239#. module: account_financial_report_webkit
240#: report:addons/account_financial_report_webkit/report/templates/account_report_profit_loss.mako:48
241msgid "Displayed Accounts"
242msgstr "Rekeningen"
243
244#. module: account_financial_report_webkit
245#: report:addons/account_financial_report_webkit/report/templates/account_report_general_ledger.mako:99
246#: report:addons/account_financial_report_webkit/report/templates/account_report_open_invoices.mako:112
247#: report:addons/account_financial_report_webkit/report/templates/account_report_partners_ledger.mako:108
248msgid "Partner"
249msgstr "Partner"
250
251#. module: account_financial_report_webkit
252#: help:account.common.balance.report,chart_account_id:0
253#: help:general.ledger.webkit,chart_account_id:0
254#: help:open.invoices.webkit,chart_account_id:0
255#: help:partner.balance.webkit,chart_account_id:0
256#: help:partners.ledger.webkit,chart_account_id:0
257#: help:trial.balance.webkit,chart_account_id:0
258msgid "Select Charts of Accounts"
259msgstr "Selecteer grootboekschema"
260
261#. module: account_financial_report_webkit
262#: field:account.common.balance.report,filter:0
263#: field:general.ledger.webkit,filter:0
264#: field:open.invoices.webkit,filter:0
265#: field:partner.balance.webkit,filter:0
266#: field:partners.ledger.webkit,filter:0
267#: field:trial.balance.webkit,filter:0
268msgid "Filter by"
269msgstr "Filtrer op"
270
271#. module: account_financial_report_webkit
272#: view:partners.ledger.webkit:0
273#: code:addons/account_financial_report_webkit/report/partners_ledger.py:48
274#, python-format
275msgid "Partner Ledger"
276msgstr "Rekeningen Partners"
277
278#. module: account_financial_report_webkit
279#: report:addons/account_financial_report_webkit/report/templates/account_report_general_ledger.mako:114
280#: report:addons/account_financial_report_webkit/report/templates/account_report_open_invoices.mako:129
281#: report:addons/account_financial_report_webkit/report/templates/account_report_partners_ledger.mako:123
282msgid "Curr."
283msgstr "Munt."
284
285#. module: account_financial_report_webkit
286#: report:addons/account_financial_report_webkit/report/templates/account_report_general_ledger.mako:101
287#: report:addons/account_financial_report_webkit/report/templates/account_report_open_invoices.mako:114
288#: report:addons/account_financial_report_webkit/report/templates/account_report_partners_ledger.mako:110
289msgid "Label"
290msgstr "Omschrijving"
291
292#. module: account_financial_report_webkit
293#: report:addons/account_financial_report_webkit/report/templates/account_report_general_ledger.mako:105
294#: report:addons/account_financial_report_webkit/report/templates/account_report_open_invoices.mako:120
295#: report:addons/account_financial_report_webkit/report/templates/account_report_partner_balance.mako:145
296#: report:addons/account_financial_report_webkit/report/templates/account_report_partners_ledger.mako:114
297#: report:addons/account_financial_report_webkit/report/templates/account_report_profit_loss.mako:111
298#: report:addons/account_financial_report_webkit/report/templates/account_report_trial_balance.mako:126
299msgid "Debit"
300msgstr "Debet"
301
302#. module: account_financial_report_webkit
303#: view:general.ledger.webkit:0
304#: view:open.invoices.webkit:0
305#: view:partner.balance.webkit:0
306#: view:partners.ledger.webkit:0
307#: view:trial.balance.webkit:0
308msgid "Time Filters"
309msgstr "Tijdsfilters"
310
311#. module: account_financial_report_webkit
312#: report:addons/account_financial_report_webkit/report/templates/account_report_open_invoices.mako:188
313#: report:addons/account_financial_report_webkit/report/templates/account_report_partners_ledger.mako:219
314msgid "Cumulated Balance on Partner"
315msgstr "Cumulatief saldo"
316
317#. module: account_financial_report_webkit
318#: model:ir.actions.act_window,name:account_financial_report_webkit.action_account_partner_balance_menu_webkit
319#: model:ir.actions.report.xml,name:account_financial_report_webkit.account_report_partner_balance_webkit
320msgid "Partner Balance Webkit"
321msgstr "Partner balans"
322
323#. module: account_financial_report_webkit
324#: report:addons/account_financial_report_webkit/report/templates/account_report_open_invoices.mako:40
325msgid "Clearance Date"
326msgstr "Datum afrekening"
327
328#. module: account_financial_report_webkit
329#: selection:general.ledger.webkit,display_account:0
330#: code:addons/account_financial_report_webkit/report/common_reports.py:62
331#, python-format
332msgid "With transactions or non zero balance"
333msgstr "Met transacties of saldo verschillend van nul"
334
335#. module: account_financial_report_webkit
336#: selection:account.common.balance.report,display_account:0
337#: selection:partner.balance.webkit,display_account:0
338#: selection:trial.balance.webkit,display_account:0
339msgid "With balance is not equal to 0"
340msgstr "Met saldo verschillend van 0"
341
342#. module: account_financial_report_webkit
343#: report:addons/account_financial_report_webkit/report/templates/account_report_partner_balance.mako:94
344#: report:addons/account_financial_report_webkit/report/templates/account_report_trial_balance.mako:104
345msgid "Fiscal Year :"
346msgstr "Boekjaar :"
347
348#. module: account_financial_report_webkit
349#: report:addons/account_financial_report_webkit/report/templates/account_report_profit_loss.mako:43
350#: code:addons/account_financial_report_webkit/wizard/balance_common.py:163
351#, python-format
352msgid "Dates"
353msgstr "Datums"
354
355#. module: account_financial_report_webkit
356#: report:addons/account_financial_report_webkit/report/templates/account_report_partner_balance.mako:136
357msgid "Code / Ref"
358msgstr "Code / Réf."
359
360#. module: account_financial_report_webkit
361#: view:trial.balance.webkit:0
362#: code:addons/account_financial_report_webkit/report/trial_balance.py:49
363#, python-format
364msgid "Trial Balance"
365msgstr "Proefbalans"
366
367#. module: account_financial_report_webkit
368#: report:addons/account_financial_report_webkit/report/templates/account_report_profit_loss.mako:87
369msgid "Dates : "
370msgstr "Datums : "
371
372#. module: account_financial_report_webkit
373#: report:addons/account_financial_report_webkit/report/templates/account_report_general_ledger.mako:36
374#: report:addons/account_financial_report_webkit/report/templates/account_report_open_invoices.mako:41
375#: report:addons/account_financial_report_webkit/report/templates/account_report_partner_balance.mako:49
376#: report:addons/account_financial_report_webkit/report/templates/account_report_partners_ledger.mako:37
377#: report:addons/account_financial_report_webkit/report/templates/account_report_trial_balance.mako:61
378msgid "Accounts Filter"
379msgstr "Filter - rekeningen"
380
381#. module: account_financial_report_webkit
382#: field:account.common.balance.report,chart_account_id:0
383#: field:general.ledger.webkit,chart_account_id:0
384#: field:open.invoices.webkit,chart_account_id:0
385#: field:partner.balance.webkit,chart_account_id:0
386#: field:partners.ledger.webkit,chart_account_id:0
387#: field:trial.balance.webkit,chart_account_id:0
388msgid "Chart of account"
389msgstr "Grootboekschema"
390
391#. module: account_financial_report_webkit
392#: report:addons/account_financial_report_webkit/report/templates/account_report_partner_balance.mako:90
393#: report:addons/account_financial_report_webkit/report/templates/account_report_trial_balance.mako:100
394msgid "Dates Filter:"
395msgstr "Datum Filter:"
396
397#. module: account_financial_report_webkit
398#: report:addons/account_financial_report_webkit/report/templates/account_report_profit_loss.mako:91
399msgid "Fiscal Year : "
400msgstr "Boekjaar : "
401
402#. module: account_financial_report_webkit
403#: selection:account.common.balance.report,display_account:0
404#: selection:partner.balance.webkit,display_account:0
405#: selection:trial.balance.webkit,display_account:0
406msgid "With movements"
407msgstr "Met transacties"
408
409#. module: account_financial_report_webkit
410#: report:addons/account_financial_report_webkit/report/templates/account_report_general_ledger.mako:109
411#: report:addons/account_financial_report_webkit/report/templates/account_report_open_invoices.mako:124
412#: report:addons/account_financial_report_webkit/report/templates/account_report_partners_ledger.mako:118
413msgid "Cumul. Bal."
414msgstr "Cumul. Saldo"
415
416#. module: account_financial_report_webkit
417#: report:addons/account_financial_report_webkit/report/templates/account_report_general_ledger.mako:22
418#: report:addons/account_financial_report_webkit/report/templates/account_report_partner_balance.mako:35
419#: report:addons/account_financial_report_webkit/report/templates/account_report_partners_ledger.mako:23
420#: report:addons/account_financial_report_webkit/report/templates/account_report_trial_balance.mako:47
421msgid "Computed"
422msgstr "Berekend"
423
424#. module: account_financial_report_webkit
425#: code:addons/account_financial_report_webkit/report/general_ledger.py:64
426#: code:addons/account_financial_report_webkit/report/open_invoices.py:63
427#: code:addons/account_financial_report_webkit/report/partner_balance.py:63
428#: code:addons/account_financial_report_webkit/report/partners_ledger.py:64
429#: code:addons/account_financial_report_webkit/report/profit_loss.py:71
430#: code:addons/account_financial_report_webkit/report/trial_balance.py:64
431#: code:addons/account_financial_report_webkit/report/webkit_parser_header_fix.py:67
432#, python-format
433msgid "of"
434msgstr "van"
435
436#. module: account_financial_report_webkit
437#: selection:open.invoices.webkit,result_selection:0
438#: selection:partner.balance.webkit,result_selection:0
439#: selection:partners.ledger.webkit,result_selection:0
440#: code:addons/account_financial_report_webkit/report/common_reports.py:71
441#, python-format
442msgid "Payable Accounts"
443msgstr "Rekeningen Leveranciers"
444
445#. module: account_financial_report_webkit
446#: code:addons/account_financial_report_webkit/report/open_invoices.py:48
447#: model:ir.actions.report.xml,name:account_financial_report_webkit.account_report_open_invoices_webkit
448#: model:ir.model,name:account_financial_report_webkit.model_account_report_open_invoices_webkit
449#, python-format
450msgid "Open Invoices Report"
451msgstr "Open facturen"
452
453#. module: account_financial_report_webkit
454#: field:account.account,centralized:0
455msgid "Centralized"
456msgstr "Gecentraliseerd"
457
458#. module: account_financial_report_webkit
459#: field:account.common.balance.report,date_from:0
460#: field:general.ledger.webkit,date_from:0
461#: field:open.invoices.webkit,date_from:0
462#: field:partner.balance.webkit,date_from:0
463#: field:partners.ledger.webkit,date_from:0
464#: field:trial.balance.webkit,date_from:0
465msgid "Start Date"
466msgstr "Startdatum"
467
468#. module: account_financial_report_webkit
469#: report:addons/account_financial_report_webkit/report/templates/account_report_general_ledger.mako:22
470#: report:addons/account_financial_report_webkit/report/templates/account_report_partner_balance.mako:35
471#: report:addons/account_financial_report_webkit/report/templates/account_report_partners_ledger.mako:23
472#: report:addons/account_financial_report_webkit/report/templates/account_report_trial_balance.mako:47
473msgid "Opening Entries"
474msgstr "Openingsboekingen"
475
476#. module: account_financial_report_webkit
477#: code:addons/account_financial_report_webkit/report/general_ledger.py:40
478#, python-format
479msgid "GENERAL LEDGER"
480msgstr "GROOTBOEK"
481
482#. module: account_financial_report_webkit
483#: report:addons/account_financial_report_webkit/report/templates/account_report_general_ledger.mako:22
484#: report:addons/account_financial_report_webkit/report/templates/account_report_partner_balance.mako:35
485#: report:addons/account_financial_report_webkit/report/templates/account_report_partners_ledger.mako:23
486#: report:addons/account_financial_report_webkit/report/templates/account_report_profit_loss.mako:77
487#: report:addons/account_financial_report_webkit/report/templates/account_report_profit_loss.mako:94
488#: report:addons/account_financial_report_webkit/report/templates/account_report_trial_balance.mako:47
489msgid "No"
490msgstr "Niet"
491
492#. module: account_financial_report_webkit
493#: report:addons/account_financial_report_webkit/report/templates/account_report_partner_balance.mako:97
494#: report:addons/account_financial_report_webkit/report/templates/account_report_profit_loss.mako:94
495#: report:addons/account_financial_report_webkit/report/templates/account_report_trial_balance.mako:107
496msgid "Initial Balance:"
497msgstr "Beginbalans:"
498
499#. module: account_financial_report_webkit
500#: report:addons/account_financial_report_webkit/report/templates/account_report_partner_balance.mako:163
501#: report:addons/account_financial_report_webkit/report/templates/account_report_profit_loss.mako:129
502#: report:addons/account_financial_report_webkit/report/templates/account_report_trial_balance.mako:144
503msgid "Balance C%s"
504msgstr "Saldo C%s"
505
506#. module: account_financial_report_webkit
507#: field:open.invoices.webkit,partner_ids:0
508#: field:partner.balance.webkit,partner_ids:0
509#: field:partners.ledger.webkit,partner_ids:0
510msgid "Filter on partner"
511msgstr "Filter - partners"
512
513#. module: account_financial_report_webkit
514#: view:general.ledger.webkit:0
515#: code:addons/account_financial_report_webkit/report/general_ledger.py:47
516#, python-format
517msgid "General Ledger"
518msgstr "Grootboek"
519
520#. module: account_financial_report_webkit
521#: report:addons/account_financial_report_webkit/report/templates/account_report_profit_loss.mako:89
522msgid "Periods : "
523msgstr "Periodes : "
524
525#. module: account_financial_report_webkit
526#: code:addons/account_financial_report_webkit/report/partner_balance.py:40
527#, python-format
528msgid "PARTNER BALANCE"
529msgstr "PARTNER BALANS"
530
531#. module: account_financial_report_webkit
532#: selection:account.common.balance.report,filter:0
533#: selection:general.ledger.webkit,filter:0
534#: selection:open.invoices.webkit,filter:0
535#: selection:partner.balance.webkit,filter:0
536#: selection:partners.ledger.webkit,filter:0
537#: selection:trial.balance.webkit,filter:0
538#: report:addons/account_financial_report_webkit/report/templates/account_report_general_ledger.mako:91
539#: report:addons/account_financial_report_webkit/report/templates/account_report_open_invoices.mako:104
540#: report:addons/account_financial_report_webkit/report/templates/account_report_partners_ledger.mako:100
541msgid "Date"
542msgstr "Datum"
543
544#. module: account_financial_report_webkit
545#: report:addons/account_financial_report_webkit/report/templates/account_report_general_ledger.mako:50
546#: report:addons/account_financial_report_webkit/report/templates/account_report_open_invoices.mako:55
547#: report:addons/account_financial_report_webkit/report/templates/account_report_partner_balance.mako:64
548#: report:addons/account_financial_report_webkit/report/templates/account_report_partners_ledger.mako:51
549#: report:addons/account_financial_report_webkit/report/templates/account_report_profit_loss.mako:62
550#: report:addons/account_financial_report_webkit/report/templates/account_report_trial_balance.mako:75
551msgid "To:"
552msgstr "Tot:"
553
554#. module: account_financial_report_webkit
555#: view:open.invoices.webkit:0
556#: model:ir.actions.act_window,name:account_financial_report_webkit.action_account_open_invoices_menu_webkit
557msgid "Open Invoices"
558msgstr "Open Facturen"
559
560#. module: account_financial_report_webkit
561#: report:addons/account_financial_report_webkit/report/templates/account_report_partner_balance.mako:87
562#: report:addons/account_financial_report_webkit/report/templates/account_report_profit_loss.mako:84
563#: report:addons/account_financial_report_webkit/report/templates/account_report_trial_balance.mako:97
564#: code:addons/account_financial_report_webkit/wizard/balance_common.py:156
565#, python-format
566msgid "Comparison %s"
567msgstr "Vergelijking %s"
568
569#. module: account_financial_report_webkit
570#: selection:account.common.balance.report,display_account:0
571#: selection:general.ledger.webkit,display_account:0
572#: selection:partner.balance.webkit,display_account:0
573#: selection:trial.balance.webkit,display_account:0
574#: report:addons/account_financial_report_webkit/report/templates/account_report_general_ledger.mako:61
575#: report:addons/account_financial_report_webkit/report/templates/account_report_partner_balance.mako:75
576#: report:addons/account_financial_report_webkit/report/templates/account_report_profit_loss.mako:73
577#: report:addons/account_financial_report_webkit/report/templates/account_report_trial_balance.mako:86
578msgid "All"
579msgstr "Alle"
580
581#. module: account_financial_report_webkit
582#: report:addons/account_financial_report_webkit/report/templates/account_report_general_ledger.mako:107
583#: report:addons/account_financial_report_webkit/report/templates/account_report_open_invoices.mako:122
584#: report:addons/account_financial_report_webkit/report/templates/account_report_partner_balance.mako:147
585#: report:addons/account_financial_report_webkit/report/templates/account_report_partners_ledger.mako:116
586#: report:addons/account_financial_report_webkit/report/templates/account_report_profit_loss.mako:113
587#: report:addons/account_financial_report_webkit/report/templates/account_report_trial_balance.mako:128
588msgid "Credit"
589msgstr "Credit"
590
591#. module: account_financial_report_webkit
592#: selection:account.common.balance.report,filter:0
593#: selection:general.ledger.webkit,filter:0
594#: selection:open.invoices.webkit,filter:0
595#: selection:partner.balance.webkit,filter:0
596#: selection:partners.ledger.webkit,filter:0
597#: selection:trial.balance.webkit,filter:0
598msgid "No Filters"
599msgstr "Geen filters"
600
601#. module: account_financial_report_webkit
602#: code:addons/account_financial_report_webkit/report/open_invoices.py:102
603#: code:addons/account_financial_report_webkit/report/partners_ledger.py:102
604#, python-format
605msgid "Error"
606msgstr "Fout"
607
608#. module: account_financial_report_webkit
609#: report:addons/account_financial_report_webkit/report/templates/account_report_partner_balance.mako:152
610#: report:addons/account_financial_report_webkit/report/templates/account_report_profit_loss.mako:118
611#: report:addons/account_financial_report_webkit/report/templates/account_report_trial_balance.mako:133
612msgid "Balance"
613msgstr "Saldo"
614
615#. module: account_financial_report_webkit
616#: report:addons/account_financial_report_webkit/report/templates/account_report_general_ledger.mako:103
617msgid "Counter part"
618msgstr "Tegenhanger"
619
620#. module: account_financial_report_webkit
621#: report:addons/account_financial_report_webkit/report/templates/account_report_partner_balance.mako:168
622#: report:addons/account_financial_report_webkit/report/templates/account_report_profit_loss.mako:134
623#: report:addons/account_financial_report_webkit/report/templates/account_report_trial_balance.mako:149
624msgid "% Difference"
625msgstr "% Verschil"
626
627#. module: account_financial_report_webkit
628#: view:partner.balance.webkit:0
629#: code:addons/account_financial_report_webkit/report/partner_balance.py:47
630#, python-format
631msgid "Partner Balance"
632msgstr "Partner Balans"
633
634#. module: account_financial_report_webkit
635#: code:addons/account_financial_report_webkit/report/general_ledger.py:146
636#, python-format
637msgid "Centralized Entries"
638msgstr "Gecentraliseerde boekingen"
639
640#. module: account_financial_report_webkit
641#: view:general.ledger.webkit:0
642#: view:partner.balance.webkit:0
643#: view:trial.balance.webkit:0
644msgid "Accounts Filters"
645msgstr "Filter - rekeningen"
646
647#. module: account_financial_report_webkit
648#: report:addons/account_financial_report_webkit/report/templates/account_report_general_ledger.mako:31
649#: report:addons/account_financial_report_webkit/report/templates/account_report_open_invoices.mako:35
650#: report:addons/account_financial_report_webkit/report/templates/account_report_partner_balance.mako:44
651#: report:addons/account_financial_report_webkit/report/templates/account_report_partners_ledger.mako:32
652#: report:addons/account_financial_report_webkit/report/templates/account_report_trial_balance.mako:56
653msgid "Dates Filter"
654msgstr "Filter - datums"
655
656
657#. module: account_financial_report_webkit
658#: field:account.common.balance.report,fiscalyear_id:0
659#: field:general.ledger.webkit,fiscalyear_id:0
660#: field:open.invoices.webkit,fiscalyear_id:0
661#: field:partner.balance.webkit,fiscalyear_id:0
662#: field:partners.ledger.webkit,fiscalyear_id:0
663#: field:trial.balance.webkit,fiscalyear_id:0
664msgid "Fiscal year"
665msgstr "Boekjaar"
666
667#. module: account_financial_report_webkit
668#: selection:account.common.balance.report,filter:0
669#: selection:general.ledger.webkit,filter:0
670#: selection:open.invoices.webkit,filter:0
671#: selection:partner.balance.webkit,filter:0
672#: selection:partners.ledger.webkit,filter:0
673#: selection:trial.balance.webkit,filter:0
674#: report:addons/account_financial_report_webkit/report/templates/account_report_profit_loss.mako:45
675#: code:addons/account_financial_report_webkit/wizard/balance_common.py:168
676#, python-format
677msgid "Periods"
678msgstr "Periodes"
679
680#. module: account_financial_report_webkit
681#: report:addons/account_financial_report_webkit/report/templates/account_report_general_ledger.mako:112
682#: report:addons/account_financial_report_webkit/report/templates/account_report_open_invoices.mako:127
683#: report:addons/account_financial_report_webkit/report/templates/account_report_partners_ledger.mako:121
684msgid "Curr. Balance"
685msgstr "Saldo Munt"
686
687#. module: account_financial_report_webkit
688#: model:ir.model,name:account_financial_report_webkit.model_account_move_line
689msgid "Journal Items"
690msgstr "Dagboekregels"
691
692#. module: account_financial_report_webkit
693#: code:addons/account_financial_report_webkit/report/common_reports.py:60
694#, python-format
695msgid "All accounts"
696msgstr "Alle rekeningen"
697
698#. module: account_financial_report_webkit
699#: report:addons/account_financial_report_webkit/report/templates/account_report_general_ledger.mako:93
700#: report:addons/account_financial_report_webkit/report/templates/account_report_open_invoices.mako:106
701#: report:addons/account_financial_report_webkit/report/templates/account_report_partners_ledger.mako:102
702msgid "Period"
703msgstr "Periode"
704
705#. module: account_financial_report_webkit
706#: code:addons/account_financial_report_webkit/report/common_reports.py:424
707#, python-format
708msgid "No valid filter"
709msgstr "Ongeldige filter"
710
711#. module: account_financial_report_webkit
712#: model:ir.ui.menu,name:account_financial_report_webkit.menu_account_open_invoices
713msgid "Open Invoices"
714msgstr "Open facturen"
715
716#. module: account_financial_report_webkit
717#: selection:account.common.balance.report,filter:0
718#: selection:partner.balance.webkit,filter:0
719#: selection:trial.balance.webkit,filter:0
720msgid "Opening Only"
721msgstr "Beginbalans"
722
723#. module: account_financial_report_webkit
724#: report:addons/account_financial_report_webkit/report/templates/account_report_general_ledger.mako:97
725#: report:addons/account_financial_report_webkit/report/templates/account_report_open_invoices.mako:110
726#: report:addons/account_financial_report_webkit/report/templates/account_report_partners_ledger.mako:106
727msgid "Journal"
728msgstr "Dagboek"
729
730#. module: account_financial_report_webkit
731#: field:general.ledger.webkit,amount_currency:0
732#: field:open.invoices.webkit,amount_currency:0
733#: field:partners.ledger.webkit,amount_currency:0
734msgid "With Currency"
735msgstr "Met secundaire munteenheid"
736
737#. module: account_financial_report_webkit
738#: code:addons/account_financial_report_webkit/report/profit_loss.py:42
739#, python-format
740msgid "PROFIT AND LOSS"
741msgstr "RESULTATENREKENING"
742
743#. module: account_financial_report_webkit
744#: report:addons/account_financial_report_webkit/report/templates/account_report_general_ledger.mako:27
745#: report:addons/account_financial_report_webkit/report/templates/account_report_open_invoices.mako:31
746#: report:addons/account_financial_report_webkit/report/templates/account_report_partner_balance.mako:40
747#: report:addons/account_financial_report_webkit/report/templates/account_report_partners_ledger.mako:28
748#: report:addons/account_financial_report_webkit/report/templates/account_report_profit_loss.mako:39
749#: report:addons/account_financial_report_webkit/report/templates/account_report_trial_balance.mako:52
750msgid "Chart of Account"
751msgstr "Grootboekschema"
752
753#. module: account_financial_report_webkit
754#: report:addons/account_financial_report_webkit/report/templates/account_report_partner_balance.mako:167
755#: report:addons/account_financial_report_webkit/report/templates/account_report_profit_loss.mako:133
756#: report:addons/account_financial_report_webkit/report/templates/account_report_trial_balance.mako:148
757msgid "Difference"
758msgstr "Verschil"
759
760#. module: account_financial_report_webkit
761#: field:account.common.balance.report,target_move:0
762#: field:general.ledger.webkit,target_move:0
763#: field:open.invoices.webkit,target_move:0
764#: field:partner.balance.webkit,target_move:0
765#: field:partners.ledger.webkit,target_move:0
766#: field:trial.balance.webkit,target_move:0
767#: report:addons/account_financial_report_webkit/report/templates/account_report_general_ledger.mako:37
768#: report:addons/account_financial_report_webkit/report/templates/account_report_open_invoices.mako:42
769#: report:addons/account_financial_report_webkit/report/templates/account_report_partner_balance.mako:51
770#: report:addons/account_financial_report_webkit/report/templates/account_report_partners_ledger.mako:38
771#: report:addons/account_financial_report_webkit/report/templates/account_report_profit_loss.mako:49
772#: report:addons/account_financial_report_webkit/report/templates/account_report_trial_balance.mako:62
773msgid "Target Moves"
774msgstr "Gekozen boekingen"
775
776#. module: account_financial_report_webkit
777#: report:addons/account_financial_report_webkit/report/templates/account_report_general_ledger.mako:44
778#: report:addons/account_financial_report_webkit/report/templates/account_report_open_invoices.mako:49
779#: report:addons/account_financial_report_webkit/report/templates/account_report_partner_balance.mako:58
780#: report:addons/account_financial_report_webkit/report/templates/account_report_partners_ledger.mako:45
781#: report:addons/account_financial_report_webkit/report/templates/account_report_profit_loss.mako:56
782#: report:addons/account_financial_report_webkit/report/templates/account_report_trial_balance.mako:69
783msgid "From:"
784msgstr "Van:"
785
786#. module: account_financial_report_webkit
787#: field:account.common.balance.report,date_to:0
788#: field:general.ledger.webkit,date_to:0
789#: field:open.invoices.webkit,date_to:0
790#: field:partner.balance.webkit,date_to:0
791#: field:partners.ledger.webkit,date_to:0
792#: field:trial.balance.webkit,date_to:0
793msgid "End Date"
794msgstr "Einddatum"
795
796#. module: account_financial_report_webkit
797#: field:open.invoices.webkit,until_date:0
798msgid "Clearance date"
799msgstr "Datum afrekening"
800
801#. module: account_financial_report_webkit
802#: model:ir.model,name:account_financial_report_webkit.model_account_report_partners_ledger_webkit
803msgid "Partner Ledger Report"
804msgstr "Partner boekeningen"
805
806#. module: account_financial_report_webkit
807#: view:open.invoices.webkit:0
808#: view:partner.balance.webkit:0
809#: view:partners.ledger.webkit:0
810msgid "Partners Filters"
811msgstr "Filter Partners"
812
813#. module: account_financial_report_webkit
814#: report:addons/account_financial_report_webkit/report/templates/account_report_general_ledger.mako:28
815#: report:addons/account_financial_report_webkit/report/templates/account_report_open_invoices.mako:32
816#: report:addons/account_financial_report_webkit/report/templates/account_report_partner_balance.mako:41
817#: report:addons/account_financial_report_webkit/report/templates/account_report_partners_ledger.mako:29
818#: report:addons/account_financial_report_webkit/report/templates/account_report_profit_loss.mako:40
819#: report:addons/account_financial_report_webkit/report/templates/account_report_trial_balance.mako:53
820msgid "Fiscal Year"
821msgstr "Boekjaar"
822
823#. module: account_financial_report_webkit
824#: report:addons/account_financial_report_webkit/report/templates/account_report_profit_loss.mako:77
825#: report:addons/account_financial_report_webkit/report/templates/account_report_profit_loss.mako:94
826msgid "Yes"
827msgstr "Ja"
828
829#. module: account_financial_report_webkit
830#: report:addons/account_financial_report_webkit/report/templates/account_report_general_ledger.mako:95
831#: report:addons/account_financial_report_webkit/report/templates/account_report_open_invoices.mako:108
832#: report:addons/account_financial_report_webkit/report/templates/account_report_partners_ledger.mako:104
833msgid "Entry"
834msgstr "Boeking"
835
836#. module: account_financial_report_webkit
837#: code:addons/account_financial_report_webkit/report/general_ledger.py:64
838#: code:addons/account_financial_report_webkit/report/open_invoices.py:63
839#: code:addons/account_financial_report_webkit/report/partner_balance.py:63
840#: code:addons/account_financial_report_webkit/report/partners_ledger.py:64
841#: code:addons/account_financial_report_webkit/report/profit_loss.py:71
842#: code:addons/account_financial_report_webkit/report/trial_balance.py:64
843#: code:addons/account_financial_report_webkit/report/webkit_parser_header_fix.py:67
844#, python-format
845msgid "Page"
846msgstr "Pag."
847
848#. module: account_financial_report_webkit
849#: report:addons/account_financial_report_webkit/report/templates/account_report_partner_balance.mako:50
850msgid "Partners Filter"
851msgstr "Partner filter"
852
853#. module: account_financial_report_webkit
854#: code:addons/account_financial_report_webkit/report/profit_loss.py:49
855#, python-format
856msgid "Profit and Loss"
857msgstr "Winst en Verlies"
858
859#. module: account_financial_report_webkit
860#: report:addons/account_financial_report_webkit/report/templates/account_report_open_invoices.mako:99
861#: report:addons/account_financial_report_webkit/report/templates/account_report_partners_ledger.mako:95
862msgid "No Partner"
863msgstr "Geen partner"
864
865#. module: account_financial_report_webkit
866#: code:addons/account_financial_report_webkit/report/open_invoices.py:41
867#, python-format
868msgid "OPEN INVOICES REPORT"
869msgstr "OPEN FACTUREN"
870
871#. module: account_financial_report_webkit
872#: code:addons/account_financial_report_webkit/report/partners_ledger.py:41
873#: code:addons/account_financial_report_webkit/report/webkit_parser_header_fix.py:57
874#, python-format
875msgid "PARTNER LEDGER"
876msgstr "PARTNER GROOTBOEK"
877
0878
=== modified file 'account_financial_report_webkit/images/ledger.png' (properties changed: -x to +x)
=== modified file 'account_financial_report_webkit/report/__init__.py' (properties changed: -x to +x)
=== modified file 'account_financial_report_webkit/report/common_balance_reports.py' (properties changed: -x to +x)
=== modified file 'account_financial_report_webkit/report/common_partner_balance_reports.py' (properties changed: -x to +x)
=== modified file 'account_financial_report_webkit/report/common_partner_reports.py' (properties changed: -x to +x)
--- account_financial_report_webkit/report/common_partner_reports.py 2012-12-11 16:32:26 +0000
+++ account_financial_report_webkit/report/common_partner_reports.py 2013-07-01 16:07:28 +0000
@@ -64,6 +64,12 @@
6464
65 :return: browse record of the first special period.65 :return: browse record of the first special period.
66 """66 """
67 # FIX by Noviat : first special period is first opening period
68 # You can have years without opening period, e.g. OpenERP systems used initially for non-accounting purposes
69 period_obj = self.pool.get('account.period')
70 first_special_period_id = period_obj.search(self.cr, self.uid, [('special', '=', True)], order='date_start ASC', limit=1)
71 return first_special_period_id and period_obj.browse(self.cr, self.uid, first_special_period_id[0]) or None
72 """
67 move_line_obj = self.pool.get('account.move.line')73 move_line_obj = self.pool.get('account.move.line')
68 first_entry_id = move_line_obj.search(74 first_entry_id = move_line_obj.search(
69 self.cr, self.uid, [], order='date ASC', limit=1)75 self.cr, self.uid, [], order='date ASC', limit=1)
@@ -79,7 +85,8 @@
79 return85 return
80 return min(special_periods,86 return min(special_periods,
81 key=lambda p: datetime.strptime(p.date_start, DEFAULT_SERVER_DATE_FORMAT))87 key=lambda p: datetime.strptime(p.date_start, DEFAULT_SERVER_DATE_FORMAT))
8288 """
89
83 def _get_period_range_from_start_period(self, start_period, include_opening=False,90 def _get_period_range_from_start_period(self, start_period, include_opening=False,
84 fiscalyear=False,91 fiscalyear=False,
85 stop_at_previous_opening=False):92 stop_at_previous_opening=False):
8693
=== modified file 'account_financial_report_webkit/report/common_reports.py' (properties changed: -x to +x)
--- account_financial_report_webkit/report/common_reports.py 2012-12-11 16:32:26 +0000
+++ account_financial_report_webkit/report/common_reports.py 2013-07-01 16:07:28 +0000
@@ -214,7 +214,16 @@
214214
215 def exclude_opening_periods(self, period_ids):215 def exclude_opening_periods(self, period_ids):
216 period_obj = self.pool.get('account.period')216 period_obj = self.pool.get('account.period')
217 return period_obj.search(self.cr, self.uid, [['special', '=', False], ['id', 'in', period_ids]])217 # FIX by Noviat: close periods should be included
218 self.cr.execute("SELECT p.id " \
219 "FROM account_period p " \
220 "INNER JOIN account_fiscalyear f ON p.fiscalyear_id = f.id " \
221 "WHERE (special = FALSE or (special = TRUE AND p.date_stop = f.date_stop)) " \
222 "AND p.id IN %s", (tuple(period_ids),))
223 period_ids = self.cr.fetchall()
224 period_ids = [x[0] for x in period_ids]
225 #return period_obj.search(self.cr, self.uid, [['special', '=', False], ['id', 'in', period_ids]])
226 return period_ids
218227
219 def get_included_opening_period(self, period):228 def get_included_opening_period(self, period):
220 """Return the opening included in normal period we use the assumption229 """Return the opening included in normal period we use the assumption
221230
=== modified file 'account_financial_report_webkit/report/general_ledger.py' (properties changed: -x to +x)
--- account_financial_report_webkit/report/general_ledger.py 2013-05-08 14:03:48 +0000
+++ account_financial_report_webkit/report/general_ledger.py 2013-07-01 16:07:28 +0000
@@ -207,7 +207,28 @@
207 line['counterparts'] = counter_parts.get(line.get('move_id'), '')207 line['counterparts'] = counter_parts.get(line.get('move_id'), '')
208 return res208 return res
209209
210210 def _get_move_ids_from_periods(self, account_id, period_start, period_stop, target_move):
211 """
212 Change by Noviat: override this methods since we want to include the opening entries in the general ledger
213 """
214 move_line_obj = self.pool.get('account.move.line')
215 period_obj = self.pool.get('account.period')
216 periods = period_obj.build_ctx_periods(self.cursor, self.uid, period_start.id, period_stop.id)
217
218 #>>> change Noviat
219 special = period_obj.search(self.cursor, self.uid, [('date_start', '>=', period_start.date_start), ('date_stop', '<=', period_stop.date_stop),
220 ('company_id', '=', period_start.company_id.id), ('special', '=', True)])
221 periods += special
222 #<<< change Noviat
223
224 if not periods:
225 return []
226
227 search = [('period_id', 'in', periods), ('account_id', '=', account_id)]
228 if target_move == 'posted':
229 search += [('move_id.state', '=', 'posted')]
230 return move_line_obj.search(self.cursor, self.uid, search)
231
211HeaderFooterTextWebKitParser('report.account.account_report_general_ledger_webkit',232HeaderFooterTextWebKitParser('report.account.account_report_general_ledger_webkit',
212 'account.account',233 'account.account',
213 'addons/account_financial_report_webkit/report/templates/account_report_general_ledger.mako',234 'addons/account_financial_report_webkit/report/templates/account_report_general_ledger.mako',
214235
=== modified file 'account_financial_report_webkit/report/open_invoices.py' (properties changed: -x to +x)
=== modified file 'account_financial_report_webkit/report/partner_balance.py' (properties changed: -x to +x)
=== modified file 'account_financial_report_webkit/report/partners_ledger.py' (properties changed: -x to +x)
=== modified file 'account_financial_report_webkit/report/report.xml' (properties changed: -x to +x)
=== modified file 'account_financial_report_webkit/report/templates/account_report_general_ledger.mako' (properties changed: -x to +x)
=== modified file 'account_financial_report_webkit/report/templates/account_report_open_invoices.mako' (properties changed: -x to +x)
=== modified file 'account_financial_report_webkit/report/templates/account_report_partner_balance.mako' (properties changed: -x to +x)
=== modified file 'account_financial_report_webkit/report/templates/account_report_partners_ledger.mako' (properties changed: -x to +x)
=== modified file 'account_financial_report_webkit/report/templates/account_report_profit_loss.mako' (properties changed: -x to +x)
=== modified file 'account_financial_report_webkit/report/templates/account_report_trial_balance.mako' (properties changed: -x to +x)
=== modified file 'account_financial_report_webkit/report/templates/grouped_by_curr_open_invoices_inclusion.mako.html' (properties changed: -x to +x)
=== modified file 'account_financial_report_webkit/report/templates/open_invoices_inclusion.mako.html' (properties changed: -x to +x)
=== modified file 'account_financial_report_webkit/report/trial_balance.py' (properties changed: -x to +x)
=== modified file 'account_financial_report_webkit/report/webkit_parser_header_fix.py' (properties changed: -x to +x)
=== modified file 'account_financial_report_webkit/report_menus.xml' (properties changed: -x to +x)
=== modified file 'account_financial_report_webkit/static/src/img/icon.png' (properties changed: -x to +x)
=== modified file 'account_financial_report_webkit/tests/account_move_line.yml' (properties changed: -x to +x)
=== modified file 'account_financial_report_webkit/tests/general_ledger.yml' (properties changed: -x to +x)
=== modified file 'account_financial_report_webkit/tests/open_invoices.yml' (properties changed: -x to +x)
=== modified file 'account_financial_report_webkit/tests/partner_balance.yml' (properties changed: -x to +x)
=== modified file 'account_financial_report_webkit/tests/partner_ledger.yml' (properties changed: -x to +x)
=== modified file 'account_financial_report_webkit/tests/trial_balance.yml' (properties changed: -x to +x)
=== modified file 'account_financial_report_webkit/wizard/__init__.py' (properties changed: -x to +x)
=== modified file 'account_financial_report_webkit/wizard/balance_common.py' (properties changed: -x to +x)
=== modified file 'account_financial_report_webkit/wizard/balance_common_view.xml' (properties changed: -x to +x)
=== modified file 'account_financial_report_webkit/wizard/general_ledger_wizard.py' (properties changed: -x to +x)
=== modified file 'account_financial_report_webkit/wizard/general_ledger_wizard_view.xml' (properties changed: -x to +x)
=== modified file 'account_financial_report_webkit/wizard/open_invoices_wizard.py' (properties changed: -x to +x)
=== modified file 'account_financial_report_webkit/wizard/open_invoices_wizard_view.xml' (properties changed: -x to +x)
=== modified file 'account_financial_report_webkit/wizard/partner_balance_wizard.py' (properties changed: -x to +x)
=== modified file 'account_financial_report_webkit/wizard/partner_balance_wizard_view.xml' (properties changed: -x to +x)
=== modified file 'account_financial_report_webkit/wizard/partners_ledger_wizard.py' (properties changed: -x to +x)
=== modified file 'account_financial_report_webkit/wizard/partners_ledger_wizard_view.xml' (properties changed: -x to +x)
=== modified file 'account_financial_report_webkit/wizard/trial_balance_wizard.py' (properties changed: -x to +x)
=== modified file 'account_financial_report_webkit/wizard/trial_balance_wizard_view.xml' (properties changed: -x to +x)
=== modified file 'account_financial_report_webkit/wizard/wizard.xml' (properties changed: -x to +x)