Merge lp:~unifield-team/unifield-wm/UFTP-245 into lp:unifield-wm

[jftempo]

=== modified file 'msf_doc_import/account.py'
--- msf_doc_import/account.py	2013-12-10 09:50:13 +0000
+++ msf_doc_import/account.py	2014-06-02 12:07:57 +0000
@@ -36,7 +36,7 @@
     _name = 'msf.doc.import.accounting'
 
     _columns = {
-        'date': fields.date(string="Migration date", required=True),
+        'date': fields.date(string="Date", required=True),
         'file': fields.binary(string="File", filters='*.xml, *.xls', required=True),
         'filename': fields.char(string="Imported filename", size=256),
         'progression': fields.float(string="Progression", readonly=True),
@@ -52,7 +52,7 @@
         'message': lambda *a: _('Initialization…'),
     }
 
-    def create_entries(self, cr, uid, ids, context=None):
+    def create_entries(self, cr, uid, ids, journal_id, context=None):
         """
         Create journal entry 
         """
@@ -60,10 +60,10 @@
         if not context:
             context = {}
         # Prepare some values
-        journal_ids = self.pool.get('account.journal').search(cr, uid, [('type', '=', 'migration'), ('is_current_instance', '=', True)])
-        if not journal_ids:
-            raise osv.except_osv(_('Warning'), _('No migration journal found!'))
-        journal_id = journal_ids[0]
+        #journal_ids = self.pool.get('account.journal').search(cr, uid, [('type', '=', 'migration'), ('is_current_instance', '=', True)])
+        #if not journal_ids:
+        #    raise osv.except_osv(_('Warning'), _('No migration journal found!'))
+        #journal_id = journal_ids[0]
         # Fetch default funding pool: MSF Private Fund
         try: 
             msf_fp_id = self.pool.get('ir.model.data').get_object_reference(cr, uid, 'analytic_distribution', 'analytic_account_msf_private_funds')[1]
@@ -191,7 +191,7 @@
                     raise osv.except_osv(_('Warning'), _('No period found!'))
                 period = self.pool.get('account.period').browse(cr, uid, wiz_period_ids[0], context)
                 if not period or period.state in ['created', 'done']:
-                    raise osv.except_osv(_('Warning'), _('Period for migration is not open!'))
+                    raise osv.except_osv(_('Warning'), _('Period is not open!'))
                 date = wiz.date or False
 
                 # Check that a file was given
@@ -213,7 +213,7 @@
                 self.write(cr, uid, [wiz.id], {'message': _('Reading headers…'), 'progression': 5.00})
                 # Use the first row to find which column to use
                 cols = {}
-                col_names = ['Description', 'Reference', 'Document Date', 'Posting Date', 'G/L Account', 'Third party', 'Destination', 'Cost Centre', 'Booking Debit', 'Booking Credit', 'Booking Currency']
+                col_names = ['Journal Code', 'Description', 'Reference', 'Document Date', 'Posting Date', 'G/L Account', 'Third party', 'Destination', 'Cost Centre', 'Booking Debit', 'Booking Credit', 'Booking Currency']
                 for num, r in enumerate(rows):
                     header = [x and x.data for x in r.iter_cells()]
                     for el in col_names:
@@ -222,6 +222,10 @@
                     break
                 # Number of line to bypass in line's count
                 base_num = 2
+                
+                # global journal code for the file
+                file_journal_id = 0
+                aj_obj = self.pool.get('account.journal')
 
                 for el in col_names:
                     if not el in cols:
@@ -289,17 +293,26 @@
                     if line[cols['Booking Credit']]:
                         money[line[cols['Booking Currency']]]['credit'] += line[cols['Booking Credit']]
                         r_credit = line[cols['Booking Credit']]
-                    # Check document/posting dates
-                    # UTP-766: Do not use Document date column, but wizard's one
-                    #if not line[cols['Document Date']]:
-                    #    errors.append(_('Line %s. No document date specified!') % (current_line_num,))
-                    #    continue
-                    # UTP-766: Do not use Posting date column, but wizard's one
-                    #if line[cols['Document Date']] > date:
-                    #    errors.append(_("Line %s. Document date '%s' should be inferior or equal to given Posting date '%s'.") % (current_line_num, line[cols['Document Date']], date,))
-                    #    continue
-                    # Fetch document date
-                    #r_document_date = line[cols['Document Date']].strftime('%Y-%m-%d')
+              
+                    # Check which journal it is to be posted to: should be of type OD, MIG or INT
+                    if not line[cols['Journal Code']]:
+                        errors.append(_('Line %s. No Journal Code specified') % (current_line_num,))
+                        continue
+                    else:
+                        # check for a valid journal code  
+                        aj_id = aj_obj.search(cr, uid, [('type','in',['intermission','migration','correction']),('code','=',line[cols['Journal Code']])])[0]
+                        if aj_id:
+                            if num == 0:   # Assume 1st line is the journal code for the entire spreadsheet                  
+                                file_journal_id = aj_id
+                            else:
+                                if file_journal_id != aj_id:
+                                    errors.append(_('Line %s. Only a single Journal Code can be specified per file') % (current_line_num,))
+                                    continue
+                        else:
+                            errors.append(_('Line %s. Journal Code is not of type OD, INT or MIG') % (current_line_num,))
+                            continue
+                    
+                    print 'journal codes: ', file_journal_id, aj_id
                     # Check G/L account
                     if not line[cols['G/L Account']]:
                         errors.append(_('Line %s. No G/L account specified!') % (current_line_num,))
@@ -399,7 +412,7 @@
                 # Update wizard
                 self.write(cr, uid, ids, {'message': _('Writing changes…'), 'progression': 0.0})
                 # Create all journal entries
