Merge lp:~os-1/unifield-wm/US-266 into lp:unifield-wm

[jftempo]

=== modified file 'account_override/account_invoice_report.xml'
--- account_override/account_invoice_report.xml	2013-11-28 20:42:06 +0000
+++ account_override/account_invoice_report.xml	2015-05-29 09:19:39 +0000
@@ -3,16 +3,35 @@
     <data>
 
         <report id="open_invoices_2"
-        string="Open Invoices"
-        model="account.invoice"
-        name="open.invoices.2"
-        target_filename="Open Invoices_${company_id.instance_id.code}_%(year)s%(month)s%(day)s"
-        file="account_override/report/open_invoices_xls.mako"
-        report_type="webkit"
-        header="False"
-        auto="False"
-        menu="True"/>
-
+            string="Open Invoices"
+            model="account.invoice"
+            name="open.invoices.2"
+            target_filename="Open Invoices_${company_id.instance_id.code}_%(year)s%(month)s%(day)s"
+            file="account_override/report/open_invoices_xls.mako"
+            report_type="webkit"
+            header="False"
+            auto="False"
+            menu="True"/>
+
+        <report id="synthesis_invoices_report"
+            string="Allocation synthesis"
+            model="account.invoice"
+            name="allocation.synthesis.invoices"
+            target_filename="Allocation_synthesis_${company_id.instance_id.code}_%(year)s%(month)s%(day)s"
+            file="account_override/report/allocation_synthesis_invoices_xls.mako"
+            report_type="webkit"
+            header="False"
+            auto="False"
+            menu="True"/>
+
+        <report id="allocation_invoices_report"
+            model="account.invoice"
+            name="allocation.invoices.report"
+            target_filename="Allocation_report_${company_id.instance_id.code}_%(year)s%(month)s%(day)s"
+            rml="account_override/report/allocation_invoices_report.rml"
+            header="False"
+            auto="False"
+            string="Invoice allocation"/>
     </data>
 </openerp>
 

=== modified file 'account_override/report/__init__.py'
--- account_override/report/__init__.py	2014-03-19 13:40:41 +0000
+++ account_override/report/__init__.py	2015-05-29 09:19:39 +0000
@@ -1,3 +1,5 @@
 import account_chart_export
 import account_print_invoice
-import report_open_invoices
\ No newline at end of file
+import report_open_invoices
+import report_allocation_synthesis_invoices
+import report_allocation_invoices

