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

[..hidden..]

Revision: 5530
          http://ledger-smb.svn.sourceforge.net/ledger-smb/?rev=5530&view=rev
Author:   einhverfr
Date:     2013-01-10 07:49:11 +0000 (Thu, 10 Jan 2013)
Log Message:
-----------
Merging from trunk fixes for new js and for errors when tax threshold not mt

Modified Paths:
--------------
    branches/1.3/Changelog
    branches/1.3/LedgerSMB/Taxes/Simple.pm
    branches/1.3/bin/ir.pl
    branches/1.3/bin/is.pl
    branches/1.3/bin/oe.pl

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


Property changes on: branches/1.3
___________________________________________________________________
Modified: svn:mergeinfo
   - /trunk:3711-3712,5424,5446-5448,5451,5457,5459,5461,5466,5473,5475,5482-5483,5485,5487,5489,5495-5496,5515,5519,5524,5526
   + /trunk:3711-3712,5424,5446-5448,5451,5457,5459,5461,5466,5473,5475,5482-5483,5485,5487,5489,5495-5496,5515,5519,5524,5526,5528-5529

Modified: branches/1.3/Changelog
===================================================================
--- branches/1.3/Changelog	2013-01-10 07:46:53 UTC (rev 5529)
+++ branches/1.3/Changelog	2013-01-10 07:49:11 UTC (rev 5530)
@@ -19,6 +19,7 @@
 * Fixed stylesheet cannot be set on preferences screen (Chris T, 3599804)
 * Moved Fixes.sql to top of LOADORDER to fix some upgrade issues (Chris T)
 * Fixing handling of unknown browsers in logout (Chris T, 3599930)
+* Fixed error generating invoice when mintax threshhold not met Chris T)
 
 Changelog for 1.3.27
 * Detect whether ledgersmb.conf exists during Makefile.PL run and create if


Property changes on: branches/1.3/Changelog
___________________________________________________________________
Modified: svn:mergeinfo
   - /trunk/Changelog:3711-3712,5424,5446-5448,5451,5457,5459,5461,5466,5473,5475,5482-5483,5485,5487,5489,5495-5496,5513,5515,5519,5524
   + /trunk/Changelog:3711-3712,5424,5446-5448,5451,5457,5459,5461,5466,5473,5475,5482-5483,5485,5487,5489,5495-5496,5513,5515,5519,5524,5529

Modified: branches/1.3/LedgerSMB/Taxes/Simple.pm
===================================================================
--- branches/1.3/LedgerSMB/Taxes/Simple.pm	2013-01-10 07:46:53 UTC (rev 5529)
+++ branches/1.3/LedgerSMB/Taxes/Simple.pm	2013-01-10 07:49:11 UTC (rev 5530)
@@ -28,6 +28,7 @@
 
 use Class::Struct;
 use Math::BigFloat;
+use Carp::Always;
 
 struct Taxes::Simple => {
     taxnumber   => '$',
@@ -58,6 +59,7 @@
 sub apply_tax {
     my ( $self, $form, $subtotal ) = @_;
     my $tax = $self->calculate_tax( $form, $subtotal, 0 );
+    $tax = Math::BigFloat->bzero unless $tax;
     $self->value($tax);
     return $tax;
 }

Modified: branches/1.3/bin/ir.pl
===================================================================
--- branches/1.3/bin/ir.pl	2013-01-10 07:46:53 UTC (rev 5529)
+++ branches/1.3/bin/ir.pl	2013-01-10 07:49:11 UTC (rev 5530)
@@ -417,7 +417,7 @@
   } else {
     kc = event.which;
   }
-  if (kc == '13' and document.activeElement.nodeName != 'TEXTAREA'){
+  if (kc == '13' && document.activeElement.tagName != 'TEXTAREA'){
         document.forms[0].submit();
   }
 }

Modified: branches/1.3/bin/is.pl
===================================================================
--- branches/1.3/bin/is.pl	2013-01-10 07:46:53 UTC (rev 5529)
+++ branches/1.3/bin/is.pl	2013-01-10 07:49:11 UTC (rev 5530)
@@ -453,7 +453,7 @@
   } else {
     kc = event.which;
   }
-  if (kc == '13' and document.activeElement.nodeName != 'TEXTAREA'){
+  if (kc == '13' && document.activeElement.tagName != 'TEXTAREA'){
         document.forms[0].submit();
   }
 }

Modified: branches/1.3/bin/oe.pl
===================================================================
--- branches/1.3/bin/oe.pl	2013-01-10 07:46:53 UTC (rev 5529)
+++ branches/1.3/bin/oe.pl	2013-01-10 07:49:11 UTC (rev 5530)
@@ -591,7 +591,7 @@
   } else {
     kc = event.which;
   }
-  if (kc == '13' and document.activeElement.nodeName != 'TEXTAREA'){
+  if (kc == '13' && document.activeElement.tagName != 'TEXTAREA'){
         document.forms[0].submit();
   }
 }

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