SF.net SVN: ledger-smb:[4136] branches/1.3/bin/io.pl

[..hidden..]

Revision: 4136
          http://ledger-smb.svn.sourceforge.net/ledger-smb/?rev=4136&view=rev
Author:   tshvr
Date:     2011-12-03 17:04:31 +0000 (Sat, 03 Dec 2011)
Log Message:
-----------
prevent myCompanyFax getting printed as shipto_fax

Modified Paths:
--------------
    branches/1.3/bin/io.pl

Modified: branches/1.3/bin/io.pl
===================================================================
--- branches/1.3/bin/io.pl	2011-12-03 16:42:45 UTC (rev 4135)
+++ branches/1.3/bin/io.pl	2011-12-03 17:04:31 UTC (rev 4136)
@@ -1464,7 +1464,9 @@
     $form->{email} = $csettings->{company_email};
     $form->{address} = $csettings->{company_address};
     $form->{tel} = $csettings->{company_phone};
+    #$form->{myCompanyFax} = $csettings->{company_fax};#fax should be named myCompanyFax ?
     $form->{fax} = $csettings->{company_fax};
+    $logger->trace("setting fax from LedgerSMB::Company_Config::settings \$form->{formname}=$form->{formname} \$form->{fax}=$form->{fax}");
 
 
     # if this goes to the printer pass through
@@ -1668,6 +1670,7 @@
         }
     }
 
+    $logger->trace("\$form->{formname}=$form->{formname} \$form->{fax}=$form->{fax} \$shipto=$shipto \$form->{shiptofax}=$form->{shiptofax}");
     if ($shipto) {
         if (   $form->{formname} eq 'purchase_order'
             || $form->{formname} eq 'request_quotation' )
@@ -1677,7 +1680,7 @@
         }
         else {
             if ( $form->{formname} !~ /bin_list/ ) {
-                for (@vars) { $form->{"shipto$_"} = $form->{$_} }
+                for (@vars) {if($_ ne 'fax'){$form->{"shipto$_"}=$form->{$_}}} #fax contains myCompanyFax
             }
         }
     }

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