=== added file 'account_override/report/allocation_invoices_report.rml'
--- account_override/report/allocation_invoices_report.rml	1970-01-01 00:00:00 +0000
+++ account_override/report/allocation_invoices_report.rml	2015-05-29 09:19:39 +0000
@@ -0,0 +1,264 @@
+<?xml version="1.0"?>
+<document filename="allocation_invoice_report.pdf">
+  <template pageSize="(842.0,595.0)" title="Test" author="Medecins Sans Frontieres" allowSplitting="20">
+    <pageTemplate id="first">
+      <frame id="first" x1="42.0" y1="57.0" width="750" height="530"/>
+    </pageTemplate>
+  </template>
+  <stylesheet>
+
+    <!-- TABLE STYLES -->
+    <blockTableStyle id="HeaderTable">
+        <blockAlignment value="CENTER" />
+        <blockValign value="MIDDLE" />
+        <lineStyle kind="OUTLINE" colorName="#000000" />
+    </blockTableStyle>
+
+    <blockTableStyle id="InformationTable">
+        <blockAlignment value="CENTER" />
+        <blockValign value="MIDDLE" />
+        <lineStyle kind="LINEBELOW" colorName="#000000" start="0,-1" />
+        <lineStyle kind="LINEABOVE" colorName="#000000" start="0,0" stop="-1,0" />
+        <lineStyle kind="LINEBEFORE" colorName="#000000" />
+        <lineStyle kind="LINEAFTER" colorName="#000000" />
+    </blockTableStyle>
+
+    <blockTableStyle id="ProductList">
+        <blockValign value="MIDDLE" />
+        <lineStyle kind="LINEBELOW" colorName="#000000" start="0,-1" />
+        <lineStyle kind="LINEABOVE" colorName="#000000" start="0,0" stop="-1,0" />
+        <lineStyle kind="LINEBEFORE" colorName="#0b0b0b" />
+        <lineStyle kind="LINEAFTER" colorName="#000000" />
+    </blockTableStyle>
+
+    <initialize>
+      <paraStyle name="all" alignment="justify"/>
+    </initialize>
+
+    <!-- PARAGRAPH STYLES -->
+    <paraStyle name="Standard" fontName="Helvetica"/>
+    <paraStyle name="Header" fontName="Helvetica-Bold" fontSize="15.0" leading="20" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0" />
+    <paraStyle name="InformationHeader" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="CENTER" />
+    <paraStyle name="Information" fontName="Helvetica" fontSize="8.0" leading="10" alignment="CENTER" />
+
+  </stylesheet>
+  <story>
+    <pto>
+    <para style="Standard">[[repeatIn(objects,'o')]]</para>
+    <!--<para style="Standard">[[ setLang(o.partner_id.lang) ]]</para>-->
+
+    <!-- HEADER TABLE OF THE PRINTED FILE -->
+    <blockTable colWidths="565" style="HeaderTable">
+        <tr>
+            <td>
+                <para style="Header">INVOICE LINES ALLOCATION REPORT</para>
+            </td>
+        </tr>
+    </blockTable>
+
+
+   <para style="Standard">
+      <font color="white"> </font>
+    </para>
+
+
+   <!-- GENERAL INFORMATION -->
+
+   <blockTable colWidths="162.0,162.0,162.0,162.0" style="InformationTable">
+        <tr>
+            <td>
+                <para style="InformationHeader">Invoice</para>
+            </td>
+            <td>
+                <para style="InformationHeader">Supplier</para>
+            </td>
+            <td>
+                <para style="InformationHeader">Type</para>
+            </td>
+            <td>
+                <para style="InformationHeader"></para>
+            </td>
+        </tr>
+
+        <tr>
+            <td>
+                <para style="Information">[[ o.number ]]</para>
+            </td>
+            <td>
+                <para style="Information">[[ o.partner_id.name ]]</para>
+            </td>
+            <td>
+            	<para style="Information">[[ getSel(o, 'type') ]]</para>
+            </td>
+            <td>
+                <para style="Information"></para>
+            </td>
+        </tr>
+    </blockTable>
+
+	<blockTable colWidths="162.0,162.0,162.0,162.0" style="InformationTable">
+        <tr>
+            <td>
+                <para style="InformationHeader">Creation date</para>
+            </td>
+            <td>
+                <para style="InformationHeader">Creator</para>
+            </td>
+            <td>
+                <para style="InformationHeader">State</para>
+            </td>
+            <td>
+                <para style="InformationHeader">Currency</para>
+            </td>
+        </tr>
+
+        <tr>
+            <td>
+                <para style="Information">[[ formatLang(o.date_invoice, date=True) ]]</para>
+            </td>
+            <td>
+                <para style="Information">[[ o.user_id.name ]]</para>
+            </td>
+            <td>
+                <para style="Information">[[ getSel(o, 'state') ]]</para>
+            </td>
+            <td>
+                <para style="Information">[[ o.currency_id.name ]]</para>
+            </td>
+        </tr>
+   </blockTable>
+
+
+    <para style="Standard">
+      <font color="white"> </font>
+    </para>
+
+
+    <!-- LINES LIST -->
+        <blockTable colWidths="33.0,100.0,100.0,80.0,50.0,50.0,50.0,50.0,60.0,60.0,60.0" style="ProductList">
+        <tr>
+            <td>
+                <para style="InformationHeader">Line</para>
+            </td>
+            <td>
+                <para style="InformationHeader">Product</para>
+            </td>
+            <td>
+                <para style="InformationHeader">Description</para>
+            </td>
+            <td>
+                <para style="InformationHeader">Account</para>
+            </td>
+            <td>
+                <para style="InformationHeader">Qty</para>
+            </td>
+            <td>
+                <para style="InformationHeader">Unit Price</para>
+            </td>
+            <td>
+                <para style="InformationHeader">%</para>
+            </td>
+            <td>
+                <para style="InformationHeader">Subtotal</para>
+            </td>
+            <td>
+                <para style="InformationHeader">Destination</para>
+            </td>
+
+            <td>
+                <para style="InformationHeader">Cost Center</para>
+            </td>
+            <td>
+                <para style="InformationHeader">Funding Pool</para>
+            </td>
+        </tr>
+   </blockTable>
+    <pto_header>
+    <blockTable colWidths="33.0,100.0,100.0,80.0,50.0,50.0,50.0,50.0,60.0,60.0,60.0" style="ProductList">
+        <tr>
+            <td>
+                <para style="InformationHeader">Line</para>
+            </td>
+            <td>
+                <para style="InformationHeader">Product</para>
+            </td>
+            <td>
+                <para style="InformationHeader">Description</para>
+            </td>
+            <td>
+                <para style="InformationHeader">Account</para>
+            </td>
+            <td>
+                <para style="InformationHeader">Qty</para>
+            </td>
+            <td>
+                <para style="InformationHeader">Unit Price</para>
+            </td>
+            <td>
+                <para style="InformationHeader">%</para>
+            </td>
+            <td>
+                <para style="InformationHeader">Subtotal</para>
+            </td>
+
+            <td>
+                <para style="InformationHeader">Destination</para>
+            </td>
+
+            <td>
+                <para style="InformationHeader">Cost Center</para>
+            </td>
+            <td>
+                <para style="InformationHeader">Funding Pool</para>
+            </td>
+        </tr>
+   </blockTable>
+   </pto_header>
+
+   <section>
+   [[ repeatIn(get_data(o.id), 'line') ]]
+   <blockTable colWidths="33.0,100.0,100.0,80.0,50.0,50.0,50.0,50.0,60.0,60.0,60.0" style="ProductList">
+        <tr>
+            <td>
+                <para style="Information">[[ line[0] ]]</para>
+            </td>
+            <td>
+                <para style="Information">[[ line[1] ]]</para>
+            </td>
+            <td>
+                <para style="Information">[[ line[2] ]]</para>
+            </td>
+            <td>
+                <para style="Information">[[ line[3] ]]</para>
+            </td>
+            <td>
+                <para style="Information">[[ formatLang(line[4]) ]]</para>
+            </td>
+            <td>
+                <para style="Information">[[ formatLang(line[5]) ]]</para>
+            </td>
+            <td>
+                <para style="Information">[[ formatLang(line[6]) ]]</para>
+            </td>
+            <td>
+                <para style="Information">[[ formatLang(line[7]) ]]</para>
+            </td>
+            <td>
+                <para style="Information">[[ line[9] ]]</para>
+            </td>
+            <td>
+                <para style="Information">[[ line[10] ]]</para>
+            </td>
+            <td>
+                <para style="Information">[[ line[11] ]]</para>
+            </td>
+        </tr>
+   </blockTable>
+   </section>
+
+    <para style="Standard">
+      <font color="white"> </font>
+    </para>
+  </pto>
+  </story>
+</document>