-                self.create_entries(cr, uid, ids, context)
+                self.create_entries(cr, uid, ids, file_journal_id, context)
                 message = _('Import successful.')
 
             # Update wizard
 
=== modified file 'msf_doc_import/view/account_view.xml'
--- msf_doc_import/view/account_view.xml	2013-10-28 12:59:14 +0000
+++ msf_doc_import/view/account_view.xml	2014-06-02 12:07:57 +0000
@@ -21,8 +21,8 @@
             <field name="model">msf.doc.import.accounting</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Import Migration Entries">
-                    <label string="This will import Migration Entries from a XML file." colspan="4"/>
+                <form string="Import Entries">
+                    <label string="This will import Entries from a XML file." colspan="4"/>
                     <newline/>
                     <field name="file" filename="filename" attrs="{'invisible': [('state', '!=', 'draft')]}"/>
                     <field name="filename" invisible="1"/>
@@ -47,7 +47,7 @@
     -->
 
         <record id="action_migration_accounting_import_wizard" model="ir.actions.act_window">
-            <field name="name">Import Migration Entries</field>
+            <field name="name">Import Entries</field>
             <field name="res_model">msf.doc.import.accounting</field>
             <field name="view_type">form</field>
             <field name="view_mode">form</field>
@@ -55,8 +55,7 @@
             <field name="target">new</field>
         </record>
 
-        <menuitem id="menu_finance_migration" name="Migration" parent="account.menu_finance_configuration" sequence="40"/>
-        <menuitem id="menu_finance_migration_accounting" name="Import Migration Entries" parent="menu_finance_migration" sequence="1" action="action_migration_accounting_import_wizard"/>
+        <menuitem id="menu_finance_migration_accounting" name="Import Entries" parent="account.menu_finance_entries" sequence="39" action="action_migration_accounting_import_wizard"/>
 
     </data>
 </openerp>
 
=== modified file 'register_accounting/account_bank_statement.py'
--- register_accounting/account_bank_statement.py	2014-06-02 10:10:09 +0000
+++ register_accounting/account_bank_statement.py	2014-06-02 12:07:57 +0000
@@ -969,7 +969,6 @@
         return list(res)
 
 
-
     def _get_fp_analytic_lines(self, cr, uid, ids, field_name=None, args=None, context=None):
         """
         Get all analytic lines linked to the given register lines
@@ -1770,10 +1769,19 @@
             distrib_id = values.get('analytic_distribution_id')
         if not distrib_id:
             values = self._update_employee_analytic_distribution(cr, uid, values=values)
+<<<<<<< TREE
         if 'cheque_number' in values:
             cr.execute('''select id from account_bank_statement_line where cheque_number = %s ''', (values['cheque_number'], ))
             for row in cr.dictfetchall():
                 raise osv.except_osv(_('Info'),_('This cheque number has already been used'))
+=======
+            
+        if 'cheque_number' in values:
+            cr.execute('''select id from account_bank_statement_line where cheque_number = '%s' ''' % (values['cheque_number']))
+            for row in cr.dictfetchall():                
+                raise osv.except_osv(_('Info'),_('This cheque number has already been used'))    
+            
+>>>>>>> MERGE-SOURCE
         # Then create a new bank statement line
         absl = super(account_bank_statement_line, self).create(cr, uid, values, context=context)
         return absl
@@ -1834,6 +1842,12 @@
             if line.get('is_down_payment', False) and line.get('down_payment_id'):
                 if not self.pool.get('wizard.down.payment').check_register_line_and_po(cr, uid, line.get('id'), line.get('down_payment_id')[0], context=context):
                     raise osv.except_osv(_('Warning'), _('An error occured on down_payment check. Please contact an administrator to resolve this problem.'))
+                
+        if 'cheque_number' in values:
+            cr.execute('''select id from account_bank_statement_line where cheque_number = '%s' ''' % (cheque_number))
+            for row in cr.dictfetchall():                
+                raise osv.except_osv(_('Info'),_('This cheque number has already been used'))
+        
         return res
 
     def copy(self, cr, uid, absl_id, default=None, context=None):
@@ -1991,7 +2005,6 @@
                 # update the invoice 'name' (ref)  TODO - does this need to be set to "/" ?
                 self.pool.get('account.invoice').read(cr, uid, absl.invoice_id.id, ['number'])['number']
                 # self.write(cr, uid, [absl.id], {'name': "/"})
-
                 # Optimization: Do check=True and update_check=True because it was out from previous lines.
                 account_move_line.write(cr, uid, account_move_line_ids, {'state': 'draft'}, context=context, check=True, update_check=True)
 
@@ -2044,7 +2057,7 @@
                     # do a move that enable a complete supplier follow-up
                     self.do_direct_expense(cr, uid, absl, context=context)
                 if previous_state == 'draft':
-                    direct_hard_post = True  # UF-2316
+                    direct_hard_post = True  # UF-2316  
                 else:
                     direct_hard_post = False
                 self._set_register_line_audittrail_post_hard_state_log(cr, uid, absl, direct_hard_post, context=context)
@@ -2067,7 +2080,7 @@
             # get next sequence
             domain = [
                 ('model', '=', model_name),
-                ('res_id', '=', absl.statement_id.id),
+                ('res_id', '=', absl.statement_id.id), 
             ]
             if direct_hard_post:
                 # for a direct hard post, an audit line with Draft 2 Temp is already created
@@ -2155,7 +2168,7 @@
         return self.posting(cr, uid, ids, 'temp', context=context)
 
     def button_analytic_lines(self, cr, uid, ids, context=None):
-        """
+        """       
         Give analytic lines linked to the given register lines
         """
         if not context:
@@ -2196,7 +2209,7 @@
             raise osv.except_osv(_('Error'), _('This wizard only accept ONE advance line.'))
         # others verifications
         for st_line in self.browse(cr, uid, ids, context=context):
