openobject-italia-core-devs team mailing list archive

[Andrea Cometa <info@xxxxxxxxxxxxxxx>]

Andrea Cometa has proposed merging lp:~scigghia/openobject-italia/6.1-new-riba-report into lp:~openobject-italia-core-devs/openobject-italia/italian-addons-6.1.

Requested reviews:
  OpenERP Italia core devs (openobject-italia-core-devs)

For more details, see:
https://code.launchpad.net/~scigghia/openobject-italia/6.1-new-riba-report/+merge/228803

added new report for riba maturities (only totals by date)
-- 
https://code.launchpad.net/~scigghia/openobject-italia/6.1-new-riba-report/+merge/228803
Your team OpenERP Italia core devs is requested to review the proposed merge of lp:~scigghia/openobject-italia/6.1-new-riba-report into lp:~openobject-italia-core-devs/openobject-italia/italian-addons-6.1.

=== modified file 'l10n_it_ricevute_bancarie_report/i18n/it.po'
--- l10n_it_ricevute_bancarie_report/i18n/it.po	2014-05-22 10:01:42 +0000
+++ l10n_it_ricevute_bancarie_report/i18n/it.po	2014-07-30 09:12:09 +0000
@@ -21,6 +21,11 @@
 msgstr "CLIENTE"
 
 #. module: l10n_it_ricevute_bancarie_report
+#: report:addons/l10n_it_ricevute_bancarie_report/templates/riba_maturities_tot_summary.mako:9
+msgid "RIBA LIST MATURITIES TOTAL SUMMARY"
+msgstr "RIEPILOGO TOTALI SCADENZE RIBA"
+
+#. module: l10n_it_ricevute_bancarie_report
 #: report:addons/l10n_it_ricevute_bancarie_report/templates/riba_maturities_summary.mako:19
 msgid "ROW nr"
 msgstr "nr RIGA"
@@ -66,6 +71,11 @@
 msgstr "Data scadenza:"
 
 #. module: l10n_it_ricevute_bancarie_report
+#: model:ir.actions.report.xml,name:l10n_it_ricevute_bancarie_report.riba_maturities_tot_summary
+msgid "Ri.Ba. Maturities Total Summary"
+msgstr "Riepilogo Totali Scadenze Ri.Ba."
+
+#. module: l10n_it_ricevute_bancarie_report
 #: model:ir.actions.report.xml,name:l10n_it_ricevute_bancarie_report.riba_maturities_summary
 msgid "Ri.Ba. Maturities Summary"
 msgstr "Riepilogo Scadenze Ri.Ba."

=== modified file 'l10n_it_ricevute_bancarie_report/i18n/l10n_it_ricevute_bancarie_report.pot'
--- l10n_it_ricevute_bancarie_report/i18n/l10n_it_ricevute_bancarie_report.pot	2014-05-22 10:01:42 +0000
+++ l10n_it_ricevute_bancarie_report/i18n/l10n_it_ricevute_bancarie_report.pot	2014-07-30 09:12:09 +0000
@@ -6,8 +6,8 @@
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-05-22 09:57+0000\n"
-"PO-Revision-Date: 2014-05-22 09:57+0000\n"
+"POT-Creation-Date: 2014-07-30 09:02+0000\n"
+"PO-Revision-Date: 2014-07-30 09:02+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -21,12 +21,18 @@
 msgstr ""
 
 #. module: l10n_it_ricevute_bancarie_report
+#: report:addons/l10n_it_ricevute_bancarie_report/templates/riba_maturities_tot_summary.mako:9
+msgid "RIBA LIST MATURITIES TOTAL SUMMARY"
+msgstr ""
+
+#. module: l10n_it_ricevute_bancarie_report
 #: report:addons/l10n_it_ricevute_bancarie_report/templates/riba_maturities_summary.mako:19
 msgid "ROW nr"
 msgstr ""
 
 #. module: l10n_it_ricevute_bancarie_report
 #: report:addons/l10n_it_ricevute_bancarie_report/templates/riba_maturities_summary.mako:40
+#: report:addons/l10n_it_ricevute_bancarie_report/templates/riba_maturities_tot_summary.mako:24
 msgid "DUE DATE TOTAL:"
 msgstr ""
 
@@ -37,6 +43,7 @@
 
 #. module: l10n_it_ricevute_bancarie_report
 #: report:addons/l10n_it_ricevute_bancarie_report/templates/riba_maturities_summary.mako:47
