[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

SF.net SVN: ledger-smb:[4591] trunk

Revision: 4591
          http://ledger-smb.svn.sourceforge.net/ledger-smb/?rev=4591&view=rev
Author:   einhverfr
Date:     2012-03-26 09:47:25 +0000 (Mon, 26 Mar 2012)
Log Message:
-----------
Reports now mostly work.  GL transactions still not showing on the search though

Modified Paths:
--------------
    trunk/LedgerSMB/DBObject/Report/GL.pm
    trunk/LedgerSMB/DBObject/Report.pm
    trunk/UI/journal/search.html
    trunk/UI/lib/ui-header.html

Added Paths:
-----------
    trunk/UI/Reports/
    trunk/UI/Reports/display_report.html

Modified: trunk/LedgerSMB/DBObject/Report/GL.pm
===================================================================
--- trunk/LedgerSMB/DBObject/Report/GL.pm	2012-03-26 09:16:46 UTC (rev 4590)
+++ trunk/LedgerSMB/DBObject/Report/GL.pm	2012-03-26 09:47:25 UTC (rev 4591)
@@ -160,7 +160,7 @@
 );
 
 sub columns {
-    return @COLUMNS;
+    return ..hidden..;
 }
 
     # TODO:  business_units int[]

Modified: trunk/LedgerSMB/DBObject/Report.pm
===================================================================
--- trunk/LedgerSMB/DBObject/Report.pm	2012-03-26 09:16:46 UTC (rev 4590)
+++ trunk/LedgerSMB/DBObject/Report.pm	2012-03-26 09:47:25 UTC (rev 4591)
@@ -136,9 +136,10 @@
         locale => $LedgerSMB::App_State::Locale,
         path => 'UI',
         template => $template,
-        format => uc($self->format),
+        format => uc($request->{format} || 'HTML'),
     );
-    $template->render({report => $self, request => $request});
+    $template->render({report => $self, request => $request,
+                       columns => $self->columns, rows => $self->rows});
 }
 
 =back

Added: trunk/UI/Reports/display_report.html
===================================================================
--- trunk/UI/Reports/display_report.html	                        (rev 0)
+++ trunk/UI/Reports/display_report.html	2012-03-26 09:47:25 UTC (rev 4591)
@@ -0,0 +1,23 @@
+<?lsmb
+
+PROCESS "ui-header.html"
+   stylesheet = request.stylesheet;
+
+PROCESS "elements.html";
+
+PROCESS "dynatable.html";
+
+LINK = 'http://' _ ENVARS.SERVER_NAME _ ENVARS.SCRIPT_NAME 
+           _ '?' _ ENVARS.QUERY_STRING _ '&company=' _ form.company;
+
+?>
+<body>
+<?lsmb PROCESS dynatable ?>
+
+<a href="<?lsmb LINK ?>">[<?lsmb text('permalink') ?>]</a>&nbsp;
+<a href="<?lsmb LINK _ '&format=PDF' ?>">[<?lsmb text('PDF') ?>]</a>&nbsp;
+<a href="<?lsmb LINK _ '&format=CSV' ?>">[<?lsmb text('CSV') ?>]</a>&nbsp;
+<a href="<?lsmb LINK _ '&format=XLS' ?>">[<?lsmb text('XLS') ?>]</a>&nbsp;
+<a href="<?lsmb LINK _ '&format=ODS' ?>">[<?lsmb text('ODS') ?>]</a>&nbsp;
+</body>
+<?lsmb PROCESS end_html ?>

Modified: trunk/UI/journal/search.html
===================================================================
--- trunk/UI/journal/search.html	2012-03-26 09:16:46 UTC (rev 4590)
+++ trunk/UI/journal/search.html	2012-03-26 09:47:25 UTC (rev 4591)
@@ -4,7 +4,7 @@
 <?lsmb PROCESS 'elements.html' ?>
 <body>
 
-<form method="post" action="<?lsmb script ?>">
+<form method="get" action="<?lsmb script ?>">
 <?lsmb PROCESS input element_data = {
     type = "hidden"
     name = "sort"

Modified: trunk/UI/lib/ui-header.html
===================================================================
--- trunk/UI/lib/ui-header.html	2012-03-26 09:16:46 UTC (rev 4590)
+++ trunk/UI/lib/ui-header.html	2012-03-26 09:47:25 UTC (rev 4591)
@@ -37,3 +37,6 @@
 	<meta name="robots" content="noindex,nofollow" />
         
 </head>
+<?lsmb BLOCK end_html ?>
+</html>
+<?lsmb END ?>

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.