Unifield Addons

Merge lp:~unifield-team/unifield-addons/uf-1714 into lp:unifield-addons

  1. uf-1714
  2. Merge into trunk
Proposed by jftempo
Status: Merged
Merged at revision: 4607
Proposed branch: lp:~unifield-team/unifield-addons/uf-1714
Merge into: lp:unifield-addons
Diff against target: 1912 lines (+769/-648)
7 files modified
account/account_report.xml (+11/-1)
account/report/account_general_ledger.py (+202/-10)
account/report/account_general_ledger.rml (+47/-254)
account/report/account_general_ledger_landscape.rml (+147/-375)
account/report/account_general_ledger_xls.mako (+279/-0)
account/wizard/account_report_general_ledger.py (+52/-4)
account/wizard/account_report_general_ledger_view.xml (+31/-4)
To merge this branch: bzr merge lp:~unifield-team/unifield-addons/uf-1714
Reviewer Review Type Date Requested Status
UniField Dev Team Pending
Review via email: mp+195731@code.launchpad.net
To post a comment you must log in.
lp:~unifield-team/unifield-addons/uf-1714 updated
4619. By Vincent GREINER

UF-1714 general ledger report view xml update

4620. By Vincent GREINER

UF-1714-addons merge unifield-addons and proprietary instances in report header

4621. By Vincent GREINER

UF-1714-addons xls header 'All journals' if all journal selected vs codes like in UF-1715

4622. By Vincent GREINER

UF-1714-addons not displaying 8* 9* account then deduced 8 and 9 amount to MSF root account

4623. By Vincent GREINER

UF-1714-addons report mako xls layout review

4624. By Vincent GREINER

UF-1714-addons set intance_ids filter in context for account._compute (for accounts of type 'view' debit/credit/balance calculation), fixing missing account 9* excluding

4625. By Vincent GREINER

UF-1714 [FIX] reducing journal info cols for debit/credit/balance OK with large amounts

4626. By Vincent GREINER

UF-1714-addons [IMP] mako xls header title and footer page count

4627. By Vincent GREINER

UF-1714-addons [FIX] report mako - remove auto filter cells in worksheet, fixing counterpart cell format: numeric

4628. By Vincent GREINER