=== added file 'account_override/report/allocation_synthesis_invoices_xls.mako'
--- account_override/report/allocation_synthesis_invoices_xls.mako	1970-01-01 00:00:00 +0000
+++ account_override/report/allocation_synthesis_invoices_xls.mako	2015-05-29 09:19:39 +0000
@@ -0,0 +1,166 @@
+<?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:dt="uuid:C2F41010-65B3-11d1-A29F-00AA00C14882"
+ xmlns:s="uuid:BDC6E3F0-6DA3-11d1-A2A3-00AA00C14882"
+ xmlns:rs="urn:schemas-microsoft-com:rowset" xmlns:z="#RowsetSchema"
+ xmlns:ss="urn:schemas-microsoft-com:office:spreadsheet"
+ xmlns:html="http://www.w3.org/TR/REC-html40">
+ <DocumentProperties xmlns="urn:schemas-microsoft-com:office:office">
+  <Author>Tempo Consulting</Author>
+  <LastAuthor>Tempo Consulting</LastAuthor>
+  <Created>2015-05-19T15:32:58Z</Created>
+  <Version>14.00</Version>
+ </DocumentProperties>
+ <OfficeDocumentSettings xmlns="urn:schemas-microsoft-com:office:office">
+  <AllowPNG/>
+ </OfficeDocumentSettings>
+ <ExcelWorkbook xmlns="urn:schemas-microsoft-com:office:excel">
+  <WindowHeight>7995</WindowHeight>
+  <WindowWidth>20115</WindowWidth>
+  <WindowTopX>240</WindowTopX>
+  <WindowTopY>75</WindowTopY>
+  <ProtectStructure>False</ProtectStructure>
+  <ProtectWindows>False</ProtectWindows>
+ </ExcelWorkbook>
+ <Styles>
+  <Style ss:ID="Default" ss:Name="Normal">
+   <Alignment ss:Vertical="Bottom"/>
+   <Borders/>
+   <Font ss:FontName="Calibri" x:Family="Swiss" ss:Size="11" ss:Color="#000000"/>
+   <Interior/>
+   <NumberFormat/>
+   <Protection/>
+  </Style>
+  <Style ss:ID="s63">
+   <NumberFormat ss:Format="Standard"/>
+  </Style>
+  <Style ss:ID="s66">
+   <Alignment ss:Horizontal="Left" ss:Vertical="Bottom" ss:Indent="1"/>
+  </Style>
+  <Style ss:ID="s67">
+   <Font ss:FontName="Calibri" x:Family="Swiss" ss:Size="11" ss:Color="#000000"
+    ss:Bold="1"/>
+   <NumberFormat ss:Format="Standard"/>
+  </Style>
+  <Style ss:ID="s69">
+   <Alignment ss:Horizontal="Left" ss:Vertical="Bottom" ss:Indent="1"/>
+   <Font ss:FontName="Calibri" x:Family="Swiss" ss:Size="11" ss:Color="#000000"
+    ss:Bold="1"/>
+  </Style>
+  <Style ss:ID="s74">
+   <Font ss:FontName="Calibri" x:Family="Swiss" ss:Size="11" ss:Color="#000000"
+    ss:Bold="1"/>
+   <Interior ss:Color="#DCE6F1" ss:Pattern="Solid"/>
+  </Style>
+  <Style ss:ID="s75">
+   <Alignment ss:Horizontal="Left" ss:Vertical="Bottom"/>
+   <Font ss:FontName="Calibri" x:Family="Swiss" ss:Size="11" ss:Color="#000000"
+    ss:Bold="1"/>
+   <Interior ss:Color="#DCE6F1" ss:Pattern="Solid"/>
+  </Style>
+  <Style ss:ID="s76">
+   <Font ss:FontName="Calibri" x:Family="Swiss" ss:Size="11" ss:Color="#000000"
+    ss:Bold="1"/>
+   <Interior ss:Color="#DCE6F1" ss:Pattern="Solid"/>
+   <NumberFormat ss:Format="Standard"/>
+  </Style>
+  <Style ss:ID="s98">
+   <Borders/>
+  </Style>
+  <Style ss:ID="s99">
+   <Alignment ss:Horizontal="Left" ss:Vertical="Bottom"/>
+   <Borders>
+    <Border ss:Position="Bottom" ss:LineStyle="Continuous" ss:Weight="2"
+     ss:Color="#8DB4E2"/>
+   </Borders>
+   <Font ss:FontName="Calibri" x:Family="Swiss" ss:Size="11" ss:Color="#000000"
+    ss:Bold="1"/>
+  </Style>
+  <Style ss:ID="s100">
+   <Borders>
+    <Border ss:Position="Bottom" ss:LineStyle="Continuous" ss:Weight="2"
+     ss:Color="#8DB4E2"/>
+   </Borders>
+   <Font ss:FontName="Calibri" x:Family="Swiss" ss:Size="11" ss:Color="#000000"
+    ss:Bold="1"/>
+   <NumberFormat ss:Format="Standard"/>
+  </Style>
+ </Styles>
+ % for o in objects:
+ <Worksheet ss:Name="${(o.number or title(o)+' '+str(o.id))|x}">
+  <Table x:FullColumns="1"
+   x:FullRows="1" ss:DefaultColumnWidth="90" ss:DefaultRowHeight="15">
+   <Column ss:AutoFitWidth="0" ss:Width="110.25"/>
+   <Column ss:AutoFitWidth="0" ss:Width="95.25"/>
+   <Column ss:AutoFitWidth="0" ss:Width="69.75"/>
+   <Column ss:Width="121.5"/>
+   <Column ss:Width="96"/>
+   <Row ss:AutoFitHeight="0">
+    <Cell><Data ss:Type="String">Invoice :</Data></Cell>
+    <Cell><Data ss:Type="String">${(o.number or ' ')|x}</Data></Cell>
+   </Row>
+   <Row ss:AutoFitHeight="0">
+    <Cell><Data ss:Type="String">Type :</Data></Cell>
+    <Cell><Data ss:Type="String">${(title(o))|x}</Data></Cell>
+   </Row>
+   <Row ss:AutoFitHeight="0">
+    <Cell><Data ss:Type="String">Supplier :</Data></Cell>
+    <Cell><Data ss:Type="String">${(o.partner_id.name)|x}</Data></Cell>
+   </Row>
+   <Row ss:AutoFitHeight="0">
+    <Cell><Data ss:Type="String">Posting date :</Data></Cell>
+    <Cell><Data ss:Type="String">${(o.date_invoice or ' ')|x}</Data></Cell>
+   </Row>
+   <Row ss:AutoFitHeight="0">
+    <Cell><Data ss:Type="String">Currency :</Data></Cell>
+    <Cell><Data ss:Type="String">${(o.currency_id.name)|x}</Data></Cell>
+   </Row>
+   <Row ss:AutoFitHeight="0"/>
+   <Row ss:AutoFitHeight="0">
+    <Cell ss:StyleID="s74"><Data ss:Type="String">Row labels</Data></Cell>
+    <Cell ss:StyleID="s74"><Data ss:Type="String">Sum of Amount</Data></Cell>
+   </Row>
+   % for row in get_data(o.id):
+   % if level(row) == 1:
+   <Row ss:AutoFitHeight="0">
+    <Cell ss:StyleID="s99"><Data ss:Type="String">${(row[0])|x}</Data></Cell>
+    <Cell ss:StyleID="s100"><Data ss:Type="Number">${(row[2])|x}</Data></Cell>
+   </Row>
+   % endif
+   % if level(row) == 2:
+   <Row ss:AutoFitHeight="0">
+    <Cell ss:StyleID="s66"><Data ss:Type="String">${(row[1])|x}</Data></Cell>
+    <Cell ss:StyleID="s63"><Data ss:Type="Number">${(row[2])|x}</Data></Cell>
+   </Row>
+   % endif
+   % if level(row) == -1:
+   <Row ss:AutoFitHeight="0">
+    <Cell ss:StyleID="s75"><Data ss:Type="String">Grand Total</Data></Cell>
+    <Cell ss:StyleID="s76"><Data ss:Type="Number">${(row[2])|x}</Data></Cell>
+   </Row>
+   % endif
+   % endfor
+  </Table>
+  <WorksheetOptions xmlns="urn:schemas-microsoft-com:office:excel">
+   <PageSetup>
+    <Header x:Margin="0.3"/>
+    <Footer x:Margin="0.3"/>
+    <PageMargins x:Bottom="0.75" x:Left="0.7" x:Right="0.7" x:Top="0.75"/>
+   </PageSetup>
+   <Unsynced/>
+   <Print>
+    <ValidPrinterInfo/>
+    <PaperSizeIndex>9</PaperSizeIndex>
+    <HorizontalResolution>600</HorizontalResolution>
+    <VerticalResolution>600</VerticalResolution>
+   </Print>
+   <Selected/>
+   <ProtectObjects>False</ProtectObjects>
+   <ProtectScenarios>False</ProtectScenarios>
+  </WorksheetOptions>
+ </Worksheet>
+ % endfor
+</Workbook>

