From: Moritz Bunkus Date: Wed, 22 Nov 2006 16:43:15 +0000 (+0000) Subject: Recommit von r1183 von skoehler: Bugfix 133, Quoting fuer Kunden und Lieferanten... X-Git-Tag: release-2.4.0^2~201 X-Git-Url: http://wagnertech.de/git?a=commitdiff_plain;h=27562848c8cb9fe0c81d9147c1bdcb0d1f532562;p=kivitendo-erp.git Recommit von r1183 von skoehler: Bugfix 133, Quoting fuer Kunden und Lieferanten rein, Dequoting wird nicht benoetigt, Anfuehrungsstriche brachten Verkaufs- und Einkaufsmasken durcheinander --- diff --git a/bin/mozilla/ir.pl b/bin/mozilla/ir.pl index a9b8aeeea..c3374b6af 100644 --- a/bin/mozilla/ir.pl +++ b/bin/mozilla/ir.pl @@ -76,6 +76,11 @@ sub invoice_links { $form->create_links("AP", \%myconfig, "vendor"); + #quote all_vendor Bug 133 + foreach $ref (@{ $form->{all_vendor} }) { + $ref->{name} = $form->quote($ref->{name}); + } + if ($form->{all_vendor}) { unless ($form->{vendor_id}) { $form->{vendor_id} = $form->{all_vendor}->[0]->{id}; @@ -219,6 +224,9 @@ sub form_header { s/option>\Q$form->{$item}\E/option selected>$form->{$item}/; } + #quote selectvendor Bug 133 + $form->{"selectvendor"} = $form->quote($form->{"selectvendor"}); + $form->{exchangerate} = $form->format_amount(\%myconfig, $form->{exchangerate}); diff --git a/bin/mozilla/is.pl b/bin/mozilla/is.pl index 163ac1461..933db34aa 100644 --- a/bin/mozilla/is.pl +++ b/bin/mozilla/is.pl @@ -138,6 +138,10 @@ sub invoice_links { $cp_id = $form->{cp_id}; IS->get_customer(\%myconfig, \%$form); + #quote all_customer Bug 133 + foreach $ref (@{ $form->{all_customer} }) { + $ref->{name} = $form->quote($ref->{name}); + } if ($id) { $form->{id} = $id; } @@ -381,6 +385,9 @@ sub form_header { s/option>\Q$form->{$item}\E/option selected>$form->{$item}/; } + #quote customer Bug 133 + $form->{selectcustomer} = $form->quote($form->{selectcustomer}); + #build contacts if ($form->{all_contacts}) { diff --git a/bin/mozilla/oe.pl b/bin/mozilla/oe.pl index f4b32c035..67c99bdfe 100644 --- a/bin/mozilla/oe.pl +++ b/bin/mozilla/oe.pl @@ -30,6 +30,7 @@ # Order entry module # Quotation module #====================================================================== +use Data::Dumper; use SL::OE; use SL::IR; @@ -188,9 +189,21 @@ sub order_links { # get customer / vendor if ($form->{type} =~ /(purchase_order|request_quotation|receive_order)/) { IR->get_vendor(\%myconfig, \%$form); + + #quote all_vendor Bug 133 + foreach $ref (@{ $form->{all_vendor} }) { + $ref->{name} = $form->quote($ref->{name}); + } + } if ($form->{type} =~ /(sales|ship)_(order|quotation)/) { IS->get_customer(\%myconfig, \%$form); + + #quote all_vendor Bug 133 + foreach $ref (@{ $form->{all_customer} }) { + $ref->{name} = $form->quote($ref->{name}); + } + } $form->{cp_id} = $cp_id; if ($payment_id) { @@ -367,6 +380,9 @@ sub form_header { s/option>\Q$form->{$item}\E/option selected>$form->{$item}/; } + #quote select[customer|vendor] Bug 133 + $form->{"select$form->{vc}"} = $form->quote($form->{"select$form->{vc}"}); + #build contacts if ($form->{all_contacts}) {