-            # verify that the journal id is a cash journal
+            # verify that the journal id is a cash journal   
             if not st_line.statement_id or not st_line.statement_id.journal_id or not st_line.statement_id.journal_id.type \
                 or st_line.statement_id.journal_id.type != 'cash':
                 raise osv.except_osv(_('Error'), _("The attached journal is not a Cash Journal"))
 
=== modified file 'register_accounting/account_view.xml'
--- register_accounting/account_view.xml	2014-05-14 12:59:36 +0000
+++ register_accounting/account_view.xml	2014-06-02 12:07:57 +0000
@@ -539,7 +539,7 @@
                     <field name="journal_id"/>
                     <field name="balance_start"/>
                     <field name="msf_calculated_balance"/>
-                    <field name="balance_end_real"/>
+                    <field name="balance_end_cash"/>
                     <field name="state"/>
                     <button type="object" string="Open" name="button_open_cash" states="draft" icon="terp-gtk-go-back-rtl"/>
                     <button type="object" string="Close Register" name="button_confirm_cash" states="open" icon="terp-camera_test"/>
 
=== modified file 'register_accounting/report/liquidity_position_xls.mako'
--- register_accounting/report/liquidity_position_xls.mako	2013-03-06 14:20:39 +0000
+++ register_accounting/report/liquidity_position_xls.mako	2014-06-02 12:07:57 +0000
@@ -1,131 +1,108 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <?mso-application progid="Excel.Sheet"?>
-<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">
-  <Author>MSFUser</Author>
-  <LastAuthor>MSFUser</LastAuthor>
-  <Created>2012-06-18T15:46:09Z</Created>
-  <Company>Medecins Sans Frontieres</Company>
-  <Version>11.9999</Version>
- </DocumentProperties>
- <ExcelWorkbook xmlns="urn:schemas-microsoft-com:office:excel">
-  <WindowHeight>13170</WindowHeight>
-  <WindowWidth>19020</WindowWidth>
-  <WindowTopX>120</WindowTopX>
-  <WindowTopY>60</WindowTopY>
-  <ProtectStructure>False</ProtectStructure>
-  <ProtectWindows>False</ProtectWindows>
- </ExcelWorkbook>
-
-
-<Styles>
-
-<Style ss:ID="Default" ss:Name="Normal">
-<Alignment ss:Vertical="Bottom"/>
-<Borders/>
-<Font/>
-<NumberFormat/>
-<Protection/>
-</Style>
-
-<Style ss:ID="s16" ss:Name="Comma">
-</Style>
-
-
-<Style ss:ID="header">
-<Alignment ss:Horizontal="Center" 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="line">
-<Alignment ss:Horizontal="Center" 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="title">
-<Alignment ss:Horizontal="Center" ss:Vertical="Center" ss:WrapText="1"/>
-</Style>
-
-<Style ss:ID="s22">
-<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="s23">
-<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="s24">
-<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="mmm\-yy"/>
-</Style>
-
-<Style ss:ID="short_date">
-<Alignment ss:Horizontal="Center" 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="short_date2">
-<Alignment ss:Horizontal="Center" ss:Vertical="Center" ss:WrapText="1"/>
-<NumberFormat ss:Format="Short Date"/>
-</Style>
-
-<Style ss:ID="pop">
-<Alignment ss:Horizontal="Center" ss:Vertical="Center" ss:WrapText="1"/>
-</Style>
-
-<Style ss:ID="s25">
-<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>
-<Interior ss:Pattern="Solid"/>
-</Style>
-
-
-<Style ss:ID="s25c">
-</Style>
-
-<Style ss:ID="s25b">
-<Font ss:Bold="1"/>
-</Style>
-
-<!-- <Style ss:ID="s25">
+<Workbook xmlns="urn:schemas-microsoft-com:office:spreadsheet" xmlns:html="http://www.w3.org/TR/REC-html40" xmlns:o="urn:schemas-microsoft-com:office:office" xmlns:ss="urn:schemas-microsoft-com:office:spreadsheet" xmlns:x="urn:schemas-microsoft-com:office:excel">
+   <DocumentProperties xmlns="urn:schemas-microsoft-com:office:office">
+      <Author>MSFUser</Author>
+      <LastAuthor>MSFUser</LastAuthor>
+      <Created>2012-06-18T15:46:09Z</Created>
+      <Company>Medecins Sans Frontieres</Company>
+      <Version>11.9999</Version>
+   </DocumentProperties>
+   <ExcelWorkbook xmlns="urn:schemas-microsoft-com:office:excel">
+      <WindowHeight>13170</WindowHeight>
+      <WindowWidth>19020</WindowWidth>
+      <WindowTopX>120</WindowTopX>
+      <WindowTopY>60</WindowTopY>
+      <ProtectStructure>False</ProtectStructure>
+      <ProtectWindows>False</ProtectWindows>
+   </ExcelWorkbook>
+   <Styles>
+      <Style ss:ID="Default" ss:Name="Normal">
+         <Alignment ss:Vertical="Bottom" />
+         <Borders />
+         <Font />
+         <NumberFormat />
+         <Protection />
+      </Style>
+      <Style ss:ID="s16" ss:Name="Comma" />
+      <Style ss:ID="header">
+         <Alignment ss:Horizontal="Center" 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="line">
+         <Alignment ss:Horizontal="Center" 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="title">
+         <Alignment ss:Horizontal="Center" ss:Vertical="Center" ss:WrapText="1" />
+      </Style>
+      <Style ss:ID="s22">
+         <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="s23">
+         <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="s24">
+         <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="mmm\-yy" />
+      </Style>
+      <Style ss:ID="short_date">
+         <Alignment ss:Horizontal="Center" 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="short_date2">
+         <Alignment ss:Horizontal="Center" ss:Vertical="Center" ss:WrapText="1" />
+         <NumberFormat ss:Format="Short Date" />
+      </Style>
+      <Style ss:ID="pop">
+         <Alignment ss:Horizontal="Center" ss:Vertical="Center" ss:WrapText="1" />
+      </Style>
+      <Style ss:ID="s25">
+         <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>
+         <Interior ss:Pattern="Solid" />
+      </Style>
+      <Style ss:ID="s25c" />
+      <Style ss:ID="s25b">
+         <Font ss:Bold="1" />
+      </Style>
+      <!-- <Style ss:ID="s25">
 <Borders>
 <Border ss:Position="Bottom" ss:LineStyle="Continuous" ss:Weight="1"/>
 <Border ss:Position="Left" ss:LineStyle="Continuous" ss:Weight="1"/>