UF-1714 hidding output currency criteria

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'account/account_report.xml'
2--- account/account_report.xml 2013-11-28 20:42:44 +0000
3+++ account/account_report.xml 2013-12-20 09:30:16 +0000
4@@ -48,6 +48,16 @@
5 rml="account/report/account_balance_landscape.rml"
6 auto="False"
7 menu="False"/>
8-
9+
10+ <!-- UF-1714 -->
11+ <report id="account_general_ledger_xls"
12+ auto="False"
13+ menu="False"
14+ header="False"
15+ model="account.account"
16+ name="account.general.ledger_xls"
17+ file="account/report/account_general_ledger_xls.mako"
18+ report_type="webkit"
19+ string="General Ledger"/>
20 </data>
21 </openerp>
22
23=== modified file 'account/report/account_general_ledger.py'
24--- account/report/account_general_ledger.py 2011-01-14 00:11:01 +0000
25+++ account/report/account_general_ledger.py 2013-12-20 09:30:16 +0000
26@@ -30,6 +30,8 @@
27 import time
28 from report import report_sxw
29 from common_report_header import common_report_header
30+from report_webkit.webkit_report import WebKitParser
31+from spreadsheet_xml.spreadsheet_xml_write import SpreadsheetReport
32
33 class general_ledger(report_sxw.rml_parse, common_report_header):
34 _name = 'report.account.general.ledger'
35@@ -37,6 +39,7 @@
36 def set_context(self, objects, data, ids, report_type=None):
37 new_ids = ids
38 obj_move = self.pool.get('account.move.line')
39+
40 self.sortby = data['form'].get('sortby', 'sort_date')
41 self.query = obj_move._query_get(self.cr, self.uid, obj='l', context=data['form'].get('used_context',{}))
42 ctx2 = data['form'].get('used_context',{}).copy()
43@@ -53,11 +56,60 @@
44 ctx['date_from'] = data['form']['date_from']
45 ctx['date_to'] = data['form']['date_to']
46 ctx['state'] = data['form']['target_move']
47+ if 'instance_ids' in data['form']:
48+ ctx['instance_ids'] = data['form']['instance_ids']
49 self.context.update(ctx)
50 if (data['model'] == 'ir.ui.menu'):
51 new_ids = [data['form']['chart_account_id']]
52- objects = self.pool.get('account.account').browse(self.cr, self.uid, new_ids)
53- return super(general_ledger, self).set_context(objects, data, new_ids, report_type=report_type)
54+ objects = self.pool.get('account.account').browse(self.cr, self.uid, new_ids, context=self.context)
55+
56+ # output currency
57+ self.output_currency_id = data['form']['output_currency']
58+ self.output_currency_code = ''
59+ if self.output_currency_id:
60+ ouput_cur_r = self.pool.get('res.currency').read(self.cr,
61+ self.uid,
62+ [self.output_currency_id],
63+ ['name'])
64+ if ouput_cur_r and ouput_cur_r[0] and ouput_cur_r[0]['name']:
65+ self.output_currency_code = ouput_cur_r[0]['name']
66+
67+ # proprietary instances filter
68+ self.instance_ids = data['form']['instance_ids']
69+ if self.instance_ids:
70+ # we add instance filter in clauses 'self.query/self.init_query'
71+ instance_ids_in = "l.instance_id in(%s)" % (",".join(map(str, self.instance_ids)))
72+ if not self.query:
73+ self.query = instance_ids_in
74+ else:
75+ self.query += ' AND ' + instance_ids_in
76+ if not self.init_query:
77+ self.init_query = instance_ids_in
78+ else:
79+ self.init_query += ' AND ' + instance_ids_in
80+
81+ res = super(general_ledger, self).set_context(objects, data, new_ids, report_type=report_type)
82+
83+ # UF-1714
84+ # accounts 8*, 9* are not displayed:
85+ # we have to deduce debit/credit/balance amounts of MSF account view (root account)
86+ self._deduce_accounts = {
87+ '8': {'debit': 0., 'credit': 0., 'balance': 0. },
88+ '9': {'debit': 0., 'credit': 0., 'balance': 0. },
89+ }
90+ a_obj = self.pool.get('account.account')
91+ for a_code in self._deduce_accounts:
92+ a_ids = a_obj.search(self.cr, self.uid, [('code', '=', a_code)])
93+ if a_ids:
94+ if isinstance(a_ids, (int, long)):
95+ a_ids = [a_ids]
96+ account = a_obj.browse(self.cr, self.uid, a_ids, context=self.context)[0]
97+ if account:
98+ self._deduce_accounts[a_code]['debit'] = self._sum_debit_account(account)
99+ self._deduce_accounts[a_code]['credit'] = self._sum_credit_account(account)
100+ self._deduce_accounts[a_code]['balance'] = self._sum_balance_account(account)
101+
102+ return res
103
104 def __init__(self, cr, uid, name, context=None):
105 if context is None:
106@@ -68,7 +120,7 @@
107 self.period_sql = ""
108 self.sold_accounts = {}
109 self.sortby = 'sort_date'
110- self.localcontext.update( {
111+ self.localcontext.update({
112 'time': time,
113 'lines': self.lines,
114 'sum_debit_account': self._sum_debit_account,
115@@ -86,7 +138,27 @@
116 'get_start_date':self._get_start_date,
117 'get_end_date':self._get_end_date,
118 'get_target_move': self._get_target_move,
119+ 'get_output_currency_code': self._get_output_currency_code,
120+ 'get_filter_info': self._get_filter_info,
121+ 'get_line_debit': self._get_line_debit,
122+ 'get_line_credit': self._get_line_credit,
123+ 'get_line_balance': self._get_line_balance,
124+ 'currency_conv': self._currency_conv,
125+ 'get_prop_instances': self._get_prop_instances,
126 })
127+
128+ # company currency
129+ self.uid = uid
130+ self.currency_id = False
131+ self.instance_id = False
132+ user = self.pool.get('res.users').browse(cr, uid, [uid], context=context)
133+ if user and user[0] and user[0].company_id:
134+ self.currency_id = user[0].company_id.currency_id.id
135+ if user[0].company_id.instance_id:
136+ self.instance_id = user[0].company_id.instance_id.id
137+ if not self.currency_id:
138+ raise osv.except_osv(_('Error !'), _('Company has no default currency'))
139+
140 self.context = context
141
142 def _sum_currency_amount_account(self, account):
143@@ -104,9 +176,13 @@
144 def get_children_accounts(self, account):
145 res = []
146 currency_obj = self.pool.get('res.currency')
147+
148 ids_acc = self.pool.get('account.account')._get_children_and_consol(self.cr, self.uid, account.id)
149 currency = account.currency_id and account.currency_id or account.company_id.currency_id
150 for child_account in self.pool.get('account.account').browse(self.cr, self.uid, ids_acc, context=self.context):
151+ if child_account.code.startswith('8') or child_account.code.startswith('9'):
152+ # UF-1714: exclude accounts '8*'/'9*'
153+ continue
154 sql = """
155 SELECT count(id)
156 FROM account_move_line AS l
157@@ -128,7 +204,6 @@
158 if not res:
159 return [account]
160 return res
161-
162 def lines(self, account):
163 """ Return all the account_move_line of account with their account code counterparts """
164 move_state = ['draft','posted']
165@@ -161,7 +236,7 @@
166 else:
167 sql_sort='l.date, l.move_id'
168 sql = """
169- SELECT l.id AS lid, l.date AS ldate, j.code AS lcode, l.currency_id,l.amount_currency,l.ref AS lref, l.name AS lname, COALESCE(l.debit,0) AS debit, COALESCE(l.credit,0) AS credit, l.period_id AS lperiod_id, l.partner_id AS lpartner_id,
170+ SELECT l.id AS lid, l.date AS ldate, j.code AS lcode, l.currency_id,l.amount_currency,l.ref AS lref, l.name AS lname, COALESCE(l.debit,0) AS debit, COALESCE(l.credit,0) AS credit, COALESCE(l.debit_currency,0) as debit_currency, COALESCE(l.credit_currency,0) as credit_currency, l.period_id AS lperiod_id, l.partner_id AS lpartner_id,
171 m.name AS move_name, m.id AS mmove_id,per.code as period_code,
172 c.symbol AS currency_code,
173 i.id AS invoice_id, i.type AS invoice_type, i.number AS invoice_number,
174@@ -181,7 +256,7 @@
175 if res_lines and self.init_balance:
176 #FIXME: replace the label of lname with a string translatable
177 sql = """
178- SELECT 0 AS lid, '' AS ldate, '' AS lcode, COALESCE(SUM(l.amount_currency),0.0) AS amount_currency, '' AS lref, 'Initial Balance' AS lname, COALESCE(SUM(l.debit),0.0) AS debit, COALESCE(SUM(l.credit),0.0) AS credit, '' AS lperiod_id, '' AS lpartner_id,
179+ SELECT 0 AS lid, '' AS ldate, '' AS lcode, COALESCE(SUM(l.amount_currency),0.0) AS amount_currency, '' AS lref, 'Initial Balance' AS lname, COALESCE(SUM(l.debit),0.0) AS debit, COALESCE(SUM(l.credit),0.0) AS credit,COALESCE(SUM(l.debit_currency),0.0) AS debit_currency, COALESCE(SUM(l.credit_currency),0.0) AS credit_currency, '' AS lperiod_id, '' AS lpartner_id,
180 '' AS move_name, '' AS mmove_id, '' AS period_code,
181 '' AS currency_code,
182 NULL AS currency_id,
183@@ -215,7 +290,14 @@
184
185 def _sum_debit_account(self, account):
186 if account.type == 'view':
187- return account.debit
188+ amount = account.debit
189+ if not account.parent_id:
190+ # UF-1714
191+ # accounts 8*, 9* are not displayed:
192+ # we have to deduce debit/credit/balance amounts of MSF account view (root account)
193+ for a_code in self._deduce_accounts:
194+ amount -= self._deduce_accounts[a_code]['debit']
195+ return self._currency_conv(amount)
196 move_state = ['draft','posted']
197 if self.target_move == 'posted':
198 move_state = ['posted','']
199@@ -226,6 +308,16 @@
200 AND (am.state IN %s) \
201 AND '+ self.query +' '
202 ,(account.id, tuple(move_state)))
203+ #~ self.cr.execute("SELECT sum(debit)" \
204+ #~ " FROM account_move_line l" \
205+ #~ " JOIN account_move am ON (am.id = l.move_id)" \
206+ #~ " JOIN account_account a ON (a.id = l.account_id)" \
207+ #~ " WHERE (l.account_id = %s)" \
208+ #~ " AND (am.state IN %s)" \
209+ #~ " AND (a.code not like '8%%')" \
210+ #~ " AND (a.code not like '9%%')" \
211+ #~ " AND "+ self.query + " "
212+ #~ ,(account.id, tuple(move_state)))
213 sum_debit = self.cr.fetchone()[0] or 0.0
214 if self.init_balance:
215 self.cr.execute('SELECT sum(debit) \
216@@ -235,13 +327,31 @@
217 AND (am.state IN %s) \
218 AND '+ self.init_query +' '
219 ,(account.id, tuple(move_state)))
220+ #~ self.cr.execute("SELECT sum(debit)" \
221+ #~ "FROM account_move_line l" \
222+ #~ " JOIN account_move am ON (am.id = l.move_id)" \
223+ #~ " JOIN account_account a ON (a.id = l.account_id)" \
224+ #~ " WHERE (l.account_id = %s)" \
225+ #~ " AND (am.state IN %s)" \
226+ #~ " AND (a.code not like '8%%')" \
227+ #~ " AND (a.code not like '9%%')" \
228+ #~ " AND " + self.init_query + " "
229+ #~ ,(account.id, tuple(move_state)))
230 # Add initial balance to the result
231 sum_debit += self.cr.fetchone()[0] or 0.0
232+ sum_debit = self._currency_conv(sum_debit)
233 return sum_debit
234
235 def _sum_credit_account(self, account):
236 if account.type == 'view':
237- return account.credit
238+ amount = account.credit
239+ if not account.parent_id:
240+ # UF-1714
241+ # accounts 8*, 9* are not displayed:
242+ # we have to deduce debit/credit/balance amounts of MSF account view (root account)
243+ for a_code in self._deduce_accounts:
244+ amount -= self._deduce_accounts[a_code]['credit']
245+ return self._currency_conv(amount)
246 move_state = ['draft','posted']
247 if self.target_move == 'posted':
248 move_state = ['posted','']
249@@ -263,11 +373,19 @@
250 ,(account.id, tuple(move_state)))
251 # Add initial balance to the result
252 sum_credit += self.cr.fetchone()[0] or 0.0
253+ sum_credit = self._currency_conv(sum_credit)
254 return sum_credit
255
256 def _sum_balance_account(self, account):
257 if account.type == 'view':
258- return account.balance
259+ amount = account.balance
260+ if not account.parent_id:
261+ # UF-1714
262+ # accounts 8*, 9* are not displayed:
263+ # we have to deduce debit/credit/balance amounts of MSF account view (root account)
264+ for a_code in self._deduce_accounts:
265+ amount -= self._deduce_accounts[a_code]['balance']
266+ return self._currency_conv(amount)
267 move_state = ['draft','posted']
268 if self.target_move == 'posted':
269 move_state = ['posted','']
270@@ -289,11 +407,12 @@
271 ,(account.id, tuple(move_state)))
272 # Add initial balance to the result
273 sum_balance += self.cr.fetchone()[0] or 0.0
274+ sum_balance = self._currency_conv(sum_balance)
275 return sum_balance
276
277 def _get_account(self, data):
278 if data['model'] == 'account.account':
279- return self.pool.get('account.account').browse(self.cr, self.uid, data['form']['id']).company_id.name
280+ return self.pool.get('account.account').browse(self.cr, self.uid, data['form']['id'], context=self.context).company_id.name
281 return super(general_ledger ,self)._get_account(data)
282
283 def _get_sortby(self, data):
284@@ -302,8 +421,81 @@
285 elif self.sortby == 'sort_journal_partner':
286 return 'Journal & Partner'
287 return 'Date'
288+
289+ def _get_output_currency_code(self, data):
290+ if not self.output_currency_code:
291+ return ''
292+ return self.output_currency_code
293+
294+ def _get_filter_info(self, data):
295+ """ get filter info
296+ _get_filter, _get_start_date, _get_end_date,
297+ get_start_period, get_end_period
298+ are from common_report_header
299+ """
300+ res = ''
301+ f = self._get_filter(data)
302+ if not f:
303+ return res
304
305+ if f == 'No Filter':
306+ res = f
307+ elif f == 'Date':
308+ res = self.formatLang(self._get_start_date(data), date=True) + ' - ' + self.formatLang(self._get_end_date(data), date=True)
309+ elif f == 'Periods':
310+ res = self.get_start_period(data) + ' - ' + self.get_end_period(data)
311+ return res
312+
313+ def _get_line_debit(self, line):
314+ return self._currency_conv(line['debit'])
315+
316+ def _get_line_credit(self, line):
317+ return self._currency_conv(line['credit'])
318+
319+ def _get_line_balance(self, line):
320+ return self._currency_conv(line['debit'] - line['credit'])
321+
322+ def _is_company_currency(self):
323+ if not self.output_currency_id or not self.currency_id \
324+ or self.output_currency_id == self.currency_id:
325+ # ouput currency == company currency
326+ return True
327+ else:
328+ # is other currency
329+ return False
330+
331+ def _currency_conv(self, amount):
332+ if not amount or amount == 0.:
333+ return amount
334+ if self._is_company_currency():
335+ return amount
336+ amount = self.pool.get('res.currency').compute(self.cr, self.uid,
337+ self.currency_id,
338+ self.output_currency_id,
339+ amount)
340+ if not amount:
341+ amount = 0.
342+ return amount
343+
344+ def _get_prop_instances(self, data):
345+ instances = []
346+ if data.get('form', False) and data['form'].get('instance_ids', False):
347+ self.cr.execute('select code from msf_instance where id IN %s',(tuple(data['form']['instance_ids']),))
348+ instances = [x for x, in self.cr.fetchall()]
349+ return instances
350+
351 report_sxw.report_sxw('report.account.general.ledger', 'account.account', 'addons/account/report/account_general_ledger.rml', parser=general_ledger, header='internal')
352 report_sxw.report_sxw('report.account.general.ledger_landscape', 'account.account', 'addons/account/report/account_general_ledger_landscape.rml', parser=general_ledger, header='internal landscape')
353
354+
355+class general_ledger_xls(SpreadsheetReport):
356+ def __init__(self, name, table, rml=False, parser=report_sxw.rml_parse, header='external', store=False):
357+ super(general_ledger_xls, self).__init__(name, table, rml=rml, parser=parser, header=header, store=store)
358+
359+ def create(self, cr, uid, ids, data, context=None):
360+ #ids = getIds(self, cr, uid, ids, context)
361+ a = super(general_ledger_xls, self).create(cr, uid, ids, data, context)
362+ return (a[0], 'xls')
363+general_ledger_xls('report.account.general.ledger_xls', 'account.account', 'addons/account/report/account_general_ledger_xls.mako', parser=general_ledger, header='internal')
364+
365 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
366
367=== modified file 'account/report/account_general_ledger.rml'
368--- account/report/account_general_ledger.rml 2011-01-14 00:11:01 +0000
369+++ account/report/account_general_ledger.rml 2013-12-20 09:30:16 +0000
370@@ -1,6 +1,6 @@
371 <?xml version="1.0"?>
372-<document filename="General Ledger.pdf">
373- <template pageSize="(595.0,842.0)" title="General Ledger" author="OpenERP S.A.(sales@openerp.com)" allowSplitting="20">
374+<document filename="test.pdf">
375+ <template pageSize="(595.0,842.0)" title="Test" author="Martin Simon" allowSplitting="20">
376 <pageTemplate id="first">
377 <frame id="first" x1="28.0" y1="28.0" width="539" height="772"/>
378 </pageTemplate>
379@@ -26,12 +26,9 @@
380 <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="3,0" stop="3,0"/>
381 <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="3,-1" stop="3,-1"/>
382 <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="4,0" stop="4,-1"/>
383+ <lineStyle kind="LINEAFTER" colorName="#e6e6e6" start="4,0" stop="4,-1"/>
384 <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="4,0" stop="4,0"/>
385 <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="4,-1" stop="4,-1"/>
386- <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="5,0" stop="5,-1"/>
387- <lineStyle kind="LINEAFTER" colorName="#e6e6e6" start="5,0" stop="5,-1"/>
388- <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="5,0" stop="5,0"/>
389- <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="5,-1" stop="5,-1"/>
390 </blockTableStyle>
391 <blockTableStyle id="Table1">
392 <blockAlignment value="LEFT"/>
393@@ -49,112 +46,9 @@
394 <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="3,0" stop="3,0"/>
395 <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="3,-1" stop="3,-1"/>
396 <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="4,0" stop="4,-1"/>
397+ <lineStyle kind="LINEAFTER" colorName="#e6e6e6" start="4,0" stop="4,-1"/>
398 <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="4,0" stop="4,0"/>
399 <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="4,-1" stop="4,-1"/>
400- <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="5,0" stop="5,-1"/>
401- <lineStyle kind="LINEAFTER" colorName="#e6e6e6" start="5,0" stop="5,-1"/>
402- <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="5,0" stop="5,0"/>
403- <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="5,-1" stop="5,-1"/>
404- <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="6,0" stop="6,-1"/>
405- <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="6,0" stop="6,0"/>
406- <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="6,-1" stop="6,-1"/>
407- <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="7,0" stop="7,-1"/>
408- <lineStyle kind="LINEAFTER" colorName="#e6e6e6" start="7,0" stop="7,-1"/>
409- <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="7,0" stop="7,0"/>
410- <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="7,-1" stop="7,-1"/>
411- <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="8,0" stop="8,-1"/>
412- <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="8,0" stop="8,0"/>
413- <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="8,-1" stop="8,-1"/>
414- <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="9,0" stop="9,-1"/>
415- <lineStyle kind="LINEAFTER" colorName="#e6e6e6" start="9,0" stop="9,-1"/>
416- <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="9,0" stop="9,0"/>
417- <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="9,-1" stop="9,-1"/>
418- <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="10,0" stop="10,-1"/>
419- <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="10,0" stop="10,0"/>
420- <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="10,-1" stop="10,-1"/>
421- <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="11,0" stop="11,-1"/>
422- <lineStyle kind="LINEAFTER" colorName="#e6e6e6" start="11,0" stop="11,-1"/>
423- <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="11,0" stop="11,0"/>
424- <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="11,-1" stop="11,-1"/>
425- <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="12,0" stop="12,-1"/>
426- <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="12,0" stop="12,0"/>
427- <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="12,-1" stop="12,-1"/>
428- <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="13,0" stop="13,-1"/>
429- <lineStyle kind="LINEAFTER" colorName="#e6e6e6" start="13,0" stop="13,-1"/>
430- <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="13,0" stop="13,0"/>
431- <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="13,-1" stop="13,-1"/>
432- <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="0,1" stop="0,-1"/>
433- <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="0,1" stop="0,1"/>
434- <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="0,-1" stop="0,-1"/>
435- <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="1,1" stop="1,-1"/>
436- <lineStyle kind="LINEAFTER" colorName="#e6e6e6" start="1,1" stop="1,-1"/>
437- <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="1,1" stop="1,1"/>
438- <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="1,-1" stop="1,-1"/>
439- <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="0,2" stop="0,-1"/>
440- <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="0,2" stop="0,2"/>
441- <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="0,-1" stop="0,-1"/>
442- <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="1,2" stop="1,-1"/>
443- <lineStyle kind="LINEAFTER" colorName="#e6e6e6" start="1,2" stop="1,-1"/>
444- <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="1,2" stop="1,2"/>
445- <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="1,-1" stop="1,-1"/>
446- <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="0,3" stop="0,-1"/>
447- <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="0,3" stop="0,3"/>
448- <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="0,-1" stop="0,-1"/>
449- <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="1,3" stop="1,-1"/>
450- <lineStyle kind="LINEAFTER" colorName="#e6e6e6" start="1,3" stop="1,-1"/>
451- <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="1,3" stop="1,3"/>
452- <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="1,-1" stop="1,-1"/>
453- <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="0,4" stop="0,-1"/>
454- <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="0,4" stop="0,4"/>
455- <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="0,-1" stop="0,-1"/>
456- <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="1,4" stop="1,-1"/>
457- <lineStyle kind="LINEAFTER" colorName="#e6e6e6" start="1,4" stop="1,-1"/>
458- <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="1,4" stop="1,4"/>
459- <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="1,-1" stop="1,-1"/>
460- </blockTableStyle>
461- <blockTableStyle id="Table2">
462- <blockAlignment value="LEFT"/>
463- <blockValign value="TOP"/>
464- <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="0,0" stop="0,-1"/>
465- <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="0,0" stop="0,0"/>
466- <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="0,-1" stop="0,-1"/>
467- <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="1,0" stop="1,-1"/>
468- <lineStyle kind="LINEAFTER" colorName="#e6e6e6" start="1,0" stop="1,-1"/>
469- <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="1,0" stop="1,0"/>
470- <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="1,-1" stop="1,-1"/>
471- </blockTableStyle>
472- <blockTableStyle id="Table3">
473- <blockAlignment value="LEFT"/>
474- <blockValign value="TOP"/>
475- <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="0,0" stop="0,-1"/>
476- <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="0,0" stop="0,0"/>
477- <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="0,-1" stop="0,-1"/>
478- <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="1,0" stop="1,-1"/>
479- <lineStyle kind="LINEAFTER" colorName="#e6e6e6" start="1,0" stop="1,-1"/>
480- <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="1,0" stop="1,0"/>
481- <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="1,-1" stop="1,-1"/>
482- </blockTableStyle>
483- <blockTableStyle id="Table4">
484- <blockAlignment value="LEFT"/>
485- <blockValign value="TOP"/>
486- <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="0,0" stop="0,-1"/>
487- <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="0,0" stop="0,0"/>
488- <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="0,-1" stop="0,-1"/>
489- <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="1,0" stop="1,-1"/>
490- <lineStyle kind="LINEAFTER" colorName="#e6e6e6" start="1,0" stop="1,-1"/>
491- <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="1,0" stop="1,0"/>
492- <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="1,-1" stop="1,-1"/>
493- </blockTableStyle>
494- <blockTableStyle id="Table5">
495- <blockAlignment value="LEFT"/>
496- <blockValign value="TOP"/>
497- <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="0,0" stop="0,-1"/>
498- <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="0,0" stop="0,0"/>
499- <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="0,-1" stop="0,-1"/>
500- <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="1,0" stop="1,-1"/>
501- <lineStyle kind="LINEAFTER" colorName="#e6e6e6" start="1,0" stop="1,-1"/>
502- <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="1,0" stop="1,0"/>
503- <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="1,-1" stop="1,-1"/>
504 </blockTableStyle>
505 <blockTableStyle id="Table7">
506 <blockAlignment value="LEFT"/>
507@@ -227,6 +121,7 @@
508 <initialize>
509 <paraStyle name="all" alignment="justify"/>
510 </initialize>
511+ <paraStyle name="P1" fontName="Helvetica" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
512 <paraStyle name="Standard" fontName="Helvetica"/>
513 <paraStyle name="Text body" fontName="Helvetica" spaceBefore="0.0" spaceAfter="6.0"/>
514 <paraStyle name="List" fontName="Helvetica" spaceBefore="0.0" spaceAfter="6.0"/>
515@@ -262,86 +157,12 @@
516 <images/>
517 </stylesheet>
518 <story>
519- <pto>
520- <pto_header>
521- <blockTable colWidths="40.0,28.0,82.0,42.0,42.0,71.0,42.0,57.0,57.0,77.0" style="Table10">[[ data['form']['amount_currency'] == False or removeParentNode('blockTable') ]]
522- <tr>
523- <td>
524- <para style="terp_tblheader_Details">Date</para>
525- </td>
526- <td>
527- <para style="terp_tblheader_Details">JNRL</para>
528- </td>
529- <td>
530- <para style="terp_tblheader_Details">Partner</para>
531- </td>
532- <td>
533- <para style="terp_tblheader_Details_Centre">Ref</para>
534- </td>
535- <td>
536- <para style="terp_tblheader_Details_Centre">Move</para>
537- </td>
538- <td>
539- <para style="terp_tblheader_Details">Entry Label</para>
540- </td>
541- <td>
542- <para style="terp_tblheader_Details_Centre">Counterpart</para>
543- </td>
544- <td>
545- <para style="terp_tblheader_Details_Right">Debit</para>
546- </td>
547- <td>
548- <para style="terp_tblheader_Details_Right">Credit</para>
549- </td>
550- <td>
551- <para style="terp_tblheader_Details_Right">Balance</para>
552- </td>
553- </tr>
554- </blockTable>
555- <blockTable colWidths="40.0,28.0,48.0,42.0,42.0,48.0,28.0,57.0,57.0,74.0,74.0" style="Table7">[[data['form']['amount_currency'] == True or removeParentNode('blockTable')]]
556- <tr>
557- <td>
558- <para style="terp_tblheader_Details">Date</para>
559- </td>
560- <td>
561- <para style="terp_tblheader_Details">JNRL</para>
562- </td>
563- <td>
564- <para style="terp_tblheader_Details">Partner</para>
565- </td>
566- <td>
567- <para style="terp_tblheader_Details_Centre">Ref</para>
568- </td>
569- <td>
570- <para style="terp_tblheader_Details_Centre">Move</para>
571- </td>
572- <td>
573- <para style="terp_tblheader_Details">Entry Label</para>
574- </td>
575- <td>
576- <para style="terp_tblheader_Details_Centre">Counterpart</para>
577- </td>
578- <td>
579- <para style="terp_tblheader_Details_Right">Debit</para>
580- </td>
581- <td>
582- <para style="terp_tblheader_Details_Right">Credit</para>
583- </td>
584- <td>
585- <para style="terp_tblheader_Details_Right">Balance</para>
586- </td>
587- <td>
588- <para style="terp_tblheader_Details_Right">Currency</para>
589- </td>
590- </tr>
591- </blockTable>
592- </pto_header>
593 <para style="terp_default_8">[[ repeatIn(objects, 'a') ]]</para>
594 <para style="terp_header_Centre">General Ledger</para>
595 <para style="terp_default_8">
596 <font color="white"> </font>
597 </para>
598- <blockTable colWidths="102.0,102.0,102.0,130.0,102.0" style="Table13">
599+ <blockTable colWidths="82.0,82.0,82.0,169.0,123.0" style="Table13">
600 <tr>
601 <td>
602 <para style="terp_tblheader_General_Centre">Chart of Account</para>
603@@ -360,7 +181,7 @@
604 </td>
605 </tr>
606 </blockTable>
607- <blockTable colWidths="102.0,102.0,102.0,130.0,102.0" style="Table1">
608+ <blockTable colWidths="82.0,82.0,82.0,169.0,123.0" style="Table1">
609 <tr>
610 <td>
611 <para style="terp_default_Centre_8">[[ get_account(data) or '' ]]</para>
612@@ -372,47 +193,7 @@
613 <para style="terp_default_Centre_8">[[', '.join([ lt or '' for lt in get_journal(data) ]) ]]</para>
614 </td>
615 <td>
616- <para style="terp_default_Centre_8">[[ get_filter(data)=='No Filter' and get_filter(data) or removeParentNode('para') ]]</para>
617- <blockTable colWidths="58.0,58.0" style="Table2">[[ get_filter(data)=='Date' or removeParentNode('blockTable') ]]
618- <tr>
619- <td>
620- <para style="terp_tblheader_General_Centre">Start Date</para>
621- </td>
622- <td>
623- <para style="terp_tblheader_General_Centre">End Date</para>
624- </td>
625- </tr>
626- </blockTable>
627- <blockTable colWidths="58.0,58.0" style="Table3">[[ get_filter(data)=='Date' or removeParentNode('blockTable') ]]
628- <tr>
629- <td>
630- <para style="terp_default_Centre_8">[[ formatLang(get_start_date(data),date=True) ]]</para>
631- </td>
632- <td>
633- <para style="terp_default_Centre_8">[[ formatLang(get_end_date(data),date=True) ]]</para>
634- </td>
635- </tr>
636- </blockTable>
637- <blockTable colWidths="58.0,58.0" style="Table4">[[ get_filter(data)=='Periods' or removeParentNode('blockTable') ]]
638- <tr>
639- <td>
640- <para style="terp_tblheader_General_Centre">Start Period</para>
641- </td>
642- <td>
643- <para style="terp_tblheader_General_Centre">End Period</para>
644- </td>
645- </tr>
646- </blockTable>
647- <blockTable colWidths="58.0,58.0" style="Table5">[[ get_filter(data)=='Periods' or removeParentNode('blockTable') ]]
648- <tr>
649- <td>
650- <para style="terp_default_Centre_8">[[ get_start_period(data) or removeParentNode('para') ]]</para>
651- </td>
652- <td>
653- <para style="terp_default_Centre_8">[[ get_end_period(data) or removeParentNode('para') ]]</para>
654- </td>
655- </tr>
656- </blockTable>
657+ <para style="terp_default_Centre_8">[[ get_filter_info(data) ]]</para>
658 <para style="terp_default_8">
659 <font color="white"> </font>
660 </para>
661@@ -425,7 +206,7 @@
662 <para style="terp_default_8">
663 <font color="white"> </font>
664 </para>
665- <blockTable colWidths="40.0,28.0,48.0,42.0,42.0,48.0,28.0,57.0,57.0,74.0,74.0" style="Table7">[[data['form']['amount_currency'] == True or removeParentNode('blockTable')]]
666+ <blockTable colWidths="40.0,28.0,48.0,42.0,42.0,48.0,28.0,57.0,57.0,74.0,74.0" style="Table7">
667 <tr>
668 <td>
669 <para style="terp_tblheader_Details">Date</para>
670@@ -464,10 +245,10 @@
671 </blockTable>
672 <section>
673 <para style="terp_default_8">[[ repeatIn(get_children_accounts(a), 'o') ]]</para>
674- <blockTable rowHeights="0.55cm" colWidths="278.0,57.0,57.0,74.0,74.0" style="Table8">[[data['form']['amount_currency'] == True or removeParentNode('blockTable')]]
675+ <blockTable colWidths="278.0,57.0,57.0,74.0,74.0" style="Table8">
676 <tr>
677 <td>
678- <para style="terp_default_Bold_9"><font color="white">[[ '..'*(o.level-1) ]]</font>[[ o.code ]] [[ o.name ]]</para>
679+ <para style="terp_default_Bold_9">[[ '..'*(o.level-1) ]] [[ o.code ]] [[ o.name ]]</para>
680 </td>
681 <td>
682 <para style="terp_default_Bold_9_Right">[[ formatLang(sum_debit_account(o), digits=get_digits(dp='Account')) ]]</para>
683@@ -476,16 +257,16 @@
684 <para style="terp_default_Bold_9_Right">[[ formatLang(sum_credit_account(o), digits=get_digits(dp='Account')) ]]</para>
685 </td>
686 <td>
687- <para style="terp_default_Bold_9_Right">[[ formatLang(sum_balance_account(o), digits=get_digits(dp='Account')) ]] [[ company.currency_id.symbol ]]</para>
688+ <para style="terp_default_Bold_9_Right">[[ formatLang(sum_balance_account(o), digits=get_digits(dp='Account')) ]] </para>
689 </td>
690 <td>
691- <para style="terp_default_Bold_9_Right">[[ o.currency_id and formatLang(sum_currency_amount_account(o), digits=get_digits(dp='Account')) + o.currency_id.symbol or '' ]]</para>
692+ <para style="terp_default_Bold_9_Right">[[ get_output_currency_code(data) ]]</para>
693 </td>
694 </tr>
695 </blockTable>
696 <section>
697 <para style="terp_default_8">[[ repeatIn(lines(o), 'line') ]]</para>
698- <blockTable rowHeights="0.55cm" colWidths="40.0,28.0,48.0,42.0,42.0,48.0,28.0,57.0,57.0,74.0,74.0" style="Table9">[[data['form']['amount_currency'] == True or removeParentNode('blockTable')]]
699+ <blockTable colWidths="47.0,21.0,48.0,42.0,42.0,48.0,28.0,57.0,57.0,74.0,74.0" style="Table9">
700 <tr>
701 <td>
702 <para style="terp_default_8">[[ formatLang(line['ldate'],date=True) ]]</para>
703@@ -497,10 +278,10 @@
704 <para style="terp_default_8">[[ strip_name(line['partner_name'],10) ]]</para>
705 </td>
706 <td>
707- <para style="terp_default_8">[[ strip_name(line['lref'],9) ]]</para>
708+ <para style="terp_default_8">[[ strip_name(line['lref'],8) ]]</para>
709 </td>
710 <td>
711- <para style="terp_default_8">[[ strip_name(line['move'],9) ]]</para>
712+ <para style="terp_default_8">[[ strip_name(line['move'],8) ]]</para>
713 </td>
714 <td>
715 <para style="terp_default_8">[[ strip_name(line['lname'],10) ]]</para>
716@@ -509,25 +290,25 @@
717 <para style="terp_default_Centre_8">[[ strip_name(line['line_corresp'].replace(', ',','),10) ]]</para>
718 </td>
719 <td>
720- <para style="terp_default_Right_8">[[ formatLang(line['debit'], digits=get_digits(dp='Account')) ]]</para>
721- </td>
722- <td>
723- <para style="terp_default_Right_8">[[ formatLang(line['credit'], digits=get_digits(dp='Account')) ]]</para>
724- </td>
725- <td>
726- <para style="terp_default_Right_8">[[ formatLang(line['progress'], digits=get_digits(dp='Account')) ]] [[ company.currency_id.symbol ]]</para>
727- </td>
728- <td>
729- <para style="terp_default_Right_8"><font>[[ (line.has_key('currency_id') and line['currency_id']==None or line['amount_currency']==None) and removeParentNode('font') ]] [[ formatLang(line['amount_currency'])]] [[ line['currency_code'] or '']]</font></para>
730+ <para style="terp_default_Right_8">[[ formatLang(get_line_debit(line), digits=get_digits(dp='Account')) ]]</para>
731+ </td>
732+ <td>
733+ <para style="terp_default_Right_8">[[ formatLang(get_line_credit(line), digits=get_digits(dp='Account')) ]]</para>
734+ </td>
735+ <td>
736+ <para style="terp_default_Right_8">[[ formatLang(get_line_balance(line), digits=get_digits(dp='Account')) ]] </para>
737+ </td>
738+ <td>
739+ <para style="P1">[[ get_output_currency_code(data) ]]</para>
740 </td>
741 </tr>
742 </blockTable>
743 </section>
744 </section>
745- <blockTable colWidths="40.0,28.0,82.0,42.0,42.0,71.0,42.0,57.0,57.0,77.0" style="Table10">[[ data['form']['amount_currency'] == False or removeParentNode('blockTable') ]]
746+ <blockTable colWidths="40.0,28.0,82.0,42.0,42.0,71.0,42.0,57.0,57.0,77.0" style="Table10">
747 <tr>
748 <td>
749- <para style="terp_tblheader_Details">Date</para>
750+ <para style="terp_tblheader_Details">[[ removeParentNode('blockTable') ]]</para>
751 </td>
752 <td>
753 <para style="terp_tblheader_Details">JNRL</para>
754@@ -560,10 +341,10 @@
755 </blockTable>
756 <section>
757 <para style="terp_default_8">[[ repeatIn(get_children_accounts(a), 'o') ]]</para>
758- <blockTable rowHeights="0.55cm" colWidths="349.0,57.0,57.0,77.0" style="Table11">[[ data['form']['amount_currency'] == False or removeParentNode('blockTable') ]]
759+ <blockTable colWidths="349.0,57.0,57.0,77.0" style="Table11">
760 <tr>
761 <td>
762- <para style="terp_default_Bold_9"><font color="white">[[ '..'*(o.level-1) ]]</font>[[ o.code ]] [[ o.name ]]</para>
763+ <para style="terp_default_Bold_9">[[ data['form']['amount_currency'] == False or removeParentNode('blockTable') ]] [[ '..'*(o.level-1) ]] [[ o.code ]] [[ o.name ]]</para>
764 </td>
765 <td>
766 <para style="terp_default_Bold_9_Right">[[ formatLang(sum_debit_account(o), digits=get_digits(dp='Account')) ]]</para>
767@@ -572,16 +353,16 @@
768 <para style="terp_default_Bold_9_Right">[[ formatLang(sum_credit_account(o), digits=get_digits(dp='Account')) ]]</para>
769 </td>
770 <td>
771- <para style="terp_default_Bold_9_Right">[[ formatLang(sum_balance_account(o), digits=get_digits(dp='Account')) ]] [[ company.currency_id.symbol ]]</para>
772+ <para style="terp_default_Bold_9_Right">[[ formatLang(sum_balance_account(o), digits=get_digits(dp='Account')) ]] <font face="Helvetica" size="8.0">[[ get_output_currency_code(data) ]]</font></para>
773 </td>
774 </tr>
775 </blockTable>
776 <section>
777 <para style="terp_default_8">[[ repeatIn(lines(o), 'line') ]]</para>
778- <blockTable rowHeights="0.55cm" colWidths="40.0,28.0,82.0,42.0,42.0,71.0,42.0,57.0,57.0,77.0" style="Table6">[[ data['form']['amount_currency'] == False or removeParentNode('blockTable') ]]
779+ <blockTable colWidths="40.0,28.0,82.0,42.0,42.0,71.0,42.0,57.0,57.0,77.0" style="Table6">
780 <tr>
781 <td>
782- <para style="terp_default_8">[[ formatLang(line['ldate'],date=True) ]]</para>
783+ <para style="terp_default_8">[[ data['form']['amount_currency'] == False or removeParentNode('blockTable') ]] [[ formatLang(line['ldate'],date=True) ]]</para>
784 </td>
785 <td>
786 <para style="terp_default_8">[[ line['lcode'] ]]</para>
787@@ -608,12 +389,24 @@
788 <para style="terp_default_Right_8">[[ formatLang(line['credit'], digits=get_digits(dp='Account')) ]]</para>
789 </td>
790 <td>
791- <para style="terp_default_Right_8">[[ formatLang(line['progress'], digits=get_digits(dp='Account')) ]] [[ company.currency_id.symbol ]]</para>
792+ <para style="terp_default_Right_8">[[ formatLang(line['progress'], digits=get_digits(dp='Account')) ]] <font face="Helvetica" size="8.0">[[ company.currency_id.name ]]</font></para>
793 </td>
794 </tr>
795 </blockTable>
796+ <para style="terp_default_2">
797+ <font color="white"> </font>
798+ </para>
799 </section>
800 </section>
801- </pto>
802+ <para style="terp_default_8">
803+ <font color="white"> </font>
804+ </para>
805+ <para style="terp_default_8">
806+ <font color="white"> </font>
807+ </para>
808+ <para style="terp_default_8">
809+ <font color="white"> </font>
810+ </para>
811 </story>
812 </document>
813+
814
815=== modified file 'account/report/account_general_ledger.sxw'
816Binary files account/report/account_general_ledger.sxw 2011-01-14 00:11:01 +0000 and account/report/account_general_ledger.sxw 2013-12-20 09:30:16 +0000 differ
817=== modified file 'account/report/account_general_ledger_landscape.rml'
818--- account/report/account_general_ledger_landscape.rml 2011-01-14 00:11:01 +0000
819+++ account/report/account_general_ledger_landscape.rml 2013-12-20 09:30:16 +0000
820@@ -1,6 +1,6 @@
821 <?xml version="1.0"?>
822-<document filename="General Ledger.pdf">
823- <template pageSize="(842.0,595.0)" title="General Ledger" author="OpenERP S.A.(sales@openerp.com)" allowSplitting="20">
824+<document filename="test.pdf">
825+ <template pageSize="(842.0,595.0)" title="Test" author="Martin Simon" allowSplitting="20">
826 <pageTemplate id="first">
827 <frame id="first" x1="28.0" y1="28.0" width="786" height="525"/>
828 </pageTemplate>
829@@ -61,106 +61,6 @@
830 <lineStyle kind="LINEAFTER" colorName="#e6e6e6" start="6,0" stop="6,-1"/>
831 <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="6,0" stop="6,0"/>
832 <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="6,-1" stop="6,-1"/>
833- <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="7,0" stop="7,-1"/>
834- <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="7,0" stop="7,0"/>
835- <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="7,-1" stop="7,-1"/>
836- <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="8,0" stop="8,-1"/>
837- <lineStyle kind="LINEAFTER" colorName="#e6e6e6" start="8,0" stop="8,-1"/>
838- <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="8,0" stop="8,0"/>
839- <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="8,-1" stop="8,-1"/>
840- <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="9,0" stop="9,-1"/>
841- <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="9,0" stop="9,0"/>
842- <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="9,-1" stop="9,-1"/>
843- <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="10,0" stop="10,-1"/>
844- <lineStyle kind="LINEAFTER" colorName="#e6e6e6" start="10,0" stop="10,-1"/>
845- <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="10,0" stop="10,0"/>
846- <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="10,-1" stop="10,-1"/>
847- <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="11,0" stop="11,-1"/>
848- <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="11,0" stop="11,0"/>
849- <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="11,-1" stop="11,-1"/>
850- <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="12,0" stop="12,-1"/>
851- <lineStyle kind="LINEAFTER" colorName="#e6e6e6" start="12,0" stop="12,-1"/>
852- <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="12,0" stop="12,0"/>
853- <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="12,-1" stop="12,-1"/>
854- <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="13,0" stop="13,-1"/>
855- <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="13,0" stop="13,0"/>
856- <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="13,-1" stop="13,-1"/>
857- <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="14,0" stop="14,-1"/>
858- <lineStyle kind="LINEAFTER" colorName="#e6e6e6" start="14,0" stop="14,-1"/>
859- <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="14,0" stop="14,0"/>
860- <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="14,-1" stop="14,-1"/>
861- <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="0,1" stop="0,-1"/>
862- <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="0,1" stop="0,1"/>
863- <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="0,-1" stop="0,-1"/>
864- <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="1,1" stop="1,-1"/>
865- <lineStyle kind="LINEAFTER" colorName="#e6e6e6" start="1,1" stop="1,-1"/>
866- <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="1,1" stop="1,1"/>
867- <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="1,-1" stop="1,-1"/>
868- <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="0,2" stop="0,-1"/>
869- <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="0,2" stop="0,2"/>
870- <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="0,-1" stop="0,-1"/>
871- <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="1,2" stop="1,-1"/>
872- <lineStyle kind="LINEAFTER" colorName="#e6e6e6" start="1,2" stop="1,-1"/>
873- <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="1,2" stop="1,2"/>
874- <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="1,-1" stop="1,-1"/>
875- <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="0,3" stop="0,-1"/>
876- <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="0,3" stop="0,3"/>
877- <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="0,-1" stop="0,-1"/>
878- <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="1,3" stop="1,-1"/>
879- <lineStyle kind="LINEAFTER" colorName="#e6e6e6" start="1,3" stop="1,-1"/>
880- <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="1,3" stop="1,3"/>
881- <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="1,-1" stop="1,-1"/>
882- <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="0,4" stop="0,-1"/>
883- <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="0,4" stop="0,4"/>
884- <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="0,-1" stop="0,-1"/>
885- <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="1,4" stop="1,-1"/>
886- <lineStyle kind="LINEAFTER" colorName="#e6e6e6" start="1,4" stop="1,-1"/>
887- <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="1,4" stop="1,4"/>
888- <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="1,-1" stop="1,-1"/>
889- </blockTableStyle>
890- <blockTableStyle id="Table3">
891- <blockAlignment value="LEFT"/>
892- <blockValign value="TOP"/>
893- <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="0,0" stop="0,-1"/>
894- <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="0,0" stop="0,0"/>
895- <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="0,-1" stop="0,-1"/>
896- <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="1,0" stop="1,-1"/>
897- <lineStyle kind="LINEAFTER" colorName="#e6e6e6" start="1,0" stop="1,-1"/>
898- <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="1,0" stop="1,0"/>
899- <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="1,-1" stop="1,-1"/>
900- </blockTableStyle>
901- <blockTableStyle id="Table4">
902- <blockAlignment value="LEFT"/>
903- <blockValign value="TOP"/>
904- <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="0,0" stop="0,-1"/>
905- <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="0,0" stop="0,0"/>
906- <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="0,-1" stop="0,-1"/>
907- <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="1,0" stop="1,-1"/>
908- <lineStyle kind="LINEAFTER" colorName="#e6e6e6" start="1,0" stop="1,-1"/>
909- <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="1,0" stop="1,0"/>
910- <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="1,-1" stop="1,-1"/>
911- </blockTableStyle>
912- <blockTableStyle id="Table5">
913- <blockAlignment value="LEFT"/>
914- <blockValign value="TOP"/>
915- <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="0,0" stop="0,-1"/>
916- <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="0,0" stop="0,0"/>
917- <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="0,-1" stop="0,-1"/>
918- <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="1,0" stop="1,-1"/>
919- <lineStyle kind="LINEAFTER" colorName="#e6e6e6" start="1,0" stop="1,-1"/>
920- <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="1,0" stop="1,0"/>
921- <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="1,-1" stop="1,-1"/>
922- </blockTableStyle>
923- <blockTableStyle id="Table6">
924- <blockAlignment value="LEFT"/>
925- <blockValign value="TOP"/>
926- <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="0,0" stop="0,-1"/>
927- <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="0,0" stop="0,0"/>
928- <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="0,-1" stop="0,-1"/>
929- <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="1,0" stop="1,-1"/>
930- <lineStyle kind="LINEAFTER" colorName="#e6e6e6" start="1,0" stop="1,-1"/>
931- <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="1,0" stop="1,0"/>
932- <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="1,-1" stop="1,-1"/>
933 </blockTableStyle>
934 <blockTableStyle id="Table7">
935 <blockAlignment value="LEFT"/>
936@@ -176,7 +76,6 @@
937 <lineStyle kind="LINEBELOW" colorName="#000000" start="8,-1" stop="8,-1"/>
938 <lineStyle kind="LINEBELOW" colorName="#000000" start="9,-1" stop="9,-1"/>
939 <lineStyle kind="LINEBELOW" colorName="#000000" start="10,-1" stop="10,-1"/>
940- <lineStyle kind="LINEBELOW" colorName="#000000" start="11,-1" stop="11,-1"/>
941 </blockTableStyle>
942 <blockTableStyle id="Table8">
943 <blockAlignment value="LEFT"/>
944@@ -197,7 +96,6 @@
945 <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="8,-1" stop="8,-1"/>
946 <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="9,-1" stop="9,-1"/>
947 <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="10,-1" stop="10,-1"/>
948- <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="11,-1" stop="11,-1"/>
949 </blockTableStyle>
950 <blockTableStyle id="Table10">
951 <blockAlignment value="LEFT"/>
952@@ -212,7 +110,6 @@
953 <lineStyle kind="LINEBELOW" colorName="#000000" start="7,-1" stop="7,-1"/>
954 <lineStyle kind="LINEBELOW" colorName="#000000" start="8,-1" stop="8,-1"/>
955 <lineStyle kind="LINEBELOW" colorName="#000000" start="9,-1" stop="9,-1"/>
956- <lineStyle kind="LINEBELOW" colorName="#000000" start="10,-1" stop="10,-1"/>
957 </blockTableStyle>
958 <blockTableStyle id="Table11">
959 <blockAlignment value="LEFT"/>
960@@ -232,11 +129,12 @@
961 <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="7,-1" stop="7,-1"/>
962 <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="8,-1" stop="8,-1"/>
963 <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="9,-1" stop="9,-1"/>
964- <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="10,-1" stop="10,-1"/>
965 </blockTableStyle>
966 <initialize>
967 <paraStyle name="all" alignment="justify"/>
968 </initialize>
969+ <paraStyle name="P1" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
970+ <paraStyle name="P2" fontName="Helvetica" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
971 <paraStyle name="Standard" fontName="Helvetica"/>
972 <paraStyle name="Heading" fontName="Helvetica" fontSize="14.0" leading="17" spaceBefore="12.0" spaceAfter="6.0"/>
973 <paraStyle name="Text body" fontName="Helvetica" spaceBefore="0.0" spaceAfter="6.0"/>
974@@ -251,113 +149,33 @@
975 <paraStyle name="Heading 9" fontName="Helvetica-Bold" fontSize="75%" leading="NaN" spaceBefore="12.0" spaceAfter="6.0"/>
976 <paraStyle name="terp_tblheader_General" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="6.0" spaceAfter="6.0"/>
977 <paraStyle name="terp_tblheader_Details" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="6.0" spaceAfter="6.0"/>
978- <paraStyle name="terp_default_7" fontName="Helvetica" fontSize="7.0" leading="9" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
979- <paraStyle name="terp_default_Bold_7" fontName="Helvetica-Bold" fontSize="7.0" leading="9" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
980+ <paraStyle name="terp_default_8" fontName="Helvetica" fontSize="7.0" leading="9" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
981+ <paraStyle name="terp_default_Bold_8" fontName="Helvetica-Bold" fontSize="7.0" leading="9" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
982 <paraStyle name="terp_tblheader_General_Centre" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="CENTER" spaceBefore="6.0" spaceAfter="6.0"/>
983 <paraStyle name="terp_tblheader_General_Right" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="6.0" spaceAfter="6.0"/>
984 <paraStyle name="terp_tblheader_Details_Centre" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="CENTER" spaceBefore="6.0" spaceAfter="6.0"/>
985 <paraStyle name="terp_tblheader_Details_Right" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="6.0" spaceAfter="6.0"/>
986- <paraStyle name="terp_default_Right_7" fontName="Helvetica" fontSize="7.0" leading="9" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
987- <paraStyle name="terp_default_Centre_7" fontName="Helvetica" fontSize="7.0" leading="9" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
988+ <paraStyle name="terp_default_Right_8" fontName="Helvetica" fontSize="7.0" leading="9" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
989+ <paraStyle name="terp_default_Centre_8" fontName="Helvetica" fontSize="7.0" leading="9" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
990 <paraStyle name="terp_header_Right" fontName="Helvetica-Bold" fontSize="15.0" leading="19" alignment="LEFT" spaceBefore="12.0" spaceAfter="6.0"/>
991 <paraStyle name="terp_header_Centre" fontName="Helvetica-Bold" fontSize="15.0" leading="19" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
992 <paraStyle name="terp_default_address" fontName="Helvetica" fontSize="10.0" leading="13" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
993- <paraStyle name="terp_default_8" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
994- <paraStyle name="terp_default_Bold_7" fontName="Helvetica-Bold" fontSize="7.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
995+ <paraStyle name="terp_default_9" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
996+ <paraStyle name="terp_default_Bold_9" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
997 <paraStyle name="terp_default_Centre_9" fontName="Helvetica" fontSize="8.0" leading="10" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
998- <paraStyle name="terp_default_Right_8" fontName="Helvetica" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
999+ <paraStyle name="terp_default_Right_9" fontName="Helvetica" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
1000 <paraStyle name="terp_default_2" fontName="Helvetica" fontSize="2.0" leading="3" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
1001- <paraStyle name="terp_default_Bold_7_Right" fontName="Helvetica-Bold" fontSize="7.0" leading="10" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
1002+ <paraStyle name="terp_default_Bold_9_Right" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
1003 <paraStyle name="Heading 3" fontName="Helvetica-Bold" fontSize="14.0" leading="17" spaceBefore="12.0" spaceAfter="6.0"/>
1004 <images/>
1005 </stylesheet>
1006 <story>
1007- <pto>
1008- <pto_header>
1009- <blockTable colWidths="45.0,35.0,30.0,90.0,65.0,55.0,100.0,70.0,65.0,65.0,75.0,75.0" style="Table7">[[data['form']['amount_currency'] == True or removeParentNode('blockTable')]]
1010- <tr>
1011- <td>
1012- <para style="terp_tblheader_Details">Date</para>
1013- </td>
1014- <td>
1015- <para style="terp_tblheader_Details">Period</para>
1016- </td>
1017- <td>
1018- <para style="terp_tblheader_Details">JRNL</para>
1019- </td>
1020- <td>
1021- <para style="terp_tblheader_Details">Partner</para>
1022- </td>
1023- <td>
1024- <para style="terp_tblheader_Details">Ref</para>
1025- </td>
1026- <td>
1027- <para style="terp_tblheader_Details">Move</para>
1028- </td>
1029- <td>
1030- <para style="terp_tblheader_Details">Entry Label</para>
1031- </td>
1032- <td>
1033- <para style="terp_tblheader_Details">Counterpart</para>
1034- </td>
1035- <td>
1036- <para style="terp_tblheader_Details_Right">Debit</para>
1037- </td>
1038- <td>
1039- <para style="terp_tblheader_Details_Right">Credit</para>
1040- </td>
1041- <td>
1042- <para style="terp_tblheader_Details_Right">Balance</para>
1043- </td>
1044- <td>
1045- <para style="terp_tblheader_Details_Right">Currency</para>
1046- </td>
1047- </tr>
1048- </blockTable>
1049- <blockTable colWidths="45.0,35.0,30.0,105.0,80.0,55.0,130.0,95.0,65.0,65.0,75.0" style="Table10">[[ data['form']['amount_currency'] == False or removeParentNode('blockTable') ]]
1050- <tr>
1051- <td>
1052- <para style="terp_tblheader_Details">Date</para>
1053- </td>
1054- <td>
1055- <para style="terp_tblheader_Details">Period</para>
1056- </td>
1057- <td>
1058- <para style="terp_tblheader_Details">JRNL</para>
1059- </td>
1060- <td>
1061- <para style="terp_tblheader_Details">Partner</para>
1062- </td>
1063- <td>
1064- <para style="terp_tblheader_Details">Ref</para>
1065- </td>
1066- <td>
1067- <para style="terp_tblheader_Details">Move</para>
1068- </td>
1069- <td>
1070- <para style="terp_tblheader_Details">Entry Label</para>
1071- </td>
1072- <td>
1073- <para style="terp_tblheader_Details">Counterpart</para>
1074- </td>
1075- <td>
1076- <para style="terp_tblheader_Details_Right">Debit</para>
1077- </td>
1078- <td>
1079- <para style="terp_tblheader_Details_Right">Credit</para>
1080- </td>
1081- <td>
1082- <para style="terp_tblheader_Details_Right">Balance</para>
1083- </td>
1084- </tr>
1085- </blockTable>
1086- </pto_header>
1087- <para style="terp_default_7">[[ repeatIn(objects, 'a') ]]</para>
1088+ <para style="terp_default_8">[[ repeatIn(objects, 'a') ]]</para>
1089 <para style="terp_header_Centre">General Ledger</para>
1090- <para style="terp_default_7">
1091+ <para style="terp_default_8">
1092 <font color="white"> </font>
1093 </para>
1094- <blockTable colWidths="110.0,110.0,110.0,110.0,128.0,93.0,110.0" style="Table1">
1095+ <blockTable colWidths="112.0,112.0,112.0,112.0,130.0,94.0,112.0" style="Table1">
1096 <tr>
1097 <td>
1098 <para style="terp_tblheader_General_Centre">[[ data['model']=='account.account' and 'Company' or removeParentNode('para') ]]</para>
1099@@ -383,99 +201,59 @@
1100 </td>
1101 </tr>
1102 </blockTable>
1103- <blockTable colWidths="110.0,110.0,110.0,110.0,128.0,93.0,110.0" style="Table2">
1104+ <blockTable colWidths="112.0,112.0,112.0,112.0,130.0,94.0,112.0" style="Table2">
1105 <tr>
1106 <td>
1107- <para style="terp_default_Centre_7">[[ get_account(data) or removeParentNode('para') ]]</para>
1108- </td>
1109- <td>
1110- <para style="terp_default_Centre_7">[[ get_fiscalyear(data) or '' ]]</para>
1111- </td>
1112- <td>
1113- <para style="terp_default_Centre_7">[[', '.join([ lt or '' for lt in get_journal(data) ]) ]]</para>
1114- </td>
1115- <td>
1116- <para style="terp_default_Centre_7">[[ (data['form']['display_account']=='bal_all' and 'All') or (data['form']['display_account']=='bal_movement' and 'With movements') or 'With balance is not equal to 0']]</para>
1117- </td>
1118- <td>
1119- <para style="terp_default_Centre_7">[[ get_filter(data)=='No Filter' and get_filter(data) or removeParentNode('para') ]]</para>
1120- <blockTable colWidths="58.0,58.0" style="Table3">[[ get_filter(data)=='Date' or removeParentNode('blockTable') ]]
1121- <tr>
1122- <td>
1123- <para style="terp_tblheader_General_Centre">Start Date</para>
1124- </td>
1125- <td>
1126- <para style="terp_tblheader_General_Centre">End Date</para>
1127- </td>
1128- </tr>
1129- </blockTable>
1130- <blockTable colWidths="58.0,58.0" style="Table4">[[ get_filter(data)=='Date' or removeParentNode('blockTable') ]]
1131- <tr>
1132- <td>
1133- <para style="terp_default_Centre_7">[[ formatLang(get_start_date(data),date=True) ]]</para>
1134- </td>
1135- <td>
1136- <para style="terp_default_Centre_7">[[ formatLang(get_end_date(data),date=True) ]]</para>
1137- </td>
1138- </tr>
1139- </blockTable>
1140- <blockTable colWidths="58.0,58.0" style="Table5">[[ get_filter(data)=='Periods' or removeParentNode('blockTable') ]]
1141- <tr>
1142- <td>
1143- <para style="terp_tblheader_General_Centre">Start Period</para>
1144- </td>
1145- <td>
1146- <para style="terp_tblheader_General_Centre">End Period</para>
1147- </td>
1148- </tr>
1149- </blockTable>
1150- <blockTable colWidths="58.0,58.0" style="Table6">[[ get_filter(data)=='Periods' or removeParentNode('blockTable') ]]
1151- <tr>
1152- <td>
1153- <para style="terp_default_Centre_7">[[ get_start_period(data) or removeParentNode('para') ]]</para>
1154- </td>
1155- <td>
1156- <para style="terp_default_Centre_7">[[ get_end_period(data) or removeParentNode('para') ]]</para>
1157- </td>
1158- </tr>
1159- </blockTable>
1160- </td>
1161- <td>
1162- <para style="terp_default_Centre_7">[[ get_sortby(data) ]]</para>
1163- </td>
1164- <td>
1165- <para style="terp_default_Centre_7">[[ get_target_move(data) ]]</para>
1166+ <para style="terp_default_Centre_8">[[ get_account(data) or removeParentNode('para') ]]</para>
1167+ </td>
1168+ <td>
1169+ <para style="terp_default_Centre_8">[[ get_fiscalyear(data) or '' ]]</para>
1170+ </td>
1171+ <td>
1172+ <para style="terp_default_Centre_8">[[', '.join([ lt or '' for lt in get_journal(data) ]) ]]</para>
1173+ </td>
1174+ <td>
1175+ <para style="terp_default_Centre_8">[[ (data['form']['display_account']=='bal_all' and 'All') or (data['form']['display_account']=='bal_movement' and 'With movements') or 'With balance is not equal to 0']]</para>
1176+ </td>
1177+ <td>
1178+ <para style="terp_default_Centre_8">[[ get_filter_info(data) ]]</para>
1179+ <para style="terp_default_Centre_8">
1180+ <font color="white"> </font>
1181+ </para>
1182+ </td>
1183+ <td>
1184+ <para style="terp_default_Centre_8">[[ get_sortby(data) ]]</para>
1185+ </td>
1186+ <td>
1187+ <para style="terp_default_Centre_8">[[ get_target_move(data) ]]</para>
1188 </td>
1189 </tr>
1190 </blockTable>
1191- <para style="terp_default_7">
1192- <font color="white"> </font>
1193+ <para style="terp_default_8">
1194+ <font color="white"> </font>
1195 </para>
1196- <blockTable colWidths="45.0,35.0,30.0,90.0,65.0,55.0,100.0,70.0,65.0,65.0,75.0,75.0" style="Table7">[[data['form']['amount_currency'] == True or removeParentNode('blockTable')]]
1197+ <blockTable colWidths="37.0,54.0,99.0,71.0,71.0,99.0,57.0,71.0,71.0,71.0,85.0" style="Table7">
1198 <tr>
1199 <td>
1200 <para style="terp_tblheader_Details">Date</para>
1201 </td>
1202 <td>
1203- <para style="terp_tblheader_Details">Period</para>
1204- </td>
1205- <td>
1206- <para style="terp_tblheader_Details">JRNL</para>
1207+ <para style="terp_tblheader_Details">JNRL</para>
1208 </td>
1209 <td>
1210 <para style="terp_tblheader_Details">Partner</para>
1211 </td>
1212 <td>
1213- <para style="terp_tblheader_Details">Ref</para>
1214+ <para style="terp_tblheader_Details_Centre">Ref</para>
1215 </td>
1216 <td>
1217- <para style="terp_tblheader_Details">Move</para>
1218+ <para style="terp_tblheader_Details_Centre">Move</para>
1219 </td>
1220 <td>
1221 <para style="terp_tblheader_Details">Entry Label</para>
1222 </td>
1223 <td>
1224- <para style="terp_tblheader_Details">Counterpart</para>
1225+ <para style="terp_tblheader_Details_Centre">Counterpart</para>
1226 </td>
1227 <td>
1228 <para style="terp_tblheader_Details_Right">Debit</para>
1229@@ -492,95 +270,89 @@
1230 </tr>
1231 </blockTable>
1232 <section>
1233- <para style="terp_default_7">[[ repeatIn(get_children_accounts(a), 'o') ]]</para>
1234- <blockTable rowHeights="0.55cm" colWidths="490.0,65.0,65.0,75.0,75.0" style="Table8">[[data['form']['amount_currency'] == True or removeParentNode('blockTable')]]
1235+ <para style="terp_default_8">[[ repeatIn(get_children_accounts(a), 'o') ]]</para>
1236+ <blockTable colWidths="488.0,71.0,71.0,71.0,85.0" style="Table8">
1237 <tr>
1238 <td>
1239- <para style="terp_default_Bold_7"><font color="white">[[ '..'*(o.level-1) ]]</font>[[ o.code ]] [[ o.name ]]</para>
1240- </td>
1241- <td>
1242- <para style="terp_default_Bold_7_Right">[[ formatLang(sum_debit_account(o), digits=get_digits(dp='Account')) ]]</para>
1243- </td>
1244- <td>
1245- <para style="terp_default_Bold_7_Right">[[ formatLang(sum_credit_account(o), digits=get_digits(dp='Account')) ]]</para>
1246- </td>
1247- <td>
1248- <para style="terp_default_Bold_7_Right">[[ formatLang(sum_balance_account(o), digits=get_digits(dp='Account')) ]] [[ company.currency_id.symbol ]]</para>
1249- </td>
1250- <td>
1251- <para style="terp_default_Bold_7_Right">[[ o.currency_id and formatLang(sum_currency_amount_account(o), digits=get_digits(dp='Account')) + o.currency_id.symbol or '' ]]</para>
1252+ <para style="terp_default_Bold_9">[[ '..'*(o.level-1) ]] [[ o.code ]] [[ o.name ]]</para>
1253+ </td>
1254+ <td>
1255+ <para style="terp_default_Bold_9_Right">[[ formatLang(sum_debit_account(o), digits=get_digits(dp='Account')) ]]</para>
1256+ </td>
1257+ <td>
1258+ <para style="terp_default_Bold_9_Right">[[ formatLang(sum_credit_account(o), digits=get_digits(dp='Account')) ]]</para>
1259+ </td>
1260+ <td>
1261+ <para style="terp_default_Bold_9_Right">[[ formatLang(sum_balance_account(o), digits=get_digits(dp='Account')) ]]</para>
1262+ </td>
1263+ <td>
1264+ <para style="P1">[[ get_output_currency_code(data) ]]</para>
1265 </td>
1266 </tr>
1267 </blockTable>
1268 <section>
1269- <para style="terp_default_7">[[ repeatIn(lines(o), 'line') ]]</para>
1270- <blockTable rowHeights="0.55cm" colWidths="45.0,35.0,30.0,90.0,65.0,55.0,100.0,70.0,65.0,65.0,75.0,75.0" style="Table9">[[data['form']['amount_currency'] == True or removeParentNode('blockTable')]]
1271+ <para style="terp_default_8">[[ repeatIn(lines(o), 'line') ]]</para>
1272+ <blockTable colWidths="57.0,33.0,99.0,71.0,71.0,71.0,99.0,57.0,71.0,71.0,85.0" style="Table9">
1273 <tr>
1274 <td>
1275- <para style="terp_default_7">[[ formatLang(line['ldate'],date=True) ]]</para>
1276- </td>
1277- <td>
1278- <para style="terp_default_7">[[ line['period_code'] ]]</para>
1279- </td>
1280- <td>
1281- <para style="terp_default_7">[[ line['lcode'] ]]</para>
1282- </td>
1283- <td>
1284- <para style="terp_default_7">[[ strip_name(line['partner_name'],20) ]]</para>
1285- </td>
1286- <td>
1287- <para style="terp_default_7">[[ strip_name(line['lref'],17) ]]</para>
1288- </td>
1289- <td>
1290- <para style="terp_default_7">[[ line['move'] ]]</para>
1291- </td>
1292- <td>
1293- <para style="terp_default_7">[[ strip_name(line['lname'],22) ]]</para>
1294- </td>
1295- <td>
1296- <para style="terp_default_7">[[ strip_name(line['line_corresp'],18) ]]</para>
1297- </td>
1298- <td>
1299- <para style="terp_default_Right_7">[[ formatLang(line['debit'], digits=get_digits(dp='Account')) ]]</para>
1300- </td>
1301- <td>
1302- <para style="terp_default_Right_7">[[ formatLang(line['credit'], digits=get_digits(dp='Account')) ]]</para>
1303- </td>
1304- <td>
1305- <para style="terp_default_Right_7">[[ formatLang(line['progress'], digits=get_digits(dp='Account')) ]] [[ company.currency_id.symbol ]]</para>
1306- </td>
1307- <td>
1308- <para style="terp_default_Right_7">[[ (line.has_key('currency_id') and line['currency_id']==None or line['amount_currency']==None) and removeParentNode('font') ]] [[ formatLang(line['amount_currency'])]] [[ line['currency_code'] or '']]</para>
1309+ <para style="terp_default_8">[[ formatLang(line['ldate'],date=True) ]]</para>
1310+ </td>
1311+ <td>
1312+ <para style="terp_default_8">[[ line['lcode'] ]]</para>
1313+ </td>
1314+ <td>
1315+ <para style="terp_default_8">[[ line['partner_name'] ]]</para>
1316+ </td>
1317+ <td>
1318+ <para style="terp_default_8">[[ strip_name(line['lref'],15) ]]</para>
1319+ </td>
1320+ <td>
1321+ <para style="terp_default_Centre_8">[[ strip_name(line['move'],15) ]]</para>
1322+ </td>
1323+ <td>
1324+ <para style="terp_default_8">[[ line['lname'] ]]</para>
1325+ </td>
1326+ <td>
1327+ <para style="terp_default_Centre_8">[[ strip_name(line['line_corresp'].replace(', ',','),25) ]]</para>
1328+ </td>
1329+ <td>
1330+ <para style="terp_default_Right_8">[[ formatLang(get_line_debit(line), digits=get_digits(dp='Account')) ]]</para>
1331+ </td>
1332+ <td>
1333+ <para style="terp_default_Right_8">[[ formatLang(get_line_credit(line), digits=get_digits(dp='Account')) ]]</para>
1334+ </td>
1335+ <td>
1336+ <para style="terp_default_Right_8">[[ formatLang(get_line_balance(line), digits=get_digits(dp='Account')) ]] </para>
1337+ </td>
1338+ <td>
1339+ <para style="P2">[[ get_output_currency_code(data) ]]</para>
1340 </td>
1341 </tr>
1342 </blockTable>
1343 </section>
1344 </section>
1345- <blockTable colWidths="45.0,35.0,30.0,105.0,80.0,55.0,130.0,95.0,65.0,65.0,75.0" style="Table10">[[ data['form']['amount_currency'] == False or removeParentNode('blockTable') ]]
1346+ <blockTable colWidths="37.0,54.0,113.0,71.0,71.0,142.0,71.0,71.0,71.0,85.0" style="Table10">
1347 <tr>
1348 <td>
1349- <para style="terp_tblheader_Details">Date</para>
1350- </td>
1351- <td>
1352- <para style="terp_tblheader_Details">Period</para>
1353- </td>
1354- <td>
1355- <para style="terp_tblheader_Details">JRNL</para>
1356+ <para style="terp_tblheader_Details">[[ removeParentNode('blockTable') ]]</para>
1357+ </td>
1358+ <td>
1359+ <para style="terp_tblheader_Details">JNRL</para>
1360 </td>
1361 <td>
1362 <para style="terp_tblheader_Details">Partner</para>
1363 </td>
1364 <td>
1365- <para style="terp_tblheader_Details">Ref</para>
1366+ <para style="terp_tblheader_Details_Centre">Ref</para>
1367 </td>
1368 <td>
1369- <para style="terp_tblheader_Details">Move</para>
1370+ <para style="terp_tblheader_Details_Centre">Move</para>
1371 </td>
1372 <td>
1373 <para style="terp_tblheader_Details">Entry Label</para>
1374 </td>
1375 <td>
1376- <para style="terp_tblheader_Details">Counterpart</para>
1377+ <para style="terp_tblheader_Details_Centre">Counterpart</para>
1378 </td>
1379 <td>
1380 <para style="terp_tblheader_Details_Right">Debit</para>
1381@@ -594,64 +366,64 @@
1382 </tr>
1383 </blockTable>
1384 <section>
1385- <para style="Standard">[[ repeatIn(get_children_accounts(a), 'o') ]]</para>
1386- <blockTable rowHeights="0.55cm" colWidths="575.0,65.0,65.0,75.0" style="Table11">[[ data['form']['amount_currency'] == False or removeParentNode('blockTable') ]]
1387+ <para style="terp_default_8">[[ repeatIn(get_children_accounts(a), 'o') ]]</para>
1388+ <blockTable colWidths="558.0,71.0,71.0,85.0" style="Table11">
1389 <tr>
1390 <td>
1391- <para style="terp_default_Bold_7"><font color="white">[[ '..'*(o.level-1) ]]</font>[[ o.code ]] [[ o.name ]]</para>
1392- </td>
1393- <td>
1394- <para style="terp_default_Bold_7_Right">[[ formatLang(sum_debit_account(o), digits=get_digits(dp='Account')) ]]</para>
1395- </td>
1396- <td>
1397- <para style="terp_default_Bold_7_Right">[[ formatLang(sum_credit_account(o), digits=get_digits(dp='Account')) ]]</para>
1398- </td>
1399- <td>
1400- <para style="terp_default_Bold_7_Right">[[ formatLang(sum_balance_account(o), digits=get_digits(dp='Account')) ]] [[ company.currency_id.symbol ]]</para>
1401+ <para style="terp_default_Bold_9">[[ data['form']['amount_currency'] == False or removeParentNode('blockTable') ]] [[ '..'*(o.level-1) ]] [[ o.code ]] [[ o.name ]]</para>
1402+ </td>
1403+ <td>
1404+ <para style="terp_default_Bold_9_Right">[[ formatLang(sum_debit_account(o), digits=get_digits(dp='Account')) ]]</para>
1405+ </td>
1406+ <td>
1407+ <para style="terp_default_Bold_9_Right">[[ formatLang(sum_credit_account(o), digits=get_digits(dp='Account')) ]]</para>
1408+ </td>
1409+ <td>
1410+ <para style="terp_default_Bold_9_Right">[[ formatLang(sum_balance_account(o), digits=get_digits(dp='Account')) ]] <font face="Helvetica" size="8.0">[[ get_output_currency_code(data) ]]</font></para>
1411 </td>
1412 </tr>
1413 </blockTable>
1414 <section>
1415- <para style="Standard">[[ repeatIn(lines(o), 'line') ]]</para>
1416- <blockTable rowHeights="0.55cm" colWidths="45.0,35.0,30.0,105.0,80.0,55.0,130.0,95.0,65.0,65.0,75.0" style="Table12">[[ data['form']['amount_currency'] == False or removeParentNode('blockTable') ]]
1417+ <para style="terp_default_8">[[ repeatIn(lines(o), 'line') ]]</para>
1418+ <blockTable colWidths="37.0,54.0,113.0,71.0,71.0,142.0,71.0,71.0,71.0,85.0" style="Table12">
1419 <tr>
1420 <td>
1421- <para style="terp_default_7">[[ formatLang(line['ldate'],date=True) ]]</para>
1422- </td>
1423- <td>
1424- <para style="terp_default_7">[[ line['period_code'] ]]</para>
1425- </td>
1426- <td>
1427- <para style="terp_default_7">[[ line['lcode'] ]]</para>
1428- </td>
1429- <td>
1430- <para style="terp_default_7">[[ strip_name(line['partner_name'],24) ]]</para>
1431- </td>
1432- <td>
1433- <para style="terp_default_7">[[ strip_name(line['lref'],21) ]]</para>
1434- </td>
1435- <td>
1436- <para style="terp_default_7">[[ line['move'] ]]</para>
1437- </td>
1438- <td>
1439- <para style="terp_default_7">[[ strip_name(line['lname'],28) ]]</para>
1440- </td>
1441- <td>
1442- <para style="terp_default_7">[[ strip_name(line['line_corresp'],23) ]]</para>
1443- </td>
1444- <td>
1445- <para style="terp_default_Right_7">[[ formatLang(line['debit'], digits=get_digits(dp='Account')) ]]</para>
1446- </td>
1447- <td>
1448- <para style="terp_default_Right_7">[[ formatLang(line['credit'], digits=get_digits(dp='Account')) ]]</para>
1449- </td>
1450- <td>
1451- <para style="terp_default_Right_7">[[ formatLang(line['progress'], digits=get_digits(dp='Account')) ]] [[ company.currency_id.symbol ]]</para>
1452+ <para style="terp_default_8">[[ data['form']['amount_currency'] == False or removeParentNode('blockTable') ]] [[ formatLang(line['ldate'],date=True) ]]</para>
1453+ </td>
1454+ <td>
1455+ <para style="terp_default_8">[[ line['lcode'] ]]</para>
1456+ </td>
1457+ <td>
1458+ <para style="terp_default_8">[[ line['partner_name'] ]]</para>
1459+ </td>
1460+ <td>
1461+ <para style="terp_default_8">[[ line['lref'] ]]</para>
1462+ </td>
1463+ <td>
1464+ <para style="terp_default_8">[[ line['move'] ]]</para>
1465+ </td>
1466+ <td>
1467+ <para style="terp_default_8">[[ line['lname'] ]]</para>
1468+ </td>
1469+ <td>
1470+ <para style="terp_default_Centre_8">[[ strip_name(line['line_corresp'].replace(', ',','),25) ]]</para>
1471+ </td>
1472+ <td>
1473+ <para style="terp_default_Right_8">[[ formatLang(line['debit'], digits=get_digits(dp='Account')) ]]</para>
1474+ </td>
1475+ <td>
1476+ <para style="terp_default_Right_8">[[ formatLang(line['credit'], digits=get_digits(dp='Account')) ]]</para>
1477+ </td>
1478+ <td>
1479+ <para style="terp_default_Right_8">[[ formatLang(line['progress'], digits=get_digits(dp='Account')) ]] <font face="Helvetica" size="8.0">[[ company.currency_id.namel ]]</font></para>
1480 </td>
1481 </tr>
1482 </blockTable>
1483+ <para style="terp_default_2">
1484+ <font color="white"> </font>
1485+ </para>
1486 </section>
1487 </section>
1488- </pto>
1489 </story>
1490 </document>
1491+
1492
1493=== modified file 'account/report/account_general_ledger_landscape.sxw'
1494Binary files account/report/account_general_ledger_landscape.sxw 2011-01-14 00:11:01 +0000 and account/report/account_general_ledger_landscape.sxw 2013-12-20 09:30:16 +0000 differ
1495=== added file 'account/report/account_general_ledger_xls.mako'
1496--- account/report/account_general_ledger_xls.mako 1970-01-01 00:00:00 +0000
1497+++ account/report/account_general_ledger_xls.mako 2013-12-20 09:30:16 +0000
1498@@ -0,0 +1,279 @@
1499+<?xml version="1.0"?>
1500+<Workbook xmlns="urn:schemas-microsoft-com:office:spreadsheet"
1501+xmlns:o="urn:schemas-microsoft-com:office:office"
1502+xmlns:x="urn:schemas-microsoft-com:office:excel"
1503+xmlns:ss="urn:schemas-microsoft-com:office:spreadsheet"
1504+xmlns:html="http://www.w3.org/TR/REC-html40">
1505+<DocumentProperties xmlns="urn:schemas-microsoft-com:office:office">
1506+<Title>General Ledger</Title>
1507+</DocumentProperties>
1508+<Styles>
1509+<Style ss:ID="ssCell">
1510+<Alignment ss:Vertical="Top" ss:WrapText="1"/>
1511+</Style>
1512+<Style ss:ID="ssH">
1513+<Alignment ss:Horizontal="Center" ss:Vertical="Center" ss:WrapText="1"/>
1514+<Font ss:Bold="1" />
1515+<Borders>
1516+ <Border ss:Position="Bottom" ss:LineStyle="Continuous" ss:Weight="1" />
1517+ <Border ss:Position="Left" ss:LineStyle="Continuous" ss:Weight="1" />
1518+ <Border ss:Position="Right" ss:LineStyle="Continuous" ss:Weight="1" />
1519+ <Border ss:Position="Top" ss:LineStyle="Continuous" ss:Weight="1" />
1520+</Borders>
1521+</Style>
1522+<Style ss:ID="ssBorder">
1523+<Alignment ss:Vertical="Center" ss:WrapText="1"/>
1524+<Borders>
1525+ <Border ss:Position="Bottom" ss:LineStyle="Continuous" ss:Weight="1" />
1526+ <Border ss:Position="Left" ss:LineStyle="Continuous" ss:Weight="1" />
1527+ <Border ss:Position="Right" ss:LineStyle="Continuous" ss:Weight="1" />
1528+ <Border ss:Position="Top" ss:LineStyle="Continuous" ss:Weight="1" />
1529+</Borders>
1530+</Style>
1531+<Style ss:ID="ssBorderDate">
1532+<Alignment ss:Vertical="Center" ss:WrapText="1"/>
1533+<Borders>
1534+ <Border ss:Position="Bottom" ss:LineStyle="Continuous" ss:Weight="1" />
1535+ <Border ss:Position="Left" ss:LineStyle="Continuous" ss:Weight="1" />
1536+ <Border ss:Position="Right" ss:LineStyle="Continuous" ss:Weight="1" />
1537+ <Border ss:Position="Top" ss:LineStyle="Continuous" ss:Weight="1" />
1538+</Borders>
1539+<NumberFormat ss:Format="Short Date" />
1540+</Style>
1541+<Style ss:ID="ssNumber">
1542+<Borders>
1543+ <Border ss:Position="Bottom" ss:LineStyle="Continuous" ss:Weight="1" />
1544+ <Border ss:Position="Left" ss:LineStyle="Continuous" ss:Weight="1" />
1545+ <Border ss:Position="Right" ss:LineStyle="Continuous" ss:Weight="1" />
1546+ <Border ss:Position="Top" ss:LineStyle="Continuous" ss:Weight="1" />
1547+</Borders>
1548+<Alignment ss:Horizontal="Right" ss:Vertical="Center" ss:WrapText="1"/>
1549+<NumberFormat ss:Format="#,##0.00"/>
1550+</Style>
1551+<Style ss:ID="ssHeader">
1552+<Alignment ss:Vertical="Top" ss:WrapText="1"/>
1553+<Borders>
1554+ <Border ss:Position="Bottom" ss:LineStyle="Continuous" ss:Weight="1" />
1555+ <Border ss:Position="Left" ss:LineStyle="Continuous" ss:Weight="1" />
1556+ <Border ss:Position="Right" ss:LineStyle="Continuous" ss:Weight="1" />
1557+ <Border ss:Position="Top" ss:LineStyle="Continuous" ss:Weight="1" />
1558+</Borders>
1559+</Style>
1560+<Style ss:ID="ssAccountLine">
1561+<Alignment ss:Bottom="Top" ss:WrapText="1"/>
1562+<Font ss:Size="8" ss:Italic="1"/>
1563+<Borders>
1564+ <Border ss:Position="Bottom" ss:LineStyle="Continuous" ss:Weight="1" />
1565+ <Border ss:Position="Left" ss:LineStyle="Continuous" ss:Weight="1" />
1566+ <Border ss:Position="Right" ss:LineStyle="Continuous" ss:Weight="1" />
1567+ <Border ss:Position="Top" ss:LineStyle="Continuous" ss:Weight="1" />
1568+</Borders>
1569+</Style>
1570+<Style ss:ID="ssAccountLine2">
1571+<Alignment ss:Bottom="Top" ss:WrapText="1"/>
1572+<Font ss:Size="8"/>
1573+<Borders>
1574+ <Border ss:Position="Bottom" ss:LineStyle="Continuous" ss:Weight="1" />
1575+ <Border ss:Position="Left" ss:LineStyle="Continuous" ss:Weight="1" />
1576+ <Border ss:Position="Right" ss:LineStyle="Continuous" ss:Weight="1" />
1577+ <Border ss:Position="Top" ss:LineStyle="Continuous" ss:Weight="1" />
1578+</Borders>
1579+</Style>
1580+<Style ss:ID="ssAccountLineNumber">
1581+<Alignment ss:Horizontal="Right" ss:Vertical="Bottom" ss:WrapText="1"/>
1582+<Font ss:Size="8"/>
1583+<Borders>
1584+ <Border ss:Position="Bottom" ss:LineStyle="Continuous" ss:Weight="1" />
1585+ <Border ss:Position="Left" ss:LineStyle="Continuous" ss:Weight="1" />
1586+ <Border ss:Position="Right" ss:LineStyle="Continuous" ss:Weight="1" />
1587+ <Border ss:Position="Top" ss:LineStyle="Continuous" ss:Weight="1" />
1588+</Borders>
1589+<NumberFormat ss:Format="#,##0.00"/>
1590+</Style>
1591+</Styles>
1592+<Worksheet ss:Name="Sheet">
1593+<%
1594+ max = 11
1595+ if data['model'] == 'account.account':
1596+ header_company_or_chart_of_account = 'Company'
1597+ else:
1598+ header_company_or_chart_of_account = 'Chart of Account'
1599+ if 'all_journals' in data['form']:
1600+ journals = 'All Journals'
1601+ else:
1602+ journals = ', '.join([lt or '' for lt in get_journal(data)])
1603+ display_account = (data['form']['display_account']=='bal_all' and 'All') or (data['form']['display_account']=='bal_movement' and 'With movements') or 'With balance is not equal to 0'
1604+ prop_instances_list = get_prop_instances(data)
1605+ if prop_instances_list:
1606+ prop_instances = ', '.join([lt or '' for lt in get_prop_instances(data)])
1607+ else:
1608+ prop_instances = 'All Instances'
1609+%>
1610+<Table x:FullColumns="1" x:FullRows="1">
1611+<Column ss:AutoFitWidth="1" ss:Width="64" />
1612+<Column ss:AutoFitWidth="1" ss:Width="50" />
1613+<Column ss:AutoFitWidth="1" ss:Width="50" />
1614+<Column ss:AutoFitWidth="1" ss:Width="50" />
1615+<Column ss:AutoFitWidth="1" ss:Width="50" />
1616+<Column ss:AutoFitWidth="1" ss:Width="50" />
1617+<Column ss:AutoFitWidth="1" ss:Width="50" />
1618+<Column ss:AutoFitWidth="1" ss:Width="64" />
1619+<Column ss:AutoFitWidth="1" ss:Width="64" />
1620+<Column ss:AutoFitWidth="1" ss:Width="64" />
1621+<Column ss:AutoFitWidth="1" ss:Width="50" />
1622+<Row>
1623+<Cell ss:StyleID="ssH"><Data ss:Type="String">${header_company_or_chart_of_account}</Data></Cell>
1624+<Cell ss:StyleID="ssH"><Data ss:Type="String">Fiscal Year</Data></Cell>
1625+<Cell ss:StyleID="ssH"><Data ss:Type="String">Journals</Data></Cell>
1626+<Cell ss:StyleID="ssH"><Data ss:Type="String">Display Account</Data></Cell>
1627+<Cell ss:StyleID="ssH"><Data ss:Type="String">Filter By ${(get_filter(data) or '')|x}</Data></Cell>
1628+<Cell ss:StyleID="ssH"><Data ss:Type="String">Entries Sorted By</Data></Cell>
1629+<Cell ss:StyleID="ssH"><Data ss:Type="String">Target Moves</Data></Cell>
1630+<Cell ss:StyleID="ssH"><Data ss:Type="String">Proprietary Instances</Data></Cell>
1631+<Cell ss:StyleID="ssCell"></Cell>
1632+<Cell ss:StyleID="ssCell"></Cell>
1633+<Cell ss:StyleID="ssCell"></Cell>
1634+</Row>
1635+% for a in objects:
1636+<Row>
1637+<Cell ss:StyleID="ssHeader">
1638+ <Data ss:Type="String">${(get_account(data) or '')|x}</Data>
1639+</Cell>
1640+<Cell ss:StyleID="ssHeader">
1641+ <Data ss:Type="String">${(get_fiscalyear(data) or '')|x}</Data>
1642+</Cell>
1643+<Cell ss:StyleID="ssHeader">
1644+ <Data ss:Type="String">${(journals or '')|x}</Data>
1645+</Cell>
1646+<Cell ss:StyleID="ssHeader">
1647+ <Data ss:Type="String">${(display_account or '')|x}</Data>
1648+</Cell>
1649+<Cell ss:StyleID="ssHeader">
1650+ <Data ss:Type="String">${(get_filter_info(data) or '')|x}</Data>
1651+</Cell>
1652+<Cell ss:StyleID="ssHeader">
1653+ <Data ss:Type="String">${(get_sortby(data) or '')|x}</Data>
1654+</Cell>
1655+<Cell ss:StyleID="ssHeader">
1656+ <Data ss:Type="String">${(get_target_move(data) or '')|x}</Data>
1657+</Cell>
1658+<Cell ss:StyleID="ssHeader">
1659+ <Data ss:Type="String">${(prop_instances or '')|x}</Data>
1660+</Cell>
1661+<Cell ss:StyleID="ssCell"></Cell>
1662+<Cell ss:StyleID="ssCell"></Cell>
1663+<Cell ss:StyleID="ssCell"></Cell>
1664+</Row>
1665+<Row>
1666+<Cell></Cell>
1667+<Cell></Cell>
1668+<Cell></Cell>
1669+<Cell></Cell>
1670+<Cell></Cell>
1671+<Cell></Cell>
1672+<Cell></Cell>
1673+<Cell></Cell>
1674+<Cell></Cell>
1675+<Cell></Cell>
1676+<Cell></Cell>
1677+</Row>
1678+<Row>
1679+<Cell ss:StyleID="ssH"><Data ss:Type="String">Date</Data></Cell>
1680+<Cell ss:StyleID="ssH"><Data ss:Type="String">JRNL</Data></Cell>
1681+<Cell ss:StyleID="ssH"><Data ss:Type="String">Partner</Data></Cell>
1682+<Cell ss:StyleID="ssH"><Data ss:Type="String">Ref</Data></Cell>
1683+<Cell ss:StyleID="ssH"><Data ss:Type="String">Move</Data></Cell>
1684+<Cell ss:StyleID="ssH"><Data ss:Type="String">Entry Label</Data></Cell>
1685+<Cell ss:StyleID="ssH"><Data ss:Type="String">Counter part</Data></Cell>
1686+<Cell ss:StyleID="ssH"><Data ss:Type="String">Debit</Data></Cell>
1687+<Cell ss:StyleID="ssH"><Data ss:Type="String">Credit</Data></Cell>
1688+<Cell ss:StyleID="ssH"><Data ss:Type="String">Balance</Data></Cell>
1689+<Cell ss:StyleID="ssH"><Data ss:Type="String">Currency</Data></Cell>
1690+</Row>
1691+% for o in get_children_accounts(a):
1692+<Row>
1693+<Cell ss:StyleID="ssBorder">
1694+</Cell>
1695+<Cell ss:StyleID="ssBorder">
1696+ <Data ss:Type="String">${(o.code or '')|x}</Data>
1697+</Cell>
1698+<Cell ss:StyleID="ssBorder" ss:MergeAcross="4">
1699+ <Data ss:Type="String">${(o.name or '')|x}</Data>
1700+</Cell>
1701+<Cell ss:StyleID="ssNumber">
1702+ <Data ss:Type="Number">${sum_debit_account(o)}</Data>
1703+</Cell>
1704+<Cell ss:StyleID="ssNumber">
1705+ <Data ss:Type="Number">${sum_credit_account(o)}</Data>
1706+</Cell>
1707+<Cell ss:StyleID="ssNumber">
1708+ <Data ss:Type="Number">${sum_balance_account(o)}</Data>
1709+</Cell>
1710+<Cell ss:StyleID="ssBorder">
1711+ <Data ss:Type="String">${get_output_currency_code(data)}</Data>
1712+</Cell>
1713+</Row>
1714+% for line in lines(o):
1715+<Row>
1716+<Cell ss:StyleID="ssAccountLine">
1717+ <Data ss:Type="String">${(formatLang(line['ldate'],date=True)) or ''}</Data>
1718+</Cell>
1719+<Cell ss:StyleID="ssAccountLine">
1720+ <Data ss:Type="String">${(line['lcode'] or '')|x}</Data>
1721+</Cell>
1722+<Cell ss:StyleID="ssAccountLine">
1723+ <Data ss:Type="String">${(line['partner_name'] or '')|x}</Data>
1724+</Cell>
1725+<Cell ss:StyleID="ssAccountLine">
1726+ <Data ss:Type="String">${(line['lref'] or '')|x}</Data>
1727+</Cell>
1728+<Cell ss:StyleID="ssAccountLine">
1729+ <Data ss:Type="String">${(line['move'] or '')|x}</Data>
1730+</Cell>
1731+<Cell ss:StyleID="ssAccountLine">
1732+ <Data ss:Type="String">${(line['lname'] or '')|x}</Data>
1733+</Cell>
1734+<Cell ss:StyleID="ssAccountLineNumber">
1735+ <Data ss:Type="Number">${((strip_name(line['line_corresp'].replace(', ',''),25)) or '')|x}</Data>
1736+</Cell>
1737+<Cell ss:StyleID="ssAccountLineNumber">
1738+ <Data ss:Type="Number">${get_line_debit(line)}</Data>
1739+</Cell>
1740+<Cell ss:StyleID="ssAccountLineNumber">
1741+ <Data ss:Type="Number">${get_line_credit(line)}</Data>
1742+</Cell>
1743+<Cell ss:StyleID="ssAccountLineNumber">
1744+ <Data ss:Type="Number">${get_line_balance(line)}</Data>
1745+</Cell>
1746+<Cell ss:StyleID="ssAccountLine2">
1747+ <Data ss:Type="String">${get_output_currency_code(data)}</Data>
1748+</Cell>
1749+</Row>
1750+% endfor
1751+% endfor
1752+% endfor
1753+</Table>
1754+<WorksheetOptions xmlns="urn:schemas-microsoft-com:office:excel">
1755+ <PageSetup>
1756+ <Layout x:Orientation="Landscape"/>
1757+ <Header x:Data="&amp;C&amp;&quot;Arial,Bold&quot;&amp;14General Ledger"/>
1758+ <Footer x:Data="Page &amp;P of &amp;N"/>
1759+ </PageSetup>
1760+ <Print>
1761+ <ValidPrinterInfo/>
1762+ <PaperSizeIndex>9</PaperSizeIndex>
1763+ <HorizontalResolution>600</HorizontalResolution>
1764+ <VerticalResolution>600</VerticalResolution>
1765+ </Print>
1766+ <Selected/>
1767+ <Panes>
1768+ <Pane>
1769+ <Number>3</Number>
1770+ <ActiveRow>17</ActiveRow>
1771+ </Pane>
1772+ </Panes>
1773+ <ProtectObjects>False</ProtectObjects>
1774+ <ProtectScenarios>False</ProtectScenarios>
1775+</WorksheetOptions>
1776+</Worksheet>
1777+</Workbook>
1778
1779=== modified file 'account/wizard/account_report_general_ledger.py'
1780--- account/wizard/account_report_general_ledger.py 2011-01-14 00:11:01 +0000
1781+++ account/wizard/account_report_general_ledger.py 2013-12-20 09:30:16 +0000
1782@@ -32,31 +32,79 @@
1783 help='It adds initial balance row on report which display previous sum amount of debit/credit/balance'),
1784 'amount_currency': fields.boolean("With Currency", help="It adds the currency column if the currency is different then the company currency"),
1785 'sortby': fields.selection([('sort_date', 'Date'), ('sort_journal_partner', 'Journal & Partner')], 'Sort By', required=True),
1786+ 'output_currency': fields.many2one('res.currency', 'Output Currency', required=True),
1787+ 'instance_ids': fields.many2many('msf.instance', 'account_report_general_ledger_instance_rel', 'instance_id', 'argl_id', 'Proprietary Instances'),
1788+ #'export_format': fields.selection([('xls', 'Excel'), ('csv', 'CSV'), ('pdf', 'PDF')], string="Export format", required=True),
1789+ 'export_format': fields.selection([('xls', 'Excel'), ('pdf', 'PDF')], string="Export format", required=True),
1790 }
1791+
1792+ def _get_journals(self, cr, uid, context=None):
1793+ """exclude extra-accounting journals from this report (IKD, ODX)."""
1794+ domain = [('type', 'not in', ['inkind', 'extra'])]
1795+ return self.pool.get('account.journal').search(cr, uid, domain, context=context)
1796+
1797 _defaults = {
1798 'landscape': True,
1799 'amount_currency': True,
1800 'sortby': 'sort_date',
1801 'initial_balance': False,
1802+ 'amount_currency': True,
1803+ 'export_format': 'pdf',
1804+ 'journal_ids': _get_journals, # exclude extra-accounting journals from this report (IKD, ODX)
1805 }
1806+
1807+ def default_get(self, cr, uid, fields, context=None):
1808+ res = super(account_report_general_ledger, self).default_get(cr, uid, fields, context=context)
1809+ # get company default currency
1810+ user = self.pool.get('res.users').browse(cr, uid, [uid], context=context)
1811+ if user and user[0] and user[0].company_id:
1812+ res['output_currency'] = user[0].company_id.currency_id.id
1813+ return res
1814
1815 def onchange_fiscalyear(self, cr, uid, ids, fiscalyear=False, context=None):
1816 res = {}
1817 if not fiscalyear:
1818 res['value'] = {'initial_balance': False}
1819 return res
1820+
1821+ def remove_journals(self, cr, uid, ids, context=None):
1822+ if ids:
1823+ self.write(cr, uid, ids, { 'journal_ids': [(6, 0, [])] },
1824+ context=context)
1825+ return {}
1826
1827 def _print_report(self, cr, uid, ids, data, context=None):
1828 if context is None:
1829 context = {}
1830 data = self.pre_print_report(cr, uid, ids, data, context=context)
1831- data['form'].update(self.read(cr, uid, ids, ['landscape', 'initial_balance', 'amount_currency', 'sortby'])[0])
1832+ data['form'].update(self.read(cr, uid, ids, ['landscape', 'initial_balance', 'amount_currency', 'sortby', 'output_currency', 'instance_ids', 'export_format'])[0])
1833 if not data['form']['fiscalyear_id']:# GTK client problem onchange does not consider in save record
1834 data['form'].update({'initial_balance': False})
1835+ if data['form']['journal_ids']:
1836+ default_journals = self._get_journals(cr, uid, context=context)
1837+ if default_journals:
1838+ if len(default_journals) == len(data['form']['journal_ids']):
1839+ data['form']['all_journals'] = True
1840+ if data['form']['export_format'] \
1841+ and data['form']['export_format'] == 'xls':
1842+ return {
1843+ 'type': 'ir.actions.report.xml',
1844+ 'report_name': 'account.general.ledger_xls',
1845+ 'datas': data,
1846+ }
1847 if data['form']['landscape']:
1848- return { 'type': 'ir.actions.report.xml', 'report_name': 'account.general.ledger_landscape', 'datas': data}
1849- return { 'type': 'ir.actions.report.xml', 'report_name': 'account.general.ledger', 'datas': data}
1850-
1851+ return {
1852+ 'type': 'ir.actions.report.xml',
1853+ 'report_name': 'account.general.ledger_landscape',
1854+ 'datas': data,
1855+ }
1856+ return {
1857+ 'type': 'ir.actions.report.xml',
1858+ 'report_name': 'account.general.ledger',
1859+ 'datas': data,
1860+ }
1861+
1862+
1863 account_report_general_ledger()
1864
1865 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
1866
1867=== modified file 'account/wizard/account_report_general_ledger_view.xml'
1868--- account/wizard/account_report_general_ledger_view.xml 2011-01-14 00:11:01 +0000
1869+++ account/wizard/account_report_general_ledger_view.xml 2013-12-20 09:30:16 +0000
1870@@ -16,11 +16,38 @@
1871 <xpath expr="//field[@name='target_move']" position="after">
1872 <field name="display_account"/>
1873 <field name="sortby"/>
1874- <field name="landscape"/>
1875 <field name="initial_balance" attrs="{'readonly':[('fiscalyear_id','=', False)]}"/>
1876- <field name="amount_currency"/>
1877- <newline/>
1878- </xpath>
1879+ <newline/>
1880+ <field name="export_format"/>
1881+ <field name="landscape" attrs="{'invisible': [('export_format', '=', 'xls')]}"/>
1882+ <newline/>
1883+ <field name="output_currency" invisible="1" />
1884+ <field name="amount_currency" invisible="1" />
1885+ <newline/>
1886+ <field name="instance_ids">
1887+ <tree noteditable="1" editable="top" string="Proprietary Instances">
1888+ <field name="code" />
1889+ <field name="name" />
1890+ </tree>
1891+ </field>
1892+ <newline/>
1893+ </xpath>
1894+
1895+ <xpath expr="//field[@name='journal_ids']" position="replace">
1896+ <group col="4" colspan="4">
1897+ <button name="remove_journals" string="Remove all journals" type="object" colspan="1" />
1898+ <label string="" colspan="3" />
1899+ <field name="journal_ids" colspan="4" nolabel="1" noteditable="1">
1900+ <tree noteditable="1" editable="top" string="Account Journal">
1901+ <field name="instance_id" />
1902+ <field name="code" />
1903+ <field name="name" />
1904+ <field name="type" />
1905+ </tree>
1906+ </field>
1907+ </group>
1908+ </xpath>
1909+
1910 </data>
1911 </field>
1912 </record>

Subscribers

People subscribed via source and target branches

to all changes: