SF.net SVN: ledger-smb:[5462] branches/1.3

[..hidden..]

Revision: 5462
          http://ledger-smb.svn.sourceforge.net/ledger-smb/?rev=5462&view=rev
Author:   einhverfr
Date:     2013-01-02 07:17:27 +0000 (Wed, 02 Jan 2013)
Log Message:
-----------
Merging ar/ap csv transaction tax fix from trunk

Modified Paths:
--------------
    branches/1.3/Changelog
    branches/1.3/templates/demo/ap_transaction.csv
    branches/1.3/templates/demo/ar_transaction.csv
    branches/1.3/templates/demo_with_images/ap_transaction.csv
    branches/1.3/templates/demo_with_images/ar_transaction.csv
    branches/1.3/templates/xedemo/ap_transaction.csv
    branches/1.3/templates/xedemo/ar_transaction.csv

Property Changed:
----------------
    branches/1.3/


Property changes on: branches/1.3
___________________________________________________________________
Modified: svn:mergeinfo
   - /trunk:3711-3712,5424,5446-5448,5451,5457,5459
   + /trunk:3711-3712,5424,5446-5448,5451,5457,5459,5461

Modified: branches/1.3/Changelog
===================================================================
--- branches/1.3/Changelog	2013-01-02 07:14:09 UTC (rev 5461)
+++ branches/1.3/Changelog	2013-01-02 07:17:27 UTC (rev 5462)
@@ -7,6 +7,7 @@
   to "postgres" db. (Chris T)
 * Added copy db utility to setup.pl for testing dbs (Chris T)
 * Fixing is_zero errors on ar/ap transaction screens w/tax incldued (Chris T)
+* Fixing csv ar transactions not showing taxes (Chris T, 3589640)
 
 Changelog for 1.3.27
 * Detect whether ledgersmb.conf exists during Makefile.PL run and create if

Modified: branches/1.3/templates/demo/ap_transaction.csv
===================================================================
--- branches/1.3/templates/demo/ap_transaction.csv	2013-01-02 07:14:09 UTC (rev 5461)
+++ branches/1.3/templates/demo/ap_transaction.csv	2013-01-02 07:17:27 UTC (rev 5462)
@@ -1,3 +1,5 @@
 account,amount,description,project
 <?lsmb FOREACH amount ?><?lsmb lc = loop.count - 1 ?><?lsmb accno.${lc} ?>,<?lsmb account.${lc} ?>,<?lsmb amount.${lc} ?>,<?lsmb description.${lc} ?>,<?lsmb projectnumber.${lc} ?>
+<?lsmb END ?><?lsmb FOREACH t IN taxaccounts.split(' ') ?><?lsmb loop_count = loop.count - 1 -?>
+<?lsmb t.remove('"') ?>,<?lsmb tax.${loop_count} ?>,<?lsmb taxdescription.${loop_count} ?>,
 <?lsmb END ?>

Modified: branches/1.3/templates/demo/ar_transaction.csv
===================================================================
--- branches/1.3/templates/demo/ar_transaction.csv	2013-01-02 07:14:09 UTC (rev 5461)
+++ branches/1.3/templates/demo/ar_transaction.csv	2013-01-02 07:17:27 UTC (rev 5462)
@@ -1,3 +1,5 @@
-account,amount,description,project
+account,description,amount,memo,project
 <?lsmb FOREACH amount ?><?lsmb lc = loop.count - 1 ?><?lsmb accno.${lc} ?>,<?lsmb account.${lc} ?>,<?lsmb amount.${lc} ?>,<?lsmb description.${lc} ?>,<?lsmb projectnumber.${lc} ?>
+<?lsmb END ?><?lsmb FOREACH t IN taxaccounts.split(' ') ?><?lsmb loop_count = loop.count - 1 -?>
+<?lsmb t.remove('"') ?>,<?lsmb taxdescription.${loop_count} ?>,<?lsmb tax.${loop_count} ?>,,,
 <?lsmb END ?>

