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

[..hidden..]

Revision: 6407
          http://sourceforge.net/p/ledger-smb/code/6407
Author:   einhverfr
Date:     2014-01-07 09:15:22 +0000 (Tue, 07 Jan 2014)
Log Message:
-----------
Fixing 864, manually entered tax amount ignored printing invoice

Modified Paths:
--------------
    trunk/Changelog
    trunk/LedgerSMB/IS.pm
    trunk/bin/is.pl

Modified: trunk/Changelog
===================================================================
--- trunk/Changelog	2014-01-07 07:44:00 UTC (rev 6406)
+++ trunk/Changelog	2014-01-07 09:15:22 UTC (rev 6407)
@@ -106,6 +106,7 @@
 * Fixed update forgetting creditor (Nick P)
 * Fixed invoices rounding and printing differently (Giovanni B)
 * Deleted broken pricematrix check on existing rows in POS (Chris T)
+* Fixing manually entered tax amounts ignored printing invoice (Chris T, 864)
 
 Chris T is Chris Travers
 Nick P is Nick Prater

Modified: trunk/LedgerSMB/IS.pm
===================================================================
--- trunk/LedgerSMB/IS.pm	2014-01-07 07:44:00 UTC (rev 6406)
+++ trunk/LedgerSMB/IS.pm	2014-01-07 09:15:22 UTC (rev 6407)
@@ -483,6 +483,10 @@
 
             foreach my $item (@taxaccounts) {
                 push @taxrates, 100 * $item->rate;
+                if ($form->{"mt_amount_" . $item->account}){
+                    $taxaccounts{ $item->account } += $form->{"mt_amount_" . $item->account};
+                    next;
+                }
                 $taxaccounts{ $item->account } += $item->value;
                 if ( $form->{taxincluded} ) {
                     $taxbase{ $item->account } += $taxbase;

Modified: trunk/bin/is.pl
===================================================================
--- trunk/bin/is.pl	2014-01-07 07:44:00 UTC (rev 6406)
+++ trunk/bin/is.pl	2014-01-07 09:15:22 UTC (rev 6407)
@@ -1450,12 +1450,8 @@
     ( $form->{AR} )      = split /--/, $form->{AR};
     ( $form->{AR_paid} ) = split /--/, $form->{AR_paid};
 
-    if ( IS->post_invoice( \%myconfig, \%$form ) ) {
-        &edit;
-    }
-    else {
-        $form->error( $locale->text('Cannot post invoice!') );
-    }
+    IS->post_invoice( \%myconfig, \%$form );
+    edit();
 
 }
 

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


------------------------------------------------------------------------------
Rapidly troubleshoot problems before they affect your business. Most IT 
organizations don't have a clear picture of how application performance 
affects their revenue. With AppDynamics, you get 100% visibility into your 
Java,.NET, & PHP application. Start your 15-day FREE TRIAL of AppDynamics Pro!
http://pubads.g.doubleclick.net/gampad/clk?id=84349831&iu=/4140/ostg.clktrk
_______________________________________________
Ledger-smb-commits mailing list
..hidden..
https://lists.sourceforge.net/lists/listinfo/ledger-smb-commits