@@ -144,339 +121,313 @@
 <NumberFormat />
 <NumberFormat ss:Format="Fixed"/>
 </Style> -->
-
-<Style ss:ID="s26" >
-<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="Fixed"/>
-</Style>
-
-
-
-<Style ss:ID="s32">
-<Alignment ss:Horizontal="Right" ss:Vertical="Bottom"/>
-<Borders>
-<Border ss:Position="Bottom" ss:LineStyle="Continuous" ss:Weight="1"/>
-<Border ss:Position="Top" ss:LineStyle="Continuous" ss:Weight="1"/>
-</Borders>
-<Font x:Family="Swiss" ss:Bold="1"/>
-</Style>
-
-<Style ss:ID="s34">
-<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>
-<Font ss:Bold="1"/>
-</Style>
-
-
-<Style ss:ID="s35">
-<Alignment ss:Vertical="Center" ss:WrapText="1"/>
-</Style>
-
-
-<Style ss:ID="s38">
-<Borders>
-<Border ss:Position="Bottom" ss:LineStyle="Continuous" ss:Weight="1"/>
-<Border ss:Position="Top" ss:LineStyle="Continuous" ss:Weight="1"/>
-</Borders>
-</Style>
-
-
-<Style ss:ID="s39" >
-<Borders>
-<Border ss:Position="Bottom" ss:LineStyle="Continuous" ss:Weight="1"/>
-<Border ss:Position="Top" ss:LineStyle="Continuous" ss:Weight="1"/>
-</Borders>
-</Style>
-
-<Style ss:ID="s40">
-<Borders>
-<Border ss:Position="Bottom" ss:LineStyle="Continuous" ss:Weight="1"/>
-</Borders>
-</Style>
-
-<Style ss:ID="s41">
-<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>
-<Font x:Family="Swiss" ss:Bold="1"/>
-</Style>
-
-<Style ss:ID="s42">
-<Borders>
-<Border ss:Position="Bottom" ss:LineStyle="Continuous" ss:Weight="1"/>
-<Border ss:Position="Left" ss:LineStyle="Continuous" ss:Weight="1"/>
-<Border ss:Position="Top" ss:LineStyle="Continuous" ss:Weight="1"/>
-</Borders>
-</Style>
-
-<Style ss:ID="s43" >
-<Borders>
-<Border ss:Position="Bottom" 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="s44" >
-<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>
-<Font x:Family="Swiss" ss:Bold="1"/>
-<NumberFormat ss:Format="Fixed"/>
-</Style>
-
-
-<Style ss:ID="s49">
-<Alignment ss:Horizontal="Right" ss:Vertical="Bottom"/>
-<Borders>
-<Border ss:Position="Bottom" ss:LineStyle="Continuous" ss:Weight="2"/>
-<Border ss:Position="Left" ss:LineStyle="Continuous" ss:Weight="2"/>
-<Border ss:Position="Right" ss:LineStyle="Continuous" ss:Weight="1"/>
-<Border ss:Position="Top" ss:LineStyle="Continuous" ss:Weight="2"/>
-</Borders>
-<Font x:Family="Swiss" ss:Bold="1"/>
-</Style>
-
-<Style ss:ID="s50" >
-<Borders>
-<Border ss:Position="Bottom" ss:LineStyle="Continuous" ss:Weight="2"/>
-<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="2"/>
-</Borders>
-<Font x:Family="Swiss" ss:Bold="1"/>
-<NumberFormat ss:Format="Fixed"/>
-</Style>
-
-<Style ss:ID="s51">
-<Borders>
-<Border ss:Position="Bottom" ss:LineStyle="Continuous" ss:Weight="2"/>
-<Border ss:Position="Left" ss:LineStyle="Continuous" ss:Weight="1"/>
-<Border ss:Position="Right" ss:LineStyle="Continuous" ss:Weight="2"/>
-<Border ss:Position="Top" ss:LineStyle="Continuous" ss:Weight="2"/>
-</Borders>
-<Font x:Family="Swiss" ss:Bold="1"/>
-</Style>
-</Styles>
-
-
-<Worksheet ss:Name="Liquidity position">
-<Table >
-<Column ss:AutoFitWidth="0" ss:Width="110.5"/>
-<Column ss:AutoFitWidth="0" ss:Width="102.75" ss:Span="1"/>
-<Column  ss:AutoFitWidth="0" ss:Width="103.5" ss:Span="1"/>
-<Column  ss:AutoFitWidth="0" ss:Width="75.75"/>
-<Column ss:AutoFitWidth="0" ss:Width="103.5" ss:Span="1"/>
-<Column  ss:AutoFitWidth="0" ss:Width="70.75"/>
-
-<Row>
-<Cell ss:StyleID="s25b" >
-<Data ss:Type="String">${_('LIQUIDITY POSITION')}</Data>
-</Cell>
-</Row>
-<Row ss:Height="13.5"/>
-<Row >
-<Cell>
-<Data ss:Type="String">${_('Report Date:')}</Data>
-</Cell>
-<Cell ss:StyleID="short_date2" >
-<Data ss:Type="DateTime">${time.strftime('%Y-%m-%d')|n}T00:00:00.000</Data>
-</Cell>
-</Row>
-<Row>
-<Cell>
-<Data ss:Type="String">${_('Prop Instance: ')}</Data>
-</Cell>
-<Cell ss:StyleID="pop">
-<Data ss:Type="String">${( company.instance_id and company.instance_id.code or '')|x}</Data>
-</Cell>
-</Row>
-<Row ss:Height="13.5"/>
-
-<Row  ss:AutoFitHeight="0" ss:Height="25.5" ss:StyleID="s35">
-		<Cell ss:StyleID="s34" >
-<Data ss:Type="String">${_('Proprietary instance')}</Data>
-</Cell>
-		<Cell ss:StyleID="s34" >
-<Data ss:Type="String">${_('Journal Code')}</Data>
-</Cell>
-		<Cell ss:StyleID="s34" >
-<Data ss:Type="String">${_('Journal Name')}</Data>
-</Cell>
-		<Cell ss:StyleID="s34" >
-<Data ss:Type="String">${_('Calculated Balance in register currency')}</Data>
-</Cell>
-		<Cell ss:StyleID="s34" >
-<Data ss:Type="String">${_('Register Balance in register currency')}</Data>
-</Cell>
-		<Cell ss:StyleID="s34" >
-<Data ss:Type="String">${_('Register Currency')}</Data>
-</Cell>
-		<Cell ss:StyleID="s34" >
-<Data ss:Type="String">${_('Calculated Balance in functional currency')}</Data>
-</Cell>
-		<Cell ss:StyleID="s34" >
-<Data ss:Type="String">${_('Register Balance in functional currency')}</Data>
-</Cell>
-		<Cell ss:StyleID="s34" >
-<Data ss:Type="String">${_('Functional Currency')}</Data>
-</Cell>
-</Row>
-
-% for reg in getRegister():
-	% for o in getRegister2()[reg]:
-	<Row>
-        <Cell ss:StyleID="s25" >
-<Data ss:Type="String">${(o.instance_id and o.instance_id.code or '')|x}</Data>
-</Cell>
-        <Cell ss:StyleID="s25" >
-<Data ss:Type="String">${(o.journal_id and o.journal_id.code or '')|x}</Data>
-</Cell>
-        <Cell ss:StyleID="s25" >
-<Data ss:Type="String">${(o.journal_id and o.journal_id.name or '')|x}</Data>
-</Cell>
-        <Cell ss:StyleID="s26" >
-<Data ss:Type="Number">${(o.msf_calculated_balance or 0.0)|x}</Data>
-</Cell>
-        % if o.journal_id.type == 'cash' :
-        	<Cell ss:StyleID="s26" >
-<Data ss:Type="Number">${(o.balance_end_cash or 0.0)|x}</Data>
-</Cell>
-	% endif
-        % if o.journal_id.type == 'bank' :
-        	<Cell ss:StyleID="s26" >
-<Data ss:Type="Number">${(o.balance_end_real or 0.0)|x}</Data>
-</Cell>
-	% endif
-        <Cell ss:StyleID="s25" >
-<Data ss:Type="String">${( o.journal_id and o.journal_id.currency and o.journal_id.currency.name or '')|x}</Data>
-</Cell>
-        <Cell ss:StyleID="s26" >
-<Data ss:Type="Number">${( getConvert(o.journal_id.currency,o.journal_id.company_id.currency_id,o.msf_calculated_balance, 'cal') or 0.0 )|x}</Data>
-</Cell>
-
-        % if o.journal_id.type == 'cash' :
-        	<Cell ss:StyleID="s26" >
-<Data ss:Type="Number">${( getConvert(o.journal_id.currency,o.journal_id.company_id.currency_id,o.balance_end_cash,'reg') or 0.0 )|x}</Data>
-</Cell>
-	% endif
-        % if o.journal_id.type == 'bank' :
-        	<Cell ss:StyleID="s26" >
-<Data ss:Type="Number">${( getConvert(o.journal_id.currency,o.journal_id.company_id.currency_id,o.balance_end_real,'reg') or 0.0 )|x}</Data>
-</Cell>
-	% endif
-        <Cell ss:StyleID="s25" >
-<Data ss:Type="String">${( getFuncCur(o) or '')|x}</Data>
-</Cell>
-	</Row>
-
-% endfor
-
-<Row>
-	<Cell ss:StyleID="s42"/>
-	<Cell ss:StyleID="s38">
-	<NamedCell ss:Name="Print_Area"/>
-	</Cell>
-	<Cell ss:StyleID="s38">
-	<NamedCell ss:Name="Print_Area"/>
-	</Cell>
-	<Cell ss:StyleID="s39">
-	<NamedCell ss:Name="Print_Area"/>
-	</Cell>
-	<Cell ss:StyleID="s43">
-	<NamedCell ss:Name="Print_Area"/>
-	</Cell>
-	<Cell ss:StyleID="s32">
-	<Data ss:Type="String">${_('Sub-Total =')}</Data>
-	<NamedCell ss:Name="Print_Area"/>
-	</Cell>
-	<Cell ss:StyleID="s44" ss:Formula="=SUM(R[-${getCal()}]C:R[-1]C)" >
-	<Data ss:Type="Number"></Data>
-	<NamedCell ss:Name="Print_Area"/>
-	</Cell>
-	<Cell ss:StyleID="s44" ss:Formula="=SUM(R[-${getRes()}]C:R[-1]C)" >
-	<Data ss:Type="Number"></Data>
-	<NamedCell ss:Name="Print_Area"/>
-	</Cell>
-	<Cell ss:StyleID="s41">
-	<Data ss:Type="String">${( getCurTot() or '')|x}</Data>
-	<NamedCell ss:Name="Print_Area"/>
-	</Cell>
-</Row>
-<Row ss:Height="13.5"/>
-% endfor
-
-
-<Row ss:Height="13.5">
-	<Cell ss:StyleID="s25c"/>
-	<Cell ss:StyleID="s25c"/>
-	<Cell ss:StyleID="s25c"/>
-	<Cell ss:StyleID="s25c"/>
-	<Cell ss:StyleID="s25c"/>
-
-	<Cell  ss:StyleID="s49">
-	<Data ss:Type="String">${_('Grand Total =')}</Data>
-	<NamedCell ss:Name="Print_Area"/>
-	</Cell>
-	<Cell ss:StyleID="s50" ss:Formula="=${getFormula()}+R[-2]C">
-	<Data ss:Type="Number"></Data>
-	<NamedCell ss:Name="Print_Area"/>
-	</Cell>
-	<Cell ss:StyleID="s50" ss:Formula="=${getFormula()}+R[-2]C">
-	<Data ss:Type="Number"></Data>
-	<NamedCell ss:Name="Print_Area"/>
-	</Cell>
-	<Cell ss:StyleID="s51">
-	<Data ss:Type="String">${( getCurTot() or '')|x}</Data>
-	<NamedCell ss:Name="Print_Area"/>
-	</Cell>
-</Row>
-
-
-</Table>
-
-
-<WorksheetOptions>
-<FitToPage/>
-<Print>
-<ValidPrinterInfo/>
-<PaperSizeIndex>9</PaperSizeIndex>
-<Scale>63</Scale>
-<HorizontalResolution>600</HorizontalResolution>
-<VerticalResolution>0</VerticalResolution>
-</Print>
-<PageBreakZoom>60</PageBreakZoom>
-<Selected/>
-<DoNotDisplayGridlines/>
-<Panes>
-<Pane>
-<Number>3</Number>
-<ActiveRow>24</ActiveRow>
-<ActiveCol>3</ActiveCol>
-</Pane>
-</Panes>
-<ProtectObjects>False</ProtectObjects>
-<ProtectScenarios>False</ProtectScenarios>
-</WorksheetOptions>
-
-</Worksheet>
-
-
-
-</Workbook>
+      <Style ss:ID="s26">
+         <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="Fixed" />
+      </Style>
+      <Style ss:ID="s32">
+         <Alignment ss:Horizontal="Right" ss:Vertical="Bottom" />
+         <Borders>
+            <Border ss:Position="Bottom" ss:LineStyle="Continuous" ss:Weight="1" />
+            <Border ss:Position="Top" ss:LineStyle="Continuous" ss:Weight="1" />
+         </Borders>
+         <Font x:Family="Swiss" ss:Bold="1" />
+      </Style>
+      <Style ss:ID="s34">
+         <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>
+         <Font ss:Bold="1" />
+      </Style>
+      <Style ss:ID="s35">
+         <Alignment ss:Vertical="Center" ss:WrapText="1" />
+      </Style>
+      <Style ss:ID="s38">
+         <Borders>
+            <Border ss:Position="Bottom" ss:LineStyle="Continuous" ss:Weight="1" />
+            <Border ss:Position="Top" ss:LineStyle="Continuous" ss:Weight="1" />
+         </Borders>
+      </Style>
+      ( getFuncCur(o) or '')|x
+      <Style ss:ID="s39">
+         <Borders>
+            <Border ss:Position="Bottom" ss:LineStyle="Continuous" ss:Weight="1" />
+            <Border ss:Position="Top" ss:LineStyle="Continuous" ss:Weight="1" />
+         </Borders>
+      </Style>
+      <Style ss:ID="s40">
+         <Borders>
+            <Border ss:Position="Bottom" ss:LineStyle="Continuous" ss:Weight="1" />
+         </Borders>
+      </Style>
+      <Style ss:ID="s41">
+         <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>
+         <Font x:Family="Swiss" ss:Bold="1" />
+      </Style>
+      <Style ss:ID="s42">
+         <Borders>
+            <Border ss:Position="Bottom" ss:LineStyle="Continuous" ss:Weight="1" />
+            <Border ss:Position="Left" ss:LineStyle="Continuous" ss:Weight="1" />
+            <Border ss:Position="Top" ss:LineStyle="Continuous" ss:Weight="1" />
+         </Borders>
+      </Style>
+      <Style ss:ID="s43">
+         <Borders>
+            <Border ss:Position="Bottom" 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="s44">
+         <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>
+         <Font x:Family="Swiss" ss:Bold="1" />
+         <NumberFormat ss:Format="Fixed" />
+      </Style>
+      <Style ss:ID="s49">
+         <Alignment ss:Horizontal="Right" ss:Vertical="Bottom" />
+         <Borders>
+            <Border ss:Position="Bottom" ss:LineStyle="Continuous" ss:Weight="2" />
+            <Border ss:Position="Left" ss:LineStyle="Continuous" ss:Weight="2" />
+            <Border ss:Position="Right" ss:LineStyle="Continuous" ss:Weight="1" />
+            <Border ss:Position="Top" ss:LineStyle="Continuous" ss:Weight="2" />
+         </Borders>
+         <Font x:Family="Swiss" ss:Bold="1" />
+      </Style>
+      <Style ss:ID="s50">
+         <Borders>
+            <Border ss:Position="Bottom" ss:LineStyle="Continuous" ss:Weight="2" />
+            <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="2" />
+         </Borders>
+         <Font x:Family="Swiss" ss:Bold="1" />
+         <NumberFormat ss:Format="Fixed" />
+      </Style>
+      <Style ss:ID="s51">
+         <Borders>
+            <Border ss:Position="Bottom" ss:LineStyle="Continuous" ss:Weight="2" />
+            <Border ss:Position="Left" ss:LineStyle="Continuous" ss:Weight="1" />
+            <Border ss:Position="Right" ss:LineStyle="Continuous" ss:Weight="2" />
+            <Border ss:Position="Top" ss:LineStyle="Continuous" ss:Weight="2" />
+         </Borders>
+         <Font x:Family="Swiss" ss:Bold="1" />
+      </Style>
+   </Styles>
+   <Worksheet ss:Name="Liquidity position">
+      <Table>
+         <Column ss:AutoFitWidth="0" ss:Width="110.5" />
+         <Column ss:AutoFitWidth="0" ss:Width="102.75" ss:Span="1" />
+         <Column ss:AutoFitWidth="0" ss:Width="103.5" ss:Span="1" />
+         <Column ss:AutoFitWidth="0" ss:Width="75.75" />
+         <Column ss:AutoFitWidth="0" ss:Width="103.5" ss:Span="1" />
+         <Column ss:AutoFitWidth="0" ss:Width="70.75" />
+         <Row>
+            <Cell ss:StyleID="s25b">
+               <Data ss:Type="String">${_('LIQUIDITY POSITION')}</Data>
+            </Cell>
+         </Row>
+         <Row ss:Height="13.5" />
+         <Row>
+            <Cell>
+               <Data ss:Type="String">${_('Report Date:')}</Data>
+            </Cell>
+            <Cell ss:StyleID="short_date2">
+               <Data ss:Type="DateTime">${time.strftime('%Y-%m-%d')|n}T00:00:00.000</Data>
+            </Cell>
+         </Row>
+         <Row>
+            <Cell>
+               <Data ss:Type="String">${_('Prop Instance: ')}</Data>
+            </Cell>
+            <Cell ss:StyleID="pop">
+               <Data ss:Type="String">${( company.instance_id and company.instance_id.code or '')|x}</Data>
+            </Cell>
+         </Row>
+         <Row ss:Height="13.5" />
+         <Row ss:AutoFitHeight="0" ss:Height="25.5" ss:StyleID="s35">
+            <Cell ss:StyleID="s34">
+               <Data ss:Type="String">${_('Proprietary instance')}</Data>
+            </Cell>
+            <Cell ss:StyleID="s34">
+               <Data ss:Type="String">${_('Journal Code')}</Data>
+            </Cell>
+            <Cell ss:StyleID="s34">
+               <Data ss:Type="String">${_('Journal Name')}</Data>
+            </Cell>
+            <Cell ss:StyleID="s34">
+               <Data ss:Type="String">${_('Status')}</Data>
+            </Cell>
+            <Cell ss:StyleID="s34">
+               <Data ss:Type="String">${_('Period')}</Data>
+            </Cell>
+            <Cell ss:StyleID="s34">
+               <Data ss:Type="String">${_('Calculated Balance in register currency')}</Data>
+            </Cell>
+            <Cell ss:StyleID="s34">
+               <Data ss:Type="String">${_('Register Balance in register currency')}</Data>
+            </Cell>
+            <Cell ss:StyleID="s34">
+               <Data ss:Type="String">${_('Register Currency')}</Data>
+            </Cell>
+            <Cell ss:StyleID="s34">
+               <Data ss:Type="String">${_('Calculated Balance in functional currency')}</Data>
+            </Cell>
+            <Cell ss:StyleID="s34">
+               <Data ss:Type="String">${_('Register Balance in functional currency')}</Data>
+            </Cell>
+            <Cell ss:StyleID="s34">
+               <Data ss:Type="String">${_('Functional Currency')}</Data>
+            </Cell>
+         </Row>
+         % for reg in getRegister():
+			% for o in getRegister2()[reg]:
+         <Row>
+            <Cell ss:StyleID="s25">
+               <Data ss:Type="String">${(o.instance_id and o.instance_id.code or '')|x}</Data>
+            </Cell>
+            <Cell ss:StyleID="s25">
+               <Data ss:Type="String">${(o.journal_id and o.journal_id.code or '')|x}</Data>
+            </Cell>
+            <Cell ss:StyleID="s25">
+               <Data ss:Type="String">${(o.journal_id and o.journal_id.name or '')|x}</Data>
+            </Cell>
+            <Cell ss:StyleID="s25">
+               <Data ss:Type="String">${(o.state or '')|x}</Data>
+            </Cell>
+            <Cell ss:StyleID="s25">
+               <Data ss:Type="String">${(o.period_id.name or '')|x}</Data>
+            </Cell>
+            <Cell ss:StyleID="s26">
+               <Data ss:Type="Number">${(o.msf_calculated_balance or 0.0)|x}</Data>
+            </Cell>
+            % if o.journal_id.type == 'cash' :
+            <Cell ss:StyleID="s26">
+               <Data ss:Type="Number">${(o.balance_end_cash or 0.0)|x}</Data>
+            </Cell>
+            % endif
+        % if o.journal_id.type == 'bank' :
+            <Cell ss:StyleID="s26">
+               <Data ss:Type="Number">${(o.balance_end_real or 0.0)|x}</Data>
+            </Cell>
+            % endif
+            <Cell ss:StyleID="s25">
+               <Data ss:Type="String">${( o.journal_id and o.journal_id.currency and o.journal_id.currency.name or '')|x}</Data>
+            </Cell>
+            <Cell ss:StyleID="s26">
+               <Data ss:Type="Number">${( getConvert(o.journal_id.currency,o.journal_id.company_id.currency_id,o.msf_calculated_balance, 'cal') or 0.0 )|x}</Data>
+            </Cell>
+           % if o.journal_id.type == 'cash' :
+            <Cell ss:StyleID="s26">
+               <Data ss:Type="Number">${( getConvert(o.journal_id.currency,o.journal_id.company_id.currency_id,o.balance_end_cash,'reg') or 0.0 )|x}</Data>
+            </Cell>
+            % endif
+        	% if o.journal_id.type == 'bank' :
+            <Cell ss:StyleID="s26">
+               <Data ss:Type="Number">${( getConvert(o.journal_id.currency,o.journal_id.company_id.currency_id,o.balance_end_real,'reg') or 0.0 )|x}</Data>
+            </Cell>
+            % endif
+            <Cell ss:StyleID="s25">
+               <Data ss:Type="String">${( getFuncCur(o) or '')|x}</Data>
+            </Cell>
+         </Row>
+         % endfor
+         <Row>
+            <Cell ss:StyleID="s42" />
+            <Cell ss:StyleID="s38">
+               <NamedCell ss:Name="Print_Area" />
+            </Cell>
+            <Cell ss:StyleID="s38">
+               <NamedCell ss:Name="Print_Area" />
+            </Cell>
+            <Cell ss:StyleID="s39">
+               <NamedCell ss:Name="Print_Area" />
+            </Cell>
+            <Cell ss:StyleID="s43">
+               <NamedCell ss:Name="Print_Area" />
+            </Cell>
+            <Cell ss:StyleID="s32">
+               <Data ss:Type="String">${_('Sub-Total =')}</Data>
+               <NamedCell ss:Name="Print_Area" />
+            </Cell>
+            <Cell ss:StyleID="s44" ss:Formula="=SUM(R[-${getCal()}]C:R[-1]C)">
+               <Data ss:Type="Number" />
+               <NamedCell ss:Name="Print_Area" />
+            </Cell>
+            <Cell ss:StyleID="s44" ss:Formula="=SUM(R[-${getRes()}]C:R[-1]C)">
+               <Data ss:Type="Number" />
+               <NamedCell ss:Name="Print_Area" />
+            </Cell>
+            <Cell ss:StyleID="s41">
+               <Data ss:Type="String">${( getCurTot() or '')|x}</Data>
+               <NamedCell ss:Name="Print_Area" />
+            </Cell>
+         </Row>
+         <Row ss:Height="13.5" />
+         % endfor
+         <Row ss:Height="13.5">
+            <Cell ss:StyleID="s25c" />
+            <Cell ss:StyleID="s25c" />
+            <Cell ss:StyleID="s25c" />
+            <Cell ss:StyleID="s25c" />
+            <Cell ss:StyleID="s25c" />
+            <Cell ss:StyleID="s49">
+               <Data ss:Type="String">${_('Grand Total =')}</Data>
+               <NamedCell ss:Name="Print_Area" />
+            </Cell>
+            <Cell ss:StyleID="s50" ss:Formula="=${getFormula()}+R[-2]C">
+               <Data ss:Type="Number" />
+               <NamedCell ss:Name="Print_Area" />
+            </Cell>
+            <Cell ss:StyleID="s50" ss:Formula="=${getFormula()}+R[-2]C">
+               <Data ss:Type="Number" />
+               <NamedCell ss:Name="Print_Area" />
+            </Cell>
+            <Cell ss:StyleID="s51">
+               <Data ss:Type="String">${( getCurTot() or '')|x}</Data>
+               <NamedCell ss:Name="Print_Area" />
+            </Cell>
+         </Row>
+      </Table>
+      <WorksheetOptions>
+         <FitToPage />
+         <Print>
+            <ValidPrinterInfo />
+            <PaperSizeIndex>9</PaperSizeIndex>
+            <Scale>63</Scale>
+            <HorizontalResolution>600</HorizontalResolution>
+            <VerticalResolution>0</VerticalResolution>
+         </Print>
+         <PageBreakZoom>60</PageBreakZoom>
+         <Selected />
+         <DoNotDisplayGridlines />
+         <Panes>
+            <Pane>
+               <Number>3</Number>
+               <ActiveRow>24</ActiveRow>
+               <ActiveCol>3</ActiveCol>
+            </Pane>
+         </Panes>
+         <ProtectObjects>False</ProtectObjects>
+         <ProtectScenarios>False</ProtectScenarios>
+      </WorksheetOptions>
+   </Worksheet>
+</Workbook>
 \ No newline at end of file
 
