[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
SF.net SVN: ledger-smb:[4063] branches/1.3
- Subject: SF.net SVN: ledger-smb:[4063] branches/1.3
- From: ..hidden..
- Date: Fri, 25 Nov 2011 01:31:08 +0000
Revision: 4063
http://ledger-smb.svn.sourceforge.net/ledger-smb/?rev=4063&view=rev
Author: einhverfr
Date: 2011-11-25 01:31:08 +0000 (Fri, 25 Nov 2011)
Log Message:
-----------
Correcting parse errors in POS Invoice template
Modified Paths:
--------------
branches/1.3/Changelog
branches/1.3/templates/demo/pos_invoice.txt
branches/1.3/templates/xedemo/pos_invoice.txt
Modified: branches/1.3/Changelog
===================================================================
--- branches/1.3/Changelog 2011-11-25 01:18:16 UTC (rev 4062)
+++ branches/1.3/Changelog 2011-11-25 01:31:08 UTC (rev 4063)
@@ -13,6 +13,7 @@
* Corrected 'Invalid Year-end filter' when exporting trial balance (Chris T)
* Correcting errors attaching and retriving URL attachments (Chris T)
* Correcting history.css not found (Chris T)
+* Correcting parse errors in pos_template.txt (Chris T)
Changelog for LedgerSMB 1.3.6
* Including xelatex templates under directory templates/xedemo (Chris T)
Modified: branches/1.3/templates/demo/pos_invoice.txt
===================================================================
--- branches/1.3/templates/demo/pos_invoice.txt 2011-11-25 01:18:16 UTC (rev 4062)
+++ branches/1.3/templates/demo/pos_invoice.txt 2011-11-25 01:31:08 UTC (rev 4063)
@@ -7,39 +7,38 @@
Printed: <?lsmb dateprinted ?>
Qty Description Amount
-<?lsmb foreach number ?>
-<?lsmb qty FILTER format('%5.5s') ?> <?lsmb description FILTER format('%-18.18s') ?> <?lsmb linetotal FILTER format('%9.9s') ?>
- <?lsmb number ?> @ <?lsmb sellprice ?>/<?lsmb unit ?>
-<?lsmb end number ?>
+<?lsmb FOREACH number ?><?lsmb loop_count = loop.count - 1 ?>
+<?lsmb qty FILTER format('%5.5s') ?> <?lsmb description.loop_count FILTER format('%-18.18s') ?> <?lsmb linetotal.loop_count FILTER format('%9.9s') ?>
+ <?lsmb number.loop_count ?> @ <?lsmb sellprice.loop_count ?>/<?lsmb unit.loop_count ?>
+<?lsmb END # number ?>
Number of items: <?lsmb totalqty ?>
-<?lsmb if taxincluded ?>
+<?lsmb IF taxincluded ?>
---------------
Total: <?lsmb invtotal FILTER format('%9.9s') ?>
-<?lsmb end taxincluded ?>
-<?lsmb if not taxincluded ?>
+<?lsmb ELSE ?>
------------
Subtotal: <?lsmb subtotal FILTER format('%9.9s') ?>
-<?lsmb end taxincluded ?>
-<?lsmb foreach tax ?>
-<?lsmb taxdescription FILTER format('%-23.23s') ?> @ <?lsmb taxrate FILTER format('%2.2s') ?>%: <?lsmb tax FILTER format('%9.9s') ?>
-<?lsmb end tax ?>
-<?lsmb foreach payment ?>
- Paid: <?lsmb payment FILTER format('%9.9s') ?> <?lsmb currency ?>
-<?lsmb end payment ?>
-<?lsmb if change ?>
+<?lsmb END # taxincluded ?>
+<?lsmb FOREACH tax ?><?lsmb loop_count = loop.count - 1 ?>
+<?lsmb taxdescription.loop_count FILTER format('%-23.23s') ?> @ <?lsmb taxrate.loop_count FILTER format('%2.2s') ?>%: <?lsmb tax.loop_count FILTER format('%9.9s') ?>
+<?lsmb END # tax ?>
+<?lsmb FOREACH payment ?><?lsmb loop_count = loop.count - 1 ?>
+ Paid: <?lsmb payment.loop_count FILTER format('%9.9s') ?> <?lsmb currency.loop_count ?>
+<?lsmb END # payment ?>
+<?lsmb IF change ?>
Change: <?lsmb change FILTER format('%9.9s') ?>
-<?lsmb end change ?>
-<?lsmb if total ?>
+<?lsmb END # change ?>
+<?lsmb IF total ?>
Balance Due: <?lsmb total FILTER format('%9.9s') ?>
-<?lsmb end total ?>
-<?lsmb if discount ?>
+<?lsmb END # total ?>
+<?lsmb IF discount ?>
<?lsmb discount ?> % Discount applied
-<?lsmb end discount ?>
+<?lsmb END # discount ?>
Thank you for your valued business!
-<?lsmb if taxincluded ?>
+<?lsmb IF taxincluded ?>
Taxes are included in price.
-<?lsmb end taxincluded ?>
+<?lsmb END # taxincluded ?>
Modified: branches/1.3/templates/xedemo/pos_invoice.txt
===================================================================
--- branches/1.3/templates/xedemo/pos_invoice.txt 2011-11-25 01:18:16 UTC (rev 4062)
+++ branches/1.3/templates/xedemo/pos_invoice.txt 2011-11-25 01:31:08 UTC (rev 4063)
@@ -7,39 +7,38 @@
Printed: <?lsmb dateprinted ?>
Qty Description Amount
-<?lsmb foreach number ?>
-<?lsmb qty FILTER format('%5.5s') ?> <?lsmb description FILTER format('%-18.18s') ?> <?lsmb linetotal FILTER format('%9.9s') ?>
- <?lsmb number ?> @ <?lsmb sellprice ?>/<?lsmb unit ?>
-<?lsmb end number ?>
+<?lsmb FOREACH number ?><?lsmb loop_count = loop.count - 1 ?>
+<?lsmb qty FILTER format('%5.5s') ?> <?lsmb description.loop_count FILTER format('%-18.18s') ?> <?lsmb linetotal.loop_count FILTER format('%9.9s') ?>
+ <?lsmb number.loop_count ?> @ <?lsmb sellprice.loop_count ?>/<?lsmb unit.loop_count ?>
+<?lsmb END # number ?>
Number of items: <?lsmb totalqty ?>
-<?lsmb if taxincluded ?>
+<?lsmb IF taxincluded ?>
---------------
Total: <?lsmb invtotal FILTER format('%9.9s') ?>
-<?lsmb end taxincluded ?>
-<?lsmb if not taxincluded ?>
+<?lsmb ELSE ?>
------------
Subtotal: <?lsmb subtotal FILTER format('%9.9s') ?>
-<?lsmb end taxincluded ?>
-<?lsmb foreach tax ?>
-<?lsmb taxdescription FILTER format('%-23.23s') ?> @ <?lsmb taxrate FILTER format('%2.2s') ?>%: <?lsmb tax FILTER format('%9.9s') ?>
-<?lsmb end tax ?>
-<?lsmb foreach payment ?>
- Paid: <?lsmb payment FILTER format('%9.9s') ?> <?lsmb currency ?>
-<?lsmb end payment ?>
-<?lsmb if change ?>
+<?lsmb END # taxincluded ?>
+<?lsmb FOREACH tax ?><?lsmb loop_count = loop.count - 1 ?>
+<?lsmb taxdescription.loop_count FILTER format('%-23.23s') ?> @ <?lsmb taxrate.loop_count FILTER format('%2.2s') ?>%: <?lsmb tax.loop_count FILTER format('%9.9s') ?>
+<?lsmb END # tax ?>
+<?lsmb FOREACH payment ?><?lsmb loop_count = loop.count - 1 ?>
+ Paid: <?lsmb payment.loop_count FILTER format('%9.9s') ?> <?lsmb currency.loop_count ?>
+<?lsmb END # payment ?>
+<?lsmb IF change ?>
Change: <?lsmb change FILTER format('%9.9s') ?>
-<?lsmb end change ?>
-<?lsmb if total ?>
+<?lsmb END # change ?>
+<?lsmb IF total ?>
Balance Due: <?lsmb total FILTER format('%9.9s') ?>
-<?lsmb end total ?>
-<?lsmb if discount ?>
+<?lsmb END # total ?>
+<?lsmb IF discount ?>
<?lsmb discount ?> % Discount applied
-<?lsmb end discount ?>
+<?lsmb END # discount ?>
Thank you for your valued business!
-<?lsmb if taxincluded ?>
+<?lsmb IF taxincluded ?>
Taxes are included in price.
-<?lsmb end taxincluded ?>
+<?lsmb END # taxincluded ?>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.