+#: report:addons/l10n_it_ricevute_bancarie_report/templates/riba_maturities_tot_summary.mako:31
 msgid "TOTAL:"
 msgstr ""
 
@@ -62,10 +69,16 @@
 
 #. module: l10n_it_ricevute_bancarie_report
 #: report:addons/l10n_it_ricevute_bancarie_report/templates/riba_maturities_summary.mako:15
+#: report:addons/l10n_it_ricevute_bancarie_report/templates/riba_maturities_tot_summary.mako:15
 msgid "Due date:"
 msgstr ""
 
 #. module: l10n_it_ricevute_bancarie_report
+#: model:ir.actions.report.xml,name:l10n_it_ricevute_bancarie_report.riba_maturities_tot_summary
+msgid "Ri.Ba. Maturities Total Summary"
+msgstr ""
+
+#. module: l10n_it_ricevute_bancarie_report
 #: model:ir.actions.report.xml,name:l10n_it_ricevute_bancarie_report.riba_maturities_summary
 msgid "Ri.Ba. Maturities Summary"
 msgstr ""

=== modified file 'l10n_it_ricevute_bancarie_report/reports.xml'
--- l10n_it_ricevute_bancarie_report/reports.xml	2014-05-22 09:49:41 +0000
+++ l10n_it_ricevute_bancarie_report/reports.xml	2014-07-30 09:12:09 +0000
@@ -334,5 +334,15 @@
                 webkit_header="riba_portrait_header"
                 />
 
+        <report auto="False"
+                id="riba_maturities_tot_summary"
+                model="riba.distinta"
+                name="riba.maturities_tot_summary"
+                file="l10n_it_ricevute_bancarie_report/templates/riba_maturities_tot_summary.mako"
+                string="Ri.Ba. Maturities Total Summary"
+                report_type="webkit"
+                webkit_header="riba_portrait_header"
+                />
+
     </data>
 </openerp>

=== modified file 'l10n_it_ricevute_bancarie_report/riba_parser.py'
--- l10n_it_ricevute_bancarie_report/riba_parser.py	2014-06-26 09:45:53 +0000
+++ l10n_it_ricevute_bancarie_report/riba_parser.py	2014-07-30 09:12:09 +0000
@@ -56,3 +56,9 @@
     'l10n_it_ricevute_bancarie_report/template/\
 riba_maturities_summary.mako',
     parser=report_riba_webkit)
+
+report_sxw.report_sxw(
+    'report.riba.maturities_tot_summary', 'riba',
+    'l10n_it_ricevute_bancarie_report/template/\
+riba_maturities_tot_summary.mako',
+    parser=report_riba_webkit)

=== added file 'l10n_it_ricevute_bancarie_report/templates/riba_maturities_tot_summary.mako'
--- l10n_it_ricevute_bancarie_report/templates/riba_maturities_tot_summary.mako	1970-01-01 00:00:00 +0000
+++ l10n_it_ricevute_bancarie_report/templates/riba_maturities_tot_summary.mako	2014-07-30 09:12:09 +0000
@@ -0,0 +1,37 @@
+<html>
+<head>
+    <style type="text/css">
+        ${css}
+    </style>
+</head>
+<body class="font_10" style="margin:0px;padding:0px;">
+    
+    <p class="w100 centered" style="font-size: 24px;"><b>${_("RIBA LIST MATURITIES TOTAL SUMMARY")}</b></p>
+    
+    <table class="w100">
+    <%total=0%>
+    %for due_date in sorted(group_riba_by_date(objects).keys()):
+        <tr style="background-color: #cecece;">
+            <td colspan="6">${_("Due date:")} ${due_date}</td>
+        </tr>
+        <%group_amount=0%>
+        %for l in group_riba_by_date(objects)[due_date]:
+            %if l.due_date == due_date:
+                <%group_amount+=l.amount%>
+            %endif
+        %endfor
+        <tr>
+            <td colspan="5" align="right"><b>${_("DUE DATE TOTAL:")}</b></td>
+            <td><b>${group_amount}</b></td>
+            <%total+=group_amount%>
+        </tr>
+    %endfor
+    <tr>
+        <td colspan="4">&nbsp;</td>
+        <td><b>${_("TOTAL:")}</b></td>
+        <td><b>${total}</b></td>
+    </tr>
+
+    </table>
+</body>
+</html>