SF.net SVN: ledger-smb:[6502] trunk/LedgerSMB

[..hidden..]

Revision: 6502
          http://sourceforge.net/p/ledger-smb/code/6502
Author:   einhverfr
Date:     2014-01-17 10:24:35 +0000 (Fri, 17 Jan 2014)
Log Message:
-----------
bypassing @'s from LaTeX encoding

Modified Paths:
--------------
    trunk/LedgerSMB/Form.pm
    trunk/LedgerSMB/OE.pm
    trunk/LedgerSMB/Template/LaTeX.pm

Modified: trunk/LedgerSMB/Form.pm
===================================================================
--- trunk/LedgerSMB/Form.pm	2014-01-17 09:56:22 UTC (rev 6501)
+++ trunk/LedgerSMB/Form.pm	2014-01-17 10:24:35 UTC (rev 6502)
@@ -1707,7 +1707,7 @@
 
 sub add_shipto {
   
-  	my ( $self,$dbh,$id ) = @_;
+  	my ( $self,$dbh,$id, $oe) = @_;
         if (! $self->{locationid}) {
 		return;
 	}
@@ -1718,10 +1718,18 @@
 			|;
 
         my $sth = $self->{dbh}->prepare($query) || $self->dberror($query);
-
+        my $trans_id;
+        my $oe_id;
+        if ($oe){
+           $trans_id = undef;
+           $oe_id = $id;
+        } else {
+           $trans_id = $id;
+           $oe_id = undef;
+        }  
         $sth->execute(
-                        undef,                     
-			$self->{id},
+                        $trans_id,                     
+			$oe_id,
 			$self->{locationid}
              
 		      ) || $self->dberror($query);

Modified: trunk/LedgerSMB/OE.pm
===================================================================
--- trunk/LedgerSMB/OE.pm	2014-01-17 09:56:22 UTC (rev 6501)
+++ trunk/LedgerSMB/OE.pm	2014-01-17 10:24:35 UTC (rev 6502)
@@ -463,7 +463,7 @@
     $form->{name} = $form->{ $form->{vc} };
     $form->{name} =~ s/--$form->{"$form->{vc}_id"}//;
 
-    $form->add_shipto( $dbh, $form->{id});
+    $form->add_shipto( $dbh, $form->{id}, 1);
 
     # save printed, emailed, queued
 

Modified: trunk/LedgerSMB/Template/LaTeX.pm
===================================================================
--- trunk/LedgerSMB/Template/LaTeX.pm	2014-01-17 09:56:22 UTC (rev 6501)
+++ trunk/LedgerSMB/Template/LaTeX.pm	2014-01-17 10:24:35 UTC (rev 6502)
@@ -111,6 +111,7 @@
 
     $vars =~ s/-/......hyphen....../g;
     $vars =~ s/\+/......plus....../g; 
+    $vars =~ s/@/......amp....../g; 
 
     # For some reason this doesnt handle hyphens or +'s, so handling those
     # above and below -CT
@@ -122,6 +123,7 @@
     }
     $vars =~ s/\.\.\.\.\.\.hyphen\.\.\.\.\.\./-/g;
     $vars =~ s/\.\.\.\.\.\.plus\.\.\.\.\.\./+/g; 
+    $vars =~ s/\.\.\.\.\.\.amp\.\.\.\.\.\./@/g; 
     return $vars;
 }
 

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


------------------------------------------------------------------------------
CenturyLink Cloud: The Leader in Enterprise Cloud Services.
Learn Why More Businesses Are Choosing CenturyLink Cloud For
Critical Workloads, Development Environments & Everything In Between.
Get a Quote or Start a Free Trial Today. 
http://pubads.g.doubleclick.net/gampad/clk?id=119420431&iu=/4140/ostg.clktrk
_______________________________________________
Ledger-smb-commits mailing list
..hidden..
https://lists.sourceforge.net/lists/listinfo/ledger-smb-commits