=== added file 'account_override/report/report_allocation_invoices.py'
--- account_override/report/report_allocation_invoices.py	1970-01-01 00:00:00 +0000
+++ account_override/report/report_allocation_invoices.py	2015-05-29 09:19:39 +0000
@@ -0,0 +1,81 @@
+# -*- 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 time
+
+from report import report_sxw
+
+
+class allocation_invoice_report(report_sxw.rml_parse):
+    def __init__(self, cr, uid, name, context=None):
+        super(allocation_invoice_report, self).__init__(cr, uid, name, context=context)
+
+        self._cr = cr
+
+        self.localcontext.update({
+            'time': time,
+            'get_data': self.get_data,
+        })
+
+    def get_data(self, invoice_id):
+        self._cr.execute("""SELECT line_number,NULLIF('[' || default_code || '] ' || name_template, '[] ') as product,i.name as description, ac.code || ' ' || ac.name as account, quantity, ROUND(price_unit, 2) as price_unit, ROUND(percentage, 2) as percentage, ROUND(price_subtotal*percentage/100, 2) as sub_total, y.name as currency, n1.code as destination, n2.code as cost_center, n3.code as funding_pool
+            FROM funding_pool_distribution_line a
+            INNER JOIN account_invoice_line i ON a.distribution_id = i.analytic_distribution_id
+            INNER JOIN account_invoice s ON s.id = i.invoice_id
+            INNER JOIN account_analytic_account n1 ON n1.id = a.destination_id
+            INNER JOIN account_analytic_account n2 ON n2.id = a.cost_center_id
+            INNER JOIN account_analytic_account n3 ON n3.id = a.analytic_id
+            INNER JOIN account_account ac ON ac.id = i.account_id
+            LEFT JOIN product_product p ON p.id = i.product_id
+            LEFT JOIN res_currency y ON y.id = s.currency_id
+            WHERE i.invoice_id=%s
+            UNION ALL
+            SELECT line_number,NULLIF('[' || default_code || '] ' || name_template, '[] ') as product,i.name as description, ac.code || ' ' || ac.name as account, quantity, ROUND(price_unit, 2) as price_unit, ROUND(percentage, 2) as percentage, ROUND(price_subtotal*percentage/100, 2) as sub_total, y.name as currency, n1.code as destination, n2.code as cost_center, n3.code as funding_pool
+            FROM funding_pool_distribution_line a
+            INNER JOIN account_invoice s ON s.analytic_distribution_id = a.distribution_id
+            LEFT JOIN account_invoice_line i ON i.invoice_id = s.id AND i.analytic_distribution_id IS NULL
+            INNER JOIN account_account ac ON ac.id = i.account_id
+            INNER JOIN account_analytic_account n1 ON n1.id = a.destination_id
+            INNER JOIN account_analytic_account n2 ON n2.id = a.cost_center_id
+            INNER JOIN account_analytic_account n3 ON n3.id = a.analytic_id
+            INNER JOIN res_currency y ON y.id = s.currency_id
+            LEFT JOIN product_product p ON p.id = i.product_id
+            WHERE s.id=%s
+            UNION ALL
+            SELECT line_number,NULLIF('[' || default_code || '] ' || name_template, '[] ') as product,i.name as description, ac.code || ac.name as account, quantity, ROUND(price_unit, 2) as price_unit, NULL, ROUND(price_subtotal, 2) as sub_total, y.name as currency, NULL, NULL, NULL
+            FROM account_invoice_line i
+            INNER JOIN account_invoice s ON s.id = i.invoice_id
+            INNER JOIN account_account ac ON ac.id = i.account_id
+            INNER JOIN res_currency y ON y.id = s.currency_id
+            LEFT JOIN product_product p ON p.id = i.product_id
+            WHERE s.id=%s and is_analytic_addicted = False
+            ORDER BY line_number, destination, cost_center, funding_pool
+            """, (invoice_id, invoice_id, invoice_id))
+
+        return self._cr.fetchall()
+
+
+report_sxw.report_sxw('report.allocation.invoices.report',
+                      'account.invoice',
+                      'addons/account_override/report/allocation_invoices_report.rml',
+                      parser=allocation_invoice_report, header="landscape")
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

