diff -ruN --ignore-blank-lines --exclude users --exclude templates --exclude sql-ledger.conf sql-ledger-2.6.1/SL/IS.pm sql-ledger-2.6.1-ORIGINAL/SL/IS.pm
--- sql-ledger-2.6.1/SL/IS.pm Thu Nov 10 20:26:28 2005
+++ sql-ledger-2.6.1-ORIGINAL/SL/IS.pm Fri Sep 30 16:35:31 2005
@@ -156,28 +156,6 @@
push(@{ $form->{sku} }, qq|$form->{"sku_$i"}|);
push(@{ $form->{serialnumber} }, qq|$form->{"serialnumber_$i"}|);
push(@{ $form->{bin} }, qq|$form->{"bin_$i"}|);
- ###JQ### Pull in the part notes for extra description in invoices, sales orders and packing lists
- if ($form->{formname} =~ /(invoice|sales_order|packing_list)/) {
- $partnumber = qq|$form->{"partnumber_$i"}|;
- $query = "SELECT notes FROM parts WHERE partnumber = '$partnumber'";
- $sth = $dbh->prepare($query);
- $sth->execute || $form->dberror($query);
- while (my $ref = $sth->fetchrow_hashref(NAME_lc)) {
- $itemnotes = $ref->{notes};
- }
- if (length($itemnotes) > 0) {
- if ($form->{format} eq "pdf" or $form->{format} eq "postscript") {
- $itemnotes =~ s/(^|\n)/\n\n\\notestextfont /g;
- }
- elsif ($form->{format} eq "html") {
- $itemnotes =~ s/(^|\n)/\n\
\n/g;
- }
- $form->{"description_$i"} .= $itemnotes;
- }
- }
-
-
- ###JQ### End of customisation
push(@{ $form->{description} }, qq|$form->{"description_$i"}|);
push(@{ $form->{qty} }, $form->format_amount($myconfig, $form->{"qty_$i"}));
push(@{ $form->{ship} }, $form->format_amount($myconfig, $form->{"qty_$i"}));
diff -ruN --ignore-blank-lines --exclude users --exclude templates --exclude sql-ledger.conf sql-ledger-2.6.1/SL/OE.pm sql-ledger-2.6.1-ORIGINAL/SL/OE.pm
--- sql-ledger-2.6.1/SL/OE.pm Thu Nov 10 19:35:58 2005
+++ sql-ledger-2.6.1-ORIGINAL/SL/OE.pm Thu Sep 29 12:51:51 2005
@@ -1022,28 +1022,6 @@
push(@{ $form->{runningnumber} }, $runningnumber++);
push(@{ $form->{number} }, qq|$form->{"partnumber_$i"}|);
push(@{ $form->{sku} }, qq|$form->{"sku_$i"}|);
-
- ###JQ### Pull in the part notes for extra description in invoices, sales orders and packing lists
- #if ($form->{formname} =~ /(invoice|sales_order|packing_list)/) {
- $partnumber = qq|$form->{"partnumber_$i"}|;
- $query = "SELECT notes FROM parts WHERE partnumber = '$partnumber'";
- $sth = $dbh->prepare($query);
- $sth->execute || $form->dberror($query);
- while (my $ref = $sth->fetchrow_hashref(NAME_lc)) {
- $itemnotes = $ref->{notes};
- }
- if (length($itemnotes) > 0) {
- if ($form->{format} eq "pdf" or $form->{format} eq "postscript") {
- $itemnotes =~ s/(^|\n)/\n\n\\notestextfont /g;
- }
- elsif ($form->{format} eq "html") {
- $itemnotes =~ s/(^|\n)/\n\
/g;
- }
- $form->{"description_$i"} .= $itemnotes;
- }
- #}
- ###JQ### End of customisation
-
push(@{ $form->{description} }, qq|$form->{"description_$i"}|);
push(@{ $form->{qty} }, $form->format_amount($myconfig, $form->{"qty_$i"}));
push(@{ $form->{ship} }, $form->format_amount($myconfig, $form->{"ship_$i"}));