Merge lp:~unifield-team/unifield-wm/UF_1981 into lp:unifield-wm

[jftempo]

=== modified file 'account_override/__init__.py'
--- account_override/__init__.py	2013-04-22 14:17:10 +0000
+++ account_override/__init__.py	2013-10-21 09:56:54 +0000
@@ -28,7 +28,6 @@
 import account_move_line
 import account_analytic_line
 import account_bank_statement
-import account_export_mapping
 import report
 import wizard
 

=== modified file 'account_override/__openerp__.py'
--- account_override/__openerp__.py	2013-04-22 14:17:10 +0000
+++ account_override/__openerp__.py	2013-10-21 09:56:54 +0000
@@ -32,16 +32,12 @@
     "init_xml" : ["data.xml",],
     "demo_xml" : [],
     "update_xml" : [
-        'security/ir.model.access.csv',
         'account_invoice_workflow.xml',
         'account_view.xml',
         'account_invoice_view.xml',
         'account_invoice_report.xml',
         'account_analytic_line_view.xml',
-        'account_export_mapping_view.xml',
-        'account_report.xml',
         'account_sequence.xml',
-        'wizard/wizard_hq_report_view.xml',
     ],
     'test': [],
     'installable': True,

=== modified file 'account_override/account.py'
--- account_override/account.py	2013-08-30 13:00:25 +0000
+++ account_override/account.py	2013-10-21 09:56:54 +0000
@@ -76,13 +76,13 @@
             that could be attached. For an example make the account to be a transfer type will display only registers to the user in the Cash Register 
             when he add a new register line.
             """),
-        'is_settled_at_hq': fields.boolean("Settled at HQ"),
+        'shrink_entries_for_hq': fields.boolean("Shrink entries for HQ export", help="Check this attribute if you want to consolidate entries on this account before they are exported to the HQ system."),
         'filter_active': fields.function(_get_active, fnct_search=_search_filter_active, type="boolean", method=True, store=False, string="Show only active accounts",),
     }
 
     _defaults = {
         'type_for_register': lambda *a: 'none',
-        'is_settled_at_hq': lambda *a: False,
+        'shrink_entries_for_hq': lambda *a: True,
     }
 
     # UTP-493: Add a dash between code and account name

=== removed file 'account_override/account_export_mapping.py'
--- account_override/account_export_mapping.py	2013-04-29 13:34:46 +0000
+++ account_override/account_export_mapping.py	1970-01-01 00:00:00 +0000
@@ -1,65 +0,0 @@
-#!/usr/bin/env python
-#-*- encoding:utf-8 -*-
-##############################################################################
-#
-#    OpenERP, Open Source Management Solution
-#    Copyright (C) 2011 TeMPO Consulting, MSF. All Rights Reserved
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU Affero General Public License as
-#    published by the Free Software Foundation, either version 3 of the
-#    License, or (at your option) any later version.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU Affero General Public License for more details.
-#
-#    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-##############################################################################
-
-from osv import osv, fields
-
-class account_export_mapping(osv.osv):
-    _name = 'account.export.mapping'
-    _description = 'Mapping of UF code into AX code'
-    _rec_name = 'account_id'
-    
-    _columns = {
-        'account_id': fields.many2one('account.account', string="Unifield Account Code", required=True),
-        'mapping_value': fields.char('HQ System Account Code', required=True, size=64)
-    }
-
-    def _check_unicity(self, cr, uid, ids, context=None):
-        if not context:
-            context = {}
-        for line in self.browse(cr, uid, ids, context=context):
-            bad_ids = self.search(cr, uid, [('account_id', '=', line.account_id and line.account_id.id or False)])
-            if len(bad_ids) and len(bad_ids) > 1:
-                return False
-        return True
-
-    _constraints = [
-        (_check_unicity, "A mapping already exists for this account", ['account_id']),
-    ]
-    
-    def menu_import_wizard(self, cr, uid, ids, context=None):
-        if context is None:
-            context = {}
-        wiz_obj = self.pool.get('wizard.import.mapping')
-        wiz_id = wiz_obj.create(cr, uid, {}, context=context)
-        # we open a wizard
-        return {
-                'type': 'ir.actions.act_window',
-                'res_model': 'wizard.import.mapping',
-                'view_type': 'form',
-                'view_mode': 'form',
-                'target': 'new',
-                'res_id': [wiz_id],
-                'context': context,
-        }
-    
-account_export_mapping()
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

=== removed file 'account_override/account_export_mapping_view.xml'
--- account_override/account_export_mapping_view.xml	2013-04-29 13:34:46 +0000
+++ account_override/account_export_mapping_view.xml	1970-01-01 00:00:00 +0000
@@ -1,74 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<openerp>
-    <data>
-
-        <record model="ir.ui.view" id="export_mapping_search_view">
-            <field name="name">export.mapping.search</field>
-            <field name="model">account.export.mapping</field>
-            <field name="type">search</field>
-            <field name="arch" type="xml">
-                <search>
-                    <field name="account_id"/>
-                    <field name="mapping_value"/>
-                </search>
-            </field>
-        </record>
-        
-        <record model="ir.ui.view" id="export_mapping_tree_view">
-            <field name="name">export.mapping.tree</field>
-            <field name="model">account.export.mapping</field>
-            <field name="type">tree</field>
-            <field name="arch" type="xml">
-                <tree string="Account Mapping">
-                    <field name="account_id" />
-                    <field name="mapping_value"/>
-                </tree>
-            </field>
-        </record>
-
-        <record model="ir.ui.view" id="export_mapping_form_view">
-            <field name="name">export.mapping.form</field>
-            <field name="model">account.export.mapping</field>
-            <field name="type">form</field>
-            <field name="arch" type="xml">
-                <form string="Account Mapping">
-                    <field name="account_id" />
-                    <field name="mapping_value"/>
-                </form>
-            </field>
-        </record>
-        
-        <record model="ir.actions.act_window" id="export_mapping_action">
-            <field name="name">Account Mapping</field>
-            <field name="res_model">account.export.mapping</field>
-            <field name="view_type">form</field>
-            <field name="view_mode">tree,form</field>
-        </record>
-
-        <menuitem id="export_mapping_menu" name="Account Mapping" parent="account.account_account_menu"
-                action="export_mapping_action" />
-        
-        <record id="import_account_mappings_view" model="ir.ui.view">
-            <field name="name">Import Mappings</field>
-            <field name="model">wizard.import.mapping</field>
-            <field name="type">form</field>
-            <field name="arch" type="xml">
-            <form string="Import Mappings">
-                <field name="import_file"/>
-                <button icon="gtk-cancel" special="cancel" string="Cancel"/>
-                <button icon="terp-camera_test" string="Import" name="import_account_mappings" type="object" default_focus="1"/>
-            </form>
-            </field>
-        </record>
-        
-        <act_window name="Import Mappings"
-            res_model="wizard.import.mapping"
-            src_model="account.export.mapping"
-            view_mode="form"
-            target="new"
-            key2="client_action_multi"
-            empty_ids="1"
-            id="action_import_account_mappings"/>
-        
-    </data>
-</openerp>
\ No newline at end of file

=== removed file 'account_override/account_report.xml'
--- account_override/account_report.xml	2013-04-16 15:02:04 +0000
+++ account_override/account_report.xml	1970-01-01 00:00:00 +0000
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<openerp>
-    <data>
-        <report id="hq_export"
-        string="Export to HQ system"
-        model="account.move.line"
-        name="hq.export"
-        report_type="txt"
-        auto="False"
-        menu="False"/>
-    </data>
-</openerp>
-

=== modified file 'account_override/report/__init__.py'
--- account_override/report/__init__.py	2013-04-16 15:02:04 +0000
+++ account_override/report/__init__.py	2013-10-21 09:56:54 +0000
@@ -1,2 +1,1 @@
-import report_open_invoices
-import report_hq_export
\ No newline at end of file
+import report_open_invoices
\ No newline at end of file

=== removed file 'account_override/report/report_hq_export.py'
--- account_override/report/report_hq_export.py	2013-05-07 09:19:17 +0000
+++ account_override/report/report_hq_export.py	1970-01-01 00:00:00 +0000
@@ -1,347 +0,0 @@
-# -*- coding: utf-8 -*-
-##############################################################################
-#
-#    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU Affero General Public License as
-#    published by the Free Software Foundation, either version 3 of the
-#    License, or (at your option) any later version.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU Affero General Public License for more details.
-#
-#    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-##############################################################################
-
-import datetime
-import csv
-import StringIO
-import pooler
-import zipfile
-from tempfile import NamedTemporaryFile
-import os
-
-from report import report_sxw
-
-class report_hq_export(report_sxw.report_sxw):
-            
-    def __init__(self, name, table, rml=False, parser=report_sxw.rml_parse, header='external', store=False):
-        report_sxw.report_sxw.__init__(self, name, table, rml=rml, parser=parser, header=header, store=store)
-    
-    def _enc(self, st):
-        if isinstance(st, unicode):
-            return st.encode('utf8')
-        return st
-    
-    def translate_account(self, cr, uid, pool, browse_account, context={}):
-        mapping_obj = pool.get('account.export.mapping')
-        if browse_account:
-            mapping_ids = mapping_obj.search(cr, uid, [('account_id', '=', browse_account.id)], context=context)
-            if len(mapping_ids) > 0:
-                mapping = mapping_obj.browse(cr, uid, mapping_ids[0], context=context)
-                return mapping.mapping_value
-            else:
-                return browse_account.code
-        return ""
-
-# Commented for OCG, but can be useful for other OCs
-#    def create_counterpart(self, cr, uid, line_key, line_debit, counterpart_date, period_name):
-#        pool = pooler.get_pool(cr.dbname)
-#        # method to create counterpart line
-#        if len(line_key) > 3 and line_debit != 0.0:
-#            journal = pool.get('account.journal').browse(cr, uid, line_key[1])
-#            currency = pool.get('res.currency').browse(cr, uid, line_key[2])
-#            return [journal.instance_id and journal.instance_id.code or "",
-#                    line_key[0],
-#                    "",
-#                    line_key[3],
-#                    "",
-#                    counterpart_date,
-#                    counterpart_date,
-#                    period_name,
-#                    "10100055 - Buffer Account",
-#                    "",
-#                    "",
-#                    "",
-#                    line_debit > 0 and "0.00" or round(-line_debit, 2),
-#                    line_debit > 0 and round(line_debit, 2) or "0.00",
-#                    currency.name]
-    
-    def create_subtotal(self, cr, uid, line_key, line_debit, counterpart_date, period_name, department_info):
-        pool = pooler.get_pool(cr.dbname)
-        # method to create subtotal + counterpart line
-        if len(line_key) > 2 and line_debit != 0.0:
-            journal = pool.get('account.journal').browse(cr, uid, line_key[1])
-            currency = pool.get('res.currency').browse(cr, uid, line_key[2])
-            description = ""
-            # Description for the line
-            if line_key[0] == "1000 0000":
-                description = "Mvts_BANK_" + period_name + "_" + currency.name
-            elif line_key[0] == "1000 0001":
-                description = "Mvts_CASH_" + period_name + "_" + currency.name
-            else:
-                mapping_obj = pool.get('account.export.mapping')
-                account_values = ""
-                mapping_ids = mapping_obj.search(cr, uid, [('mapping_value', '=', line_key[0])], context={})
-                for mapping in mapping_obj.browse(cr, uid, mapping_ids, context={}):
-                    if account_values != "":
-                        account_values += "-"
-                    account_values += mapping.account_id.code
-                description = "Mvts_" + account_values + period_name + journal.code + "_" + currency.name
-            
-            return [[journal.instance_id and journal.instance_id.code or "",
-                     journal.code,
-                     "",
-                     description,
-                     "",
-                     counterpart_date,
-                     counterpart_date,
-                     period_name,
-                     line_key[0],
-                     "",
-                     department_info,
-                     "",
-                     "",
-                     line_debit > 0 and round(line_debit, 2) or "0.00",
-                     line_debit > 0 and "0.00" or round(-line_debit, 2),
-                     currency.name]]
-# Commented for OCG, but can be useful for other OCs
-#                    ,[journal.instance_id and journal.instance_id.code or "",
-#                     journal.code,
-#                     "",
-#                     "",
-#                     "",
-#                     counterpart_date,
-#                     counterpart_date,
-#                     period_name,
-#                     "10100055 - Buffer Account",
-#                     "",
-#                     "",
-#                     "",
-#                     line_debit > 0 and "0.00" or round(-line_debit, 2),
-#                     line_debit > 0 and round(line_debit, 2) or "0.00",
-#                     currency.name]]
-        
-    def create(self, cr, uid, ids, data, context=None):
-        pool = pooler.get_pool(cr.dbname)
-        # Create the header
-        first_header = ['Proprietary Instance',
-                        'Journal Code',
-                        'Entry Sequence',
-                        'Description',
-                        'Reference',
-                        'Document Date',
-                        'Posting Date',
-                        'Period',
-                        'G/L Account',
-                        'Unifield Account',
-                        'Destination',
-                        'Cost Centre',
-                        'Funding Pool',
-                        'Third Parties',
-                        'Booking Debit',
-                        'Booking Credit',
-                        'Booking Currency',
-                        'Functional Debit',
-                        'Functional Credit',
-                        'Functional Currency']
-        
-        second_header = ['Proprietary Instance',
-                         'Journal Code',
-                         'Entry Sequence',
-                         'Description',
-                         'Reference',
-                         'Document Date',
-                         'Posting Date',
-                         'Period',
-                         'G/L Account',
-                         'Destination',
-                         'Department',
-                         'Cost Centre',
-                         'Third Parties',
-                         'Booking Debit',
-                         'Booking Credit',
-                         'Booking Currency']
-        
-        # Initialize lists: one for the first report...
-        first_result_lines = []
-        # ...and subdivisions for the second report.
-        second_result_lines = []
-        main_lines = {}
-        main_lines_debit = {}
-        account_lines_debit = {}
-        # Get department info code: 3 first characters of main instance's code
-        department_info = ""
-        if len(data['form']['instance_ids']) > 0:
-            parent_instance = pool.get('msf.instance').browse(cr, uid, data['form']['instance_ids'][0], context=context)
-            if parent_instance:
-                department_info = parent_instance.code[:3]
-        
-        
-        move_line_ids = pool.get('account.move.line').search(cr, uid, [('period_id', '=', data['form']['period_id']),
-                                                                       ('instance_id', 'in', data['form']['instance_ids']),
-                                                                       ('analytic_distribution_id', '=', False),
-                                                                       ('journal_id.type', 'not in', ['hq', 'cur_adj', 'inkind'])], context=context)
-        
-        for move_line in pool.get('account.move.line').browse(cr, uid, move_line_ids, context=context):
-            journal = move_line.journal_id
-            account = move_line.account_id
-            currency = move_line.currency_id
-            # For first report: as if
-            formatted_data = [move_line.instance_id and move_line.instance_id.code or "",
-                              journal and journal.code or "",
-                              move_line.move_id and move_line.move_id.name or "",
-                              move_line.name,
-                              move_line.ref,
-                              datetime.datetime.strptime(move_line.document_date, '%Y-%m-%d').date().strftime('%d/%m/%Y'),
-                              datetime.datetime.strptime(move_line.date, '%Y-%m-%d').date().strftime('%d/%m/%Y'),
-                              move_line.period_id and move_line.period_id.code or "",
-                              self.translate_account(cr, uid, pool, account),
-                              account and account.code + " " + account.name,
-                              "",
-                              "",
-                              "",
-                              move_line.partner_txt,
-                              round(move_line.debit_currency, 2),
-                              round(move_line.credit_currency, 2),
-                              currency and currency.name or "",
-                              round(move_line.debit, 2),
-                              round(move_line.credit, 2),
-                              move_line.functional_currency_id and move_line.functional_currency_id.name or ""]
-            first_result_lines.append(formatted_data)
-            
-            # For second report: add to corresponding sub
-            if journal.type in ['correction', 'intermission'] or account.is_settled_at_hq:
-                if (journal.code, journal.id, currency.id) not in main_lines:
-                    main_lines[(journal.code, journal.id, currency.id)] = []
-                main_lines[(journal.code, journal.id, currency.id)].append(formatted_data[:9] + [formatted_data[10]] + [department_info] + formatted_data[11:12] + formatted_data[13:17])
-            else:
-                translated_account_code = self.translate_account(cr, uid, pool, account)
-                if (translated_account_code, journal.id, currency.id) not in account_lines_debit:
-                    account_lines_debit[(translated_account_code, journal.id, currency.id)] = 0.0
-                account_lines_debit[(translated_account_code, journal.id, currency.id)] += (move_line.debit_currency - move_line.credit_currency)
-                            
-                            
-                            
-        cur_adj_journal_ids = pool.get('account.journal').search(cr, uid, [('type', '=', 'cur_adj')], context=context)
-        ana_cur_journal_ids = []
-        for journal in pool.get('account.journal').browse(cr, uid, cur_adj_journal_ids, context=context):
-            if journal.analytic_journal_id and journal.analytic_journal_id.id not in ana_cur_journal_ids:
-                ana_cur_journal_ids.append(journal.analytic_journal_id.id)
-        
-        analytic_line_ids = pool.get('account.analytic.line').search(cr, uid, [('period_id', '=', data['form']['period_id']),
-                                                                               ('instance_id', 'in', data['form']['instance_ids']),
-                                                                               ('journal_id.type', 'not in', ['hq', 'engagement', 'inkind']),
-                                                                               ('journal_id', 'not in', ana_cur_journal_ids)], context=context)
-        for analytic_line in pool.get('account.analytic.line').browse(cr, uid, analytic_line_ids, context=context):
-            journal = analytic_line.move_id and analytic_line.move_id.journal_id
-            account = analytic_line.general_account_id
-            currency = analytic_line.currency_id
-            # For first report: as is
-            formatted_data = [analytic_line.instance_id and analytic_line.instance_id.code or "",
-                              analytic_line.journal_id and analytic_line.journal_id.code or "",
-                              analytic_line.move_id and analytic_line.move_id.move_id and analytic_line.move_id.move_id.name or "",
-                              analytic_line.name or "",
-                              analytic_line.ref or "",
-                              datetime.datetime.strptime(analytic_line.document_date, '%Y-%m-%d').date().strftime('%d/%m/%Y'),
-                              datetime.datetime.strptime(analytic_line.date, '%Y-%m-%d').date().strftime('%d/%m/%Y'),
-                              analytic_line.period_id and analytic_line.period_id.code or "",
-                              account and account.code,
-                              account and account.code + " " + account.name or "",
-                              analytic_line.destination_id and analytic_line.destination_id.code or "",
-                              analytic_line.cost_center_id and analytic_line.cost_center_id.code or "",
-                              analytic_line.account_id and analytic_line.account_id.code or "",
-                              analytic_line.partner_txt or "",
-                              analytic_line.amount_currency > 0 and "0.00" or round(-analytic_line.amount_currency, 2),
-                              analytic_line.amount_currency > 0 and round(analytic_line.amount_currency, 2) or "0.00",
-                              currency and currency.name or "",
-                              analytic_line.amount > 0 and "0.00" or round(-analytic_line.amount, 2),
-                              analytic_line.amount > 0 and round(analytic_line.amount, 2) or "0.00",
-                              analytic_line.functional_currency_id and analytic_line.functional_currency_id.name or ""]
-            first_result_lines.append(formatted_data)
-            
-            # For second report: add to regular lines
-            
-# Commented for OCG, but can be useful for other OCs
-#            line_name = ""
-#            if journal.type == 'cash':
-#                line_name = "Tresorerie des missions cash " + journal.code + " - Contrepartie compte d'expense"
-#            elif journal.type == 'bank':
-#                line_name = "Tresorerie des missions banque " + journal.code + " - Contrepartie compte d'expense"
-#            elif journal.type == 'cheque':
-#                line_name = "Tresorerie des missions cheque " + journal.code + " - Contrepartie compte d'expense"
-#            elif account.user_type and account.user_type.code == 'payable':
-#                line_name = "Local A/P - Contrepartie compte d'expense"
-#            elif account.user_type and account.user_type.code == 'receivable':
-#                line_name = "Local A/R - Contrepartie compte d'expense"
-#            elif account.accrual_account:
-#                line_name = "Local accrual - Contrepartie compte d'expense"
-            if (journal.code, journal.id, currency.id) not in main_lines:
-                main_lines[(journal.code, journal.id, currency.id)] = []
-            main_lines[(journal.code, journal.id, currency.id)].append(formatted_data[:9] + [formatted_data[10]] + [department_info] + formatted_data[11:12] + formatted_data[13:17])
-        
-        first_result_lines = sorted(first_result_lines, key=lambda line: line[2])
-        first_report = [first_header] + first_result_lines
-        
-        # Regroup second report lines
-        period = pool.get('account.period').browse(cr, uid, data['form']['period_id'])
-        counterpart_date = period and period.date_stop and \
-                           datetime.datetime.strptime(period.date_stop, '%Y-%m-%d').date().strftime('%d/%m/%Y') or ""
-        period_name = period and period.code or ""
-        
-        for key in sorted(main_lines.iterkeys(), key=lambda tuple: tuple[0]):
-            second_result_lines += sorted(main_lines[key], key=lambda line: line[2])
-        
-        for key in sorted(account_lines_debit.iterkeys(), key=lambda tuple: tuple[0]):
-            subtotal_lines = self.create_subtotal(cr, uid, key,
-                                                  account_lines_debit[key],
-                                                  counterpart_date,
-                                                  period_name,
-                                                  department_info)
-            if subtotal_lines:
-                second_result_lines += subtotal_lines
-        
-        second_report = [second_header] + second_result_lines    
-        
-        # file names
-        prefix = ""
-        for instance in pool.get('msf.instance').browse(cr, uid, data['form']['instance_ids'], context=context):
-            if instance.level == 'coordo':
-                prefix += instance.top_cost_center_id and instance.top_cost_center_id.code or "xxx"
-                break
-        prefix += "_"
-        period = pool.get('account.period').browse(cr, uid, data['form']['period_id'], context=context)
-        if period and period.date_start:
-            prefix += datetime.datetime.strptime(period.date_start, '%Y-%m-%d').date().strftime('%Y%m')
-        else:
-            prefix += "xxxxxx"
-        prefix += "_"
-        
-        zip_buffer = StringIO.StringIO()
-        first_fileobj = NamedTemporaryFile('w+b', delete=False)
-        second_fileobj = NamedTemporaryFile('w+b', delete=False)
-        writer = csv.writer(first_fileobj, quoting=csv.QUOTE_ALL)
-        for line in first_report:
-            writer.writerow(map(self._enc,line))
-        first_fileobj.close()
-        writer = csv.writer(second_fileobj, quoting=csv.QUOTE_ALL)
-        for line in second_report:
-            writer.writerow(map(self._enc,line))
-        second_fileobj.close()
-        out_zipfile = zipfile.ZipFile(zip_buffer, "w")
-        out_zipfile.write(first_fileobj.name, prefix + "raw data UF export.csv", zipfile.ZIP_DEFLATED)
-        out_zipfile.write(second_fileobj.name, prefix + "formatted data AX import.csv", zipfile.ZIP_DEFLATED)
-        out_zipfile.close()
-        out = zip_buffer.getvalue()
-        os.unlink(first_fileobj.name)
-        os.unlink(second_fileobj.name)
-        return (out, 'zip')
-
-report_hq_export('report.hq.export', 'account.move.line', False, parser=False)
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

=== removed directory 'account_override/security'
=== removed file 'account_override/security/ir.model.access.csv'
--- account_override/security/ir.model.access.csv	2013-04-22 14:17:10 +0000
+++ account_override/security/ir.model.access.csv	1970-01-01 00:00:00 +0000
@@ -1,2 +0,0 @@
-"id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
-"access_account_mapping_all","account.export.mapping","model_account_export_mapping","",1,1,1,1

=== modified file 'account_override/wizard/__init__.py'
--- account_override/wizard/__init__.py	2013-04-22 14:17:10 +0000
+++ account_override/wizard/__init__.py	2013-10-21 09:56:54 +0000
@@ -1,2 +1,1 @@
-import wizard_hq_report
 import wizard_import_mapping
\ No newline at end of file

=== removed file 'account_override/wizard/wizard_hq_report.py'
--- account_override/wizard/wizard_hq_report.py	2013-04-16 15:02:04 +0000
+++ account_override/wizard/wizard_hq_report.py	1970-01-01 00:00:00 +0000
@@ -1,57 +0,0 @@
-# -*- coding: utf-8 -*-
-##############################################################################
-#
-#    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU Affero General Public License as
-#    published by the Free Software Foundation, either version 3 of the
-#    License, or (at your option) any later version.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU Affero General Public License for more details.
-#
-#    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-##############################################################################
-
-from osv import fields, osv
-from tools.translate import _
-
-import datetime
-import base64
-import StringIO
-import csv
-
-class wizard_hq_report(osv.osv_memory):
-    _name = "wizard.hq.report"
-    
-    _columns = {
-        'instance_id': fields.many2one('msf.instance', 'Top proprietary instance', required=True),
-        'fiscalyear_id': fields.many2one('account.fiscalyear', 'Fiscal year', required=True),
-        'period_id': fields.many2one('account.period', 'Period', required=True)
-    }
-    
-    _defaults = {
-        'fiscalyear_id': lambda self, cr, uid, c: self.pool.get('account.fiscalyear').find(cr, uid, datetime.datetime.today().strftime('%Y-%m-%d'), context=c)
-    }
-    
-    def button_create_report(self, cr, uid, ids, context=None):
-        wizard = self.browse(cr, uid, ids[0], context=context)
-        data = {}
-        # add parameters
-        data['form'] = {}
-        if wizard.instance_id:
-            # Get projects below instance
-            data['form'].update({'instance_ids': [wizard.instance_id.id] + [x.id for x in wizard.instance_id.child_ids]})
-        if wizard.period_id:
-            data['form'].update({'period_id': wizard.period_id.id})
-
-        return {'type': 'ir.actions.report.xml', 'report_name': 'hq.export', 'datas': data}
-    
-wizard_hq_report()
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

=== removed file 'account_override/wizard/wizard_hq_report_view.xml'
--- account_override/wizard/wizard_hq_report_view.xml	2013-04-16 15:02:04 +0000
+++ account_override/wizard/wizard_hq_report_view.xml	1970-01-01 00:00:00 +0000
@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<openerp>
-    <data>
-    
-        <record id="hq_export_view" model="ir.ui.view">
-            <field name="name">Export to HQ system</field>
-            <field name="model">wizard.hq.report</field>
-            <field name="type">form</field>
-            <field name="arch" type="xml">
-            <form string="Export to HQ system">
-                <field name="instance_id" domain="[('level', '=', 'coordo')]"/>
-                <field name="fiscalyear_id"/>
-                <field name="period_id" domain="[('fiscalyear_id', '=', fiscalyear_id), ('state', 'in', ['mission-closed', 'done'])]"/>
-                <newline/>
-                <button icon="terp-camera_test" string="Export" name="button_create_report" type="object" default_focus="1"/>
-            </form>
-            </field>
-        </record>
-        
-        <record id="action_hq_export" model="ir.actions.act_window">
-            <field name="name">Export to HQ system</field>
-            <field name="type">ir.actions.act_window</field>
-            <field name="res_model">wizard.hq.report</field>
-            <field name="view_type">form</field>
-            <field name="view_mode">form</field>
-            <field name="view_id" ref="hq_export_view"/>
-            <field name="target">new</field>
-        </record>
-
-        <menuitem parent="account.menu_finance_generic_reporting"
-            action="action_hq_export"
-            id="menu_action_hq_export"  sequence="10"/>
-
-    </data>
-</openerp>
\ No newline at end of file

=== modified file 'account_override/wizard/wizard_import_mapping.py'
--- account_override/wizard/wizard_import_mapping.py	2013-04-22 14:17:10 +0000
+++ account_override/wizard/wizard_import_mapping.py	2013-10-21 09:56:54 +0000
@@ -38,7 +38,12 @@
         if context is None:
             context = {}
         account_obj = self.pool.get('account.account')
-        mapping_obj = self.pool.get('account.export.mapping')
+        instance_obj = self.pool.get('msf.instance')
+        # using the "active model" variable to determine which mapping is uploaded
+        if 'active_model' in context:
+            mapping_obj = self.pool.get(context['active_model'])
+        else:
+            raise osv.except_osv(_('Error'), _('The object to be imported is undertermined!'))
         
         # Delete previous lines
         mapping_ids = mapping_obj.search(cr, uid, [], context=context)
@@ -49,15 +54,26 @@
             import_string = StringIO.StringIO(import_file)
             import_data = list(csv.reader(import_string, quoting=csv.QUOTE_ALL, delimiter=','))
         
-            for line in import_data[1:]:
-                if len(line) == 2:
-                    account_ids = account_obj.search(cr, uid, [('code', '=', line[0])], context=context)
-                    if len(account_ids) > 0:
-                        mapping_obj.create(cr, uid, {'account_id': account_ids[0],
-                                                     'mapping_value': line[1]}, context=context)
-                    else:
-                        raise osv.except_osv(_('Error'), _('The account code %s is not in the database!') % line[0])
-                        break
+            if context['active_model'] == 'account.export.mapping':
+                for line in import_data[1:]:
+                    if len(line) == 2:
+                        account_ids = account_obj.search(cr, uid, [('code', '=', line[0])], context=context)
+                        if len(account_ids) > 0:
+                            mapping_obj.create(cr, uid, {'account_id': account_ids[0],
+                                                         'mapping_value': line[1]}, context=context)
+                        else:
+                            raise osv.except_osv(_('Error'), _('The account code %s is not in the database!') % line[0])
+                            break
+            elif context['active_model'] == 'country.export.mapping':
+                for line in import_data[1:]:
+                    if len(line) == 2:
+                        instance_ids = instance_obj.search(cr, uid, [('code', '=', line[0])], context=context)
+                        if len(instance_ids) > 0:
+                            mapping_obj.create(cr, uid, {'instance_id': instance_ids[0],
+                                                         'mapping_value': line[1]}, context=context)
+                        else:
+                            raise osv.except_osv(_('Error'), _('The instance code %s is not in the database!') % line[0])
+                            break
                         
         return {'type': 'ir.actions.act_window_close'}
     

=== modified file 'msf_profile/__openerp__.py'
--- msf_profile/__openerp__.py	2013-03-22 13:35:49 +0000
+++ msf_profile/__openerp__.py	2013-10-21 09:56:54 +0000
@@ -114,6 +114,7 @@
         "export_import_lang",
         "msf_button_access_rights",
         "msf_field_access_rights",
+        "vertical_integration",
     ],
     "update_xml": [
         "report.xml",

=== added directory 'vertical_integration'
=== added file 'vertical_integration/__init__.py'
--- vertical_integration/__init__.py	1970-01-01 00:00:00 +0000
+++ vertical_integration/__init__.py	2013-10-21 09:56:54 +0000
@@ -0,0 +1,28 @@
+#!/usr/bin/env python
+#-*- encoding:utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2011 TeMPO Consulting, MSF. All Rights Reserved
+#    Developer: Olivier DOSSMANN
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+import account_export_mapping
+import country_export_mapping
+import report
+import wizard
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

=== added file 'vertical_integration/__openerp__.py'
--- vertical_integration/__openerp__.py	1970-01-01 00:00:00 +0000
+++ vertical_integration/__openerp__.py	2013-10-21 09:56:54 +0000
@@ -0,0 +1,45 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2011 MSF, TeMPO Consulting
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+{
+    "name" : "Vertical Integration",
+    "version" : "1.0",
+    "author" : "MSF, TeMPO Consulting",
+    "description" : """
+    Add HQ exports of finance data for all sections
+    """,
+    "website": "http://unifield.msf.org",
+    "depends" : ["base", "account", "msf_instance"],
+    "category" : "Generic Modules/Accounting",
+    "init_xml" : [],
+    "demo_xml" : [],
+    "update_xml" : [
+        'security/ir.model.access.csv',
+        'account_export_mapping_view.xml',
+        'country_export_mapping_view.xml',
+        'account_report.xml',
+        'wizard/wizard_hq_report_ocg_view.xml',
+        'wizard/wizard_hq_report_oca_view.xml',
+    ],
+    'test': [],
+    'installable': True,
+    'active': False,
+}

=== added file 'vertical_integration/account_export_mapping.py'
--- vertical_integration/account_export_mapping.py	1970-01-01 00:00:00 +0000
+++ vertical_integration/account_export_mapping.py	2013-10-21 09:56:54 +0000
@@ -0,0 +1,65 @@
+#!/usr/bin/env python
+#-*- encoding:utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2011 TeMPO Consulting, MSF. All Rights Reserved
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+from osv import osv, fields
+
+class account_export_mapping(osv.osv):
+    _name = 'account.export.mapping'
+    _description = 'Mapping of UF code into AX code'
+    _rec_name = 'account_id'
+    
+    _columns = {
+        'account_id': fields.many2one('account.account', string="Unifield Account Code", required=True),
+        'mapping_value': fields.char('HQ System Account Code', required=True, size=64)
+    }
+
+    def _check_unicity(self, cr, uid, ids, context=None):
+        if not context:
+            context = {}
+        for line in self.browse(cr, uid, ids, context=context):
+            bad_ids = self.search(cr, uid, [('account_id', '=', line.account_id and line.account_id.id or False)])
+            if len(bad_ids) and len(bad_ids) > 1:
+                return False
+        return True
+
+    _constraints = [
+        (_check_unicity, "A mapping already exists for this account", ['account_id']),
+    ]
+    
+    def menu_import_wizard(self, cr, uid, ids, context=None):
+        if context is None:
+            context = {}
+        wiz_obj = self.pool.get('wizard.import.mapping')
+        wiz_id = wiz_obj.create(cr, uid, {}, context=context)
+        # we open a wizard
+        return {
+                'type': 'ir.actions.act_window',
+                'res_model': 'wizard.import.mapping',
+                'view_type': 'form',
+                'view_mode': 'form',
+                'target': 'new',
+                'res_id': [wiz_id],
+                'context': context,
+        }
+    
+account_export_mapping()
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

=== added file 'vertical_integration/account_export_mapping_view.xml'
--- vertical_integration/account_export_mapping_view.xml	1970-01-01 00:00:00 +0000
+++ vertical_integration/account_export_mapping_view.xml	2013-10-21 09:56:54 +0000
@@ -0,0 +1,74 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<openerp>
+    <data>
+
+        <record model="ir.ui.view" id="export_mapping_search_view">
+            <field name="name">export.mapping.search</field>
+            <field name="model">account.export.mapping</field>
+            <field name="type">search</field>
+            <field name="arch" type="xml">
+                <search>
+                    <field name="account_id"/>
+                    <field name="mapping_value"/>
+                </search>
+            </field>
+        </record>
+        
+        <record model="ir.ui.view" id="export_mapping_tree_view">
+            <field name="name">export.mapping.tree</field>
+            <field name="model">account.export.mapping</field>
+            <field name="type">tree</field>
+            <field name="arch" type="xml">
+                <tree string="Account Mapping">
+                    <field name="account_id" />
+                    <field name="mapping_value"/>
+                </tree>
+            </field>
+        </record>
+
+        <record model="ir.ui.view" id="export_mapping_form_view">
+            <field name="name">export.mapping.form</field>
+            <field name="model">account.export.mapping</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Account Mapping">
+                    <field name="account_id" />
+                    <field name="mapping_value"/>
+                </form>
+            </field>
+        </record>
+        
+        <record model="ir.actions.act_window" id="export_mapping_action">
+            <field name="name">Account Mapping</field>
+            <field name="res_model">account.export.mapping</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,form</field>
+        </record>
+
+        <menuitem id="export_mapping_menu" name="Account Mapping" parent="account.account_account_menu"
+                action="export_mapping_action" />
+        
+        <record id="import_account_mappings_view" model="ir.ui.view">
+            <field name="name">Import Mappings</field>
+            <field name="model">wizard.import.mapping</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+            <form string="Import Mappings">
+                <field name="import_file"/>
+                <button icon="gtk-cancel" special="cancel" string="Cancel"/>
+                <button icon="terp-camera_test" string="Import" name="import_account_mappings" type="object" default_focus="1"/>
+            </form>
+            </field>
+        </record>
+        
+        <act_window name="Import Mappings"
+            res_model="wizard.import.mapping"
+            src_model="account.export.mapping"
+            view_mode="form"
+            target="new"
+            key2="client_action_multi"
+            empty_ids="1"
+            id="action_import_account_mappings"/>
+        
+    </data>
+</openerp>
\ No newline at end of file

=== added file 'vertical_integration/account_report.xml'
--- vertical_integration/account_report.xml	1970-01-01 00:00:00 +0000
+++ vertical_integration/account_report.xml	2013-10-21 09:56:54 +0000
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+        <report id="hq_ocg"
+        string="Export to HQ system"
+        model="account.move.line"
+        name="hq.ocg"
+        report_type="txt"
+        auto="False"
+        menu="False"/>
+    </data>
+    <data>
+        <report id="hq_oca"
+        string="Export to HQ system"
+        model="account.move.line"
+        name="hq.oca"
+        report_type="txt"
+        auto="False"
+        menu="False"/>
+    </data>
+</openerp>
+

=== added file 'vertical_integration/country_export_mapping.py'
--- vertical_integration/country_export_mapping.py	1970-01-01 00:00:00 +0000
+++ vertical_integration/country_export_mapping.py	2013-10-21 09:56:54 +0000
@@ -0,0 +1,65 @@
+#!/usr/bin/env python
+#-*- encoding:utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2011 TeMPO Consulting, MSF. All Rights Reserved
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+from osv import osv, fields
+
+class country_export_mapping(osv.osv):
+    _name = 'country.export.mapping'
+    _description = 'Mapping of Instance into a Country Code'
+    _rec_name = 'instance_id'
+    
+    _columns = {
+        'instance_id': fields.many2one('msf.instance', string="Unifield Instance", required=True, domain=[('level', '=', 'coordo')]),
+        'mapping_value': fields.char('HQ System Country Code', required=True, size=64)
+    }
+
+    def _check_unicity(self, cr, uid, ids, context=None):
+        if not context:
+            context = {}
+        for line in self.browse(cr, uid, ids, context=context):
+            bad_ids = self.search(cr, uid, [('instance_id', '=', line.instance_id and line.instance_id.id or False)])
+            if len(bad_ids) and len(bad_ids) > 1:
+                return False
+        return True
+
+    _constraints = [
+        (_check_unicity, "A mapping already exists for this instance", ['instance_id']),
+    ]
+    
+    def menu_import_wizard(self, cr, uid, ids, context=None):
+        if context is None:
+            context = {}
+        wiz_obj = self.pool.get('wizard.import.mapping')
+        wiz_id = wiz_obj.create(cr, uid, {}, context=context)
+        # we open a wizard
+        return {
+                'type': 'ir.actions.act_window',
+                'res_model': 'wizard.import.mapping',
+                'view_type': 'form',
+                'view_mode': 'form',
+                'target': 'new',
+                'res_id': [wiz_id],
+                'context': context,
+        }
+    
+country_export_mapping()
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

=== added file 'vertical_integration/country_export_mapping_view.xml'
--- vertical_integration/country_export_mapping_view.xml	1970-01-01 00:00:00 +0000
+++ vertical_integration/country_export_mapping_view.xml	2013-10-21 09:56:54 +0000
@@ -0,0 +1,61 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<openerp>
+    <data>
+
+        <record model="ir.ui.view" id="country_export_mapping_search_view">
+            <field name="name">country.export.mapping.search</field>
+            <field name="model">country.export.mapping</field>
+            <field name="type">search</field>
+            <field name="arch" type="xml">
+                <search>
+                    <field name="instance_id"/>
+                    <field name="mapping_value"/>
+                </search>
+            </field>
+        </record>
+        
+        <record model="ir.ui.view" id="country_export_mapping_tree_view">
+            <field name="name">country.export.mapping.tree</field>
+            <field name="model">country.export.mapping</field>
+            <field name="type">tree</field>
+            <field name="arch" type="xml">
+                <tree string="Country Code Mapping">
+                    <field name="instance_id" />
+                    <field name="mapping_value"/>
+                </tree>
+            </field>
+        </record>
+
+        <record model="ir.ui.view" id="country_export_mapping_form_view">
+            <field name="name">country.export.mapping.form</field>
+            <field name="model">country.export.mapping</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Country Code Mapping">
+                    <field name="instance_id" />
+                    <field name="mapping_value"/>
+                </form>
+            </field>
+        </record>
+        
+        <record model="ir.actions.act_window" id="country_export_mapping_action">
+            <field name="name">Country Code Mapping</field>
+            <field name="res_model">country.export.mapping</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,form</field>
+        </record>
+
+        <menuitem id="country_export_mapping_menu" name="Country Code Mapping" parent="account.account_account_menu"
+                action="country_export_mapping_action" />
+        
+        <act_window name="Import Mappings"
+            res_model="wizard.import.mapping"
+            src_model="country.export.mapping"
+            view_mode="form"
+            target="new"
+            key2="client_action_multi"
+            empty_ids="1"
+            id="action_import_country_mappings"/>
+        
+    </data>
+</openerp>
\ No newline at end of file

=== added directory 'vertical_integration/report'
=== added file 'vertical_integration/report/__init__.py'
--- vertical_integration/report/__init__.py	1970-01-01 00:00:00 +0000
+++ vertical_integration/report/__init__.py	2013-10-21 09:56:54 +0000
@@ -0,0 +1,2 @@
+import hq_report_ocg
+import hq_report_oca
\ No newline at end of file

=== added file 'vertical_integration/report/hq_report_oca.py'
--- vertical_integration/report/hq_report_oca.py	1970-01-01 00:00:00 +0000
+++ vertical_integration/report/hq_report_oca.py	2013-10-21 09:56:54 +0000
@@ -0,0 +1,335 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+import datetime
+import csv
+import StringIO
+import pooler
+import zipfile
+from tempfile import NamedTemporaryFile
+import os
+
+from report import report_sxw
+
+class hq_report_oca(report_sxw.report_sxw):
+            
+    def __init__(self, name, table, rml=False, parser=report_sxw.rml_parse, header='external', store=False):
+        report_sxw.report_sxw.__init__(self, name, table, rml=rml, parser=parser, header=header, store=store)
+    
+    def _enc(self, st):
+        if isinstance(st, unicode):
+            return st.encode('utf8')
+        return st
+    
+    def translate_country(self, cr, uid, pool, browse_instance, context={}):
+        mapping_obj = pool.get('country.export.mapping')
+        if browse_instance:
+            mapping_ids = mapping_obj.search(cr, uid, [('instance_id', '=', browse_instance.id)], context=context)
+            if len(mapping_ids) > 0:
+                mapping = mapping_obj.browse(cr, uid, mapping_ids[0], context=context)
+                return mapping.mapping_value
+        return "0"
+
+    def create_counterpart(self, cr, uid, line):
+        pool = pooler.get_pool(cr.dbname)
+        # method to create counterpart line
+        return line[:2] + \
+               ["20750",
+                "0",
+                "0",
+                line[5],
+                line[6],
+                line[7],
+                line[9],
+                line[8]] + line[10:]
+    
+    def create_subtotal(self, cr, uid, line_key, line_debit, line_functional_debit, counterpart_date, country_code, sequence_number):
+        pool = pooler.get_pool(cr.dbname)
+        # method to create subtotal + counterpart line
+        if len(line_key) > 2 and line_debit != 0.0 and line_functional_debit != 0.0:
+            return [["01",
+                     country_code,
+                     line_key[0],
+                     "0",
+                     "0",
+                     counterpart_date,
+                     line_key[1],
+                     round(line_debit / line_functional_debit, 8),
+                     line_debit > 0 and round(line_debit, 2) or "",
+                     line_debit < 0 and round(-line_debit, 2) or "",
+                     sequence_number,
+                     "",
+                     "Subtotal - " + line_key[0] + " - " + line_key[1] + " - " + line_key[2],
+                     "0",
+                     counterpart_date,
+                     "0"]
+                    ,["01",
+                      country_code,
+                      "20750",
+                      "0",
+                      "0",
+                      counterpart_date,
+                      line_key[1],
+                      round(line_debit / line_functional_debit, 8),
+                      line_debit < 0 and round(-line_debit, 2) or "",
+                      line_debit > 0 and round(line_debit, 2) or "",
+                      sequence_number,
+                      "",
+                      "Automatic counterpart for " + line_key[0] + " - " + line_key[1] + " - " + line_key[2],
+                      "0",
+                      counterpart_date,
+                      "0"]]
+        
+    def create(self, cr, uid, ids, data, context=None):
+        pool = pooler.get_pool(cr.dbname)
+        
+        first_header = ['Proprietary Instance',
+                        'Journal Code',
+                        'Entry Sequence',
+                        'Description',
+                        'Reference',
+                        'Document Date',
+                        'Posting Date',
+                        'Period',
+                        'G/L Account',
+                        'Destination',
+                        'Cost Centre',
+                        'Funding Pool',
+                        'Third Parties',
+                        'Booking Debit',
+                        'Booking Credit',
+                        'Booking Currency',
+                        'Functional Debit',
+                        'Functional Credit',
+                        'Functional Currency',
+                        'Exchange Rate']
+        
+        # Initialize lists: one for the first report...
+        first_result_lines = []
+        # ...one for the second report...
+        second_result_lines = []
+        # ...and subdivisions for the third report.
+        third_report = []
+        account_lines = []
+        account_lines_debit = {}
+        account_lines_functional_debit = {}
+        # General variables
+        period = pool.get('account.period').browse(cr, uid, data['form']['period_id'])
+        period_name = period and period.code or "0"
+        counterpart_date = period and period.date_stop and \
+                           datetime.datetime.strptime(period.date_stop, '%Y-%m-%d').date().strftime('%d/%m/%Y') or ""
+        integration_ref = "0"
+        country_code = "0"
+        move_prefix = "0"
+        if len(data['form']['instance_ids']) > 0:
+            parent_instance = pool.get('msf.instance').browse(cr, uid, data['form']['instance_ids'][0], context=context)
+            if parent_instance:
+                country_code = self.translate_country(cr, uid, pool, parent_instance)
+                if period and period.date_start:
+                    integration_ref = parent_instance.code[:2] + period.date_start[5:7]
+                    move_prefix = parent_instance.move_prefix[:2]
+        
+        move_line_ids = pool.get('account.move.line').search(cr, uid, [('period_id', '=', data['form']['period_id']),
+                                                                       ('instance_id', 'in', data['form']['instance_ids']),
+                                                                       ('analytic_distribution_id', '=', False),
+                                                                       ('journal_id.type', 'not in', ['hq', 'migration'])], context=context)
+        
+        for move_line in pool.get('account.move.line').browse(cr, uid, move_line_ids, context=context):
+            journal = move_line.journal_id
+            account = move_line.account_id
+            currency = move_line.currency_id
+            func_currency = move_line.functional_currency_id
+            rate = "0.00"
+            if currency and func_currency:
+                cr.execute("SELECT rate FROM res_currency_rate WHERE currency_id = %s AND name <= %s ORDER BY name desc LIMIT 1" ,(move_line.functional_currency_id.id, move_line.date))
+                if cr.rowcount:
+                    func_rate = cr.fetchall()[0][0]
+                cr.execute("SELECT rate FROM res_currency_rate WHERE currency_id = %s AND name <= %s ORDER BY name desc LIMIT 1" ,(currency.id, move_line.date))
+                if cr.rowcount:
+                    curr_rate = cr.fetchall()[0][0]
+                if func_rate != 0.00:
+                    rate = round(curr_rate / func_rate, 5)
+            # For first report: as if
+            formatted_data = [move_line.instance_id and move_line.instance_id.code or "",
+                              journal and journal.code or "",
+                              move_line.move_id and move_line.move_id.name or "",
+                              move_line.name,
+                              move_line.ref,
+                              datetime.datetime.strptime(move_line.document_date, '%Y-%m-%d').date().strftime('%d/%m/%Y'),
+                              datetime.datetime.strptime(move_line.date, '%Y-%m-%d').date().strftime('%d/%m/%Y'),
+                              move_line.period_id and move_line.period_id.code or "",
+                              account and account.code + " " + account.name,
+                              "",
+                              "",
+                              "",
+                              move_line.partner_txt,
+                              round(move_line.debit_currency, 2),
+                              round(move_line.credit_currency, 2),
+                              currency and currency.name or "",
+                              round(move_line.debit, 2),
+                              round(move_line.credit, 2),
+                              func_currency and func_currency.name or "",
+                              rate]
+            first_result_lines.append(formatted_data)
+            
+            # For third report: add to corresponding sub
+            if not account.shrink_entries_for_hq:
+                expat_employee = "0"
+                # Expat employees are the only third party in this report
+                if move_line.partner_txt and move_line.employee_id and move_line.employee_id.employee_type == 'ex':
+                    expat_employee = move_line.partner_txt[:5]
+                other_formatted_data = ["01",
+                                        country_code,
+                                        account and account.code or "0",
+                                        "0",
+                                        "0",
+                                        move_line.date and datetime.datetime.strptime(move_line.date, '%Y-%m-%d').date().strftime('%d/%m/%Y') or "0",
+                                        currency and currency.name or "0",
+                                        rate,
+                                        move_line.debit_currency != 0.0 and round(move_line.debit_currency, 2) or "",
+                                        move_line.credit_currency != 0.0 and round(move_line.credit_currency, 2) or "",
+                                        move_line.move_id and move_line.move_id.name or "0",
+                                        "",
+                                        move_line.name or "0",
+                                        expat_employee,
+                                        move_line.document_date and datetime.datetime.strptime(move_line.document_date, '%Y-%m-%d').date().strftime('%d/%m/%Y') or "0",
+                                        move_line.ref or "0"]
+                account_lines.append(other_formatted_data)
+            else:
+                if (account.code, currency.name, period_name) not in account_lines_debit:
+                    account_lines_debit[(account.code, currency.name, period_name)] = 0.0
+                    account_lines_functional_debit[(account.code, currency.name, period_name)] = 0.0
+                account_lines_debit[(account.code, currency.name, period_name)] += (move_line.debit_currency - move_line.credit_currency)
+                account_lines_functional_debit[(account.code, currency.name, period_name)] += (move_line.debit - move_line.credit)
+        
+        analytic_line_ids = pool.get('account.analytic.line').search(cr, uid, [('period_id', '=', data['form']['period_id']),
+                                                                               ('instance_id', 'in', data['form']['instance_ids']),
+                                                                               ('journal_id.type', 'not in', ['hq', 'engagement', 'migration'])], context=context)
+        
+        for analytic_line in pool.get('account.analytic.line').browse(cr, uid, analytic_line_ids, context=context):
+            journal = analytic_line.move_id and analytic_line.move_id.journal_id
+            account = analytic_line.general_account_id
+            currency = analytic_line.currency_id
+            func_currency = move_line.functional_currency_id
+            rate = ""
+            if func_currency:
+                cr.execute("SELECT rate FROM res_currency_rate WHERE currency_id = %s AND name <= %s ORDER BY name desc LIMIT 1" ,(move_line.functional_currency_id.id, analytic_line.date))
+                if cr.rowcount:
+                    rate = cr.fetchall()[0][0]
+            # For first report: as is
+            formatted_data = [analytic_line.instance_id and analytic_line.instance_id.code or "",
+                              analytic_line.journal_id and analytic_line.journal_id.code or "",
+                              analytic_line.move_id and analytic_line.move_id.move_id and analytic_line.move_id.move_id.name or "",
+                              analytic_line.name or "",
+                              analytic_line.ref or "",
+                              datetime.datetime.strptime(analytic_line.document_date, '%Y-%m-%d').date().strftime('%d/%m/%Y'),
+                              datetime.datetime.strptime(analytic_line.date, '%Y-%m-%d').date().strftime('%d/%m/%Y'),
+                              analytic_line.period_id and analytic_line.period_id.code or "",
+                              account and account.code + " " + account.name or "",
+                              analytic_line.destination_id and analytic_line.destination_id.code or "",
+                              analytic_line.cost_center_id and analytic_line.cost_center_id.code or "",
+                              analytic_line.account_id and analytic_line.account_id.code or "",
+                              analytic_line.partner_txt or "",
+                              analytic_line.amount_currency > 0 and "0.00" or round(-analytic_line.amount_currency, 2),
+                              analytic_line.amount_currency > 0 and round(analytic_line.amount_currency, 2) or "0.00",
+                              currency and currency.name or "",
+                              analytic_line.amount > 0 and "0.00" or round(-analytic_line.amount, 2),
+                              analytic_line.amount > 0 and round(analytic_line.amount, 2) or "0.00",
+                              func_currency and func_currency.name or "",
+                              rate]
+            first_result_lines.append(formatted_data)
+            
+            # Add to second report (expenses only)
+            other_formatted_data = [integration_ref ,
+                                    analytic_line.document_date and datetime.datetime.strptime(analytic_line.document_date, '%Y-%m-%d').date().strftime('%d/%m/%Y') or "0",
+                                    "0",
+                                    "0",
+                                    analytic_line.cost_center_id and analytic_line.cost_center_id.code or "0",
+                                    "1",
+                                    account and account.code + " " + account.name or "0",
+                                    currency and currency.name or "0",
+                                    analytic_line.amount_currency and round(-analytic_line.amount_currency, 2) or "0.00",
+                                    "0",
+                                    rate,
+                                    analytic_line.date and datetime.datetime.strptime(analytic_line.date, '%Y-%m-%d').date().strftime('%d/%m/%Y') or "0",
+                                    analytic_line.move_id and analytic_line.move_id.move_id and analytic_line.move_id.move_id.name or "0",
+                                    "0",
+                                    analytic_line.name or "0",
+                                    analytic_line.ref or "0",
+                                    analytic_line.destination_id and analytic_line.destination_id.code or "0"]
+            second_result_lines.append(other_formatted_data)
+        
+        first_result_lines = sorted(first_result_lines, key=lambda line: line[2])
+        first_report = [first_header] + first_result_lines
+        
+        second_report = sorted(second_result_lines, key=lambda line: line[12])
+        
+        for line in sorted(account_lines, key=lambda line: line[10]):
+            third_report.append(line)
+            third_report.append(self.create_counterpart(cr, uid, line))
+        
+        sequence_index = 1
+        for key in sorted(account_lines_debit.iterkeys(), key=lambda tuple: tuple[0]):
+            # create the sequence number for those lines
+            sequence_number = move_prefix + "-" + \
+                              period.date_start[5:7] + "-" + \
+                              period.date_start[:4] + "-" + \
+                              key[0] + "-" + \
+                              key[1]
+                
+            subtotal_lines = self.create_subtotal(cr, uid, key,
+                                                  account_lines_debit[key],
+                                                  account_lines_functional_debit[key],
+                                                  counterpart_date,
+                                                  country_code,
+                                                  sequence_number)
+            if subtotal_lines:
+                third_report += subtotal_lines
+        
+        zip_buffer = StringIO.StringIO()
+        first_fileobj = NamedTemporaryFile('w+b', delete=False)
+        second_fileobj = NamedTemporaryFile('w+b', delete=False)
+        third_fileobj = NamedTemporaryFile('w+b', delete=False)
+        writer = csv.writer(first_fileobj, quoting=csv.QUOTE_ALL)
+        for line in first_report:
+            writer.writerow(map(self._enc,line))
+        first_fileobj.close()
+        writer = csv.writer(second_fileobj, quoting=csv.QUOTE_ALL)
+        for line in second_report:
+            writer.writerow(map(self._enc,line))
+        second_fileobj.close()
+        writer = csv.writer(third_fileobj, quoting=csv.QUOTE_ALL)
+        for line in third_report:
+            writer.writerow(map(self._enc,line))
+        third_fileobj.close()
+        out_zipfile = zipfile.ZipFile(zip_buffer, "w")
+        out_zipfile.write(first_fileobj.name, "Raw_Data.csv", zipfile.ZIP_DEFLATED)
+        out_zipfile.write(second_fileobj.name, "Up_Expenses.csv", zipfile.ZIP_DEFLATED)
+        out_zipfile.write(third_fileobj.name, "Up_Balances.csv", zipfile.ZIP_DEFLATED)
+        out_zipfile.close()
+        out = zip_buffer.getvalue()
+        os.unlink(first_fileobj.name)
+        os.unlink(second_fileobj.name)
+        os.unlink(third_fileobj.name)
+        return (out, 'zip')
+
+hq_report_oca('report.hq.oca', 'account.move.line', False, parser=False)
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

=== added file 'vertical_integration/report/hq_report_ocg.py'
--- vertical_integration/report/hq_report_ocg.py	1970-01-01 00:00:00 +0000
+++ vertical_integration/report/hq_report_ocg.py	2013-10-21 09:56:54 +0000
@@ -0,0 +1,291 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+import datetime
+import csv
+import StringIO
+import pooler
+import zipfile
+from tempfile import NamedTemporaryFile
+import os
+
+from report import report_sxw
+
+class hq_report_ocg(report_sxw.report_sxw):
+            
+    def __init__(self, name, table, rml=False, parser=report_sxw.rml_parse, header='external', store=False):
+        report_sxw.report_sxw.__init__(self, name, table, rml=rml, parser=parser, header=header, store=store)
+    
+    def _enc(self, st):
+        if isinstance(st, unicode):
+            return st.encode('utf8')
+        return st
+    
+    def translate_account(self, cr, uid, pool, browse_account, context={}):
+        mapping_obj = pool.get('account.export.mapping')
+        if browse_account:
+            mapping_ids = mapping_obj.search(cr, uid, [('account_id', '=', browse_account.id)], context=context)
+            if len(mapping_ids) > 0:
+                mapping = mapping_obj.browse(cr, uid, mapping_ids[0], context=context)
+                return mapping.mapping_value
+            else:
+                return browse_account.code
+        return ""
+    
+    def create_subtotal(self, cr, uid, line_key, line_debit, counterpart_date, period_name, department_info):
+        pool = pooler.get_pool(cr.dbname)
+        # method to create subtotal + counterpart line
+        if len(line_key) > 2 and line_debit != 0.0:
+            journal = pool.get('account.journal').browse(cr, uid, line_key[1])
+            currency = pool.get('res.currency').browse(cr, uid, line_key[2])
+            description = ""
+            # Description for the line
+            if line_key[0] == "1000 0000":
+                description = "Mvts_BANK_" + period_name + "_" + currency.name
+            elif line_key[0] == "1000 0001":
+                description = "Mvts_CASH_" + period_name + "_" + currency.name
+            else:
+                mapping_obj = pool.get('account.export.mapping')
+                account_values = ""
+                mapping_ids = mapping_obj.search(cr, uid, [('mapping_value', '=', line_key[0])], context={})
+                for mapping in mapping_obj.browse(cr, uid, mapping_ids, context={}):
+                    if account_values != "":
+                        account_values += "-"
+                    account_values += mapping.account_id.code
+                description = "Mvts_" + account_values + period_name + journal.code + "_" + currency.name
+            
+            return [[journal.instance_id and journal.instance_id.code or "",
+                     journal.code,
+                     "",
+                     description,
+                     "",
+                     counterpart_date,
+                     counterpart_date,
+                     period_name,
+                     line_key[0],
+                     "",
+                     department_info,
+                     "",
+                     "",
+                     line_debit > 0 and round(line_debit, 2) or "0.00",
+                     line_debit > 0 and "0.00" or round(-line_debit, 2),
+                     currency.name]]
+        
+    def create(self, cr, uid, ids, data, context=None):
+        pool = pooler.get_pool(cr.dbname)
+        # Create the header
+        first_header = ['Proprietary Instance',
+                        'Journal Code',
+                        'Entry Sequence',
+                        'Description',
+                        'Reference',
+                        'Document Date',
+                        'Posting Date',
+                        'Period',
+                        'G/L Account',
+                        'Unifield Account',
+                        'Destination',
+                        'Cost Centre',
+                        'Funding Pool',
+                        'Third Parties',
+                        'Booking Debit',
+                        'Booking Credit',
+                        'Booking Currency',
+                        'Functional Debit',
+                        'Functional Credit',
+                        'Functional Currency']
+        
+        second_header = ['Proprietary Instance',
+                         'Journal Code',
+                         'Entry Sequence',
+                         'Description',
+                         'Reference',
+                         'Document Date',
+                         'Posting Date',
+                         'Period',
+                         'G/L Account',
+                         'Destination',
+                         'Department',
+                         'Cost Centre',
+                         'Third Parties',
+                         'Booking Debit',
+                         'Booking Credit',
+                         'Booking Currency']
+        
+        # Initialize lists: one for the first report...
+        first_result_lines = []
+        # ...and subdivisions for the second report.
+        second_result_lines = []
+        main_lines = {}
+        account_lines_debit = {}
+        # Get department info code: 3 first characters of main instance's code
+        department_info = ""
+        if len(data['form']['instance_ids']) > 0:
+            parent_instance = pool.get('msf.instance').browse(cr, uid, data['form']['instance_ids'][0], context=context)
+            if parent_instance:
+                department_info = parent_instance.code[:3]
+        
+        
+        move_line_ids = pool.get('account.move.line').search(cr, uid, [('period_id', '=', data['form']['period_id']),
+                                                                       ('instance_id', 'in', data['form']['instance_ids']),
+                                                                       ('analytic_distribution_id', '=', False),
+                                                                       ('journal_id.type', 'not in', ['hq', 'cur_adj', 'inkind'])], context=context)
+        
+        for move_line in pool.get('account.move.line').browse(cr, uid, move_line_ids, context=context):
+            journal = move_line.journal_id
+            account = move_line.account_id
+            currency = move_line.currency_id
+            # For first report: as if
+            formatted_data = [move_line.instance_id and move_line.instance_id.code or "",
+                              journal and journal.code or "",
+                              move_line.move_id and move_line.move_id.name or "",
+                              move_line.name,
+                              move_line.ref,
+                              datetime.datetime.strptime(move_line.document_date, '%Y-%m-%d').date().strftime('%d/%m/%Y'),
+                              datetime.datetime.strptime(move_line.date, '%Y-%m-%d').date().strftime('%d/%m/%Y'),
+                              move_line.period_id and move_line.period_id.code or "",
+                              self.translate_account(cr, uid, pool, account),
+                              account and account.code + " " + account.name,
+                              "",
+                              "",
+                              "",
+                              move_line.partner_txt,
+                              round(move_line.debit_currency, 2),
+                              round(move_line.credit_currency, 2),
+                              currency and currency.name or "",
+                              round(move_line.debit, 2),
+                              round(move_line.credit, 2),
+                              move_line.functional_currency_id and move_line.functional_currency_id.name or ""]
+            first_result_lines.append(formatted_data)
+            
+            # For second report: add to corresponding sub
+            if journal.type in ['correction', 'intermission'] or not account.shrink_entries_for_hq:
+                if (journal.code, journal.id, currency.id) not in main_lines:
+                    main_lines[(journal.code, journal.id, currency.id)] = []
+                main_lines[(journal.code, journal.id, currency.id)].append(formatted_data[:9] + [formatted_data[10]] + [department_info] + formatted_data[11:12] + formatted_data[13:17])
+            else:
+                translated_account_code = self.translate_account(cr, uid, pool, account)
+                if (translated_account_code, journal.id, currency.id) not in account_lines_debit:
+                    account_lines_debit[(translated_account_code, journal.id, currency.id)] = 0.0
+                account_lines_debit[(translated_account_code, journal.id, currency.id)] += (move_line.debit_currency - move_line.credit_currency)
+                            
+                            
+                            
+        cur_adj_journal_ids = pool.get('account.journal').search(cr, uid, [('type', '=', 'cur_adj')], context=context)
+        ana_cur_journal_ids = []
+        for journal in pool.get('account.journal').browse(cr, uid, cur_adj_journal_ids, context=context):
+            if journal.analytic_journal_id and journal.analytic_journal_id.id not in ana_cur_journal_ids:
+                ana_cur_journal_ids.append(journal.analytic_journal_id.id)
+        
+        analytic_line_ids = pool.get('account.analytic.line').search(cr, uid, [('period_id', '=', data['form']['period_id']),
+                                                                               ('instance_id', 'in', data['form']['instance_ids']),
+                                                                               ('journal_id.type', 'not in', ['hq', 'engagement', 'inkind']),
+                                                                               ('journal_id', 'not in', ana_cur_journal_ids)], context=context)
+        for analytic_line in pool.get('account.analytic.line').browse(cr, uid, analytic_line_ids, context=context):
+            journal = analytic_line.move_id and analytic_line.move_id.journal_id
+            account = analytic_line.general_account_id
+            currency = analytic_line.currency_id
+            # For first report: as is
+            formatted_data = [analytic_line.instance_id and analytic_line.instance_id.code or "",
+                              analytic_line.journal_id and analytic_line.journal_id.code or "",
+                              analytic_line.move_id and analytic_line.move_id.move_id and analytic_line.move_id.move_id.name or "",
+                              analytic_line.name or "",
+                              analytic_line.ref or "",
+                              datetime.datetime.strptime(analytic_line.document_date, '%Y-%m-%d').date().strftime('%d/%m/%Y'),
+                              datetime.datetime.strptime(analytic_line.date, '%Y-%m-%d').date().strftime('%d/%m/%Y'),
+                              analytic_line.period_id and analytic_line.period_id.code or "",
+                              account and account.code,
+                              account and account.code + " " + account.name or "",
+                              analytic_line.destination_id and analytic_line.destination_id.code or "",
+                              analytic_line.cost_center_id and analytic_line.cost_center_id.code or "",
+                              analytic_line.account_id and analytic_line.account_id.code or "",
+                              analytic_line.partner_txt or "",
+                              analytic_line.amount_currency > 0 and "0.00" or round(-analytic_line.amount_currency, 2),
+                              analytic_line.amount_currency > 0 and round(analytic_line.amount_currency, 2) or "0.00",
+                              currency and currency.name or "",
+                              analytic_line.amount > 0 and "0.00" or round(-analytic_line.amount, 2),
+                              analytic_line.amount > 0 and round(analytic_line.amount, 2) or "0.00",
+                              analytic_line.functional_currency_id and analytic_line.functional_currency_id.name or ""]
+            first_result_lines.append(formatted_data)
+            
+            if (journal.code, journal.id, currency.id) not in main_lines:
+                main_lines[(journal.code, journal.id, currency.id)] = []
+            main_lines[(journal.code, journal.id, currency.id)].append(formatted_data[:9] + [formatted_data[10]] + [department_info] + formatted_data[11:12] + formatted_data[13:17])
+        
+        first_result_lines = sorted(first_result_lines, key=lambda line: line[2])
+        first_report = [first_header] + first_result_lines
+        
+        # Regroup second report lines
+        period = pool.get('account.period').browse(cr, uid, data['form']['period_id'])
+        counterpart_date = period and period.date_stop and \
+                           datetime.datetime.strptime(period.date_stop, '%Y-%m-%d').date().strftime('%d/%m/%Y') or ""
+        period_name = period and period.code or ""
+        
+        for key in sorted(main_lines.iterkeys(), key=lambda tuple: tuple[0]):
+            second_result_lines += sorted(main_lines[key], key=lambda line: line[2])
+        
+        for key in sorted(account_lines_debit.iterkeys(), key=lambda tuple: tuple[0]):
+            subtotal_lines = self.create_subtotal(cr, uid, key,
+                                                  account_lines_debit[key],
+                                                  counterpart_date,
+                                                  period_name,
+                                                  department_info)
+            if subtotal_lines:
+                second_result_lines += subtotal_lines
+        
+        second_report = [second_header] + second_result_lines    
+        
+        # file names
+        prefix = ""
+        for instance in pool.get('msf.instance').browse(cr, uid, data['form']['instance_ids'], context=context):
+            if instance.level == 'coordo':
+                prefix += instance.top_cost_center_id and instance.top_cost_center_id.code or "xxx"
+                break
+        prefix += "_"
+        period = pool.get('account.period').browse(cr, uid, data['form']['period_id'], context=context)
+        if period and period.date_start:
+            prefix += datetime.datetime.strptime(period.date_start, '%Y-%m-%d').date().strftime('%Y%m')
+        else:
+            prefix += "xxxxxx"
+        prefix += "_"
+        
+        zip_buffer = StringIO.StringIO()
+        first_fileobj = NamedTemporaryFile('w+b', delete=False)
+        second_fileobj = NamedTemporaryFile('w+b', delete=False)
+        writer = csv.writer(first_fileobj, quoting=csv.QUOTE_ALL)
+        for line in first_report:
+            writer.writerow(map(self._enc,line))
+        first_fileobj.close()
+        writer = csv.writer(second_fileobj, quoting=csv.QUOTE_ALL)
+        for line in second_report:
+            writer.writerow(map(self._enc,line))
+        second_fileobj.close()
+        out_zipfile = zipfile.ZipFile(zip_buffer, "w")
+        out_zipfile.write(first_fileobj.name, prefix + "raw data UF export.csv", zipfile.ZIP_DEFLATED)
+        out_zipfile.write(second_fileobj.name, prefix + "formatted data AX import.csv", zipfile.ZIP_DEFLATED)
+        out_zipfile.close()
+        out = zip_buffer.getvalue()
+        os.unlink(first_fileobj.name)
+        os.unlink(second_fileobj.name)
+        return (out, 'zip')
+
+hq_report_ocg('report.hq.ocg', 'account.move.line', False, parser=False)
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

=== added file 'vertical_integration/report/open_invoices_xls.mako'
--- vertical_integration/report/open_invoices_xls.mako	1970-01-01 00:00:00 +0000
+++ vertical_integration/report/open_invoices_xls.mako	2013-10-21 09:56:54 +0000
@@ -0,0 +1,382 @@
+<?xml version="1.0"?>
+<?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">
+  <LastAuthor>MSFUser</LastAuthor>
+  <Created>2013-01-08T16:00:30Z</Created>
+  <LastSaved>2013-01-08T16:06:38Z</LastSaved>
+  <Version>11.9999</Version>
+ </DocumentProperties>
+ <ExcelWorkbook xmlns="urn:schemas-microsoft-com:office:excel">
+  <WindowHeight>8385</WindowHeight>
+  <WindowWidth>14940</WindowWidth>
+  <WindowTopX>360</WindowTopX>
+  <WindowTopY>240</WindowTopY>
+  <ProtectStructure>False</ProtectStructure>
+  <ProtectWindows>False</ProtectWindows>
+ </ExcelWorkbook>
+ <Styles>
+
+
+  <Style ss:ID="Default" ss:Name="Normal">
+   <Alignment ss:Vertical="Bottom"/>
+   <Borders/>
+   <Font/>
+   <Interior/>
+   <NumberFormat/>
+   <Protection/>
+  </Style>
+
+
+  <Style ss:ID="s21">
+   <Alignment ss:Horizontal="Center"/>
+   <Font x:Family="Swiss" />
+  </Style>
+  <Style ss:ID="s23">
+   <Font x:Family="Swiss" ss:Color="#FFFFFF" ss:Bold="1"/>
+   <Interior ss:Color="#FF0000" ss:Pattern="Solid"/>
+  </Style>
+  <Style ss:ID="s24">
+   <Font x:Family="Swiss" ss:Bold="1"/>
+   <Interior ss:Color="#FF0000" ss:Pattern="Solid"/>
+  </Style>
+  <Style ss:ID="s25">
+   <Font/>
+   <Interior ss:Color="#FF0000" ss:Pattern="Solid"/>
+  </Style>
+  <Style ss:ID="s26">
+   <Alignment ss:Vertical="Center"/>
+  </Style>
+  <Style ss:ID="s27">
+   <Alignment ss:Vertical="Center"/>
+   <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="s28">
+   <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 x:Family="Swiss" ss:Bold="1"/>
+  </Style>
+  <Style ss:ID="s29">
+   <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 x:Family="Swiss" ss:Bold="1"/>
+   <Interior ss:Pattern="Solid"/>
+  </Style>
+  <Style ss:ID="s30">
+   <Alignment ss:Vertical="Center"/>
+   <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="s31">
+   <Font x:Family="Swiss" ss:Color="#FFFFFF" ss:Bold="1"/>
+   <Interior ss:Color="#FF0000" ss:Pattern="Solid"/>
+  </Style>
+  <Style ss:ID="s32">
+   <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="s33">
+   <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="Standard"/>
+  </Style>
+
+
+  <Style ss:ID="s34">
+   <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="s35">
+   <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"/>
+   <NumberFormat ss:Format="Fixed"/>
+  </Style>
+  <Style ss:ID="s36">
+   <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="Standard"/>
+  </Style>
+  <Style ss:ID="s37">
+   <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"/>
+   <NumberFormat ss:Format="Standard"/>
+  </Style>
+  <Style ss:ID="s38">
+   <Interior ss:Color="#FF0000" ss:Pattern="Solid"/>
+  </Style>
+  <Style ss:ID="s39">
+   <Alignment ss:Vertical="Center"/>
+   <Borders/>
+   <Font x:Family="Swiss" ss:Bold="1"/>
+  </Style>
+  <Style ss:ID="s40">
+   <Alignment ss:Vertical="Center" ss:WrapText="1"/>
+   <Borders/>
+   <Font x:Family="Swiss" ss:Bold="1"/>
+  </Style>
+  <Style ss:ID="s42">
+   <Alignment ss:Vertical="Center"/>
+   <Borders/>
+  </Style>
+  <Style ss:ID="s44">
+   <Alignment ss:Horizontal="Right" ss:Vertical="Center"/>
+   <Borders/>
+   <Font x:Family="Swiss" ss:Bold="1"/>
+  </Style>
+
+  <Style ss:ID="s49">
+   <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 x:Family="Swiss" ss:Bold="1"/>
+   <Interior ss:Pattern="Solid"/>
+   <NumberFormat ss:Format="Standard"/>
+  </Style>
+
+  <Style ss:ID="s50">
+   <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"/>
+   <NumberFormat ss:Format="Standard"/>
+  </Style>
+
+  <Style ss:ID="s51">
+   <Font ss:Size="14"/>
+   <Interior  ss:Pattern="Solid"/>
+  </Style>
+
+    <Style ss:ID="s25b">
+        <Font ss:Bold="1"/>
+    </Style>
+
+  <Style ss:ID="short_date2">
+   <Alignment ss:Horizontal="Center" ss:Vertical="Center" ss:WrapText="1"/>
+   <NumberFormat ss:Format="Short Date"/>
+    <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="short_date2a">
+   <Alignment ss:Horizontal="Center" ss:Vertical="Center" ss:WrapText="1"/>
+   <NumberFormat ss:Format="Short Date"/>
+  </Style>
+
+ </Styles>
+
+<Worksheet ss:Name="${_('Open Invoices')}">
+    <Table>
+    <Column ss:AutoFitWidth="0" ss:Width="90.5" ss:Span="1"/>
+    <Column ss:Index="3" ss:Width="88.5"/>
+    <Column ss:Width="91.5"/>
+    <Column ss:Width="108"/>
+    <Column ss:Width="63"/>
+    <Column ss:Width="53.25"/>
+    <Column ss:Width="105.75"/>
+    <Column ss:Width="51"/>
+    <Column ss:Width="42.75"/>
+    <Column ss:Width="46.5" ss:Span="1"/>
+    <Column ss:Index="13" ss:Width="49.5"/>
+    <Column ss:Width="39.75"/>
+    <Column ss:Width="45.5"/>
+
+
+    <Row ss:AutoFitHeight="0" ss:Height="18">
+        <Cell ss:StyleID="s25b">
+        <Data ss:Type="String">${_('OPEN INVOICES')}</Data>
+        </Cell>
+    </Row>
+
+    <Row><Cell><Data ss:Type="String"></Data></Cell></Row>
+
+    <Row >
+        <Cell>
+        <Data ss:Type="String">${_('Prop. Instance')}:</Data>
+        </Cell>
+        <Cell ss:StyleID="s21">
+        <Data ss:Type="String">${(company.instance_id and company.instance_id.code or '')|x}</Data>
+        </Cell>
+    </Row>
+    <Row>
+        <Cell>
+        <Data ss:Type="String">${_('Report Date')}:</Data>
+        </Cell>
+        <Cell ss:StyleID="short_date2a" ><Data ss:Type="DateTime">${time.strftime('%Y-%m-%d')|n}T00:00:00.000</Data></Cell>
+    </Row>
+    <Row><Cell><Data ss:Type="String"></Data></Cell></Row>
+
+% for (type, title) in [('ci', _('Stock Transfer Vouchers')), ('si', _('Supplier Invoices')), ('cr', _('Customer Refunds')), ('sr', _('Supplier Refunds'))]:
+   <Row >
+    <Cell ss:StyleID="s23"><Data ss:Type="String">${title}</Data></Cell>
+    <Cell ss:StyleID="s24"/>
+    <Cell ss:StyleID="s24"/>
+    <Cell ss:StyleID="s24"/>
+    <Cell ss:StyleID="s24"/>
+    <Cell ss:StyleID="s24"/>
+    <Cell ss:StyleID="s24"/>
+    <Cell ss:StyleID="s24"/>
+    <Cell ss:StyleID="s24"/>
+    <Cell ss:StyleID="s24"/>
+    <Cell ss:StyleID="s24"/>
+    <Cell ss:StyleID="s24"/>
+    <Cell ss:StyleID="s24"/>
+    <Cell ss:StyleID="s24"/>
+    <Cell ss:StyleID="s25"/>
+   </Row>
+    <Row ss:AutoFitHeight="0" ss:Height="51" ss:StyleID="s26">
+        <Cell ss:StyleID="s27"><Data ss:Type="String">${_('Document Date')}</Data></Cell>
+        <Cell ss:StyleID="s27"><Data ss:Type="String">${_('Posting Date')}</Data></Cell>
+        <Cell ss:StyleID="s27"><Data ss:Type="String">${_('Number')}</Data></Cell>
+        <Cell ss:StyleID="s27"><Data ss:Type="String">${_('Customer')}</Data></Cell>
+        <Cell ss:StyleID="s27"><Data ss:Type="String">${_('Description')}</Data></Cell>
+        <Cell ss:StyleID="s27"><Data ss:Type="String">${_('Responsible')}</Data></Cell>
+        <Cell ss:StyleID="s27"><Data ss:Type="String">${_('Due Date')}</Data></Cell>
+        <Cell ss:StyleID="s27"><Data ss:Type="String">${_('Source Document')}</Data></Cell>
+        <Cell ss:StyleID="s28"><Data ss:Type="String">${_('Residual amt booking ccy')}</Data></Cell>
+        <Cell ss:StyleID="s28"><Data ss:Type="String">${_('Total amt booking ccy')}</Data></Cell>
+        <Cell ss:StyleID="s28"><Data ss:Type="String">${_('Booking Currency')}</Data></Cell>
+        <Cell ss:StyleID="s29"><Data ss:Type="String">${_('Residual amt func. ccy')}</Data></Cell>
+        <Cell ss:StyleID="s29"><Data ss:Type="String">${_('Total amt func. ccy')}</Data></Cell>
+        <Cell ss:StyleID="s29"><Data ss:Type="String">${_('Func. Ccy')}</Data></Cell>
+        <Cell ss:StyleID="s27"><Data ss:Type="String">${_('State')}</Data></Cell>
+    </Row>
+
+<% nb_line = 0 %>
+
+% for line in getLines(type):
+    <Row>
+        <% nb_line += 1 %>
+        % if line[1]:
+            <Cell ss:StyleID="short_date2" ><Data ss:Type="DateTime">${line[1] or ' ' |n}T00:00:00.000</Data></Cell>
+        % else:
+            <Cell ss:StyleID="short_date2" ><Data ss:Type="String"></Data></Cell>
+        % endif
+
+        % if line[2]:
+            <Cell ss:StyleID="short_date2" ><Data ss:Type="DateTime">${line[2] or ' ' |n}T00:00:00.000</Data></Cell>
+        % else:
+            <Cell ss:StyleID="short_date2" ><Data ss:Type="String"></Data></Cell>
+        % endif
+        <Cell ss:StyleID="s33"><Data ss:Type="String">${(line[3] or '')|x}</Data></Cell>
+        <Cell ss:StyleID="s33"><Data ss:Type="String">${(line[4] or '')|x}</Data></Cell>
+        <Cell ss:StyleID="s33"><Data ss:Type="String">${(line[5] or '')|x}</Data></Cell>
+        <Cell ss:StyleID="s33"><Data ss:Type="String">${(line[6] or '')|x}</Data></Cell>
+        % if line[7]:
+            <Cell ss:StyleID="short_date2" ><Data ss:Type="DateTime">${line[7] or ' ' |n}T00:00:00.000</Data></Cell>
+        % else:
+            <Cell ss:StyleID="short_date2" ><Data ss:Type="String"></Data></Cell>
+        % endif
+        <Cell ss:StyleID="s33"><Data ss:Type="String">${(line[8] or '')|x}</Data></Cell>
+        <Cell ss:StyleID="s33" ><Data ss:Type="Number">${(line[10] or 0.0)|x}</Data></Cell>
+        <Cell ss:StyleID="s33" ><Data ss:Type="Number">${(line[11] or 0.0)|x}</Data></Cell>
+        <Cell ss:StyleID="s33"><Data ss:Type="String">${(line[9] or '')|x}</Data></Cell>
+        <Cell ss:StyleID="s50" ><Data ss:Type="Number">${(getConvert(line[10], line) or 0.0 )|x}</Data></Cell>
+        <Cell ss:StyleID="s50" ><Data ss:Type="Number">${(getConvert(line[11], line) or 0.0 )|x}</Data></Cell>
+        <Cell ss:StyleID="s50"><Data ss:Type="String">${getFuncCur() |x}</Data></Cell>
+        <Cell ss:StyleID="s33"><Data ss:Type="String">${(line[12] and getSelValue('account.invoice', 'state', line[12]) or '')|x}</Data></Cell>
+    </Row>
+% endfor
+
+    <Row ss:AutoFitHeight="0" ss:StyleID="s26">
+        <Cell ss:StyleID="s39"/>
+        <Cell ss:StyleID="s39"/>
+        <Cell ss:StyleID="s39"/>
+        <Cell ss:StyleID="s39"/>
+        <Cell ss:StyleID="s39"/>
+        <Cell ss:StyleID="s39"/>
+        <Cell ss:StyleID="s39"/>
+        <Cell ss:StyleID="s39"/>
+        <Cell ss:StyleID="s40"/>
+        <Cell ss:StyleID="s40"/>
+        <Cell ss:StyleID="s44"><Data ss:Type="String">${_('Sub Total')} =</Data></Cell>
+        % if nb_line:
+            <Cell ss:StyleID="s49" ss:Formula="=SUM(R[-${nb_line}]C:R[-1]C)"><Data ss:Type="Number" ></Data></Cell>
+            <Cell ss:StyleID="s49" ss:Formula="=SUM(R[-${nb_line}]C:R[-1]C)"><Data ss:Type="Number"></Data></Cell>
+        % else:
+            <Cell ss:StyleID="s49" />
+            <Cell ss:StyleID="s49" />
+        % endif
+        <Cell ss:StyleID="s29"><Data ss:Type="String">${getFuncCur() |x}</Data></Cell>
+        <Cell ss:StyleID="s42"/>
+    </Row>
+
+    <Row><Cell><Data ss:Type="String"></Data></Cell></Row>
+    <Row><Cell><Data ss:Type="String"></Data></Cell></Row>
+% endfor
+  </Table>
+  <WorksheetOptions xmlns="urn:schemas-microsoft-com:office:excel">
+   <Print>
+    <ValidPrinterInfo/>
+    <PaperSizeIndex>9</PaperSizeIndex>
+    <HorizontalResolution>600</HorizontalResolution>
+    <VerticalResolution>0</VerticalResolution>
+   </Print>
+   <Selected/>
+   <ProtectObjects>False</ProtectObjects>
+   <ProtectScenarios>False</ProtectScenarios>
+  </WorksheetOptions>
+ </Worksheet>
+</Workbook>

=== added file 'vertical_integration/report/report_open_invoices.py'
--- vertical_integration/report/report_open_invoices.py	1970-01-01 00:00:00 +0000
+++ vertical_integration/report/report_open_invoices.py	2013-10-21 09:56:54 +0000
@@ -0,0 +1,77 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    Copyright (C) 2013 MSF, TeMPO Consulting
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+from spreadsheet_xml.spreadsheet_xml_write import SpreadsheetReport
+from report import report_sxw
+from tools.translate import _
+
+
+class report_open_invoices2(report_sxw.rml_parse):
+    def __init__(self, cr, uid, name, context=None):
+        super(report_open_invoices2, self).__init__(cr, uid, name, context=context)
+        self.funcCur = ''
+        self.localcontext.update({
+            'getLines':self.getLines,
+            'getConvert':self.getConvert,
+            'getFuncCur':self.getFuncCur,
+        })
+        return
+
+    def getLines(self,option):
+        result = []
+        sql_request = """
+            SELECT DISTINCT invoice.id, invoice.document_date, invoice.date_invoice, move.name,
+                            partner.name, invoice.name, responsible.name,
+                            invoice.date_due, invoice.origin,
+                            currency.name, invoice.residual,
+                            invoice.amount_total, invoice.state,
+                            currency.id
+            FROM
+                account_invoice invoice
+                LEFT JOIN account_move move ON invoice.move_id = move.id
+                LEFT JOIN res_partner partner ON invoice.partner_id = partner.id
+                LEFT JOIN res_users responsible ON invoice.user_id = responsible.id
+                LEFT JOIN res_currency currency ON invoice.currency_id = currency.id
+            WHERE
+                invoice.state NOT IN ('paid', 'cancel') AND
+                invoice.type = %s
+            ORDER BY invoice.date_invoice
+        """
+
+        option_type = {'ci': 'out_invoice', 'si': 'in_invoice', 'cr': 'out_refund', 'sr': 'in_refund'}
+        if option_type.get(option):
+            self.cr.execute(sql_request, (option_type[option], ))
+            result = self.cr.fetchall()
+
+        return result
+
+    def getConvert(self, amount, line):
+        company = self.localcontext['company']
+        func_cur_id = company and company.currency_id and company.currency_id.id or False
+        conv = self.pool.get('res.currency').compute(self.cr, self.uid, line[13], func_cur_id, amount or 0.0, round=True)
+        return conv
+
+    def getFuncCur(self, ):
+        company = self.localcontext['company']
+        return company and company.currency_id and company.currency_id.name or ''
+
+
+SpreadsheetReport('report.open.invoices.2','account.invoice','addons/account_override/report/open_invoices_xls.mako', parser=report_open_invoices2)
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

=== added directory 'vertical_integration/security'
=== added file 'vertical_integration/security/ir.model.access.csv'
--- vertical_integration/security/ir.model.access.csv	1970-01-01 00:00:00 +0000
+++ vertical_integration/security/ir.model.access.csv	2013-10-21 09:56:54 +0000
@@ -0,0 +1,3 @@
+"id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
+"access_account_mapping_all","account.export.mapping","model_account_export_mapping","",1,1,1,1
+"access_country_mapping_all","country.export.mapping","model_country_export_mapping","",1,1,1,1

=== added directory 'vertical_integration/wizard'
=== added file 'vertical_integration/wizard/__init__.py'
--- vertical_integration/wizard/__init__.py	1970-01-01 00:00:00 +0000
+++ vertical_integration/wizard/__init__.py	2013-10-21 09:56:54 +0000
@@ -0,0 +1,2 @@
+import wizard_hq_report_ocg
+import wizard_hq_report_oca
\ No newline at end of file

=== added file 'vertical_integration/wizard/wizard_hq_report_oca.py'
--- vertical_integration/wizard/wizard_hq_report_oca.py	1970-01-01 00:00:00 +0000
+++ vertical_integration/wizard/wizard_hq_report_oca.py	2013-10-21 09:56:54 +0000
@@ -0,0 +1,57 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+from osv import fields, osv
+from tools.translate import _
+
+import datetime
+import base64
+import StringIO
+import csv
+
+class wizard_hq_report_oca(osv.osv_memory):
+    _name = "wizard.hq.report.oca"
+    
+    _columns = {
+        'instance_id': fields.many2one('msf.instance', 'Top proprietary instance', required=True),
+        'fiscalyear_id': fields.many2one('account.fiscalyear', 'Fiscal year', required=True),
+        'period_id': fields.many2one('account.period', 'Period', required=True)
+    }
+    
+    _defaults = {
+        'fiscalyear_id': lambda self, cr, uid, c: self.pool.get('account.fiscalyear').find(cr, uid, datetime.datetime.today().strftime('%Y-%m-%d'), context=c)
+    }
+    
+    def button_create_report(self, cr, uid, ids, context=None):
+        wizard = self.browse(cr, uid, ids[0], context=context)
+        data = {}
+        # add parameters
+        data['form'] = {}
+        if wizard.instance_id:
+            # Get projects below instance
+            data['form'].update({'instance_ids': [wizard.instance_id.id] + [x.id for x in wizard.instance_id.child_ids]})
+        if wizard.period_id:
+            data['form'].update({'period_id': wizard.period_id.id})
+
+        return {'type': 'ir.actions.report.xml', 'report_name': 'hq.oca', 'datas': data}
+    
+wizard_hq_report_oca()
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

=== added file 'vertical_integration/wizard/wizard_hq_report_oca_view.xml'
--- vertical_integration/wizard/wizard_hq_report_oca_view.xml	1970-01-01 00:00:00 +0000
+++ vertical_integration/wizard/wizard_hq_report_oca_view.xml	2013-10-21 09:56:54 +0000
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<openerp>
+    <data>
+    
+        <record id="hq_export_oca_view" model="ir.ui.view">
+            <field name="name">Export to HQ system (OCA)</field>
+            <field name="model">wizard.hq.report.oca</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+            <form string="Export to HQ system">
+                <field name="instance_id" domain="[('level', '=', 'coordo')]"/>
+                <field name="fiscalyear_id"/>
+                <field name="period_id" domain="[('fiscalyear_id', '=', fiscalyear_id), ('state', 'in', ['mission-closed', 'done'])]"/>
+                <newline/>
+                <button icon="terp-camera_test" string="Export" name="button_create_report" type="object" default_focus="1"/>
+            </form>
+            </field>
+        </record>
+        
+        <record id="action_hq_export_oca" model="ir.actions.act_window">
+            <field name="name">Export to HQ system (OCA)</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="res_model">wizard.hq.report.oca</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">form</field>
+            <field name="view_id" ref="hq_export_oca_view"/>
+            <field name="target">new</field>
+        </record>
+
+        <menuitem parent="account.menu_finance_generic_reporting"
+            action="action_hq_export_oca"
+            id="menu_action_hq_export_oca"  sequence="10"/>
+
+    </data>
+</openerp>
\ No newline at end of file

=== added file 'vertical_integration/wizard/wizard_hq_report_ocg.py'
--- vertical_integration/wizard/wizard_hq_report_ocg.py	1970-01-01 00:00:00 +0000
+++ vertical_integration/wizard/wizard_hq_report_ocg.py	2013-10-21 09:56:54 +0000
@@ -0,0 +1,57 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+from osv import fields, osv
+from tools.translate import _
+
+import datetime
+import base64
+import StringIO
+import csv
+
+class wizard_hq_report_ocg(osv.osv_memory):
+    _name = "wizard.hq.report.ocg"
+    
+    _columns = {
+        'instance_id': fields.many2one('msf.instance', 'Top proprietary instance', required=True),
+        'fiscalyear_id': fields.many2one('account.fiscalyear', 'Fiscal year', required=True),
+        'period_id': fields.many2one('account.period', 'Period', required=True)
+    }
+    
+    _defaults = {
+        'fiscalyear_id': lambda self, cr, uid, c: self.pool.get('account.fiscalyear').find(cr, uid, datetime.datetime.today().strftime('%Y-%m-%d'), context=c)
+    }
+    
+    def button_create_report(self, cr, uid, ids, context=None):
+        wizard = self.browse(cr, uid, ids[0], context=context)
+        data = {}
+        # add parameters
+        data['form'] = {}
+        if wizard.instance_id:
+            # Get projects below instance
+            data['form'].update({'instance_ids': [wizard.instance_id.id] + [x.id for x in wizard.instance_id.child_ids]})
+        if wizard.period_id:
+            data['form'].update({'period_id': wizard.period_id.id})
+
+        return {'type': 'ir.actions.report.xml', 'report_name': 'hq.ocg', 'datas': data}
+    
+wizard_hq_report_ocg()
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

=== added file 'vertical_integration/wizard/wizard_hq_report_ocg_view.xml'
--- vertical_integration/wizard/wizard_hq_report_ocg_view.xml	1970-01-01 00:00:00 +0000
+++ vertical_integration/wizard/wizard_hq_report_ocg_view.xml	2013-10-21 09:56:54 +0000
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<openerp>
+    <data>
+    
+        <record id="hq_export_ocg_view" model="ir.ui.view">
+            <field name="name">Export to HQ system (OCG)</field>
+            <field name="model">wizard.hq.report.ocg</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+            <form string="Export to HQ system">
+                <field name="instance_id" domain="[('level', '=', 'coordo')]"/>
+                <field name="fiscalyear_id"/>
+                <field name="period_id" domain="[('fiscalyear_id', '=', fiscalyear_id), ('state', 'in', ['mission-closed', 'done'])]"/>
+                <newline/>
+                <button icon="terp-camera_test" string="Export" name="button_create_report" type="object" default_focus="1"/>
+            </form>
+            </field>
+        </record>
+        
+        <record id="action_hq_export_ocg" model="ir.actions.act_window">
+            <field name="name">Export to HQ system (OCG)</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="res_model">wizard.hq.report.ocg</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">form</field>
+            <field name="view_id" ref="hq_export_ocg_view"/>
+            <field name="target">new</field>
+        </record>
+
+        <menuitem parent="account.menu_finance_generic_reporting"
+            action="action_hq_export_ocg"
+            id="menu_action_hq_export_ocg"  sequence="10"/>
+
+    </data>
+</openerp>
\ No newline at end of file