=== added file 'account_override/report/report_allocation_synthesis_invoices.py'
--- account_override/report/report_allocation_synthesis_invoices.py	1970-01-01 00:00:00 +0000
+++ account_override/report/report_allocation_synthesis_invoices.py	2015-05-29 09:19:39 +0000
@@ -0,0 +1,87 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    Copyright (C) 2015 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
+
+
+class report_allocation_synthesis_invoices(report_sxw.rml_parse):
+    def __init__(self, cr, uid, name, context=None):
+        super(report_allocation_synthesis_invoices, self).__init__(cr, uid, name, context=context)
+
+        self._cr = cr
+
+        self.localcontext.update({
+            'title': self.get_title,
+            'get_data': self.get_data,
+            'level': self.get_level,
+        })
+
+    def get_data(self, invoice_id):
+        self._cr.execute(""" WITH t as (
+            SELECT ac.code as L1, n2.code as L2,
+            ROUND(SUM(price_subtotal*percentage/100), 2) as amount
+            FROM funding_pool_distribution_line a
+            INNER JOIN account_invoice_line i ON a.distribution_id = i.analytic_distribution_id
+            INNER JOIN account_analytic_account n2 ON n2.id = a.cost_center_id
+            INNER JOIN account_account ac ON ac.id = i.account_id
+            WHERE i.invoice_id=%s
+            GROUP BY ac.code, n2.code
+            UNION ALL
+            SELECT ac.code, n2.code, ROUND(SUM(price_subtotal*percentage/100), 2)
+            FROM funding_pool_distribution_line a
+            INNER JOIN account_invoice s ON s.analytic_distribution_id = a.distribution_id
+            LEFT JOIN account_invoice_line i ON i.invoice_id = s.id AND i.analytic_distribution_id IS NULL
+            INNER JOIN account_account ac ON ac.id = i.account_id
+            INNER JOIN account_analytic_account n2 ON n2.id = a.cost_center_id
+            WHERE s.id=%s
+            GROUP BY ac.code, n2.code)
+            SELECT L1, L2, SUM(amount) as amount FROM t
+            GROUP BY L1, L2
+            UNION ALL
+            SELECT L1, '', SUM(amount) FROM t
+            GROUP BY L1
+            UNION ALL
+            SELECT NULL, '', SUM(amount) FROM t
+            ORDER BY L1, L2""", (invoice_id, invoice_id))
+
+        return self._cr.fetchall()
+
+    def get_level(self, row):
+        if row[0] is None:
+            return -1
+        elif row[1] == '':
+            return 1
+        else:
+            return 2
+
+    def get_title(self, invoice):
+
+        invoice_types = {
+            'out_invoice': 'Customer Invoice',
+            'in_invoice': 'Supplier Invoice',
+            'out_refund': 'Customer Refund',
+            'in_refund': 'Supplier Refund'
+            }
+
+        return invoice_types[invoice.type]
+
+
+SpreadsheetReport('report.allocation.synthesis.invoices', 'account.invoice', 'addons/account_override/report/allocation_synthesis_invoices_xls.mako', parser=report_allocation_synthesis_invoices)