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

[..hidden..]

Revision: 4304
          http://ledger-smb.svn.sourceforge.net/ledger-smb/?rev=4304&view=rev
Author:   einhverfr
Date:     2012-02-13 08:50:58 +0000 (Mon, 13 Feb 2012)
Log Message:
-----------
Bulk payment multi-currency handling fixed
Minor documentation addition to Asset.pm
Copyright notice cleanup on manual.

Modified Paths:
--------------
    branches/1.3/Changelog
    branches/1.3/LedgerSMB/DBObject/Asset.pm
    branches/1.3/doc/manual/LedgerSMB-manual.tex
    branches/1.3/sql/modules/Payment.sql

Modified: branches/1.3/Changelog
===================================================================
--- branches/1.3/Changelog	2012-02-11 15:33:31 UTC (rev 4303)
+++ branches/1.3/Changelog	2012-02-13 08:50:58 UTC (rev 4304)
@@ -18,6 +18,7 @@
 * Fixed multicurrency handling in bulk payment interface (Chris T and Erik H)
 * Corrected a number of number parsing/i18n issues (Herman V)
 * Corrected pos_cashier inadequate permissions (Chris T)
+* Corrected templates directive not handled properly (Chris T)
 
 Changelog for 1.3.10
 * Fixes for permissions for exchangerate table (Erik H)

Modified: branches/1.3/LedgerSMB/DBObject/Asset.pm
===================================================================
--- branches/1.3/LedgerSMB/DBObject/Asset.pm	2012-02-11 15:33:31 UTC (rev 4303)
+++ branches/1.3/LedgerSMB/DBObject/Asset.pm	2012-02-13 08:50:58 UTC (rev 4304)
@@ -156,7 +156,7 @@
 
 =item get
 
-Gets a fixed asset, sets all standard properties.
+Gets a fixed asset, sets all standard properties.  The id property must be set.
 
 =cut
 

Modified: branches/1.3/doc/manual/LedgerSMB-manual.tex
===================================================================
--- branches/1.3/doc/manual/LedgerSMB-manual.tex	2012-02-11 15:33:31 UTC (rev 4303)
+++ branches/1.3/doc/manual/LedgerSMB-manual.tex	2012-02-13 08:50:58 UTC (rev 4304)
@@ -35,7 +35,7 @@
 Except for the included scripts (which are licensed under the GPL v2 or later),
 the following permissive license governs this work.
 
-Copyright 2005-2009 The LedgerSMB Project. All rights reserved.
+Copyright 2005-2009 The LedgerSMB Project. 
 
 Redistribution and use in source (\LaTeX) and 'compiled' forms (SGML,
 HTML, PDF, PostScript, RTF and so forth) with or without modification, are

Modified: branches/1.3/sql/modules/Payment.sql
===================================================================
--- branches/1.3/sql/modules/Payment.sql	2012-02-11 15:33:31 UTC (rev 4303)
+++ branches/1.3/sql/modules/Payment.sql	2012-02-13 08:50:58 UTC (rev 4304)
@@ -553,7 +553,7 @@
         INSERT INTO acc_trans
              (trans_id, chart_id, amount, approved,
               voucher_id, transdate, source)
-           SELECT id, t_cash_id, amount * t_cash_sign * t_exchangerate,
+           SELECT id, t_cash_id, amount * t_cash_sign * t_exchangerate/fxrate,
                   CASE WHEN t_voucher_id IS NULL THEN true
                        ELSE false END,
                   t_voucher_id, in_payment_date, in_source
@@ -564,7 +564,7 @@
              (trans_id, chart_id, amount, approved,
               voucher_id, transdate, source)
            SELECT id, t_ar_ap_id,
-                  amount * -1 * t_cash_sign * fxrate,
+                  amount * -1 * t_cash_sign,
                   CASE WHEN t_voucher_id IS NULL THEN true
                        ELSE false END,
                   t_voucher_id, in_payment_date, in_source
@@ -575,7 +575,7 @@
              (trans_id, chart_id, amount, approved,
               voucher_id, transdate, source)
            SELECT id, gain_loss_accno,
-                  amount * -1 * t_cash_sign * (t_exchangerate - fxrate),
+                  amount * t_cash_sign * (1 - t_exchangerate/fxrate),
                   CASE WHEN t_voucher_id IS NULL THEN true
                        ELSE false END,
                   t_voucher_id, in_payment_date, in_source

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