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

[..hidden..]

Revision: 5838
          http://sourceforge.net/p/ledger-smb/code/5838
Author:   einhverfr
Date:     2013-05-20 09:41:35 +0000 (Mon, 20 May 2013)
Log Message:
-----------
Merging in fix for taxform checkboxes from 1.4

Modified Paths:
--------------
    branches/1.3/Changelog
    branches/1.3/LedgerSMB/AA.pm
    branches/1.3/bin/io.pl
    branches/1.3/bin/ir.pl
    branches/1.3/bin/is.pl

Modified: branches/1.3/Changelog
===================================================================
--- branches/1.3/Changelog	2013-05-20 09:37:00 UTC (rev 5837)
+++ branches/1.3/Changelog	2013-05-20 09:41:35 UTC (rev 5838)
@@ -13,6 +13,7 @@
 * Fixed double-counting first date's balance on gl report (Chris T)
 * Fixed user creation failing on some timezones with some datestyles (Chris T)
 * Added secondary partnumber ordering to eca history report (Chris T)
+* Fixed default_reportable not respected for invoices (Chris T, 799)
 
 Changelog for 1.3.32
 * Fixed em-dash handling for pdfs (Chris T)

Modified: branches/1.3/LedgerSMB/AA.pm
===================================================================
--- branches/1.3/LedgerSMB/AA.pm	2013-05-20 09:37:00 UTC (rev 5837)
+++ branches/1.3/LedgerSMB/AA.pm	2013-05-20 09:41:35 UTC (rev 5838)
@@ -1301,10 +1301,11 @@
 			  b.discount AS tradediscount, 
 		          b.description AS business, 
 			  entity.control_code as entity_control_code,
-			  c.meta_number, ecl.*
+			  c.meta_number, ecl.*, ctf.default_reportable
 		     FROM entity_credit_account c
 		     JOIN entity ON (entity.id = c.entity_id)
 		LEFT JOIN business b ON (b.id = c.business_id)
+                LEFT JOIN country_tax_form ctf ON ctf.id = c.taxform_id
                 LEFT JOIN (SELECT coalesce(line_one, '')
                                || ' ' || coalesce(line_two, '') as address,
                                l.city, etl.credit_id

Modified: branches/1.3/bin/io.pl
===================================================================
--- branches/1.3/bin/io.pl	2013-05-20 09:37:00 UTC (rev 5837)
+++ branches/1.3/bin/io.pl	2013-05-20 09:41:35 UTC (rev 5838)
@@ -331,7 +331,7 @@
 
         
         $taxchecked="";
-	if($form->{"taxformcheck_$i"})
+	if($form->{"taxformcheck_$i"} or ($i == $form->{rowcount} and $form->{default_reportable}))
 	{
 		$taxchecked="checked";
 

Modified: branches/1.3/bin/ir.pl
===================================================================
--- branches/1.3/bin/ir.pl	2013-05-20 09:37:00 UTC (rev 5837)
+++ branches/1.3/bin/ir.pl	2013-05-20 09:41:35 UTC (rev 5838)
@@ -432,7 +432,7 @@
     $form->hide_form(
         qw(id title vc type terms creditlimit creditremaining closedto locked 
            shipped oldtransdate recurring reverse batch_id subtype form_id
-           nextsub)
+           nextsub default_reportable)
     );
 
     print qq|

Modified: branches/1.3/bin/is.pl
===================================================================
--- branches/1.3/bin/is.pl	2013-05-20 09:37:00 UTC (rev 5837)
+++ branches/1.3/bin/is.pl	2013-05-20 09:41:35 UTC (rev 5838)
@@ -466,7 +466,7 @@
         qw(form_id id type printed emailed queued title vc terms discount 
            creditlimit creditremaining tradediscount business closedto locked 
            shipped oldtransdate recurring reverse batch_id subtype 
-           meta_number nextsub)
+           meta_number nextsub default_reportable)
     );
 
     if ($form->{notice}){

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