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

[jftempo]

[lp:~unifield-team/unifield-addons/uf-1714]

4619. By Vincent GREINER on 2013-12-09

UF-1714 general ledger report view xml update

4620. By Vincent GREINER on 2013-12-09

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

4621. By Vincent GREINER on 2013-12-09

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

4622. By Vincent GREINER on 2013-12-09

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

4623. By Vincent GREINER on 2013-12-09

UF-1714-addons report mako xls layout review

4624. By Vincent GREINER on 2013-12-10

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 on 2013-12-11

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

4626. By Vincent GREINER on 2013-12-18

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

4627. By Vincent GREINER on 2013-12-18

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

4628. By Vincent GREINER on 2013-12-20

UF-1714 hidding output currency criteria

=== modified file 'account/account_report.xml'
--- account/account_report.xml	2013-11-28 20:42:44 +0000
+++ account/account_report.xml	2013-12-20 09:30:16 +0000
@@ -48,6 +48,16 @@
             rml="account/report/account_balance_landscape.rml"
             auto="False"
             menu="False"/>
-
+         
+        <!-- UF-1714 -->
+        <report id="account_general_ledger_xls"
+            auto="False" 
+            menu="False"
+            header="False"
+            model="account.account"
+            name="account.general.ledger_xls"
+            file="account/report/account_general_ledger_xls.mako"
+            report_type="webkit" 
+            string="General Ledger"/>
     </data>
 </openerp>
 
=== modified file 'account/report/account_general_ledger.py'
--- account/report/account_general_ledger.py	2011-01-14 00:11:01 +0000
+++ account/report/account_general_ledger.py	2013-12-20 09:30:16 +0000
@@ -30,6 +30,8 @@
 import time
 from report import report_sxw
 from common_report_header import common_report_header
+from report_webkit.webkit_report import WebKitParser
+from spreadsheet_xml.spreadsheet_xml_write import SpreadsheetReport
 
 class general_ledger(report_sxw.rml_parse, common_report_header):
     _name = 'report.account.general.ledger'
@@ -37,6 +39,7 @@
     def set_context(self, objects, data, ids, report_type=None):
         new_ids = ids
         obj_move = self.pool.get('account.move.line')
+        
         self.sortby = data['form'].get('sortby', 'sort_date')
         self.query = obj_move._query_get(self.cr, self.uid, obj='l', context=data['form'].get('used_context',{}))
         ctx2 = data['form'].get('used_context',{}).copy()
@@ -53,11 +56,60 @@
             ctx['date_from'] = data['form']['date_from']
             ctx['date_to'] =  data['form']['date_to']
         ctx['state'] = data['form']['target_move']
+        if 'instance_ids' in data['form']:
+            ctx['instance_ids'] = data['form']['instance_ids']
         self.context.update(ctx)
         if (data['model'] == 'ir.ui.menu'):
             new_ids = [data['form']['chart_account_id']]
-            objects = self.pool.get('account.account').browse(self.cr, self.uid, new_ids)
-        return super(general_ledger, self).set_context(objects, data, new_ids, report_type=report_type)
+            objects = self.pool.get('account.account').browse(self.cr, self.uid, new_ids, context=self.context)
+        
+        # output currency
+        self.output_currency_id = data['form']['output_currency']
+        self.output_currency_code = ''
+        if self.output_currency_id:
+            ouput_cur_r = self.pool.get('res.currency').read(self.cr,
+                                            self.uid,
+                                            [self.output_currency_id],
+                                            ['name'])
+            if ouput_cur_r and ouput_cur_r[0] and ouput_cur_r[0]['name']:
+                self.output_currency_code = ouput_cur_r[0]['name']
+                
+        # proprietary instances filter
+        self.instance_ids = data['form']['instance_ids'] 
+        if self.instance_ids:
+            # we add instance filter in clauses 'self.query/self.init_query' 
+            instance_ids_in = "l.instance_id in(%s)" % (",".join(map(str, self.instance_ids)))
+            if not self.query:
+                self.query = instance_ids_in
+            else:
+                self.query += ' AND ' + instance_ids_in
+            if not self.init_query:
+                self.init_query = instance_ids_in
+            else:
+                self.init_query += ' AND ' + instance_ids_in
+        
+        res = super(general_ledger, self).set_context(objects, data, new_ids, report_type=report_type)
+
+        # UF-1714
+        # accounts 8*, 9* are not displayed:
+        # we have to deduce debit/credit/balance amounts of MSF account view (root account)
+        self._deduce_accounts = { 
+            '8': {'debit': 0., 'credit': 0., 'balance': 0. },
+            '9': {'debit': 0., 'credit': 0., 'balance': 0. },
+        }
+        a_obj = self.pool.get('account.account')
+        for a_code in self._deduce_accounts:
+            a_ids = a_obj.search(self.cr, self.uid, [('code', '=', a_code)])
+            if a_ids:
+                if isinstance(a_ids, (int, long)):
+                    a_ids = [a_ids]
+                account = a_obj.browse(self.cr, self.uid, a_ids, context=self.context)[0]
+                if account:
+                    self._deduce_accounts[a_code]['debit'] = self._sum_debit_account(account)
+                    self._deduce_accounts[a_code]['credit'] = self._sum_credit_account(account)
+                    self._deduce_accounts[a_code]['balance'] = self._sum_balance_account(account)
+        
+        return res
 
     def __init__(self, cr, uid, name, context=None):
         if context is None:
@@ -68,7 +120,7 @@
         self.period_sql = ""
         self.sold_accounts = {}
         self.sortby = 'sort_date'
