[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
SF.net SVN: ledger-smb:[5223] trunk/UI/Reports

Subject: SF.net SVN: ledger-smb:[5223] trunk/UI/Reports
From: ..hidden..
Date: Wed, 21 Nov 2012 08:14:38 +0000
Revision: 5223
          http://ledger-smb.svn.sourceforge.net/ledger-smb/?rev=5223&view=rev
Author:   einhverfr
Date:     2012-11-21 08:14:38 +0000 (Wed, 21 Nov 2012)
Log Message:
-----------
Food enough CSS, template tweaks, click-through hyperlinks on income statement

Modified Paths:
--------------
    trunk/UI/Reports/PNL.html

Added Paths:
-----------
    trunk/UI/Reports/pnl.css

Modified: trunk/UI/Reports/PNL.html
===================================================================
--- trunk/UI/Reports/PNL.html	2012-11-21 07:28:26 UTC (rev 5222)
+++ trunk/UI/Reports/PNL.html	2012-11-21 08:14:38 UTC (rev 5223)
@@ -1,5 +1,6 @@
 <?lsmb INCLUDE 'ui-header.html' include_stylesheet = ['UI/Reports/pnl.css'];
 account_data = report.account_data ?>
+<?lsmb COLS = comparison.length + 2 ?>
 <body>
 <h1><?lsmb name ?></h1>
 <h2><?lsmb text('Accounting period: [_1] to [_2]', report.from_date, report.to_date); ?></h2>
@@ -10,35 +11,46 @@
 </h2>
    <?lsmb END;
 END ?>
-<table>
+<table class="income_statement">
 <tbody>
     <tr class="sectionhead">
         <th><?lsmb text('Income Account') ?></th>
-        <th><?lsmb report.from_date _ ' - ' _ report.to_date ?></th>
+        <th><?lsmb report.from_date _ '<br /> - <br />' _ report.to_date ?></th>
     <?lsmb FOREACH COMP IN comparison ?>
-        <th><?lsmb COMP.from_date _ ' - ' _ COMP.to_date ?></th>
+        <th><?lsmb COMP.from_date _ '<br /> - <br />' _ COMP.to_date ?></th>
     <?lsmb END ?>
     </tr>
   <?lsmb FOREACH k IN account_data.I.keys ?>
     <tr class="incomerow">
-        <td class="label"><?lsmb k _ '--' 
-                             _ account_data.I.${k}.main.account_description ?></td>
-        <td class="amount"><?lsmb account_data.I.${k}.main.amount ?></td>
+        <td class="label"><a href="account.pl?action=edit&id=<?lsmb
+                                     account_data.I.${k}.main.account_id 
+                                  ?>&charttype=A"
+             ><?lsmb k _ '--' 
+                             _ account_data.I.${k}.main.account_description ?></td></a>
+        <td class="amount"><a href="journal.pl?sort=transdate&accno=<?lsmb k
+                                    ?>&from_date=<?lsmb report.from_date 
+                                    ?>&to_date=<?lsmb report.to_date 
+                                    ?>&category=X&col_transdate=Y&col_reference=Y&col_description=Y&col_debits=Y&col_credits=Y&col_source=Y&col_accno=Y&action=search"
+        ><?lsmb account_data.I.${k}.main.amount ?></a></td>
        
     <?lsmb FOREACH COMP IN comparison ?>
-        <td class="amount">
-            <?lsmb account_data.I.${k}.${COMP.label}.amount ?></td>
+        <td class="amount"><a href="journal.pl?sort=transdate&accno=<?lsmb k 
+                                   ?>&from_date=<?lsmb COMP.from_date 
+                                   ?>&to_date=<?lsmb COMP.to_date
+                                   ?>&category=X&col_transdate=Y&col_reference=Y&col_description=Y&col_debits=Y&col_credits=Y&col_source=Y&col_accno=Y&action=search"
+           ><?lsmb account_data.I.${k}.${COMP.label}.amount ?></a></td>
     <?lsmb END ?>
     </tr>
  <?lsmb END ?>
    <tr class="sectionfoot">
      <th><?lsmb text('Total Income') ?></th>
-     <td class="amount"><?lsmb account_data.totals.main.I ?></td>
+     <td class="amount total"><?lsmb account_data.totals.main.I ?></td>
     <?lsmb FOREACH COMP IN comparison ?>
-        <td class="amount">
+        <td class="amount total">
             <?lsmb account_data.totals.${COMP.label}.I ?></td>
     <?lsmb END ?>
    </tr>
+   <tr class="separator"><td colspan="<?lsmb COLS ?>"></td></tr>
     <tr class="sectionhead">
         <th><?lsmb text('Expense Account') ?></th>
         <th>&nbsp;</th>
@@ -48,24 +60,34 @@
     </tr>
   <?lsmb FOREACH k IN account_data.E.keys ?>
     <tr class="incomerow">
-        <td class="label"><?lsmb k _ '--' _
-             account_data.E.${k}.main.account_description ?></td>
-        <td class="amount"><?lsmb account_data.E.${k}.main.amount ?></td>
+        <td class="label"><a href="account.pl?action=edit&id=<?lsmb
+                                     account_data.I.${k}.main.account_id 
+                                  ?>&charttype=A"
+             ><?lsmb k _ '--' _
+             account_data.E.${k}.main.account_description ?></a></td>
+        <td class="amount"><a href="journal.pl?sort=transdate&accno=<?lsmb k
+                                    ?>&from_date=<?lsmb report.from_date 
+                                    ?>&to_date=<?lsmb report.to_date 
+                                    ?>&category=X&col_transdate=Y&col_reference=Y&col_description=Y&col_debits=Y&col_credits=Y&col_source=Y&col_accno=Y&action=search"
+        ><?lsmb account_data.E.${k}.main.amount ?></a></td>
     <?lsmb FOREACH COMP IN comparison ?>
         <td class="amount">
-            <?lsmb account_data.E.${k}.${COMP.label}.amount ?></td>
+        <td class="amount"><a href="journal.pl?sort=transdate&accno=<?lsmb k 
+                                   ?>&from_date=<?lsmb COMP.from_date 
+                                   ?>&to_date=<?lsmb COMP.to_date
+                                   ?>&category=X&col_transdate=Y&col_reference=Y&col_description=Y&col_debits=Y&col_credits=Y&col_source=Y&col_accno=Y&action=search"
+	><?lsmb account_data.E.${k}.${COMP.label}.amount ?></a></td>
     <?lsmb END ?>
     </tr>
  <?lsmb END ?>
    <tr class="sectionfoot">
      <th><?lsmb text('Total Expense') ?></th>
-     <td class="amount"><?lsmb account_data.totals.main.E ?></td>
+     <td class="amount total"><?lsmb account_data.totals.main.E ?></td>
     <?lsmb FOREACH COMP IN comparison ?>
-        <td class="amount">
+        <td class="amount total">
             <?lsmb account_data.totals.${COMP.label}.E ?></td>
-    <?lsmb END ?>
-   </tr>
-   <tr class="separator"><td></td></tr>
+    <?lsmb END ?></tr>
+   <tr class="separator"><td colspan="<?lsmb COLS ?>"></td></tr>
    <tr class="sectionfoot">
      <th><?lsmb text('Total Income') ?></th>
      <td class="amount"><?lsmb account_data.totals.main.I ?></td>
@@ -83,10 +105,10 @@
     <?lsmb END ?>
    </tr>
    <tr class="reportfoot">
-     <th><?lsmb text('Income (Loss)') ?></th>
-     <td class="amount"><?lsmb account_data.totals.main.total ?></td>
+     <th> = <?lsmb text('Net Income (Loss)') ?></th>
+     <td class="amount total"><?lsmb account_data.totals.main.total ?></td>
     <?lsmb FOREACH COMP IN comparison ?>
-        <td class="amount">
+        <td class="amount total">
             <?lsmb account_data.totals.${COMP.label}.total ?></td>
     <?lsmb END ?>
    </tr>

Added: trunk/UI/Reports/pnl.css
===================================================================
--- trunk/UI/Reports/pnl.css	                        (rev 0)
+++ trunk/UI/Reports/pnl.css	2012-11-21 08:14:38 UTC (rev 5223)
@@ -0,0 +1,37 @@
+a {
+	color: inherit;
+	background-color: inherit;
+	text-decoration: none;
+}
+a:link {
+	color: inherit;
+	background-color: inherit;
+	text-decoration: none;
+}
+a:visited {
+	color: inherit;
+	background-color: inherit;
+	text-decoration: none;
+}
+a:hover {
+	color: inherit;
+	background-color: inherit;
+	text-decoration: none;
+	border-bottom: thin dashed;
+}
+td.amount {
+	text-align: right;
+}
+tr.separator {
+	background-color: gray;
+}
+td.total {
+        border: 0px;
+	border-top: 1px;
+        border-color: black;
+        border-style: solid;
+}
+
+th {
+	vertical-align: bottom;	
+}

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
Prev by Date: SF.net SVN: ledger-smb:[5222] trunk
Next by Date: SF.net SVN: ledger-smb:[5224] trunk/LedgerSMB/Report/PNL/Income_Statement. pm
Previous by thread: SF.net SVN: ledger-smb:[5222] trunk
Next by thread: SF.net SVN: ledger-smb:[5224] trunk/LedgerSMB/Report/PNL/Income_Statement. pm
Index(es):
- Date
- Thread