Modified: branches/1.3/templates/demo_with_images/ap_transaction.csv
===================================================================
--- branches/1.3/templates/demo_with_images/ap_transaction.csv	2013-01-02 07:14:09 UTC (rev 5461)
+++ branches/1.3/templates/demo_with_images/ap_transaction.csv	2013-01-02 07:17:27 UTC (rev 5462)
@@ -1,3 +1,5 @@
 account,amount,description,project
 <?lsmb FOREACH amount ?><?lsmb lc = loop.count - 1 ?><?lsmb accno.${lc} ?>,<?lsmb account.${lc} ?>,<?lsmb amount.${lc} ?>,<?lsmb description.${lc} ?>,<?lsmb projectnumber.${lc} ?>
+<?lsmb END ?><?lsmb FOREACH t IN taxaccounts.split(' ') ?><?lsmb loop_count = loop.count - 1 -?>
+<?lsmb t.remove('"') ?>,<?lsmb tax.${loop_count} ?>,<?lsmb taxdescription.${loop_count} ?>,
 <?lsmb END ?>

Modified: branches/1.3/templates/demo_with_images/ar_transaction.csv
===================================================================
--- branches/1.3/templates/demo_with_images/ar_transaction.csv	2013-01-02 07:14:09 UTC (rev 5461)
+++ branches/1.3/templates/demo_with_images/ar_transaction.csv	2013-01-02 07:17:27 UTC (rev 5462)
@@ -1,3 +1,5 @@
-account,amount,description,project
+account,description,amount,memo,project
 <?lsmb FOREACH amount ?><?lsmb lc = loop.count - 1 ?><?lsmb accno.${lc} ?>,<?lsmb account.${lc} ?>,<?lsmb amount.${lc} ?>,<?lsmb description.${lc} ?>,<?lsmb projectnumber.${lc} ?>
+<?lsmb END ?><?lsmb FOREACH t IN taxaccounts.split(' ') ?><?lsmb loop_count = loop.count - 1 -?>
+<?lsmb t.remove('"') ?>,<?lsmb taxdescription.${loop_count} ?>,<?lsmb tax.${loop_count} ?>,,,
 <?lsmb END ?>

Modified: branches/1.3/templates/xedemo/ap_transaction.csv
===================================================================
--- branches/1.3/templates/xedemo/ap_transaction.csv	2013-01-02 07:14:09 UTC (rev 5461)
+++ branches/1.3/templates/xedemo/ap_transaction.csv	2013-01-02 07:17:27 UTC (rev 5462)
@@ -1,3 +1,5 @@
 account,amount,description,project
 <?lsmb FOREACH amount ?><?lsmb lc = loop.count - 1 ?><?lsmb accno.${lc} ?>,<?lsmb account.${lc} ?>,<?lsmb amount.${lc} ?>,<?lsmb description.${lc} ?>,<?lsmb projectnumber.${lc} ?>
+<?lsmb END ?><?lsmb FOREACH t IN taxaccounts.split(' ') ?><?lsmb loop_count = loop.count - 1 -?>
+<?lsmb t.remove('"') ?>,<?lsmb tax.${loop_count} ?>,<?lsmb taxdescription.${loop_count} ?>,
 <?lsmb END ?>

Modified: branches/1.3/templates/xedemo/ar_transaction.csv
===================================================================
--- branches/1.3/templates/xedemo/ar_transaction.csv	2013-01-02 07:14:09 UTC (rev 5461)
+++ branches/1.3/templates/xedemo/ar_transaction.csv	2013-01-02 07:17:27 UTC (rev 5462)
@@ -1,3 +1,5 @@
-account,amount,description,project
+account,description,amount,memo,project
 <?lsmb FOREACH amount ?><?lsmb lc = loop.count - 1 ?><?lsmb accno.${lc} ?>,<?lsmb account.${lc} ?>,<?lsmb amount.${lc} ?>,<?lsmb description.${lc} ?>,<?lsmb projectnumber.${lc} ?>
+<?lsmb END ?><?lsmb FOREACH t IN taxaccounts.split(' ') ?><?lsmb loop_count = loop.count - 1 -?>
+<?lsmb t.remove('"') ?>,<?lsmb taxdescription.${loop_count} ?>,<?lsmb tax.${loop_count} ?>,,,
 <?lsmb END ?>

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