-        self.localcontext.update( {
+        self.localcontext.update({
             'time': time,
             'lines': self.lines,
             'sum_debit_account': self._sum_debit_account,
@@ -86,7 +138,27 @@
             'get_start_date':self._get_start_date,
             'get_end_date':self._get_end_date,
             'get_target_move': self._get_target_move,
+            'get_output_currency_code': self._get_output_currency_code,
+            'get_filter_info': self._get_filter_info,
+            'get_line_debit': self._get_line_debit,
+            'get_line_credit': self._get_line_credit,
+            'get_line_balance': self._get_line_balance,
+            'currency_conv': self._currency_conv,
+            'get_prop_instances': self._get_prop_instances,
         })
+        
+        # company currency
+        self.uid = uid
+        self.currency_id = False
+        self.instance_id = False
+        user = self.pool.get('res.users').browse(cr, uid, [uid], context=context)
+        if user and user[0] and user[0].company_id:
+            self.currency_id = user[0].company_id.currency_id.id
+            if user[0].company_id.instance_id:
+                self.instance_id = user[0].company_id.instance_id.id
+        if not self.currency_id:
+            raise osv.except_osv(_('Error !'), _('Company has no default currency'))
+
         self.context = context
 
     def _sum_currency_amount_account(self, account):
@@ -104,9 +176,13 @@
     def get_children_accounts(self, account):
         res = []
         currency_obj = self.pool.get('res.currency')
+         
         ids_acc = self.pool.get('account.account')._get_children_and_consol(self.cr, self.uid, account.id)
         currency = account.currency_id and account.currency_id or account.company_id.currency_id
         for child_account in self.pool.get('account.account').browse(self.cr, self.uid, ids_acc, context=self.context):
+            if child_account.code.startswith('8') or child_account.code.startswith('9'):
+                # UF-1714: exclude accounts '8*'/'9*'
+                continue
             sql = """
                 SELECT count(id)
                 FROM account_move_line AS l
@@ -128,7 +204,6 @@
         if not res:
             return [account]
         return res
-
     def lines(self, account):
         """ Return all the account_move_line of account with their account code counterparts """
         move_state = ['draft','posted']
@@ -161,7 +236,7 @@
         else:
             sql_sort='l.date, l.move_id'
         sql = """
-            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,
+            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,
             m.name AS move_name, m.id AS mmove_id,per.code as period_code,
             c.symbol AS currency_code,
             i.id AS invoice_id, i.type AS invoice_type, i.number AS invoice_number,
@@ -181,7 +256,7 @@
         if res_lines and self.init_balance:
             #FIXME: replace the label of lname with a string translatable
             sql = """
-                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,
+                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,
                 '' AS move_name, '' AS mmove_id, '' AS period_code,
                 '' AS currency_code,
                 NULL AS currency_id,
@@ -215,7 +290,14 @@
 
     def _sum_debit_account(self, account):
         if account.type == 'view':
-            return account.debit
+            amount = account.debit
+            if not account.parent_id:
+                # UF-1714
+                # accounts 8*, 9* are not displayed:
+                # we have to deduce debit/credit/balance amounts of MSF account view (root account)
+                for a_code in self._deduce_accounts:
+                    amount -= self._deduce_accounts[a_code]['debit']
+            return self._currency_conv(amount)
         move_state = ['draft','posted']
         if self.target_move == 'posted':
             move_state = ['posted','']
@@ -226,6 +308,16 @@
                 AND (am.state IN %s) \
                 AND '+ self.query +' '
                 ,(account.id, tuple(move_state)))
+        #~ self.cr.execute("SELECT sum(debit)" \
+                #~ " FROM account_move_line l" \
+                #~ " JOIN account_move am ON (am.id = l.move_id)" \
+                #~ " JOIN account_account a  ON (a.id = l.account_id)" \
+                #~ " WHERE (l.account_id = %s)" \
+                #~ " AND (am.state IN %s)" \
+                #~ " AND (a.code not like '8%%')" \
+                #~ " AND (a.code not like '9%%')" \
+                #~ " AND "+ self.query + " "
+                #~ ,(account.id, tuple(move_state)))
         sum_debit = self.cr.fetchone()[0] or 0.0
         if self.init_balance:
             self.cr.execute('SELECT sum(debit) \
@@ -235,13 +327,31 @@
                     AND (am.state IN %s) \
                     AND '+ self.init_query +' '
                     ,(account.id, tuple(move_state)))
+            #~ self.cr.execute("SELECT sum(debit)" \
+                    #~ "FROM account_move_line l" \
+                    #~ " JOIN account_move am ON (am.id = l.move_id)" \
+                    #~ " JOIN account_account a  ON (a.id = l.account_id)" \
+                    #~ " WHERE (l.account_id = %s)" \
+                    #~ " AND (am.state IN %s)" \
+                    #~ " AND (a.code not like '8%%')" \
+                    #~ " AND (a.code not like '9%%')" \
+                    #~ " AND " + self.init_query + " "
+                    #~ ,(account.id, tuple(move_state)))
             # Add initial balance to the result
             sum_debit += self.cr.fetchone()[0] or 0.0
+        sum_debit = self._currency_conv(sum_debit)
         return sum_debit
 
     def _sum_credit_account(self, account):
         if account.type == 'view':
-            return account.credit
+            amount = account.credit
+            if not account.parent_id:
+                # UF-1714
+                # accounts 8*, 9* are not displayed:
+                # we have to deduce debit/credit/balance amounts of MSF account view (root account)
+                for a_code in self._deduce_accounts:
+                    amount -= self._deduce_accounts[a_code]['credit']
+            return self._currency_conv(amount)
         move_state = ['draft','posted']
         if self.target_move == 'posted':
             move_state = ['posted','']
@@ -263,11 +373,19 @@
                     ,(account.id, tuple(move_state)))
             # Add initial balance to the result
             sum_credit += self.cr.fetchone()[0] or 0.0
+        sum_credit = self._currency_conv(sum_credit)
         return sum_credit
 
     def _sum_balance_account(self, account):
         if account.type == 'view':
-            return account.balance
+            amount = account.balance
+            if not account.parent_id:
+                # UF-1714
+                # accounts 8*, 9* are not displayed:
+                # we have to deduce debit/credit/balance amounts of MSF account view (root account)
+                for a_code in self._deduce_accounts:
+                    amount -= self._deduce_accounts[a_code]['balance']
+            return self._currency_conv(amount)
         move_state = ['draft','posted']
         if self.target_move == 'posted':
             move_state = ['posted','']
@@ -289,11 +407,12 @@
                     ,(account.id, tuple(move_state)))
             # Add initial balance to the result
             sum_balance += self.cr.fetchone()[0] or 0.0
+        sum_balance = self._currency_conv(sum_balance)
         return sum_balance
 
     def _get_account(self, data):
         if data['model'] == 'account.account':
-            return self.pool.get('account.account').browse(self.cr, self.uid, data['form']['id']).company_id.name
+            return self.pool.get('account.account').browse(self.cr, self.uid, data['form']['id'], context=self.context).company_id.name
         return super(general_ledger ,self)._get_account(data)
 
     def _get_sortby(self, data):
@@ -302,8 +421,81 @@
         elif self.sortby == 'sort_journal_partner':
             return 'Journal & Partner'
         return 'Date'
+        
+    def _get_output_currency_code(self, data):
+        if not self.output_currency_code:
+            return ''
+        return self.output_currency_code
+        
+    def _get_filter_info(self, data):
+        """ get filter info
+        _get_filter, _get_start_date, _get_end_date,
+        get_start_period, get_end_period
+        are from common_report_header
+        """
+        res = ''
+        f = self._get_filter(data)
+        if not f:
+            return res
 
+        if f == 'No Filter':
+            res = f
+        elif f == 'Date':
+            res = self.formatLang(self._get_start_date(data), date=True) + ' - ' + self.formatLang(self._get_end_date(data), date=True)
+        elif f == 'Periods':
+            res = self.get_start_period(data) + ' - ' + self.get_end_period(data)
+        return res
+        
+    def _get_line_debit(self, line):
+        return self._currency_conv(line['debit'])
+        
+    def _get_line_credit(self, line):
+        return self._currency_conv(line['credit'])
+        
+    def _get_line_balance(self, line):
+        return self._currency_conv(line['debit'] - line['credit'])
+        
+    def _is_company_currency(self):
+        if not self.output_currency_id or not self.currency_id \
+           or self.output_currency_id == self.currency_id:
+            # ouput currency == company currency
+            return True
+        else:
+            # is other currency
+            return False
+        
+    def _currency_conv(self, amount):
+        if not amount or amount == 0.:
+            return amount
+        if self._is_company_currency():
+            return amount
+        amount = self.pool.get('res.currency').compute(self.cr, self.uid,
+                                                self.currency_id,
+                                                self.output_currency_id,
+                                                amount)
+        if not amount:
+            amount = 0.
+        return amount
+        
+    def _get_prop_instances(self, data):
+        instances = []
+        if data.get('form', False) and data['form'].get('instance_ids', False):
+            self.cr.execute('select code from msf_instance where id IN %s',(tuple(data['form']['instance_ids']),))
+            instances = [x for x, in self.cr.fetchall()]
+        return instances
+                                            
 report_sxw.report_sxw('report.account.general.ledger', 'account.account', 'addons/account/report/account_general_ledger.rml', parser=general_ledger, header='internal')
 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')
 
+
+class general_ledger_xls(SpreadsheetReport):
+    def __init__(self, name, table, rml=False, parser=report_sxw.rml_parse, header='external', store=False):
+        super(general_ledger_xls, self).__init__(name, table, rml=rml, parser=parser, header=header, store=store)
+
+    def create(self, cr, uid, ids, data, context=None):
+        #ids = getIds(self, cr, uid, ids, context)
+        a = super(general_ledger_xls, self).create(cr, uid, ids, data, context)
+        return (a[0], 'xls')
+general_ledger_xls('report.account.general.ledger_xls', 'account.account', 'addons/account/report/account_general_ledger_xls.mako', parser=general_ledger, header='internal')
+
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
=== modified file 'account/report/account_general_ledger.rml'
--- account/report/account_general_ledger.rml	2011-01-14 00:11:01 +0000
+++ account/report/account_general_ledger.rml	2013-12-20 09:30:16 +0000
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
-<document filename="General Ledger.pdf">
-  <template pageSize="(595.0,842.0)" title="General Ledger" author="OpenERP S.A.([e-mail])" allowSplitting="20">
+<document filename="test.pdf">
+  <template pageSize="(595.0,842.0)" title="Test" author="Martin Simon" allowSplitting="20">
     <pageTemplate id="first">
       <frame id="first" x1="28.0" y1="28.0" width="539" height="772"/>
     </pageTemplate>
@@ -26,12 +26,9 @@
       <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="3,0" stop="3,0"/>
       <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="3,-1" stop="3,-1"/>
       <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="4,0" stop="4,-1"/>
+      <lineStyle kind="LINEAFTER" colorName="#e6e6e6" start="4,0" stop="4,-1"/>
       <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="4,0" stop="4,0"/>
       <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="4,-1" stop="4,-1"/>
-      <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="5,0" stop="5,-1"/>
-      <lineStyle kind="LINEAFTER" colorName="#e6e6e6" start="5,0" stop="5,-1"/>
-      <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="5,0" stop="5,0"/>
-      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="5,-1" stop="5,-1"/>
     </blockTableStyle>
     <blockTableStyle id="Table1">
       <blockAlignment value="LEFT"/>
@@ -49,112 +46,9 @@
       <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="3,0" stop="3,0"/>
       <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="3,-1" stop="3,-1"/>
       <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="4,0" stop="4,-1"/>
+      <lineStyle kind="LINEAFTER" colorName="#e6e6e6" start="4,0" stop="4,-1"/>
       <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="4,0" stop="4,0"/>
       <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="4,-1" stop="4,-1"/>
-      <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="5,0" stop="5,-1"/>
-      <lineStyle kind="LINEAFTER" colorName="#e6e6e6" start="5,0" stop="5,-1"/>
-      <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="5,0" stop="5,0"/>
-      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="5,-1" stop="5,-1"/>
-      <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="6,0" stop="6,-1"/>
-      <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="6,0" stop="6,0"/>
-      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="6,-1" stop="6,-1"/>
-      <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="7,0" stop="7,-1"/>
-      <lineStyle kind="LINEAFTER" colorName="#e6e6e6" start="7,0" stop="7,-1"/>
-      <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="7,0" stop="7,0"/>
-      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="7,-1" stop="7,-1"/>
-      <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="8,0" stop="8,-1"/>
-      <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="8,0" stop="8,0"/>
-      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="8,-1" stop="8,-1"/>
-      <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="9,0" stop="9,-1"/>
-      <lineStyle kind="LINEAFTER" colorName="#e6e6e6" start="9,0" stop="9,-1"/>
-      <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="9,0" stop="9,0"/>
-      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="9,-1" stop="9,-1"/>
-      <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="10,0" stop="10,-1"/>
-      <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="10,0" stop="10,0"/>
-      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="10,-1" stop="10,-1"/>
-      <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="11,0" stop="11,-1"/>
-      <lineStyle kind="LINEAFTER" colorName="#e6e6e6" start="11,0" stop="11,-1"/>
-      <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="11,0" stop="11,0"/>
-      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="11,-1" stop="11,-1"/>
-      <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="12,0" stop="12,-1"/>
-      <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="12,0" stop="12,0"/>
-      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="12,-1" stop="12,-1"/>
-      <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="13,0" stop="13,-1"/>
-      <lineStyle kind="LINEAFTER" colorName="#e6e6e6" start="13,0" stop="13,-1"/>
-      <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="13,0" stop="13,0"/>
-      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="13,-1" stop="13,-1"/>
-      <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="0,1" stop="0,-1"/>
-      <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="0,1" stop="0,1"/>
-      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="0,-1" stop="0,-1"/>
-      <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="1,1" stop="1,-1"/>
-      <lineStyle kind="LINEAFTER" colorName="#e6e6e6" start="1,1" stop="1,-1"/>
-      <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="1,1" stop="1,1"/>
-      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="1,-1" stop="1,-1"/>
-      <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="0,2" stop="0,-1"/>
-      <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="0,2" stop="0,2"/>
-      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="0,-1" stop="0,-1"/>
-      <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="1,2" stop="1,-1"/>
-      <lineStyle kind="LINEAFTER" colorName="#e6e6e6" start="1,2" stop="1,-1"/>
-      <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="1,2" stop="1,2"/>
-      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="1,-1" stop="1,-1"/>
-      <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="0,3" stop="0,-1"/>
-      <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="0,3" stop="0,3"/>
-      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="0,-1" stop="0,-1"/>
-      <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="1,3" stop="1,-1"/>
-      <lineStyle kind="LINEAFTER" colorName="#e6e6e6" start="1,3" stop="1,-1"/>
-      <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="1,3" stop="1,3"/>
-      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="1,-1" stop="1,-1"/>
-      <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="0,4" stop="0,-1"/>
-      <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="0,4" stop="0,4"/>
-      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="0,-1" stop="0,-1"/>
-      <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="1,4" stop="1,-1"/>
-      <lineStyle kind="LINEAFTER" colorName="#e6e6e6" start="1,4" stop="1,-1"/>
-      <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="1,4" stop="1,4"/>
-      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="1,-1" stop="1,-1"/>
-    </blockTableStyle>
-    <blockTableStyle id="Table2">
-      <blockAlignment value="LEFT"/>
-      <blockValign value="TOP"/>
-      <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="0,0" stop="0,-1"/>
-      <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="0,0" stop="0,0"/>
-      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="0,-1" stop="0,-1"/>
-      <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="1,0" stop="1,-1"/>
-      <lineStyle kind="LINEAFTER" colorName="#e6e6e6" start="1,0" stop="1,-1"/>
-      <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="1,0" stop="1,0"/>
-      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="1,-1" stop="1,-1"/>
-    </blockTableStyle>
-    <blockTableStyle id="Table3">
-      <blockAlignment value="LEFT"/>
-      <blockValign value="TOP"/>
-      <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="0,0" stop="0,-1"/>
-      <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="0,0" stop="0,0"/>
-      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="0,-1" stop="0,-1"/>
-      <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="1,0" stop="1,-1"/>
-      <lineStyle kind="LINEAFTER" colorName="#e6e6e6" start="1,0" stop="1,-1"/>
-      <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="1,0" stop="1,0"/>
-      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="1,-1" stop="1,-1"/>
-    </blockTableStyle>
-    <blockTableStyle id="Table4">
-      <blockAlignment value="LEFT"/>
-      <blockValign value="TOP"/>
-      <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="0,0" stop="0,-1"/>
-      <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="0,0" stop="0,0"/>
-      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="0,-1" stop="0,-1"/>
-      <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="1,0" stop="1,-1"/>
-      <lineStyle kind="LINEAFTER" colorName="#e6e6e6" start="1,0" stop="1,-1"/>
-      <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="1,0" stop="1,0"/>
-      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="1,-1" stop="1,-1"/>
-    </blockTableStyle>
-    <blockTableStyle id="Table5">
-      <blockAlignment value="LEFT"/>
-      <blockValign value="TOP"/>
-      <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="0,0" stop="0,-1"/>
-      <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="0,0" stop="0,0"/>
-      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="0,-1" stop="0,-1"/>
-      <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="1,0" stop="1,-1"/>
-      <lineStyle kind="LINEAFTER" colorName="#e6e6e6" start="1,0" stop="1,-1"/>
-      <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="1,0" stop="1,0"/>
-      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="1,-1" stop="1,-1"/>
     </blockTableStyle>
     <blockTableStyle id="Table7">
       <blockAlignment value="LEFT"/>
@@ -227,6 +121,7 @@
     <initialize>
       <paraStyle name="all" alignment="justify"/>
     </initialize>
+    <paraStyle name="P1" fontName="Helvetica" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
     <paraStyle name="Standard" fontName="Helvetica"/>
     <paraStyle name="Text body" fontName="Helvetica" spaceBefore="0.0" spaceAfter="6.0"/>
     <paraStyle name="List" fontName="Helvetica" spaceBefore="0.0" spaceAfter="6.0"/>
@@ -262,86 +157,12 @@
     <images/>
   </stylesheet>
   <story>
-  	<pto>
-  	<pto_header>
-  		<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') ]]
-	      <tr>
-	        <td>
-	          <para style="terp_tblheader_Details">Date</para>
-	        </td>
-	        <td>
-	          <para style="terp_tblheader_Details">JNRL</para>
-	        </td>
-	        <td>
-	          <para style="terp_tblheader_Details">Partner</para>
-	        </td>
-	        <td>
-	          <para style="terp_tblheader_Details_Centre">Ref</para>
-	        </td>
-	        <td>
-	          <para style="terp_tblheader_Details_Centre">Move</para>
-	        </td>
-	        <td>
-	          <para style="terp_tblheader_Details">Entry Label</para>
-	        </td>
-	        <td>
-	          <para style="terp_tblheader_Details_Centre">Counterpart</para>
-	        </td>
-	        <td>
-	          <para style="terp_tblheader_Details_Right">Debit</para>
-	        </td>
-	        <td>
-	          <para style="terp_tblheader_Details_Right">Credit</para>
-	        </td>
-	        <td>
-	          <para style="terp_tblheader_Details_Right">Balance</para>
-	        </td>
-	      </tr>
-	    </blockTable>
-	    <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')]]
-	      <tr>
-	        <td>
-	          <para style="terp_tblheader_Details">Date</para>
-	        </td>
-	        <td>
-	          <para style="terp_tblheader_Details">JNRL</para>
-	        </td>
-	        <td>
-	          <para style="terp_tblheader_Details">Partner</para>
-	        </td>
-	        <td>
-	          <para style="terp_tblheader_Details_Centre">Ref</para>
-	        </td>
-	        <td>
-	          <para style="terp_tblheader_Details_Centre">Move</para>
-	        </td>
-	        <td>
-	          <para style="terp_tblheader_Details">Entry Label</para>
-	        </td>
-	        <td>
-	          <para style="terp_tblheader_Details_Centre">Counterpart</para>
-	        </td>
-	        <td>
-	          <para style="terp_tblheader_Details_Right">Debit</para>
-	        </td>
-	        <td>
-	          <para style="terp_tblheader_Details_Right">Credit</para>
-	        </td>
-	        <td>
-	          <para style="terp_tblheader_Details_Right">Balance</para>
-	        </td>
-	        <td>
-	          <para style="terp_tblheader_Details_Right">Currency</para>
-	        </td>
-	      </tr>
-	    </blockTable>
-  	</pto_header>
     <para style="terp_default_8">[[ repeatIn(objects, 'a') ]]</para>
     <para style="terp_header_Centre">General Ledger</para>
     <para style="terp_default_8">
       <font color="white"> </font>
     </para>
-    <blockTable colWidths="102.0,102.0,102.0,130.0,102.0" style="Table13">
+    <blockTable colWidths="82.0,82.0,82.0,169.0,123.0" style="Table13">
       <tr>
         <td>
           <para style="terp_tblheader_General_Centre">Chart of Account</para>
@@ -360,7 +181,7 @@
         </td>
       </tr>
     </blockTable>
-    <blockTable colWidths="102.0,102.0,102.0,130.0,102.0" style="Table1">
+    <blockTable colWidths="82.0,82.0,82.0,169.0,123.0" style="Table1">
       <tr>
         <td>
           <para style="terp_default_Centre_8">[[ get_account(data) or '' ]]</para>
@@ -372,47 +193,7 @@
           <para style="terp_default_Centre_8">[[', '.join([ lt or '' for lt in get_journal(data) ]) ]]</para>
         </td>
         <td>
-          <para style="terp_default_Centre_8">[[ get_filter(data)=='No Filter' and get_filter(data) or removeParentNode('para') ]]</para>
-          <blockTable colWidths="58.0,58.0" style="Table2">[[ get_filter(data)=='Date' or removeParentNode('blockTable') ]]
-            <tr>
-              <td>
-                <para style="terp_tblheader_General_Centre">Start Date</para>
-              </td>
-              <td>
-                <para style="terp_tblheader_General_Centre">End Date</para>
-              </td>
-            </tr>
-          </blockTable>
-          <blockTable colWidths="58.0,58.0" style="Table3">[[ get_filter(data)=='Date' or removeParentNode('blockTable') ]]
-            <tr>
-              <td>
-                <para style="terp_default_Centre_8">[[ formatLang(get_start_date(data),date=True) ]]</para>
-              </td>
-              <td>
-                <para style="terp_default_Centre_8">[[ formatLang(get_end_date(data),date=True) ]]</para>
-              </td>
-            </tr>
-          </blockTable>
-          <blockTable colWidths="58.0,58.0" style="Table4">[[ get_filter(data)=='Periods' or removeParentNode('blockTable') ]]
-            <tr>
-              <td>
-                <para style="terp_tblheader_General_Centre">Start Period</para>
-              </td>
-              <td>
-                <para style="terp_tblheader_General_Centre">End Period</para>
-              </td>
-            </tr>
-          </blockTable>
-          <blockTable colWidths="58.0,58.0" style="Table5">[[ get_filter(data)=='Periods' or removeParentNode('blockTable') ]]
-            <tr>
-              <td>
-                <para style="terp_default_Centre_8">[[ get_start_period(data) or removeParentNode('para') ]]</para>
-              </td>
-              <td>
-                <para style="terp_default_Centre_8">[[ get_end_period(data) or removeParentNode('para') ]]</para>
-              </td>
-            </tr>
-          </blockTable>
+          <para style="terp_default_Centre_8">[[ get_filter_info(data) ]]</para>
           <para style="terp_default_8">
             <font color="white"> </font>
           </para>
@@ -425,7 +206,7 @@
     <para style="terp_default_8">
       <font color="white"> </font>
     </para>
-    <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')]]
+    <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">
       <tr>
         <td>
           <para style="terp_tblheader_Details">Date</para>
@@ -464,10 +245,10 @@
     </blockTable>
     <section>
       <para style="terp_default_8">[[ repeatIn(get_children_accounts(a), 'o') ]]</para>
-      <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')]]
+      <blockTable colWidths="278.0,57.0,57.0,74.0,74.0" style="Table8">
         <tr>
           <td>
-            <para style="terp_default_Bold_9"><font color="white">[[ '..'*(o.level-1) ]]</font>[[ o.code ]] [[ o.name ]]</para>
+            <para style="terp_default_Bold_9">[[ '..'*(o.level-1) ]] [[ o.code ]] [[ o.name ]]</para>
           </td>
           <td>
             <para style="terp_default_Bold_9_Right">[[ formatLang(sum_debit_account(o), digits=get_digits(dp='Account')) ]]</para>
@@ -476,16 +257,16 @@
             <para style="terp_default_Bold_9_Right">[[ formatLang(sum_credit_account(o), digits=get_digits(dp='Account')) ]]</para>
           </td>
           <td>
-            <para style="terp_default_Bold_9_Right">[[ formatLang(sum_balance_account(o), digits=get_digits(dp='Account')) ]] [[ company.currency_id.symbol ]]</para>
+            <para style="terp_default_Bold_9_Right">[[ formatLang(sum_balance_account(o), digits=get_digits(dp='Account')) ]] </para>
           </td>
           <td>
-            <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>
+            <para style="terp_default_Bold_9_Right">[[ get_output_currency_code(data) ]]</para>
           </td>
         </tr>
       </blockTable>
       <section>
         <para style="terp_default_8">[[ repeatIn(lines(o), 'line') ]]</para>
-        <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')]]
+        <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">
           <tr>
             <td>
               <para style="terp_default_8">[[ formatLang(line['ldate'],date=True) ]]</para>
@@ -497,10 +278,10 @@
               <para style="terp_default_8">[[ strip_name(line['partner_name'],10) ]]</para>
             </td>
             <td>
-              <para style="terp_default_8">[[ strip_name(line['lref'],9) ]]</para>
+              <para style="terp_default_8">[[ strip_name(line['lref'],8) ]]</para>
             </td>
             <td>
-              <para style="terp_default_8">[[ strip_name(line['move'],9) ]]</para>
+              <para style="terp_default_8">[[ strip_name(line['move'],8) ]]</para>
             </td>
             <td>
               <para style="terp_default_8">[[ strip_name(line['lname'],10) ]]</para>
@@ -509,25 +290,25 @@
               <para style="terp_default_Centre_8">[[ strip_name(line['line_corresp'].replace(', ',','),10) ]]</para>
             </td>
             <td>
-              <para style="terp_default_Right_8">[[ formatLang(line['debit'], digits=get_digits(dp='Account')) ]]</para>
-            </td>
-            <td>
-              <para style="terp_default_Right_8">[[ formatLang(line['credit'], digits=get_digits(dp='Account')) ]]</para>
-            </td>
-            <td>
-              <para style="terp_default_Right_8">[[ formatLang(line['progress'], digits=get_digits(dp='Account')) ]] [[ company.currency_id.symbol ]]</para>
-            </td>
-            <td>
-              <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>
+              <para style="terp_default_Right_8">[[ formatLang(get_line_debit(line), digits=get_digits(dp='Account')) ]]</para>
+            </td>
+            <td>
+              <para style="terp_default_Right_8">[[ formatLang(get_line_credit(line), digits=get_digits(dp='Account')) ]]</para>
+            </td>
+            <td>
+              <para style="terp_default_Right_8">[[ formatLang(get_line_balance(line), digits=get_digits(dp='Account')) ]] </para>
+            </td>
+            <td>
+              <para style="P1">[[ get_output_currency_code(data) ]]</para>
             </td>
           </tr>
         </blockTable>
       </section>
     </section>
-    <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') ]]
+    <blockTable colWidths="40.0,28.0,82.0,42.0,42.0,71.0,42.0,57.0,57.0,77.0" style="Table10">
       <tr>
         <td>
-          <para style="terp_tblheader_Details">Date</para>
+          <para style="terp_tblheader_Details">[[ removeParentNode('blockTable') ]]</para>
         </td>
         <td>
           <para style="terp_tblheader_Details">JNRL</para>
@@ -560,10 +341,10 @@
     </blockTable>
     <section>
       <para style="terp_default_8">[[ repeatIn(get_children_accounts(a), 'o') ]]</para>
-      <blockTable rowHeights="0.55cm" colWidths="349.0,57.0,57.0,77.0" style="Table11">[[ data['form']['amount_currency'] == False or removeParentNode('blockTable') ]]
+      <blockTable colWidths="349.0,57.0,57.0,77.0" style="Table11">
         <tr>
           <td>
-            <para style="terp_default_Bold_9"><font color="white">[[ '..'*(o.level-1) ]]</font>[[ o.code ]] [[ o.name ]]</para>
+            <para style="terp_default_Bold_9">[[ data['form']['amount_currency'] == False or removeParentNode('blockTable') ]] [[ '..'*(o.level-1) ]] [[ o.code ]] [[ o.name ]]</para>
           </td>
           <td>
             <para style="terp_default_Bold_9_Right">[[ formatLang(sum_debit_account(o), digits=get_digits(dp='Account')) ]]</para>
@@ -572,16 +353,16 @@
             <para style="terp_default_Bold_9_Right">[[ formatLang(sum_credit_account(o), digits=get_digits(dp='Account')) ]]</para>
           </td>
           <td>
-            <para style="terp_default_Bold_9_Right">[[ formatLang(sum_balance_account(o), digits=get_digits(dp='Account')) ]] [[ company.currency_id.symbol ]]</para>
+            <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>
           </td>
         </tr>
       </blockTable>
       <section>
         <para style="terp_default_8">[[ repeatIn(lines(o), 'line') ]]</para>
-        <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') ]]
+        <blockTable colWidths="40.0,28.0,82.0,42.0,42.0,71.0,42.0,57.0,57.0,77.0" style="Table6">
           <tr>
             <td>
-              <para style="terp_default_8">[[ formatLang(line['ldate'],date=True) ]]</para>
+              <para style="terp_default_8">[[ data['form']['amount_currency'] == False or removeParentNode('blockTable') ]] [[ formatLang(line['ldate'],date=True) ]]</para>
             </td>
             <td>
               <para style="terp_default_8">[[ line['lcode'] ]]</para>
@@ -608,12 +389,24 @@
               <para style="terp_default_Right_8">[[ formatLang(line['credit'], digits=get_digits(dp='Account')) ]]</para>
             </td>
             <td>
-              <para style="terp_default_Right_8">[[ formatLang(line['progress'], digits=get_digits(dp='Account')) ]] [[ company.currency_id.symbol ]]</para>
+              <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>
             </td>
           </tr>
         </blockTable>
+        <para style="terp_default_2">
+          <font color="white"> </font>
+        </para>
       </section>
     </section>
-    </pto>
+    <para style="terp_default_8">
+      <font color="white"> </font>
+    </para>
+    <para style="terp_default_8">
+      <font color="white"> </font>
+    </para>
+    <para style="terp_default_8">
+      <font color="white"> </font>
+    </para>
   </story>
 </document>
+
 
=== modified file 'account/report/account_general_ledger.sxw'
 Binary 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
=== modified file 'account/report/account_general_ledger_landscape.rml'
--- account/report/account_general_ledger_landscape.rml	2011-01-14 00:11:01 +0000
+++ account/report/account_general_ledger_landscape.rml	2013-12-20 09:30:16 +0000
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
-<document filename="General Ledger.pdf">
-  <template pageSize="(842.0,595.0)" title="General Ledger" author="OpenERP S.A.([e-mail])" allowSplitting="20">
+<document filename="test.pdf">
+  <template pageSize="(842.0,595.0)" title="Test" author="Martin Simon" allowSplitting="20">
     <pageTemplate id="first">
       <frame id="first" x1="28.0" y1="28.0" width="786" height="525"/>
     </pageTemplate>
@@ -61,106 +61,6 @@
       <lineStyle kind="LINEAFTER" colorName="#e6e6e6" start="6,0" stop="6,-1"/>
       <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="6,0" stop="6,0"/>
       <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="6,-1" stop="6,-1"/>
-      <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="7,0" stop="7,-1"/>
-      <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="7,0" stop="7,0"/>
-      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="7,-1" stop="7,-1"/>
-      <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="8,0" stop="8,-1"/>
-      <lineStyle kind="LINEAFTER" colorName="#e6e6e6" start="8,0" stop="8,-1"/>
-      <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="8,0" stop="8,0"/>
-      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="8,-1" stop="8,-1"/>
-      <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="9,0" stop="9,-1"/>
-      <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="9,0" stop="9,0"/>
-      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="9,-1" stop="9,-1"/>
-      <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="10,0" stop="10,-1"/>
-      <lineStyle kind="LINEAFTER" colorName="#e6e6e6" start="10,0" stop="10,-1"/>
-      <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="10,0" stop="10,0"/>
-      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="10,-1" stop="10,-1"/>
-      <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="11,0" stop="11,-1"/>
-      <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="11,0" stop="11,0"/>
-      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="11,-1" stop="11,-1"/>
-      <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="12,0" stop="12,-1"/>
-      <lineStyle kind="LINEAFTER" colorName="#e6e6e6" start="12,0" stop="12,-1"/>
-      <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="12,0" stop="12,0"/>
-      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="12,-1" stop="12,-1"/>
-      <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="13,0" stop="13,-1"/>
-      <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="13,0" stop="13,0"/>
-      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="13,-1" stop="13,-1"/>
-      <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="14,0" stop="14,-1"/>
-      <lineStyle kind="LINEAFTER" colorName="#e6e6e6" start="14,0" stop="14,-1"/>
-      <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="14,0" stop="14,0"/>
-      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="14,-1" stop="14,-1"/>
-      <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="0,1" stop="0,-1"/>
-      <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="0,1" stop="0,1"/>
-      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="0,-1" stop="0,-1"/>
-      <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="1,1" stop="1,-1"/>
-      <lineStyle kind="LINEAFTER" colorName="#e6e6e6" start="1,1" stop="1,-1"/>
-      <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="1,1" stop="1,1"/>
-      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="1,-1" stop="1,-1"/>
-      <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="0,2" stop="0,-1"/>
-      <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="0,2" stop="0,2"/>
-      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="0,-1" stop="0,-1"/>
-      <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="1,2" stop="1,-1"/>
-      <lineStyle kind="LINEAFTER" colorName="#e6e6e6" start="1,2" stop="1,-1"/>
-      <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="1,2" stop="1,2"/>
-      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="1,-1" stop="1,-1"/>
-      <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="0,3" stop="0,-1"/>
-      <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="0,3" stop="0,3"/>
-      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="0,-1" stop="0,-1"/>
-      <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="1,3" stop="1,-1"/>
-      <lineStyle kind="LINEAFTER" colorName="#e6e6e6" start="1,3" stop="1,-1"/>
-      <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="1,3" stop="1,3"/>
-      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="1,-1" stop="1,-1"/>
-      <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="0,4" stop="0,-1"/>
-      <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="0,4" stop="0,4"/>
-      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="0,-1" stop="0,-1"/>
-      <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="1,4" stop="1,-1"/>
-      <lineStyle kind="LINEAFTER" colorName="#e6e6e6" start="1,4" stop="1,-1"/>
-      <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="1,4" stop="1,4"/>
-      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="1,-1" stop="1,-1"/>
-    </blockTableStyle>
-    <blockTableStyle id="Table3">
-      <blockAlignment value="LEFT"/>
-      <blockValign value="TOP"/>
-      <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="0,0" stop="0,-1"/>
-      <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="0,0" stop="0,0"/>
-      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="0,-1" stop="0,-1"/>
-      <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="1,0" stop="1,-1"/>
-      <lineStyle kind="LINEAFTER" colorName="#e6e6e6" start="1,0" stop="1,-1"/>
-      <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="1,0" stop="1,0"/>
-      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="1,-1" stop="1,-1"/>
-    </blockTableStyle>
-    <blockTableStyle id="Table4">
-      <blockAlignment value="LEFT"/>
-      <blockValign value="TOP"/>
-      <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="0,0" stop="0,-1"/>
-      <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="0,0" stop="0,0"/>
-      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="0,-1" stop="0,-1"/>
-      <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="1,0" stop="1,-1"/>
-      <lineStyle kind="LINEAFTER" colorName="#e6e6e6" start="1,0" stop="1,-1"/>
-      <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="1,0" stop="1,0"/>
-      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="1,-1" stop="1,-1"/>
-    </blockTableStyle>
-    <blockTableStyle id="Table5">
-      <blockAlignment value="LEFT"/>
-      <blockValign value="TOP"/>
-      <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="0,0" stop="0,-1"/>
-      <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="0,0" stop="0,0"/>
-      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="0,-1" stop="0,-1"/>
-      <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="1,0" stop="1,-1"/>
-      <lineStyle kind="LINEAFTER" colorName="#e6e6e6" start="1,0" stop="1,-1"/>
-      <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="1,0" stop="1,0"/>
-      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="1,-1" stop="1,-1"/>
-    </blockTableStyle>
-    <blockTableStyle id="Table6">
-      <blockAlignment value="LEFT"/>
-      <blockValign value="TOP"/>
-      <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="0,0" stop="0,-1"/>
-      <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="0,0" stop="0,0"/>
-      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="0,-1" stop="0,-1"/>
-      <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="1,0" stop="1,-1"/>
-      <lineStyle kind="LINEAFTER" colorName="#e6e6e6" start="1,0" stop="1,-1"/>
-      <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="1,0" stop="1,0"/>
-      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="1,-1" stop="1,-1"/>
     </blockTableStyle>
     <blockTableStyle id="Table7">
       <blockAlignment value="LEFT"/>
@@ -176,7 +76,6 @@
       <lineStyle kind="LINEBELOW" colorName="#000000" start="8,-1" stop="8,-1"/>
       <lineStyle kind="LINEBELOW" colorName="#000000" start="9,-1" stop="9,-1"/>
       <lineStyle kind="LINEBELOW" colorName="#000000" start="10,-1" stop="10,-1"/>
-      <lineStyle kind="LINEBELOW" colorName="#000000" start="11,-1" stop="11,-1"/>
     </blockTableStyle>
     <blockTableStyle id="Table8">
       <blockAlignment value="LEFT"/>
@@ -197,7 +96,6 @@
       <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="8,-1" stop="8,-1"/>
       <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="9,-1" stop="9,-1"/>
       <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="10,-1" stop="10,-1"/>
-      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="11,-1" stop="11,-1"/>
     </blockTableStyle>
     <blockTableStyle id="Table10">
       <blockAlignment value="LEFT"/>
@@ -212,7 +110,6 @@
       <lineStyle kind="LINEBELOW" colorName="#000000" start="7,-1" stop="7,-1"/>
       <lineStyle kind="LINEBELOW" colorName="#000000" start="8,-1" stop="8,-1"/>
       <lineStyle kind="LINEBELOW" colorName="#000000" start="9,-1" stop="9,-1"/>
-      <lineStyle kind="LINEBELOW" colorName="#000000" start="10,-1" stop="10,-1"/>
     </blockTableStyle>
     <blockTableStyle id="Table11">
       <blockAlignment value="LEFT"/>
@@ -232,11 +129,12 @@
       <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="7,-1" stop="7,-1"/>
       <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="8,-1" stop="8,-1"/>
       <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="9,-1" stop="9,-1"/>
-      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="10,-1" stop="10,-1"/>
     </blockTableStyle>
     <initialize>
       <paraStyle name="all" alignment="justify"/>
     </initialize>
+    <paraStyle name="P1" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="P2" fontName="Helvetica" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
     <paraStyle name="Standard" fontName="Helvetica"/>
     <paraStyle name="Heading" fontName="Helvetica" fontSize="14.0" leading="17" spaceBefore="12.0" spaceAfter="6.0"/>
     <paraStyle name="Text body" fontName="Helvetica" spaceBefore="0.0" spaceAfter="6.0"/>
@@ -251,113 +149,33 @@
     <paraStyle name="Heading 9" fontName="Helvetica-Bold" fontSize="75%" leading="NaN" spaceBefore="12.0" spaceAfter="6.0"/>
     <paraStyle name="terp_tblheader_General" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="6.0" spaceAfter="6.0"/>
     <paraStyle name="terp_tblheader_Details" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="6.0" spaceAfter="6.0"/>
-    <paraStyle name="terp_default_7" fontName="Helvetica" fontSize="7.0" leading="9" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="terp_default_Bold_7" fontName="Helvetica-Bold" fontSize="7.0" leading="9" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_default_8" fontName="Helvetica" fontSize="7.0" leading="9" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_default_Bold_8" fontName="Helvetica-Bold" fontSize="7.0" leading="9" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
     <paraStyle name="terp_tblheader_General_Centre" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="CENTER" spaceBefore="6.0" spaceAfter="6.0"/>
     <paraStyle name="terp_tblheader_General_Right" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="6.0" spaceAfter="6.0"/>
     <paraStyle name="terp_tblheader_Details_Centre" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="CENTER" spaceBefore="6.0" spaceAfter="6.0"/>
     <paraStyle name="terp_tblheader_Details_Right" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="6.0" spaceAfter="6.0"/>
-    <paraStyle name="terp_default_Right_7" fontName="Helvetica" fontSize="7.0" leading="9" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="terp_default_Centre_7" fontName="Helvetica" fontSize="7.0" leading="9" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_default_Right_8" fontName="Helvetica" fontSize="7.0" leading="9" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_default_Centre_8" fontName="Helvetica" fontSize="7.0" leading="9" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
     <paraStyle name="terp_header_Right" fontName="Helvetica-Bold" fontSize="15.0" leading="19" alignment="LEFT" spaceBefore="12.0" spaceAfter="6.0"/>
     <paraStyle name="terp_header_Centre" fontName="Helvetica-Bold" fontSize="15.0" leading="19" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
     <paraStyle name="terp_default_address" fontName="Helvetica" fontSize="10.0" leading="13" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="terp_default_8" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="terp_default_Bold_7" fontName="Helvetica-Bold" fontSize="7.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_default_9" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_default_Bold_9" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
     <paraStyle name="terp_default_Centre_9" fontName="Helvetica" fontSize="8.0" leading="10" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="terp_default_Right_8" fontName="Helvetica" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_default_Right_9" fontName="Helvetica" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
     <paraStyle name="terp_default_2" fontName="Helvetica" fontSize="2.0" leading="3" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="terp_default_Bold_7_Right" fontName="Helvetica-Bold" fontSize="7.0" leading="10" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_default_Bold_9_Right" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
     <paraStyle name="Heading 3" fontName="Helvetica-Bold" fontSize="14.0" leading="17" spaceBefore="12.0" spaceAfter="6.0"/>
     <images/>
   </stylesheet>
   <story>
-  	<pto>
-  	<pto_header>
-  		<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')]]
-	      <tr>
-	        <td>
-	          <para style="terp_tblheader_Details">Date</para>
-	        </td>
-	        <td>
-	          <para style="terp_tblheader_Details">Period</para>
-	        </td>
-	        <td>
-	          <para style="terp_tblheader_Details">JRNL</para>
-	        </td>
-	        <td>
-	          <para style="terp_tblheader_Details">Partner</para>
-	        </td>
-	        <td>
-	          <para style="terp_tblheader_Details">Ref</para>
-	        </td>
-	        <td>
-	          <para style="terp_tblheader_Details">Move</para>
-	        </td>
-	        <td>
-	          <para style="terp_tblheader_Details">Entry Label</para>
-	        </td>
-	        <td>
-	          <para style="terp_tblheader_Details">Counterpart</para>
-	        </td>
-	        <td>
-	          <para style="terp_tblheader_Details_Right">Debit</para>
-	        </td>
-	        <td>
-	          <para style="terp_tblheader_Details_Right">Credit</para>
-	        </td>
-	        <td>
-	          <para style="terp_tblheader_Details_Right">Balance</para>
-	        </td>
-	        <td>
-	          <para style="terp_tblheader_Details_Right">Currency</para>
-	        </td>
-	      </tr>
-	    </blockTable>
-  		<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') ]]
-	      <tr>
-	        <td>
-	          <para style="terp_tblheader_Details">Date</para>
-	        </td>
-	        <td>
-	          <para style="terp_tblheader_Details">Period</para>
-	        </td>
-	        <td>
-	          <para style="terp_tblheader_Details">JRNL</para>
-	        </td>
-	        <td>
-	          <para style="terp_tblheader_Details">Partner</para>
-	        </td>
-	        <td>
-	          <para style="terp_tblheader_Details">Ref</para>
-	        </td>
-	        <td>
-	          <para style="terp_tblheader_Details">Move</para>
-	        </td>
-	        <td>
-	          <para style="terp_tblheader_Details">Entry Label</para>
-	        </td>
-	        <td>
-	          <para style="terp_tblheader_Details">Counterpart</para>
-	        </td>
-	        <td>
-	          <para style="terp_tblheader_Details_Right">Debit</para>
-	        </td>
-	        <td>
-	          <para style="terp_tblheader_Details_Right">Credit</para>
-	        </td>
-	        <td>
-	          <para style="terp_tblheader_Details_Right">Balance</para>
-	        </td>
-	      </tr>
-	    </blockTable>
-  	</pto_header>
-    <para style="terp_default_7">[[ repeatIn(objects, 'a') ]]</para>
+    <para style="terp_default_8">[[ repeatIn(objects, 'a') ]]</para>
     <para style="terp_header_Centre">General Ledger</para>
-    <para style="terp_default_7">
+    <para style="terp_default_8">
       <font color="white"> </font>
     </para>
-    <blockTable colWidths="110.0,110.0,110.0,110.0,128.0,93.0,110.0" style="Table1">
+    <blockTable colWidths="112.0,112.0,112.0,112.0,130.0,94.0,112.0" style="Table1">
       <tr>
         <td>
           <para style="terp_tblheader_General_Centre">[[ data['model']=='account.account' and 'Company' or removeParentNode('para') ]]</para>
@@ -383,99 +201,59 @@
         </td>
       </tr>
     </blockTable>
-    <blockTable colWidths="110.0,110.0,110.0,110.0,128.0,93.0,110.0" style="Table2">
+    <blockTable colWidths="112.0,112.0,112.0,112.0,130.0,94.0,112.0" style="Table2">
       <tr>
         <td>
-          <para style="terp_default_Centre_7">[[ get_account(data) or removeParentNode('para') ]]</para>
-        </td>
-        <td>
-          <para style="terp_default_Centre_7">[[ get_fiscalyear(data) or '' ]]</para>
-        </td>
-        <td>
-          <para style="terp_default_Centre_7">[[', '.join([ lt or '' for lt in get_journal(data) ]) ]]</para>
-        </td>
-        <td>
-          <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>
-        </td>
-        <td>
-          <para style="terp_default_Centre_7">[[ get_filter(data)=='No Filter' and get_filter(data) or removeParentNode('para') ]]</para>
-          <blockTable colWidths="58.0,58.0" style="Table3">[[ get_filter(data)=='Date' or removeParentNode('blockTable') ]]
-            <tr>
-              <td>
-                <para style="terp_tblheader_General_Centre">Start Date</para>
-              </td>
-              <td>
-                <para style="terp_tblheader_General_Centre">End Date</para>
-              </td>
-            </tr>
-          </blockTable>
-          <blockTable colWidths="58.0,58.0" style="Table4">[[ get_filter(data)=='Date' or removeParentNode('blockTable') ]]
-            <tr>
-              <td>
-                <para style="terp_default_Centre_7">[[ formatLang(get_start_date(data),date=True) ]]</para>
-              </td>
-              <td>
-                <para style="terp_default_Centre_7">[[ formatLang(get_end_date(data),date=True) ]]</para>
-              </td>
-            </tr>
-          </blockTable>
-          <blockTable colWidths="58.0,58.0" style="Table5">[[ get_filter(data)=='Periods' or removeParentNode('blockTable') ]]
-            <tr>
-              <td>
-                <para style="terp_tblheader_General_Centre">Start Period</para>
-              </td>
-              <td>
-                <para style="terp_tblheader_General_Centre">End Period</para>
-              </td>
-            </tr>
-          </blockTable>
-          <blockTable colWidths="58.0,58.0" style="Table6">[[ get_filter(data)=='Periods' or removeParentNode('blockTable') ]]
-            <tr>
-              <td>
-                <para style="terp_default_Centre_7">[[ get_start_period(data) or removeParentNode('para') ]]</para>
-              </td>
-              <td>
-                <para style="terp_default_Centre_7">[[ get_end_period(data) or removeParentNode('para') ]]</para>
-              </td>
-            </tr>
-          </blockTable>
-        </td>
-        <td>
-          <para style="terp_default_Centre_7">[[ get_sortby(data) ]]</para>
-        </td>
-        <td>
-          <para style="terp_default_Centre_7">[[ get_target_move(data) ]]</para>
+          <para style="terp_default_Centre_8">[[ get_account(data) or removeParentNode('para') ]]</para>
+        </td>
+        <td>
+          <para style="terp_default_Centre_8">[[ get_fiscalyear(data) or '' ]]</para>
+        </td>
+        <td>
+          <para style="terp_default_Centre_8">[[', '.join([ lt or '' for lt in get_journal(data) ]) ]]</para>
+        </td>
+        <td>
+          <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>
+        </td>
+        <td>
+          <para style="terp_default_Centre_8">[[ get_filter_info(data) ]]</para>
+          <para style="terp_default_Centre_8">
+            <font color="white"> </font>
+          </para>
+        </td>
+        <td>
+          <para style="terp_default_Centre_8">[[ get_sortby(data) ]]</para>
+        </td>
+        <td>
+          <para style="terp_default_Centre_8">[[ get_target_move(data) ]]</para>
         </td>
       </tr>
     </blockTable>
-    <para style="terp_default_7">
-       <font color="white"> </font>
+    <para style="terp_default_8">
+      <font color="white"> </font>
     </para>
-    <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')]]
+    <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">
       <tr>
         <td>
           <para style="terp_tblheader_Details">Date</para>
         </td>
         <td>
-          <para style="terp_tblheader_Details">Period</para>
-        </td>
-        <td>
-          <para style="terp_tblheader_Details">JRNL</para>
+          <para style="terp_tblheader_Details">JNRL</para>
         </td>
         <td>
           <para style="terp_tblheader_Details">Partner</para>
         </td>
         <td>
-          <para style="terp_tblheader_Details">Ref</para>
+          <para style="terp_tblheader_Details_Centre">Ref</para>
         </td>
         <td>
-          <para style="terp_tblheader_Details">Move</para>
+          <para style="terp_tblheader_Details_Centre">Move</para>
         </td>
         <td>
           <para style="terp_tblheader_Details">Entry Label</para>
         </td>
         <td>
-          <para style="terp_tblheader_Details">Counterpart</para>
+          <para style="terp_tblheader_Details_Centre">Counterpart</para>
         </td>
         <td>
           <para style="terp_tblheader_Details_Right">Debit</para>
@@ -492,95 +270,89 @@
       </tr>
     </blockTable>
     <section>
-      <para style="terp_default_7">[[ repeatIn(get_children_accounts(a), 'o') ]]</para>
-      <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')]]
+      <para style="terp_default_8">[[ repeatIn(get_children_accounts(a), 'o') ]]</para>
+      <blockTable colWidths="488.0,71.0,71.0,71.0,85.0" style="Table8">
         <tr>
           <td>
-            <para style="terp_default_Bold_7"><font color="white">[[ '..'*(o.level-1) ]]</font>[[ o.code ]] [[ o.name ]]</para>
-          </td>
-          <td>
-            <para style="terp_default_Bold_7_Right">[[ formatLang(sum_debit_account(o), digits=get_digits(dp='Account')) ]]</para>
-          </td>
-          <td>
-            <para style="terp_default_Bold_7_Right">[[ formatLang(sum_credit_account(o), digits=get_digits(dp='Account')) ]]</para>
-          </td>
-          <td>
-            <para style="terp_default_Bold_7_Right">[[ formatLang(sum_balance_account(o), digits=get_digits(dp='Account')) ]] [[ company.currency_id.symbol ]]</para>
-          </td>
-          <td>
-            <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>
+            <para style="terp_default_Bold_9">[[ '..'*(o.level-1) ]] [[ o.code ]] [[ o.name ]]</para>
+          </td>
+          <td>
+            <para style="terp_default_Bold_9_Right">[[ formatLang(sum_debit_account(o), digits=get_digits(dp='Account')) ]]</para>
+          </td>
+          <td>
+            <para style="terp_default_Bold_9_Right">[[ formatLang(sum_credit_account(o), digits=get_digits(dp='Account')) ]]</para>
+          </td>
+          <td>
+            <para style="terp_default_Bold_9_Right">[[ formatLang(sum_balance_account(o), digits=get_digits(dp='Account')) ]]</para>
+          </td>
+          <td>
+            <para style="P1">[[ get_output_currency_code(data) ]]</para>
           </td>
         </tr>
       </blockTable>
       <section>
-        <para style="terp_default_7">[[ repeatIn(lines(o), 'line') ]]</para>
-        <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')]]
+        <para style="terp_default_8">[[ repeatIn(lines(o), 'line') ]]</para>
+        <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">
           <tr>
             <td>
-              <para style="terp_default_7">[[ formatLang(line['ldate'],date=True) ]]</para>
-            </td>
-            <td>
-              <para style="terp_default_7">[[ line['period_code'] ]]</para>
-            </td>
-            <td>
-              <para style="terp_default_7">[[ line['lcode'] ]]</para>
-            </td>
-            <td>
-              <para style="terp_default_7">[[ strip_name(line['partner_name'],20) ]]</para>
-            </td>
-            <td>
-              <para style="terp_default_7">[[ strip_name(line['lref'],17) ]]</para>
-            </td>
-            <td>
-              <para style="terp_default_7">[[ line['move'] ]]</para>
-            </td>
-            <td>
-              <para style="terp_default_7">[[ strip_name(line['lname'],22) ]]</para>
-            </td>
-            <td>
-              <para style="terp_default_7">[[ strip_name(line['line_corresp'],18) ]]</para>
-            </td>
-            <td>
-              <para style="terp_default_Right_7">[[ formatLang(line['debit'], digits=get_digits(dp='Account')) ]]</para>
-            </td>
-            <td>
-              <para style="terp_default_Right_7">[[ formatLang(line['credit'], digits=get_digits(dp='Account')) ]]</para>
-            </td>
-            <td>
-              <para style="terp_default_Right_7">[[ formatLang(line['progress'], digits=get_digits(dp='Account')) ]] [[ company.currency_id.symbol ]]</para>
-            </td>
-            <td>
-              <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>
+              <para style="terp_default_8">[[ formatLang(line['ldate'],date=True) ]]</para>
+            </td>
+            <td>
+              <para style="terp_default_8">[[ line['lcode'] ]]</para>
+            </td>
+            <td>
+              <para style="terp_default_8">[[ line['partner_name'] ]]</para>
+            </td>
+            <td>
+              <para style="terp_default_8">[[ strip_name(line['lref'],15) ]]</para>
+            </td>
+            <td>
+              <para style="terp_default_Centre_8">[[ strip_name(line['move'],15) ]]</para>
+            </td>
+            <td>
+              <para style="terp_default_8">[[ line['lname'] ]]</para>
+            </td>
+            <td>
+              <para style="terp_default_Centre_8">[[ strip_name(line['line_corresp'].replace(', ',','),25) ]]</para>
+            </td>
+            <td>
+              <para style="terp_default_Right_8">[[ formatLang(get_line_debit(line), digits=get_digits(dp='Account')) ]]</para>
+            </td>
+            <td>
+              <para style="terp_default_Right_8">[[ formatLang(get_line_credit(line), digits=get_digits(dp='Account')) ]]</para>
+            </td>
+            <td>
+              <para style="terp_default_Right_8">[[ formatLang(get_line_balance(line), digits=get_digits(dp='Account')) ]] </para>
+            </td>
+            <td>
+              <para style="P2">[[ get_output_currency_code(data) ]]</para>
             </td>
           </tr>
         </blockTable>
       </section>
     </section>
-    <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') ]]
+    <blockTable colWidths="37.0,54.0,113.0,71.0,71.0,142.0,71.0,71.0,71.0,85.0" style="Table10">
       <tr>
         <td>
-          <para style="terp_tblheader_Details">Date</para>
-        </td>
-        <td>
-          <para style="terp_tblheader_Details">Period</para>
-        </td>
-        <td>
-          <para style="terp_tblheader_Details">JRNL</para>
+          <para style="terp_tblheader_Details">[[ removeParentNode('blockTable') ]]</para>
+        </td>
+        <td>
+          <para style="terp_tblheader_Details">JNRL</para>
         </td>
         <td>
           <para style="terp_tblheader_Details">Partner</para>
         </td>
         <td>
-          <para style="terp_tblheader_Details">Ref</para>
+          <para style="terp_tblheader_Details_Centre">Ref</para>
         </td>
         <td>
-          <para style="terp_tblheader_Details">Move</para>
+          <para style="terp_tblheader_Details_Centre">Move</para>
         </td>
         <td>
           <para style="terp_tblheader_Details">Entry Label</para>
         </td>
         <td>
-          <para style="terp_tblheader_Details">Counterpart</para>
+          <para style="terp_tblheader_Details_Centre">Counterpart</para>
         </td>
         <td>
           <para style="terp_tblheader_Details_Right">Debit</para>
@@ -594,64 +366,64 @@
       </tr>
     </blockTable>
     <section>
-      <para style="Standard">[[ repeatIn(get_children_accounts(a), 'o') ]]</para>
-      <blockTable rowHeights="0.55cm" colWidths="575.0,65.0,65.0,75.0" style="Table11">[[ data['form']['amount_currency'] == False or removeParentNode('blockTable') ]]
+      <para style="terp_default_8">[[ repeatIn(get_children_accounts(a), 'o') ]]</para>
+      <blockTable colWidths="558.0,71.0,71.0,85.0" style="Table11">
         <tr>
           <td>
-            <para style="terp_default_Bold_7"><font color="white">[[ '..'*(o.level-1) ]]</font>[[ o.code ]] [[ o.name ]]</para>
-          </td>
-          <td>
-            <para style="terp_default_Bold_7_Right">[[ formatLang(sum_debit_account(o), digits=get_digits(dp='Account')) ]]</para>
-          </td>
-          <td>
-            <para style="terp_default_Bold_7_Right">[[ formatLang(sum_credit_account(o), digits=get_digits(dp='Account')) ]]</para>
-          </td>
-          <td>
-            <para style="terp_default_Bold_7_Right">[[ formatLang(sum_balance_account(o), digits=get_digits(dp='Account')) ]] [[ company.currency_id.symbol ]]</para>
+            <para style="terp_default_Bold_9">[[ data['form']['amount_currency'] == False or removeParentNode('blockTable') ]] [[ '..'*(o.level-1) ]] [[ o.code ]] [[ o.name ]]</para>
+          </td>
+          <td>
+            <para style="terp_default_Bold_9_Right">[[ formatLang(sum_debit_account(o), digits=get_digits(dp='Account')) ]]</para>
+          </td>
+          <td>
+            <para style="terp_default_Bold_9_Right">[[ formatLang(sum_credit_account(o), digits=get_digits(dp='Account')) ]]</para>
+          </td>
+          <td>
+            <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>
           </td>
         </tr>
       </blockTable>
       <section>
-        <para style="Standard">[[ repeatIn(lines(o), 'line') ]]</para>
-        <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') ]]
+        <para style="terp_default_8">[[ repeatIn(lines(o), 'line') ]]</para>
+        <blockTable colWidths="37.0,54.0,113.0,71.0,71.0,142.0,71.0,71.0,71.0,85.0" style="Table12">
           <tr>
             <td>
-              <para style="terp_default_7">[[ formatLang(line['ldate'],date=True) ]]</para>
-            </td>
-            <td>
-              <para style="terp_default_7">[[ line['period_code'] ]]</para>
-            </td>
-            <td>
-              <para style="terp_default_7">[[ line['lcode'] ]]</para>
-            </td>
-            <td>
-              <para style="terp_default_7">[[ strip_name(line['partner_name'],24) ]]</para>
-            </td>
-            <td>
-              <para style="terp_default_7">[[ strip_name(line['lref'],21) ]]</para>
-            </td>
-            <td>
-              <para style="terp_default_7">[[ line['move'] ]]</para>
-            </td>
-            <td>
-              <para style="terp_default_7">[[ strip_name(line['lname'],28) ]]</para>
-            </td>
-            <td>
-              <para style="terp_default_7">[[ strip_name(line['line_corresp'],23) ]]</para>
-            </td>
-            <td>
-              <para style="terp_default_Right_7">[[ formatLang(line['debit'], digits=get_digits(dp='Account')) ]]</para>
-            </td>
-            <td>
-              <para style="terp_default_Right_7">[[ formatLang(line['credit'], digits=get_digits(dp='Account')) ]]</para>
-            </td>
-            <td>
-              <para style="terp_default_Right_7">[[ formatLang(line['progress'], digits=get_digits(dp='Account')) ]] [[ company.currency_id.symbol ]]</para>
+              <para style="terp_default_8">[[ data['form']['amount_currency'] == False or removeParentNode('blockTable') ]] [[ formatLang(line['ldate'],date=True) ]]</para>
+            </td>
+            <td>
+              <para style="terp_default_8">[[ line['lcode'] ]]</para>
+            </td>
+            <td>
+              <para style="terp_default_8">[[ line['partner_name'] ]]</para>
+            </td>
+            <td>
+              <para style="terp_default_8">[[ line['lref'] ]]</para>
+            </td>
+            <td>
+              <para style="terp_default_8">[[ line['move'] ]]</para>
+            </td>
+            <td>
+              <para style="terp_default_8">[[ line['lname'] ]]</para>
+            </td>
+            <td>
+              <para style="terp_default_Centre_8">[[ strip_name(line['line_corresp'].replace(', ',','),25) ]]</para>
+            </td>
+            <td>
+              <para style="terp_default_Right_8">[[ formatLang(line['debit'], digits=get_digits(dp='Account')) ]]</para>
+            </td>
+            <td>
+              <para style="terp_default_Right_8">[[ formatLang(line['credit'], digits=get_digits(dp='Account')) ]]</para>
+            </td>
+            <td>
+              <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>
             </td>
           </tr>
         </blockTable>
+        <para style="terp_default_2">
+          <font color="white"> </font>
+        </para>
       </section>
     </section>
-    </pto>
   </story>
 </document>
+
 
=== modified file 'account/report/account_general_ledger_landscape.sxw'
 Binary 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
=== added file 'account/report/account_general_ledger_xls.mako'
--- account/report/account_general_ledger_xls.mako	1970-01-01 00:00:00 +0000
+++ account/report/account_general_ledger_xls.mako	2013-12-20 09:30:16 +0000
@@ -0,0 +1,279 @@
+<?xml version="1.0"?>
+<Workbook xmlns="urn:schemas-microsoft-com:office:spreadsheet"
+xmlns:o="urn:schemas-microsoft-com:office:office"
+xmlns:x="urn:schemas-microsoft-com:office:excel"
+xmlns:ss="urn:schemas-microsoft-com:office:spreadsheet"
+xmlns:html="http://www.w3.org/TR/REC-html40">
+<DocumentProperties xmlns="urn:schemas-microsoft-com:office:office">
+<Title>General Ledger</Title>
+</DocumentProperties>
+<Styles>
+<Style ss:ID="ssCell">
+<Alignment ss:Vertical="Top" ss:WrapText="1"/>
+</Style>
+<Style ss:ID="ssH">
+<Alignment ss:Horizontal="Center" ss:Vertical="Center" ss:WrapText="1"/>
+<Font ss:Bold="1" />
+<Borders>
+  <Border ss:Position="Bottom" ss:LineStyle="Continuous" ss:Weight="1" />
+  <Border ss:Position="Left" ss:LineStyle="Continuous" ss:Weight="1" />
+  <Border ss:Position="Right" ss:LineStyle="Continuous" ss:Weight="1" />
+  <Border ss:Position="Top" ss:LineStyle="Continuous" ss:Weight="1" />
+</Borders>
+</Style>
+<Style ss:ID="ssBorder">
+<Alignment ss:Vertical="Center" ss:WrapText="1"/>
+<Borders>
+  <Border ss:Position="Bottom" ss:LineStyle="Continuous" ss:Weight="1" />
+  <Border ss:Position="Left" ss:LineStyle="Continuous" ss:Weight="1" />
+  <Border ss:Position="Right" ss:LineStyle="Continuous" ss:Weight="1" />
+  <Border ss:Position="Top" ss:LineStyle="Continuous" ss:Weight="1" />
+</Borders>
+</Style>
+<Style ss:ID="ssBorderDate">
+<Alignment ss:Vertical="Center" ss:WrapText="1"/>
+<Borders>
+  <Border ss:Position="Bottom" ss:LineStyle="Continuous" ss:Weight="1" />
+  <Border ss:Position="Left" ss:LineStyle="Continuous" ss:Weight="1" />
+  <Border ss:Position="Right" ss:LineStyle="Continuous" ss:Weight="1" />
+  <Border ss:Position="Top" ss:LineStyle="Continuous" ss:Weight="1" />
+</Borders>
+<NumberFormat ss:Format="Short Date" />
+</Style>
+<Style ss:ID="ssNumber">
+<Borders>
+  <Border ss:Position="Bottom" ss:LineStyle="Continuous" ss:Weight="1" />
+  <Border ss:Position="Left" ss:LineStyle="Continuous" ss:Weight="1" />
+  <Border ss:Position="Right" ss:LineStyle="Continuous" ss:Weight="1" />
+  <Border ss:Position="Top" ss:LineStyle="Continuous" ss:Weight="1" />
+</Borders>
+<Alignment ss:Horizontal="Right" ss:Vertical="Center" ss:WrapText="1"/>
+<NumberFormat ss:Format="#,##0.00"/>
+</Style>
+<Style ss:ID="ssHeader">
+<Alignment ss:Vertical="Top" ss:WrapText="1"/>
+<Borders>
+  <Border ss:Position="Bottom" ss:LineStyle="Continuous" ss:Weight="1" />
+  <Border ss:Position="Left" ss:LineStyle="Continuous" ss:Weight="1" />
+  <Border ss:Position="Right" ss:LineStyle="Continuous" ss:Weight="1" />
+  <Border ss:Position="Top" ss:LineStyle="Continuous" ss:Weight="1" />
+</Borders>
+</Style>
+<Style ss:ID="ssAccountLine">
+<Alignment ss:Bottom="Top" ss:WrapText="1"/>
+<Font ss:Size="8" ss:Italic="1"/>
+<Borders>
+  <Border ss:Position="Bottom" ss:LineStyle="Continuous" ss:Weight="1" />
+  <Border ss:Position="Left" ss:LineStyle="Continuous" ss:Weight="1" />
+  <Border ss:Position="Right" ss:LineStyle="Continuous" ss:Weight="1" />
+  <Border ss:Position="Top" ss:LineStyle="Continuous" ss:Weight="1" />
+</Borders>
+</Style>
+<Style ss:ID="ssAccountLine2">
+<Alignment ss:Bottom="Top" ss:WrapText="1"/>
+<Font ss:Size="8"/>
+<Borders>
+  <Border ss:Position="Bottom" ss:LineStyle="Continuous" ss:Weight="1" />
+  <Border ss:Position="Left" ss:LineStyle="Continuous" ss:Weight="1" />
+  <Border ss:Position="Right" ss:LineStyle="Continuous" ss:Weight="1" />
+  <Border ss:Position="Top" ss:LineStyle="Continuous" ss:Weight="1" />
+</Borders>
+</Style>
+<Style ss:ID="ssAccountLineNumber">
+<Alignment ss:Horizontal="Right" ss:Vertical="Bottom" ss:WrapText="1"/>
+<Font ss:Size="8"/>
+<Borders>
+  <Border ss:Position="Bottom" ss:LineStyle="Continuous" ss:Weight="1" />
+  <Border ss:Position="Left" ss:LineStyle="Continuous" ss:Weight="1" />
+  <Border ss:Position="Right" ss:LineStyle="Continuous" ss:Weight="1" />
+  <Border ss:Position="Top" ss:LineStyle="Continuous" ss:Weight="1" />
+</Borders>
+<NumberFormat ss:Format="#,##0.00"/>
+</Style>
+</Styles>
+<Worksheet ss:Name="Sheet">
+<%
+    max = 11
+    if data['model'] == 'account.account':
+        header_company_or_chart_of_account = 'Company'
+    else:
+        header_company_or_chart_of_account = 'Chart of Account'
+    if 'all_journals' in data['form']:
+       journals = 'All Journals'
+    else:
+       journals = ', '.join([lt or '' for lt in get_journal(data)])
+    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'
+    prop_instances_list = get_prop_instances(data)
+    if prop_instances_list:
+        prop_instances = ', '.join([lt or '' for lt in get_prop_instances(data)])
+    else:
+        prop_instances = 'All Instances'
+%>
+<Table x:FullColumns="1" x:FullRows="1">
+<Column ss:AutoFitWidth="1" ss:Width="64" />
+<Column ss:AutoFitWidth="1" ss:Width="50" />
+<Column ss:AutoFitWidth="1" ss:Width="50" />
+<Column ss:AutoFitWidth="1" ss:Width="50" />
+<Column ss:AutoFitWidth="1" ss:Width="50" />
+<Column ss:AutoFitWidth="1" ss:Width="50" />
+<Column ss:AutoFitWidth="1" ss:Width="50" />
+<Column ss:AutoFitWidth="1" ss:Width="64" />
+<Column ss:AutoFitWidth="1" ss:Width="64" />
+<Column ss:AutoFitWidth="1" ss:Width="64" />
+<Column ss:AutoFitWidth="1" ss:Width="50" />
+<Row>
+<Cell ss:StyleID="ssH"><Data ss:Type="String">${header_company_or_chart_of_account}</Data></Cell>
+<Cell ss:StyleID="ssH"><Data ss:Type="String">Fiscal Year</Data></Cell>
+<Cell ss:StyleID="ssH"><Data ss:Type="String">Journals</Data></Cell>
+<Cell ss:StyleID="ssH"><Data ss:Type="String">Display Account</Data></Cell>
+<Cell ss:StyleID="ssH"><Data ss:Type="String">Filter By ${(get_filter(data) or '')|x}</Data></Cell>
+<Cell ss:StyleID="ssH"><Data ss:Type="String">Entries Sorted By</Data></Cell>
+<Cell ss:StyleID="ssH"><Data ss:Type="String">Target Moves</Data></Cell>
+<Cell ss:StyleID="ssH"><Data ss:Type="String">Proprietary Instances</Data></Cell>
+<Cell ss:StyleID="ssCell"></Cell>
+<Cell ss:StyleID="ssCell"></Cell>
+<Cell ss:StyleID="ssCell"></Cell>
+</Row>
+% for a in objects:
+<Row>
+<Cell ss:StyleID="ssHeader">
+    <Data ss:Type="String">${(get_account(data) or '')|x}</Data>
+</Cell>
+<Cell ss:StyleID="ssHeader">
+    <Data ss:Type="String">${(get_fiscalyear(data) or '')|x}</Data>
+</Cell>
+<Cell ss:StyleID="ssHeader">
+    <Data ss:Type="String">${(journals or '')|x}</Data>
+</Cell>
+<Cell ss:StyleID="ssHeader">
+    <Data ss:Type="String">${(display_account or '')|x}</Data>
+</Cell>
+<Cell ss:StyleID="ssHeader">
+    <Data ss:Type="String">${(get_filter_info(data) or '')|x}</Data>
+</Cell>
+<Cell ss:StyleID="ssHeader">
+    <Data ss:Type="String">${(get_sortby(data) or '')|x}</Data>
+</Cell>
+<Cell ss:StyleID="ssHeader">
+    <Data ss:Type="String">${(get_target_move(data) or '')|x}</Data>
+</Cell>
+<Cell ss:StyleID="ssHeader">
+    <Data ss:Type="String">${(prop_instances or '')|x}</Data>
+</Cell>
+<Cell ss:StyleID="ssCell"></Cell>
+<Cell ss:StyleID="ssCell"></Cell>
+<Cell ss:StyleID="ssCell"></Cell>
+</Row>
+<Row>
+<Cell></Cell>
+<Cell></Cell>
+<Cell></Cell>
+<Cell></Cell>
+<Cell></Cell>
+<Cell></Cell>
+<Cell></Cell>
+<Cell></Cell>
+<Cell></Cell>
+<Cell></Cell>
+<Cell></Cell>
+</Row>
+<Row>
+<Cell ss:StyleID="ssH"><Data ss:Type="String">Date</Data></Cell>
+<Cell ss:StyleID="ssH"><Data ss:Type="String">JRNL</Data></Cell>
+<Cell ss:StyleID="ssH"><Data ss:Type="String">Partner</Data></Cell>
+<Cell ss:StyleID="ssH"><Data ss:Type="String">Ref</Data></Cell>
+<Cell ss:StyleID="ssH"><Data ss:Type="String">Move</Data></Cell>
+<Cell ss:StyleID="ssH"><Data ss:Type="String">Entry Label</Data></Cell>
+<Cell ss:StyleID="ssH"><Data ss:Type="String">Counter part</Data></Cell>
+<Cell ss:StyleID="ssH"><Data ss:Type="String">Debit</Data></Cell>
+<Cell ss:StyleID="ssH"><Data ss:Type="String">Credit</Data></Cell>
+<Cell ss:StyleID="ssH"><Data ss:Type="String">Balance</Data></Cell>
+<Cell ss:StyleID="ssH"><Data ss:Type="String">Currency</Data></Cell>
+</Row>
+% for o in get_children_accounts(a):
+<Row>
+<Cell ss:StyleID="ssBorder">
+</Cell>
+<Cell ss:StyleID="ssBorder">
+    <Data ss:Type="String">${(o.code or '')|x}</Data>
+</Cell>
+<Cell ss:StyleID="ssBorder" ss:MergeAcross="4">
+    <Data ss:Type="String">${(o.name or '')|x}</Data>
+</Cell>
+<Cell ss:StyleID="ssNumber">
+    <Data ss:Type="Number">${sum_debit_account(o)}</Data>
+</Cell>
+<Cell ss:StyleID="ssNumber">
+    <Data ss:Type="Number">${sum_credit_account(o)}</Data>
+</Cell>
+<Cell ss:StyleID="ssNumber">
+    <Data ss:Type="Number">${sum_balance_account(o)}</Data>
+</Cell>
+<Cell ss:StyleID="ssBorder">
+    <Data ss:Type="String">${get_output_currency_code(data)}</Data>
+</Cell>
+</Row>
+% for line in lines(o):
+<Row>
+<Cell ss:StyleID="ssAccountLine">
+    <Data ss:Type="String">${(formatLang(line['ldate'],date=True)) or ''}</Data>
+</Cell>
+<Cell ss:StyleID="ssAccountLine">
+    <Data ss:Type="String">${(line['lcode'] or '')|x}</Data>
+</Cell>
+<Cell ss:StyleID="ssAccountLine">
+    <Data ss:Type="String">${(line['partner_name'] or '')|x}</Data>
+</Cell>
+<Cell ss:StyleID="ssAccountLine">
+    <Data ss:Type="String">${(line['lref'] or '')|x}</Data>
+</Cell>
+<Cell ss:StyleID="ssAccountLine">
+    <Data ss:Type="String">${(line['move'] or '')|x}</Data>
+</Cell>
+<Cell ss:StyleID="ssAccountLine">
+    <Data ss:Type="String">${(line['lname'] or '')|x}</Data>
+</Cell>
+<Cell ss:StyleID="ssAccountLineNumber">
+    <Data ss:Type="Number">${((strip_name(line['line_corresp'].replace(', ',''),25)) or '')|x}</Data>
+</Cell>
+<Cell ss:StyleID="ssAccountLineNumber">
+    <Data ss:Type="Number">${get_line_debit(line)}</Data>
+</Cell>
+<Cell ss:StyleID="ssAccountLineNumber">
+    <Data ss:Type="Number">${get_line_credit(line)}</Data>
+</Cell>
+<Cell ss:StyleID="ssAccountLineNumber">
+    <Data ss:Type="Number">${get_line_balance(line)}</Data>
+</Cell>
+<Cell ss:StyleID="ssAccountLine2">
+    <Data ss:Type="String">${get_output_currency_code(data)}</Data>
+</Cell>
+</Row>
+% endfor
+% endfor
+% endfor
+</Table>
+<WorksheetOptions xmlns="urn:schemas-microsoft-com:office:excel">
+   <PageSetup>
+    <Layout x:Orientation="Landscape"/>
+    <Header x:Data="&amp;C&amp;&quot;Arial,Bold&quot;&amp;14General Ledger"/>
+    <Footer x:Data="Page &amp;P of &amp;N"/>
+   </PageSetup>
+   <Print>
+    <ValidPrinterInfo/>
+    <PaperSizeIndex>9</PaperSizeIndex>
+    <HorizontalResolution>600</HorizontalResolution>
+    <VerticalResolution>600</VerticalResolution>
+   </Print>
+   <Selected/>
+   <Panes>
+    <Pane>
+     <Number>3</Number>
+     <ActiveRow>17</ActiveRow>
+    </Pane>
+   </Panes>
+   <ProtectObjects>False</ProtectObjects>
+   <ProtectScenarios>False</ProtectScenarios>
+</WorksheetOptions>
+</Worksheet>
+</Workbook>
 
=== modified file 'account/wizard/account_report_general_ledger.py'
--- account/wizard/account_report_general_ledger.py	2011-01-14 00:11:01 +0000
+++ account/wizard/account_report_general_ledger.py	2013-12-20 09:30:16 +0000
@@ -32,31 +32,79 @@
                                           help='It adds initial balance row on report which display previous sum amount of debit/credit/balance'),
         'amount_currency': fields.boolean("With Currency", help="It adds the currency column if the currency is different then the company currency"),
         'sortby': fields.selection([('sort_date', 'Date'), ('sort_journal_partner', 'Journal & Partner')], 'Sort By', required=True),
+        'output_currency': fields.many2one('res.currency', 'Output Currency', required=True),
+        'instance_ids': fields.many2many('msf.instance', 'account_report_general_ledger_instance_rel', 'instance_id', 'argl_id', 'Proprietary Instances'),
+        #'export_format': fields.selection([('xls', 'Excel'), ('csv', 'CSV'), ('pdf', 'PDF')], string="Export format", required=True),
+        'export_format': fields.selection([('xls', 'Excel'), ('pdf', 'PDF')], string="Export format", required=True),
     }
+    
+    def _get_journals(self, cr, uid, context=None):
+        """exclude extra-accounting journals from this report (IKD, ODX)."""
+        domain = [('type', 'not in', ['inkind', 'extra'])]
+        return self.pool.get('account.journal').search(cr, uid, domain, context=context)
+    
     _defaults = {
         'landscape': True,
         'amount_currency': True,
         'sortby': 'sort_date',
         'initial_balance': False,
+        'amount_currency': True,
+        'export_format': 'pdf',
+        'journal_ids': _get_journals,  # exclude extra-accounting journals from this report (IKD, ODX)
     }
+    
+    def default_get(self, cr, uid, fields, context=None):
+        res = super(account_report_general_ledger, self).default_get(cr, uid, fields, context=context)
+        # get company default currency
+        user = self.pool.get('res.users').browse(cr, uid, [uid], context=context)
+        if user and user[0] and user[0].company_id:
+            res['output_currency'] = user[0].company_id.currency_id.id
+        return res
 
     def onchange_fiscalyear(self, cr, uid, ids, fiscalyear=False, context=None):
         res = {}
         if not fiscalyear:
             res['value'] = {'initial_balance': False}
         return res
+        
+    def remove_journals(self, cr, uid, ids, context=None):
+        if ids:
+            self.write(cr, uid, ids, { 'journal_ids': [(6, 0, [])] },
+                       context=context)
+        return {}
 
     def _print_report(self, cr, uid, ids, data, context=None):
         if context is None:
             context = {}
         data = self.pre_print_report(cr, uid, ids, data, context=context)
-        data['form'].update(self.read(cr, uid, ids, ['landscape',  'initial_balance', 'amount_currency', 'sortby'])[0])
+        data['form'].update(self.read(cr, uid, ids, ['landscape',  'initial_balance', 'amount_currency', 'sortby', 'output_currency', 'instance_ids', 'export_format'])[0])
         if not data['form']['fiscalyear_id']:# GTK client problem onchange does not consider in save record
             data['form'].update({'initial_balance': False})
+        if data['form']['journal_ids']:
+            default_journals = self._get_journals(cr, uid, context=context)
+            if default_journals:
+                if len(default_journals) == len(data['form']['journal_ids']):
+                    data['form']['all_journals'] = True
+        if data['form']['export_format'] \
+           and data['form']['export_format'] == 'xls':
+            return { 
+                'type': 'ir.actions.report.xml',
+                'report_name': 'account.general.ledger_xls',
+                'datas': data,
+            }
         if data['form']['landscape']:
-            return { 'type': 'ir.actions.report.xml', 'report_name': 'account.general.ledger_landscape', 'datas': data}
-        return { 'type': 'ir.actions.report.xml', 'report_name': 'account.general.ledger', 'datas': data}
-
+            return { 
+                'type': 'ir.actions.report.xml',
+                'report_name': 'account.general.ledger_landscape',
+                'datas': data,
+            }
+        return { 
+            'type': 'ir.actions.report.xml',
+            'report_name': 'account.general.ledger',
+            'datas': data,
+        }
+        
+        
 account_report_general_ledger()
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
=== modified file 'account/wizard/account_report_general_ledger_view.xml'
--- account/wizard/account_report_general_ledger_view.xml	2011-01-14 00:11:01 +0000
+++ account/wizard/account_report_general_ledger_view.xml	2013-12-20 09:30:16 +0000
@@ -16,11 +16,38 @@
             <xpath expr="//field[@name='target_move']" position="after">
                 <field name="display_account"/>
                 <field name="sortby"/>
-                <field name="landscape"/>
                 <field name="initial_balance" attrs="{'readonly':[('fiscalyear_id','=', False)]}"/>
-                <field name="amount_currency"/>
-                <newline/>
-            </xpath>
+                <newline/>
+                <field name="export_format"/>
+                <field name="landscape" attrs="{'invisible': [('export_format', '=', 'xls')]}"/>
+                <newline/>   
+                <field name="output_currency" invisible="1" />
+                <field name="amount_currency" invisible="1" />
+                <newline/>
+                <field name="instance_ids">
+                    <tree noteditable="1" editable="top" string="Proprietary Instances">
+                        <field name="code" />
+                        <field name="name" />
+                    </tree>
+                </field>
+                <newline/>
+            </xpath>
+            
+            <xpath expr="//field[@name='journal_ids']" position="replace">
+                <group col="4" colspan="4">
+                    <button name="remove_journals" string="Remove all journals" type="object" colspan="1" />
+                    <label string="" colspan="3" />
+                    <field name="journal_ids" colspan="4" nolabel="1" noteditable="1">
+                        <tree noteditable="1" editable="top" string="Account Journal">
+                            <field name="instance_id" />
+                            <field name="code" />
+                            <field name="name" />
+                            <field name="type" />
+                        </tree>
+                    </field>
+                </group>
+            </xpath>
+            
             </data>
             </field>
         </record>