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

[..hidden..]

Revision: 6313
          http://sourceforge.net/p/ledger-smb/code/6313
Author:   einhverfr
Date:     2013-12-07 15:49:52 +0000 (Sat, 07 Dec 2013)
Log Message:
-----------
Initial changes so that templates will print descriptions

Modified Paths:
--------------
    trunk/LedgerSMB/IS.pm
    trunk/bin/io.pl
    trunk/templates/demo/invoice.html
    trunk/templates/demo/invoice.tex
    trunk/templates/xedemo/invoice.html
    trunk/templates/xedemo/invoice.tex

Modified: trunk/LedgerSMB/IS.pm
===================================================================
--- trunk/LedgerSMB/IS.pm	2013-12-07 15:12:08 UTC (rev 6312)
+++ trunk/LedgerSMB/IS.pm	2013-12-07 15:49:52 UTC (rev 6313)
@@ -363,7 +363,7 @@
             push( @{ $form->{serialnumber} },  $form->{"serialnumber_$i"} );
 
             push( @{ $form->{bin} },         $form->{"bin_$i"} );
-            push( @{ $form->{description} }, $form->{"description_$i"} );
+            push( @{ $form->{item_description} }, $form->{"description_$i"} );
             push( @{ $form->{itemnotes} },   $form->{"notes_$i"} );
             push(
                 @{ $form->{qty} },

Modified: trunk/bin/io.pl
===================================================================
--- trunk/bin/io.pl	2013-12-07 15:12:08 UTC (rev 6312)
+++ trunk/bin/io.pl	2013-12-07 15:49:52 UTC (rev 6313)
@@ -1988,12 +1988,7 @@
         output_options => \%output_options,
 	output_file => $form->{formname} . "-" . $form->{"${inv}number"},
         );
-    try {
-        $template->render($form);
-    }
-    catch {
-        $form->error( $_ );
-    };
+    $template->render($form);
 
     # if we got back here restore the previous form
     if ( %$old_form ) {

Modified: trunk/templates/demo/invoice.html
===================================================================
--- trunk/templates/demo/invoice.html	2013-12-07 15:12:08 UTC (rev 6312)
+++ trunk/templates/demo/invoice.html	2013-12-07 15:49:52 UTC (rev 6313)
@@ -147,7 +147,7 @@
         <tr valign=top>
           <td align=right><?lsmb runningnumber.${loop_count} ?>.</td>
           <td><?lsmb number.${loop_count} ?></td>
-          <td><?lsmb description.${loop_count} ?></td>
+          <td><?lsmb item_description.${loop_count} ?></td>
           <td><?lsmb deliverydate.${loop_count} ?></td>
           <td align=right><?lsmb qty.${loop_count} ?></td>
           <td><?lsmb unit.${loop_count} ?></td>

Modified: trunk/templates/demo/invoice.tex
===================================================================
--- trunk/templates/demo/invoice.tex	2013-12-07 15:12:08 UTC (rev 6312)
+++ trunk/templates/demo/invoice.tex	2013-12-07 15:49:52 UTC (rev 6313)
@@ -145,7 +145,7 @@
 <?lsmb lc = loop.count - 1 ?>
   <?lsmb runningnumber.${lc} ?> & 
   <?lsmb number.${lc} ?> & 
-  <?lsmb INCLUDE multiline string = description.${lc} ?> & 
+  <?lsmb INCLUDE multiline string = item_description.${lc} ?> & 
   <?lsmb deliverydate.${lc} ?> &
   <?lsmb qty.${lc} ?> & 
   <?lsmb unit.${lc} ?> &

Modified: trunk/templates/xedemo/invoice.html
===================================================================
--- trunk/templates/xedemo/invoice.html	2013-12-07 15:12:08 UTC (rev 6312)
+++ trunk/templates/xedemo/invoice.html	2013-12-07 15:49:52 UTC (rev 6313)
@@ -147,7 +147,7 @@
         <tr valign=top>
           <td align=right><?lsmb runningnumber.${loop_count} ?>.</td>
           <td><?lsmb number.${loop_count} ?></td>
-          <td><?lsmb description.${loop_count} ?></td>
+          <td><?lsmb item_description.${loop_count} ?></td>
           <td><?lsmb deliverydate.${loop_count} ?></td>
           <td align=right><?lsmb qty.${loop_count} ?></td>
           <td><?lsmb unit.${loop_count} ?></td>

Modified: trunk/templates/xedemo/invoice.tex
===================================================================
--- trunk/templates/xedemo/invoice.tex	2013-12-07 15:12:08 UTC (rev 6312)
+++ trunk/templates/xedemo/invoice.tex	2013-12-07 15:49:52 UTC (rev 6313)
@@ -143,7 +143,7 @@
 <?lsmb lc = loop.count - 1 ?>
   <?lsmb runningnumber.${lc} ?> & 
   <?lsmb number.${lc} ?> & 
-  <?lsmb INCLUDE multiline string = description.${lc} ?> & 
+  <?lsmb INCLUDE multiline string = item_description.${lc} ?> & 
   <?lsmb deliverydate.${lc} ?> &
   <?lsmb qty.${lc} ?> & 
   <?lsmb unit.${lc} ?> &

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


------------------------------------------------------------------------------
Sponsored by Intel(R) XDK 
Develop, test and display web and hybrid apps with a single code base.
Download it for free now!
http://pubads.g.doubleclick.net/gampad/clk?id=111408631&iu=/4140/ostg.clktrk
_______________________________________________
Ledger-smb-commits mailing list
..hidden..
https://lists.sourceforge.net/lists/listinfo/ledger-smb-commits