=== modified file 'register_accounting/report/report_liquidity_position.py'
--- register_accounting/report/report_liquidity_position.py	2014-03-07 11:05:37 +0000
+++ register_accounting/report/report_liquidity_position.py	2014-06-02 12:07:57 +0000
@@ -83,12 +83,17 @@
         pool = pooler.get_pool(self.cr.dbname)
 
         sql_register_ids = """
-            SELECT abs.id FROM account_bank_statement abs
-                LEFT JOIN account_journal aj ON abs.journal_id = aj.id
-            WHERE
-                aj.type != 'cheque' AND abs.state != 'draft' AND abs.id not in (
-                    SELECT prev_reg_id FROM account_bank_statement WHERE prev_reg_id is not null AND state != 'draft'
-                )
+            SELECT abs.id 
+            FROM account_bank_statement abs
+            LEFT JOIN account_journal aj ON abs.journal_id = aj.id
+            WHERE aj.type != 'cheque' 
+            AND abs.state != 'draft'
+            AND abs.period_number = (SELECT max(abs2.period_number) 
+                                       FROM account_bank_statement abs2
+                                       LEFT JOIN account_journal aj2 ON abs2.journal_id = aj2.id
+                                       WHERE aj2.type != 'cheque' AND abs2.state != 'draft'
+                                       AND abs2.instance_id = abs.instance_id
+                                       AND abs2.journal_id = abs.journal_id)
         """
 
         self.cr.execute(sql_register_ids)