[Erp5-report] r23171 - in /erp5/trunk/bt5/erp5_accounting: SkinTemplateItem/portal_skins/er...

[nobody at svn.erp5.org]

Author: jerome
Date: Tue Aug 26 15:35:11 2008
New Revision: 23171

URL: http://svn.erp5.org?rev=23171&view=rev
Log:
fix structure of Profit and Loss, we have total Income|Expense, result if Income|Expense and Total

Modified:
    erp5/trunk/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountModule_viewProfitAndLossReport.xml
    erp5/trunk/bt5/erp5_accounting/bt/revision

Modified: erp5/trunk/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountModule_viewProfitAndLossReport.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountModule_viewProfitAndLossReport.xml?rev=23171&r1=23170&r2=23171&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountModule_viewProfitAndLossReport.xml (original)
+++ erp5/trunk/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountModule_viewProfitAndLossReport.xml Tue Aug 26 15:35:11 2008
@@ -475,6 +475,26 @@
         <!-- }}} -->\n
       </tal:block>\n
       <!-- loop level 2 -->\n
+      <!-- Total expense {{{ -->\n
+        <table:table-row>\n
+          <table:table-cell table:style-name=\'report-stat2\'\n
+                            table:number-columns-spanned=\'3\'\n
+                            table:number-rows-spanned=\'1\'\n
+                            office:value-type=\'string\'>\n
+            <text:p i18n:translate="" i18n:domain="ui">Total <tal:block i18n:name="class"\n
+                        i18n:translate=\'\' i18n:domain="ui" tal:content=\'string:Expense\'></tal:block></text:p>\n
+          </table:table-cell>\n
+          <table:covered-table-cell table:style-name="ce9"/>\n
+          <table:covered-table-cell table:style-name="ce9"/>\n
+\n
+          <table:table-cell table:style-name=\'report-stat-currency2\'\n
+            tal:attributes="office:value python: grand_total_current_period"\n
+            office:value-type=\'float\' office:value=\'123456.56\'><text:p>123 456,56</text:p></table:table-cell>\n
+          <table:table-cell table:style-name=\'report-stat-currency2\'\n
+            tal:attributes="office:value python: grand_total_previous_period"\n
+            office:value=\'123456.56\' office:value-type=\'float\'><text:p>123 456,56</text:p></table:table-cell>\n
+        </table:table-row>\n
+      <!-- }}} -->\n
 \n
         <!-- NET PROFIT {{{ -->\n
         <table:table-row tal:condition="python: net_income &lt; 0">\n
@@ -501,8 +521,7 @@
                             table:number-columns-spanned=\'3\'\n
                             table:number-rows-spanned=\'1\'\n
                             office:value-type=\'string\'>\n
-            <text:p i18n:translate="" i18n:domain="ui">Total <tal:block i18n:name="class"\n
-                        i18n:translate=\'\' i18n:domain="ui" tal:content=\'string:Expense\'></tal:block></text:p>\n
+            <text:p i18n:translate="" i18n:domain="ui">Total</text:p>\n
           </table:table-cell>\n
           <table:covered-table-cell table:style-name="ce9"/>\n
           <table:covered-table-cell table:style-name="ce9"/>\n
@@ -810,6 +829,24 @@
 \n
       </tal:block> <!-- loop level 2 -->\n
 \n
+        <!-- TOTAL INCOME {{{ -->\n
+        <table:table-row>\n
+          <table:table-cell table:style-name=\'report-stat2\'\n
+                            office:value-type=\'string\'\n
+                            table:number-rows-spanned=\'1\'\n
+                            table:number-columns-spanned=\'3\'>\n
+          <text:p i18n:translate="" i18n:domain="ui">Total <tal:block i18n:name="class" i18n:translate=\'\' i18n:domain="ui" tal:content=\'string:Income\'></tal:block></text:p>\n
+          </table:table-cell>\n
+          <table:covered-table-cell table:style-name="ce9"/><table:covered-table-cell table:style-name="ce9"/>\n
+          <table:table-cell table:style-name=\'report-stat-currency2\'\n
+            tal:attributes="office:value python: grand_total_current_period"\n
+            office:value-type=\'float\' office:value=\'123456.56\'><text:p>123 456,56</text:p></table:table-cell>\n
+          <table:table-cell table:style-name=\'report-stat-currency2\'\n
+            tal:attributes="office:value python: grand_total_previous_period"\n
+            office:value=\'123456.56\' office:value-type=\'float\'><text:p>123 456,56</text:p></table:table-cell>\n
+        </table:table-row>\n
+        <!-- }}} --> \n
+\n
         <!-- NET LOSS {{{ -->\n
         <table:table-row tal:condition="python: net_income &gt; 0">\n
           <table:table-cell table:style-name=\'report-stat2\'\n
@@ -835,7 +872,7 @@
                             office:value-type=\'string\'\n
                             table:number-rows-spanned=\'1\'\n
                             table:number-columns-spanned=\'3\'>\n
-          <text:p i18n:translate="" i18n:domain="ui">Total <tal:block i18n:name="class" i18n:translate=\'\' i18n:domain="ui" tal:content=\'string:Income\'></tal:block></text:p>\n
+          <text:p i18n:translate="" i18n:domain="ui">Total</text:p>\n
           </table:table-cell>\n
           <table:covered-table-cell table:style-name="ce9"/><table:covered-table-cell table:style-name="ce9"/>\n
           <table:table-cell table:style-name=\'report-stat-currency2\'\n

Modified: erp5/trunk/bt5/erp5_accounting/bt/revision
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_accounting/bt/revision?rev=23171&r1=23170&r2=23171&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_accounting/bt/revision (original)
+++ erp5/trunk/bt5/erp5_accounting/bt/revision Tue Aug 26 15:35:11 2008
@@ -1,1 +1,1 @@
-745
+746