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) on 2013-07-01
Status: Rejected
Rejected by: Nhomar - Vauxoo on 2013-11-05
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 on 2013-11-05
Maxime Chambreuil (http://www.savoirfairelinux.com) Disapprove on 2013-11-03
Guewen Baconnier @ Camptocamp Resubmit on 2013-07-02
Yannick Vaucher @ Camptocamp 2013-07-01 Resubmit on 2013-07-02
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.

Please don't change executable property of files

review: Needs Fixing (file rights)

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: 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

review: Resubmit
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.

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

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.

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

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
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.

Thanks for the split

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> on 2013-05-13

a couple of fixes

Preview Diff

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